From 19db58430de71ba65d7477d19beb7aeefe2ee325 Mon Sep 17 00:00:00 2001 From: Daniel Gruno Date: Thu, 10 May 2012 19:46:33 +0000 Subject: [PATCH] backport changes from trunk (r1336850) and rebuild git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1336857 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/event.xml.meta | 2 +- docs/manual/mod/mod_auth_form.html.en | 2 +- docs/manual/mod/mod_authn_file.html.en | 6 +++--- docs/manual/mod/mod_authn_file.xml | 6 +++--- docs/manual/mod/mod_authn_file.xml.fr | 2 +- docs/manual/mod/mod_authn_file.xml.ja | 2 +- docs/manual/mod/mod_authn_file.xml.ko | 2 +- docs/manual/mod/mod_authn_file.xml.meta | 2 +- docs/manual/mod/mod_cern_meta.html.en | 5 +++-- docs/manual/mod/mod_cern_meta.xml.ko | 2 +- docs/manual/mod/mod_proxy_balancer.xml.ja | 2 +- 11 files changed, 17 insertions(+), 16 deletions(-) diff --git a/docs/manual/mod/event.xml.meta b/docs/manual/mod/event.xml.meta index 58ce5cc073..7b7fc287cf 100644 --- a/docs/manual/mod/event.xml.meta +++ b/docs/manual/mod/event.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_auth_form.html.en b/docs/manual/mod/mod_auth_form.html.en index 46bbdf2b58..d885b9f8a4 100644 --- a/docs/manual/mod/mod_auth_form.html.en +++ b/docs/manual/mod/mod_auth_form.html.en @@ -307,7 +307,7 @@ SessionCryptoPassphrase secret

CGI example

         AuthFormProvider file
-        ErrorDocument 401 /cgi-bin/login.cgi
+        ErrorDocument 401 /cgi-bin/login.cgi
         ...
diff --git a/docs/manual/mod/mod_authn_file.html.en b/docs/manual/mod/mod_authn_file.html.en index 6133cc4693..404db1348d 100644 --- a/docs/manual/mod/mod_authn_file.html.en +++ b/docs/manual/mod/mod_authn_file.html.en @@ -87,11 +87,11 @@ passwords for authentication use the first occurrence to verify the password.

The encrypted password format depends on which authentication - frontend (e.g. mod_authn_basic or - mod_authn_digest) is being used. See Password Formats for + frontend (e.g. mod_auth_basic or + mod_auth_digest) is being used. See Password Formats for more information.

-

For mod_authn_basic, use the utility htpasswd +

For mod_auth_basic, use the utility htpasswd which is installed as part of the binary distribution, or which can be found in src/support. See the man page for more details. diff --git a/docs/manual/mod/mod_authn_file.xml b/docs/manual/mod/mod_authn_file.xml index dd530946ff..be76949882 100644 --- a/docs/manual/mod/mod_authn_file.xml +++ b/docs/manual/mod/mod_authn_file.xml @@ -73,12 +73,12 @@ passwords for authentication use the first occurrence to verify the password.

The encrypted password format depends on which authentication - frontend (e.g. mod_authn_basic or - mod_authn_digest) is being used. See mod_auth_basic or + mod_auth_digest) is being used. See Password Formats for more information.

-

For mod_authn_basic, use the utility htpasswd +

For mod_auth_basic, use the utility htpasswd which is installed as part of the binary distribution, or which can be found in src/support. See the man page for more details. diff --git a/docs/manual/mod/mod_authn_file.xml.fr b/docs/manual/mod/mod_authn_file.xml.fr index c02eab0567..275a781865 100644 --- a/docs/manual/mod/mod_authn_file.xml.fr +++ b/docs/manual/mod/mod_authn_file.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_authn_file.xml.ja b/docs/manual/mod/mod_authn_file.xml.ja index bcf8af726a..3d603f3e64 100644 --- a/docs/manual/mod/mod_authn_file.xml.ja +++ b/docs/manual/mod/mod_authn_file.xml.ja @@ -1,7 +1,7 @@ - + + + +