From dbe5fe827ea7c79c8cbc6456cb60ce97f9edaa13 Mon Sep 17 00:00:00 2001 From: Thom May Date: Wed, 14 May 2003 20:06:12 +0000 Subject: [PATCH] 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 --- docs/man/htpasswd.1 | 8 ++++---- docs/manual/programs/htpasswd.html.en | 10 ++++++++-- docs/manual/programs/htpasswd.xml | 10 ++++++++-- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/docs/man/htpasswd.1 b/docs/man/htpasswd.1 index 47504240d6..ea99217f14 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 d48b6facfa..16eb74ee33 100644 --- a/docs/manual/programs/htpasswd.html.en +++ b/docs/manual/programs/htpasswd.html.en @@ -57,14 +57,16 @@ distribution.

Synopsis

htpasswd [ -c ] - [ -m ] passwdfile username

+ [ -m ] + [ -D ] passwdfile username

htpasswd -b [ -c ] [ -m | -d | -p | - -s ] passwdfile username + -s ] + [ -D ] passwdfile username password

htpasswd -n @@ -119,6 +121,10 @@ distribution.

creation on all platforms, the httpd daemon will only accept plain text passwords on Windows, Netware and TPF. +
-D
+
Delete user. If the username exists in the specified htpasswd file, it + will be deleted.
+
passwdfile
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, diff --git a/docs/manual/programs/htpasswd.xml b/docs/manual/programs/htpasswd.xml index c2fdd0d6e1..b6bb4e25c3 100644 --- a/docs/manual/programs/htpasswd.xml +++ b/docs/manual/programs/htpasswd.xml @@ -39,14 +39,16 @@ distribution.

Synopsis

htpasswd [ -c ] - [ -m ] passwdfile username

+ [ -m ] + [ -D ] passwdfile username

htpasswd -b [ -c ] [ -m | -d | -p | - -s ] passwdfile username + -s ] + [ -D ] passwdfile username password

htpasswd -n @@ -101,6 +103,10 @@ distribution.

creation on all platforms, the httpd daemon will only accept plain text passwords on Windows, Netware and TPF.
+
-D
+
Delete user. If the username exists in the specified htpasswd file, it + will be deleted.
+
passwdfile
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, -- 2.50.1