centralize versioning of httpd and docs urls

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

diff --git a/docs/manual/faq/all_in_one.xml b/docs/manual/faq/all_in_one.xml
index bb66965e23b25472ed6656cfb6e16fcd78f5568c..52d5ce5bc00a8f1d335c51f9832c0a4db5842690 100644 (file)
--- a/docs/manual/faq/all_in_one.xml
+++ b/docs/manual/faq/all_in_one.xml
@@ -29,8 +29,8 @@
 
 <summary>
     <p>The latest version of this FAQ is always available from the main Apache
-    web site, at &lt;<a href="http://httpd.apache.org/docs-2.0/faq/"
-    >http://httpd.apache.org/docs-2.0/faq/</a>&gt;.</p>
+    web site, at &lt;<a href="http://httpd.apache.org/docs/&httpd.docs;/faq/"
+    >http://httpd.apache.org/docs/&httpd.docs;/faq/</a>&gt;.</p>
 
     <p>Since Apache 2.0 is quite new, we don't yet know what the <em>Frequently
     Asked Questions</em> will be. While this section fills up, you should also

diff --git a/docs/manual/faq/all_in_one.xml.ko b/docs/manual/faq/all_in_one.xml.ko
index b857329550954445ea48b29147fa912cc7b3f50a..ecfcf0eced67c48aa6e5991634e35711d180ff5e 100644 (file)
--- a/docs/manual/faq/all_in_one.xml.ko
+++ b/docs/manual/faq/all_in_one.xml.ko
@@ -28,8 +28,8 @@
 
 <summary>
     <p>FAQ ÃÖ½ÅÆÇÀº ¾ÆÆÄÄ¡ À¥»çÀÌÆ® &lt;<a
-    href="http://httpd.apache.org/docs-2.1/faq/"
-    >http://httpd.apache.org/docs-2.0/faq/</a>&gt;¿¡¼­ º¼ ¼ö
+    href="http://httpd.apache.org/docs/&httpd.docs;/faq/"
+    >http://httpd.apache.org/docs/&httpd.docs;/faq/</a>&gt;¿¡¼­ º¼ ¼ö
     ÀÖ´Ù.</p>
 
     <p>¾ÆÆÄÄ¡ 2.0ÀÌ ³ª¿ÂÁö ¾ó¸¶ ¾ÈµÇ¼­ ¿ì¸®´Â ¾ÆÁ÷ <em>ÀÚÁÖ

diff --git a/docs/manual/faq/index.xml b/docs/manual/faq/index.xml
index 9dbaa642411ffb1a616fea95b8dc2e6891870033..cfc8658a3548a3be5ea6812180aa6439e064af64 100644 (file)
--- a/docs/manual/faq/index.xml
+++ b/docs/manual/faq/index.xml
@@ -29,8 +29,9 @@
 
 <summary>
     <p>The latest version of this FAQ is always available from the
-    main Apache web site, at &lt;<a href="http://httpd.apache.org/docs-2.0/faq/"
-    >http://httpd.apache.org/docs-2.0/faq/</a>&gt;. In addition, you can view
+    main Apache web site, at &lt;<a
+    href="http://httpd.apache.org/docs/&httpd.docs;/faq/"
+    >http://httpd.apache.org/docs/&httpd.docs;/faq/</a>&gt;. In addition, you can view
     this FAQ <a href="all_in_one.html">all in one page</a> for easy searching
     and printing.</p>
 

diff --git a/docs/manual/faq/index.xml.ko b/docs/manual/faq/index.xml.ko
index 3b42be03a2c671951f0c3512df7d05905bc16286..66ce6cb092dc4d1b77a700fcf90bc16b9101b537 100644 (file)
--- a/docs/manual/faq/index.xml.ko
+++ b/docs/manual/faq/index.xml.ko
@@ -28,8 +28,8 @@
 
 <summary>
     <p>FAQ ÃÖ½ÅÆÇÀº ¾ÆÆÄÄ¡ À¥»çÀÌÆ® &lt;<a
-    href="http://httpd.apache.org/docs-2.0/faq/"
-    >http://httpd.apache.org/docs-2.0/faq/</a>&gt;¿¡¼­ º¼ ¼ö
+    href="http://httpd.apache.org/docs/&httpd.docs;/faq/"
+    >http://httpd.apache.org/docs/&httpd.docs;/faq/</a>&gt;¿¡¼­ º¼ ¼ö
     ÀÖ´Ù. ¶Ç, °Ë»öÇÏ°í Ãâ·ÂÇϱâ ÆíÇÏ°Ô FAQ¸¦ <a
     href="all_in_one.html">ÇÑ ÆäÀÌÁö·Î</a> º¼ ¼ö ÀÖ´Ù.</p>
 

diff --git a/docs/manual/faq/support.xml b/docs/manual/faq/support.xml
index fd1db256092ef36e767b28a48c7ce62a51652b6f..89405a8b59fc998845f8aa0a5c70d5e9b81b02b7 100644 (file)
--- a/docs/manual/faq/support.xml
+++ b/docs/manual/faq/support.xml
@@ -53,7 +53,7 @@
       location on your server.</dd>
 
       <dt>Check the <a
-      href="http://httpd.apache.org/docs-2.0/faq/">FAQ</a>!</dt>
+      href="http://httpd.apache.org/docs/&httpd.docs;/faq/">FAQ</a>!</dt>
       <dd>The latest version of the Apache Frequently-Asked Questions list can
       always be found at the main Apache web site.</dd>
 

diff --git a/docs/manual/faq/support.xml.ko b/docs/manual/faq/support.xml.ko
index a7717bd1782c40d41c82c7c3291cf89fd977caec..e1867cf48ebb1b1ebbfb8c201d611570bf68ada2 100644 (file)
--- a/docs/manual/faq/support.xml.ko
+++ b/docs/manual/faq/support.xml.ko
@@ -52,7 +52,7 @@
       module="core">ErrorLog</directive> Áö½Ã¾î¸¦ Âü°íÇ϶ó.</dd>
 
       <dt><a
-      href="http://httpd.apache.org/docs-2.0/faq/">FAQ</a>¸¦
+      href="http://httpd.apache.org/docs/&httpd.docs;/faq/">FAQ</a>¸¦
       È®ÀÎÇ϶ó!</dt>
       <dd>¾ÆÆÄÄ¡ À¥»çÀÌÆ®¿¡¼­ Ç×»ó ¾ÆÆÄÄ¡ FAQ ÃÖ½ÅÆÇÀ» º¼ ¼ö
       ÀÖ´Ù.</dd>

diff --git a/docs/manual/glossary.xml b/docs/manual/glossary.xml
index dca77df92ebfd35253d29c98ff02d847484270b2..96e19f3948de8a511ca4b8d5e4f90cf31ecd909d 100644 (file)
--- a/docs/manual/glossary.xml
+++ b/docs/manual/glossary.xml
@@ -434,7 +434,7 @@
       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>http://httpd.apache.org/docs/&httpd.docs;/glossary.html</code>.
   </dd> 
 
   <dt><a name="uniformresourceidentifier"

diff --git a/docs/manual/glossary.xml.de b/docs/manual/glossary.xml.de
index 88a25a7b6de43c3225cf2c37464f0cb94ccc81a8..0b5176175a62abc7f73577721e72b23379d2b80e 100644 (file)
--- a/docs/manual/glossary.xml.de
+++ b/docs/manual/glossary.xml.de
@@ -484,7 +484,7 @@
       Identifier</glossary>. URLs bestehen &uuml;blicherweise aus einem
       Schema wie <code>http</code> oder <code>https</code>, einem Hostnamen
       und einem Pfad. Die URL f&uuml;r diese Seite ist
-      <code>http://httpd.apache.org/docs-2.1/glossary.html</code>.
+      <code>http://httpd.apache.org/docs/&httpd.docs;/glossary.html</code>.
     </dd>
 
     <dt><a name="uniformresourceidentifier"

diff --git a/docs/manual/glossary.xml.es b/docs/manual/glossary.xml.es
index 79f5038ac636b97da2434697035feb96a2929e63..ffd857f85532cb0fc50f9e801b09b75843c944a1 100644 (file)
--- a/docs/manual/glossary.xml.es
+++ b/docs/manual/glossary.xml.es
@@ -400,7 +400,7 @@ llama un <a href="#uniformresourceidentifier">Identificador de
 Recursos Uniforme</a>.  Las URLs est&#225;n compuestas normalmente por
 un esquema, tal como <code>http</code> o <code>https</code>, un nombre
 de host, y una ruta.  Una URL para esta p&#225;gina es
-<code>http://httpd.apache.org/docs-2.0/glossary.html</code>.</dd>
+<code>http://httpd.apache.org/docs/&httpd.docs;/glossary.html</code>.</dd>
 
 <dt><a name="uniformresourceidentifier">Identificador de Recursos
 Uniforme</a> <a name="URI">(URI)</a></dt> <dd>Una cadena de caracteres

diff --git a/docs/manual/glossary.xml.ko b/docs/manual/glossary.xml.ko
index 584a62e20ff0e33aabf2ec1a02df22312aceb1c4..584600564089ca4fa45a91b84b3b65b860968deb 100644 (file)
--- a/docs/manual/glossary.xml.ko
+++ b/docs/manual/glossary.xml.ko
@@ -350,7 +350,7 @@ href="#uniformresourceidentifier">Uniform Resource
 Identifier</a>¶ó°í ÇÏ´Â °ÍÀÇ ÀÏ»óÀûÀÎ ºñ°ø½Ä ¸íĪÀÌ´Ù. º¸Åë URLÀº
 <code>http</code>³ª <code>https</code>°°Àº ½ºÅ´(scheme), È£½ºÆ®¸í,
 °æ·Î·Î ±¸¼ºµÈ´Ù. ÀÌ ÆäÀÌÁöÀÇ URLÀº
-<code>http://httpd.apache.org/docs-2.0/glossary.html</code>ÀÌ´Ù.</dd>
+<code>http://httpd.apache.org/docs/&httpd.docs;/glossary.html</code>ÀÌ´Ù.</dd>
 
 <dt><a name="uniformresourceidentifier">Uniform Resource Identifier</a>
 <a name="URI">(URI)</a></dt>

diff --git a/docs/manual/index.xml b/docs/manual/index.xml
index 271d6cd8636ee456d5dcf3eddc37b996ae14960b..ee141f6b2f0c0d2f33615891764f70d54dd07950 100644 (file)
--- a/docs/manual/index.xml
+++ b/docs/manual/index.xml
@@ -23,7 +23,8 @@
 <indexpage metafile="index.xml.meta">
 <parentdocument href="http://httpd.apache.org/docs-project/" />
 
-<title>Apache HTTP Server Version 2.0 Documentation</title>
+<title>Apache HTTP Server Version &httpd.major;.&httpd.minor;
+Documentation</title>
 
 <category id="release"><title>Release Notes</title>
     <page href="new_features_2_0.html">New features with Apache 2.0</page>

diff --git a/docs/manual/index.xml.de b/docs/manual/index.xml.de
index da985ff301fe72351ffd4b4d22a441c0a6a36399..b633837b1dc2a158dc494117960f20162ac6b592 100644 (file)
--- a/docs/manual/index.xml.de
+++ b/docs/manual/index.xml.de
@@ -22,7 +22,8 @@
 <indexpage metafile="index.xml.meta">
 <parentdocument href="http://httpd.apache.org/docs-project/" />
 
-<title>Dokumentation zum Apache HTTP Server Version 2.0</title>
+<title>Dokumentation zum Apache HTTP Server Version
+&httpd.major;.&httpd.minor;</title>
 
 <category id="release"><title>Hinweise zur Version</title>
     <page href="new_features_2_0.html">Neue Funktionen in Version 2.0</page>

diff --git a/docs/manual/index.xml.es b/docs/manual/index.xml.es
index 31b7c21752d6dc8195fd0cd4e60302d1724fedc3..ffc739757f01dbf703d9912160f0bd169e847e1d 100644 (file)
--- a/docs/manual/index.xml.es
+++ b/docs/manual/index.xml.es
@@ -23,7 +23,8 @@
 <indexpage metafile="index.xml.meta">
 <parentdocument href="http://httpd.apache.org/docs-project/" />
 
-<title>Documentaci&#243;n del Servidor HTTP Apache 2.0</title>
+<title>Documentaci&#243;n del Servidor HTTP Apache
+&httpd.major;.&httpd.minor;</title>
 
 <category id="release"><title>Notas de la Versi&#243;n</title> 
     <page href="new_features_2_0.html">Nuevas funcionalidades en

diff --git a/docs/manual/index.xml.fr b/docs/manual/index.xml.fr
index d4a8042dc2e668f530b8e87052c0e663b97e4067..be10279c1accb3dd80663951e4a9d0ea7eaf7fa5 100644 (file)
--- a/docs/manual/index.xml.fr
+++ b/docs/manual/index.xml.fr
@@ -24,7 +24,8 @@
 <indexpage metafile="index.xml.meta">
 <parentdocument href="http://httpd.apache.org/docs-project/" />
 
-<title>Documentation du Serveur Apache Version 2.0</title>
+<title>Documentation du Serveur Apache Version
+&httpd.major;.&httpd.minor;</title>
 
 <category id="release"><title>Notes sur cette version</title>
     <page href="new_features_2_0.html">Nouvelles fonctionnalités de la version 2.0</page>

diff --git a/docs/manual/index.xml.ja b/docs/manual/index.xml.ja
index c941d910ce9f3d0f33c060abcec0e4062d55b4d9..92fd52d33f1c2030add7a2e13a6953a51a9ff749 100644 (file)
--- a/docs/manual/index.xml.ja
+++ b/docs/manual/index.xml.ja
@@ -22,7 +22,7 @@
 <indexpage metafile="index.xml.meta">
 <parentdocument href="http://httpd.apache.org/docs-project/" />
 
-<title>Apache HTTP \e$B%5!<%P\e(B \e$B%P!<%8%g%s\e(B 2.0 \e$B%I%-%e%a%s%H\e(B</title>
+<title>Apache HTTP \e$B%5!<%P\e(B \e$B%P!<%8%g%s\e(B &httpd.major;.&httpd.minor; \e$B%I%-%e%a%s%H\e(B</title>
 
 <category id="release"><title>\e$B%j%j!<%9%N!<%H\e(B</title>
     <page href="new_features_2_0.html">Apache 2.0 \e$B$N?75!G=\e(B</page>

diff --git a/docs/manual/index.xml.ko b/docs/manual/index.xml.ko
index ad1c6cc07ae89821de25f59e4e82de913426434b..e0ea086b02bdd9d89198122b161b3fd476f74d3a 100644 (file)
--- a/docs/manual/index.xml.ko
+++ b/docs/manual/index.xml.ko
@@ -22,7 +22,7 @@
 <indexpage metafile="index.xml.meta">
 <parentdocument href="http://httpd.apache.org/docs-project/" />
 
-<title>Apache HTTP Server Version 2.0 ¹®¼­</title>
+<title>Apache HTTP Server Version &httpd.major;.&httpd.minor; ¹®¼­</title>
 
 <category id="release"><title>¹ßÇ¥¹®</title>
     <page href="new_features_2_0.html">¹öÀü 2.0ÀÇ »õ·Î¿î ±â´É</page>

diff --git a/docs/manual/index.xml.ru b/docs/manual/index.xml.ru
index a61382d003766d9076a59d72e300130134ef3990..3e0ec6480d6b2695e0d4ff7ad7869ee7f257db36 100644 (file)
--- a/docs/manual/index.xml.ru
+++ b/docs/manual/index.xml.ru
@@ -29,7 +29,8 @@
 <indexpage metafile="index.xml.meta">
 <parentdocument href="http://httpd.apache.org/docs-project/" />
 
-<title>äÏËÕÍÅÎÁÔÃÉÑ Ë HTTP ÓÅÒ×ÅÒÕ Apache ×ÅÒÓÉÉ 2.0</title>
+<title>äÏËÕÍÅÎÁÔÃÉÑ Ë HTTP ÓÅÒ×ÅÒÕ Apache ×ÅÒÓÉÉ
+&httpd.major;.&httpd.minor;</title>
 
 <category id="release"><title>ï ×ÅÒÓÉÉ 2.0</title>
     <page href="new_features_2_0.html">ïÂÚÏÒ ÎÏ×ÙÈ ×ÏÚÍÏÖÎÏÓÔÅÊ × Apache 2.0</page>

diff --git a/docs/manual/install.xml b/docs/manual/install.xml
index a89aaac0bd794f530c84259f8662508e7f4c2521..e99b6216ef980089ad40bb04ee7c3803af83b921 100644 (file)
--- a/docs/manual/install.xml
+++ b/docs/manual/install.xml
@@ -309,9 +309,9 @@ $ tar xvf httpd-2_0_<em>NN</em>.tar
 
     <p>Have a look at the Apache manual under <a
     href="./">docs/manual/</a> or consult <a
-    href="http://httpd.apache.org/docs-2.0/"
-    >http://httpd.apache.org/docs-2.0/</a> for the most recent version of
-    this manual and a complete reference of available <a
+    href="http://httpd.apache.org/docs/&httpd.docs;/"
+    >http://httpd.apache.org/docs/&httpd.docs;/</a> for the most recent
+    version of this manual and a complete reference of available <a
     href="mod/directives.html">configuration directives</a>.</p>
 </section>
 

diff --git a/docs/manual/install.xml.de b/docs/manual/install.xml.de
index fb4c8a1024c3aea20f2c2107c2d85bcbb91237de..5efbbabd259bfe6961e5274442bdfd4ff016ac30 100644 (file)
--- a/docs/manual/install.xml.de
+++ b/docs/manual/install.xml.de
@@ -323,8 +323,8 @@
     href="./">docs/manual/</a>. Die aktuellste Version dieses Handbuchs
     sowie eine komplette Referenz der verf&#252;gbaren <a
     href="mod/directives.html">Konfigurationsanweisungen</a> finden
-    Sie unter <a href="http://httpd.apache.org/docs-2.0/"
-    >http://httpd.apache.org/docs-2.0/</a>.</p>
+    Sie unter <a href="http://httpd.apache.org/docs/&httpd.docs;/"
+    >http://httpd.apache.org/docs/&httpd.docs;/</a>.</p>
 </section>
 
 <section id="test"><title>Testen</title>

diff --git a/docs/manual/install.xml.es b/docs/manual/install.xml.es
index c73015e0faf9f465806f60e1b08005b7c3b3f8a5..2bb8fb1594aa2e8b61b05117c376a6ff57e9daf5 100644 (file)
--- a/docs/manual/install.xml.es
+++ b/docs/manual/install.xml.es
@@ -338,8 +338,8 @@ directorios</title>
 
     <p>&#233;chele un vistazo al Manual de Apache que est&#225; en <a
     href="./">docs/manual/</a> o consulte en <a
-    href="http://httpd.apache.org/docs-2.0/"
-    >http://httpd.apache.org/docs-2.0/</a> la versi&#243;n m&#225;s
+    href="http://httpd.apache.org/docs/&httpd.docs;/"
+    >http://httpd.apache.org/docs/&httpd.docs;/</a> la versi&#243;n m&#225;s
     reciente de este manual y la Guia de Referencia de todas las <a
     href="mod/directives.html">directivas de configuraci&#243;n</a>
     disponibles.</p>

diff --git a/docs/manual/install.xml.ja b/docs/manual/install.xml.ja
index 47fb719aa5c9351c2d36ef43571dd0e46e90beff..6f31e358d7503c67f745278a155676c15fedbbff 100644 (file)
--- a/docs/manual/install.xml.ja
+++ b/docs/manual/install.xml.ja
@@ -319,7 +319,7 @@ $ tar xvf httpd-2_0_<em>NN</em>.tar
 
     <p><a href="./">docs/manual/</a> \e$B$N\e(B Apache \e$B%^%K%e%"%k$r$6$C$H8+$F$/$@$5$$!#\e(B
     \e$B$^$?$O!"\e(B<a
-    href="http://httpd.apache.org/docs-2.0/">http://httpd.apache.org/docs-2.0/</a>
+    href="http://httpd.apache.org/docs/&httpd.docs;/">http://httpd.apache.org/docs/&httpd.docs;/</a>
     \e$B$K$"$k%^%K%e%"%k:G?7HG!"\e(B<a
     href="mod/directives.html">\e$B@_Dj%G%#%l%/%F%#%V\e(B</a>\e$B$KEv$?$C$F$_$F$/$@$5$$!#\e(B</p>
 </section>

diff --git a/docs/manual/install.xml.ko b/docs/manual/install.xml.ko
index 9d0f289c16279fb40535cbd4126c3a555763902d..8523ecf51fa56d3c32c1e155f0053d166df28a57 100644 (file)
--- a/docs/manual/install.xml.ko
+++ b/docs/manual/install.xml.ko
@@ -289,8 +289,8 @@ $ tar xvf httpd-2_0_<em>NN</em>.tar
     <p>»ç¿ë°¡´ÉÇÑ <a href="mod/directives.html">¼³Á¤ Áö½Ã¾î</a>¿¡
     ´ëÇÑ ¿ÏÀüÇÑ ¼³¸í°ú ÀÌ ¹®¼­ÀÇ °¡Àå ÃÖ±Ù ÆÇÀº <a
     href="./">docs/manual/</a>À̳ª <a
-    href="http://httpd.apache.org/docs-2.0/"
-    >http://httpd.apache.org/docs-2.0/</a>¿¡ ÀÖ´Â ¾ÆÆÄÄ¡ ¼³¸í¼­¸¦
+    href="http://httpd.apache.org/docs/&httpd.docs;/"
+    >http://httpd.apache.org/docs/&httpd.docs;/</a>¿¡ ÀÖ´Â ¾ÆÆÄÄ¡ ¼³¸í¼­¸¦
     Âü°íÇ϶ó.</p>
 </section>
 

diff --git a/docs/manual/install.xml.ru b/docs/manual/install.xml.ru
index 9b4bfb0ebee157bf15290e98a7d84ffb466e53c5..922e615963f0148cf5d74c5764d961d799c8fb8f 100644 (file)
--- a/docs/manual/install.xml.ru
+++ b/docs/manual/install.xml.ru
@@ -554,7 +554,8 @@
 
     <p>òÕËÏ×ÏÄÓÔ×Ï ÐÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ Apache ×Ù ÍÏÖÅÔÅ ÎÁÊÔÉ ÌÉÂÏ ÐÏ ÌÏËÁÌØÎÏÍÕ
     ÁÄÒÅÓÕ Õ ÓÅÂÑ ÎÁ ÓÅÒ×ÅÒÅ <a href="./">docs/manual/</a>, ÌÉÂÏ ÎÁ ÏÆÉÃÉÁÌØÎÏÍ
-    ÓÁÊÔÅ Apache <a href="http://httpd.apache.org/docs-2.0/">http://httpd.apache.org/docs-2.0/</a>,
+    ÓÁÊÔÅ Apache <a
+    href="http://httpd.apache.org/docs/&httpd.docs;/">http://httpd.apache.org/docs/&httpd.docs;/</a>,
     ÇÄÅ ÏÐÕÂÌÉËÏ×ÁÎÁ ÓÁÍÁÑ ÐÏÓÌÅÄÎÑÑ ×ÅÒÓÉÑ ÄÏËÕÍÅÎÔÁÃÉÉ É ×ÓÑ ÎÅÏÂÈÏÄÉÍÁÑ ÓÐÒÁ×ÏÞÎÁÑ ÉÎÆÏÒÍÁÃÉÑ
     ÐÏ ×ÓÅÍ ×ÏÚÍÏÖÎÙÍ <a href="mod/directives.html">ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÍ ÄÉÒÅËÔÉ×ÁÍ</a>.</p>
 </section>

diff --git a/docs/manual/mod/mod_info.xml b/docs/manual/mod/mod_info.xml
index 401f4425964cf2aaa1306942a537467c2783ce18..41a4fad4f985a6d909ba04f3d3f66900f173140c 100644 (file)
--- a/docs/manual/mod/mod_info.xml
+++ b/docs/manual/mod/mod_info.xml
@@ -103,8 +103,8 @@ information displayed by the server-info handler</description>
     <example>
       AddModuleInfo mod_auth.c 'See &lt;a \<br />
       <indent>
-        href="http://www.apache.org/docs-2.0/mod/mod_auth.html"&gt;\<br />
-        http://www.apache.org/docs-2.0/mod/mod_auth.html&lt;/a&gt;'
+        href="http://www.apache.org/docs/&httpd.docs;/mod/mod_auth.html"&gt;\<br />
+        http://www.apache.org/docs/&httpd.docs;/mod/mod_auth.html&lt;/a&gt;'
       </indent>
     </example>
 </usage>

diff --git a/docs/manual/mod/mod_info.xml.ja b/docs/manual/mod/mod_info.xml.ja
index 48ab4800a0025da28b49fb6a76ffd4e70f7866d8..454bc2818ce991630bced988cf011b81020767b5 100644 (file)
--- a/docs/manual/mod/mod_info.xml.ja
+++ b/docs/manual/mod/mod_info.xml.ja
@@ -91,8 +91,8 @@ SetHandler server-info<br />
 <example>
   AddModuleInfo mod_authn_file.c 'See &lt;a \<br />
   <indent>
-    href="http://www.apache.org/docs-2.0/mod/mod_authn_file.html"&gt;\<br />
-    http://www.apache.org/docs-2.0/mod/mod_authn_file.html&lt;/a&gt;'
+    href="http://www.apache.org/docs/&httpd.docs;/mod/mod_authn_file.html"&gt;\<br />
+    http://www.apache.org/docs/&httpd.docs;/mod/mod_authn_file.html&lt;/a&gt;'
   </indent>
 </example>
 </usage>

diff --git a/docs/manual/mod/mod_info.xml.ko b/docs/manual/mod/mod_info.xml.ko
index e4fa0dc0ba23056838ddcd36160e44be347249a3..af63758be593ba6fcac00d905ad8349063255887 100644 (file)
--- a/docs/manual/mod/mod_info.xml.ko
+++ b/docs/manual/mod/mod_info.xml.ko
@@ -87,8 +87,8 @@
     <example>
       AddModuleInfo mod_auth.c 'See &lt;a \<br />
       <indent>
-        href="http://www.apache.org/docs-2.0/mod/mod_auth.html"&gt;\<br />
-        http://www.apache.org/docs-2.0/mod/mod_auth.html&lt;/a&gt;'
+        href="http://www.apache.org/docs/&httpd.docs;/mod/mod_auth.html"&gt;\<br />
+        http://www.apache.org/docs/&httpd.docs;/mod/mod_auth.html&lt;/a&gt;'
       </indent>
     </example>
 </usage>

diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml
index 5a73e12775d23098cb16f33016f55818602fd5b4..5ce99892b3b5341087c89415d47a16336dcff131 100644 (file)
--- a/docs/manual/mod/mod_ssl.xml
+++ b/docs/manual/mod/mod_ssl.xml
@@ -203,7 +203,7 @@ exclusion of operations which have to be done in a synchronized way between the
 pre-forked Apache server processes. This directive can only be used in the
 global server context because it's only useful to have one global mutex.
 This directive is designed to closely match the
-<a href="http://httpd.apache.org/docs-2.0/mod/mpm_common.html#acceptmutex">AcceptMutex</a> directive</p>
+<a href="http://httpd.apache.org/docs/&httpd.docs;/mod/mpm_common.html#acceptmutex">AcceptMutex</a> directive</p>
 <p>
 The following Mutex <em>types</em> are available:</p>
 <ul>

diff --git a/docs/manual/programs/suexec.xml b/docs/manual/programs/suexec.xml
index 927e08088a45a8f1f780df9bef9efed6f95ebca8..0723f82f29df15dca105c1320f306b6232f283aa 100644 (file)
--- a/docs/manual/programs/suexec.xml
+++ b/docs/manual/programs/suexec.xml
@@ -35,8 +35,8 @@
 
      <p>For further information about the concepts and and the security model
      of suexec please refer to the suexec documentation (<a
-     href="http://httpd.apache.org/docs-2.0/suexec.html"
-     >http://httpd.apache.org/docs-2.0/suexec.html</a>).</p>
+     href="http://httpd.apache.org/docs/&httpd.docs;/suexec.html"
+     >http://httpd.apache.org/docs/&httpd.docs;/suexec.html</a>).</p>
 </summary>
 
 <section id="synopsis"><title>Synopsis</title>

diff --git a/docs/manual/programs/suexec.xml.ko b/docs/manual/programs/suexec.xml.ko
index 9b15483b9b79052942ddd9828d29272d42b71147..3dae35bc0b3aff92336f46db9fca5e0e26c2e8f6 100644 (file)
--- a/docs/manual/programs/suexec.xml.ko
+++ b/docs/manual/programs/suexec.xml.ko
@@ -34,8 +34,8 @@
      ´Ù¸¥ »ç¿ëÀÚ°¡ ¾²±â±ÇÇÑÀ» °¡Áö¸é ¾ÈµÈ´Ù.</p>
 
      <p>suexecÀÇ °³³ä°ú º¸¾È¸ðµ¨¿¡ ´ëÇÑ Á¤º¸´Â suexec ¹®¼­¸¦
-     (<a href="http://httpd.apache.org/docs-2.0/suexec.html"
-     >http://httpd.apache.org/docs-2.0/suexec.html</a>) Âü°íÇ϶ó.</p>
+     (<a href="http://httpd.apache.org/docs/&httpd.docs;/suexec.html"
+     >http://httpd.apache.org/docs/&httpd.docs;/suexec.html</a>) Âü°íÇ϶ó.</p>
 </summary>
 
 <section id="synopsis"><title>°³¿ä</title>

diff --git a/docs/manual/sitemap.xml b/docs/manual/sitemap.xml
index 1c4305d5682535e0810b38146feb9de5f8b96bef..e653760006b6f6afcc10d750b397cc4cde868d12 100644 (file)
--- a/docs/manual/sitemap.xml
+++ b/docs/manual/sitemap.xml
@@ -26,7 +26,8 @@
 
 <summary>
 <p>This page lists the currently available documents of the
-<a href="./">Apache HTTP Server Version 2.0 Documentation</a>.</p>
+<a href="./">Apache HTTP Server Version &httpd.major;.&httpd.minor;
+Documentation</a>.</p>
 </summary>
 
 <category id="release">

diff --git a/docs/manual/sitemap.xml.de b/docs/manual/sitemap.xml.de
index d0bf397ea14a89313ad3f7e9637d6e36a8e90432..ece7f3b067c8dac23ab2fb29f2d357712109b79f 100644 (file)
--- a/docs/manual/sitemap.xml.de
+++ b/docs/manual/sitemap.xml.de
@@ -25,7 +25,8 @@
 
 <summary>
 <p>Diese Seite verzeichnet die zur Zeit verf&#252;gbaren Dokumente der
-<a href="./">Dokumentation zum Apache HTTP Server Version 2.0</a>.</p>
+<a href="./">Dokumentation zum Apache HTTP Server Version
+&httpd.major;.&httpd.minor;</a>.</p>
 </summary>
 
 <category id="release">

diff --git a/docs/manual/sitemap.xml.es b/docs/manual/sitemap.xml.es
index 5fbcf8ef1015884a655f6de2900806e680faef80..5e66203a7d018fc0f6b27b398335ab6c0ec3dfed 100644 (file)
--- a/docs/manual/sitemap.xml.es
+++ b/docs/manual/sitemap.xml.es
@@ -25,8 +25,8 @@
 
 <summary>
 <p>Esta p&#225;gina contiene la lista con los documentos actualmente
-disponibles de la <a href="./">Versi&#243;n 2.0 de la Documentaci&#243;n del
-Servidor HTTP Apache</a>.</p>
+disponibles de la <a href="./">Versi&#243;n &httpd.major;.&httpd.minor; de la
+Documentaci&#243;n del Servidor HTTP Apache</a>.</p>
 </summary>
 
 <category id="release">

diff --git a/docs/manual/sitemap.xml.ja b/docs/manual/sitemap.xml.ja
index c67fe41578aa17da212c7677848720f6e9808252..0cc4cb38b9359c571cb13468c1938318eb219807 100644 (file)
--- a/docs/manual/sitemap.xml.ja
+++ b/docs/manual/sitemap.xml.ja
@@ -25,7 +25,7 @@
 
 <summary>
 <p>\e$B$3$N%Z!<%8$O8=;~E@$GMxMQ2DG=$J\e(B
-<a href="./">Apache HTTP \e$B%5!<%P%P!<%8%g%s\e(B 2.0 \e$B$N%I%-%e%a%s%F!<%7%g%s\e(B</a>
+<a href="./">Apache HTTP \e$B%5!<%P%P!<%8%g%s\e(B &httpd.major;.&httpd.minor; \e$B$N%I%-%e%a%s%F!<%7%g%s\e(B</a>
 \e$B$N0lMw$G$9!#\e(B</p>
 </summary>
 

diff --git a/docs/manual/sitemap.xml.ko b/docs/manual/sitemap.xml.ko
index e1a535c127f19110eaba7122a7dca3f2f8ef7b55..f59b5d8c281d294e1e1254d9d1056bf41621c09b 100644 (file)
--- a/docs/manual/sitemap.xml.ko
+++ b/docs/manual/sitemap.xml.ko
@@ -25,7 +25,7 @@
 
 <summary>
 <p>ÀÌ ÆäÀÌÁö´Â ÇöÀç
-<a href="./">Apache HTTP Server Version 2.0 ¹®¼­</a> ¸ñ·ÏÀ»
+<a href="./">Apache HTTP Server Version &httpd.major;.&httpd.minor; ¹®¼­</a> ¸ñ·ÏÀ»
 º¸¿©ÁØ´Ù.</p>
 </summary>
 

diff --git a/docs/manual/ssl/ssl_faq.xml b/docs/manual/ssl/ssl_faq.xml
index 8dbdf9d1a68b1d62fcc0408cff9fcaeb14a9c1b7..bd2610d9089e978c191e98b7932b44541a3fd668 100644 (file)
--- a/docs/manual/ssl/ssl_faq.xml
+++ b/docs/manual/ssl/ssl_faq.xml
@@ -923,8 +923,8 @@ for my core dump?</a></li>
 
     <dl>
     <dt>Answers in the User Manual's F.A.Q. List (this)</dt>
-    <dd><a href="http://httpd.apache.org/docs/2.1/ssl/ssl_faq.html">
-       http://httpd.apache.org/docs/2.1/ssl/ssl_faq.html</a><br />
+    <dd><a href="http://httpd.apache.org/docs/&httpd.docs;/ssl/ssl_faq.html">
+       http://httpd.apache.org/docs/&httpd.docs;/ssl/ssl_faq.html</a><br />
        First check the F.A.Q. (this text). If your problem is a common
        one, it may have been answered several times before, and been included
        in this doc.

diff --git a/docs/manual/style/common.dtd b/docs/manual/style/common.dtd
index 8b9285a45b65f5b82e7e5287a8db785152295472..b1e603fb66e0b9e2df63dc30ae1e610089c82d8b 100644 (file)
--- a/docs/manual/style/common.dtd
+++ b/docs/manual/style/common.dtd
@@ -1,7 +1,8 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 
 <!--
- Copyright 2002-2004 The Apache Software Foundation
+ Copyright 2002-2005 The Apache Software Foundation or its licensors,
+                     as applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -33,6 +34,11 @@
    "http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent">
 %HTMLspecial;
 
+<!-- HTTPD Version -->
+
+<!ENTITY % HTTPD-VERSION SYSTEM "version.ent">
+%HTTPD-VERSION;
+
 <!-- Generic tag entities -->
 
 <!ENTITY % inlinetags "em | strong | code | a | br | directive | module |
@@ -45,6 +51,8 @@ program | img | cite | q | dfn | var | transnote | glossary | phonetic">
 <!ENTITY % Inline "(#PCDATA | %inlinetags;)*">
 <!ENTITY % BlockOrInline "(#PCDATA | %inlinetags; | %blocktags;)*">
 
+<!-- Common Elements -->
+
 <!ELEMENT title %Inline;>
 
 <!ELEMENT summary %Block;>
@@ -175,7 +183,7 @@ program | img | cite | q | dfn | var | transnote | glossary | phonetic">
 <!-- The glossary element defines a special case of link. The referenced
      target is the name of an anchor within the glossary -->
 <!ELEMENT glossary %Inline;>
-<!ATTLIST glossary ref CDATA #REQUIRED>
+<!ATTLIST glossary ref CDATA #IMPLIED>
 
 <!-- The phonetic element should be used only within the glossary. It
      describes a pronounciation -->

diff --git a/docs/manual/style/lang.dtd b/docs/manual/style/lang.dtd
new file mode 100644 (file)
index 0000000..f117e8d
--- /dev/null
+++ b/docs/manual/style/lang.dtd
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!--
+ Copyright 2005 The Apache Software Foundation or its licensors,
+                as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!ENTITY % HTTPD-VERSION SYSTEM "version.ent">
+%HTTPD-VERSION;
+
+<!ENTITY nbsp "&#160;">
+

diff --git a/docs/manual/style/lang/de.xml b/docs/manual/style/lang/de.xml
index e1dede4927e6fa87117c4705fd8bef4743cd4347..224a6734efe0cb54fa05ab31ba0a7f3324a62cdd 100644 (file)
--- a/docs/manual/style/lang/de.xml
+++ b/docs/manual/style/lang/de.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE messages [ <!ENTITY nbsp "&#160;"> ]>
+<!DOCTYPE messages SYSTEM "../lang.dtd">
 <!-- English revision: 106090 -->
 
 <!--
@@ -98,7 +98,8 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Apache HTTP Server</message>
-        <message id="apachehttpserver">Apache HTTP Server Version 2.0</message>
+        <message id="apachehttpserver">Apache HTTP Server Version
+            &httpd.major;.&httpd.minor;</message>
         <message id="apachedocalt">[APACHE DOCUMENTATION]</message>
         <message id="search">Google-Suche</message> <!-- search button -->
         <message id="index">Index</message> <!-- deprecated -->
@@ -108,7 +109,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">HTTP-Server</message>
         <message id="documentation">Dokumentation</message>
-        <message id="version">Version 2.0</message>
+        <message id="version">Version &httpd.major;.&httpd.minor;</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 9d90afdbb61ed7fe47cd5a887ef9057faaa064dd..4cc4c7e136c72dcd4ca700221fcb1e8f58c7a422 100644 (file)
--- a/docs/manual/style/lang/en.xml
+++ b/docs/manual/style/lang/en.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE messages [ <!ENTITY nbsp "&#160;"> ]>
+<!DOCTYPE messages SYSTEM "../lang.dtd">
 <!-- $LastChangedRevision$ -->
 
 <!--
@@ -99,7 +99,8 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Apache HTTP Server</message>
-        <message id="apachehttpserver">Apache HTTP Server Version 2.0</message>
+        <message id="apachehttpserver">Apache HTTP Server Version
+            &httpd.major;.&httpd.minor;</message>
         <message id="apachedocalt">[APACHE DOCUMENTATION]</message>
         <message id="search">Google Search</message> <!-- search button -->
         <message id="index">Index</message> <!-- deprecated -->
@@ -109,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.0</message>
+        <message id="version">Version &httpd.major;.&httpd.minor;</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 b42f70e6336768fe31f6cb23e214ba8458f44b91..b9eb06095c335e841a2a125685798a8bdb32399c 100644 (file)
--- a/docs/manual/style/lang/es.xml
+++ b/docs/manual/style/lang/es.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE messages [ <!ENTITY nbsp "&#160;"> ]>
+<!DOCTYPE messages SYSTEM "../lang.dtd">
 
 <!--
  Copyright 2004 The Apache Software Foundation
@@ -97,8 +97,8 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Servidor HTTP Apache</message>
-        <message id="apachehttpserver">Versi&#243;n 2.0 del Servidor HTTP
-            Apache</message>
+        <message id="apachehttpserver">Versi&#243;n &httpd.major;.&httpd.minor;
+            del Servidor HTTP Apache</message>
         <message id="apachedocalt">[APACHE DOCUMENTATION]</message>
         <message id="search">Buscar en Google</message> <!-- search button -->
         <message id="index">&#205;ndice</message> <!-- deprecated -->
@@ -108,7 +108,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.0</message>
+        <message id="version">Versi&#243;n &httpd.major;.&httpd.minor;</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 48a448c22b6d4b41b91782e559b8ee9948794c01..24dcdf5bd1c935361436b0a1085ecb8ddf714303 100644 (file)
--- a/docs/manual/style/lang/fr.xml
+++ b/docs/manual/style/lang/fr.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE language [ <!ENTITY nbsp "&#160;"> ]>
+<!DOCTYPE language SYSTEM "../lang.dtd">
 <!-- English revision: 151405 -->
 
 <!--
@@ -101,7 +101,8 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Serveur Apache HTTP</message>
-        <message id="apachehttpserver">Serveur Apache HTTP Version 2.0</message>
+        <message id="apachehttpserver">Serveur Apache HTTP Version
+            &httpd.major;.&httpd.minor;</message>
         <message id="apachedocalt">[DOCUMENTATION APACHE]</message>
         <message id="search">Recherche Google</message> <!-- search button -->
         <message id="index">Index</message> <!-- deprecated -->
@@ -111,7 +112,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">Serveur HTTP</message>
         <message id="documentation">Documentation</message>
-        <message id="version">Version 2.0</message>
+        <message id="version">Version &httpd.major;.&httpd.minor;</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 fe9f13fea7ee80a4da075d52d630d35ebaa83dfe..0eb55348867f4a6ac4dd41eddeb2eaf2e3d9b6b0 100644 (file)
--- a/docs/manual/style/lang/ja.xml
+++ b/docs/manual/style/lang/ja.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
-<!DOCTYPE messages [ <!ENTITY nbsp "&#160;"> ]>
+<!DOCTYPE messages SYSTEM "../lang.dtd">
 <!-- English revision: 1.5 -->
 
 <!--
@@ -88,7 +88,8 @@
 
         <!-- 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.0</message>
+        <message id="apachehttpserver">Apache HTTP \e$B%5!<%P\e(B
+            \e$B%P!<%8%g%s\e(B &httpd.major;.&httpd.minor;</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 -->
@@ -98,7 +99,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.0</message>
+        <message id="version">\e$B%P!<%8%g%s\e(B &httpd.major;.&httpd.minor;</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 dc1734a12f5a30f0d010d7215e788ada434d3731..ad23c4cf92456948da28545d897d2aeec2822d41 100644 (file)
--- a/docs/manual/style/lang/ko.xml
+++ b/docs/manual/style/lang/ko.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="EUC-KR"?>
-<!DOCTYPE language [ <!ENTITY nbsp "&#160;"> ]>
+<!DOCTYPE language SYSTEM "../lang.dtd">
 <!-- English Revision: 1.6.2.10 -->
 
 <!--
@@ -103,7 +103,8 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Apache HTTP Server</message>
-        <message id="apachehttpserver">Apache HTTP Server Version 2.0</message>
+        <message id="apachehttpserver">Apache HTTP Server Version
+            &httpd.major;.&httpd.minor;</message>
         <message id="apachedocalt">[APACHE DOCUMENTATION]</message>
         <message id="search">Google °Ë»ö</message> <!-- search button -->
         <message id="index">Index</message> <!-- deprecated -->
@@ -113,7 +114,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">HTTP Server</message>
         <message id="documentation">Documentation</message>
-        <message id="version">Version 2.0</message>
+        <message id="version">Version &httpd.major;.&httpd.minor;</message>
 
         <!-- super menu -->
         <message id="modules">¸ðµâ</message>

diff --git a/docs/manual/style/lang/ru.xml b/docs/manual/style/lang/ru.xml
index 1800aba7155d7041078b0227f223ccd5e8791fa7..2487a8f37a189128c9818322dbf00e4028df8ca2 100644 (file)
--- a/docs/manual/style/lang/ru.xml
+++ b/docs/manual/style/lang/ru.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="KOI8-R"?>
-<!DOCTYPE messages [ <!ENTITY nbsp "&#160;"> ]>
+<!DOCTYPE messages SYSTEM "../lang.dtd">
 <!-- English revision: 1.4 -->
 
 <!--
@@ -92,7 +92,8 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- HTTP ÓÅÒ×ÅÒ Apache</message>
-        <message id="apachehttpserver">HTTP ÓÅÒ×ÅÒ Apache ×ÅÒÓÉÉ 2.0</message>
+        <message id="apachehttpserver">HTTP ÓÅÒ×ÅÒ Apache ×ÅÒÓÉÉ
+            &httpd.major;.&httpd.minor;</message>
         <message id="apachedocalt">[äïëõíåîôáãéñ APACHE]</message>
         <message id="search">ðÏÉÓË × Google</message> <!-- search button -->
         <message id="index">ïÇÌÁ×ÌÅÎÉÅ</message> <!-- deprecated -->
@@ -102,7 +103,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">HTTP ÓÅÒ×ÅÒ</message>
         <message id="documentation">äÏËÕÍÅÎÔÁÃÉÑ</message>
-        <message id="version">÷ÅÒÓÉÑ 2.0</message>
+        <message id="version">÷ÅÒÓÉÑ &httpd.major;.&httpd.minor;</message>
 
         <!-- super menu -->
         <message id="modules">íÏÄÕÌÉ</message>

diff --git a/docs/manual/style/latex/latex.xsl b/docs/manual/style/latex/latex.xsl
index b4068b268dadcafe7a30f23b7056605c776f2df5..dc705d01ed41ab4d8d337641387d79befc9f85fd 100644 (file)
--- a/docs/manual/style/latex/latex.xsl
+++ b/docs/manual/style/latex/latex.xsl
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE xsl:stylesheet [
+    <!ENTITY % HTTPD-VERSION SYSTEM "../version.ent">
+    %HTTPD-VERSION;
+]>
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors, as
@@ -122,7 +126,7 @@ during development, the PDF version may contain some errors and
 inconsistencies, especially in formatting.  If you have difficulty
 reading a part of this file, please consult the HTML version
 of the documentation on the Apache HTTP Server website at
-\href{http://httpd.apache.org/docs-2.0/}{http://httpd.apache.org/docs-2.0/}
+\href{http://httpd.apache.org/docs/&httpd.docs;/}{http://httpd.apache.org/docs/&httpd.docs;/}
 
 The Apache HTTP Server Documentation is maintained by the Apache HTTP
 Server Documentation Project.  More information is available at

diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent
new file mode 100644 (file)
index 0000000..3389896
--- /dev/null
+++ b/docs/manual/style/version.ent
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!--
+ Copyright 2005 The Apache Software Foundation or its licensors,
+                     as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!ENTITY httpd.major "2">
+<!ENTITY httpd.minor "0">
+<!ENTITY httpd.patch "56">
+
+<!ENTITY httpd.docs "2.0">

diff --git a/docs/manual/style/xsl/indexpage.xsl b/docs/manual/style/xsl/indexpage.xsl
index 3b0645568a6f088c71d28074c7f72e1a6409b2f7..5c7aa719da92f2ebfc39262f7ea716b2466f24c9 100644 (file)
--- a/docs/manual/style/xsl/indexpage.xsl
+++ b/docs/manual/style/xsl/indexpage.xsl
@@ -175,8 +175,9 @@
     <!-- (submit the original button and name) -->
     <input type="hidden" name="btnG" value="Google Search" />
 
-    <!-- including the exact phrase "Version 2.0" -->
-    <input type="hidden" value="{$message[@id='version']}" name="as_epq" />
+    <!-- including the exact phrase "Version major.minor" -->
+    <input type="hidden" value="{normalize-space($message[@id='version'])}"
+           name="as_epq" />
 
     <!-- with at least one of the words (none) -->
     <input type="hidden" value="" name="as_oq" />

diff --git a/docs/manual/suexec.xml b/docs/manual/suexec.xml
index 80e9582d72e2465371b70c48daa323725c2b8a92..3c8074de4be8cee31031a64b21f09ba5b8715df9 100644 (file)
--- a/docs/manual/suexec.xml
+++ b/docs/manual/suexec.xml
@@ -545,7 +545,7 @@
     <p><strong>NOTE!</strong> This section may not be
     complete. For the latest revision of this section of the
     documentation, see the Apache Group's <a
-    href="http://httpd.apache.org/docs-2.0/suexec.html">Online
+    href="http://httpd.apache.org/docs/&httpd.docs;/suexec.html">Online
     Documentation</a> version.</p>
 
     <p>There are a few points of interest regarding

diff --git a/docs/manual/suexec.xml.ja b/docs/manual/suexec.xml.ja
index 6654be826d45615e6012e413f230dfa2cf096e7e..a409fd3c5a5c1d6eb0aa01c2a74e0c54a1052a46 100644 (file)
--- a/docs/manual/suexec.xml.ja
+++ b/docs/manual/suexec.xml.ja
@@ -544,7 +544,7 @@
 
     <p><strong>\e$BCm0U\e(B!</strong>
     \e$B$3$N>O$O40A4$G$O$"$j$^$;$s!#$3$N>O$N:G?72~D{HG$K$D$$$F$O!"\e(B
-    Apache \e$B%0%k!<%W$N\e(B<a href="http://httpd.apache.org/docs-2.0/suexec.html">
+    Apache \e$B%0%k!<%W$N\e(B<a href="http://httpd.apache.org/docs/&httpd.docs;/suexec.html">
     \e$B%*%s%i%$%s%I%-%e%a%s%H\e(B</a>\e$BHG$r;2>H$7$F$/$@$5$$!#\e(B
     </p>
 

diff --git a/docs/manual/suexec.xml.ko b/docs/manual/suexec.xml.ko
index 7de802362b41aca7f81555a179748c13dcada1e3..5489f50fff51964ff225ca6ed16cbd94f5e254d9 100644 (file)
--- a/docs/manual/suexec.xml.ko
+++ b/docs/manual/suexec.xml.ko
@@ -476,7 +476,7 @@
 
     <p><strong>ÁÖÀÇ!</strong> ÀÌ ¼½¼ÇÀº ¿ÏÀüÇÏÁö ¾ÊÀ» ¼ö ÀÖ´Ù.
     ¾ÆÆÄÄ¡±×·ìÀÇ <a
-    href="http://httpd.apache.org/docs-2.0/suexec.html">¿Â¶óÀÎ
+    href="http://httpd.apache.org/docs/&httpd.docs;/suexec.html">¿Â¶óÀÎ
     ¹®¼­</a>¿¡¼­ ÀÌ ¹®¼­ÀÇ ÃÖ½ÅÆÇÀ» Âü°íÇ϶ó.</p>
 
     <p>wrapper°¡ ¼­¹ö ¼³Á¤À» Á¦¾àÇÏ´Â ¸î°¡Áö Èï¹Ì·Î¿î Á¡ÀÌ ÀÖ´Ù.