httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From taka...@apache.org
Subject svn commit: r1226330 - in /httpd/httpd/branches/2.2.x: ./ docs/ docs/man/httxt2dbm.1 docs/manual/programs/httxt2dbm.xml
Date Mon, 02 Jan 2012 01:08:45 GMT
Author: takashi
Date: Mon Jan  2 01:08:45 2012
New Revision: 1226330

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

Build the man page for httxt2dbm.

Added:
    httpd/httpd/branches/2.2.x/docs/man/httxt2dbm.1
      - copied unchanged from r1222335, httpd/httpd/trunk/docs/man/httxt2dbm.1
Modified:
    httpd/httpd/branches/2.2.x/   (props changed)
    httpd/httpd/branches/2.2.x/docs/   (props changed)
    httpd/httpd/branches/2.2.x/docs/manual/programs/httxt2dbm.xml

Propchange: httpd/httpd/branches/2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan  2 01:08:45 2012
@@ -1 +1 @@
-/httpd/httpd/trunk:395552,417988,451572,583817,583830,611483,630858,639005,639010,647395,657354,657459,660461,660566,664330,678761,680082,681190,682369,683626,685112,686805,686809,687099,687754,693120,693392,693727-693728,696006,697093,706318,707163,708902,711421,719357,720250,729316-729317,729586,732414,732504,732832,733127,733134,733218-733219,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,823536,823563,891282,932791,942209,953311,955966,992625,1026743,1031551,1058192,1070096,1082196,1223048
+/httpd/httpd/trunk:395552,417988,451572,583817,583830,611483,630858,639005,639010,647395,657354,657459,660461,660566,664330,678761,680082,681190,682369,683626,685112,686805,686809,687099,687754,693120,693392,693727-693728,696006,697093,706318,707163,708902,711421,719357,720250,729316-729317,729586,732414,732504,732832,733127,733134,733218-733219,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,823536,823563,891282,932791,942209,953311,955966,992625,1026743,1031551,1058192,1070096,1082196,1222335,1223048

Propchange: httpd/httpd/branches/2.2.x/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan  2 01:08:45 2012
@@ -1 +1 @@
-/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,1223048
+/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=1226330&r1=1226329&r2=1226330&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 Mon Jan  2 01:08:45 2012
@@ -50,18 +50,17 @@
 
     <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 <glossary>APR</glossary> Default. Available types are:<br />
-    <code>GDBM</code> for GDBM files<br />
-    <code>SDBM</code> for SDBM files<br />
-    <code>DB</code> for berkeley DB files<br />
-    <code>NDBM</code> for NDBM files<br />
-    <code>default</code> for the default DBM type
+    use the <code>APR</code> Default. Available types are:
+    <code>GDBM</code> for GDBM files,
+    <code>SDBM</code> for SDBM files,
+    <code>DB</code> for berkeley DB files,
+    <code>NDBM</code> for NDBM files,
+    <code>default</code> for the default DBM type.
     </dd>
 
     <dt><code>-i <var>SOURCE_TXT</var></code></dt>
     <dd>Input file from which the dbm is to be created. The file should be formated
-    with one record per line, of the form:<br />
-    <code>key value</code><br />
+    with one record per line, of the form: <code>key value</code>.
     See the documentation for <directive module="mod_rewrite">RewriteMap</directive>
for
     further details of this file's format and meaning.
     </dd>



Mime
View raw message