summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2011-01-18 13:00:51 +0100
committerMichael Adam <obnox@samba.org>2011-01-18 14:08:38 +0100
commit891bff8747bc81bee6c0f7f564c79ffbe4b15e13 (patch)
tree97d5eb2fad2c03ee0144e1287a6a48ff89c155f1
parenta1e1f02efea3a6c1f419a7d93498718d46636d2b (diff)
downloadsamba-891bff8747bc81bee6c0f7f564c79ffbe4b15e13.tar.gz
samba-891bff8747bc81bee6c0f7f564c79ffbe4b15e13.tar.bz2
samba-891bff8747bc81bee6c0f7f564c79ffbe4b15e13.zip
docs: Remove template "itemizedlist/listitem" from man.xsl
This seems to have been basically taken from the manpages/lists.xls from the docbook-xsl stylesheets. But it references a variable list-indent that older versions of docbook-xsl (e.g. 1.69) do not provide. This makes the manpage build break on older systems. Removing the definition lets the build succeed, using the system-definition of the itemizedlist/listitem. The diff between the docbook's (version 1.75.1) definition of itemizedlist/listitem and the definition in our man.xls is this: -- with this patch -- without this patch @@ -53,5 +53,7 @@ <!-- * seems to require the extra space. --> <xsl:call-template name="roff-if-end"/> <xsl:apply-templates/> - <xsl:text>.RE&#10;</xsl:text> + <xsl:if test=" following-sibling::listitem"> + <xsl:text>&#10;.RE&#10;</xsl:text> + </xsl:if> </xsl:template> I.e. the version of man.xsl made insertion if ".RE" conditional. I hope this does not break anything severely. The diff for e.g. the resulting winbindd.8 manpage is this: --- with this patch +++ witout this patch: @@ -375,7 +375,6 @@ \m[blue]\fBwinbind: rpc only\fR\m[] Setting this parameter forces winbindd to use RPC instead of LDAP to retrieve information from Domain Controllers\&. -.RE .SH "EXAMPLE SETUP" .PP To setup winbindd for user and group lookups plus authentication from a domain controller use something like the following setup\&. This was tested on an early Red Hat Linux box\&. Cheers
-rw-r--r--docs-xml/xslt/man.xsl60
1 files changed, 0 insertions, 60 deletions
diff --git a/docs-xml/xslt/man.xsl b/docs-xml/xslt/man.xsl
index e259004330..d9cc1def72 100644
--- a/docs-xml/xslt/man.xsl
+++ b/docs-xml/xslt/man.xsl
@@ -29,66 +29,6 @@
</xsl:if>
</xsl:template>
-<xsl:template match="itemizedlist/listitem">
- <!-- * We output a real bullet here (rather than, "\(bu", -->
- <!-- * the roff bullet) because, when we do character-map -->
- <!-- * processing before final output, the character-map will -->
- <!-- * handle conversion of the &#x2022; to "\(bu" for us -->
- <xsl:text>&#10;</xsl:text>
- <xsl:text>.sp</xsl:text>
- <xsl:text>&#10;</xsl:text>
- <xsl:text>.RS</xsl:text>
- <xsl:if test="not($list-indent = '')">
- <xsl:text> </xsl:text>
- <xsl:value-of select="$list-indent"/>
- </xsl:if>
- <xsl:text>&#10;</xsl:text>
- <!-- * if "n" then we are using "nroff", which means the output is for -->
- <!-- * TTY; so we do some fixed-width-font hackery with \h to make a -->
- <!-- * hanging indent (instead of using .IP, which has some -->
- <!-- * undesirable side effects under certain circumstances) -->
- <xsl:call-template name="roff-if-else-start"/>
- <xsl:text>\h'-</xsl:text>
- <xsl:choose>
- <xsl:when test="not($list-indent = '')">
- <xsl:text>0</xsl:text>
- <xsl:value-of select="$list-indent"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>\n(INu</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:text>'</xsl:text>
- <xsl:text>&#x2022;</xsl:text>
- <xsl:text>\h'+</xsl:text>
- <xsl:choose>
- <xsl:when test="not($list-indent = '')">
- <xsl:text>0</xsl:text>
- <xsl:value-of select="$list-indent - 1"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>\n(INu-1</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:text>'\c&#10;</xsl:text>
- <!-- * else, we are not using for "nroff", but instead "troff" - which -->
- <!-- * means not for TTY, but for PS or whatever; so we’re not using a -->
- <!-- * fixed-width font, so use a real .IP instead -->
- <xsl:call-template name="roff-else"/>
- <!-- * .IP generates a blank like of space, so let’s go backwards one -->
- <!-- * line up to compensate for that -->
- <xsl:text>.sp -1&#10;</xsl:text>
- <xsl:text>.IP \(bu 2.3&#10;</xsl:text>
- <!-- * The value 2.3 is the amount of indentation; we use 2.3 instead -->
- <!-- * of 2 because when the font family is New Century Schoolbook it -->
- <!-- * seems to require the extra space. -->
- <xsl:call-template name="roff-if-end"/>
- <xsl:apply-templates/>
- <xsl:if test=" following-sibling::listitem">
- <xsl:text>&#10;.RE&#10;</xsl:text>
- </xsl:if>
-</xsl:template>
-
<xsl:template match="itemizedlist|orderedlist|procedure">
<xsl:if test="title">
<xsl:text>.PP&#10;</xsl:text>