From: Ruediger Pluem <rpluem@apache.org>
Date: Sat, 16 Aug 2008 19:45:59 +0000 (+0000)
Subject: * Update transformation
X-Git-Tag: 2.2.10~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be8644b247658800216da043c9cb5cfcd9d741ad;p=thirdparty%2Fapache%2Fhttpd.git

* Update transformation


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@686552 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/env.html.en b/docs/manual/env.html.en
index a1729c034ea..5bb7d34a971 100644
--- a/docs/manual/env.html.en
+++ b/docs/manual/env.html.en
@@ -348,10 +348,11 @@
 
    
 
-   <h3><a name="proxy" id="proxy">force-proxy-request-1.0, proxy-nokeepalive, proxy-sendchunked, proxy-sendcl</a></h3>
+   <h3><a name="proxy" id="proxy">force-proxy-request-1.0, proxy-nokeepalive, proxy-sendchunked,
+   proxy-sendcl, proxy-chain-auth, proxy-interim-response</a></h3>
 
    <p>These directives alter the protocol behavior of
-   <code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code>.  See the <code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code>
+   <code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code>.  See the <code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code> and <code class="module"><a href="./mod/mod_proxy_http.html">mod_proxy_http</a></code>
    documentation for more details.</p>
    
 
diff --git a/docs/manual/env.html.tr.utf8 b/docs/manual/env.html.tr.utf8
index c15ed2b3079..859ae7dd682 100644
--- a/docs/manual/env.html.tr.utf8
+++ b/docs/manual/env.html.tr.utf8
@@ -23,6 +23,7 @@
 <a href="./ko/env.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./tr/env.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
+<div class="outofdate">Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.</div>
 
     <p>Apache HTTP Sunucusunda bilgiyi değişkenlerde saklamak için <em>ortam
       değişkenleri</em> adı verilen bir mekanizma bulunur. Saklanan bu bilgi
diff --git a/docs/manual/env.xml.ja b/docs/manual/env.xml.ja
index cd553684a7e..ae2f20aa7a8 100644
--- a/docs/manual/env.xml.ja
+++ b/docs/manual/env.xml.ja
@@ -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: 421100:678109 (outdated) -->
+<!-- English Revision: 421100:686548 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/env.xml.ko b/docs/manual/env.xml.ko
index 893775407d5..ac0521a7687 100644
--- a/docs/manual/env.xml.ko
+++ b/docs/manual/env.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 105989:678109 (outdated) -->
+<!-- English Revision: 105989:686548 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/env.xml.meta b/docs/manual/env.xml.meta
index 30bff621c5b..65bc59ba6b8 100644
--- a/docs/manual/env.xml.meta
+++ b/docs/manual/env.xml.meta
@@ -10,6 +10,6 @@
     <variant>en</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
-    <variant>tr</variant>
+    <variant outdated="yes">tr</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/env.xml.tr b/docs/manual/env.xml.tr
index 9ebf01049f4..35e91d9ff49 100644
--- a/docs/manual/env.xml.tr
+++ b/docs/manual/env.xml.tr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?>
-<!-- English Revision: 678109 -->
+<!-- English Revision: 678109:686548 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/misc/rewriteguide.xml.ko b/docs/manual/misc/rewriteguide.xml.ko
index fed467c9b3e..61e1695a846 100644
--- a/docs/manual/misc/rewriteguide.xml.ko
+++ b/docs/manual/misc/rewriteguide.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 122770:636034 (outdated) -->
+<!-- English Revision: 122770:685144 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/misc/security_tips.html.en b/docs/manual/misc/security_tips.html.en
index 589a6b8efda..4903ff8d59c 100644
--- a/docs/manual/misc/security_tips.html.en
+++ b/docs/manual/misc/security_tips.html.en
@@ -22,7 +22,7 @@
 <a href="../ko/misc/security_tips.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
 
-    <p>Some hints and tips on security issues in setting up a web server. 
+    <p>Some hints and tips on security issues in setting up a web server.
     Some of the suggestions will be general, others specific to Apache.</p>
   </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#uptodate">Keep up to Date</a></li>
@@ -60,18 +60,18 @@
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="serverroot" id="serverroot">Permissions on ServerRoot Directories</a></h2>
-  
-    
-    
-    <p>In typical operation, Apache is started by the root user, and it 
-    switches to the user defined by the <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code> directive to serve hits. As is the 
-    case with any command that root executes, you must take care that it is 
-    protected from modification by non-root users. Not only must the files 
-    themselves be writeable only by root, but so must the directories, and 
-    parents of all directories. For example, if you choose to place 
-    ServerRoot in  /usr/local/apache then it is suggested that you create 
-    that directory as root, with commands like these:</p>
+
     
+
+    <p>In typical operation, Apache is started by the root user, and it
+    switches to the user defined by the <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code> directive to serve hits. As is the
+    case with any command that root executes, you must take care that it is
+    protected from modification by non-root users. Not only must the files
+    themselves be writeable only by root, but so must the directories, and
+    parents of all directories. For example, if you choose to place
+    ServerRoot in  <code>/usr/local/apache</code> then it is suggested that
+    you create that directory as root, with commands like these:</p>
+
     <div class="example"><p><code>
       mkdir /usr/local/apache <br />
       cd /usr/local/apache <br />
@@ -80,125 +80,127 @@
       chgrp 0 . bin conf logs <br />
       chmod 755 . bin conf logs
     </code></p></div>
-    
-    <p>It is assumed that /, /usr, and /usr/local are only modifiable by 
-    root. When you install the <code class="program"><a href="../programs/httpd.html">httpd</a></code> executable, you
-    should ensure that it is similarly protected:</p>
-    
+
+    <p>It is assumed that <code>/</code>, <code>/usr</code>, and
+    <code>/usr/local</code> are only modifiable by root. When you install the
+    <code class="program"><a href="../programs/httpd.html">httpd</a></code> executable, you should ensure that it is
+    similarly protected:</p>
+
     <div class="example"><p><code>
       cp httpd /usr/local/apache/bin <br />
       chown 0 /usr/local/apache/bin/httpd <br />
       chgrp 0 /usr/local/apache/bin/httpd <br />
       chmod 511 /usr/local/apache/bin/httpd
     </code></p></div>
-    
-    <p>You can create an htdocs subdirectory which is modifiable by other 
-    users -- since root never executes any files out of there, and shouldn't 
+
+    <p>You can create an htdocs subdirectory which is modifiable by other
+    users -- since root never executes any files out of there, and shouldn't
     be creating files in there.</p>
-    
-    <p>If you allow non-root users to modify any files that root either 
-    executes or writes on then you open your system to root compromises. 
+
+    <p>If you allow non-root users to modify any files that root either
+    executes or writes on then you open your system to root compromises.
     For example, someone could replace the <code class="program"><a href="../programs/httpd.html">httpd</a></code> binary so
     that the next time you start it, it will execute some arbitrary code. If
     the logs directory is writeable (by a non-root user), someone could replace
-    a log file with a symlink to some other system file, and then root 
-    might overwrite that file with arbitrary data. If the log files 
-    themselves are writeable (by a non-root user), then someone may be 
+    a log file with a symlink to some other system file, and then root
+    might overwrite that file with arbitrary data. If the log files
+    themselves are writeable (by a non-root user), then someone may be
     able to overwrite the log itself with bogus data.</p>
-    
+
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="ssi" id="ssi">Server Side Includes</a></h2>
-  
-    
+
     
-    <p>Server Side Includes (SSI) present a server administrator with 
+
+    <p>Server Side Includes (SSI) present a server administrator with
     several potential security risks.</p>
-    
-    <p>The first risk is the increased load on the server. All 
-    SSI-enabled files have to be parsed by Apache, whether or not 
-    there are any SSI directives included within the files. While this 
-    load increase is minor, in a shared server environment it can become 
+
+    <p>The first risk is the increased load on the server. All
+    SSI-enabled files have to be parsed by Apache, whether or not
+    there are any SSI directives included within the files. While this
+    load increase is minor, in a shared server environment it can become
     significant.</p>
-    
-    <p>SSI files also pose the same risks that are associated with CGI 
-    scripts in general. Using the "exec cmd" element, SSI-enabled files 
-    can execute any CGI script or program under the permissions of the 
-    user and group Apache runs as, as configured in httpd.conf.</p>
-    
-    <p>There are ways to enhance the security of SSI files while still 
+
+    <p>SSI files also pose the same risks that are associated with CGI
+    scripts in general. Using the <code>exec cmd</code> element, SSI-enabled
+    files can execute any CGI script or program under the permissions of the
+    user and group Apache runs as, as configured in <code>httpd.conf</code>.
+    </p>
+
+    <p>There are ways to enhance the security of SSI files while still
     taking advantage of the benefits they provide.</p>
-    
-    <p>To isolate the damage a wayward SSI file can cause, a server 
-    administrator can enable <a href="../suexec.html">suexec</a> as 
+
+    <p>To isolate the damage a wayward SSI file can cause, a server
+    administrator can enable <a href="../suexec.html">suexec</a> as
     described in the <a href="#cgi">CGI in General</a> section.</p>
-    
-    <p>Enabling SSI for files with .html or .htm extensions can be 
-    dangerous. This is especially true in a shared, or high traffic, 
-    server environment. SSI-enabled files should have a separate extension,
-    such as the conventional .shtml. This helps keep server load at a 
-    minimum and allows for easier management of risk.</p>
-    
-    <p>Another solution is to disable the ability to run scripts and 
+
+    <p>Enabling SSI for files with <code>.html</code> or <code>.htm</code>
+    extensions can be dangerous. This is especially true in a shared, or high
+    traffic, server environment. SSI-enabled files should have a separate
+    extension, such as the conventional <code>.shtml.</code> This helps keep
+    server load at a minimum and allows for easier management of risk.</p>
+
+    <p>Another solution is to disable the ability to run scripts and
     programs from SSI pages. To do this replace <code>Includes</code>
-    with <code>IncludesNOEXEC</code> in the <code class="directive"><a href="../mod/core.html#options">Options</a></code> directive.  Note that users may 
-    still use &lt;--#include virtual="..." --&gt; to execute CGI scripts if 
-    these scripts are in directories designated by a <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code> directive.</p>
-    
+    with <code>IncludesNOEXEC</code> in the <code class="directive"><a href="../mod/core.html#options">Options</a></code> directive.  Note that users may
+    still use <code>&lt;--#include virtual="..." --&gt;</code> to execute CGI
+    scripts if these scripts are in directories designated by a <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code> directive.</p>
+
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="cgi" id="cgi">CGI in General</a></h2>
-  
-    
+
     
-    <p>First of all, you always have to remember that you must trust the 
-    writers of the CGI scripts/programs or your ability to spot potential 
-    security holes in CGI, whether they were deliberate or accidental. CGI 
-    scripts can run essentially arbitrary commands on your system with the 
-    permissions of the web server user and can therefore be extremely 
+
+    <p>First of all, you always have to remember that you must trust the
+    writers of the CGI scripts/programs or your ability to spot potential
+    security holes in CGI, whether they were deliberate or accidental. CGI
+    scripts can run essentially arbitrary commands on your system with the
+    permissions of the web server user and can therefore be extremely
     dangerous if they are not carefully checked.</p>
-    
-    <p>All the CGI scripts will run as the same user, so they have potential 
-    to conflict (accidentally or deliberately) with other scripts e.g. User 
-    A hates User B, so he writes a script to trash User B's CGI database. One 
+
+    <p>All the CGI scripts will run as the same user, so they have potential
+    to conflict (accidentally or deliberately) with other scripts e.g. User
+    A hates User B, so he writes a script to trash User B's CGI database. One
     program which can be used to allow scripts to run as different users is
-    <a href="../suexec.html">suEXEC</a> which is included with Apache as of 
-    1.2 and is called from special hooks in the Apache server code. Another 
-    popular way of doing this is with 
+    <a href="../suexec.html">suEXEC</a> which is included with Apache as of
+    1.2 and is called from special hooks in the Apache server code. Another
+    popular way of doing this is with
     <a href="http://cgiwrap.unixtools.org/">CGIWrap</a>.</p>
-    
+
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="nsaliasedcgi" id="nsaliasedcgi">Non Script Aliased CGI</a></h2>
-  
-    
+
     
-    <p>Allowing users to execute CGI scripts in any directory should only be 
+
+    <p>Allowing users to execute CGI scripts in any directory should only be
     considered if:</p>
-    
+
     <ul>
-      <li>You trust your users not to write scripts which will deliberately 
+      <li>You trust your users not to write scripts which will deliberately
           or accidentally expose your system to an attack.</li>
-      <li>You consider security at your site to be so feeble in other areas, 
+      <li>You consider security at your site to be so feeble in other areas,
           as to make one more potential hole irrelevant.</li>
       <li>You have no users, and nobody ever visits your server.</li>
     </ul>
-    
+
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="saliasedcgi" id="saliasedcgi">Script Aliased CGI</a></h2>
-  
-    
+
     
-    <p>Limiting CGI to special directories gives the admin control over what 
-    goes into those directories. This is inevitably more secure than non 
-    script aliased CGI, but only if users with write access to the 
-    directories are trusted or the admin is willing to test each 
+
+    <p>Limiting CGI to special directories gives the admin control over what
+    goes into those directories. This is inevitably more secure than non
+    script aliased CGI, but only if users with write access to the
+    directories are trusted or the admin is willing to test each
     new CGI script/program for potential security holes.</p>
-    
-    <p>Most sites choose this option over the non script aliased CGI 
+
+    <p>Most sites choose this option over the non script aliased CGI
     approach.</p>
-    
+
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="dynamic" id="dynamic">Other sources of dynamic content</a></h2>
@@ -207,66 +209,67 @@
 
   <p>
   Embedded scripting options which run as part of the server itself,
-  such as mod_php, mod_perl, mod_tcl, and mod_python, run under the
-  identity of the server itself (see the <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code> directive), and therefore
-  scripts executed by these engines potentially can access anything the
-  server user can. Some scripting engines may provide restrictions, but
+  such as <code>mod_php</code>, <code>mod_perl</code>, <code>mod_tcl</code>,
+  and <code>mod_python</code>, run under the identity of the server itself
+  (see the <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code> directive), and
+  therefore scripts executed by these engines potentially can access anything
+  the server user can. Some scripting engines may provide restrictions, but
   it is better to be safe and assume not.</p>
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="systemsettings" id="systemsettings">Protecting System Settings</a></h2>
-  
-    
+
     
-    <p>To run a really tight ship, you'll want to stop users from setting 
-    up <code>.htaccess</code> files which can override security features 
+
+    <p>To run a really tight ship, you'll want to stop users from setting
+    up <code>.htaccess</code> files which can override security features
     you've configured. Here's one way to do it.</p>
-    
+
     <p>In the server configuration file, put</p>
-    
+
     <div class="example"><p><code>
       &lt;Directory /&gt; <br />
         AllowOverride None <br />
       &lt;/Directory&gt;
     </code></p></div>
-    
-    <p>This prevents the use of <code>.htaccess</code> files in all 
+
+    <p>This prevents the use of <code>.htaccess</code> files in all
     directories apart from those specifically enabled.</p>
-    
+
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="protectserverfiles" id="protectserverfiles">Protect Server Files by Default</a></h2>
-  
-    
+
     
-    <p>One aspect of Apache which is occasionally misunderstood is the 
-    feature of default access. That is, unless you take steps to change it, 
-    if the server can find its way to a file through normal URL mapping 
+
+    <p>One aspect of Apache which is occasionally misunderstood is the
+    feature of default access. That is, unless you take steps to change it,
+    if the server can find its way to a file through normal URL mapping
     rules, it can serve it to clients.</p>
-    
+
     <p>For instance, consider the following example:</p>
-    
+
     <div class="example"><p><code>
       # cd /; ln -s / public_html <br />
       Accessing <code>http://localhost/~root/</code>
     </code></p></div>
-    
-    <p>This would allow clients to walk through the entire filesystem. To 
-    work around this, add the following block to your server's 
+
+    <p>This would allow clients to walk through the entire filesystem. To
+    work around this, add the following block to your server's
     configuration:</p>
-    
+
     <div class="example"><p><code>
       &lt;Directory /&gt; <br />
       Order Deny,Allow <br />
       Deny from all <br />
       &lt;/Directory&gt;
     </code></p></div>
-    
-    <p>This will forbid default access to filesystem locations. Add 
-    appropriate <code class="directive"><a href="../mod/core.html#directory">Directory</a></code> blocks to 
+
+    <p>This will forbid default access to filesystem locations. Add
+    appropriate <code class="directive"><a href="../mod/core.html#directory">Directory</a></code> blocks to
     allow access only in those areas you wish. For example,</p>
-    
+
     <div class="example"><p><code>
       &lt;Directory /usr/users/*/public_html&gt; <br />
         Order Deny,Allow <br />
@@ -277,69 +280,69 @@
         Allow from all <br />
       &lt;/Directory&gt;
     </code></p></div>
-    
-    <p>Pay particular attention to the interactions of <code class="directive"><a href="../mod/core.html#location">Location</a></code> and <code class="directive"><a href="../mod/core.html#directory">Directory</a></code> directives; for instance, even 
+
+    <p>Pay particular attention to the interactions of <code class="directive"><a href="../mod/core.html#location">Location</a></code> and <code class="directive"><a href="../mod/core.html#directory">Directory</a></code> directives; for instance, even
     if <code>&lt;Directory /&gt;</code> denies access, a <code>
     &lt;Location /&gt;</code> directive might overturn it.</p>
-    
-    <p>Also be wary of playing games with the <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> directive; setting it to 
-    something like "./" would have the same effect, for root, as the first 
-    example above. If you are using Apache 1.3 or above, we strongly 
-    recommend that you include the following line in your server 
+
+    <p>Also be wary of playing games with the <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> directive; setting it to
+    something like <code>./</code> would have the same effect, for root, as
+    the first example above. If you are using Apache 1.3 or above, we strongly
+    recommend that you include the following line in your server
     configuration files:</p>
-    
+
     <div class="example"><p><code>
       UserDir disabled root
     </code></p></div>
-    
+
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="watchyourlogs" id="watchyourlogs">Watching Your Logs</a></h2>
-  
-    
+
     
-    <p>To keep up-to-date with what is actually going on against your server 
-    you have to check the <a href="../logs.html">Log Files</a>.  Even though 
-    the log files only reports what has already happened, they will give you 
-    some understanding of what attacks is thrown against the server and 
+
+    <p>To keep up-to-date with what is actually going on against your server
+    you have to check the <a href="../logs.html">Log Files</a>.  Even though
+    the log files only reports what has already happened, they will give you
+    some understanding of what attacks is thrown against the server and
     allow you to check if the necessary level of security is present.</p>
-    
+
     <p>A couple of examples:</p>
-    
+
     <div class="example"><p><code>
       grep -c "/jsp/source.jsp?/jsp/ /jsp/source.jsp??" access_log <br />
       grep "client denied" error_log | tail -n 10
     </code></p></div>
-    
+
     <p>The first example will list the number of attacks trying to exploit the
-    <a href="http://online.securityfocus.com/bid/4876/info/">Apache Tomcat 
-    Source.JSP Malformed Request Information Disclosure Vulnerability</a>, 
+    <a href="http://online.securityfocus.com/bid/4876/info/">Apache Tomcat
+    Source.JSP Malformed Request Information Disclosure Vulnerability</a>,
     the second example will list the ten last denied clients, for example:</p>
-    
+
     <div class="example"><p><code>
-      [Thu Jul 11 17:18:39 2002] [error] [client foo.example.com] client denied 
+      [Thu Jul 11 17:18:39 2002] [error] [client foo.example.com] client denied
       by server configuration: /usr/local/apache/htdocs/.htpasswd
     </code></p></div>
-    
-    <p>As you can see, the log files only report what already has happened, so 
-    if the client had been able to access the <code>.htpasswd</code> file you 
+
+    <p>As you can see, the log files only report what already has happened, so
+    if the client had been able to access the <code>.htpasswd</code> file you
     would have seen something similar to:</p>
-    
+
     <div class="example"><p><code>
       foo.example.com - - [12/Jul/2002:01:59:13 +0200] "GET /.htpasswd HTTP/1.1"
     </code></p></div>
-    
-    <p>in your <a href="../logs.html#accesslog">Access Log</a>. This means 
-    you probably commented out the following in your server configuration 
+
+    <p>in your <a href="../logs.html#accesslog">Access Log</a>. This means
+    you probably commented out the following in your server configuration
     file:</p>
-    
+
     <div class="example"><p><code>
       &lt;Files ~ "^\.ht"&gt; <br />
         Order allow,deny <br />
         Deny from all <br />
       &lt;/Files&gt;
     </code></p></div>
-    
+
   </div></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/misc/security_tips.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/misc/security_tips.xml.ko b/docs/manual/misc/security_tips.xml.ko
index bf711d051c9..a6fdd478e42 100644
--- a/docs/manual/misc/security_tips.xml.ko
+++ b/docs/manual/misc/security_tips.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:658547 (outdated) -->
+<!-- English Revision: 105989:686269 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index 6cf65ac9e92..8e46bdf73d4 100644
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -927,7 +927,7 @@ through</td></tr>
         clears the in-error flag.
     </td></tr>
     <tr><td>timeout</td>
-        <td><code class="directive">ProxyTimeout</code></td>
+        <td><code class="directive"><a href="#proxytimeout">ProxyTimeout</a></code></td>
         <td>Connection timeout in seconds.
         The number of seconds Apache waits for data sent by / to the backend.
     </td></tr>
@@ -1409,7 +1409,7 @@ expressions</td></tr>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Network timeout for proxied requests</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyTimeout <var>seconds</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ProxyTimeout 300</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Value of <code class="directive"><a href="../mod/core.html#timeout">Timeout</a></code></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_proxy</td></tr>
diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja
index 8eaa74eab02..46de8e186ee 100644
--- a/docs/manual/mod/mod_proxy.xml.ja
+++ b/docs/manual/mod/mod_proxy.xml.ja
@@ -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: 421100:684343 (outdated) -->
+<!-- English Revision: 421100:686548 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_proxy_http.html.en b/docs/manual/mod/mod_proxy_http.html.en
index b13292f681a..c7328408f0c 100644
--- a/docs/manual/mod/mod_proxy_http.html.en
+++ b/docs/manual/mod/mod_proxy_http.html.en
@@ -75,10 +75,10 @@
         <dt>proxy-nokeepalive</dt>
         <dd>Forces the proxy to close the backend connection after
         each request.</dd>
-        <dt>Proxy-Chain-Auth</dt>
+        <dt>proxy-chain-auth</dt>
         <dd>If the proxy requires authentication, it will read and
         consume the proxy authentication credentials sent by the client.
-        With <var>Proxy-Chain-Auth</var> it will <em>also</em> forward
+        With <var>proxy-chain-auth</var> it will <em>also</em> forward
         the credentials to the next proxy in the chain.  This may
         be necessary if you have a chain of proxies that share
         authentication information.  <strong>Security Warning:</strong>
diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de
index ad4cc88e491..36406f9e0a4 100644
--- a/docs/manual/mod/quickreference.html.de
+++ b/docs/manual/mod/quickreference.html.de
@@ -548,7 +548,7 @@ expressions</td></tr>
 <tr class="odd"><td><a href="mod_proxy.html#proxyrequests">ProxyRequests On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables forward (standard) proxy requests</td></tr>
 <tr><td><a href="mod_proxy.html#proxyset">ProxySet <var>url</var> <var>key=value [key=value ...]</var></a></td><td></td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4">Set various Proxy balancer or member parameters</td></tr>
 <tr class="odd"><td><a href="mod_proxy.html#proxystatus">ProxyStatus Off|On|Full</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Show Proxy LoadBalancer status in mod_status</td></tr>
-<tr><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
+<tr><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
 <tr class="odd"><td><a href="mod_proxy.html#proxyvia">ProxyVia On|Off|Full|Block</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Information provided in the <code>Via</code> HTTP response
 header for proxied requests</td></tr>
 <tr><td><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Name of the file that will be inserted at the end
diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index 28ed4e38cde..c144d5f6ca8 100644
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -535,7 +535,7 @@ expressions</td></tr>
 <tr class="odd"><td><a href="mod_proxy.html#proxyrequests">ProxyRequests On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables forward (standard) proxy requests</td></tr>
 <tr><td><a href="mod_proxy.html#proxyset">ProxySet <var>url</var> <var>key=value [key=value ...]</var></a></td><td></td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4">Set various Proxy balancer or member parameters</td></tr>
 <tr class="odd"><td><a href="mod_proxy.html#proxystatus">ProxyStatus Off|On|Full</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Show Proxy LoadBalancer status in mod_status</td></tr>
-<tr><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
+<tr><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
 <tr class="odd"><td><a href="mod_proxy.html#proxyvia">ProxyVia On|Off|Full|Block</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Information provided in the <code>Via</code> HTTP response
 header for proxied requests</td></tr>
 <tr><td><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Name of the file that will be inserted at the end
diff --git a/docs/manual/mod/quickreference.html.es b/docs/manual/mod/quickreference.html.es
index cc3d7e61ebb..20a0fe64729 100644
--- a/docs/manual/mod/quickreference.html.es
+++ b/docs/manual/mod/quickreference.html.es
@@ -542,7 +542,7 @@ expressions</td></tr>
 <tr class="odd"><td><a href="mod_proxy.html#proxyrequests">ProxyRequests On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables forward (standard) proxy requests</td></tr>
 <tr><td><a href="mod_proxy.html#proxyset">ProxySet <var>url</var> <var>key=value [key=value ...]</var></a></td><td></td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4">Set various Proxy balancer or member parameters</td></tr>
 <tr class="odd"><td><a href="mod_proxy.html#proxystatus">ProxyStatus Off|On|Full</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Show Proxy LoadBalancer status in mod_status</td></tr>
-<tr><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
+<tr><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
 <tr class="odd"><td><a href="mod_proxy.html#proxyvia">ProxyVia On|Off|Full|Block</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Information provided in the <code>Via</code> HTTP response
 header for proxied requests</td></tr>
 <tr><td><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Name of the file that will be inserted at the end
diff --git a/docs/manual/mod/quickreference.html.ko.euc-kr b/docs/manual/mod/quickreference.html.ko.euc-kr
index 187eeb30889..11cf76b1b75 100644
--- a/docs/manual/mod/quickreference.html.ko.euc-kr
+++ b/docs/manual/mod/quickreference.html.ko.euc-kr
@@ -485,7 +485,7 @@ expressions</td></tr>
 <tr><td><a href="mod_proxy.html#proxyrequests">ProxyRequests On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables forward (standard) proxy requests</td></tr>
 <tr class="odd"><td><a href="mod_proxy.html#proxyset">ProxySet <var>url</var> <var>key=value [key=value ...]</var></a></td><td></td><td>d</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Set various Proxy balancer or member parameters</td></tr>
 <tr><td><a href="mod_proxy.html#proxystatus">ProxyStatus Off|On|Full</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Show Proxy LoadBalancer status in mod_status</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
 <tr><td><a href="mod_proxy.html#proxyvia">ProxyVia On|Off|Full|Block</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Information provided in the <code>Via</code> HTTP response
 header for proxied requests</td></tr>
 <tr class="odd"><td><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ÆÄÀϸñ·Ï ¸¶Áö¸·¿¡ »ðÀÔÇÒ ÆÄÀÏÀÇ À̸§</td></tr>
diff --git a/docs/manual/mod/quickreference.html.ru.koi8-r b/docs/manual/mod/quickreference.html.ru.koi8-r
index 1de03e5c5a1..c152008ffe3 100644
--- a/docs/manual/mod/quickreference.html.ru.koi8-r
+++ b/docs/manual/mod/quickreference.html.ru.koi8-r
@@ -540,7 +540,7 @@ expressions</td></tr>
 <tr class="odd"><td><a href="mod_proxy.html#proxyrequests">ProxyRequests On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables forward (standard) proxy requests</td></tr>
 <tr><td><a href="mod_proxy.html#proxyset">ProxySet <var>url</var> <var>key=value [key=value ...]</var></a></td><td></td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4">Set various Proxy balancer or member parameters</td></tr>
 <tr class="odd"><td><a href="mod_proxy.html#proxystatus">ProxyStatus Off|On|Full</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Show Proxy LoadBalancer status in mod_status</td></tr>
-<tr><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
+<tr><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
 <tr class="odd"><td><a href="mod_proxy.html#proxyvia">ProxyVia On|Off|Full|Block</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Information provided in the <code>Via</code> HTTP response
 header for proxied requests</td></tr>
 <tr><td><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Name of the file that will be inserted at the end
diff --git a/docs/manual/mod/quickreference.html.tr.utf8 b/docs/manual/mod/quickreference.html.tr.utf8
index 06927141c39..dff56c673f8 100644
--- a/docs/manual/mod/quickreference.html.tr.utf8
+++ b/docs/manual/mod/quickreference.html.tr.utf8
@@ -537,7 +537,7 @@ expressions</td></tr>
 <tr class="odd"><td><a href="mod_proxy.html#proxyrequests">ProxyRequests On|Off</a></td><td> Off </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables forward (standard) proxy requests</td></tr>
 <tr><td><a href="mod_proxy.html#proxyset">ProxySet <var>url</var> <var>key=value [key=value ...]</var></a></td><td></td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4">Set various Proxy balancer or member parameters</td></tr>
 <tr class="odd"><td><a href="mod_proxy.html#proxystatus">ProxyStatus Off|On|Full</a></td><td> Off </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Show Proxy LoadBalancer status in mod_status</td></tr>
-<tr><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td> 300 </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
+<tr><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td></td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
 <tr class="odd"><td><a href="mod_proxy.html#proxyvia">ProxyVia On|Off|Full|Block</a></td><td> Off </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Information provided in the <code>Via</code> HTTP response
 header for proxied requests</td></tr>
 <tr><td><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName <var>dosya-ismi</var></a></td><td></td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Dizin listesinin sonuna yerleştirilecek dosyanın ismini