You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2011/09/05 09:56:29 UTC

svn commit: r1165196 [1/8] - in /httpd/httpd/trunk/docs/manual: ./ mod/ rewrite/

Author: sf
Date: Mon Sep  5 07:56:28 2011
New Revision: 1165196

URL: http://svn.apache.org/viewvc?rev=1165196&view=rev
Log:
update xforms

Modified:
    httpd/httpd/trunk/docs/manual/configuring.html.en
    httpd/httpd/trunk/docs/manual/configuring.html.fr
    httpd/httpd/trunk/docs/manual/configuring.xml.de
    httpd/httpd/trunk/docs/manual/configuring.xml.ja
    httpd/httpd/trunk/docs/manual/configuring.xml.ko
    httpd/httpd/trunk/docs/manual/configuring.xml.tr
    httpd/httpd/trunk/docs/manual/convenience.map
    httpd/httpd/trunk/docs/manual/expr.html.en
    httpd/httpd/trunk/docs/manual/expr.html.fr
    httpd/httpd/trunk/docs/manual/mod/core.html.de
    httpd/httpd/trunk/docs/manual/mod/core.html.es
    httpd/httpd/trunk/docs/manual/mod/core.html.fr
    httpd/httpd/trunk/docs/manual/mod/core.html.ja.utf8
    httpd/httpd/trunk/docs/manual/mod/core.html.tr.utf8
    httpd/httpd/trunk/docs/manual/mod/core.xml.de
    httpd/httpd/trunk/docs/manual/mod/core.xml.ja
    httpd/httpd/trunk/docs/manual/mod/core.xml.tr
    httpd/httpd/trunk/docs/manual/mod/directives.html.de
    httpd/httpd/trunk/docs/manual/mod/directives.html.en
    httpd/httpd/trunk/docs/manual/mod/directives.html.es
    httpd/httpd/trunk/docs/manual/mod/directives.html.ja.utf8
    httpd/httpd/trunk/docs/manual/mod/directives.html.ko.euc-kr
    httpd/httpd/trunk/docs/manual/mod/directives.html.tr.utf8
    httpd/httpd/trunk/docs/manual/mod/directives.html.zh-cn
    httpd/httpd/trunk/docs/manual/mod/mod_authn_dbd.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_proxy_http.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_status.html.fr
    httpd/httpd/trunk/docs/manual/mod/quickreference.html.de
    httpd/httpd/trunk/docs/manual/mod/quickreference.html.en
    httpd/httpd/trunk/docs/manual/mod/quickreference.html.es
    httpd/httpd/trunk/docs/manual/mod/quickreference.html.ja.utf8
    httpd/httpd/trunk/docs/manual/mod/quickreference.html.ko.euc-kr
    httpd/httpd/trunk/docs/manual/mod/quickreference.html.tr.utf8
    httpd/httpd/trunk/docs/manual/mod/quickreference.html.zh-cn
    httpd/httpd/trunk/docs/manual/rewrite/access.html.en
    httpd/httpd/trunk/docs/manual/rewrite/flags.html.fr

Modified: httpd/httpd/trunk/docs/manual/configuring.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/configuring.html.en?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/configuring.html.en (original)
+++ httpd/httpd/trunk/docs/manual/configuring.html.en Mon Sep  5 07:56:28 2011
@@ -91,10 +91,6 @@ Server.</p>
     configuration file itself, for example with <code class="directive"><a href="./mod/mod_env.html#setenv">SetEnv</a></code>, take effect too late to be used for
     expansions in the configuration file.</p>
 
-    <p>The maximum length of a line in the configuration file, after
-    variable substitution, joining any continued lines and removing leading
-    and trailing white space, is 8192 characters.</p>
-
     <p>You can check your configuration files for syntax errors
     without starting the server by using <code>apachectl
     configtest</code> or the <code>-t</code> command line

Modified: httpd/httpd/trunk/docs/manual/configuring.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/configuring.html.fr?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/configuring.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/configuring.html.fr Mon Sep  5 07:56:28 2011
@@ -102,11 +102,6 @@ le Serveur HTTP Apache.</p>
     pouvoir être utilisées dans les extensions au sein du fichier de
     configuration.</p>
 
-    <p>La longueur maximale d'une ligne du fichier de configuration,
-    après substitution des variables, reconstitution des
-    lignes fragmentées et suppression des espaces de début et de fin,
-    est de 8192 caractères.</p>
-
     <p>Vous pouvez vérifier l'absence d'erreurs de syntaxe dans vos fichiers
     de configuration sans démarrer le serveur à l'aide de la commande
     <code>apachectl configtest</code> ou de l'option de ligne de commande

Modified: httpd/httpd/trunk/docs/manual/configuring.xml.de
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/configuring.xml.de?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/configuring.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/configuring.xml.de Mon Sep  5 07:56:28 2011
@@ -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.de.xsl"?>
-<!-- English Revision: 420990:1086771 (outdated) -->
+<!-- English Revision: 420990:1157354 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/configuring.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/configuring.xml.ja?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/configuring.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/configuring.xml.ja [utf-8] Mon Sep  5 07:56:28 2011
@@ -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.ja.xsl"?>
-<!-- English Revision: 420990:1086771 (outdated) -->
+<!-- English Revision: 420990:1157354 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/configuring.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/configuring.xml.ko?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/configuring.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/configuring.xml.ko [euc-kr] Mon Sep  5 07:56:28 2011
@@ -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: 420990:1086771 (outdated) -->
+<!-- English Revision: 420990:1157354 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/configuring.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/configuring.xml.tr?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/configuring.xml.tr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/configuring.xml.tr [utf-8] Mon Sep  5 07:56:28 2011
@@ -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: 1061758:1086771 (outdated) -->
+<!-- English Revision: 1061758:1157354 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/convenience.map
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/convenience.map?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/convenience.map (original)
+++ httpd/httpd/trunk/docs/manual/convenience.map Mon Sep  5 07:56:28 2011
@@ -34,11 +34,13 @@ allowconnect	mod/mod_proxy_connect.html#
 allowencodedslashes	mod/core.html#allowencodedslashes
 allowmethods	mod/mod_allowmethods.html#allowmethods
 allowoverride	mod/core.html#allowoverride
+allowoverridelist	mod/core.html#allowoverridelist
 anonymous	mod/mod_authn_anon.html#anonymous
 anonymous_logemail	mod/mod_authn_anon.html#anonymous_logemail
 anonymous_mustgiveemail	mod/mod_authn_anon.html#anonymous_mustgiveemail
 anonymous_nouserid	mod/mod_authn_anon.html#anonymous_nouserid
 anonymous_verifyemail	mod/mod_authn_anon.html#anonymous_verifyemail
+asyncrequestworkerfactor	mod/event.html#asyncrequestworkerfactor
 authbasicauthoritative	mod/mod_auth_basic.html#authbasicauthoritative
 authbasicprovider	mod/mod_auth_basic.html#authbasicprovider
 authdbduserpwquery	mod/mod_authn_dbd.html#authdbduserpwquery
@@ -182,6 +184,7 @@ deflatewindowsize	mod/mod_deflate.html#d
 deny	mod/mod_access_compat.html#deny
 directory	mod/core.html#directory
 directoryindex	mod/mod_dir.html#directoryindex
+directoryindexredirect	mod/mod_dir.html#directoryindexredirect
 directorymatch	mod/core.html#directorymatch
 directoryslash	mod/mod_dir.html#directoryslash
 documentroot	mod/core.html#documentroot
@@ -304,6 +307,7 @@ luascope	mod/mod_lua.html#luascope
 maxconnectionsperchild	mod/mpm_common.html#maxconnectionsperchild
 maxkeepaliverequests	mod/core.html#maxkeepaliverequests
 maxmemfree	mod/mpm_common.html#maxmemfree
+maxranges	mod/core.html#maxranges
 maxrequestworkers	mod/mpm_common.html#maxrequestworkers
 maxspareservers	mod/prefork.html#maxspareservers
 maxsparethreads	mod/mpm_common.html#maxsparethreads
@@ -360,6 +364,7 @@ proxyrequests	mod/mod_proxy.html#proxyre
 proxyscgiinternalredirect	mod/mod_proxy_scgi.html#proxyscgiinternalredirect
 proxyscgisendfile	mod/mod_proxy_scgi.html#proxyscgisendfile
 proxyset	mod/mod_proxy.html#proxyset
+proxysourceaddress	mod/mod_proxy.html#proxysourceaddress
 proxystatus	mod/mod_proxy.html#proxystatus
 proxytimeout	mod/mod_proxy.html#proxytimeout
 proxyvia	mod/mod_proxy.html#proxyvia
@@ -458,6 +463,7 @@ sslcacertificatefile	mod/mod_ssl.html#ss
 sslcacertificatepath	mod/mod_ssl.html#sslcacertificatepath
 sslcadnrequestfile	mod/mod_ssl.html#sslcadnrequestfile
 sslcadnrequestpath	mod/mod_ssl.html#sslcadnrequestpath
+sslcarevocationcheck	mod/mod_ssl.html#sslcarevocationcheck
 sslcarevocationfile	mod/mod_ssl.html#sslcarevocationfile
 sslcarevocationpath	mod/mod_ssl.html#sslcarevocationpath
 sslcertificatechainfile	mod/mod_ssl.html#sslcertificatechainfile
@@ -480,12 +486,14 @@ sslpassphrasedialog	mod/mod_ssl.html#ssl
 sslprotocol	mod/mod_ssl.html#sslprotocol
 sslproxycacertificatefile	mod/mod_ssl.html#sslproxycacertificatefile
 sslproxycacertificatepath	mod/mod_ssl.html#sslproxycacertificatepath
+sslproxycarevocationcheck	mod/mod_ssl.html#sslproxycarevocationcheck
 sslproxycarevocationfile	mod/mod_ssl.html#sslproxycarevocationfile
 sslproxycarevocationpath	mod/mod_ssl.html#sslproxycarevocationpath
 sslproxycheckpeercn	mod/mod_ssl.html#sslproxycheckpeercn
 sslproxycheckpeerexpire	mod/mod_ssl.html#sslproxycheckpeerexpire
 sslproxyciphersuite	mod/mod_ssl.html#sslproxyciphersuite
 sslproxyengine	mod/mod_ssl.html#sslproxyengine
+sslproxymachinecertificatechainfile	mod/mod_ssl.html#sslproxymachinecertificatechainfile
 sslproxymachinecertificatefile	mod/mod_ssl.html#sslproxymachinecertificatefile
 sslproxymachinecertificatepath	mod/mod_ssl.html#sslproxymachinecertificatepath
 sslproxyprotocol	mod/mod_ssl.html#sslproxyprotocol

Modified: httpd/httpd/trunk/docs/manual/expr.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/expr.html.en?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/expr.html.en (original)
+++ httpd/httpd/trunk/docs/manual/expr.html.en Mon Sep  5 07:56:28 2011
@@ -147,7 +147,7 @@ listfunction ::= listfuncname "<strong>(
 <tr class="odd"><td><code>REQUEST_SCHEME</code></td>
         <td>The scheme part of the request's URI</td></tr>
 <tr><td><code>REQUEST_URI</code></td>
-        <td>The URI of the request</td></tr>
+        <td>The path part of the request's URI</td></tr>
 <tr class="odd"><td><code>DOCUMENT_URI</code></td>
         <td>Same as REQUEST_URI</td></tr>
 <tr><td><code>REQUEST_FILENAME</code></td>

Modified: httpd/httpd/trunk/docs/manual/expr.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/expr.html.fr?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/expr.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/expr.html.fr Mon Sep  5 07:56:28 2011
@@ -421,8 +421,9 @@ listfunction ::= listfuncname "<strong>(
 <tr><td><code>escape</code></td>
         <td>Echappe les caractères spéciaux en codage hexadécimal</td><td /></tr>
 <tr class="odd"><td><code>unescape</code></td>
-        <td>"Déséchappe" les chaînes codées en hexadécimal en conservant
-	le codage des caractères spéciaux aux URLs (XXX: describe better)</td><td /></tr>
+        <td>"Déséchappe" les chaînes codées
+	en hexadécimal, en ne gardant encodés que les slashes; renvoie la chaîne vide
+	si la séquence %00 est rencontrée</td><td /></tr>
 <tr><td><code>file</code></td>
         <td>Lit le contenu d'un fichier</td><td>oui</td></tr>
 <tr class="odd"><td><code>filesize</code></td>

Modified: httpd/httpd/trunk/docs/manual/mod/core.html.de
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.html.de?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.html.de (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.html.de Mon Sep  5 07:56:28 2011
@@ -84,6 +84,7 @@ Servers</td></tr>
 <li><img alt="" src="../images/down.gif" /> <a href="#locationmatch">&lt;LocationMatch&gt;</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#loglevel">LogLevel</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#maxranges">MaxRanges</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#mutex">Mutex</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#namevirtualhost">NameVirtualHost</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
@@ -2345,6 +2346,20 @@ zulässig sind</td></tr>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MaxRanges" id="MaxRanges">MaxRanges</a>-<a name="maxranges" id="maxranges">Direktive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Beschreibung:</a></th><td>Number of ranges allowed before returning the complete
+resource </td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MaxRanges <var>number</var> (0 = no limit)</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Voreinstellung:</a></th><td><code>MaxRanges 200</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Kontext:</a></th><td>Serverkonfiguration, Virtual Host, Verzeichnis</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modul:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Kompatibilität:</a></th><td>Available in Apache HTTP Server 2.3.15 and later</td></tr>
+</table><p>Die Dokumentation zu dieser Direktive wurde
+            noch nicht übersetzt. Bitte schauen Sie in die englische
+            Version.</p></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="Mutex" id="Mutex">Mutex</a>-<a name="mutex" id="mutex">Direktive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Beschreibung:</a></th><td>Configures mutex mechanism and lock file directory for all

Modified: httpd/httpd/trunk/docs/manual/mod/core.html.es
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.html.es?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.html.es (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.html.es Mon Sep  5 07:56:28 2011
@@ -80,6 +80,7 @@
 <li><img alt="" src="../images/down.gif" /> <a href="#locationmatch">&lt;LocationMatch&gt;</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#loglevel">LogLevel</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#maxranges">MaxRanges</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#mutex">Mutex</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#namevirtualhost">NameVirtualHost</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
@@ -2739,6 +2740,20 @@ connection</td></tr>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MaxRanges" id="MaxRanges">MaxRanges</a> <a name="maxranges" id="maxranges">Directiva</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Descripción:</a></th><td>Number of ranges allowed before returning the complete
+resource </td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sintaxis:</a></th><td><code>MaxRanges <var>number</var> (0 = no limit)</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Valor por defecto:</a></th><td><code>MaxRanges 200</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexto:</a></th><td>server config, virtual host, directory</td></tr>
+<tr><th><a href="directive-dict.html#Status">Estado:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Módulo:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilidad:</a></th><td>Available in Apache HTTP Server 2.3.15 and later</td></tr>
+</table><p>The documentation for this directive has
+            not been translated yet. Please have a look at the English
+            version.</p></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="Mutex" id="Mutex">Mutex</a> <a name="mutex" id="mutex">Directiva</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Descripción:</a></th><td>Configures mutex mechanism and lock file directory for all

Modified: httpd/httpd/trunk/docs/manual/mod/core.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.html.fr?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.html.fr Mon Sep  5 07:56:28 2011
@@ -81,6 +81,7 @@ disponibles</td></tr>
 <li><img alt="" src="../images/down.gif" /> <a href="#locationmatch">&lt;LocationMatch&gt;</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#loglevel">LogLevel</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#maxranges">MaxRanges</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#mutex">Mutex</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#namevirtualhost">NameVirtualHost</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
@@ -438,7 +439,7 @@ All pour les versions antérieures</code
     <code class="directive"><a href="#files">&lt;Files&gt;</a></code>.
     </div>
 
-    <p>Lorsque cette directive est définie à <code>None</code>, les
+    <p>Lorsque cette directive et la directive <code class="directive"><a href="#allowoverridelist">AllowOverrideList</a></code> sont définies à <code>None</code>, les
     fichiers <a href="#accessfilename">.htaccess</a> sont totalement
     ignorés. Dans ce cas, le serveur n'essaiera même pas de lire les
     fichiers <code>.htaccess</code> du système de fichiers.</p>
@@ -497,7 +498,20 @@ All pour les versions antérieures</code
       spécifiques d'un répertoire (<code class="directive"><a href="#options">Options</a></code> et <code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code>). "Options" doit être
       suivi d'un signe "égal", puis d'une liste d'options séparées par des
       virgules (pas d'espaces) ; ces options doivent être définies à
-      l'aide de la commande <code class="directive"><a href="#options">Options</a></code>.</dd>
+      l'aide de la commande <code class="directive"><a href="#options">Options</a></code>.
+
+      <div class="note"><h3>Désactivation implicite des options</h3>
+      <p>Bien que la liste des options disponibles dans les fichiers
+      .htaccess puisse être limitée par cette directive, tant qu'un
+      directive <code class="directive"><a href="#options">Options</a></code> est
+      autorisée, toute autre option héritée peut être désactivée en
+      utilisant la syntaxe non-relative. En d'autres termes, ce
+      mécanisme ne peut pas forcer une option spécifique à rester
+      <em>activée</em> tout en permettant à toute autre option d'être
+      activée.
+      </p></div>
+      
+      </dd>
     </dl>
 
     <p>Exemple :</p>
@@ -522,29 +536,68 @@ All pour les versions antérieures</code
 <h3>Voir aussi</h3>
 <ul>
 <li><code class="directive"><a href="#accessfilename">AccessFileName</a></code></li>
-<li><a href="../configuring.html">Configuration Files</a></li>
-<li><a href="../howto/htaccess.html">.htaccess Files</a></li>
+<li><code class="directive"><a href="#allowoverridelist">AllowOverrideList</a></code></li>
+<li><a href="../configuring.html">Fichiers de configuration</a></li>
+<li><a href="../howto/htaccess.html">Fichiers .htaccess</a></li>
 </ul>
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="AllowOverrideList" id="AllowOverrideList">AllowOverrideList</a> <a name="allowoverridelist" id="allowoverridelist">Directive</a></h2>
 <table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Individual directives that are allowed in
-<code>.htaccess</code> files</td></tr>
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Directives autorisées dans les fichiers <code>.htaccess</code></td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AllowOverrideList None|<var>directive</var>
 [<var>directive-type</var>] ...</code></td></tr>
 <tr><th><a href="directive-dict.html#Default">Défaut:</a></th><td><code>AllowOverrideList None</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>répertoire</td></tr>
 <tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Core</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
-</table><p>La documentation de cette directive
-	n'a pas encore t traduite. Veuillez vous reporter  la version
-	en langue anglaise.</p><h3>Voir aussi</h3>
+</table>
+    <p>Lorsque le serveur trouve un fichier <code>.htaccess</code>
+    (comme spécifié par la directive <code class="directive"><a href="#accessfilename">AccessFileName</a></code>), il doit savoir lesquelles
+    des directives déclarées dans ce fichier peuvent remplacer des
+    directives des fichiers de configuration du serveur.</p>
+
+    <div class="note"><h3>Seulement disponible dans les sections &lt;Directory&gt;</h3>
+    La directive <code class="directive">AllowOverrideList</code> n'est
+    disponible que dans les sections <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> spécifiées sans expressions
+    rationnelles.
+    </div>
+
+    <p>Lorsque cette directive et la directive <code class="directive"><a href="#allowoverride">AllowOverride</a></code> sont définies à
+    <code>None</code>, les fichiers <a href="#accessfilename">.htaccess</a> sont totalement ignorés. Dans
+    ce cas, le serveur ne cherchera même pas à lire des fichiers
+    <code>.htaccess</code> dans le système de fichiers.</p>
+
+    <p>Example:</p>
+
+    <div class="example"><p><code>
+      AllowOverride None
+      AllowOverrideList Redirect RedirectMatch
+    </code></p></div>
+
+    <p>Dans l'exemple ci-dessus, seules les directives
+    <code>Redirect</code> et <code>RedirectMatch</code> sont autorisées.
+    Toutes les autres provoqueront une erreur interne du serveur.</p>
+
+    <p>Example:</p>
+
+    <div class="example"><p><code>
+      AllowOverride AuthConfig
+      AllowOverrideList CookieTracking CookieName
+    </code></p></div>
+
+    <p>Dans l'exemple ci-dessus, la directive <code class="directive"><a href="#allowoverride">AllowOverride</a></code> autorise les directives du
+    groupement <code>AuthConfig</code>, et
+    <code class="directive">AllowOverrideList</code> n'autorise que deux
+    directives du groupement <code>FileInfo</code>. Toutes les autres
+    provoqueront une erreur interne du serveur.</p>
+
+<h3>Voir aussi</h3>
 <ul>
 <li><code class="directive"><a href="#accessfilename">AccessFileName</a></code></li>
 <li><code class="directive"><a href="#allowoverride">AllowOverride</a></code></li>
-<li><a href="../configuring.html">Configuration Files</a></li>
-<li><a href="../howto/htaccess.html">.htaccess Files</a></li>
+<li><a href="../configuring.html">Fichiers de configuration</a></li>
+<li><a href="../howto/htaccess.html">Fichiers .htaccess</a></li>
 </ul>
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1878,7 +1931,7 @@ requête</td></tr>
     ...). Les expressions rationnelles sont aussi supportées,</p>
 
     <div class="example"><p><code>
-        &lt;If "%{QUERY_STRING =~ /(delete|commit)=.*?elem/"&gt;
+        &lt;If "%{QUERY_STRING} =~ /(delete|commit)=.*?elem/"&gt;
     </code></p></div>
 
     <p>ainsi que les comparaison de modèles de type shell et de
@@ -3007,6 +3060,20 @@ persistante</td></tr>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MaxRanges" id="MaxRanges">MaxRanges</a> <a name="maxranges" id="maxranges">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Number of ranges allowed before returning the complete
+resource </td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>MaxRanges <var>number</var> (0 = no limit)</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Défaut:</a></th><td><code>MaxRanges 200</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, répertoire</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilité:</a></th><td>Available in Apache HTTP Server 2.3.15 and later</td></tr>
+</table><p>La documentation de cette directive
+	n'a pas encore t traduite. Veuillez vous reporter  la version
+	en langue anglaise.</p></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="Mutex" id="Mutex">Mutex</a> <a name="mutex" id="mutex">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Définit les mécanismes de mutex et le repertoire du fichier
@@ -3920,6 +3987,11 @@ serveur</td></tr>
       ServerRoot /home/httpd
     </code></p></div>
 
+    <p>La valeur par défaut de <code class="directive">ServerRoot</code> peut
+    être modifiée via l'argument <code>--prefix</code> de la commande <a href="../programs/configure.html"><code>configure</code></a>, et de
+    nombreuses distributions tierces du serveur proposent une valeur
+    différente de celles listées ci-dessus.</p>
+
 
 <h3>Voir aussi</h3>
 <ul>

Modified: httpd/httpd/trunk/docs/manual/mod/core.html.ja.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.html.ja.utf8?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.html.ja.utf8 [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.html.ja.utf8 [utf-8] Mon Sep  5 07:56:28 2011
@@ -83,6 +83,7 @@
 <li><img alt="" src="../images/down.gif" /> <a href="#locationmatch">&lt;LocationMatch&gt;</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#loglevel">LogLevel</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#maxranges">MaxRanges</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#mutex">Mutex</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#namevirtualhost">NameVirtualHost</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
@@ -2284,6 +2285,20 @@ request</td></tr>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MaxRanges" id="MaxRanges">MaxRanges</a> <a name="maxranges" id="maxranges">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Number of ranges allowed before returning the complete
+resource </td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>MaxRanges <var>number</var> (0 = no limit)</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>MaxRanges 200</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト, ディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>Available in Apache HTTP Server 2.3.15 and later</td></tr>
+</table><p>The documentation for this directive has
+            not been translated yet. Please have a look at the English
+            version.</p></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="Mutex" id="Mutex">Mutex</a> <a name="mutex" id="mutex">ディレクティブ</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Configures mutex mechanism and lock file directory for all

Modified: httpd/httpd/trunk/docs/manual/mod/core.html.tr.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.html.tr.utf8?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.html.tr.utf8 [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.html.tr.utf8 [utf-8] Mon Sep  5 07:56:28 2011
@@ -82,6 +82,7 @@
 <li><img alt="" src="../images/down.gif" /> <a href="#locationmatch">&lt;LocationMatch&gt;</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#loglevel">LogLevel</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#maxranges">MaxRanges</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#mutex">Mutex</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#namevirtualhost">NameVirtualHost</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
@@ -2322,6 +2323,19 @@ uygulanır.</td></tr>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MaxRanges" id="MaxRanges">MaxRanges</a> <a name="maxranges" id="maxranges">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Number of ranges allowed before returning the complete
+resource </td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>MaxRanges <var>number</var> (0 = no limit)</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>MaxRanges 200</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu geneli, sanal konak, dizin</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>Available in Apache HTTP Server 2.3.15 and later</td></tr>
+</table><p>Bu yönergenin belgesi henüz Türkçeye çevrilmedi.
+            Lütfen İngilizce sürümüne bakınız.</p></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="Mutex" id="Mutex">Mutex</a> <a name="mutex" id="mutex">Yönergesi</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Configures mutex mechanism and lock file directory for all

Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.de
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.de?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.de Mon Sep  5 07:56:28 2011
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 344972:1154940 (outdated) -->
+<!-- English Revision: 344972:1162587 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.ja?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.ja [utf-8] Mon Sep  5 07:56:28 2011
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 669847:1154940 (outdated) -->
+<!-- English Revision: 669847:1162587 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.tr?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.tr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.tr [utf-8] Mon Sep  5 07:56:28 2011
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 813376:1154940 (outdated) -->
+<!-- English Revision: 813376:1162587 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>

Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.de
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/directives.html.de?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.de (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.de Mon Sep  5 07:56:28 2011
@@ -343,6 +343,7 @@
 <li><a href="mpm_common.html#maxconnectionsperchild" id="M" name="M">MaxConnectionsPerChild</a></li>
 <li><a href="core.html#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
 <li><a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
+<li><a href="core.html#maxranges">MaxRanges</a></li>
 <li><a href="mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></li>
 <li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
 <li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
@@ -498,6 +499,7 @@
 <li><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath</a></li>
 <li><a href="mod_ssl.html#sslcadnrequestfile">SSLCADNRequestFile</a></li>
 <li><a href="mod_ssl.html#sslcadnrequestpath">SSLCADNRequestPath</a></li>
+<li><a href="mod_ssl.html#sslcarevocationcheck">SSLCARevocationCheck</a></li>
 <li><a href="mod_ssl.html#sslcarevocationfile">SSLCARevocationFile</a></li>
 <li><a href="mod_ssl.html#sslcarevocationpath">SSLCARevocationPath</a></li>
 <li><a href="mod_ssl.html#sslcertificatechainfile">SSLCertificateChainFile</a></li>
@@ -520,12 +522,14 @@
 <li><a href="mod_ssl.html#sslprotocol">SSLProtocol</a></li>
 <li><a href="mod_ssl.html#sslproxycacertificatefile">SSLProxyCACertificateFile</a></li>
 <li><a href="mod_ssl.html#sslproxycacertificatepath">SSLProxyCACertificatePath</a></li>
+<li><a href="mod_ssl.html#sslproxycarevocationcheck">SSLProxyCARevocationCheck</a></li>
 <li><a href="mod_ssl.html#sslproxycarevocationfile">SSLProxyCARevocationFile</a></li>
 <li><a href="mod_ssl.html#sslproxycarevocationpath">SSLProxyCARevocationPath</a></li>
 <li><a href="mod_ssl.html#sslproxycheckpeercn">SSLProxyCheckPeerCN</a></li>
 <li><a href="mod_ssl.html#sslproxycheckpeerexpire">SSLProxyCheckPeerExpire</a></li>
 <li><a href="mod_ssl.html#sslproxyciphersuite">SSLProxyCipherSuite</a></li>
 <li><a href="mod_ssl.html#sslproxyengine">SSLProxyEngine</a></li>
+<li><a href="mod_ssl.html#sslproxymachinecertificatechainfile">SSLProxyMachineCertificateChainFile</a></li>
 <li><a href="mod_ssl.html#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile</a></li>
 <li><a href="mod_ssl.html#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath</a></li>
 <li><a href="mod_ssl.html#sslproxyprotocol">SSLProxyProtocol</a></li>

Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/directives.html.en?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.en Mon Sep  5 07:56:28 2011
@@ -344,6 +344,7 @@
 <li><a href="mpm_common.html#maxconnectionsperchild" id="M" name="M">MaxConnectionsPerChild</a></li>
 <li><a href="core.html#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
 <li><a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
+<li><a href="core.html#maxranges">MaxRanges</a></li>
 <li><a href="mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></li>
 <li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
 <li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
@@ -499,6 +500,7 @@
 <li><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath</a></li>
 <li><a href="mod_ssl.html#sslcadnrequestfile">SSLCADNRequestFile</a></li>
 <li><a href="mod_ssl.html#sslcadnrequestpath">SSLCADNRequestPath</a></li>
+<li><a href="mod_ssl.html#sslcarevocationcheck">SSLCARevocationCheck</a></li>
 <li><a href="mod_ssl.html#sslcarevocationfile">SSLCARevocationFile</a></li>
 <li><a href="mod_ssl.html#sslcarevocationpath">SSLCARevocationPath</a></li>
 <li><a href="mod_ssl.html#sslcertificatechainfile">SSLCertificateChainFile</a></li>
@@ -521,12 +523,14 @@
 <li><a href="mod_ssl.html#sslprotocol">SSLProtocol</a></li>
 <li><a href="mod_ssl.html#sslproxycacertificatefile">SSLProxyCACertificateFile</a></li>
 <li><a href="mod_ssl.html#sslproxycacertificatepath">SSLProxyCACertificatePath</a></li>
+<li><a href="mod_ssl.html#sslproxycarevocationcheck">SSLProxyCARevocationCheck</a></li>
 <li><a href="mod_ssl.html#sslproxycarevocationfile">SSLProxyCARevocationFile</a></li>
 <li><a href="mod_ssl.html#sslproxycarevocationpath">SSLProxyCARevocationPath</a></li>
 <li><a href="mod_ssl.html#sslproxycheckpeercn">SSLProxyCheckPeerCN</a></li>
 <li><a href="mod_ssl.html#sslproxycheckpeerexpire">SSLProxyCheckPeerExpire</a></li>
 <li><a href="mod_ssl.html#sslproxyciphersuite">SSLProxyCipherSuite</a></li>
 <li><a href="mod_ssl.html#sslproxyengine">SSLProxyEngine</a></li>
+<li><a href="mod_ssl.html#sslproxymachinecertificatechainfile">SSLProxyMachineCertificateChainFile</a></li>
 <li><a href="mod_ssl.html#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile</a></li>
 <li><a href="mod_ssl.html#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath</a></li>
 <li><a href="mod_ssl.html#sslproxyprotocol">SSLProxyProtocol</a></li>

Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.es
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/directives.html.es?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.es (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.es Mon Sep  5 07:56:28 2011
@@ -346,6 +346,7 @@
 <li><a href="mpm_common.html#maxconnectionsperchild" id="M" name="M">MaxConnectionsPerChild</a></li>
 <li><a href="core.html#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
 <li><a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
+<li><a href="core.html#maxranges">MaxRanges</a></li>
 <li><a href="mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></li>
 <li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
 <li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
@@ -501,6 +502,7 @@
 <li><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath</a></li>
 <li><a href="mod_ssl.html#sslcadnrequestfile">SSLCADNRequestFile</a></li>
 <li><a href="mod_ssl.html#sslcadnrequestpath">SSLCADNRequestPath</a></li>
+<li><a href="mod_ssl.html#sslcarevocationcheck">SSLCARevocationCheck</a></li>
 <li><a href="mod_ssl.html#sslcarevocationfile">SSLCARevocationFile</a></li>
 <li><a href="mod_ssl.html#sslcarevocationpath">SSLCARevocationPath</a></li>
 <li><a href="mod_ssl.html#sslcertificatechainfile">SSLCertificateChainFile</a></li>
@@ -523,12 +525,14 @@
 <li><a href="mod_ssl.html#sslprotocol">SSLProtocol</a></li>
 <li><a href="mod_ssl.html#sslproxycacertificatefile">SSLProxyCACertificateFile</a></li>
 <li><a href="mod_ssl.html#sslproxycacertificatepath">SSLProxyCACertificatePath</a></li>
+<li><a href="mod_ssl.html#sslproxycarevocationcheck">SSLProxyCARevocationCheck</a></li>
 <li><a href="mod_ssl.html#sslproxycarevocationfile">SSLProxyCARevocationFile</a></li>
 <li><a href="mod_ssl.html#sslproxycarevocationpath">SSLProxyCARevocationPath</a></li>
 <li><a href="mod_ssl.html#sslproxycheckpeercn">SSLProxyCheckPeerCN</a></li>
 <li><a href="mod_ssl.html#sslproxycheckpeerexpire">SSLProxyCheckPeerExpire</a></li>
 <li><a href="mod_ssl.html#sslproxyciphersuite">SSLProxyCipherSuite</a></li>
 <li><a href="mod_ssl.html#sslproxyengine">SSLProxyEngine</a></li>
+<li><a href="mod_ssl.html#sslproxymachinecertificatechainfile">SSLProxyMachineCertificateChainFile</a></li>
 <li><a href="mod_ssl.html#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile</a></li>
 <li><a href="mod_ssl.html#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath</a></li>
 <li><a href="mod_ssl.html#sslproxyprotocol">SSLProxyProtocol</a></li>

Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.ja.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/directives.html.ja.utf8?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.ja.utf8 [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.ja.utf8 [utf-8] Mon Sep  5 07:56:28 2011
@@ -342,6 +342,7 @@
 <li><a href="mpm_common.html#maxconnectionsperchild" id="M" name="M">MaxConnectionsPerChild</a></li>
 <li><a href="core.html#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
 <li><a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
+<li><a href="core.html#maxranges">MaxRanges</a></li>
 <li><a href="mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></li>
 <li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
 <li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
@@ -497,6 +498,7 @@
 <li><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath</a></li>
 <li><a href="mod_ssl.html#sslcadnrequestfile">SSLCADNRequestFile</a></li>
 <li><a href="mod_ssl.html#sslcadnrequestpath">SSLCADNRequestPath</a></li>
+<li><a href="mod_ssl.html#sslcarevocationcheck">SSLCARevocationCheck</a></li>
 <li><a href="mod_ssl.html#sslcarevocationfile">SSLCARevocationFile</a></li>
 <li><a href="mod_ssl.html#sslcarevocationpath">SSLCARevocationPath</a></li>
 <li><a href="mod_ssl.html#sslcertificatechainfile">SSLCertificateChainFile</a></li>
@@ -519,12 +521,14 @@
 <li><a href="mod_ssl.html#sslprotocol">SSLProtocol</a></li>
 <li><a href="mod_ssl.html#sslproxycacertificatefile">SSLProxyCACertificateFile</a></li>
 <li><a href="mod_ssl.html#sslproxycacertificatepath">SSLProxyCACertificatePath</a></li>
+<li><a href="mod_ssl.html#sslproxycarevocationcheck">SSLProxyCARevocationCheck</a></li>
 <li><a href="mod_ssl.html#sslproxycarevocationfile">SSLProxyCARevocationFile</a></li>
 <li><a href="mod_ssl.html#sslproxycarevocationpath">SSLProxyCARevocationPath</a></li>
 <li><a href="mod_ssl.html#sslproxycheckpeercn">SSLProxyCheckPeerCN</a></li>
 <li><a href="mod_ssl.html#sslproxycheckpeerexpire">SSLProxyCheckPeerExpire</a></li>
 <li><a href="mod_ssl.html#sslproxyciphersuite">SSLProxyCipherSuite</a></li>
 <li><a href="mod_ssl.html#sslproxyengine">SSLProxyEngine</a></li>
+<li><a href="mod_ssl.html#sslproxymachinecertificatechainfile">SSLProxyMachineCertificateChainFile</a></li>
 <li><a href="mod_ssl.html#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile</a></li>
 <li><a href="mod_ssl.html#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath</a></li>
 <li><a href="mod_ssl.html#sslproxyprotocol">SSLProxyProtocol</a></li>

Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/directives.html.ko.euc-kr?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.ko.euc-kr [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.ko.euc-kr [euc-kr] Mon Sep  5 07:56:28 2011
@@ -341,6 +341,7 @@
 <li><a href="mpm_common.html#maxconnectionsperchild" id="M" name="M">MaxConnectionsPerChild</a></li>
 <li><a href="core.html#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
 <li><a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
+<li><a href="core.html#maxranges">MaxRanges</a></li>
 <li><a href="mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></li>
 <li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
 <li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
@@ -496,6 +497,7 @@
 <li><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath</a></li>
 <li><a href="mod_ssl.html#sslcadnrequestfile">SSLCADNRequestFile</a></li>
 <li><a href="mod_ssl.html#sslcadnrequestpath">SSLCADNRequestPath</a></li>
+<li><a href="mod_ssl.html#sslcarevocationcheck">SSLCARevocationCheck</a></li>
 <li><a href="mod_ssl.html#sslcarevocationfile">SSLCARevocationFile</a></li>
 <li><a href="mod_ssl.html#sslcarevocationpath">SSLCARevocationPath</a></li>
 <li><a href="mod_ssl.html#sslcertificatechainfile">SSLCertificateChainFile</a></li>
@@ -518,12 +520,14 @@
 <li><a href="mod_ssl.html#sslprotocol">SSLProtocol</a></li>
 <li><a href="mod_ssl.html#sslproxycacertificatefile">SSLProxyCACertificateFile</a></li>
 <li><a href="mod_ssl.html#sslproxycacertificatepath">SSLProxyCACertificatePath</a></li>
+<li><a href="mod_ssl.html#sslproxycarevocationcheck">SSLProxyCARevocationCheck</a></li>
 <li><a href="mod_ssl.html#sslproxycarevocationfile">SSLProxyCARevocationFile</a></li>
 <li><a href="mod_ssl.html#sslproxycarevocationpath">SSLProxyCARevocationPath</a></li>
 <li><a href="mod_ssl.html#sslproxycheckpeercn">SSLProxyCheckPeerCN</a></li>
 <li><a href="mod_ssl.html#sslproxycheckpeerexpire">SSLProxyCheckPeerExpire</a></li>
 <li><a href="mod_ssl.html#sslproxyciphersuite">SSLProxyCipherSuite</a></li>
 <li><a href="mod_ssl.html#sslproxyengine">SSLProxyEngine</a></li>
+<li><a href="mod_ssl.html#sslproxymachinecertificatechainfile">SSLProxyMachineCertificateChainFile</a></li>
 <li><a href="mod_ssl.html#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile</a></li>
 <li><a href="mod_ssl.html#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath</a></li>
 <li><a href="mod_ssl.html#sslproxyprotocol">SSLProxyProtocol</a></li>

Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.tr.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/directives.html.tr.utf8?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.tr.utf8 [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.tr.utf8 [utf-8] Mon Sep  5 07:56:28 2011
@@ -340,6 +340,7 @@
 <li><a href="mpm_common.html#maxconnectionsperchild" id="M" name="M">MaxConnectionsPerChild</a></li>
 <li><a href="core.html#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
 <li><a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
+<li><a href="core.html#maxranges">MaxRanges</a></li>
 <li><a href="mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></li>
 <li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
 <li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
@@ -495,6 +496,7 @@
 <li><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath</a></li>
 <li><a href="mod_ssl.html#sslcadnrequestfile">SSLCADNRequestFile</a></li>
 <li><a href="mod_ssl.html#sslcadnrequestpath">SSLCADNRequestPath</a></li>
+<li><a href="mod_ssl.html#sslcarevocationcheck">SSLCARevocationCheck</a></li>
 <li><a href="mod_ssl.html#sslcarevocationfile">SSLCARevocationFile</a></li>
 <li><a href="mod_ssl.html#sslcarevocationpath">SSLCARevocationPath</a></li>
 <li><a href="mod_ssl.html#sslcertificatechainfile">SSLCertificateChainFile</a></li>
@@ -517,12 +519,14 @@
 <li><a href="mod_ssl.html#sslprotocol">SSLProtocol</a></li>
 <li><a href="mod_ssl.html#sslproxycacertificatefile">SSLProxyCACertificateFile</a></li>
 <li><a href="mod_ssl.html#sslproxycacertificatepath">SSLProxyCACertificatePath</a></li>
+<li><a href="mod_ssl.html#sslproxycarevocationcheck">SSLProxyCARevocationCheck</a></li>
 <li><a href="mod_ssl.html#sslproxycarevocationfile">SSLProxyCARevocationFile</a></li>
 <li><a href="mod_ssl.html#sslproxycarevocationpath">SSLProxyCARevocationPath</a></li>
 <li><a href="mod_ssl.html#sslproxycheckpeercn">SSLProxyCheckPeerCN</a></li>
 <li><a href="mod_ssl.html#sslproxycheckpeerexpire">SSLProxyCheckPeerExpire</a></li>
 <li><a href="mod_ssl.html#sslproxyciphersuite">SSLProxyCipherSuite</a></li>
 <li><a href="mod_ssl.html#sslproxyengine">SSLProxyEngine</a></li>
+<li><a href="mod_ssl.html#sslproxymachinecertificatechainfile">SSLProxyMachineCertificateChainFile</a></li>
 <li><a href="mod_ssl.html#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile</a></li>
 <li><a href="mod_ssl.html#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath</a></li>
 <li><a href="mod_ssl.html#sslproxyprotocol">SSLProxyProtocol</a></li>

Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.zh-cn
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/directives.html.zh-cn?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.zh-cn (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.zh-cn Mon Sep  5 07:56:28 2011
@@ -339,6 +339,7 @@
 <li><a href="mpm_common.html#maxconnectionsperchild" id="M" name="M">MaxConnectionsPerChild</a></li>
 <li><a href="core.html#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
 <li><a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
+<li><a href="core.html#maxranges">MaxRanges</a></li>
 <li><a href="mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></li>
 <li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
 <li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
@@ -494,6 +495,7 @@
 <li><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath</a></li>
 <li><a href="mod_ssl.html#sslcadnrequestfile">SSLCADNRequestFile</a></li>
 <li><a href="mod_ssl.html#sslcadnrequestpath">SSLCADNRequestPath</a></li>
+<li><a href="mod_ssl.html#sslcarevocationcheck">SSLCARevocationCheck</a></li>
 <li><a href="mod_ssl.html#sslcarevocationfile">SSLCARevocationFile</a></li>
 <li><a href="mod_ssl.html#sslcarevocationpath">SSLCARevocationPath</a></li>
 <li><a href="mod_ssl.html#sslcertificatechainfile">SSLCertificateChainFile</a></li>
@@ -516,12 +518,14 @@
 <li><a href="mod_ssl.html#sslprotocol">SSLProtocol</a></li>
 <li><a href="mod_ssl.html#sslproxycacertificatefile">SSLProxyCACertificateFile</a></li>
 <li><a href="mod_ssl.html#sslproxycacertificatepath">SSLProxyCACertificatePath</a></li>
+<li><a href="mod_ssl.html#sslproxycarevocationcheck">SSLProxyCARevocationCheck</a></li>
 <li><a href="mod_ssl.html#sslproxycarevocationfile">SSLProxyCARevocationFile</a></li>
 <li><a href="mod_ssl.html#sslproxycarevocationpath">SSLProxyCARevocationPath</a></li>
 <li><a href="mod_ssl.html#sslproxycheckpeercn">SSLProxyCheckPeerCN</a></li>
 <li><a href="mod_ssl.html#sslproxycheckpeerexpire">SSLProxyCheckPeerExpire</a></li>
 <li><a href="mod_ssl.html#sslproxyciphersuite">SSLProxyCipherSuite</a></li>
 <li><a href="mod_ssl.html#sslproxyengine">SSLProxyEngine</a></li>
+<li><a href="mod_ssl.html#sslproxymachinecertificatechainfile">SSLProxyMachineCertificateChainFile</a></li>
 <li><a href="mod_ssl.html#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile</a></li>
 <li><a href="mod_ssl.html#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath</a></li>
 <li><a href="mod_ssl.html#sslproxyprotocol">SSLProxyProtocol</a></li>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_authn_dbd.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_authn_dbd.html.en?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authn_dbd.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authn_dbd.html.en Mon Sep  5 07:56:28 2011
@@ -163,8 +163,8 @@ AuthDBDUserPWQuery \
     names of the form <code>AUTHENTICATE_<var>COLUMN</var></code>.
     </p>
     <p>The encrypted password format depends on which authentication
-    frontend (e.g. <code class="module"><a href="../mod/mod_authn_basic.html">mod_authn_basic</a></code> or
-    <code class="module"><a href="../mod/mod_authn_digest.html">mod_authn_digest</a></code>) is being used.  See <a href="../misc/password_encryptions.html">Password Formats</a> for
+    frontend (e.g. <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> or
+    <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code>) is being used.  See <a href="../misc/password_encryptions.html">Password Formats</a> for
     more information.</p>
 
 </div>
@@ -197,8 +197,8 @@ AuthDBDUserRealmQuery \
     names of the form <code>AUTHENTICATE_<var>COLUMN</var></code>.
     </p>
     <p>The encrypted password format depends on which authentication
-    frontend (e.g. <code class="module"><a href="../mod/mod_authn_basic.html">mod_authn_basic</a></code> or
-    <code class="module"><a href="../mod/mod_authn_digest.html">mod_authn_digest</a></code>) is being used.  See <a href="../misc/password_encryptions.html">Password Formats</a> for
+    frontend (e.g. <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> or
+    <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code>) is being used.  See <a href="../misc/password_encryptions.html">Password Formats</a> for
     more information.</p>
 
 </div>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en Mon Sep  5 07:56:28 2011
@@ -503,10 +503,10 @@ by other LDAP modules</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_ldap</td></tr>
 </table>
-    <p>This directive configures the LDAP_OPT_NETWORK_TIMEOUT option in the
-    underlying LDAP client library, when available.  This value typically 
-    controls how long the LDAP client library will wait for the TCP connection
-    to the LDAP server to complete.</p>
+    <p>This directive configures the LDAP_OPT_NETWORK_TIMEOUT (or LDAP_OPT_CONNECT_TIMEOUT)
+    option in the underlying LDAP client library, when available.  This value
+    typically controls how long the LDAP client library will wait for the TCP
+    connection to the LDAP server to complete.</p>
 
     <p> If a connection is not successful with the timeout period, either an error will be 
     returned or the LDAP client library will attempt to connect to a secondary LDAP 
@@ -517,8 +517,9 @@ by other LDAP modules</td></tr>
     server supports the LDAP_OPT_NETWORK_TIMEOUT option.</p>
 
     <div class="note">LDAPConnectionTimeout is only available when the LDAP client library linked
-    with the server supports the LDAP_OPT_NETWORK_TIMEOUT option, and the
-    ultimate behavior is dictated entirely by the LDAP client library.
+    with the server supports the LDAP_OPT_NETWORK_TIMEOUT 
+    (or LDAP_OPT_CONNECT_TIMEOUT) option, and the ultimate behavior is 
+    dictated entirely by the LDAP client library.
     </div>
 
 </div>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.fr?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.fr Mon Sep  5 07:56:28 2011
@@ -538,13 +538,27 @@ connexion</td></tr>
 <tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_ldap</td></tr>
 </table>
-    <p>Cette directive permet de spécifier le délai d'attente (en
-    secondes) pendant lequel le
-    module tentera de se connecter au serveur LDAP. Si une tentative de
-    connexion n'a pas abouti au bout de ce délai, soit une erreur sera
-    renvoyée, soit le module tentera de se connecter à un serveur LDAP
-    secondaire s'il en a été spécifié un. La valeur par défaut est de 10
-    secondes.</p>
+    <p>Cette directive configure l'option LDAP_OPT_NETWORK_TIMEOUT (ou
+    LDAP_OPT_CONNECT_TIMEOUT) dans la bibliothèque client LDAP
+    sous-jacente, si elle est disponible. Cette valeur représente la
+    durée pendant laquelle la bibliothèque client LDAP va attendre que
+    le processus de connexion TCP au serveur LDAP soit achevé.</p>
+
+    <p>Si la connexion n'a pas réussi avant ce délai, une erreur sera
+    renvoyée, ou la bibliothèque client LDAP tentera de se connecter à
+    un second serveur LDAP, s'il en a été défini un (via une liste de
+    noms d'hôtes séparés par des espaces dans la directive <code class="directive"><a href="#authldapurl">AuthLDAPURL</a></code>).</p>
+
+    <p>La valeur par défaut est 10 secondes, si la bibliothèque client
+    LDAP liée avec le serveur supporte l'option
+    LDAP_OPT_NETWORK_TIMEOUT.</p>
+
+    <div class="note">LDAPConnectionTimeout n'est disponible que si la bibliothèque client
+    LDAP liée avec le serveur supporte l'option
+    LDAP_OPT_NETWORK_TIMEOUT (ou LDAP_OPT_CONNECT_TIMEOUT), et le
+    comportement final est entièrement dicté par la bibliothèque client
+    LDAP.
+    </div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -622,7 +636,7 @@ restent valides</td></tr>
 alternatifs (referrals) avant l'abandon de la requête
 LDAP.</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LDAPReferralHopLimit <var>nombre</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Défaut:</a></th><td><code>LDAPReferralHopLimit 5</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Défaut:</a></th><td><code>Dépend du SDK, en général entre 5 et 10</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>répertoire, .htaccess</td></tr>
 <tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</td></tr>
 <tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
@@ -633,6 +647,10 @@ LDAP.</td></tr>
     des serveurs alternatifs (referrals) avant l'abandon de la requête
     LDAP.</p>
 
+<div class="warning">
+<p>L'ajustement de ce paramètre n'est pas commun à tous les SDKs LDAP.</p>
+</div>    
+
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="LDAPReferrals" id="LDAPReferrals">LDAPReferrals</a> <a name="ldapreferrals" id="ldapreferrals">Directive</a></h2>
@@ -749,6 +767,8 @@ connexion.</td></tr>
     cours de définition, en fonction du SDK LDAP utilisé. Les types
     supportés sont :</p>
     <ul>
+      <li>CA_DER - certificat de CA codé en binaire DER</li>
+      <li>CA_BASE64 - certificat de CA codé en PEM</li>
       <li>CERT_DER - certificat client codé en binaire DER</li>
       <li>CERT_BASE64 - certificat client codé en PEM</li>
       <li>CERT_NICKNAME - certificat client "nickname" (SDK Netscape)</li>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.fr?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.fr Mon Sep  5 07:56:28 2011
@@ -768,8 +768,6 @@ en-têtes X-Forwarded-*</td></tr>
      par <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code>.</p>
     </div>
 
-
-
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="ProxyBadHeader" id="ProxyBadHeader">ProxyBadHeader</a> <a name="proxybadheader" id="proxybadheader">Directive</a></h2>
@@ -1886,15 +1884,20 @@ du serveur HTTP Apache.</td></tr>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="ProxySourceAddress" id="ProxySourceAddress">ProxySourceAddress</a> <a name="proxysourceaddress" id="proxysourceaddress">Directive</a></h2>
 <table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Set local IP address for outgoing proxy connections</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ProxySourceAddress <var>address</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Définit l'adresse IP locale pour les connexions mandatées
+sortantes</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ProxySourceAddress <var>adresse</var></code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</td></tr>
 <tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilité:</a></th><td>Available in version 2.3.9 and later</td></tr>
-</table><p>La documentation de cette directive
-	n'a pas encore t traduite. Veuillez vous reporter  la version
-	en langue anglaise.</p></div>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilité:</a></th><td>Disponible depuis la version 2.3.9</td></tr>
+</table>
+    <p>Cette directive permet de définir une adresse IP locale
+    spécifique à laquelle faire référence lors d'une connexion à un
+    serveur d'arrière-plan.</p>
+
+
+</div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="ProxyStatus" id="ProxyStatus">ProxyStatus</a> <a name="proxystatus" id="proxystatus">Directive</a></h2>
 <table class="directive">

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy_http.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy_http.html.fr?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy_http.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy_http.html.fr Mon Sep  5 07:56:28 2011
@@ -55,6 +55,7 @@
 <h3>Sujets</h3>
 <ul id="topics">
 <li><img alt="" src="../images/down.gif" /> <a href="#env">Variables d'environnement</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#notes">Informations sur les requêtes</a></li>
 </ul><h3>Voir aussi</h3>
 <ul class="seealso">
 <li><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></li>
@@ -137,6 +138,20 @@
 	HTTP/1.0.
         </dd>
     </dl>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="notes" id="notes">Informations sur les requêtes</a></h2>
+    <p><code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code> enregistre les informations
+    suivantes pour journalisation via le format <code>%{NOMVAR}n</code>
+    dans les directives <code class="directive"><a href="../mod/mod_log_config.html#logformat">LogFormat</a></code> ou <code class="directive"><a href="../mod/core.html#errorlogformat">ErrorLogFormat</a></code> :
+    </p>
+    <dl>
+        <dt>proxy-source-port</dt>
+        <dd>Le port local utilisé pour la connexion vers le serveur
+	d'arrière-plan.</dd>
+        <dt>proxy-status</dt>
+        <dd>Le code d'état HTTP reçu du serveur d'arrière-plan.</dd>
+    </dl>
 </div>
 </div>
 <div class="bottomlang">

Modified: httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en Mon Sep  5 07:56:28 2011
@@ -317,9 +317,10 @@ RewriteRule ^index\.html$  newsite.html
 
                   <dt><code>REQUEST_URI</code></dt>
 
-                  <dd>The resource requested in the HTTP request
-                  line. (In the example above, this would be
-                  "/index.html".)</dd>
+                  <dd>The path component of the requested URI,
+                  such as "/index.html".  This notably excludes the
+                  query string which is available as as its own variable
+                  named <code>QUERY_STRING</code>.</dd>
 
                   <dt><code>REQUEST_FILENAME</code></dt>
 

Modified: httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en Mon Sep  5 07:56:28 2011
@@ -46,6 +46,7 @@ to provide the cryptography engine.</p>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslcacertificatepath">SSLCACertificatePath</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslcadnrequestfile">SSLCADNRequestFile</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslcadnrequestpath">SSLCADNRequestPath</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#sslcarevocationcheck">SSLCARevocationCheck</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslcarevocationfile">SSLCARevocationFile</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslcarevocationpath">SSLCARevocationPath</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslcertificatechainfile">SSLCertificateChainFile</a></li>
@@ -68,12 +69,14 @@ to provide the cryptography engine.</p>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslprotocol">SSLProtocol</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslproxycacertificatefile">SSLProxyCACertificateFile</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslproxycacertificatepath">SSLProxyCACertificatePath</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#sslproxycarevocationcheck">SSLProxyCARevocationCheck</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslproxycarevocationfile">SSLProxyCARevocationFile</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslproxycarevocationpath">SSLProxyCARevocationPath</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslproxycheckpeercn">SSLProxyCheckPeerCN</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslproxycheckpeerexpire">SSLProxyCheckPeerExpire</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslproxyciphersuite">SSLProxyCipherSuite</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslproxyengine">SSLProxyEngine</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#sslproxymachinecertificatechainfile">SSLProxyMachineCertificateChainFile</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslproxyprotocol">SSLProxyProtocol</a></li>
@@ -408,6 +411,43 @@ SSLCADNRequestPath /usr/local/apache2/co
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLCARevocationCheck" id="SSLCARevocationCheck">SSLCARevocationCheck</a> <a name="sslcarevocationcheck" id="sslcarevocationcheck">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enable CRL-based revocation checking</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLCARevocationCheck chain|leaf|none</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSLCARevocationCheck none</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_ssl</td></tr>
+</table>
+<p>
+Enables certificate revocation list (CRL) checking. At least one of
+<code class="directive"><a href="#sslcarevocationfile">SSLCARevocationFile</a></code>
+or <code class="directive"><a href="#sslcarevocationpath">SSLCARevocationPath</a></code> must be
+configured. When set to <code>chain</code> (recommended setting),
+CRL checks are applied to all certificates in the chain, while setting it to
+<code>leaf</code> limits the checks to the end-entity cert.
+</p>
+<div class="note">
+<h3>When set to <code>chain</code> or <code>leaf</code>,
+CRLs <em>must</em> be available for successful validation</h3>
+<p>
+Prior to version 2.3.15, CRL checking in mod_ssl also succeeded when
+no CRL(s) were found in any of the locations configured with
+<code class="directive"><a href="#sslcarevocationfile">SSLCARevocationFile</a></code>
+or <code class="directive"><a href="#sslcarevocationpath">SSLCARevocationPath</a></code>.
+With the introduction of this directive, the behavior has been changed:
+when checking is enabled, CRLs <em>must</em> be present for the validation
+to succeed - otherwise it will fail with an
+<code>"unable to get certificate CRL"</code> error.
+</p>
+</div>
+<div class="example"><h3>Example</h3><p><code>
+SSLCARevocationCheck chain
+</code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="SSLCARevocationFile" id="SSLCARevocationFile">SSLCARevocationFile</a> <a name="sslcarevocationfile" id="sslcarevocationfile">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>File of concatenated PEM-encoded CA CRLs for 
@@ -1228,6 +1268,44 @@ SSLProxyCACertificatePath /usr/local/apa
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLProxyCARevocationCheck" id="SSLProxyCARevocationCheck">SSLProxyCARevocationCheck</a> <a name="sslproxycarevocationcheck" id="sslproxycarevocationcheck">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enable CRL-based revocation checking for Remote Server Auth</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLProxyCARevocationCheck chain|leaf|none</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSLProxyCARevocationCheck none</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_ssl</td></tr>
+</table>
+<p>
+Enables certificate revocation list (CRL) checking for the
+<em>remote servers</em> you deal with. At least one of
+<code class="directive"><a href="#sslproxycarevocationfile">SSLProxyCARevocationFile</a></code>
+or <code class="directive"><a href="#sslproxycarevocationpath">SSLProxyCARevocationPath</a></code> must be
+configured. When set to <code>chain</code> (recommended setting),
+CRL checks are applied to all certificates in the chain, while setting it to
+<code>leaf</code> limits the checks to the end-entity cert.
+</p>
+<div class="note">
+<h3>When set to <code>chain</code> or <code>leaf</code>,
+CRLs <em>must</em> be available for successful validation</h3>
+<p>
+Prior to version 2.3.15, CRL checking in mod_ssl also succeeded when
+no CRL(s) were found in any of the locations configured with
+<code class="directive"><a href="#sslproxycarevocationfile">SSLProxyCARevocationFile</a></code>
+or <code class="directive"><a href="#sslproxycarevocationpath">SSLProxyCARevocationPath</a></code>.
+With the introduction of this directive, the behavior has been changed:
+when checking is enabled, CRLs <em>must</em> be present for the validation
+to succeed - otherwise it will fail with an
+<code>"unable to get certificate CRL"</code> error.
+</p>
+</div>
+<div class="example"><h3>Example</h3><p><code>
+SSLProxyCARevocationCheck chain
+</code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="SSLProxyCARevocationFile" id="SSLProxyCARevocationFile">SSLProxyCARevocationFile</a> <a name="sslproxycarevocationfile" id="sslproxycarevocationfile">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>File of concatenated PEM-encoded CA CRLs for 
@@ -1358,6 +1436,32 @@ SSLProxyEngine on<br />
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLProxyMachineCertificateChainFile" id="SSLProxyMachineCertificateChainFile">SSLProxyMachineCertificateChainFile</a> <a name="sslproxymachinecertificatechainfile" id="sslproxymachinecertificatechainfile">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>File of concatenated PEM-encoded CA certificates to be used by the proxy for choosing a certificate</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLProxyMachineCertificateChainFile <em>filename</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>Not applicable</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_ssl</td></tr>
+</table>
+<p>
+This directive sets the all-in-one file where you keep the certificate chain
+for all of the client certs in use. This directive will be needed if the
+remote server presents a list of CA certificates that are not direct signers
+of one of the configured client certificates.
+</p>
+<p>
+This referenced file is simply the concatenation of the various PEM-encoded
+certificate files. Upon startup, each client certificate configured will
+be examined and a chain of trust will be constructed.
+</p>
+<div class="example"><h3>Example</h3><p><code>
+SSLProxyMachineCertificateChainFile /usr/local/apache2/conf/ssl.crt/proxyCA.pem
+</code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="SSLProxyMachineCertificateFile" id="SSLProxyMachineCertificateFile">SSLProxyMachineCertificateFile</a> <a name="sslproxymachinecertificatefile" id="sslproxymachinecertificatefile">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>File of concatenated PEM-encoded client certificates and keys to be used by the proxy</td></tr>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_status.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_status.html.fr?rev=1165196&r1=1165195&r2=1165196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_status.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_status.html.fr Mon Sep  5 07:56:28 2011
@@ -131,7 +131,7 @@ du serveur</td></tr>
 
     <div class="note">
       <strong>Veuillez noter que si <code class="module"><a href="../mod/mod_status.html">mod_status</a></code> a été
-      compilé dans le serveur, son gestionnaire sera disponible dans
+      chargé dans le serveur, son gestionnaire sera disponible dans
       <em>tous</em> les fichiers de configuration, y compris les
       fichiers de configuration de <em>niveau répertoire</em> (par
       exemple <code>.htaccess</code>), ce qui peut avoir des