From: Thom May <thommay@apache.org>
Date: Wed, 14 May 2003 20:06:12 +0000 (+0000)
Subject: Hrm. Update the xml and generate the man page correctly.
X-Git-Tag: pre_ajp_proxy~1700
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dbe5fe827ea7c79c8cbc6456cb60ce97f9edaa13;p=thirdparty%2Fapache%2Fhttpd.git

Hrm. Update the xml and generate the man page correctly.
Thanks to Joshua for catching this.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99829 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/man/htpasswd.1 b/docs/man/htpasswd.1
index 47504240d65..ea99217f143 100644
--- a/docs/man/htpasswd.1
+++ b/docs/man/htpasswd.1
@@ -19,7 +19,7 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "HTPASSWD" 1 "2003-05-13" "Apache HTTP Server" "htpasswd"
+.TH "HTPASSWD" 1 "2003-05-14" "Apache HTTP Server" "htpasswd"
 
 .SH NAME
 htpasswd \- Manage user files for basic authentication
@@ -27,10 +27,10 @@ htpasswd \- Manage user files for basic authentication
 .SH "SYNOPSIS"
  
 .PP
-\fBhtpasswd\fR [ -\fBc\fR ] [ -\fBm\fR ] [ -\fBD\fB ] \fIpasswdfile\fR \fIusername\fR
+\fBhtpasswd\fR [ -\fBc\fR ] [ -\fBm\fR ] [ -\fBD\fR ] \fIpasswdfile\fR \fIusername\fR
  
 .PP
-\fBhtpasswd\fR -\fBb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] [ -\fBD\fB ] \fIpasswdfile\fR \fIusername\fR \fIpassword\fR
+\fBhtpasswd\fR -\fBb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] [ -\fBD\fR ] \fIpasswdfile\fR \fIusername\fR \fIpassword\fR
  
 .PP
 \fBhtpasswd\fR -\fBn\fR [ -\fBm\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] \fIusername\fR
@@ -81,7 +81,7 @@ Use SHA encryption for passwords\&. Facilitates migration from/to Netscape serve
 Use plaintext passwords\&. Though htpasswd will support creation on all platforms, the httpd daemon will only accept plain text passwords on Windows, Netware and TPF\&.  
 .TP
 -D
-Delete user\&. If the username exists in the specified htpasswd file, it will be deleted\&.
+Delete user\&. If the username exists in the specified htpasswd file, it will be deleted\&.  
 .TP
 \fIpasswdfile\fR
 Name of the file to contain the user name and password\&. If -c is given, this file is created if it does not already exist, or rewritten and truncated if it does exist\&.  
diff --git a/docs/manual/programs/htpasswd.html.en b/docs/manual/programs/htpasswd.html.en
index d48b6facfa0..16eb74ee33f 100644
--- a/docs/manual/programs/htpasswd.html.en
+++ b/docs/manual/programs/htpasswd.html.en
@@ -57,14 +57,16 @@ distribution.</p></li></ul></div>
 <h2><a name="synopsis" id="synopsis">Synopsis</a></h2>
     <p><code><strong>htpasswd</strong>
     [ -<strong>c</strong> ]
-    [ -<strong>m</strong> ] <var>passwdfile</var> <var>username</var></code></p>
+    [ -<strong>m</strong> ]
+    [ -<strong>D</strong> ] <var>passwdfile</var> <var>username</var></code></p>
 
     <p><code><strong>htpasswd</strong> -<strong>b</strong>
     [ -<strong>c</strong> ]
     [ -<strong>m</strong> |
       -<strong>d</strong> |
       -<strong>p</strong> |
-      -<strong>s</strong> ] <var>passwdfile</var> <var>username</var>
+      -<strong>s</strong> ] 
+    [ -<strong>D</strong> ]  <var>passwdfile</var> <var>username</var>
     <var>password</var></code></p>
 
     <p><code><strong>htpasswd</strong> -<strong>n</strong>
@@ -119,6 +121,10 @@ distribution.</p></li></ul></div>
     creation on all platforms, the <a href="httpd.html">httpd</a> daemon will
     only accept plain text passwords on Windows, Netware and TPF.</dd>
 
+    <dt><code>-D</code></dt>
+    <dd>Delete user. If the username exists in the specified htpasswd file, it
+    will be deleted.</dd>
+    
     <dt><code><var>passwdfile</var></code></dt>
     <dd>Name of the file to contain the user name and password. If
     <code>-c</code> is given, this file is created if it does not already exist,
diff --git a/docs/manual/programs/htpasswd.xml b/docs/manual/programs/htpasswd.xml
index c2fdd0d6e18..b6bb4e25c3a 100644
--- a/docs/manual/programs/htpasswd.xml
+++ b/docs/manual/programs/htpasswd.xml
@@ -39,14 +39,16 @@ distribution.</p></seealso>
 <section id="synopsis"><title>Synopsis</title>
     <p><code><strong>htpasswd</strong>
     [ -<strong>c</strong> ]
-    [ -<strong>m</strong> ] <var>passwdfile</var> <var>username</var></code></p>
+    [ -<strong>m</strong> ]
+    [ -<strong>D</strong> ] <var>passwdfile</var> <var>username</var></code></p>
 
     <p><code><strong>htpasswd</strong> -<strong>b</strong>
     [ -<strong>c</strong> ]
     [ -<strong>m</strong> |
       -<strong>d</strong> |
       -<strong>p</strong> |
-      -<strong>s</strong> ] <var>passwdfile</var> <var>username</var>
+      -<strong>s</strong> ] 
+    [ -<strong>D</strong> ]  <var>passwdfile</var> <var>username</var>
     <var>password</var></code></p>
 
     <p><code><strong>htpasswd</strong> -<strong>n</strong>
@@ -101,6 +103,10 @@ distribution.</p></seealso>
     creation on all platforms, the <a href="httpd.html">httpd</a> daemon will
     only accept plain text passwords on Windows, Netware and TPF.</dd>
 
+    <dt><code>-D</code></dt>
+    <dd>Delete user. If the username exists in the specified htpasswd file, it
+    will be deleted.</dd>
+    
     <dt><code><var>passwdfile</var></code></dt>
     <dd>Name of the file to contain the user name and password. If
     <code>-c</code> is given, this file is created if it does not already exist,