diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-07-09 00:15:59 +0000 |
|---|---|---|
| committer | Gerald W. Carter <jerry@samba.org> | 2008-04-23 08:47:04 -0500 |
| commit | 4c7f834b0b9afd7b796b1a0fa422868a7b54823e (patch) | |
| tree | 4dabae82be0d9cdb118928b97d5dcc4a91349485 | |
| parent | 40ac96fb1bb098ee21bd34814ee1a6923b8c21ed (diff) | |
| download | samba-4c7f834b0b9afd7b796b1a0fa422868a7b54823e.tar.gz samba-4c7f834b0b9afd7b796b1a0fa422868a7b54823e.tar.bz2 samba-4c7f834b0b9afd7b796b1a0fa422868a7b54823e.zip | |
Fix smb.conf.5 output
(This used to be commit a6cd8e8598b50fc9c8157bd84d4a0ec976f8c5f1)
| -rw-r--r-- | docs/xslt/expand-sambadoc.xsl | 7 | ||||
| -rw-r--r-- | docs/xslt/expand-smbconfdoc.xsl | 17 |
2 files changed, 9 insertions, 15 deletions
diff --git a/docs/xslt/expand-sambadoc.xsl b/docs/xslt/expand-sambadoc.xsl index f10f04b97d..0a6326ef0b 100644 --- a/docs/xslt/expand-sambadoc.xsl +++ b/docs/xslt/expand-sambadoc.xsl @@ -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"> diff --git a/docs/xslt/expand-smbconfdoc.xsl b/docs/xslt/expand-smbconfdoc.xsl index cd92990234..6162f73169 100644 --- a/docs/xslt/expand-smbconfdoc.xsl +++ b/docs/xslt/expand-smbconfdoc.xsl @@ -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> </xsl:text> - <xsl:copy-of select="$default"/> <xsl:text> </xsl:text> - <xsl:copy-of select="$examples"/> <xsl:text> </xsl:text> + <xsl:copy-of select="$content"/> <xsl:text> </xsl:text> + <xsl:copy-of select="$default"/> <xsl:text> </xsl:text> + <xsl:copy-of select="$examples"/> <xsl:text> </xsl:text> </xsl:element> </xsl:element> </xsl:template> |