Merge r1229116 from trunk:

Add <glossary> to nroff.xsl and revert r1222335(r1222355) partially.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1229232 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/programs/httxt2dbm.xml b/docs/manual/programs/httxt2dbm.xml
index d537c4c396f8ddc87403dd5fa9331245a63d1d65..4bcc56d2bedbfd0628ff7ef97507f61de8365a14 100644 (file)
--- a/docs/manual/programs/httxt2dbm.xml
+++ b/docs/manual/programs/httxt2dbm.xml
@@ -50,7 +50,7 @@
 
     <dt><code>-f <var>DBM_TYPE</var></code></dt>
     <dd>Specify the DBM type to be used for the output. If not specified, will
-    use the <code>APR</code> Default. Available types are:
+    use the <glossary>APR</glossary> Default. Available types are:
     <code>GDBM</code> for GDBM files,
     <code>SDBM</code> for SDBM files,
     <code>DB</code> for berkeley DB files,

diff --git a/docs/manual/style/xsl/nroff.xsl b/docs/manual/style/xsl/nroff.xsl
index 5aadc418b2395187a01542e88a6e6433196bdea2..46d574f04d702c51159becf182010c422508ee79 100644 (file)
--- a/docs/manual/style/xsl/nroff.xsl
+++ b/docs/manual/style/xsl/nroff.xsl
@@ -373,7 +373,7 @@ FATAL: only tables with two (2) columns are supported.
 <!-- ==================================================================== -->
 <!-- pass through content                                                 -->
 <!-- ==================================================================== -->
-<xsl:template match="a|code|module|table|program">
+<xsl:template match="a|code|module|table|program|glossary">
 <xsl:apply-templates />
 </xsl:template>