Bunch of smaller fixes.

diff --git a/docs/manpages-3/smb.conf.5.xml b/docs/manpages-3/smb.conf.5.xml
index d0317db9047fe3185fb90f1eb74ab15004187012..e7e4a8933c853e36e6fa2d3ea6b6f95dbc277439 100644 (file)
--- a/docs/manpages-3/smb.conf.5.xml
+++ b/docs/manpages-3/smb.conf.5.xml
@@ -1,4 +1,5 @@
-<refentry id="smb.conf.5" xmlns:xi="http://www.w3.org/2003/XInclude">
+<refentry id="smb.conf.5" xmlns:xi="http://www.w3.org/2003/XInclude"
+                        xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
        
 <refmeta>
        <refentrytitle>smb.conf</refentrytitle>
@@ -607,7 +608,9 @@ alias|alias|alias|alias...
 <refsect1>
        <title>EXPLANATION OF EACH PARAMETER</title>
        
-       <xi:include href="../smbdotconf/parameters.all.xml" parse="xml"/>
+       <samba:parameterlist>
+               <xi:include href="../smbdotconf/parameters.all.xml" parse="xml"/>
+       </samba:parameterlist>
 
 </refsect1>
 

diff --git a/docs/xslt/latex.xsl b/docs/xslt/latex.xsl
index 5ee1f6531ddc81494df58253da26073126f6d366..6434e8d9dd3eb6ec649fbd0bb8afee4f5749ed58 100644 (file)
--- a/docs/xslt/latex.xsl
+++ b/docs/xslt/latex.xsl
@@ -170,12 +170,17 @@
        <xsl:apply-templates/>
 </xsl:template>
 
+<xsl:template match="refentry">
+       <xsl:text>\section{</xsl:text><xsl:value-of select="refmeta/refentrytitle"/><xsl:text>}&#10;</xsl:text>
+       <xsl:apply-templates/>
+</xsl:template>
+
 <xsl:template match="//samba:parameter">
-       <xsl:text>\item[{</xsl:text><xsl:value-of select="@name"/><xsl:text>}]&#10;</xsl:text>
+       <xsl:text>\item[{</xsl:text><xsl:value-of select="@name"/><xsl:text>}]\null{}&#10;</xsl:text>
        <xsl:text>\index{</xsl:text><xsl:value-of select="@name"/><xsl:text>|it}&#10;</xsl:text>
 
        <xsl:for-each select="synonym">
-       <xsl:text>\item[{</xsl:text><xsl:value-of select="."/><xsl:text>}]&#10;</xsl:text>
+               <xsl:text>\item[{</xsl:text><xsl:value-of select="."/><xsl:text>}]\null{}&#10;</xsl:text>
        <xsl:text>\index{</xsl:text><xsl:value-of select="."/><xsl:text>|it}&#10;</xsl:text>
        <xsl:text>This parameter is a synonym for \smbconfoption{</xsl:text><xsl:value-of select="../@name"/><xsl:text>}.</xsl:text>
        </xsl:for-each>
@@ -219,7 +224,4 @@
        <xsl:apply-templates select="description"/>
 </xsl:template>
 
-<xsl:template match="refsect1[title='VERSION']"/>
-<xsl:template match="refsect1[title='AUTHOR']"/>
-
 </xsl:stylesheet>

diff --git a/docs/xslt/strip-references.xsl b/docs/xslt/strip-references.xsl
index 568aecafd2f166f66111428dcf8d48ec4e07e7e1..c3dbb71e1128d14aaa886c000d07c5d6be6b22cc 100644 (file)
--- a/docs/xslt/strip-references.xsl
+++ b/docs/xslt/strip-references.xsl
@@ -2,41 +2,9 @@
 <!-- Removes particular (unuseful for the book) elements from references -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
        version="1.1">
-       <xsl:template match="reference/refentry/refsect1">
-               <xsl:if test="title!='VERSION' and title!='AUTHOR'">
-                       <xsl:element name="refsect1">
-                               <xsl:if test="@id!=''">
-                                       <xsl:attribute name="id">
-                                               <xsl:value-of select="@id"/>
-                                       </xsl:attribute>
-                               </xsl:if>
-                               <xsl:apply-templates/>                  
-                       </xsl:element>
-               </xsl:if>
-       </xsl:template>
-
-       <xsl:template match="reference/refentry">
-               <xsl:element name="section">
-                       <xsl:attribute name="id">
-                               <xsl:value-of select="@id"/>
-                       </xsl:attribute>
-                       <xsl:element name="title">
-                               <xsl:value-of select="refmeta/refentrytitle"/>
-                       </xsl:element>
-                       <xsl:apply-templates/>
-               </xsl:element>
-       </xsl:template>
+       <xsl:template match="reference/refentry/refsect1[title='VERSION' or title='AUTHOR']"/>
 
        <xsl:template match="reference/refentry/refmeta"/>
 
        <xsl:template match="reference/refentry/refnamediv"/>
-
-       <xsl:template match="reference">
-               <xsl:element name="appendix">
-                       <xsl:attribute name="id">
-                               <xsl:value-of select="@id"/>
-                       </xsl:attribute>
-                       <xsl:apply-templates/>
-               </xsl:element>
-       </xsl:template>
 </xsl:stylesheet>