From: Rainer Jung Date: Wed, 12 Dec 2012 14:15:38 +0000 (+0000) Subject: Docs xforms. X-Git-Tag: 2.5.0-alpha~6020 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea38445e20df16a4b4e6cb7167e58a876d29133b;p=apache Docs xforms. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1420690 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/man/dbmmanage.1 b/docs/man/dbmmanage.1 index 88e4a7057e..a0f9f78001 100644 --- a/docs/man/dbmmanage.1 +++ b/docs/man/dbmmanage.1 @@ -19,7 +19,7 @@ .el .ne 3 .IP "\\$1" \\$2 .. -.TH "DBMMANAGE" 1 "2004-12-10" "Apache HTTP Server" "dbmmanage" +.TH "DBMMANAGE" 1 "2012-12-12" "Apache HTTP Server" "dbmmanage" .SH NAME dbmmanage \- Manage user authentication files in DBM format @@ -41,6 +41,9 @@ dbmmanage \- Manage user authentication files in DBM format .PP dbmmanage is used to create and update the DBM format files used to store usernames and password for basic authentication of HTTP users via mod_authn_dbm\&. Resources available from the Apache HTTP server can be restricted to just the users listed in the files created by dbmmanage\&. This program can only be used when the usernames are stored in a DBM file\&. To use a flat-file database see htpasswd\&. +.PP +Another tool to maintain a DBM password database is htdbm\&. + .PP This manual page only lists the command line arguments\&. For details of the directives necessary to configure user authentication in httpd see the httpd manual, which is part of the Apache distribution or can be found at http://httpd\&.apache\&.org/\&. diff --git a/docs/man/htdbm.1 b/docs/man/htdbm.1 index 010755b45b..61a691880c 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-03-27" "Apache HTTP Server" "htdbm" +.TH "HTDBM" 1 "2012-12-12" "Apache HTTP Server" "htdbm" .SH NAME htdbm \- Manipulate DBM password databases @@ -27,25 +27,25 @@ htdbm \- Manipulate DBM password databases .SH "SYNOPSIS" .PP -\fBhtdbm\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] [ -\fBt\fR ] [ -\fBv\fR ] [ -\fBx\fR ] \fIfilename\fR \fIusername\fR +\fBhtdbm\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBi\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIfilename\fR \fIusername\fR .PP -\fBhtdbm\fR -\fBb\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIfilename\fR \fIusername\fR \fIpassword\fR +\fBhtdbm\fR -\fBb\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIfilename\fR \fIusername\fR \fIpassword\fR .PP -\fBhtdbm\fR -\fBn\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIusername\fR +\fBhtdbm\fR -\fBn\fR [ -\fBi\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIusername\fR .PP -\fBhtdbm\fR -\fBnb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIusername\fR \fIpassword\fR +\fBhtdbm\fR -\fBnb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIusername\fR \fIpassword\fR .PP -\fBhtdbm\fR -\fBv\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIfilename\fR \fIusername\fR +\fBhtdbm\fR -\fBv\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBi\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIfilename\fR \fIusername\fR .PP -\fBhtdbm\fR -\fBvb\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIfilename\fR \fIusername\fR \fIpassword\fR +\fBhtdbm\fR -\fBvb\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIfilename\fR \fIusername\fR \fIpassword\fR .PP -\fBhtdbm\fR -\fBx\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] \fIfilename\fR \fIusername\fR +\fBhtdbm\fR -\fBx\fR [ -\fBT\fR\fIDBTYPE\fR ] \fIfilename\fR \fIusername\fR .PP \fBhtdbm\fR -\fBl\fR [ -\fBT\fR\fIDBTYPE\fR ] @@ -62,7 +62,10 @@ htdbm is used to manipulate the DBM format files used to store usernames and pas .TP -b -Use batch mode; \fIi\&.e\&.\fR, get the password from the command line rather than prompting for it\&. This option should be used with extreme care, since \fBthe password is clearly visible\fR on the command line\&. +Use batch mode; \fIi\&.e\&.\fR, get the password from the command line rather than prompting for it\&. This option should be used with extreme care, since \fBthe password is clearly visible\fR on the command line\&. For script use see the -i option\&. +.TP +-i +Read the password from stdin without verification (for script usage)\&. .TP -c Create the \fIpasswdfile\fR\&. If \fIpasswdfile\fR already exists, it is rewritten and truncated\&. This option cannot be combined with the -n option\&. @@ -73,11 +76,17 @@ Display the results on standard output rather than updating a database\&. This o -m Use MD5 encryption for passwords\&. On Windows and Netware, this is the default\&. .TP +-B +Use bcrypt encryption for passwords\&. This is currently considered to be very secure\&. +.TP +-C +This flag is only allowed in combination with -B (bcrypt encryption)\&. It sets the computing time used for the bcrypt algorithm (higher is more secure but slower, default: 5, valid: 4 to 31)\&. +.TP -d -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\&. +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\&. This algorithm is \fBinsecure\fR by today's standards\&. .TP -s -Use SHA encryption for passwords\&. Facilitates migration from/to Netscape servers using the LDAP Directory Interchange Format (ldif)\&. +Use SHA encryption for passwords\&. Facilitates migration from/to Netscape servers using the LDAP Directory Interchange Format (ldif)\&. This algorithm is \fBinsecure\fR by today's standards\&. .TP -p Use plaintext passwords\&. Though htdbm will support creation on all platforms, the httpd daemon will only accept plain text passwords on Windows and Netware\&. @@ -85,15 +94,15 @@ Use plaintext passwords\&. Though htdbm will support creation on all platforms, -l Print each of the usernames and comments from the database on stdout\&. .TP --t -Interpret the final parameter as a comment\&. When this option is specified, an additional string can be appended to the command line; this string will be stored in the "Comment" field of the database, associated with the specified username\&. -.TP -v Verify the username and password\&. The program will print a message indicating whether the supplied password is valid\&. If the password is invalid, the program exits with error code 3\&. .TP -x Delete user\&. If the username exists in the specified DBM file, it will be deleted\&. .TP +-t +Interpret the final parameter as a comment\&. When this option is specified, an additional string can be appended to the command line; this string will be stored in the "Comment" field of the database, associated with the specified username\&. +.TP \fIfilename\fR The filename of the DBM format file\&. Usually without the extension \&.db, \&.pag, or \&.dir\&. If -c is given, the DBM file is created if it does not already exist, or updated if it does exist\&. .TP @@ -156,6 +165,15 @@ Web password files such as those managed by htdbm should \fInot\fR be within the .PP The use of the -b option is discouraged, since when it is used the unencrypted password appears on the command line\&. +.PP +When using the crypt() algorithm, note that only the first 8 characters of the password are used to form the password\&. If the supplied password is longer, the extra characters will be silently discarded\&. + +.PP +The SHA encryption format does not use salting: for a given password, there is only one encrypted representation\&. The crypt() and MD5 formats permute the representation by prepending a random salt string, to make dictionary attacks against the passwords more difficult\&. + +.PP +The SHA and crypt() formats are insecure by today's standards\&. + .SH "RESTRICTIONS" .PP diff --git a/docs/man/htpasswd.1 b/docs/man/htpasswd.1 index c4724a910a..07fc3a50c4 100644 --- a/docs/man/htpasswd.1 +++ b/docs/man/htpasswd.1 @@ -19,7 +19,7 @@ .el .ne 3 .IP "\\$1" \\$2 .. -.TH "HTPASSWD" 1 "2012-06-22" "Apache HTTP Server" "htpasswd" +.TH "HTPASSWD" 1 "2012-12-12" "Apache HTTP Server" "htpasswd" .SH NAME htpasswd \- Manage user files for basic authentication @@ -27,16 +27,16 @@ htpasswd \- Manage user files for basic authentication .SH "SYNOPSIS" .PP -\fBhtpasswd\fR [ -\fBc\fR ] [ -\fBm\fR ] [ -\fBD\fR ] \fIpasswdfile\fR \fIusername\fR +\fBhtpasswd\fR [ -\fBc\fR ] [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBD\fR ] \fIpasswdfile\fR \fIusername\fR .PP -\fBhtpasswd\fR -\fBb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] [ -\fBD\fR ] \fIpasswdfile\fR \fIusername\fR \fIpassword\fR +\fBhtpasswd\fR -\fBb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBD\fR ] \fIpasswdfile\fR \fIusername\fR \fIpassword\fR .PP -\fBhtpasswd\fR -\fBn\fR [ -\fBm\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] \fIusername\fR +\fBhtpasswd\fR -\fBn\fR [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] \fIusername\fR .PP -\fBhtpasswd\fR -\fBnb\fR [ -\fBm\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] \fIusername\fR \fIpassword\fR +\fBhtpasswd\fR -\fBnb\fR [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] \fIusername\fR \fIpassword\fR .SH "SUMMARY" @@ -45,10 +45,10 @@ htpasswd \- Manage user files for basic authentication htpasswd is used to create and update the flat-files used to store usernames and password for basic authentication of HTTP users\&. If htpasswd cannot access a file, such as not being able to write to the output file or not being able to read the file in order to update it, it returns an error status and makes no changes\&. .PP -Resources available from the Apache HTTP server can be restricted to just the users listed in the files created by htpasswd\&. This program can only manage usernames and passwords stored in a flat-file\&. It can encrypt and display password information for use in other types of data stores, though\&. To use a DBM database see dbmmanage\&. +Resources available from the Apache HTTP server can be restricted to just the users listed in the files created by htpasswd\&. This program can only manage usernames and passwords stored in a flat-file\&. It can encrypt and display password information for use in other types of data stores, though\&. To use a DBM database see dbmmanage or htdbm\&. .PP -htpasswd encrypts passwords using either a version of MD5 modified for Apache, or the system's crypt() routine\&. Files managed by htpasswd may contain both types of passwords; some user records may have MD5-encrypted passwords while others in the same file may have passwords encrypted with crypt()\&. +htpasswd encrypts passwords using either bcrypt, a version of MD5 modified for Apache, SHA1, or the system's crypt() routine\&. Files managed by htpasswd may contain a mixture of different encoding types of passwords; some user records may have bcrypt or MD5-encrypted passwords while others in the same file may have passwords encrypted with crypt()\&. .PP This manual page only lists the command line arguments\&. For details of the directives necessary to configure user authentication in httpd see the Apache manual, which is part of the Apache distribution or can be found at http://httpd\&.apache\&.org/\&. @@ -59,7 +59,10 @@ This manual page only lists the command line arguments\&. For details of the dir .TP -b -Use batch mode; \fIi\&.e\&.\fR, get the password from the command line rather than prompting for it\&. This option should be used with extreme care, since \fBthe password is clearly visible\fR on the command line\&. +Use batch mode; \fIi\&.e\&.\fR, get the password from the command line rather than prompting for it\&. This option should be used with extreme care, since \fBthe password is clearly visible\fR on the command line\&. For script use see the -i option\&. +.TP +-i +Read the password from stdin without verification (for script usage)\&. .TP -c Create the \fIpasswdfile\fR\&. If \fIpasswdfile\fR already exists, it is rewritten and truncated\&. This option cannot be combined with the -n option\&. @@ -70,6 +73,12 @@ Display the results on standard output rather than updating a file\&. This is us -m Use MD5 encryption for passwords\&. This is the default\&. .TP +-B +Use bcrypt encryption for passwords\&. This is currently considered to be very secure\&. +.TP +-C +This flag is only allowed in combination with -B (bcrypt encryption)\&. It sets the computing time used for the bcrypt algorithm (higher is more secure but slower, default: 5, valid: 4 to 31)\&. +.TP -d Use crypt() encryption for passwords\&. This is not supported by the httpd server on Windows and Netware\&. This algorithm limits the password length to 8 characters\&. This algorithm is \fBinsecure\fR by today's standards\&. .TP diff --git a/docs/manual/convenience.map b/docs/manual/convenience.map index 3e937be56e..deca7e82c4 100644 --- a/docs/manual/convenience.map +++ b/docs/manual/convenience.map @@ -32,6 +32,7 @@ aliasmatch mod/mod_alias.html#aliasmatch allow mod/mod_access_compat.html#allow allowconnect mod/mod_proxy_connect.html#allowconnect allowencodedslashes mod/core.html#allowencodedslashes +allowhandlers mod/mod_allowhandlers.html#allowhandlers allowmethods mod/mod_allowmethods.html#allowmethods allowoverride mod/core.html#allowoverride allowoverridelist mod/core.html#allowoverridelist @@ -108,7 +109,6 @@ authzdbmtype mod/mod_authz_dbm.html#authzdbmtype authzprovideralias mod/mod_authz_core.html#authzprovideralias authzsendforbiddenonfailure mod/mod_authz_core.html#authzsendforbiddenonfailure balancergrowth mod/mod_proxy.html#balancergrowth -balancerinherit mod/mod_proxy.html#balancerinherit balancermember mod/mod_proxy.html#balancermember balancerpersist mod/mod_proxy.html#balancerpersist browsermatch mod/mod_setenvif.html#browsermatch @@ -308,6 +308,7 @@ location mod/core.html#location locationmatch mod/core.html#locationmatch logformat mod/mod_log_config.html#logformat loglevel mod/core.html#loglevel +logleveloverride mod/core.html#logleveloverride logmessage mod/mod_log_debug.html#logmessage luaauthzprovider mod/mod_lua.html#luaauthzprovider luacodecache mod/mod_lua.html#luacodecache @@ -409,6 +410,7 @@ proxyiobuffersize mod/mod_proxy.html#proxyiobuffersize proxymatch mod/mod_proxy.html#proxymatch proxymaxforwards mod/mod_proxy.html#proxymaxforwards proxypass mod/mod_proxy.html#proxypass +proxypassinherit mod/mod_proxy.html#proxypassinherit proxypassinterpolateenv mod/mod_proxy.html#proxypassinterpolateenv proxypassmatch mod/mod_proxy.html#proxypassmatch proxypassreverse mod/mod_proxy.html#proxypassreverse @@ -433,6 +435,7 @@ redirectmatch mod/mod_alias.html#redirectmatch redirectpermanent mod/mod_alias.html#redirectpermanent redirecttemp mod/mod_alias.html#redirecttemp reflectorheader mod/mod_reflector.html#reflectorheader +registerhttpmethod mod/core.html#registerhttpmethod remoteipheader mod/mod_remoteip.html#remoteipheader remoteipinternalproxy mod/mod_remoteip.html#remoteipinternalproxy remoteipinternalproxylist mod/mod_remoteip.html#remoteipinternalproxylist @@ -611,6 +614,7 @@ virtualdocumentrootip mod/mod_vhost_alias.html#virtualdocumentrootip virtualhost mod/core.html#virtualhost virtualscriptalias mod/mod_vhost_alias.html#virtualscriptalias virtualscriptaliasip mod/mod_vhost_alias.html#virtualscriptaliasip +warning mod/core.html#warning watchdoginterval mod/mod_watchdog.html#watchdoginterval xbithack mod/mod_include.html#xbithack xml2encalias mod/mod_xml2enc.html#xml2encalias diff --git a/docs/manual/howto/auth.html.en b/docs/manual/howto/auth.html.en index 8d2e0c10cc..6134a8380f 100644 --- a/docs/manual/howto/auth.html.en +++ b/docs/manual/howto/auth.html.en @@ -266,7 +266,7 @@ Require user rbowen file to authenticate the user on each request. Apache also has the ability to store user information in fast database files. The mod_authn_dbm module provides the AuthDBMUserFile directive. These - files can be created and manipulated with the dbmmanage program. Many + files can be created and manipulated with the dbmmanage and htdbm programs. Many other types of authentication options are available from third party modules in the Apache Modules Database.

@@ -377,7 +377,7 @@ Require group GroupName you can choose dbm or dbd as your storage format.

-

To select a dbd file rather than a text file, for example:

+

To select a dbm file rather than a text file, for example:

 <Directory /www/docs/private>
diff --git a/docs/manual/howto/auth.html.fr b/docs/manual/howto/auth.html.fr
index 67bb69d009..085ad89ea7 100644
--- a/docs/manual/howto/auth.html.fr
+++ b/docs/manual/howto/auth.html.fr
@@ -27,6 +27,8 @@
  ko  |
  tr 

 
+
Cette traduction peut être périmée. Vérifiez la version
+            anglaise pour les changements récents.

 
     
L'authentification est un processus qui vous permet de vérifier
     qu'une personne est bien celle qu'elle prétend être. L'autorisation
diff --git a/docs/manual/howto/auth.xml.fr b/docs/manual/howto/auth.xml.fr
index 1352e20edb..e66774b904 100644
--- a/docs/manual/howto/auth.xml.fr
+++ b/docs/manual/howto/auth.xml.fr
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 
 
diff --git a/docs/manual/howto/auth.xml.ja b/docs/manual/howto/auth.xml.ja
index e0290ab7a2..7b68853733 100644
--- a/docs/manual/howto/auth.xml.ja
+++ b/docs/manual/howto/auth.xml.ja
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 
+
 
 
+
 
+
 
 
 
diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index 2c15e2aed4..9ebd21ea19 100644
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -86,7 +86,6 @@
 
Directives

 

-
top

-
BalancerInherit Directive

-
-
-
-
-
-
-
-
-
Description:Inherit Balancers from the main server
Syntax:BalancerInherit On|Off
Default:BalancerInherit Off
Context:server config, virtual host
Status:Extension
Module:mod_proxy
Compatibility:BalancerInherit is only available in Apache HTTP Server 2.5.0
-        and later.

-        
This directive will cause the current server/vhost to "inherit" Balancers
-            defined in the main server. This can cause issues and inconsistent
-            behavior if using the Balancer Manager and so is disabled
-            by default.

-    
 

 
top

 
BalancerMember Directive

@@ -1399,6 +1381,24 @@ ProxyPass / balancer://hotcluster/
     [P] flag.

 
 
+

+
top

+
ProxyPassInherit Directive

+
+
+
+
+
+
+
+
+
Description:Inherit ProxyPass Balancers/Workers from the main server
Syntax:ProxyPassInherit On|Off
Default:ProxyPassInherit On
Context:server config, virtual host
Status:Extension
Module:mod_proxy
Compatibility:ProxyPassInherit is only available in Apache HTTP Server 2.5.0
+        and later.

+        
This directive will cause the current server/vhost to "inherit" ProxyPass
+            Balancers and Workers defined in the main server. This can cause issues and
+            inconsistent behavior if using the Balancer Manager and so should be disabled
+            if using that feature.

+    
 

 
top

 
ProxyPassInterpolateEnv Directive

diff --git a/docs/manual/mod/mod_proxy.html.fr b/docs/manual/mod/mod_proxy.html.fr
index db34d6a96b..5024b39fbd 100644
--- a/docs/manual/mod/mod_proxy.html.fr
+++ b/docs/manual/mod/mod_proxy.html.fr
@@ -28,6 +28,8 @@
  fr  |
  ja 

 

+
Cette traduction peut être périmée. Vérifiez la version
+            anglaise pour les changements récents.

 
@@ -93,7 +95,6 @@
 
Directives

 

-
top

-
BalancerInherit Directive

-
Description:Serveur mandataire/passerelle multi-protocole

 
Statut:Extension

 
Identificateur de Module:proxy_module

-
-
-
-
-
-
-
-
Description:Héritage des répartiteurs de charge du serveur
-    principal
Syntaxe:BalancerInherit On|Off
Défaut:BalancerInherit Off
Contexte:configuration du serveur, serveur virtuel
Statut:Extension
Module:mod_proxy
Compatibilité:BalancerInherit n'est disponible qu'à partir de la
-    version 2.5.0 du serveur HTTP Apache.

-        
Cette directive permet au serveur virtuel courant d'"hériter"
-	des répartiteurs de charge définis au niveau du serveur
-	principal. Des problèmes et des comportements inattendus sont
-	cependant à prévoir si on utilise le gestionnaire de répartition
-	de charge, et cette directive est donc désactivée par défaut.

-    
 
 
top

 
BalancerMember Directive

@@ -1573,6 +1555,20 @@ ProxyPass / balancer://hotcluster/
 
 

 
top

+
ProxyPassInherit Directive

+
+
+
+
+
+
+
+
+
Description:Inherit ProxyPass Balancers/Workers from the main server
Syntaxe:ProxyPassInherit On|Off
Défaut:ProxyPassInherit On
Contexte:configuration du serveur, serveur virtuel
Statut:Extension
Module:mod_proxy
Compatibilité:ProxyPassInherit is only available in Apache HTTP Server 2.5.0
+        and later.
La documentation de cette directive
+	n'a pas encore t traduite. Veuillez vous reporter  la version
+	en langue anglaise.

+
top

 
ProxyPassInterpolateEnv Directive

 

 
Description:Active l'interpolation des variables d'environnement dans
diff --git a/docs/manual/mod/mod_proxy.html.ja.utf8 b/docs/manual/mod/mod_proxy.html.ja.utf8
index 22d82ea4ed..cbf96ec3a2 100644
--- a/docs/manual/mod/mod_proxy.html.ja.utf8
+++ b/docs/manual/mod/mod_proxy.html.ja.utf8
@@ -71,7 +71,6 @@
 
ディレクティブ

 

 
top

-
BalancerInherit ディレクティブ

-
-
-
-
-
-
-
-
-
説明:Inherit Balancers from the main server
構文:BalancerInherit On|Off
デフォルト:BalancerInherit Off
コンテキスト:サーバ設定ファイル, バーチャルホスト
ステータス:Extension
モジュール:mod_proxy
互換性:BalancerInherit is only available in Apache HTTP Server 2.5.0
-        and later.
このディレクティブの解説文書は
-            まだ翻訳されていません。英語版をご覧ください。
-            

-
top

 
BalancerMember ディレクティブ

 
@@ -915,6 +901,20 @@
 
 
top

+
ProxyPassInherit ディレクティブ

+

 
説明:Add a member to a load balancing group

 

+
+
+
+
+
+
+
+
説明:Inherit ProxyPass Balancers/Workers from the main server
構文:ProxyPassInherit On|Off
デフォルト:ProxyPassInherit On
コンテキスト:サーバ設定ファイル, バーチャルホスト
ステータス:Extension
モジュール:mod_proxy
互換性:ProxyPassInherit is only available in Apache HTTP Server 2.5.0
+        and later.
このディレクティブの解説文書は
+            まだ翻訳されていません。英語版をご覧ください。
+            

+
top

 
ProxyPassInterpolateEnv ディレクティブ

 
diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr
index 06b4ce27f4..1ae65a224d 100644
--- a/docs/manual/mod/mod_proxy.xml.fr
+++ b/docs/manual/mod/mod_proxy.xml.fr
@@ -1,7 +1,7 @@
 
-
+
 
diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja
index 85ca6b4a42..ab8aa9e948 100644
--- a/docs/manual/mod/mod_proxy.xml.ja
+++ b/docs/manual/mod/mod_proxy.xml.ja
@@ -1,7 +1,7 @@
 
-
+

 
説明:Enable Environment Variable interpolation in Reverse Proxy configurations