From 2f9de75820b0f27aec2b00d08cb8434d842dc528 Mon Sep 17 00:00:00 2001
From: Takashi Sato <takashi@apache.org>
Date: Mon, 2 Jan 2012 01:08:45 +0000
Subject: [PATCH] Merge r1222335 from trunk:

Build the man page for httxt2dbm.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1226330 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/man/httxt2dbm.1               | 62 ++++++++++++++++++++++++++++++
 docs/manual/programs/httxt2dbm.xml | 15 ++++----
 2 files changed, 69 insertions(+), 8 deletions(-)
 create mode 100644 docs/man/httxt2dbm.1

diff --git a/docs/man/httxt2dbm.1 b/docs/man/httxt2dbm.1
new file mode 100644
index 00000000000..8298cdfc7c7
--- /dev/null
+++ b/docs/man/httxt2dbm.1
@@ -0,0 +1,62 @@
+.\" XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+.\" DO NOT EDIT! Generated from XML source.
+.\" XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+.de Sh \" Subsection
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Ip \" List item
+.br
+.ie \\n(.$>=3 .ne \\$3
+.el .ne 3
+.IP "\\$1" \\$2
+..
+.TH "HTTXT2DBM" 1 "2011-12-22" "Apache HTTP Server" "httxt2dbm"
+
+.SH NAME
+httxt2dbm \- Generate dbm files for use with RewriteMap
+
+.SH "SYNOPSIS"
+ 
+.PP
+\fBhttxt2dbm\fR [ -\fBv\fR ] [ -\fBf\fR \fIDBM_TYPE\fR ] -\fBi\fR \fISOURCE_TXT\fR -\fBo\fR \fIOUTPUT_DBM\fR
+ 
+
+.SH "SUMMARY"
+ 
+.PP
+httxt2dbm is used to generate dbm files from text input, for use in RewriteMap with the dbm map type\&.
+ 
+
+.SH "OPTIONS"
+ 
+ 
+.TP
+-v
+More verbose output  
+.TP
+-f \fIDBM_TYPE\fR
+Specify the DBM type to be used for the output\&. If not specified, will use the APR Default\&. Available types are: GDBM for GDBM files, SDBM for SDBM files, DB for berkeley DB files, NDBM for NDBM files, default for the default DBM type\&.  
+.TP
+-i \fISOURCE_TXT\fR
+Input file from which the dbm is to be created\&. The file should be formated with one record per line, of the form: key value\&. See the documentation for RewriteMap for further details of this file's format and meaning\&.  
+.TP
+-o \fIOUTPUT_DBM\fR
+Name of the output dbm files\&.  
+ 
+.SH "EXAMPLES"
+ 
+.nf
+
+      httxt2dbm -i rewritemap\&.txt -o rewritemap\&.dbm
+      httxt2dbm -f SDBM -i rewritemap\&.txt -o rewritemap\&.dbm 
+.fi
+ 
diff --git a/docs/manual/programs/httxt2dbm.xml b/docs/manual/programs/httxt2dbm.xml
index add3fd0504d..513c7ef951c 100644
--- a/docs/manual/programs/httxt2dbm.xml
+++ b/docs/manual/programs/httxt2dbm.xml
@@ -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>
-- 
2.47.2