Remove doc:div and doc:toc, add show-in-this-page and reindent. Really this should have been in bug 23052. Ah well.
1.1 --- a/docs/html-to-website-xml.xsl Thu Jan 19 15:19:35 2012 +0000
1.2 +++ b/docs/html-to-website-xml.xsl Thu Jan 19 15:52:27 2012 +0000
1.3 @@ -28,36 +28,30 @@
1.4 <head>
1.5 <title><xsl:value-of select="document($original)/refentry/refnamediv/refname"/><xsl:if test="document($original)/refentry/refmeta/manvolnum">(<xsl:value-of select="document($original)/refentry/refmeta/manvolnum"/>)</xsl:if> manual page</title>
1.6 </head>
1.7 - <body>
1.8 - <doc:div>
1.9 - <xsl:choose>
1.10 + <body show-in-this-page="true">
1.11 + <xsl:choose>
1.12 <xsl:when test="document($original)/refentry/refmeta/manvolnum">
1.13 - <p>
1.14 - This is the manual page for
1.15 - <code><xsl:value-of select="document($original)/refentry/refnamediv/refname"/>(<xsl:value-of select="document($original)/refentry/refmeta/manvolnum"/>)</code>.
1.16 - </p>
1.17 - <p>
1.18 - <a href="../manpages.html">See a list of all manual pages</a>.
1.19 - </p>
1.20 + <p>
1.21 + This is the manual page for
1.22 + <code><xsl:value-of select="document($original)/refentry/refnamediv/refname"/>(<xsl:value-of select="document($original)/refentry/refmeta/manvolnum"/>)</code>.
1.23 + </p>
1.24 + <p>
1.25 + <a href="../manpages.html">See a list of all manual pages</a>.
1.26 + </p>
1.27 </xsl:when>
1.28 <xsl:otherwise>
1.29 - <p>
1.30 - This is the documentation for
1.31 - <code><xsl:value-of select="document($original)/refentry/refnamediv/refname"/></code>.
1.32 - </p>
1.33 + <p>
1.34 + This is the documentation for
1.35 + <code><xsl:value-of select="document($original)/refentry/refnamediv/refname"/></code>.
1.36 + </p>
1.37 </xsl:otherwise>
1.38 - </xsl:choose>
1.39 - <p>
1.40 + </xsl:choose>
1.41 + <p>
1.42 For more general documentation, please see the
1.43 - <a href="../admin-guide.html">administrator's guide</a>.
1.44 - </p>
1.45 + <a href="../admin-guide.html">administrator's guide</a>.
1.46 + </p>
1.47
1.48 - <doc:toc class="compact">
1.49 - <doc:heading>Table of Contents</doc:heading>
1.50 - </doc:toc>
1.51 -
1.52 - <xsl:apply-templates select="body/div[@class='refentry']"/>
1.53 - </doc:div>
1.54 + <xsl:apply-templates select="body/div[@class='refentry']"/>
1.55 </body>
1.56 </html>
1.57 </xsl:template>