From e5ab01823ef2d4777ed62d3a32514fecd393a188 Mon Sep 17 00:00:00 2001
From: Stefan Fritsch <sf@apache.org>
Date: Tue, 28 Dec 2010 14:33:45 +0000
Subject: [PATCH] update transforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1053357 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/env.html.en                |  34 ++++++
 docs/manual/env.xml.ja                 |   2 +-
 docs/manual/env.xml.ko                 |   2 +-
 docs/manual/env.xml.tr                 |   2 +-
 docs/manual/howto/cgi.html.en          |  18 ++-
 docs/manual/howto/cgi.xml.ja           |   2 +-
 docs/manual/howto/cgi.xml.ko           |   2 +-
 docs/manual/mod/core.html.en           | 141 ++++++----------------
 docs/manual/mod/core.xml.de            |   2 +-
 docs/manual/mod/core.xml.ja            |   2 +-
 docs/manual/mod/core.xml.tr            |   2 +-
 docs/manual/new_features_2_4.html.en   |  11 +-
 docs/manual/upgrading.html.en          |   9 +-
 docs/manual/upgrading.html.fr          |   2 +
 docs/manual/upgrading.xml.fr           |   2 +-
 docs/manual/upgrading.xml.meta         |   2 +-
 docs/manual/vhosts/details.html.en     | 157 +++++--------------------
 docs/manual/vhosts/details.xml.fr      |   2 +-
 docs/manual/vhosts/details.xml.ko      |   2 +-
 docs/manual/vhosts/details.xml.tr      |   2 +-
 docs/manual/vhosts/examples.html.en    |  42 ++-----
 docs/manual/vhosts/examples.html.fr    |   2 +
 docs/manual/vhosts/examples.xml.fr     |   2 +-
 docs/manual/vhosts/examples.xml.ja     |   2 +-
 docs/manual/vhosts/examples.xml.ko     |   2 +-
 docs/manual/vhosts/examples.xml.meta   |   2 +-
 docs/manual/vhosts/examples.xml.tr     |   2 +-
 docs/manual/vhosts/index.html.en       |   1 -
 docs/manual/vhosts/index.html.fr       |   2 +
 docs/manual/vhosts/index.xml.de        |   2 +-
 docs/manual/vhosts/index.xml.fr        |   2 +-
 docs/manual/vhosts/index.xml.ja        |   2 +-
 docs/manual/vhosts/index.xml.ko        |   2 +-
 docs/manual/vhosts/index.xml.meta      |   2 +-
 docs/manual/vhosts/index.xml.tr        |   2 +-
 docs/manual/vhosts/ip-based.html.en    |  27 +++--
 docs/manual/vhosts/ip-based.html.fr    |   2 +
 docs/manual/vhosts/ip-based.xml.fr     |   2 +-
 docs/manual/vhosts/ip-based.xml.ja     |   2 +-
 docs/manual/vhosts/ip-based.xml.ko     |   2 +-
 docs/manual/vhosts/ip-based.xml.meta   |   2 +-
 docs/manual/vhosts/ip-based.xml.tr     |   2 +-
 docs/manual/vhosts/mass.html.en        |   1 -
 docs/manual/vhosts/mass.xml.ko         |   2 +-
 docs/manual/vhosts/mass.xml.tr         |   2 +-
 docs/manual/vhosts/name-based.html.en  |  60 ++++------
 docs/manual/vhosts/name-based.html.fr  |   2 +
 docs/manual/vhosts/name-based.xml.de   |   2 +-
 docs/manual/vhosts/name-based.xml.fr   |   2 +-
 docs/manual/vhosts/name-based.xml.ja   |   2 +-
 docs/manual/vhosts/name-based.xml.ko   |   2 +-
 docs/manual/vhosts/name-based.xml.meta |   2 +-
 docs/manual/vhosts/name-based.xml.tr   |   2 +-
 53 files changed, 222 insertions(+), 363 deletions(-)

diff --git a/docs/manual/env.html.en b/docs/manual/env.html.en
index 5e575e5cc2..8e8890ead1 100644
--- a/docs/manual/env.html.en
+++ b/docs/manual/env.html.en
@@ -126,6 +126,13 @@
           not be a number. Characters which do not match this
           restriction will be replaced by an underscore when passed to
           CGI scripts and SSI pages.</li>
+          
+          <li>A special case are HTTP headers which are passed to CGI
+          scripts and the like via environment variables (see below).
+          They are converted to uppercase and only dashes are replaced with
+          underscores; if the header contains any other (invalid) character,
+          the whole header is silently dropped. See <a href="#fixheader">
+          below</a> for a workaround.</li>
 
           <li>The <code class="directive"><a href="./mod/mod_env.html#setenv">SetEnv</a></code> directive runs
           late during request processing meaning that directives such as
@@ -382,6 +389,33 @@
 <h2><a name="examples" id="examples">Examples</a></h2>
     
 
+    <h3><a name="fixheader" id="fixheader">Passing broken headers to CGI scripts</a></h3>
+      
+      
+      <p>Starting with version 2.4, Apache is more strict about how HTTP
+      headers are converted to environment variables in <code class="module"><a href="./mod/mod_cgi&#10;      .html">mod_cgi
+      </a></code> and other modules:  Previously any invalid characters
+      in header names were simply translated to underscores.  This allowed
+      for some potential cross-site-scripting attacks via header injection
+      (see <a href="http://events.ccc.de/congress/2007/Fahrplan/events/2212.en.html">
+      Unusual Web Bugs</a>, slide 19/20).</p>
+      
+      <p>If you have to support a client which sends broken headers and
+      which can't be fixed, a simple workaround involving <code class="module"><a href="./mod/mod_setenvif&#10;      .html">mod_setenvif
+      </a></code> and <code class="module"><a href="./mod/mod_header.html">mod_header</a></code> allows you to still accept
+      these headers:</p>
+      
+<div class="example"><pre>
+# 
+# The following works around a client sending a broken Accept_Encoding
+# header.
+#
+SetEnvIfNoCase ^Accept.Encoding$ ^(.*)$ fix_accept_encoding=$1
+RequestHeader set Accept-Encoding %{fix_accept_encoding}e env=fix_accept_encoding
+</pre></div>
+      
+    
+
     <h3><a name="misbehaving" id="misbehaving">Changing protocol behavior with misbehaving clients</a></h3>
         
 
diff --git a/docs/manual/env.xml.ja b/docs/manual/env.xml.ja
index 52cea70a88..26c631f247 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: 659902:1001639 (outdated) -->
+<!-- English Revision: 659902:1053353 (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 26d035806e..9a6fb64896 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:1001639 (outdated) -->
+<!-- English Revision: 105989:1053353 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/env.xml.tr b/docs/manual/env.xml.tr
index e3acafd641..c882ce398d 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: 810187:1001639 (outdated) -->
+<!-- English Revision: 810187:1053353 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/howto/cgi.html.en b/docs/manual/howto/cgi.html.en
index cb37dbe46a..bfcedde1e5 100644
--- a/docs/manual/howto/cgi.html.en
+++ b/docs/manual/howto/cgi.html.en
@@ -342,10 +342,6 @@
 
       <p>Make sure that this is in fact the path to the
       interpreter.</p>
-
-      <p>In addition, if your CGI program depends on other <a href="#env">environment variables</a>, you will need to
-      assure that those variables are passed by Apache.</p>
-
       <div class="warning">
       When editing CGI scripts on Windows, end-of-line characters may be
       appended to the interpreter path. Ensure that files are then
@@ -354,6 +350,20 @@
       unrecognized end-of-line character being interpreted as a part of
       the interpreter filename.
       </div>
+    
+
+    <h3><a name="missingenv" id="missingenv">Missing environment variables</a></h3>
+      
+
+      <p>If your CGI program depends on non-standard <a href="#env">environment variables</a>, you will need to
+      assure that those variables are passed by Apache.</p>
+
+      <p>When you miss HTTP headers from the environment, make
+      sure they are formatted according to 
+      <a href="http://tools.ietf.org/html/rfc2616">RFC 2616</a>,
+      section 4.2: Header names must start with a letter, 
+      followed only by letters, numbers or hyphen. Any header
+      violating this rule will be dropped silently.</p>
 
     
 
diff --git a/docs/manual/howto/cgi.xml.ja b/docs/manual/howto/cgi.xml.ja
index c7f457c031..b4fc23d620 100644
--- a/docs/manual/howto/cgi.xml.ja
+++ b/docs/manual/howto/cgi.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: 545841:1031597 (outdated) -->
+<!-- English Revision: 545841:1053353 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/howto/cgi.xml.ko b/docs/manual/howto/cgi.xml.ko
index 8db0fe6fd4..f105b14a0a 100644
--- a/docs/manual/howto/cgi.xml.ko
+++ b/docs/manual/howto/cgi.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:1031597 (outdated) -->
+<!-- English Revision: 105989:1053353 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 723464fa44..db2790c86c 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -1907,8 +1907,7 @@ Apache httpd 2.3.2 and later</td></tr>
     occupied waiting on connections with idle clients.</p>
 
     <p>In a name-based virtual host context, the value of the first
-    defined virtual host (the default host) in a set of <code class="directive"><a href="#namevirtualhost">NameVirtualHost</a></code> will be used.
-    The other values will be ignored.</p>
+    defined virtual host best matching the local IP and port will be used.</p>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -2151,7 +2150,7 @@ will be accepted from the client</td></tr>
      <div class="warning"><h3>Warning</h3>
      <p> When name-based virtual hosting is used, the value for this
      directive is taken from the default (first-listed) virtual host for the
-     <code class="directive">NameVirtualHost</code> the connection was mapped to.</p>
+     local IP and port combination</p>.
      </div>
 
 
@@ -2195,11 +2194,10 @@ client</td></tr>
 
     <div class="warning"><h3>Warning</h3>
     <p> When name-based virtual hosting is used, the value for this
-    directive is taken from the default (first-listed) virtual host for the
-    <code class="directive">NameVirtualHost</code> the connection was mapped to.</p>
+    directive is taken from the default (first-listed) virtual host best 
+    matching the current IP address and port combination.</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="LimitRequestLine" id="LimitRequestLine">LimitRequestLine</a> <a name="limitrequestline" id="limitrequestline">Directive</a></h2>
@@ -2240,8 +2238,8 @@ from the client</td></tr>
 
     <div class="warning"><h3>Warning</h3>
     <p> When name-based virtual hosting is used, the value for this
-    directive is taken from the default (first-listed) virtual host for the
-    <code class="directive">NameVirtualHost</code> the connection was mapped to.</p>
+    directive is taken from the default (first-listed) virtual host best 
+    matching the current IP address and port combination.</p>
     </div>
 
 
@@ -2896,80 +2894,13 @@ hosting</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
 </table>
 
-<p>A single <code class="directive">NameVirtualHost</code> directive
-identifies a set of identical virtual hosts on which the server will
-further select from on the basis of the <em>hostname</em>
-requested by the client.  The <code class="directive">NameVirtualHost</code>
-directive is a required directive if you want to configure
-<a href="../vhosts/">name-based virtual hosts</a>.</p>
-
-<p>This directive, and the corresponding <code class="directive">VirtualHost</code>,
-<em>must</em> be qualified with a port number if the server supports both HTTP
-and HTTPS connections.</p>
-
-<p>Although <var>addr</var> can be a hostname, it is recommended
-that you always use an IP address or a wildcard.  A wildcard
-NameVirtualHost matches only virtualhosts that also have a literal wildcard
-as their argument.</p>
-
-<p>In cases where a firewall or other proxy receives the requests and
-forwards them on a different IP address to the server, you must specify the
-IP address of the physical interface on the machine which will be
-servicing the requests. </p>
-
-<p> In the example below, requests received on interface 192.0.2.1 and port 80
-will only select among the first two virtual hosts. Requests received on
-port 80 on any other interface will only select among the third and fourth
-virtual hosts. In the common case where the interface isn't important
-to the mapping, only the "*:80" NameVirtualHost and VirtualHost directives
-are necessary.</p>
-
-   <div class="example"><p><code>
-      NameVirtualHost 192.0.2.1:80<br />
-      NameVirtualHost *:80<br /><br />
-
-      &lt;VirtualHost 192.0.2.1:80&gt;<br />
-      &nbsp; ServerName namebased-a.example.com<br />
-      &lt;/VirtualHost&gt;<br />
-      <br />
-      &lt;VirtualHost 192.0.2.1:80&gt;<br />
-      &nbsp; Servername namebased-b.example.com<br />
-      &lt;/VirtualHost&gt;<br />
-      <br />
-      &lt;VirtualHost *:80&gt;<br />
-      &nbsp; ServerName namebased-c.example.com <br />
-      &lt;/VirtualHost&gt;<br />
-      <br />
-      &lt;VirtualHost *:80&gt;<br />
-      &nbsp; ServerName namebased-d.example.com <br />
-      &lt;/VirtualHost&gt;<br />
-      <br />
-
-    </code></p></div>
-
-    <p>If no matching virtual host is found, then the first listed
-    virtual host that matches the IP address and port will be used.</p>
-
-
-    <p>IPv6 addresses must be enclosed in square brackets, as shown
-    in the following example:</p>
+<p>Prior to 2.3.11, <code class="directive">NameVirtualHost</code> was required
+to instruct the server that a particular IP address and port combination
+was usable as a name-based virtual host.  In 2.3.11 and later,
+any time an IP address and port combination is used in multiple virtual
+hosts, name-based virtual hosting is automatically enabled for that address.</p>
 
-    <div class="example"><p><code>
-      NameVirtualHost [2001:db8::a00:20ff:fea7:ccea]:8080
-    </code></p></div>
-
-    <div class="note"><h3>Argument to <code class="directive">&lt;VirtualHost&gt;</code>
-      directive</h3>
-      <p>Note that the argument to the <code class="directive">&lt;VirtualHost&gt;</code> directive must
-      exactly match the argument to the <code class="directive">NameVirtualHost</code> directive.</p>
-
-      <div class="example"><p><code>
-        NameVirtualHost 192.0.2.2:80<br />
-        &lt;VirtualHost 192.0.2.2:80&gt;<br />
-        # ...<br />
-        &lt;/VirtualHost&gt;<br />
-      </code></p></div>
-    </div>
+<p>This directive currently has no effect.</p>
 
 <h3>See also</h3>
 <ul>
@@ -3534,7 +3465,6 @@ itself</td></tr>
     documentation</a></li>
 <li><code class="directive"><a href="#usecanonicalname">UseCanonicalName</a></code></li>
 <li><code class="directive"><a href="#usecanonicalphysicalport">UseCanonicalPhysicalPort</a></code></li>
-<li><code class="directive"><a href="#namevirtualhost">NameVirtualHost</a></code></li>
 <li><code class="directive"><a href="#serveralias">ServerAlias</a></code></li>
 </ul>
 </div>
@@ -4017,7 +3947,8 @@ hostname or IP address</td></tr>
     used. When the server receives a request for a document on a
     particular virtual host, it uses the configuration directives
     enclosed in the <code class="directive">&lt;VirtualHost&gt;</code>
-    section. <var>Addr</var> can be:</p>
+    section. <var>Addr</var> can be any of the following, optionally followed by
+    a colon and a port number (or *):</p>
 
     <ul>
       <li>The IP address of the virtual host;</li>
@@ -4025,15 +3956,15 @@ hostname or IP address</td></tr>
       <li>A fully qualified domain name for the IP address of the
       virtual host (not recommended);</li>
 
-      <li>The character <code>*</code>, which is used only in combination with
-      <code>NameVirtualHost *</code> to match all IP addresses; or</li>
+      <li>The character <code>*</code>, which acts as a wildcard and matches 
+      any IP address.</li>
+  
+      <li>The string <code>_default_</code>, which is an alias for <code>*</code></li>
 
-      <li>The string <code>_default_</code>, which is used only
-      with IP virtual hosting to catch unmatched IP addresses.</li>
     </ul>
 
     <div class="example"><h3>Example</h3><p><code>
-      &lt;VirtualHost 10.1.2.3&gt;<br />
+      &lt;VirtualHost 10.1.2.3:80&gt;<br />
       <span class="indent">
         ServerAdmin webmaster@host.example.com<br />
         DocumentRoot /www/docs/host.example.com<br />
@@ -4050,7 +3981,7 @@ hostname or IP address</td></tr>
     IPv6 example is shown below:</p>
 
     <div class="example"><p><code>
-      &lt;VirtualHost [2001:db8::a00:20ff:fea7:ccea]&gt;<br />
+      &lt;VirtualHost [2001:db8::a00:20ff:fea7:ccea]:80&gt;<br />
       <span class="indent">
         ServerAdmin webmaster@host.example.com<br />
         DocumentRoot /www/docs/host.example.com<br />
@@ -4076,30 +4007,24 @@ hostname or IP address</td></tr>
     using <code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code>.</p>
     </div>
 
-    <p>When using IP-based virtual hosting, the special name
-    <code>_default_</code> can be specified in
-    which case this virtual host will match any IP address that is
-    not explicitly listed in another virtual host. In the absence
-    of any <code>_default_</code> virtual host the "main" server config,
-    consisting of all those definitions outside any VirtualHost
-    section, is used when no IP-match occurs.</p>
-
-    <p>You can specify a <code>:port</code> to change the port that is
-    matched. If unspecified then it defaults to the same port as the
-    most recent <code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code>
-    statement of the main server. You may also specify <code>:*</code>
-    to match all ports on that address. (This is recommended when used
-    with <code>_default_</code>.)</p>
-
     <p>A <code class="directive"><a href="#servername">ServerName</a></code> should be
     specified inside each <code class="directive">&lt;VirtualHost&gt;</code> block. If it is absent, the
     <code class="directive"><a href="#servername">ServerName</a></code> from the "main"
     server configuration will be inherited.</p>
 
-    <p>If no matching virtual host is found, then the first listed
-    virtual host that matches the IP address will be used.  As a
-    consequence, the first listed virtual host is the default virtual
-    host.</p>
+    <p>When a request is received, the server first maps it to the best matching 
+    <code class="directive">&lt;VirtualHost&gt;</code> based on the local 
+    IP address and port combination only.  Non-wildcards have a higher 
+    precedence. if no match based on IP and port occurs at all, the 
+    "main" server configuration is used.</p>
+    
+    <p>If multiple virtual hosts contain the best matching IP address and port,
+    the server selects from these virtual hosts the best match based on the 
+    requested hostname.  If no matching name-based virtual host is found, 
+    then the first listed virtual host that matched the IP address will be 
+    used.  As a consequence, the first listed virtual for a given IP address
+    and port combination is default virtual host for that IP and port 
+    combination.</p>
 
     <div class="warning"><h3>Security</h3>
     <p>See the <a href="../misc/security_tips.html">security tips</a>
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index d8ca41d8bc..2338d53720 100644
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.xml.de
@@ -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: 290537:1053149 (outdated) -->
+<!-- English Revision: 290537:1053231 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index 180e204ba0..2c839fb53a 100644
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.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: 669847:1053149 (outdated) -->
+<!-- English Revision: 669847:1053231 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.tr b/docs/manual/mod/core.xml.tr
index 7242b83a20..7acc13e3a2 100644
--- a/docs/manual/mod/core.xml.tr
+++ b/docs/manual/mod/core.xml.tr
@@ -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:1053149 (outdated) -->
+<!-- English Revision: 813376:1053231 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/new_features_2_4.html.en b/docs/manual/new_features_2_4.html.en
index 99f8c41b36..ae2c87e553 100644
--- a/docs/manual/new_features_2_4.html.en
+++ b/docs/manual/new_features_2_4.html.en
@@ -111,11 +111,20 @@
       authentication or authorization.</dd>
 
       <dt><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></dt>
-
       <dd>Support for the 'onerror' attribute within an 'include' element,
       allowing an error document to be served on error instead of the default
       error string.</dd>
 
+      <dt><code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="./mod/mod_include.html">mod_include</a></code>,
+          <code class="module"><a href="./mod/mod_isapi.html">mod_isapi</a></code>, ...</dt>
+      <dd>Translation of headers to environment variables is more strict than 
+      before to mitigate some possible cross-site-scripting attacks via header
+      injection. Headers containing invalid characters (including underscores)
+      are now silently dropped. <a href="env.html">Environment Variables
+      in Apache</a> has some pointers on how to work around broken legacy
+      clients which require such headers. (This affects all modules which
+      use these environment variables.)</dd>
+
     </dl>
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en
index ced169cf38..a49935a2b9 100644
--- a/docs/manual/upgrading.html.en
+++ b/docs/manual/upgrading.html.en
@@ -214,7 +214,6 @@
         <li><code class="module"><a href="./mod/mod_filter.html">mod_filter</a></code>: <code class="directive"><a href="./mod/filter.html#filterprovider">FilterProvider</a></code> syntax has changed and
         now uses a boolean expression to determine if a filter is applied.
         </li>
-
       </ul>
     
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
@@ -228,6 +227,12 @@
       ignored.</li>
       <li><code class="program"><a href="./programs/htpasswd.html">htpasswd</a></code> now uses MD5 hash by default on
       all platforms.</li>
+
+      <li>The <code class="directive"><a href="./mod/core.html#namevirtualhost">NameVirtualHost</a></code>
+      directive no longer has any effect, other than to emit a
+      warning.  Any address/port combination appearing in multiple
+      virtual hosts is implicitly treated as a name-based virtual host.
+      </li>
     </ul>
     
 
@@ -253,8 +258,6 @@
  - load module <code class="module"><a href="./mod/mod_access_compat.html">mod_access_compat</a></code>, or update configuration to 2.4 authorization directives.</li>
       <li><code>Ignoring deprecated use of DefaultType in line NN of /path/to/httpd.conf</code> - remove <code class="directive"><a href="./mod/core.html#defaulttype">DefaultType</a></code>
       and replace with other configuration settings.</li>
-      <li><code>mixing * ports and non-* ports with a NameVirtualHost address is not supported</code>, <code>Either NameVirtualHost w.x.y.z:n has no VirtualHosts, or there is more than one identical NameVirtualHost line, or your VirtualHost declarations do not match the NameVirtualHost line</code> - these are not new messages, but they now cause startup to fail</li>
-      <li><code>_default_ is not allowed in NameVirtualHost directive</code> - self-explanatory; was never valid, but now causes startup to fail.</li>
     </ul></li>
     <li>Errors serving requests:
     <ul>
diff --git a/docs/manual/upgrading.html.fr b/docs/manual/upgrading.html.fr
index 40234b1a52..4bc1663420 100644
--- a/docs/manual/upgrading.html.fr
+++ b/docs/manual/upgrading.html.fr
@@ -21,6 +21,8 @@
 <p><span>Langues Disponibles: </span><a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/upgrading.html" title="Français">&nbsp;fr&nbsp;</a></p>
 </div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+            anglaise pour les changements récents.</div>
 
   <p>Afin d'assister les utilisateurs lors de leurs opérations de mise à
   jour, nous maintenons un document
diff --git a/docs/manual/upgrading.xml.fr b/docs/manual/upgrading.xml.fr
index 5724b54d9f..b5b2192699 100644
--- a/docs/manual/upgrading.xml.fr
+++ b/docs/manual/upgrading.xml.fr
@@ -3,7 +3,7 @@
 <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
-<!-- English Revision: 1043126 -->
+<!-- English Revision: 1043126:1053231 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/upgrading.xml.meta b/docs/manual/upgrading.xml.meta
index aba29996bb..1d2a68a225 100644
--- a/docs/manual/upgrading.xml.meta
+++ b/docs/manual/upgrading.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/vhosts/details.html.en b/docs/manual/vhosts/details.html.en
index 6bdcf8a45d..f36cfe71ea 100644
--- a/docs/manual/vhosts/details.html.en
+++ b/docs/manual/vhosts/details.html.en
@@ -64,16 +64,10 @@
     resolutions fail, those virtual host definitions are ignored.
     This is, therefore, not recommended.</p>
 
-    <p>If using IP-based vhosts, the address can be specified
-    as <code>_default_</code>, which will match a request if no
-    other vhost has the explicit address on which the request was
-    received.</p>
-
-    <p>If using name-based vhosts, the address can be specified as
+    <p>The address can be specified as
     <code>*</code>, which will match a request if no
     other vhost has the explicit address on which the request was
-    received.  The corresponding <code>NameVirtualHost</code>
-    directive must also use <code>*</code>.</p>
+    received. </p> 
 
     <p>The address appearing in the <code>VirtualHost</code>
     directive can have an optional port. If the port is unspecified,
@@ -93,11 +87,10 @@
     results from DNS lookups) are called the vhost's
     <em>address set</em>.</p>
 
-    <p>If you want Apache to discriminate on the
-    basis of the HTTP <code>Host</code> header supplied by the client,
-    the <code>NameVirtualHost</code> directive <em>must</em> appear
-    with the exact IP address (or wildcard) and port pair used in a
-    corresponding set of <code>VirtualHost</code> directives.</p>
+    <p>Apache automatically discriminates on the
+    basis of the HTTP <code>Host</code> header supplied by the client
+    whenever the most specific match for an IP address and port combination
+    is listed in multiple virtual hosts.</p>
 
     <p>The 
     <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> directive
@@ -106,11 +99,6 @@
     server).  If no <code>ServerName</code> is specified, the server
     attempts to deduce it from the server's IP address.</p>
 
-    <p>Multiple <code>NameVirtualHost</code> directives can be used,
-    each with a set of <code>VirtualHost</code> directives, but only
-    one <code>NameVirtualHost</code> directive should be used for
-    each specific IP:port pair.</p>
-
     <p>The first name-based vhost in the configuration file for a
     given IP:port pair is significant because it is used for all
     requests received on that address and port for which no other
@@ -118,66 +106,6 @@
     ServerAlias.  It is also used for all SSL connections if the
     server does not support <a class="glossarylink" href="../glossary.html#servernameindication" title="see glossary">Server Name Indication</a>.</p>
 
-    <p>If there are no vhosts defined for an address in a
-    <code>NameVirtualHost</code> directive, the
-    <code>NameVirtualHost</code> directive is ignored at startup and an error is
-    logged.</p>
-
-    <p>The ordering of <code>NameVirtualHost</code> and
-    <code>VirtualHost</code> directives is not important, which
-    makes the following two examples identical (only the order of
-    the <code>VirtualHost</code> directives for <em>one</em>
-    address set is important, see below):</p>
-
-<table><tr>
-<td><div class="example"><p><code>
-  NameVirtualHost 111.22.33.44<br />
-  &lt;VirtualHost 111.22.33.44&gt;<br />
-  # server A<br />
-  ...<br />
-  &lt;/VirtualHost&gt;<br />
-  &lt;VirtualHost 111.22.33.44&gt;<br />
-  # server B<br />
-  ...<br />
-  &lt;/VirtualHost&gt;<br />
-  <br />
-  NameVirtualHost 111.22.33.55<br />
-  &lt;VirtualHost 111.22.33.55&gt;<br />
-  # server C<br />
-  ...<br />
-  &lt;/VirtualHost&gt;<br />
-  &lt;VirtualHost 111.22.33.55&gt;<br />
-  # server D<br />
-  ...<br />
-  &lt;/VirtualHost&gt;
-</code></p></div></td>
-<td><div class="example"><p><code>
-  &lt;VirtualHost 111.22.33.44&gt;<br />
-  # server A<br />
-  &lt;/VirtualHost&gt;<br />
-  &lt;VirtualHost 111.22.33.55&gt;<br />
-  # server C<br />
-  ...<br />
-  &lt;/VirtualHost&gt;<br />
-  &lt;VirtualHost 111.22.33.44&gt;<br />
-  # server B<br />
-  ...<br />
-  &lt;/VirtualHost&gt;<br />
-  &lt;VirtualHost 111.22.33.55&gt;<br />
-  # server D<br />
-  ...<br />
-  &lt;/VirtualHost&gt;<br />
-  <br />
-  NameVirtualHost 111.22.33.44<br />
-  NameVirtualHost 111.22.33.55<br />
-  <br />
-</code></p></div></td>
-</tr></table>
-
-
-    <p>(To aid the readability of your configuration you should
-    prefer the left variant.)</p>
-
     <p>For every vhost various default values are set. In
     particular:</p>
 
@@ -242,10 +170,6 @@
     <p>If there are no exact matches for the address and port, then
     wildcard (<code>*</code>) matches are considered.</p>
 
-    <p>If there are still no matches, then vhosts with IP
-    address specified as <code>_default_</code> that match the
-    port are considered.</p>
-
     <p>If no matches are found, the request is served by the
     main server.</p>
 
@@ -257,17 +181,19 @@
 
     <h3><a name="ipbased" id="ipbased">IP-based vhost</a></h3>
 
-    <p>If there is no <code>NameVirtualHost</code> directive
-    matching the vhost, no further actions are performed and
-    the request is served from the first matching vhost.</p>
+    <p>If there is exactly one <code>VirtualHost</code> directive
+    listing the IP address and port combibation that was determined
+    to be the best match, no further actions are performed and
+    the request is served from the matching vhost.</p>
 
     
 
     <h3><a name="namebased" id="namebased">Name-based vhost</a></h3>
 
-    <p>If the entry corresponds to a name-based vhost, the "list" in
-    the remaining steps refers to the list of vhosts that matched, in
-    the order they were in the configuration file.</p>
+    <p>If there are multiple <code>VirtalHost</code> directives listing
+    the IP address and port combination that was determined to be the
+    best match, the "list" in the remaining steps refers to the list of vhosts 
+    that matched, in the order they were in the configuration file.</p>
 
     <p>If the connection is using SSL, the server supports <a class="glossarylink" href="../glossary.html#servernameindication" title="see glossary">Server Name Indication</a>, and
     the SSL client handshake includes the TLS extension with the
@@ -320,20 +246,18 @@
 <h3><a name="observations" id="observations">Observations</a></h3>
 
     <ul>
-      <li>A name-based vhost can never interfere with an IP-base
-      vhost and vice versa. IP-based vhosts can only be reached
-      through an IP address of its own address set and never
-      through any other address. The same applies to name-based
-      vhosts, they can only be reached through an IP address of the
-      corresponding address set which must be defined with a
-      <code>NameVirtualHost</code> directive.</li>
-
-      <li><code>ServerAlias</code>
+      <li>Name-based virtual hosting is a process applied after
+      the server has selected the best matching IP-based virtual
+      host.</li>
+
+      <li>If you don't care what IP address the client has connected to, use a
+      "*" as the address of every virtual host, and name-based virtual hosting
+      is applied across all configured virtual hosts.</li>
+
+      <li><code>ServerName</code> and <code>ServerAlias</code>
       checks are never performed for an IP-based vhost.</li>
 
-      <li>The order of name-/IP-based, the <code>_default_</code>
-      vhost and the <code>NameVirtualHost</code> directive within
-      the config file is not important. Only the ordering of
+      <li>Only the ordering of
       name-based vhosts for a specific address set is significant.
       The one name-based vhosts that comes first in the
       configuration file has the highest priority for its
@@ -343,39 +267,18 @@
       matching process. Apache always uses the real port to which
       the client sent the request.</li>
 
-      <li>If two IP-based vhosts have an address in common, the
-      vhost appearing first in the config file is always matched.
-      Such a thing might happen inadvertently. The server will give
-      a warning in the error logfile when it detects this.</li>
-
-      <li>A <code>_default_</code> vhost catches a request only if
-      there is no other vhost with a matching IP address
-      <em>and</em> a matching port number for the request. The
-      request is only caught if the port number to which the client
-      sent the request matches the port number of your
-      <code>_default_</code> vhost which is your standard
-      <code>Listen</code> by default. A wildcard port can be
-      specified (<em>i.e.</em>, <code>_default_:*</code>) to catch
-      requests to any available port. This also applies to
-      <code>NameVirtualHost *</code> vhosts.  Note that this is simply an
-      extension of the "best match" principle, as a specific and exact match
-      is favored over a wildcard.</li>
+      <li>If two vhosts have an address in common, those common addresses
+      act as name-based virtual hosts implicitly.  This is new behavior as of 
+      2.3.11.</li>
 
       <li>The main server is only used to serve a request if the IP
       address and port number to which the client connected 
       does not match any vhost (including a
-      <code>_default_</code> vhost). In other words, the main server
+      <code>*</code> vhost). In other words, the main server
       only catches a request for an unspecified address/port
       combination (unless there is a <code>_default_</code> vhost
       which matches that port).</li>
 
-      <li>A <code>_default_</code> vhost or the main server is
-      <em>never</em> matched for a request with an unknown or
-      missing <code>Host:</code> header field if the client
-      connected to an address (and port) which is used for
-      name-based vhosts, <em>e.g.</em>, in a
-      <code>NameVirtualHost</code> directive.</li>
-
       <li>You should never specify DNS names in
       <code>VirtualHost</code> directives because it will force
       your server to rely on DNS to boot. Furthermore it poses a
@@ -403,10 +306,6 @@
       readability of the configuration -- the post-config merging
       process makes it non-obvious that definitions mixed in around
       virtual hosts might affect all virtual hosts.)</li>
-
-      <li>Group corresponding <code>NameVirtualHost</code> and
-      <code>VirtualHost</code> definitions in your configuration to
-      ensure better readability.</li>
     </ul>
 
 </div></div>
diff --git a/docs/manual/vhosts/details.xml.fr b/docs/manual/vhosts/details.xml.fr
index a4e883aea0..4e8faf5df0 100644
--- a/docs/manual/vhosts/details.xml.fr
+++ b/docs/manual/vhosts/details.xml.fr
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='ISO-8859-1' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 420990:987254 (outdated) -->
+<!-- English Revision: 420990:1053231 (outdated) -->
 <!-- French translation by Vincent Deffontaines, review by alain B -->
 <!-- Updated by Lucien Gentis -->
 
diff --git a/docs/manual/vhosts/details.xml.ko b/docs/manual/vhosts/details.xml.ko
index 52905b029f..2c142deba8 100644
--- a/docs/manual/vhosts/details.xml.ko
+++ b/docs/manual/vhosts/details.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:987254 (outdated) -->
+<!-- English Revision: 105989:1053231 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/details.xml.tr b/docs/manual/vhosts/details.xml.tr
index 9c43ff6298..9d1f1b6af6 100644
--- a/docs/manual/vhosts/details.xml.tr
+++ b/docs/manual/vhosts/details.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: 420990:987254 (outdated) -->
+<!-- English Revision: 420990:1053231 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/vhosts/examples.html.en b/docs/manual/vhosts/examples.html.en
index b2113a2aaf..ca0a6c2eca 100644
--- a/docs/manual/vhosts/examples.html.en
+++ b/docs/manual/vhosts/examples.html.en
@@ -81,8 +81,6 @@
     # Ensure that Apache listens on port 80<br />
     Listen 80<br />
     <br />
-    # Listen for virtual host requests on all IP addresses<br />
-    NameVirtualHost *:80<br />
     <br />
     &lt;VirtualHost *:80&gt;<br />
     <span class="indent">
@@ -117,17 +115,9 @@
     <div class="note">
             <h3>Note</h3>
 
-            <p>You can, if you wish, replace <code>*</code> with the actual
-            IP address of the system. In that case, the argument to
-            <code>VirtualHost</code> <em>must</em> match the argument to
-            <code>NameVirtualHost</code>:</p>
-
-            <div class="example"><p><code>
-            NameVirtualHost 172.20.30.40<br />
-            <br />
-            &lt;VirtualHost 172.20.30.40&gt;<br />
-             # etc ...
-            </code></p></div>
+           <p>You can, if you wish, replace <code>*</code> with the actual
+           IP address of the system, when you don't care to discriminate based
+           on the IP address or port.</p>
 
            <p>However, it is additionally useful to use <code>*</code>
            on systems where the IP address is not predictable - for
@@ -167,9 +157,6 @@
     ServerName server.example.com<br />
     DocumentRoot /www/mainserver<br />
     <br />
-    # This is the other address<br />
-    NameVirtualHost 172.20.30.50<br />
-    <br />
     &lt;VirtualHost 172.20.30.50&gt;<br />
     <span class="indent">
         DocumentRoot /www/example1<br />
@@ -217,8 +204,6 @@
     <div class="example"><h3>Server configuration</h3><p><code>
     
 
-    NameVirtualHost 192.168.1.1<br />
-    NameVirtualHost 172.20.30.40<br />
     <br />
     &lt;VirtualHost 192.168.1.1 172.20.30.40&gt;<br />
     <span class="indent">
@@ -249,10 +234,9 @@
     ports.</a></h2>
 
     <p>You have multiple domains going to the same IP and also want to
-    serve multiple ports. By defining the ports in the "NameVirtualHost"
-    tag, you can allow this to work. If you try using &lt;VirtualHost
-    name:port&gt; without the NameVirtualHost name:port or you try to use
-    the Listen directive, your configuration will not work.</p>
+    serve multiple ports.  The example below illustrates that the name-matching
+    takes place after the best matching IP address and port combination
+    is determined.</p>
 
     <div class="example"><h3>Server configuration</h3><p><code>
     
@@ -260,9 +244,6 @@
     Listen 80<br />
     Listen 8080<br />
     <br />
-    NameVirtualHost 172.20.30.40:80<br />
-    NameVirtualHost 172.20.30.40:8080<br />
-    <br />
     &lt;VirtualHost 172.20.30.40:80&gt;<br />
     <span class="indent">
         ServerName www.example.com<br />
@@ -379,16 +360,13 @@
 <h2><a name="mixed" id="mixed">Mixed name-based and IP-based
     vhosts</a></h2>
 
-    <p>On some of my addresses, I want to do name-based virtual hosts, and
-    on others, IP-based hosts.</p>
+    <p>Any address mentioned in the argument to a virtualhost that never
+    appears in another virtual host is a strictly IP-based virtual host.</p>
 
     <div class="example"><h3>Server configuration</h3><p><code>
     
 
     Listen 80<br />
-    <br />
-    NameVirtualHost 172.20.30.40<br />
-    <br />
     &lt;VirtualHost 172.20.30.40&gt;<br />
     <span class="indent">
         DocumentRoot /www/example1<br />
@@ -560,8 +538,6 @@
     ServerName www.example.com<br />
     DocumentRoot /www/example1<br />
     <br />
-    NameVirtualHost 172.20.30.40<br />
-    <br />
     &lt;VirtualHost 172.20.30.40 172.20.30.50&gt;<br />
     <span class="indent">
         DocumentRoot /www/example2<br />
@@ -601,8 +577,6 @@
     <div class="example"><h3>Server configuration</h3><p><code>
     
 
-    NameVirtualHost 172.20.30.40<br />
-    <br />
     &lt;VirtualHost 172.20.30.40&gt;<br />
     <span class="indent">
         # primary vhost<br />
diff --git a/docs/manual/vhosts/examples.html.fr b/docs/manual/vhosts/examples.html.fr
index 72cd68d451..72a21586b9 100644
--- a/docs/manual/vhosts/examples.html.fr
+++ b/docs/manual/vhosts/examples.html.fr
@@ -24,6 +24,8 @@
 <a href="../ko/vhosts/examples.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="../tr/vhosts/examples.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+            anglaise pour les changements récents.</div>
 
 
     <p>Le but de ce document est d'essayer de répondre aux questions 
diff --git a/docs/manual/vhosts/examples.xml.fr b/docs/manual/vhosts/examples.xml.fr
index 794258f3d8..2a50fae2e0 100644
--- a/docs/manual/vhosts/examples.xml.fr
+++ b/docs/manual/vhosts/examples.xml.fr
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='ISO-8859-1' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1043126 -->
+<!-- English Revision: 1043126:1053231 (outdated) -->
 <!-- French translation by Vincent Deffontaines, Alain B., review by  -->
 <!-- updated by Lucien Gentis -->
 
diff --git a/docs/manual/vhosts/examples.xml.ja b/docs/manual/vhosts/examples.xml.ja
index 641444f75a..df0a41a381 100644
--- a/docs/manual/vhosts/examples.xml.ja
+++ b/docs/manual/vhosts/examples.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: 659902:1043126 (outdated) -->
+<!-- English Revision: 659902:1053231 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/examples.xml.ko b/docs/manual/vhosts/examples.xml.ko
index 8532e7ae5b..db2918a8da 100644
--- a/docs/manual/vhosts/examples.xml.ko
+++ b/docs/manual/vhosts/examples.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:1043126 (outdated) -->
+<!-- English Revision: 105989:1053231 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/examples.xml.meta b/docs/manual/vhosts/examples.xml.meta
index c15857860f..9222c81673 100644
--- a/docs/manual/vhosts/examples.xml.meta
+++ b/docs/manual/vhosts/examples.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">tr</variant>
diff --git a/docs/manual/vhosts/examples.xml.tr b/docs/manual/vhosts/examples.xml.tr
index 6bfc84005d..2dd94bb326 100644
--- a/docs/manual/vhosts/examples.xml.tr
+++ b/docs/manual/vhosts/examples.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: 659902:1043126 (outdated) -->
+<!-- English Revision: 659902:1053231 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by:  Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/vhosts/index.html.en b/docs/manual/vhosts/index.html.en
index 531d6302bc..7b12c51ce5 100644
--- a/docs/manual/vhosts/index.html.en
+++ b/docs/manual/vhosts/index.html.en
@@ -75,7 +75,6 @@ hosts</a></li><li><a href="ip-based.html">IP-based virtual hosts</a></li><li><a
 
     <ul>
       <li><code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code></li>
-      <li><code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code></li>
       <li><code class="directive"><a href="../mod/core.html#servername">ServerName</a></code></li>
       <li><code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code></li>
       <li><code class="directive"><a href="../mod/core.html#serverpath">ServerPath</a></code></li>
diff --git a/docs/manual/vhosts/index.html.fr b/docs/manual/vhosts/index.html.fr
index 58135ac4c7..4750c625e3 100644
--- a/docs/manual/vhosts/index.html.fr
+++ b/docs/manual/vhosts/index.html.fr
@@ -25,6 +25,8 @@
 <a href="../ko/vhosts/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="../tr/vhosts/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+            anglaise pour les changements récents.</div>
 
 
     <p>Le principe des <cite>Serveurs Virtuels</cite> consiste à 
diff --git a/docs/manual/vhosts/index.xml.de b/docs/manual/vhosts/index.xml.de
index 3b4c28cae1..5dab7cb1bf 100644
--- a/docs/manual/vhosts/index.xml.de
+++ b/docs/manual/vhosts/index.xml.de
@@ -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:1042758 (outdated) -->
+<!-- English Revision: 420990:1053231 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/index.xml.fr b/docs/manual/vhosts/index.xml.fr
index 8fde4e644c..59c46db5f8 100644
--- a/docs/manual/vhosts/index.xml.fr
+++ b/docs/manual/vhosts/index.xml.fr
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='ISO-8859-1' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1042758 -->
+<!-- English Revision: 1042758:1053231 (outdated) -->
 <!-- french translation by alain B, review by Vincent Deffontaines -->
 <!-- Updated by Lucien Gentis -->
 
diff --git a/docs/manual/vhosts/index.xml.ja b/docs/manual/vhosts/index.xml.ja
index 85673843e8..4c1367c951 100644
--- a/docs/manual/vhosts/index.xml.ja
+++ b/docs/manual/vhosts/index.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: 420990:1042758 (outdated) -->
+<!-- English Revision: 420990:1053231 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/index.xml.ko b/docs/manual/vhosts/index.xml.ko
index bd8a63f761..e3f8b3e314 100644
--- a/docs/manual/vhosts/index.xml.ko
+++ b/docs/manual/vhosts/index.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:1042758 (outdated) -->
+<!-- English Revision: 105989:1053231 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/index.xml.meta b/docs/manual/vhosts/index.xml.meta
index 9a469364e4..41a6ef676a 100644
--- a/docs/manual/vhosts/index.xml.meta
+++ b/docs/manual/vhosts/index.xml.meta
@@ -9,7 +9,7 @@
   <variants>
     <variant outdated="yes">de</variant>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">tr</variant>
diff --git a/docs/manual/vhosts/index.xml.tr b/docs/manual/vhosts/index.xml.tr
index 0cd50746db..dccb000cfc 100644
--- a/docs/manual/vhosts/index.xml.tr
+++ b/docs/manual/vhosts/index.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: 420990:1042758 (outdated) -->
+<!-- English Revision: 420990:1053231 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/vhosts/ip-based.html.en b/docs/manual/vhosts/ip-based.html.en
index f2d53312c2..45d55c70d9 100644
--- a/docs/manual/vhosts/ip-based.html.en
+++ b/docs/manual/vhosts/ip-based.html.en
@@ -25,7 +25,8 @@
 <a href="../tr/vhosts/ip-based.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 </div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#requirements">System requirements</a></li>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#explanation">What is IP-based virtual hosting</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#requirements">System requirements</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#howto">How to set up Apache</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#multiple">Setting up multiple daemons</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#single">Setting up a single daemon
@@ -35,6 +36,18 @@
 </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="explanation" id="explanation">What is IP-based virtual hosting</a></h2>
+<p>IP-based virtual hosting is a method to apply different directives
+based on the IP address and port a request is received on.  Most commonly,
+this is used to serve different websites on different ports or interfaces.</p>
+
+<p>In many cases, <a href="name-based.html">name-based
+virtual hosts</a> are more convenient, because they allow
+many virtual hosts to share a single address/port.
+See <a href="name-based.html#namevip">Name-based vs. IP-based
+Virtual Hosts</a> to help you decide.  </p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
 <h2><a name="requirements" id="requirements">System requirements</a></h2>
 
     <p>As the term <cite>IP-based</cite> indicates, the server
@@ -47,12 +60,8 @@
     most commonly used to set them up), and/or using multiple
     port numbers.</p>
 
-    <p>In many cases, <a href="name-based.html">name-based
-    virtual hosts</a> are more convenient, because they allow
-    many virtual hosts to share a single address/port.
-    See <a href="name-based.html#namevip">Name-based vs. IP-based
-    Virtual Hosts</a> to help you decide.
-    </p>
+    <p> In the terminology of Apache HTTP Servr, using a single IP address 
+    but multiple TCP ports, is also IP-based virtual hosting.</p>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -142,6 +151,10 @@
     hostname in the &lt;VirtualHost&gt; directive
     (see <a href="../dns-caveats.html">DNS caveats</a>).</p>
 
+    <p> Specific IP addresses or ports have precedence over their wildcard
+    equivalents, and any virtual host that matches has precedence over
+    the servers base configuration.</p> 
+
     <p>Almost <strong>any</strong> configuration directive can be
     put in the VirtualHost directive, with the exception of
     directives that control process creation and a few other
diff --git a/docs/manual/vhosts/ip-based.html.fr b/docs/manual/vhosts/ip-based.html.fr
index f8d917031f..d025bb58f6 100644
--- a/docs/manual/vhosts/ip-based.html.fr
+++ b/docs/manual/vhosts/ip-based.html.fr
@@ -24,6 +24,8 @@
 <a href="../ko/vhosts/ip-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="../tr/vhosts/ip-based.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+            anglaise pour les changements récents.</div>
 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#requirements">Système requis</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#howto">Comment configurer Apache</a></li>
diff --git a/docs/manual/vhosts/ip-based.xml.fr b/docs/manual/vhosts/ip-based.xml.fr
index bc4131681d..21b9d09e8a 100644
--- a/docs/manual/vhosts/ip-based.xml.fr
+++ b/docs/manual/vhosts/ip-based.xml.fr
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='ISO-8859-1' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<!-- English Revision: 1043126 -->
+<!-- English Revision: 1043126:1053231 (outdated) -->
 <!-- French translation by alain B, review by Vincent Deffontaines -->
 <!-- Updated by Lucien Gentis -->
 
diff --git a/docs/manual/vhosts/ip-based.xml.ja b/docs/manual/vhosts/ip-based.xml.ja
index 9d8df1851f..ffd864d104 100644
--- a/docs/manual/vhosts/ip-based.xml.ja
+++ b/docs/manual/vhosts/ip-based.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: 659902:1043126 (outdated) -->
+<!-- English Revision: 659902:1053231 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/ip-based.xml.ko b/docs/manual/vhosts/ip-based.xml.ko
index 80d91c7322..2fbf68aa3a 100644
--- a/docs/manual/vhosts/ip-based.xml.ko
+++ b/docs/manual/vhosts/ip-based.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:1043126 (outdated) -->
+<!-- English Revision: 105989:1053231 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/ip-based.xml.meta b/docs/manual/vhosts/ip-based.xml.meta
index 1d24a40e09..af2f9cae53 100644
--- a/docs/manual/vhosts/ip-based.xml.meta
+++ b/docs/manual/vhosts/ip-based.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">tr</variant>
diff --git a/docs/manual/vhosts/ip-based.xml.tr b/docs/manual/vhosts/ip-based.xml.tr
index 26a810dcf8..ec02b3820c 100644
--- a/docs/manual/vhosts/ip-based.xml.tr
+++ b/docs/manual/vhosts/ip-based.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: 752951:1043126 (outdated) -->
+<!-- English Revision: 752951:1053231 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/vhosts/mass.html.en b/docs/manual/vhosts/mass.html.en
index a1de6056ef..2732b62c1e 100644
--- a/docs/manual/vhosts/mass.html.en
+++ b/docs/manual/vhosts/mass.html.en
@@ -53,7 +53,6 @@ mod_rewrite</a></li>
     substantially the same, for example:</p>
 
 <div class="example"><pre>
-NameVirtualHost 111.22.33.44
 &lt;VirtualHost 111.22.33.44&gt;
     ServerName                 customer-1.example.com
     DocumentRoot        /www/hosts/customer-1.example.com/docs
diff --git a/docs/manual/vhosts/mass.xml.ko b/docs/manual/vhosts/mass.xml.ko
index e3d1c22c75..ded8fca1d4 100644
--- a/docs/manual/vhosts/mass.xml.ko
+++ b/docs/manual/vhosts/mass.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: 151408:1043126 (outdated) -->
+<!-- English Revision: 151408:1053231 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/mass.xml.tr b/docs/manual/vhosts/mass.xml.tr
index 54785d6436..6d9d530302 100644
--- a/docs/manual/vhosts/mass.xml.tr
+++ b/docs/manual/vhosts/mass.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: 659902:1043126 (outdated) -->
+<!-- English Revision: 659902:1053231 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/vhosts/name-based.html.en b/docs/manual/vhosts/name-based.html.en
index 6a38564fa4..2a912901d4 100644
--- a/docs/manual/vhosts/name-based.html.en
+++ b/docs/manual/vhosts/name-based.html.en
@@ -63,6 +63,10 @@
         they are on separate IP addresses.</li>
     </ul>
 
+    <p> Name-based virtual hosting builds off of the IP-based virtual host
+    selection algoirthm, meaning that searches for the proper server name
+    occur only between virtual hosts that have the best IP-based address.</p>
+
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -72,47 +76,29 @@
     host resolution is IP-based resolution.  Name-based virtual host
     resolution only chooses the most appropriate name-based virtual host
     after narrowing down the candidates to the best IP-based match.  Using a wildcard (*)
-    for the IP address in all of the NameVirtualHost and VirtualHost directives makes this
+    for the IP address in all of the VirtualHost directives makes this
     IP-based mapping irrelevant.</p>
     
-    <p>When a request arrives, the server will first check if it is using
-    an IP address that matches exactly any <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code>. If it is, then it will look at each <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> section with a (literal) matching
-    IP address and try to find one where the <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> or <code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code> 
-    matches the requested hostname. If it finds one, then it uses the configuration 
-    for that server.</p>
-
-    <h3><a name="defaultvhost" id="defaultvhost">The default name-based vhost for a NameVirtualHost</a></h3>
-    <p> If no matching ServerName or ServerAlias is found in the
-    set of virtual hosts matching the NameVirtualHost directive, then 
-    <strong>the first listed virtual host</strong> that matches the IP 
-    address will be used.</p>
+    <p>When a request arrives, the server will find the best (most specific) matching  
+    <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> argument based on
+    the IP address and port used by the request.  If there is more than one virtual host
+    contanin this best-match address and port combination,  Apache will further
+    compare the <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> and <code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code>  directives to the server name
+    present in the request.</p>
+
+    <h3><a name="defaultvhost" id="defaultvhost">The default name-based vhost for an IP and port combination </a></h3>
+    <p> If no matching ServerName or ServerAlias is found in the set of 
+    virtual hosts containing the most specific matching IP address and port 
+    combination, then <strong>the first listed virtual host</strong> that 
+    matches the will be used.</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="using" id="using">Using Name-based Virtual Hosts</a></h2>
 
-<table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="../mod/core.html">core</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code></li><li><code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code></li><li><code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code></li><li><code class="directive"><a href="../mod/core.html#servername">ServerName</a></code></li><li><code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code></li></ul></td></tr></table>
-
-    <p>To use name-based virtual hosting, you must designate the IP
-    address (and possibly port) on the server that will be accepting
-    requests that need to be distinguished by hostname.
-    This is configured using the <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code> directive.
-    In the normal case where any and all IP addresses on the server should
-    be used, you can use <code>*</code> as the argument to <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code>. If you're planning to use
-    multiple ports (e.g. running SSL) you should add a Port to the argument,
-    such as <code>*:80</code>.</p>
-
-    <div class="note"><p>Note that mentioning an IP address in a
-    <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code> directive does not
-    automatically make the server <em>listen</em> to that IP address. See
-    <a href="../bind.html">Setting which addresses and ports Apache uses</a>
-    for more details. In addition, any IP address specified here must be
-    associated with a network interface on the server.</p></div>
-
-    <p>The next step is to create a <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> block for
-    each different host that you would like to serve. The argument to the
-    <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> directive
-    must match a defined <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code> directive. (In this usual case,
-    this will be "*:80").  Inside each <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> block, you will need at minimum a
+<table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="../mod/core.html">core</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code></li><li><code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code></li><li><code class="directive"><a href="../mod/core.html#servername">ServerName</a></code></li><li><code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code></li></ul></td></tr></table>
+
+    <p>The first step is to create a <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> block for
+    each different host that you would like to serve.  Inside each <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> block, you will need at minimum a
     <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> directive to designate
     which host is served and a <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
     directive to show where in the filesystem the content for that host
@@ -138,8 +124,6 @@
     Then you simply add the following to <code>httpd.conf</code>:</p>
 
     <div class="example"><p><code>
-        NameVirtualHost *:80<br />
-        <br />
         &lt;VirtualHost *:80&gt;<br />
         <span class="indent">
             # This first-listed virtual host is also the default for *:80
@@ -157,7 +141,7 @@
     </code></p></div>
 
     <p>You can alternatively specify an explicit IP address in place of the
-    <code>*</code> in both the <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code> and <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> directives. For example, you might want to do this
+    <code>*</code> in <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> directives. For example, you might want to do this
     in order to run some name-based virtual hosts on one IP address, and either
     IP-based, or another set of name-based virtual hosts on another address.</p>
 
diff --git a/docs/manual/vhosts/name-based.html.fr b/docs/manual/vhosts/name-based.html.fr
index bb7c077434..2a67bf957c 100644
--- a/docs/manual/vhosts/name-based.html.fr
+++ b/docs/manual/vhosts/name-based.html.fr
@@ -25,6 +25,8 @@
 <a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="../tr/vhosts/name-based.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+            anglaise pour les changements récents.</div>
 
     <p>Ce document décrit quand et comment utiliser des serveurs 
     virtuels par nom.</p>
diff --git a/docs/manual/vhosts/name-based.xml.de b/docs/manual/vhosts/name-based.xml.de
index da92722e9d..2bd0071893 100644
--- a/docs/manual/vhosts/name-based.xml.de
+++ b/docs/manual/vhosts/name-based.xml.de
@@ -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:1044323 (outdated) -->
+<!-- English Revision: 420990:1053231 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/name-based.xml.fr b/docs/manual/vhosts/name-based.xml.fr
index 821e1d24f7..d0a4efd330 100644
--- a/docs/manual/vhosts/name-based.xml.fr
+++ b/docs/manual/vhosts/name-based.xml.fr
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='ISO-8859-1' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1044323 -->
+<!-- English Revision: 1044323:1053231 (outdated) -->
 <!-- French translation by alain B, review by Vincent Deffontaines 
 	updated by Lucien GENTIS -->
 
diff --git a/docs/manual/vhosts/name-based.xml.ja b/docs/manual/vhosts/name-based.xml.ja
index cb44129edc..dae592cbc7 100644
--- a/docs/manual/vhosts/name-based.xml.ja
+++ b/docs/manual/vhosts/name-based.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: 420990:1044323 (outdated) -->
+<!-- English Revision: 420990:1053231 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/name-based.xml.ko b/docs/manual/vhosts/name-based.xml.ko
index 73af3966d5..3de362e7f2 100644
--- a/docs/manual/vhosts/name-based.xml.ko
+++ b/docs/manual/vhosts/name-based.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: 420990:1044323 (outdated) -->
+<!-- English Revision: 420990:1053231 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/name-based.xml.meta b/docs/manual/vhosts/name-based.xml.meta
index c87cdc59f2..fdb7b6bac8 100644
--- a/docs/manual/vhosts/name-based.xml.meta
+++ b/docs/manual/vhosts/name-based.xml.meta
@@ -9,7 +9,7 @@
   <variants>
     <variant outdated="yes">de</variant>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">tr</variant>
diff --git a/docs/manual/vhosts/name-based.xml.tr b/docs/manual/vhosts/name-based.xml.tr
index b5477229f3..773c6fe654 100644
--- a/docs/manual/vhosts/name-based.xml.tr
+++ b/docs/manual/vhosts/name-based.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: 659902:1044323 (outdated) -->
+<!-- English Revision: 659902:1053231 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
-- 
2.40.0