From: Daniel Gruno <humbedooh@apache.org>
Date: Wed, 19 Sep 2012 16:16:14 +0000 (+0000)
Subject: various xforms
X-Git-Tag: 2.4.4~590
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2074321a64f2675fb085214948dc05eeeda91c4;p=apache

various xforms

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

diff --git a/docs/manual/howto/cgi.html.fr b/docs/manual/howto/cgi.html.fr
index e4d672b8c5..6efd3aaefa 100644
--- a/docs/manual/howto/cgi.html.fr
+++ b/docs/manual/howto/cgi.html.fr
@@ -26,8 +26,6 @@
 <a href="../ja/howto/cgi.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/cgi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&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="#intro">Introduction</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#configuring">Configurer Apache pour autoriser CGI</a></li>
@@ -522,8 +520,11 @@ print "Hello, World.";
 
       <pre class="prettyprint lang-perl">
 #!/usr/bin/perl
+use strict;
+use warnings;
+
 print "Content-type: text/html\n\n";
-foreach $key (keys %ENV) {
+foreach my $key (keys %ENV) {
     print "$key --&gt; $ENV{$key}&lt;br&gt;";
 }
       </pre>
diff --git a/docs/manual/howto/cgi.xml.meta b/docs/manual/howto/cgi.xml.meta
index 73144f6d4d..3070905d45 100644
--- a/docs/manual/howto/cgi.xml.meta
+++ b/docs/manual/howto/cgi.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>
diff --git a/docs/manual/install.html.en b/docs/manual/install.html.en
index 750f88ecf0..92f9250331 100644
--- a/docs/manual/install.html.en
+++ b/docs/manual/install.html.en
@@ -362,7 +362,7 @@ $ tar xvf httpd-<em>NN</em>.tar
     <p>The first step in upgrading is to read the release announcement
     and the file <code>CHANGES</code> in the source distribution to
     find any changes that may affect your site.  When changing between
-    major releases (for example, from 2.0 to 2.2 or from 2.2 to 2.3),
+    major releases (for example, from 2.0 to 2.2 or from 2.2 to 2.4),
     there will likely be major differences in the compile-time and
     run-time configuration that will require manual adjustments.  All
     modules will also need to be upgraded to accommodate changes in the
diff --git a/docs/manual/install.html.fr b/docs/manual/install.html.fr
index e0ff5a131e..52f2e88b90 100644
--- a/docs/manual/install.html.fr
+++ b/docs/manual/install.html.fr
@@ -29,6 +29,8 @@
 <a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./tr/install.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 couvre l'installation et la compilation du serveur
diff --git a/docs/manual/install.xml.de b/docs/manual/install.xml.de
index 6fedc9a1c4..4830844d54 100644
--- a/docs/manual/install.xml.de
+++ b/docs/manual/install.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: 239255:1334033 (outdated) -->
+<!-- English Revision: 239255:1387659 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/install.xml.es b/docs/manual/install.xml.es
index e1829bc78d..c659ca0b35 100644
--- a/docs/manual/install.xml.es
+++ b/docs/manual/install.xml.es
@@ -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.es.xsl"?>
-<!-- English Revision: 105989:1334033 (outdated) -->
+<!-- English Revision: 105989:1387659 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/install.xml.fr b/docs/manual/install.xml.fr
index 1df9bee01d..13fcc69ec9 100644
--- a/docs/manual/install.xml.fr
+++ b/docs/manual/install.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 : 1334033 -->
+<!-- English Revision: 1334033:1387659 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/install.xml.ja b/docs/manual/install.xml.ja
index acc56ac94a..32a6f9b6a6 100644
--- a/docs/manual/install.xml.ja
+++ b/docs/manual/install.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: 527129:1334033 (outdated) -->
+<!-- English Revision: 527129:1387659 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/install.xml.ko b/docs/manual/install.xml.ko
index 2bca308387..79343d1ac2 100644
--- a/docs/manual/install.xml.ko
+++ b/docs/manual/install.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:1334033 (outdated) -->
+<!-- English Revision: 105989:1387659 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/install.xml.meta b/docs/manual/install.xml.meta
index 6a8403bc30..de3fcaf615 100644
--- a/docs/manual/install.xml.meta
+++ b/docs/manual/install.xml.meta
@@ -10,7 +10,7 @@
     <variant outdated="yes">de</variant>
     <variant>en</variant>
     <variant outdated="yes">es</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/install.xml.tr b/docs/manual/install.xml.tr
index f78f1b8a71..535d372f3f 100644
--- a/docs/manual/install.xml.tr
+++ b/docs/manual/install.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: 1296736:1334033 (outdated) -->
+<!-- English Revision: 1296736:1387659 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/invoking.html.en b/docs/manual/invoking.html.en
index b89de422ad..01f199a77b 100644
--- a/docs/manual/invoking.html.en
+++ b/docs/manual/invoking.html.en
@@ -31,10 +31,8 @@
 </div>
 
     <p>On Windows, Apache is normally run as a service on Windows
-    NT, 2000 and XP, or as a console application on Windows 9x and
-    ME. For details, see <a href="platform/windows.html#winsvc">Running Apache as a Service</a>
-    and <a href="platform/windows.html#wincons">Running Apache as a
-    Console Application</a>.</p>
+    NT, 2000 and XP, Vista and 7. For details, see <a href="platform/windows.html#winsvc">Running Apache as a Service</a>.
+    </p>
 
     <p>On Unix, the <code class="program"><a href="./programs/httpd.html">httpd</a></code> program
     is run as a daemon that executes continuously in the
diff --git a/docs/manual/invoking.html.fr b/docs/manual/invoking.html.fr
index d5cf4464e7..b2723acb45 100644
--- a/docs/manual/invoking.html.fr
+++ b/docs/manual/invoking.html.fr
@@ -29,6 +29,8 @@
 <a href="./ko/invoking.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./tr/invoking.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>Apache est habituellement lancé en tant que service
     sous Windows NT, 2000 et XP, ou comme application en mode console sous
diff --git a/docs/manual/invoking.html.tr.utf8 b/docs/manual/invoking.html.tr.utf8
index d4493beaa4..5c5235649c 100644
--- a/docs/manual/invoking.html.tr.utf8
+++ b/docs/manual/invoking.html.tr.utf8
@@ -29,6 +29,7 @@
 <a href="./ko/invoking.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./tr/invoking.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 normal olarak, Windows NT, 2000 ve XP'de bir hizmet olarak,
       Windows 9x ve ME’de ise bir konsol uygulaması olarak çalışır. Ayrıntılı
diff --git a/docs/manual/invoking.xml.de b/docs/manual/invoking.xml.de
index 99e1f95fc7..24372b3c7f 100644
--- a/docs/manual/invoking.xml.de
+++ b/docs/manual/invoking.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: 395228:1044380 (outdated) -->
+<!-- English Revision: 395228:1387618 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/invoking.xml.es b/docs/manual/invoking.xml.es
index 85f2d36d96..5f8c556739 100644
--- a/docs/manual/invoking.xml.es
+++ b/docs/manual/invoking.xml.es
@@ -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.es.xsl"?>
-<!-- English Revision: 105989:1044380 (outdated) -->
+<!-- English Revision: 105989:1387618 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/invoking.xml.fr b/docs/manual/invoking.xml.fr
index 9e2dba847b..50de02f708 100644
--- a/docs/manual/invoking.xml.fr
+++ b/docs/manual/invoking.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: 1044380 -->
+<!-- English Revision: 1044380:1387618 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/invoking.xml.ja b/docs/manual/invoking.xml.ja
index adaa31fa95..8a2319c8ab 100644
--- a/docs/manual/invoking.xml.ja
+++ b/docs/manual/invoking.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: 567441:1044380 (outdated) -->
+<!-- English Revision: 567441:1387618 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/invoking.xml.ko b/docs/manual/invoking.xml.ko
index 62f2856a1d..1e93fd25d4 100644
--- a/docs/manual/invoking.xml.ko
+++ b/docs/manual/invoking.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:1044380 (outdated) -->
+<!-- English Revision: 105989:1387618 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/invoking.xml.meta b/docs/manual/invoking.xml.meta
index f1681166a1..6919b9d87c 100644
--- a/docs/manual/invoking.xml.meta
+++ b/docs/manual/invoking.xml.meta
@@ -10,9 +10,9 @@
     <variant outdated="yes">de</variant>
     <variant>en</variant>
     <variant outdated="yes">es</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</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/invoking.xml.tr b/docs/manual/invoking.xml.tr
index cab4715295..d8703e432f 100644
--- a/docs/manual/invoking.xml.tr
+++ b/docs/manual/invoking.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: 1044380 -->
+<!-- English Revision: 1044380:1387618 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/mod/mod_authn_dbd.html.en b/docs/manual/mod/mod_authn_dbd.html.en
index ba0eb878f0..a130bfe6de 100644
--- a/docs/manual/mod/mod_authn_dbd.html.en
+++ b/docs/manual/mod/mod_authn_dbd.html.en
@@ -76,7 +76,7 @@
 <div class="section">
 <h2><a name="socache" id="socache">Performance and Cacheing</a></h2>
 
-<p>Some users of DBD authentication in HTTPD 2.2 have reported that it
+<p>Some users of DBD authentication in HTTPD 2.2/2.4 have reported that it
 imposes a problematic load on the database.  This is most likely where
 an HTML page contains hundreds of objects (e.g. images, scripts, etc)
 each of which requires authentication.  Users affected (or concerned)
diff --git a/docs/manual/mod/mod_proxy.html.fr b/docs/manual/mod/mod_proxy.html.fr
index 5ccf44ca1f..8e8814e29d 100644
--- a/docs/manual/mod/mod_proxy.html.fr
+++ b/docs/manual/mod/mod_proxy.html.fr
@@ -28,8 +28,6 @@
 <a href="../fr/mod/mod_proxy.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ja/mod/mod_proxy.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&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>
 <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Serveur mandataire/passerelle multi-protocole</td></tr>
 <tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
 <tr><th><a href="module-dict.html#ModuleIdentifier">Identificateur de Module:</a></th><td>proxy_module</td></tr>
@@ -1436,10 +1434,10 @@ ProxyPass /mirror/foo http://backend.example.com
 ProxyPass /special-area http://special.example.com smax=5 max=10
 ProxyPass / balancer://mycluster/ stickysession=JSESSIONID|jsessionid nofailover=On
 &lt;Proxy balancer://mycluster&gt;
-    BalancerMember ajp://1.2.3.4:8009
-    BalancerMember ajp://1.2.3.5:8009 loadfactor=20
+    BalancerMember ajp://1.2.3.4:8009/
+    BalancerMember ajp://1.2.3.5:8009/ loadfactor=20
     # Less powerful server, don't send as many requests there,
-    BalancerMember ajp://1.2.3.6:8009 loadfactor=5
+    BalancerMember ajp://1.2.3.6:8009/ loadfactor=5
 &lt;/Proxy&gt;
     </pre>
 
@@ -1449,10 +1447,10 @@ ProxyPass / balancer://mycluster/ stickysession=JSESSIONID|jsessionid nofailover
     <pre class="prettyprint lang-config">
 ProxyPass / balancer://hotcluster/ 
 &lt;Proxy balancer://hotcluster&gt;
-    BalancerMember ajp://1.2.3.4:8009 loadfactor=1
-    BalancerMember ajp://1.2.3.5:8009 loadfactor=2
+    BalancerMember ajp://1.2.3.4:8009/ loadfactor=1
+    BalancerMember ajp://1.2.3.5:8009/ loadfactor=2
     # The server below is on hot standby
-    BalancerMember ajp://1.2.3.6:8009 status=+H
+    BalancerMember ajp://1.2.3.6:8009/ status=+H
     ProxySet lbmethod=bytraffic
 &lt;/Proxy&gt;
     </pre>
@@ -1921,8 +1919,8 @@ du serveur HTTP Apache.</td></tr>
 
     <div class="example"><pre class="prettyprint lang-config">
 &lt;Proxy balancer://hotcluster&gt;
-    BalancerMember http://www2.example.com:8080 loadfactor=1
-    BalancerMember http://www3.example.com:8080 loadfactor=2
+    BalancerMember http://www2.example.com:8080/ loadfactor=1
+    BalancerMember http://www3.example.com:8080/ loadfactor=2
     ProxySet lbmethod=bytraffic
 &lt;/Proxy&gt;
       </pre>
diff --git a/docs/manual/mod/mod_proxy.xml.meta b/docs/manual/mod/mod_proxy.xml.meta
index f0185375d4..38a79fdda7 100644
--- a/docs/manual/mod/mod_proxy.xml.meta
+++ b/docs/manual/mod/mod_proxy.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ja</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/platform/windows.html.en b/docs/manual/platform/windows.html.en
index d2c0118c83..2c3f042f62 100644
--- a/docs/manual/platform/windows.html.en
+++ b/docs/manual/platform/windows.html.en
@@ -26,7 +26,7 @@
 </div>
 
     <p>This document explains how to install, configure and run
-    Apache 2.3 under Microsoft Windows.  If you have questions after
+    Apache 2.4 under Microsoft Windows.  If you have questions after
     reviewing the documentation (and any event and error logs), you
     should consult the peer-supported
     <a href="http://httpd.apache.org/userslist.html">users' mailing
@@ -53,7 +53,7 @@
 <h2><a name="req" id="req">Operating System Requirements</a></h2>
     
 
-    <p>The primary Windows platform for running Apache 2.3 is Windows
+    <p>The primary Windows platform for running Apache 2.4 is Windows
     2000 or later.  The binary installer only works with the x86 family
     of processors, such as Intel and AMD processors.  Always obtain and
     install the current service pack to avoid operating system bugs.</p>
@@ -98,11 +98,11 @@
     <a href="http://support.microsoft.com/kb/292539/">KB 292539</a>.
     Windows XP and later do not require this update.</p>
 
-    <p>Note that you cannot install two versions of Apache 2.3 on the
+    <p>Note that you cannot install two versions of Apache 2.4 on the
     same computer with the binary installer. You can, however, install
     a version of the 1.3 series <strong>and</strong> a version of the
-    2.3 series on the same computer without problems. If you need to
-    have two different 2.3 versions on the same computer, you have to
+    2.4 series on the same computer without problems. If you need to
+    have two different 2.4 versions on the same computer, you have to
     <a href="win_compiling.html">compile and install Apache from the
     source</a>.</p>
 
@@ -143,7 +143,7 @@
       <li><p><strong>Where to install.</strong> The default path is
       <code>C:\Program Files\Apache Software Foundation</code>
       under which a directory called
-      <code>Apache2.3</code> will be created by default.</p></li>
+      <code>Apache2.4</code> will be created by default.</p></li>
     </ol>
 
     <p>During the installation, Apache will configure the files in the
@@ -307,14 +307,14 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
       validate all path names given.  This means that each directory
       which Apache evaluates, from the drive root up to the directory
       leaf, must have read, list and traverse directory permissions.
-      If Apache2.3 is installed at C:\Program Files, then the root
-      directory, Program Files and Apache2.3 must all be visible
+      If Apache2.4 is installed at C:\Program Files, then the root
+      directory, Program Files and Apache2.4 must all be visible
       to Apache.</p></li>
 
       <li><p>Apache for Windows contains the ability to load modules at
       runtime, without recompiling the server. If Apache is compiled
       normally, it will install a number of optional modules in the
-      <code>\Apache2.3\modules</code> directory. To activate these or
+      <code>\Apache2.4\modules</code> directory. To activate these or
       other modules, the new <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code>
       directive must be used. For example, to activate the status
       module, use the following (in addition to the status-activating
@@ -398,7 +398,7 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
     </code></p></div>
 
     <p>If you use the first command without any special parameters except
-    <code>-k install</code>, the service will be called <code>Apache2.3</code>
+    <code>-k install</code>, the service will be called <code>Apache2.4</code>
     and the configuration will be assumed to be <code>conf\httpd.conf</code>.
     </p>
 
@@ -416,8 +416,8 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
 
     <p>Normal starting, restarting and shutting down of an Apache
     service is usually done via the Apache Service Monitor, by using
-    commands like <code>NET START Apache2.3</code> and <code>NET STOP
-    Apache2.3</code> or via normal Windows service management. Before
+    commands like <code>NET START Apache2.4</code> and <code>NET STOP
+    Apache2.4</code> or via normal Windows service management. Before
     starting Apache as a service by any means, you should test the
     service's configuration file by using:</p>
 
@@ -495,7 +495,7 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
     </ol>
 
     <div class="note">It is usually a good practice to grant the user the Apache
-    service runs as read and execute (RX) access to the whole Apache2.3
+    service runs as read and execute (RX) access to the whole Apache2.4
     directory, except the <code>logs</code> subdirectory, where the
     user has to have at least change (RWXD) rights.</div>
 
@@ -518,7 +518,7 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
     Windows Control Panel, you may get the following message:</p>
 
     <div class="example"><p><code>
-      Could not start the Apache2.3 service on \\COMPUTER <br />
+      Could not start the Apache2.4 service on \\COMPUTER <br />
       Error 1067; The process terminated unexpectedly.
     </code></p></div>
 
@@ -552,7 +552,7 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
 
     <p>You can also run Apache via the shortcut Start Apache in Console
     placed to <code>Start Menu --&gt; Programs --&gt; Apache HTTP Server
-    2.3.xx --&gt; Control Apache Server</code> during the installation.
+    2.4.xx --&gt; Control Apache Server</code> during the installation.
     This will open a console window and start Apache inside it. If you
     don't have Apache installed as a service, the window will remain
     visible until you stop Apache by pressing Control-C in the console
@@ -603,7 +603,7 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
 
     <div class="example"><p><code>
       c: <br />
-      cd "\Program Files\Apache Software Foundation\Apache2.3\bin" <br />
+      cd "\Program Files\Apache Software Foundation\Apache2.4\bin" <br />
       httpd.exe
     </code></p></div>
 
diff --git a/docs/manual/platform/windows.xml.ko b/docs/manual/platform/windows.xml.ko
index 7f33aebc24..730f357fbe 100644
--- a/docs/manual/platform/windows.xml.ko
+++ b/docs/manual/platform/windows.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:1333993 (outdated) -->
+<!-- English Revision: 105989:1387618 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/sections.html.fr b/docs/manual/sections.html.fr
index c5d831c2a8..236aff1775 100644
--- a/docs/manual/sections.html.fr
+++ b/docs/manual/sections.html.fr
@@ -27,8 +27,6 @@
 <a href="./ko/sections.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./tr/sections.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>Les directives des <a href="configuring.html">fichiers de configuration</a> peuvent s'appliquer
 au serveur dans son ensemble, ou seulement à des répertoires, fichiers, hôtes,
 ou URLs particuliers.  Ce document décrit comment utiliser les conteneurs de
@@ -221,7 +219,7 @@ toute requ
 <pre class="prettyprint lang-config">
 &lt;LocationMatch ^/private&gt;
     Require all denied
-&lt;/Location&gt;
+&lt;/LocationMatch&gt;
 </pre>
 
 
diff --git a/docs/manual/sections.xml.meta b/docs/manual/sections.xml.meta
index 0e839c6dc7..f5ac84359d 100644
--- a/docs/manual/sections.xml.meta
+++ b/docs/manual/sections.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">tr</variant>