From: André Malo <nd@apache.org>
Date: Tue, 29 Nov 2005 19:12:13 +0000 (+0000)
Subject: update transformation
X-Git-Tag: 2.2.1~245
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ad4cdb5f2a716c5a0c05b1c755b0ac0feee20a5;p=thirdparty%2Fapache%2Fhttpd.git

update transformation


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

diff --git a/docs/manual/install.html.en b/docs/manual/install.html.en
index bf02621f365..7dfdd66cc91 100644
--- a/docs/manual/install.html.en
+++ b/docs/manual/install.html.en
@@ -70,8 +70,8 @@
         <td><a href="#extract">Extract</a></td>
 
         <td><code>$ gzip -d httpd-<em>NN</em>.tar.gz<br />
-         $ tar xvf httpd-<em>NN</em>.tar</code><br />
-         $ cd httpd-<em>NN</em></td>
+         $ tar xvf httpd-<em>NN</em>.tar<br />
+         $ cd httpd-<em>NN</em></code></td>
       </tr>
 
       <tr>
diff --git a/docs/manual/install.xml.de b/docs/manual/install.xml.de
index e639247e19a..8042aeb1135 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: 333030:344412 (outdated) -->
+<!-- English Revision: 333030:349755 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/install.xml.es b/docs/manual/install.xml.es
index 963d48901be..f2edbf7047f 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:344412 (outdated) -->
+<!-- English Revision: 105989:349755 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/install.xml.fr b/docs/manual/install.xml.fr
index 59beb11bf7b..ae45edf40eb 100644
--- a/docs/manual/install.xml.fr
+++ b/docs/manual/install.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: 105989:344412 (outdated) -->
+<!-- English Revision: 105989:349755 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/install.xml.ja b/docs/manual/install.xml.ja
index 750286ee1d1..5d3a6c6cfe3 100644
--- a/docs/manual/install.xml.ja
+++ b/docs/manual/install.xml.ja
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='iso-2022-jp' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 178520:344412 (outdated) -->
+<!-- English Revision: 178520:349755 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors, as
diff --git a/docs/manual/install.xml.ko b/docs/manual/install.xml.ko
index 3c39311846d..6feb84f3aa4 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:344412 (outdated) -->
+<!-- English Revision: 105989:349755 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index ff03acde700..a7e135ff1b3 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -2399,7 +2399,7 @@ a resource</td></tr>
     <p>This directive selects which authenticated users can access a
     resource.  The restrictions are processed by authorization
     modules.  Some of the allowed syntaxes provided by
-    <code class="module"><a href="../mod/mod_authz_owner.html">mod_authz_owner</a></code> and
+    <code class="module"><a href="../mod/mod_authz_user.html">mod_authz_user</a></code> and
     <code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code> are:</p>
 
     <dl>
@@ -2441,6 +2441,36 @@ a resource</td></tr>
     place the <code class="directive">Require</code> statement into a
     <code class="directive"><a href="#limit">&lt;Limit&gt;</a></code>
     section.</p>
+ 
+    <p>If <code class="directive">Require</code> is used together with 
+    the <code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code> or
+    <code class="directive"><a href="../mod/mod_authz_host.html#deny">Deny</a></code> directives,
+    then the interaction of these restrictions is controlled by
+    the <code class="directive"><a href="#satisfy">Satisfy</a></code> directive.</p>
+
+    <div class="note"><h3>Removing controls in subdirectories</h3>
+    <p>The following example shows how to use the <code class="directive"><a href="#satisfy">Satisfy</a></code> directive to disable access
+    controls in a subdirectory of a protected directory.  This
+    technique should be used with caution, because it will also
+    disable any access controls imposed by
+    <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code>.</p>
+    <div class="example"><p><code>
+      &lt;Directory /path/to/protected/&gt;<br />
+        <span class="indent">
+        Require user david<br />
+        </span>
+      &lt;/Directory&gt;<br />
+      &lt;Directory /path/to/protected/unprotected&gt;<br />
+        <span class="indent">
+        # All access controls and authentication are disabled<br />
+        # in this directory<br />
+        Satisfy Any<br />
+        Allow from all<br />
+        </span>
+      &lt;/Directory&gt;<br />
+    </code></p></div>
+    </div>
+      
 
 <h3>See also</h3>
 <ul>
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index 1f2609fe988..5539d6626b9 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: 167959:345333 (outdated) -->
+<!-- English Revision: 167959:349779 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index 428183c3293..83035cb8b52 100644
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 190982:345333 (outdated) -->
+<!-- English Revision: 190982:349779 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/new_features_2_2.html.en b/docs/manual/new_features_2_2.html.en
index 2b92e365faa..40fd74e5a58 100644
--- a/docs/manual/new_features_2_2.html.en
+++ b/docs/manual/new_features_2_2.html.en
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><!--
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
         XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
               This file is generated from xml source: DO NOT EDIT
         XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
       -->
 <title>Overview of new features in Apache 2.2 - Apache HTTP Server</title>
-<link title="Main stylesheet" type="text/css" media="all" rel="stylesheet" href="./style/css/manual.css" />
-<link title="No Sidebar - Default font size" type="text/css" media="all" rel="alternate stylesheet" href="./style/css/manual-loose-100pc.css" />
-<link type="text/css" media="print" rel="stylesheet" href="./style/css/manual-print.css" />
-<link rel="shortcut icon" href="./images/favicon.ico" /></head>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
 <body id="manual-page"><div id="page-header">
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
 <p class="apache">Apache HTTP Server Version 2.2</p>
-<img src="./images/feather.gif" alt="" /></div>
-<div class="up"><a href="./"><img src="./images/left.gif" alt="&lt;-" title="&lt;-" /></a></div>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
 <div id="path">
 <a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs-project/">Documentation</a> &gt; <a href="./">Version 2.2</a></div><div id="page-content"><div id="preamble"><h1>Overview of new features in Apache 2.2</h1>
 <div class="toplang">
@@ -28,14 +28,14 @@
      version 1.3, see the <a href="new_features_2_0.html">2.0 new features</a>
      document.</p>
 </div>
-<div id="quickview"><ul id="toc"><li><img src="./images/down.gif" alt="" /> <a href="#core">Core Enhancements</a></li>
-<li><img src="./images/down.gif" alt="" /> <a href="#module">Module Enhancements</a></li>
-<li><img src="./images/down.gif" alt="" /> <a href="#programs">Program Enhancements</a></li>
-<li><img src="./images/down.gif" alt="" /> <a href="#developer">Module Developer Changes</a></li>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#core">Core Enhancements</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#module">Module Enhancements</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#programs">Program Enhancements</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#developer">Module Developer Changes</a></li>
 </ul></div>
-<div class="top"><a href="#page-header"><img src="./images/up.gif" alt="top" /></a></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
-<h2><a id="core" name="core">Core Enhancements</a></h2>
+<h2><a name="core" id="core">Core Enhancements</a></h2>
     
     <dl>
 
@@ -115,9 +115,9 @@
 	  </dd>
 
     </dl>
-  </div><div class="top"><a href="#page-header"><img src="./images/up.gif" alt="top" /></a></div>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
-<h2><a id="module" name="module">Module Enhancements</a></h2>
+<h2><a name="module" id="module">Module Enhancements</a></h2>
     
     <dl>
       <dt>Authn/Authz</dt>
@@ -156,9 +156,9 @@
           user confusion.</dd>
     </dl>
 
-  </div><div class="top"><a href="#page-header"><img src="./images/up.gif" alt="top" /></a></div>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
-<h2><a id="programs" name="programs">Program Enhancements</a></h2>
+<h2><a name="programs" id="programs">Program Enhancements</a></h2>
     
     <dl>
       <dt><code class="program"><a href="./programs/httpd.html">httpd</a></code></dt>
@@ -171,12 +171,12 @@
           for use in <code class="directive"><a href="./mod/mod_rewrite.html#rewritemap">RewriteMap</a></code>
           with the <code>dbm</code> map type.</dd>
     </dl>
-  </div><div class="top"><a href="#page-header"><img src="./images/up.gif" alt="top" /></a></div>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
-<h2><a id="developer" name="developer">Module Developer Changes</a></h2>
+<h2><a name="developer" id="developer">Module Developer Changes</a></h2>
     
     <dl>
-      <dt><a href="./glossary.html#apr" class="glossarylink" title="see glossary">APR</a> 1.0 API</dt>
+      <dt><a class="glossarylink" href="./glossary.html#apr" title="see glossary">APR</a> 1.0 API</dt>
 
       <dd>Apache 2.2 uses the APR 1.0 API.  All deprecated functions and 
           symbols have been removed from <code>APR</code> and 
@@ -261,4 +261,4 @@
 </div><div id="footer">
 <p class="apache">Copyright 1995-2005 The Apache Software Foundation or its licensors, as applicable.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
-</body></html>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/new_features_2_2.xml.ko b/docs/manual/new_features_2_2.xml.ko
index 9b449c0025b..baa54b92e56 100644
--- a/docs/manual/new_features_2_2.xml.ko
+++ b/docs/manual/new_features_2_2.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:345705 (outdated) -->
+<!-- English Revision: 105989:349765 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/new_features_2_2.xml.pt-br b/docs/manual/new_features_2_2.xml.pt-br
index 3c08b27571a..3d7b853aa31 100644
--- a/docs/manual/new_features_2_2.xml.pt-br
+++ b/docs/manual/new_features_2_2.xml.pt-br
@@ -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.pt-br.xsl"?>
-<!-- English Revision: 151408:345705 (outdated) -->
+<!-- English Revision: 151408:349765 (outdated) -->
 
 <!--
  Copyright 2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/upgrading.html b/docs/manual/upgrading.html
index 35b0339c8f6..e32040eca50 100644
--- a/docs/manual/upgrading.html
+++ b/docs/manual/upgrading.html
@@ -6,10 +6,6 @@ URI: upgrading.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: upgrading.html.fr
-Content-Language: fr
-Content-type: text/html; charset=ISO-8859-1
-
 URI: upgrading.html.ja.euc-jp
 Content-Language: ja
 Content-type: text/html; charset=EUC-JP
diff --git a/docs/manual/upgrading.html.de b/docs/manual/upgrading.html.de
index c0f43a7b32c..11a88aabcbe 100644
--- a/docs/manual/upgrading.html.de
+++ b/docs/manual/upgrading.html.de
@@ -20,7 +20,6 @@
 <div class="toplang">
 <p><span>Verfügbare Sprachen: </span><a href="./de/upgrading.html" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
@@ -111,7 +110,6 @@
 <div class="bottomlang">
 <p><span>Verfügbare Sprachen: </span><a href="./de/upgrading.html" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en
index e43472f0a5c..c42495fc2c0 100644
--- a/docs/manual/upgrading.html.en
+++ b/docs/manual/upgrading.html.en
@@ -20,7 +20,6 @@
 <div class="toplang">
 <p><span>Available Languages: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="./en/upgrading.html" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
@@ -48,14 +47,24 @@
 <div class="section">
 <h2><a name="compile-time" id="compile-time">Compile-Time Configuration Changes</a></h2>
     
+
+    <p>The compilation process is very similar to the one used in
+    version 2.0.  Your old <code>configure</code> command line (as
+    found in <code>build/config.nice</code> in the installed server
+    directory) can be used in some cases.  The most significant change
+    required will be to account for changes in module names, in
+    particular for the authentication and authorization modules.
+    Some details of changes:</p>
+
     <ul>
-      <li>Upgraded to require the APR 1.0 API.</li>
-      <li>Updated bundled PCRE version to 5.0</li>
       <li>mod_imap has been renamed to <code class="module"><a href="./mod/mod_imagemap.html">mod_imagemap</a></code></li>
-      <li>mod_auth has been split up into <code class="module"><a href="./mod/mod_auth_basic.html">mod_auth_basic</a></code>
-          and <code class="module"><a href="./mod/mod_authn_file.html">mod_authn_file</a></code></li>
+      <li>mod_auth has been split up into <code class="module"><a href="./mod/mod_auth_basic.html">mod_auth_basic</a></code>,
+          <code class="module"><a href="./mod/mod_authn_file.html">mod_authn_file</a></code>, <code class="module"><a href="./mod/mod_authz_user.html">mod_authz_user</a></code>, and
+          <code class="module"><a href="./mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code></li>
       <li>mod_access has been renamed to <code class="module"><a href="./mod/mod_authz_host.html">mod_authz_host</a></code></li>
       <li>mod_auth_ldap has been renamed to <code class="module"><a href="./mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code></li>
+      <li>Upgraded to require the APR 1.0 API.</li>
+      <li>Updated bundled PCRE version to 5.0</li>
     </ul>
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
@@ -63,21 +72,32 @@
 <h2><a name="run-time" id="run-time">Run-Time Configuration Changes</a></h2>
     
 
-    <ul>
-      <li>The config file <code>httpd.conf</code> distributed with the
-      Apache HTTP Server has been greatly simplified by removing all
-      but the most essential configuration settings.  A set of example
-      configuration settings for more advanced features is present in
-      the <code>conf/extra/</code> directory of the installed
-      server.</li>
+    <p>Your existing version 2.0 config files and startup scripts can
+      usually be used unchanged in version 2.2.  Some small
+      adjustments may be necessary for particular configurations as
+      discussed below.  In addition, if you dynamically load the
+      standard modules using the <code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code> directive, then you will
+      need to account for the module name changes mentioned above.</p>
+
+    <p>If you choose to use the new default
+      configuration file for version 2.2, you will find that it has
+      been greatly simplified by removing all but the most essential
+      configuration settings.  A set of example configuration settings
+      for more advanced features is present in the
+      <code>conf/extra/</code> directory of the installed server.  Default
+      configuration files are installed in the <code>conf/original</code>
+      directory.</p>
+
+    <p>Some runtime configuration changes that you may notice:</p>
 
+    <ul>
       <li>The <code class="program"><a href="./programs/apachectl.html">apachectl</a></code> option
-      <code>startssl</code> is no longer available.  To enable ssl
+      <code>startssl</code> is no longer available.  To enable SSL
       support, you should edit <code>httpd.conf</code> to include the
       relevant <code class="module"><a href="./mod/mod_ssl.html">mod_ssl</a></code> directives and then use
       <code>apachectl start</code> to start the server.  An example
-      configuration to activate <code class="module"><a href="./mod/mod_ssl.html">mod_ssl</a></code> has been included
-      in <code>conf/extra/httpd-ssl.conf</code>.</li>
+      configuration to activate <code class="module"><a href="./mod/mod_ssl.html">mod_ssl</a></code> has been
+      included in <code>conf/extra/httpd-ssl.conf</code>.</li>
 
       <li>The default setting of <code class="directive"><a href="./mod/core.html#usecanonicalname">UseCanonicalName</a></code> is now
       <code>Off</code>.  If you did not have this directive in your
@@ -118,11 +138,14 @@
 <h2><a name="third-party" id="third-party">Third Party Modules</a></h2>
     
 
+   <p>Many third-party modules designed for version 2.0 will work
+   unchanged with the the Apache HTTP Server version 2.2.  But all
+   modules must be recompiled before being loaded.</p>
+
   </div></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="./en/upgrading.html" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
diff --git a/docs/manual/upgrading.html.ja.euc-jp b/docs/manual/upgrading.html.ja.euc-jp
index f09d0fbabee..853251d6ed3 100644
--- a/docs/manual/upgrading.html.ja.euc-jp
+++ b/docs/manual/upgrading.html.ja.euc-jp
@@ -20,7 +20,6 @@
 <div class="toplang">
 <p><span>Available Languages: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Fran«®ais">&nbsp;fr&nbsp;</a> |
 <a href="./ja/upgrading.html" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Portugu«´s (Brasil)">&nbsp;pt-br&nbsp;</a> |
@@ -213,7 +212,6 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Fran«®ais">&nbsp;fr&nbsp;</a> |
 <a href="./ja/upgrading.html" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Portugu«´s (Brasil)">&nbsp;pt-br&nbsp;</a> |
diff --git a/docs/manual/upgrading.html.ko.euc-kr b/docs/manual/upgrading.html.ko.euc-kr
index 0a211cf7363..a45ae17db28 100644
--- a/docs/manual/upgrading.html.ko.euc-kr
+++ b/docs/manual/upgrading.html.ko.euc-kr
@@ -20,7 +20,6 @@
 <div class="toplang">
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/upgrading.html" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Portugu&#234;s (Brasil)">&nbsp;pt-br&nbsp;</a> |
@@ -195,7 +194,6 @@
 <div class="bottomlang">
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/upgrading.html" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Portugu&#234;s (Brasil)">&nbsp;pt-br&nbsp;</a> |
diff --git a/docs/manual/upgrading.html.pt-br b/docs/manual/upgrading.html.pt-br
index 153c69e5ccd..b9267a577b6 100644
--- a/docs/manual/upgrading.html.pt-br
+++ b/docs/manual/upgrading.html.pt-br
@@ -20,7 +20,6 @@
 <div class="toplang">
 <p><span>Línguas Disponíveis: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./pt-br/upgrading.html" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
@@ -216,7 +215,6 @@
 <div class="bottomlang">
 <p><span>Línguas Disponíveis: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./pt-br/upgrading.html" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
diff --git a/docs/manual/upgrading.html.ru.koi8-r b/docs/manual/upgrading.html.ru.koi8-r
index e82e5be0a77..f7f9d541926 100644
--- a/docs/manual/upgrading.html.ru.koi8-r
+++ b/docs/manual/upgrading.html.ru.koi8-r
@@ -20,7 +20,6 @@
 <div class="toplang">
 <p><span>Available Languages: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Portugu&#234;s (Brasil)">&nbsp;pt-br&nbsp;</a> |
@@ -192,7 +191,6 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Portugu&#234;s (Brasil)">&nbsp;pt-br&nbsp;</a> |
diff --git a/docs/manual/upgrading.xml.de b/docs/manual/upgrading.xml.de
index 6cdd06e92d9..b7cb3e0fd87 100644
--- a/docs/manual/upgrading.xml.de
+++ b/docs/manual/upgrading.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: 333065:349164 (outdated) -->
+<!-- English Revision: 333065:349745 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/upgrading.xml.ja b/docs/manual/upgrading.xml.ja
index 24dddb7b487..a3347117af8 100644
--- a/docs/manual/upgrading.xml.ja
+++ b/docs/manual/upgrading.xml.ja
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='iso-2022-jp' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 151408:349164 (outdated) -->
+<!-- English Revision: 151408:349745 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/upgrading.xml.ko b/docs/manual/upgrading.xml.ko
index 74c7b0830be..8e9e291cc26 100644
--- a/docs/manual/upgrading.xml.ko
+++ b/docs/manual/upgrading.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:349164 (outdated) -->
+<!-- English Revision: 151408:349745 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/upgrading.xml.meta b/docs/manual/upgrading.xml.meta
index f4c18ef596b..636b2b10519 100644
--- a/docs/manual/upgrading.xml.meta
+++ b/docs/manual/upgrading.xml.meta
@@ -8,7 +8,6 @@
   <variants>
     <variant outdated="yes">de</variant>
     <variant>en</variant>
-    <variant htmlonly="yes">fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">pt-br</variant>
diff --git a/docs/manual/upgrading.xml.pt-br b/docs/manual/upgrading.xml.pt-br
index 1b620eb868f..4b1ce2003f5 100644
--- a/docs/manual/upgrading.xml.pt-br
+++ b/docs/manual/upgrading.xml.pt-br
@@ -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.pt-br.xsl"?>
-<!-- English Revision: 151408:349164 (outdated) -->
+<!-- English Revision: 151408:349745 (outdated) -->
 
 <!--
  Copyright 2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/upgrading.xml.ru b/docs/manual/upgrading.xml.ru
index 05075e3e960..43a3b4f6c79 100644
--- a/docs/manual/upgrading.xml.ru
+++ b/docs/manual/upgrading.xml.ru
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='KOI8-R' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ru.xsl"?>
-<!-- English Revision: 96997:349164 (outdated) -->
+<!-- English Revision: 96997:349745 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors,