httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From taka...@apache.org
Subject svn commit: r1229791 - in /httpd/httpd/branches/2.2.x/docs: ./ manual/programs/httxt2dbm.xml manual/style/xsl/nroff.xsl
Date Tue, 10 Jan 2012 23:16:34 GMT
Author: takashi
Date: Tue Jan 10 23:16:33 2012
New Revision: 1229791

URL: http://svn.apache.org/viewvc?rev=1229791&view=rev
Log:
Merge r1229116 from trunk:

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

Modified:
    httpd/httpd/branches/2.2.x/docs/   (props changed)
    httpd/httpd/branches/2.2.x/docs/manual/programs/httxt2dbm.xml
    httpd/httpd/branches/2.2.x/docs/manual/style/xsl/nroff.xsl

Propchange: httpd/httpd/branches/2.2.x/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 10 23:16:33 2012
@@ -1 +1,2 @@
+/httpd/httpd/trunk:1229116
 /httpd/httpd/trunk/docs:395552,417988,451572,583817,583830,611483,630858,639005,639010,647395,657354,657459,660461,660566,664330,675610,678761,680082,681190,682369,683626,684351,685112,686549,686805,686809,687099,687754,692325,693120,693392,693727-693728,696006,697093,703441,703997,706318,707163,708902,711421,719357,720250,726109,728015,728020,728220,729316-729317,729586,732414,732421,732451,732504,732832,733127,733134,733218-733219,733465,733467,733695,734703,734710,743589,755190,756671,756675,756678,756683,757741,761329,763394,764239,768535,769809,771587,771610,776325,777042,777091,778438-778439,778531,778942,780648,780655,780692,780697,780699,785457,785661,790587,803704,891282,942209,955966,992625,1026743,1058192,1070096,1082196,1222335,1223048

Modified: httpd/httpd/branches/2.2.x/docs/manual/programs/httxt2dbm.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/programs/httxt2dbm.xml?rev=1229791&r1=1229790&r2=1229791&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/programs/httxt2dbm.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/programs/httxt2dbm.xml Tue Jan 10 23:16:33 2012
@@ -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,

Modified: httpd/httpd/branches/2.2.x/docs/manual/style/xsl/nroff.xsl
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/style/xsl/nroff.xsl?rev=1229791&r1=1229790&r2=1229791&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/style/xsl/nroff.xsl (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/style/xsl/nroff.xsl Tue Jan 10 23:16:33 2012
@@ -373,7 +373,7 @@ FATAL: only tables with two (2) columns 
 <!-- ==================================================================== -->
 <!-- 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>
 



Mime
View raw message