From: Rich Bowen <rbowen@apache.org>
Date: Thu, 15 Mar 2012 11:11:50 +0000 (+0000)
Subject: Apply various patches from Daniel Gruno (rumble at cord dot dk). Typos
X-Git-Tag: 2.5.0-alpha~7370
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78a3fe3fc890cd8fc10262ba0d4f61f677b9bcb2;p=thirdparty%2Fapache%2Fhttpd.git

Apply various patches from Daniel Gruno (rumble at cord dot dk). Typos
and broken links.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1300910 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/env.xml b/docs/manual/env.xml
index 369eaf8993a..3c3a902caf4 100644
--- a/docs/manual/env.xml
+++ b/docs/manual/env.xml
@@ -170,9 +170,9 @@
         <module>mod_rewrite</module>
       </modulelist>
       <directivelist>
-        <directive module="mod_authz_host">Allow</directive>
+        <directive module="mod_access_compat">Allow</directive>
         <directive module="mod_log_config">CustomLog</directive>
-        <directive module="mod_authz_host">Deny</directive>
+        <directive module="mod_access_compat">Deny</directive>
         <directive module="mod_ext_filter">ExtFilterDefine</directive>
         <directive module="mod_headers">Header</directive>
         <directive module="mod_log_config">LogFormat</directive>
diff --git a/docs/manual/rewrite/flags.html.fr b/docs/manual/rewrite/flags.html.fr
index 5cf304ac44b..ef3f2674331 100644
--- a/docs/manual/rewrite/flags.html.fr
+++ b/docs/manual/rewrite/flags.html.fr
@@ -21,6 +21,8 @@
 <p><span>Langues Disponibles: </span><a href="../en/rewrite/flags.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/rewrite/flags.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>Ce document décrit les drapeaux disponibles dans la directive
 <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code>, en fournissant
diff --git a/docs/manual/rewrite/flags.xml.fr b/docs/manual/rewrite/flags.xml.fr
index f2f12c99df5..7a65f108544 100644
--- a/docs/manual/rewrite/flags.xml.fr
+++ b/docs/manual/rewrite/flags.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 : 1179266 -->
+<!-- English Revision: 1179266:1300556 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/rewrite/flags.xml.meta b/docs/manual/rewrite/flags.xml.meta
index 912229af035..e4f3ee6f495 100644
--- a/docs/manual/rewrite/flags.xml.meta
+++ b/docs/manual/rewrite/flags.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/sections.xml b/docs/manual/sections.xml
index c7fb4ac2df0..8bbea4758bf 100644
--- a/docs/manual/sections.xml
+++ b/docs/manual/sections.xml
@@ -94,7 +94,7 @@ to work all the time, because it can suppress useful error messages
 about missing modules.</p>
 
 <p>In the following example, the <directive
-module="mod_mime_magic">MimeMagicFiles</directive> directive will be
+module="mod_mime_magic">MimeMagicFile</directive> directive will be
 applied only if <module>mod_mime_magic</module> is available.</p>
 
 <example>
@@ -247,7 +247,7 @@ certain sections or directives are evaluated. For
 &lt;Location /foo/bar&gt;<br />
 &lt;/Location>
 </example>
-<p><directive type="section" module="core">Alias</directive>es on the other hand,
+<p><directive type="section" module="mod_alias">Alias</directive>es on the other hand,
 are mapped vice-versa:</p>
 <example>
 Alias /foo/bar /srv/www/uncommon/bar<br />
@@ -371,7 +371,7 @@ to all requests regardless of the specific URL.</p>
 <section id="nesting"><title>Nesting of sections</title>
 
 <p>Some section types can be nested inside other section types. One the one
-hand, <directive type="section" module="core">File</directive> can be used
+hand, <directive type="section" module="core">Files</directive> can be used
 inside <directive type="section" module="core">Directory</directive>.  On
 the other hand, <directive type="section" module="core">If</directive> can
 be used inside <directive type="section" module="core">Directory</directive>,
diff --git a/docs/manual/ssl/ssl_faq.xml b/docs/manual/ssl/ssl_faq.xml
index 96d0938c989..076fb721a61 100644
--- a/docs/manual/ssl/ssl_faq.xml
+++ b/docs/manual/ssl/ssl_faq.xml
@@ -51,7 +51,7 @@ generate temporary 512 bit RSA private key" when I start Apache?</a></li>
     Make sure that all parent directories (here <code>/opt</code>,
     <code>/opt/apache</code> and <code>/opt/apache/logs</code>) have the x-bit
     set for, at minimum, the UID under which Apache's children are running (see
-    the <directive module="mpm_common">User</directive> directive).</p>
+    the <directive module="mod_unixd">User</directive> directive).</p>
 </section>
 
 <section id="entropy"><title>Why does mod_ssl stop with the error
diff --git a/docs/manual/vhosts/ip-based.html.en b/docs/manual/vhosts/ip-based.html.en
index 38b4b3a610a..410c26864ae 100644
--- a/docs/manual/vhosts/ip-based.html.en
+++ b/docs/manual/vhosts/ip-based.html.en
@@ -78,7 +78,7 @@ Virtual Hosts</a> to help you decide.  </p>
       <li>There are security partitioning issues, such as company1
       does not want anyone at company2 to be able to read their
       data except via the web. In this case you would need two
-      daemons, each running with different <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code>, <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code>, <code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code>, and <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> settings.</li>
+      daemons, each running with different <code class="directive"><a href="../mod/mod_unixd.html#user">User</a></code>, <code class="directive"><a href="../mod/mod_unixd.html#group">Group</a></code>, <code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code>, and <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> settings.</li>
 
       <li>You can afford the memory and file descriptor
       requirements of listening to every IP alias on the
diff --git a/docs/manual/vhosts/ip-based.xml b/docs/manual/vhosts/ip-based.xml
index 5a5571a8d41..37cb7727f43 100644
--- a/docs/manual/vhosts/ip-based.xml
+++ b/docs/manual/vhosts/ip-based.xml
@@ -71,8 +71,8 @@ Virtual Hosts</a> to help you decide.  </p>
       does not want anyone at company2 to be able to read their
       data except via the web. In this case you would need two
       daemons, each running with different <directive
-      module="mpm_common">User</directive>, <directive
-      module="mpm_common">Group</directive>, <directive
+      module="mod_unixd">User</directive>, <directive
+      module="mod_unixd">Group</directive>, <directive
       module="mpm_common">Listen</directive>, and <directive
       module="core">ServerRoot</directive> settings.</li>