Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f11a936f authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/docbook-fix' into for-linus

parents a3c6048d e776ec19

Documentation/DocBook/Makefile

+2 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,8 @@ DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \ 
	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \

	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \

	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \

	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \

	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \

	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \

	    mac80211.xml debugobjects.xml sh.xml regulator.xml

	    mac80211.xml debugobjects.xml sh.xml regulator.xml \

	    alsa-driver-api.xml writing-an-alsa-driver.xml





###

###

# The build process is as follows (targets):

# The build process is as follows (targets):

Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl→Documentation/DocBook/alsa-driver-api.tmpl

+6 −4
Original line number Original line Diff line number Diff line 
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">

<?xml version="1.0" encoding="UTF-8"?>



<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"

<book>

	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []>

<?dbhtml filename="index.html">





<!-- ****************************************************** -->

<!-- ****************************************************** -->

<!-- Header  -->

<!-- Header  -->

<!-- ****************************************************** -->

<!-- ****************************************************** -->

<book id="ALSA-Driver-API">

  <bookinfo>

  <bookinfo>

    <title>The ALSA Driver API</title>

    <title>The ALSA Driver API</title>
@@ -35,6 +35,8 @@ 




  </bookinfo>

  </bookinfo>





<toc></toc>



  <chapter><title>Management of Cards and Devices</title>

  <chapter><title>Management of Cards and Devices</title>

     <sect1><title>Card Management</title>

     <sect1><title>Card Management</title>

!Esound/core/init.c

!Esound/core/init.c

Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl→Documentation/DocBook/writing-an-alsa-driver.tmpl

+4 −4
Original line number Original line Diff line number Diff line 
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">

<?xml version="1.0" encoding="UTF-8"?>



<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"

<book>

	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []>

<?dbhtml filename="index.html">





<!-- ****************************************************** -->

<!-- ****************************************************** -->

<!-- Header  -->

<!-- Header  -->

<!-- ****************************************************** -->

<!-- ****************************************************** -->

<book id="Writing-an-ALSA-Driver">

  <bookinfo>

  <bookinfo>

    <title>Writing an ALSA Driver</title>

    <title>Writing an ALSA Driver</title>

    <author>

    <author>