summaryrefslogtreecommitdiffstats
path: root/docs/man
diff options
context:
space:
mode:
authorRuediger Pluem <rpluem@apache.org>2009-03-27 13:44:01 +0100
committerRuediger Pluem <rpluem@apache.org>2009-03-27 13:44:01 +0100
commitd593d89ad6dee02979ed0c5f53246dfd2a0f693b (patch)
treedaf2accb14656bd793f51829f07dc82e7c1637bc /docs/man
parentThe Event MPM is no longer experimental; move it out of that ghetto. (diff)
downloadapache2-d593d89ad6dee02979ed0c5f53246dfd2a0f693b.tar.xz
apache2-d593d89ad6dee02979ed0c5f53246dfd2a0f693b.zip
* Update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@759120 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/man')
-rw-r--r--docs/man/htdbm.110
-rw-r--r--docs/man/htpasswd.110
2 files changed, 10 insertions, 10 deletions
diff --git a/docs/man/htdbm.1 b/docs/man/htdbm.1
index e6647afaae..010755b45b 100644
--- a/docs/man/htdbm.1
+++ b/docs/man/htdbm.1
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "HTDBM" 1 "2009-01-11" "Apache HTTP Server" "htdbm"
+.TH "HTDBM" 1 "2009-03-27" "Apache HTTP Server" "htdbm"
.SH NAME
htdbm \- Manipulate DBM password databases
@@ -71,16 +71,16 @@ Create the \fIpasswdfile\fR\&. If \fIpasswdfile\fR already exists, it is rewritt
Display the results on standard output rather than updating a database\&. 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\&. On Windows and Netware, 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 htdbm on all platforms, it is not supported by the httpd server on Windows, Netware and TPF\&.
+Use crypt() encryption for passwords\&. The default on all platforms but Windows and Netware\&. Though possibly supported by htdbm on all platforms, it 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)\&.
.TP
-p
-Use plaintext passwords\&. Though htdbm will support creation on all platforms, the httpd daemon will only accept plain text passwords on Windows, Netware and TPF\&.
+Use plaintext passwords\&. Though htdbm will support creation on all platforms, the httpd daemon will only accept plain text passwords on Windows and Netware\&.
.TP
-l
Print each of the usernames and comments from the database on stdout\&.
@@ -159,7 +159,7 @@ The use of the -b option is discouraged, since when it is used the unencrypted p
.SH "RESTRICTIONS"
.PP
-On the Windows and MPE platforms, passwords encrypted with htdbm are limited to no more than 255 characters in length\&. Longer passwords will be truncated to 255 characters\&.
+On the Windows platform, passwords encrypted with htdbm are limited to no more than 255 characters in length\&. Longer passwords will be truncated to 255 characters\&.
.PP
The MD5 algorithm used by htdbm is specific to the Apache software; passwords encrypted using it will not be usable with other Web servers\&.
diff --git a/docs/man/htpasswd.1 b/docs/man/htpasswd.1
index f0a7ac476b..bbb298cb96 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-02-08" "Apache HTTP Server" "htpasswd"
+.TH "HTPASSWD" 1 "2009-03-27" "Apache HTTP Server" "htpasswd"
.SH NAME
htpasswd \- Manage user files for basic authentication
@@ -68,16 +68,16 @@ 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\&. On Windows and Netware, 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\&. 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\&.
.TP
-s
Use SHA encryption for passwords\&. Facilitates migration from/to Netscape servers using the LDAP Directory Interchange Format (ldif)\&.
.TP
-p
-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\&.
+Use plaintext passwords\&. Though htpasswd will support creation on all platforms, the httpd daemon will only accept plain text passwords on Windows and Netware\&.
.TP
-D
Delete user\&. If the username exists in the specified htpasswd file, it will be deleted\&.
@@ -145,7 +145,7 @@ The SHA encryption format does not use salting: for a given password, there is o
.SH "RESTRICTIONS"
.PP
-On the Windows and MPE platforms, passwords encrypted with htpasswd are limited to no more than 255 characters in length\&. Longer passwords will be truncated to 255 characters\&.
+On the Windows platform, passwords encrypted with htpasswd are limited to no more than 255 characters in length\&. Longer passwords will be truncated to 255 characters\&.
.PP
The MD5 algorithm used by htpasswd is specific to the Apache software; passwords encrypted using it will not be usable with other Web servers\&.