httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From taka...@apache.org
Subject svn commit: r1229232 - in /httpd/httpd/branches/2.4.x: ./ docs/manual/programs/httxt2dbm.xml docs/manual/style/xsl/nroff.xsl
Date Mon, 09 Jan 2012 16:07:37 GMT
Author: takashi
Date: Mon Jan  9 16:07:37 2012
New Revision: 1229232

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

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

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

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan  9 16:07:37 2012
@@ -1,3 +1,3 @@
 /httpd/httpd/branches/revert-ap-ldap:1150158-1150173
 /httpd/httpd/branches/wombat-integration:723609-723841
-/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663,1211680,1212883,1213338,1213567,1214003,1214005,1214015,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1223048,1225060,1225197-1225198,1225380,1225476,1225478,1225791,1225795-1225796,1226339,1226375,1228816,1229059,1229134,1229136
+/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663,1211680,1212883,1213338,1213567,1214003,1214005,1214015,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1223048,1225060,1225197-1225198,1225380,1225476,1225478,1225791,1225795-1225796,1226339,1226375,1228816,1229059,1229116,1229134,1229136

Modified: httpd/httpd/branches/2.4.x/docs/manual/programs/httxt2dbm.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/programs/httxt2dbm.xml?rev=1229232&r1=1229231&r2=1229232&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/programs/httxt2dbm.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/programs/httxt2dbm.xml Mon Jan  9 16:07:37 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.4.x/docs/manual/style/xsl/nroff.xsl
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/xsl/nroff.xsl?rev=1229232&r1=1229231&r2=1229232&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/xsl/nroff.xsl (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/xsl/nroff.xsl Mon Jan  9 16:07:37 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