summaryrefslogtreecommitdiffstats
path: root/docs/man
diff options
context:
space:
mode:
authorStefan Fritsch <sf@apache.org>2009-10-19 22:58:59 +0200
committerStefan Fritsch <sf@apache.org>2009-10-19 22:58:59 +0200
commit322565b28a7e7227cba80b42309abdf9da0f8ce4 (patch)
tree4d9328d82d79120ea771775e6e90bb7fc1edab53 /docs/man
parentChange the default algorithm for htpasswd to MD5 on all platforms. Crypt (diff)
downloadapache2-322565b28a7e7227cba80b42309abdf9da0f8ce4.tar.xz
apache2-322565b28a7e7227cba80b42309abdf9da0f8ce4.zip
update transformations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@826808 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/man')
-rw-r--r--docs/man/htpasswd.112
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/man/htpasswd.1 b/docs/man/htpasswd.1
index bbb298cb96..17fc3c6943 100644
--- a/docs/man/htpasswd.1
+++ b/docs/man/htpasswd.1
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "HTPASSWD" 1 "2009-03-27" "Apache HTTP Server" "htpasswd"
+.TH "HTPASSWD" 1 "2009-10-19" "Apache HTTP Server" "htpasswd"
.SH NAME
htpasswd \- Manage user files for basic authentication
@@ -68,10 +68,10 @@ Create the \fIpasswdfile\fR\&. If \fIpasswdfile\fR already exists, it is rewritt
Display the results on standard output rather than updating a file\&. This is useful for generating password records acceptable to Apache for inclusion in non-text data stores\&. This option changes the syntax of the command line, since the \fIpasswdfile\fR argument (usually the first one) is omitted\&. It cannot be combined with the -c option\&.
.TP
-m
-Use MD5 encryption for passwords\&. On Windows and Netware, this is the default\&.
+Use MD5 encryption for passwords\&. This is the default\&.
.TP
-d
-Use crypt() encryption for passwords\&. The default on all platforms but Windows and Netware\&. Though possibly supported by htpasswd on all platforms, it is not supported by the httpd server on Windows and Netware\&.
+Use crypt() encryption for passwords\&. This is not supported by the httpd server on Windows and Netware\&.
.TP
-s
Use SHA encryption for passwords\&. Facilitates migration from/to Netscape servers using the LDAP Directory Interchange Format (ldif)\&.
@@ -105,7 +105,7 @@ htpasswd returns a zero status ("true") if the username and password have been s
.fi
.PP
-Adds or modifies the password for user jsmith\&. The user is prompted for the password\&. If executed on a Windows system, the password will be encrypted using the modified Apache MD5 algorithm; otherwise, the system's crypt() routine will be used\&. If the file does not exist, htpasswd will do nothing except return an error\&.
+Adds or modifies the password for user jsmith\&. The user is prompted for the password\&. The password will be encrypted using the modified Apache MD5 algorithm\&. If the file does not exist, htpasswd will do nothing except return an error\&.
.nf
@@ -118,12 +118,12 @@ Creates a new file and stores a record in it for user jane\&. The user is prompt
.nf
- htpasswd -mb /usr/web/\&.htpasswd-all jones Pwd4Steve
+ htpasswd -db /usr/web/\&.htpasswd-all jones Pwd4Steve
.fi
.PP
-Encrypts the password from the command line (Pwd4Steve) using the MD5 algorithm, and stores it in the specified file\&.
+Encrypts the password from the command line (Pwd4Steve) using the crypt() algorithm, and stores it in the specified file\&.
.SH "SECURITY CONSIDERATIONS"