summaryrefslogtreecommitdiff
path: root/docs/man/htpasswd.1
diff options
context:
space:
mode:
Diffstat (limited to 'docs/man/htpasswd.1')
-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 40858a0e..cb8738aa 100644
--- a/docs/man/htpasswd.1
+++ b/docs/man/htpasswd.1
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "HTPASSWD" 1 "2007-04-24" "Apache HTTP Server" "htpasswd"
+.TH "HTPASSWD" 1 "2011-06-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, Netware and TPF, 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, Netware and TPF\&. Though possibly supported by htpasswd on all platforms, it is not supported by the httpd server on Windows, Netware and TPF\&.
+Use crypt() encryption for passwords\&. This is not supported by the httpd server on Windows and Netware and TPF\&.
.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"