Bump 2.2.x branch docs to refer to itself as 2.2.

(The code does not refer to itself as 2.2 yet; but the docs need to do so to
ease the release process.)

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

diff --git a/docs/manual/glossary.xml b/docs/manual/glossary.xml
index 9cdff443a815894377602d653dfe6faf581ada53..eb862063003525609010141511baf9acb9927b7f 100644 (file)
--- a/docs/manual/glossary.xml
+++ b/docs/manual/glossary.xml
@@ -443,8 +443,8 @@
     informal term for what is formally called a <glossary
       ref="uniformresourceidentifier">Uniform Resource Identifier</glossary>.
     URLs are usually made up of a scheme, like <code>http</code> or
-    <code>https</code>, a hostname, and a path.  A URL for this page is
-    <code>http://httpd.apache.org/docs-2.1/glossary.html</code>.
+    <code>https</code>, a hostname, and a path.  A URL for this page might
+    be <code>http://httpd.apache.org/docs-2.1/glossary.html</code>.
   </dd> 
 
   <dt><a name="uniformresourceidentifier"

diff --git a/docs/manual/index.xml b/docs/manual/index.xml
index 773c0c5d1e7e0c7625ebcb13d777c17e627c0e91..4ec066efcedcbb3f77f2b03c7e3c1983fddea20c 100644 (file)
--- a/docs/manual/index.xml
+++ b/docs/manual/index.xml
@@ -23,7 +23,7 @@
 <indexpage metafile="index.xml.meta">
 <parentdocument href="http://httpd.apache.org/docs-project/" />
 
-<title>Apache HTTP Server Version 2.1 Documentation</title>
+<title>Apache HTTP Server Version 2.2 Documentation</title>
 
 <category id="release"><title>Release Notes</title>
     <page href="new_features_2_2.html">New features with Apache 2.1/2.2</page>

diff --git a/docs/manual/sitemap.xml b/docs/manual/sitemap.xml
index 222a144510e41f27bded7d781fb058ded57bd84b..f4a32256e249089cd2a0ad387bbf1455af354923 100644 (file)
--- a/docs/manual/sitemap.xml
+++ b/docs/manual/sitemap.xml
@@ -26,12 +26,13 @@
 
 <summary>
 <p>This page lists the currently available documents of the
-<a href="./">Apache HTTP Server Version 2.1 Documentation</a>.</p>
+<a href="./">Apache HTTP Server Version 2.2 Documentation</a>.</p>
 </summary>
 
 <category id="release">
 <title>Release Notes</title>
-<page href="upgrading.html">Upgrading to 2.0 from 1.3</page>
+<page href="upgrading.html">Upgrading to 2.2 from 2.0</page>
+<page href="new_features_2_2.html">New features with Apache 2.2</page>
 <page href="new_features_2_0.html">New features with Apache 2.0</page>
 <page href="license.html">Apache License</page>
 </category>

diff --git a/docs/manual/style/lang/de.xml b/docs/manual/style/lang/de.xml
index 2a95ccad44de99070a00474c4a2e9d84a5463661..2ff785a28b81702572c0877006f705e91e241116 100644 (file)
--- a/docs/manual/style/lang/de.xml
+++ b/docs/manual/style/lang/de.xml
@@ -100,7 +100,7 @@
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Apache HTTP Server</message>
         <message id="apachehttpserver">Apache HTTP Server Version
-            2.1</message>
+            2.2</message>
         <message id="apachedocalt">[APACHE DOCUMENTATION]</message>
         <message id="search">Google-Suche</message> <!-- search button -->
         <message id="index">Index</message> <!-- deprecated -->
@@ -110,7 +110,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">HTTP-Server</message>
         <message id="documentation">Dokumentation</message>
-        <message id="version">Version 2.1</message>
+        <message id="version">Version 2.2</message>
 
         <!-- super menu -->
         <message id="modules">Module</message>

diff --git a/docs/manual/style/lang/en.xml b/docs/manual/style/lang/en.xml
index 3bcd3769be740a8a9290737282a2a82950ab786e..f9f15b8e2f4382d59ed7a5397d56ae6b7c54dde8 100644 (file)
--- a/docs/manual/style/lang/en.xml
+++ b/docs/manual/style/lang/en.xml
@@ -100,7 +100,7 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Apache HTTP Server</message>
-        <message id="apachehttpserver">Apache HTTP Server Version 2.1</message>
+        <message id="apachehttpserver">Apache HTTP Server Version 2.2</message>
         <message id="apachedocalt">[APACHE DOCUMENTATION]</message>
         <message id="search">Google Search</message> <!-- search button -->
         <message id="index">Index</message> <!-- deprecated -->
@@ -110,7 +110,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">HTTP Server</message>
         <message id="documentation">Documentation</message>
-        <message id="version">Version 2.1</message>
+        <message id="version">Version 2.2</message>
 
         <!-- super menu -->
         <message id="modules">Modules</message>

diff --git a/docs/manual/style/lang/es.xml b/docs/manual/style/lang/es.xml
index b972403c867732d1a3f49fc918ee74ea53f1ceca..575a49f981ee364889ec79de59596ee0bf822e1a 100644 (file)
--- a/docs/manual/style/lang/es.xml
+++ b/docs/manual/style/lang/es.xml
@@ -98,7 +98,7 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Servidor HTTP Apache</message>
-        <message id="apachehttpserver">Versi&#243;n 2.1 del Servidor HTTP
+        <message id="apachehttpserver">Versi&#243;n 2.2 del Servidor HTTP
             Apache</message>
         <message id="apachedocalt">[APACHE DOCUMENTATION]</message>
         <message id="search">Buscar en Google</message> <!-- search button -->
@@ -109,7 +109,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">Servidor HTTP</message>
         <message id="documentation">Documentaci&#243;n</message>
-        <message id="version">Versi&#243;n 2.1</message>
+        <message id="version">Versi&#243;n 2.2</message>
 
         <!-- super menu -->
         <message id="modules">M&#243;dulos</message>

diff --git a/docs/manual/style/lang/fr.xml b/docs/manual/style/lang/fr.xml
index cb71ff5227563ba92108492b6face2a6712c40bc..24483b0418e4b819daba410862cfa3114405c158 100644 (file)
--- a/docs/manual/style/lang/fr.xml
+++ b/docs/manual/style/lang/fr.xml
@@ -101,7 +101,7 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Serveur Apache HTTP</message>
-        <message id="apachehttpserver">Serveur Apache HTTP Version 2.1</message>
+        <message id="apachehttpserver">Serveur Apache HTTP Version 2.2</message>
         <message id="apachedocalt">[DOCUMENTATION APACHE]</message>
         <message id="search">Recherche Google</message> <!-- search button -->
         <message id="index">Index</message> <!-- deprecated -->
@@ -111,7 +111,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">Serveur HTTP</message>
         <message id="documentation">Documentation</message>
-        <message id="version">Version 2.1</message>
+        <message id="version">Version 2.2</message>
 
         <!-- super menu -->
         <message id="modules">Modules</message>

diff --git a/docs/manual/style/lang/ja.xml b/docs/manual/style/lang/ja.xml
index 37ba31dd10c94962b4cd1788ec7801659e695565..3f215258ce38506452c34a989115a97a66f57a19 100644 (file)
--- a/docs/manual/style/lang/ja.xml
+++ b/docs/manual/style/lang/ja.xml
@@ -97,7 +97,7 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Apache HTTP \e$B%5!<%P\e(B</message>
-        <message id="apachehttpserver">Apache HTTP \e$B%5!<%P\e(B \e$B%P!<%8%g%s\e(B 2.1</message>
+        <message id="apachehttpserver">Apache HTTP \e$B%5!<%P\e(B \e$B%P!<%8%g%s\e(B 2.2</message>
         <message id="apachedocalt">[APACHE DOCUMENTATION]</message>
         <message id="search">Google Search</message> <!-- search button -->
         <message id="index">\e$B:w0z\e(B</message> <!-- deprecated -->
@@ -107,7 +107,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">HTTP \e$B%5!<%P\e(B</message>
         <message id="documentation">\e$B%I%-%e%a%s%F!<%7%g%s\e(B</message>
-        <message id="version">\e$B%P!<%8%g%s\e(B 2.1</message>
+        <message id="version">\e$B%P!<%8%g%s\e(B 2.2</message>
 
         <!-- super menu -->
         <message id="modules">\e$B%b%8%e!<%k\e(B</message>

diff --git a/docs/manual/style/lang/ko.xml b/docs/manual/style/lang/ko.xml
index 5bbd0295afd3fb00d0360cb4f44c85f38424fcb0..95bb3d6c03bb102f61956ca296cdae09722ec6a6 100644 (file)
--- a/docs/manual/style/lang/ko.xml
+++ b/docs/manual/style/lang/ko.xml
@@ -103,7 +103,7 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Apache HTTP Server</message>
-        <message id="apachehttpserver">Apache HTTP Server Version 2.1</message>
+        <message id="apachehttpserver">Apache HTTP Server Version 2.2</message>
         <message id="apachedocalt">[APACHE DOCUMENTATION]</message>
         <message id="search">Google °Ë»ö</message> <!-- search button -->
         <message id="index">Index</message> <!-- deprecated -->
@@ -113,7 +113,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">HTTP Server</message>
         <message id="documentation">Documentation</message>
-        <message id="version">Version 2.1</message>
+        <message id="version">Version 2.2</message>
 
         <!-- super menu -->
         <message id="modules">¸ðµâ</message>

diff --git a/docs/manual/style/lang/pt-br.xml b/docs/manual/style/lang/pt-br.xml
index 904417b03c3974621999318bbf9541dba6389575..0776a440243778eeba25d499196d96eadc2f6cec 100644 (file)
--- a/docs/manual/style/lang/pt-br.xml
+++ b/docs/manual/style/lang/pt-br.xml
@@ -102,7 +102,7 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Servidor HTTP Apache</message>
-        <message id="apachehttpserver">Servidor HTTP Apache Vers&#227;o 2.1</message>
+        <message id="apachehttpserver">Servidor HTTP Apache Vers&#227;o 2.2</message>
         <message id="apachedocalt">[DOCUMENTA&#199;&#195;O APACHE]</message>
         <message id="search">Busca Google</message> <!-- search button -->
         <message id="index">&#205;ndice</message> <!-- deprecated -->
@@ -112,7 +112,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">Servidor HTTP</message>
         <message id="documentation">Documenta&#231;&#227;o</message>
-        <message id="version">Vers&#227;o 2.1</message>
+        <message id="version">Vers&#227;o 2.2</message>
 
         <!-- super menu -->
         <message id="modules">M&#243;dulos</message>

diff --git a/docs/manual/style/lang/ru.xml b/docs/manual/style/lang/ru.xml
index 1ed52c23df089a477f7e131af17e979e2a78e2cb..3cb78533d58b06f20c80edca5e5a53bf39b037ac 100644 (file)
--- a/docs/manual/style/lang/ru.xml
+++ b/docs/manual/style/lang/ru.xml
@@ -87,7 +87,7 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- HTTP ÓÅÒ×ÅÒ Apache</message>
-        <message id="apachehttpserver">HTTP ÓÅÒ×ÅÒ Apache ÷ÅÒÓÉÑ 2.1</message>
+        <message id="apachehttpserver">HTTP ÓÅÒ×ÅÒ Apache ÷ÅÒÓÉÑ 2.2</message>
         <message id="apachedocalt">[äïëõíåîôáãéñ APACHE]</message>
         <message id="search">Google Search</message> <!-- search button -->
         <message id="index">ïÇÌÁ×ÌÅÎÉÅ</message> <!-- deprecated -->
@@ -97,7 +97,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">HTTP ÓÅÒ×ÅÒ</message>
         <message id="documentation">äÏËÕÍÅÎÔÁÃÉÑ</message>
-        <message id="version">÷ÅÒÓÉÑ 2.1</message>
+        <message id="version">÷ÅÒÓÉÑ 2.2</message>
 
         <!-- super menu -->
         <message id="modules">íÏÄÕÌÉ</message>