diff options
author | Stefan Fritsch <sf@apache.org> | 2009-10-19 22:58:59 +0200 |
---|---|---|
committer | Stefan Fritsch <sf@apache.org> | 2009-10-19 22:58:59 +0200 |
commit | 322565b28a7e7227cba80b42309abdf9da0f8ce4 (patch) | |
tree | 4d9328d82d79120ea771775e6e90bb7fc1edab53 /docs | |
parent | Change the default algorithm for htpasswd to MD5 on all platforms. Crypt (diff) | |
download | apache2-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')
-rw-r--r-- | docs/man/htpasswd.1 | 12 | ||||
-rw-r--r-- | docs/manual/programs/htpasswd.html.en | 22 | ||||
-rw-r--r-- | docs/manual/programs/htpasswd.html.tr.utf8 | 1 | ||||
-rw-r--r-- | docs/manual/programs/htpasswd.xml.ko | 2 | ||||
-rw-r--r-- | docs/manual/programs/htpasswd.xml.meta | 2 | ||||
-rw-r--r-- | 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.</li></ul></div> one) is omitted. It cannot be combined with the <code>-c</code> option.</dd> <dt><code>-m</code></dt> - <dd>Use MD5 encryption for passwords. On Windows and Netware, this is - the default.</dd> + <dd>Use MD5 encryption for passwords. This is the default.</dd> <dt><code>-d</code></dt> - <dd>Use <code>crypt()</code> encryption for passwords. The default on all - platforms but Windows and Netware. Though possibly supported by - <code>htpasswd</code> on all platforms, it is not supported by the - <code class="program"><a href="../programs/httpd.html">httpd</a></code> server on Windows and Netware.</dd> + <dd>Use <code>crypt()</code> encryption for passwords. This is not + supported by the <code class="program"><a href="../programs/httpd.html">httpd</a></code> server on Windows and + Netware.</dd> <dt><code>-s</code></dt> <dd>Use SHA encryption for passwords. Facilitates migration from/to Netscape @@ -163,10 +161,9 @@ distribution.</li></ul></div> </code></p></div> <p>Adds or modifies the password for user <code>jsmith</code>. 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 <code>crypt()</code> routine will be used. If the file does not - exist, <code>htpasswd</code> will do nothing except return an error.</p> + is prompted for the password. The password will be encrypted using the + modified Apache MD5 algorithm. If the file does not exist, + <code>htpasswd</code> will do nothing except return an error.</p> <div class="example"><p><code> htpasswd -c /home/doe/public_html/.htpasswd jane @@ -178,11 +175,12 @@ distribution.</li></ul></div> will display a message and return an error status.</p> <div class="example"><p><code> - htpasswd -mb /usr/web/.htpasswd-all jones Pwd4Steve + htpasswd -db /usr/web/.htpasswd-all jones Pwd4Steve </code></p></div> <p>Encrypts the password from the command line (<code>Pwd4Steve</code>) - using the MD5 algorithm, and stores it in the specified file.</p> + using the <code>crypt()</code> algorithm, and stores it in the specified + file.</p> </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> <div class="section"> <h2><a name="security" id="security">Security Considerations</a></h2> 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 @@ <a href="../ko/programs/htpasswd.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="../tr/programs/htpasswd.html" title="Türkçe"> tr </a></p> </div> +<div class="outofdate">Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.</div> <p><code><strong>htpasswd</strong></code>, 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 @@ <?xml version='1.0' encoding='EUC-KR' ?> <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?> -<!-- English Revision: 105989:758944 (outdated) --> +<!-- English Revision: 105989:826805 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/programs/htpasswd.xml.meta b/docs/manual/programs/htpasswd.xml.meta index 481a3b5b75..169f3bb367 100644 --- a/docs/manual/programs/htpasswd.xml.meta +++ b/docs/manual/programs/htpasswd.xml.meta @@ -9,6 +9,6 @@ <variants> <variant>en</variant> <variant outdated="yes">ko</variant> - <variant>tr</variant> + <variant outdated="yes">tr</variant> </variants> </metafile> diff --git a/docs/manual/programs/htpasswd.xml.tr b/docs/manual/programs/htpasswd.xml.tr index da9d24b735..4e6da808b5 100644 --- a/docs/manual/programs/htpasswd.xml.tr +++ b/docs/manual/programs/htpasswd.xml.tr @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8' ?> <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?> -<!-- English Revision: 758944 --> +<!-- English Revision: 758944:826805 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.org> Reviewed by: Orhan Berent <berent belgeler.org> |