You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2011/12/22 18:13:51 UTC
svn commit: r1222355 - in /httpd/httpd/branches/2.4.x: ./
build/rpm/httpd.spec.in docs/man/httxt2dbm.1
docs/manual/programs/httxt2dbm.xml
Author: minfrin
Date: Thu Dec 22 17:13:51 2011
New Revision: 1222355
URL: http://svn.apache.org/viewvc?rev=1222355&view=rev
Log:
Build the man page for httxt2dbm.
Added:
httpd/httpd/branches/2.4.x/docs/man/httxt2dbm.1
- copied unchanged from r1222335, httpd/httpd/trunk/docs/man/httxt2dbm.1
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/build/rpm/httpd.spec.in
httpd/httpd/branches/2.4.x/docs/manual/programs/httxt2dbm.xml
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 22 17:13:51 2011
@@ -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
+/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
Modified: httpd/httpd/branches/2.4.x/build/rpm/httpd.spec.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/build/rpm/httpd.spec.in?rev=1222355&r1=1222354&r2=1222355&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/build/rpm/httpd.spec.in (original)
+++ httpd/httpd/branches/2.4.x/build/rpm/httpd.spec.in Thu Dec 22 17:13:51 2011
@@ -446,6 +446,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/htdbm.1*
%{_mandir}/man1/htdigest.1*
%{_mandir}/man1/htpasswd.1*
+%{_mandir}/man1/httxt2dbm.1*
%{_mandir}/man1/ab.1*
%{_mandir}/man1/logresolve.1*
%{_mandir}/man8/rotatelogs.8*
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=1222355&r1=1222354&r2=1222355&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 Thu Dec 22 17:13:51 2011
@@ -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>