From 9334f68ff67fd60bf02579e40774b9c635283bcb Mon Sep 17 00:00:00 2001
From: Justin Erenkrantz <jerenkrantz@apache.org>
Date: Sun, 13 Nov 2005 05:54:03 +0000
Subject: [PATCH] Update upgrading doc; add mention of mod_imap->mod_imagemap
 change.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332902 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/howto/auth.xml.ja          | 2 +-
 docs/manual/howto/auth.xml.ko          | 2 +-
 docs/manual/howto/auth.xml.meta        | 2 +-
 docs/manual/new_features_2_2.html.en   | 5 +++++
 docs/manual/new_features_2_2.xml       | 5 +++++
 docs/manual/new_features_2_2.xml.ko    | 2 +-
 docs/manual/new_features_2_2.xml.pt-br | 2 +-
 docs/manual/upgrading.html.en          | 9 +++++++++
 docs/manual/upgrading.xml              | 9 +++++++++
 9 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/docs/manual/howto/auth.xml.ja b/docs/manual/howto/auth.xml.ja
index 204a4e5300..5e762cbf68 100644
--- a/docs/manual/howto/auth.xml.ja
+++ b/docs/manual/howto/auth.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: 219484 -->
+<!-- English Revision: 219484:332896 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/howto/auth.xml.ko b/docs/manual/howto/auth.xml.ko
index e11fc28dc2..7039e54218 100644
--- a/docs/manual/howto/auth.xml.ko
+++ b/docs/manual/howto/auth.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:219484 (outdated) -->
+<!-- English Revision: 105989:332896 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/howto/auth.xml.meta b/docs/manual/howto/auth.xml.meta
index 7a87763842..ca40aa7f42 100644
--- a/docs/manual/howto/auth.xml.meta
+++ b/docs/manual/howto/auth.xml.meta
@@ -7,7 +7,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>ja</variant>
+    <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/new_features_2_2.html.en b/docs/manual/new_features_2_2.html.en
index a3a320d4d6..99006a2109 100644
--- a/docs/manual/new_features_2_2.html.en
+++ b/docs/manual/new_features_2_2.html.en
@@ -146,7 +146,12 @@
       <dd>Added a support for 
          <a href="http://www.ietf.org/rfc/rfc2817.txt">RFC 2817</a>, which 
          allows connections to upgrade from clear text to TLS encryption.</dd>
+
+      <dt><code class="module"><a href="./mod/mod_imagemap.html">mod_imagemap</a></code></dt>
+      <dd>mod_imap has been renamed to <code class="module"><a href="./mod/mod_imagemap.html">mod_imagemap</a></code> to avoid
+          user confusion.</dd>
     </dl>
+
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="programs" id="programs">Program Enhancements</a></h2>
diff --git a/docs/manual/new_features_2_2.xml b/docs/manual/new_features_2_2.xml
index 6867b84072..3d9d4a97a8 100644
--- a/docs/manual/new_features_2_2.xml
+++ b/docs/manual/new_features_2_2.xml
@@ -143,7 +143,12 @@
       <dd>Added a support for 
          <a href="http://www.ietf.org/rfc/rfc2817.txt">RFC 2817</a>, which 
          allows connections to upgrade from clear text to TLS encryption.</dd>
+
+      <dt><module>mod_imagemap</module></dt>
+      <dd>mod_imap has been renamed to <module>mod_imagemap</module> to avoid
+          user confusion.</dd>
     </dl>
+
   </section>
 
   <section id="programs">
diff --git a/docs/manual/new_features_2_2.xml.ko b/docs/manual/new_features_2_2.xml.ko
index 0cbf8c1c27..9c445671a3 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:328728 (outdated) -->
+<!-- English Revision: 105989:332896 (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 6dc4f81f49..ccf567ef2c 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:328728 (outdated) -->
+<!-- English Revision: 151408:332896 (outdated) -->
 
 <!--
  Copyright 2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en
index 993a3214af..c999559e30 100644
--- a/docs/manual/upgrading.html.en
+++ b/docs/manual/upgrading.html.en
@@ -48,6 +48,15 @@
 <div class="section">
 <h2><a name="compile-time" id="compile-time">Compile-Time Configuration Changes</a></h2>
     
+    <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_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>
+    </ul>
 
   </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.xml b/docs/manual/upgrading.xml
index 2079367930..e2409f0b57 100644
--- a/docs/manual/upgrading.xml
+++ b/docs/manual/upgrading.xml
@@ -43,6 +43,15 @@
 
   <section id="compile-time">
     <title>Compile-Time Configuration Changes</title>
+    <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 <module>mod_imagemap</module></li>
+      <li>mod_auth has been split up into <module>mod_auth_basic</module>
+          and <module>mod_authn_file</module></li>
+      <li>mod_access has been renamed to <module>mod_authz_host</module></li>
+      <li>mod_auth_ldap has been renamed to <module>mod_authnz_ldap</module></li>
+    </ul>
 
   </section>
 
-- 
2.40.0