svn commit: samba-docs r778 - in trunk/xslt: .

[jelmer at samba.org]

Author: jelmer
Date: 2005-07-09 00:15:59 +0000 (Sat, 09 Jul 2005)
New Revision: 778

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=778

Log:
Fix smb.conf.5 output

Modified:
   trunk/xslt/expand-sambadoc.xsl
   trunk/xslt/expand-smbconfdoc.xsl


Changeset:
Modified: trunk/xslt/expand-sambadoc.xsl
===================================================================
--- trunk/xslt/expand-sambadoc.xsl	2005-07-08 15:07:53 UTC (rev 777)
+++ trunk/xslt/expand-sambadoc.xsl	2005-07-09 00:15:59 UTC (rev 778)
@@ -9,11 +9,11 @@
 	xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"
 	version="1.1">
 
-	<xsl:import href="strip-references.xsl"/>
-	<xsl:import href="expand-smbconfdoc.xsl"/>
-
 	<xsl:output method="xml" encoding="UTF-8" doctype-public="-//OASIS//DTD DocBook XML V4.2//EN" indent="yes" doctype-system="http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"/>
 
+	<xsl:include href="strip-references.xsl"/>
+	<xsl:include href="expand-smbconfdoc.xsl"/>
+
 	<!-- This is needed to copy content unchanged -->
 	<xsl:template match="@*|node()">
 		<xsl:copy>
@@ -22,7 +22,6 @@
 	</xsl:template>
 
 	<xsl:template match="smbconfblock/smbconfoption">
-
 		<xsl:element name="member">
 			<xsl:element name="indexterm">
 				<xsl:element name="primary">

Modified: trunk/xslt/expand-smbconfdoc.xsl
===================================================================
--- trunk/xslt/expand-smbconfdoc.xsl	2005-07-08 15:07:53 UTC (rev 777)
+++ trunk/xslt/expand-smbconfdoc.xsl	2005-07-09 00:15:59 UTC (rev 778)
@@ -18,9 +18,9 @@
 
 	<xsl:template match="related"><xsl:apply-templates/></xsl:template>
 
-	<xsl:template match="//samba:parameterlist">
+	<xsl:template match="samba:parameterlist">
 		<xsl:apply-templates>
-			<xsl:sort select="varlistentry/term/anchor"/>
+			<xsl:sort select="samba:parameter/@name"/>
 		</xsl:apply-templates>
 	</xsl:template>
 
@@ -29,10 +29,7 @@
 		<xsl:apply-templates/>
 	</xsl:template>
 
-	<xsl:template match="//samba:parameter">
-		<!-- reconstruct varlistentry - not all of them will go into separate files
-		and also we must repair the main varlistentry itself.
-		-->
+	<xsl:template match="samba:parameter">
 		<xsl:variable name="cname"><xsl:value-of select="translate(translate(string(@name),' ',''),
 				'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
 		</xsl:variable>
@@ -134,7 +131,6 @@
 						<xsl:value-of select="$name"/>
 					</xsl:element>
 				</xsl:element>
-
 				<xsl:element name="term">
 					<xsl:element name="anchor">
 						<xsl:attribute name="id">
@@ -143,7 +139,6 @@
 					</xsl:element>
 					<xsl:value-of select="."/>
 				</xsl:element>
-
 				<xsl:element name="listitem">
 					<xsl:element name="para"><xsl:text>This parameter is a synonym for </xsl:text><xsl:copy-of select="$name"/><xsl:text>.</xsl:text></xsl:element>
 				</xsl:element>
@@ -162,9 +157,9 @@
 			</xsl:element>
 			<xsl:copy-of select="$term"/>
 			<xsl:element name="listitem">
-				<xsl:copy-of select="$content"/> <xsl:text>&#10;</xsl:text>     
-				<xsl:copy-of select="$default"/> <xsl:text>&#10;</xsl:text>     
-				<xsl:copy-of select="$examples"/> <xsl:text>&#10;</xsl:text>     
+				<xsl:copy-of select="$content"/> <xsl:text>&#10;</xsl:text>
+				<xsl:copy-of select="$default"/> <xsl:text>&#10;</xsl:text>
+				<xsl:copy-of select="$examples"/> <xsl:text>&#10;</xsl:text>
 			</xsl:element>
 		</xsl:element>
 	</xsl:template>