From ae955f654a254f46540f946f5bddb8b9c1288756 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 5 Jul 2005 00:19:04 +0000
Subject: [PATCH] Bunch of smaller fixes. (This used to be commit
 b6ade327e055126d04bb53451c71ebef27112a16)

---
 docs/manpages-3/smb.conf.5.xml |  7 +++++--
 docs/xslt/latex.xsl            | 12 +++++++-----
 docs/xslt/strip-references.xsl | 34 +---------------------------------
 3 files changed, 13 insertions(+), 40 deletions(-)

diff --git a/docs/manpages-3/smb.conf.5.xml b/docs/manpages-3/smb.conf.5.xml
index d0317db9047..e7e4a8933c8 100644
--- 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 5ee1f6531dd..6434e8d9dd3 100644
--- 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 568aecafd2f..c3dbb71e112 100644
--- 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>