From: Stefan Fritsch Date: Sat, 6 Jul 2013 21:58:04 +0000 (+0000) Subject: xforms X-Git-Tag: 2.2.26~58 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66a8e93b1f78a0e20a6f0eeeb739403440e80d31;p=thirdparty%2Fapache%2Fhttpd.git xforms git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1500330 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/man/htpasswd.1 b/docs/man/htpasswd.1 index cb8738aa764..cc4250843f4 100644 --- a/docs/man/htpasswd.1 +++ b/docs/man/htpasswd.1 @@ -19,7 +19,7 @@ .el .ne 3 .IP "\\$1" \\$2 .. -.TH "HTPASSWD" 1 "2011-06-19" "Apache HTTP Server" "htpasswd" +.TH "HTPASSWD" 1 "2013-07-06" "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\&. This is the default\&. +Use MD5 encryption for passwords\&. This is the default (since version 2\&.2\&.18)\&. .TP -d -Use crypt() encryption for passwords\&. This is not supported by the httpd server on Windows and Netware and TPF\&. +Use crypt() encryption for passwords\&. This is not supported by the httpd server on Windows and Netware and TPF\&. This algorithm limits the password length to 8 characters\&. This algorithm is \fBinsecure\fR by today's standards\&. It used to be the default algorithm until version 2\&.2\&.17\&. .TP -s Use SHA encryption for passwords\&. Facilitates migration from/to Netscape servers using the LDAP Directory Interchange Format (ldif)\&. diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja index ae91484d87c..9f0ea311228 100644 --- a/docs/manual/mod/mod_proxy.xml.ja +++ b/docs/manual/mod/mod_proxy.xml.ja @@ -1,7 +1,7 @@ - + + +