Merge remote-tracking branch 'sound/topic/restize-docs' into sound
authorJonathan Corbet <corbet@lwn.net>
Fri, 18 Nov 2016 23:19:28 +0000 (16:19 -0700)
committerJonathan Corbet <corbet@lwn.net>
Fri, 18 Nov 2016 23:19:28 +0000 (16:19 -0700)
Bring in the sphinxification of the sound documentation.

1  2 
Documentation/DocBook/Makefile
Documentation/index.rst

@@@ -9,11 -9,10 +9,10 @@@
  DOCBOOKS := z8530book.xml  \
            kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
            writing_usb_driver.xml networking.xml \
 -          kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \
 +          kernel-api.xml filesystems.xml lsm.xml kgdb.xml \
            gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
            genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
-           debugobjects.xml sh.xml regulator.xml \
-           alsa-driver-api.xml writing-an-alsa-driver.xml \
+           80211.xml debugobjects.xml sh.xml regulator.xml \
            tracepoint.xml w1.xml \
            writing_musb_glue_layer.xml crypto-API.xml iio.xml
  
@@@ -57,16 -18,8 +57,17 @@@ needed)
     media/index
     gpu/index
     80211/index
 +   security/index
+    sound/index
  
 +Korean translations
 +-------------------
 +
 +.. toctree::
 +   :maxdepth: 1
 +
 +   translations/ko_KR/index
 +
  Indices and tables
  ==================