From 322565b28a7e7227cba80b42309abdf9da0f8ce4 Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Mon, 19 Oct 2009 20:58:59 +0000 Subject: [PATCH] update transformations git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@826808 13f79535-47bb-0310-9956-ffa450edef68 --- docs/man/htpasswd.1 | 12 ++++++------ docs/manual/programs/htpasswd.html.en | 22 ++++++++++------------ docs/manual/programs/htpasswd.html.tr.utf8 | 1 + docs/manual/programs/htpasswd.xml.ko | 2 +- docs/manual/programs/htpasswd.xml.meta | 2 +- docs/manual/programs/htpasswd.xml.tr | 2 +- 6 files changed, 20 insertions(+), 21 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" diff --git a/docs/manual/programs/htpasswd.html.en b/docs/manual/programs/htpasswd.html.en index 7728ef2750..808a8217b8 100644 --- a/docs/manual/programs/htpasswd.html.en +++ b/docs/manual/programs/htpasswd.html.en @@ -105,14 +105,12 @@ distribution. one) is omitted. It cannot be combined with the -c option.
-m
-
Use MD5 encryption for passwords. On Windows and Netware, this is - the default.
+
Use MD5 encryption for passwords. This is the default.
-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.
-s
Use SHA encryption for passwords. Facilitates migration from/to Netscape @@ -163,10 +161,9 @@ distribution.

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.

+ 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.

htpasswd -c /home/doe/public_html/.htpasswd jane @@ -178,11 +175,12 @@ distribution.

will display a message and return an error status.

- htpasswd -mb /usr/web/.htpasswd-all jones Pwd4Steve + htpasswd -db /usr/web/.htpasswd-all jones Pwd4Steve

Encrypts the password from the command line (Pwd4Steve) - using the MD5 algorithm, and stores it in the specified file.

+ using the crypt() algorithm, and stores it in the specified + file.

top

Security Considerations

diff --git a/docs/manual/programs/htpasswd.html.tr.utf8 b/docs/manual/programs/htpasswd.html.tr.utf8 index 4ff09ab57c..ac9de23afc 100644 --- a/docs/manual/programs/htpasswd.html.tr.utf8 +++ b/docs/manual/programs/htpasswd.html.tr.utf8 @@ -22,6 +22,7 @@  ko  |  tr 

+
Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.

htpasswd, HTTP kullanıcılarının temel kimlik doğrulaması için kullanıcı isimlerinin ve parolalarının diff --git a/docs/manual/programs/htpasswd.xml.ko b/docs/manual/programs/htpasswd.xml.ko index 3d2bed5066..3f9d4c1ce2 100644 --- a/docs/manual/programs/htpasswd.xml.ko +++ b/docs/manual/programs/htpasswd.xml.ko @@ -1,7 +1,7 @@ - + +