httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject svn commit: r333005 - in /httpd/httpd/trunk/docs: conf/ conf/extra/ manual/ manual/faq/ manual/mod/ manual/programs/ manual/ssl/ manual/style/ manual/style/lang/ manual/style/latex/ manual/style/xsl/
Date Sun, 13 Nov 2005 14:12:38 GMT
Author: nd
Date: Sun Nov 13 06:11:48 2005
New Revision: 333005

URL: http://svn.apache.org/viewcvs?rev=333005&view=rev
Log:
centralize the versioning of the httpd and the docs directories

Added:
    httpd/httpd/trunk/docs/manual/style/lang.dtd   (with props)
    httpd/httpd/trunk/docs/manual/style/version.ent   (with props)
Modified:
    httpd/httpd/trunk/docs/conf/extra/httpd-manual.conf.in
    httpd/httpd/trunk/docs/conf/extra/httpd-ssl.conf.in
    httpd/httpd/trunk/docs/conf/extra/httpd-vhosts.conf.in
    httpd/httpd/trunk/docs/conf/httpd-win.conf
    httpd/httpd/trunk/docs/conf/httpd.conf.in
    httpd/httpd/trunk/docs/manual/faq/all_in_one.xml
    httpd/httpd/trunk/docs/manual/faq/all_in_one.xml.ja
    httpd/httpd/trunk/docs/manual/faq/all_in_one.xml.ko
    httpd/httpd/trunk/docs/manual/faq/index.xml
    httpd/httpd/trunk/docs/manual/faq/index.xml.ja
    httpd/httpd/trunk/docs/manual/faq/index.xml.ko
    httpd/httpd/trunk/docs/manual/faq/support.xml
    httpd/httpd/trunk/docs/manual/faq/support.xml.ja
    httpd/httpd/trunk/docs/manual/faq/support.xml.ko
    httpd/httpd/trunk/docs/manual/glossary.xml
    httpd/httpd/trunk/docs/manual/glossary.xml.de
    httpd/httpd/trunk/docs/manual/glossary.xml.es
    httpd/httpd/trunk/docs/manual/glossary.xml.ko
    httpd/httpd/trunk/docs/manual/index.xml
    httpd/httpd/trunk/docs/manual/index.xml.de
    httpd/httpd/trunk/docs/manual/index.xml.es
    httpd/httpd/trunk/docs/manual/index.xml.fr
    httpd/httpd/trunk/docs/manual/index.xml.ja
    httpd/httpd/trunk/docs/manual/index.xml.ko
    httpd/httpd/trunk/docs/manual/index.xml.pt-br
    httpd/httpd/trunk/docs/manual/install.xml
    httpd/httpd/trunk/docs/manual/install.xml.de
    httpd/httpd/trunk/docs/manual/install.xml.es
    httpd/httpd/trunk/docs/manual/install.xml.fr
    httpd/httpd/trunk/docs/manual/install.xml.ja
    httpd/httpd/trunk/docs/manual/install.xml.ko
    httpd/httpd/trunk/docs/manual/mod/mod_info.xml
    httpd/httpd/trunk/docs/manual/mod/mod_info.xml.ja
    httpd/httpd/trunk/docs/manual/mod/mod_info.xml.ko
    httpd/httpd/trunk/docs/manual/mod/mod_ssl.xml
    httpd/httpd/trunk/docs/manual/programs/suexec.xml
    httpd/httpd/trunk/docs/manual/programs/suexec.xml.ko
    httpd/httpd/trunk/docs/manual/sitemap.xml
    httpd/httpd/trunk/docs/manual/sitemap.xml.es
    httpd/httpd/trunk/docs/manual/sitemap.xml.ja
    httpd/httpd/trunk/docs/manual/sitemap.xml.ko
    httpd/httpd/trunk/docs/manual/ssl/ssl_faq.xml
    httpd/httpd/trunk/docs/manual/style/build.properties
    httpd/httpd/trunk/docs/manual/style/common.dtd
    httpd/httpd/trunk/docs/manual/style/lang/de.xml
    httpd/httpd/trunk/docs/manual/style/lang/en.xml
    httpd/httpd/trunk/docs/manual/style/lang/es.xml
    httpd/httpd/trunk/docs/manual/style/lang/fr.xml
    httpd/httpd/trunk/docs/manual/style/lang/ja.xml
    httpd/httpd/trunk/docs/manual/style/lang/ko.xml
    httpd/httpd/trunk/docs/manual/style/lang/pt-br.xml
    httpd/httpd/trunk/docs/manual/style/lang/ru.xml
    httpd/httpd/trunk/docs/manual/style/latex/latex.xsl
    httpd/httpd/trunk/docs/manual/style/xsl/indexpage.xsl
    httpd/httpd/trunk/docs/manual/suexec.xml
    httpd/httpd/trunk/docs/manual/suexec.xml.ja
    httpd/httpd/trunk/docs/manual/suexec.xml.ko
    httpd/httpd/trunk/docs/manual/upgrading.xml
    httpd/httpd/trunk/docs/manual/upgrading.xml.de

Modified: httpd/httpd/trunk/docs/conf/extra/httpd-manual.conf.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/conf/extra/httpd-manual.conf.in?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/conf/extra/httpd-manual.conf.in (original)
+++ httpd/httpd/trunk/docs/conf/extra/httpd-manual.conf.in Sun Nov 13 06:11:48 2005
@@ -2,7 +2,7 @@
 # Provide access to the documentation on your server as
 #  http://yourserver.example.com/manual/
 # The documentation is always available at
-#  http://httpd.apache.org/docs-2.1/
+#  http://httpd.apache.org/docs/trunk/
 #
 # Required modules: mod_alias, mod_setenvif, mod_negotiation
 #

Modified: httpd/httpd/trunk/docs/conf/extra/httpd-ssl.conf.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/conf/extra/httpd-ssl.conf.in?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/conf/extra/httpd-ssl.conf.in (original)
+++ httpd/httpd/trunk/docs/conf/extra/httpd-ssl.conf.in Sun Nov 13 06:11:48 2005
@@ -2,7 +2,7 @@
 # This is the Apache server configuration file providing SSL support.
 # It contains the configuration directives to instruct the server how to
 # serve pages over an https connection. For detailing information about these 
-# directives see <URL:http://httpd.apache.org/docs-2.1/mod/mod_ssl.html>
+# directives see <URL:http://httpd.apache.org/docs/trunk/mod/mod_ssl.html>
 # 
 # Do NOT simply read the instructions in here without understanding
 # what they do.  They're here only as hints or reminders.  If you are unsure

Modified: httpd/httpd/trunk/docs/conf/extra/httpd-vhosts.conf.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/conf/extra/httpd-vhosts.conf.in?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/conf/extra/httpd-vhosts.conf.in (original)
+++ httpd/httpd/trunk/docs/conf/extra/httpd-vhosts.conf.in Sun Nov 13 06:11:48 2005
@@ -7,7 +7,7 @@
 # IP addresses. This is indicated by the asterisks in the directives below.
 #
 # Please see the documentation at 
-# <URL:http://httpd.apache.org/docs-2.1/vhosts/>
+# <URL:http://httpd.apache.org/docs/trunk/vhosts/>
 # for further details before you try to setup virtual hosts.
 #
 # You may use the command line option '-S' to verify your virtual host

Modified: httpd/httpd/trunk/docs/conf/httpd-win.conf
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/conf/httpd-win.conf?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/conf/httpd-win.conf (original)
+++ httpd/httpd/trunk/docs/conf/httpd-win.conf Sun Nov 13 06:11:48 2005
@@ -1,9 +1,9 @@
 #
 # This is the main Apache HTTP server configuration file.  It contains the
 # configuration directives that give the server its instructions.
-# See <URL:http://httpd.apache.org/docs-2.1/> for detailed information.
+# See <URL:http://httpd.apache.org/docs/trunk/> for detailed information.
 # In particular, see 
-# <URL:http://httpd.apache.org/docs-2.1/mod/directives.html>
+# <URL:http://httpd.apache.org/docs/trunk/mod/directives.html>
 # for a discussion of each configuration directive.
 #
 # Do NOT simply read the instructions in here without understanding
@@ -183,7 +183,7 @@
     # doesn't give it to you.
     #
     # The Options directive is both complicated and important.  Please see
-    # http://httpd.apache.org/docs-2.1/mod/core.html#options
+    # http://httpd.apache.org/docs/trunk/mod/core.html#options
     # for more information.
     #
     Options Indexes FollowSymLinks

Modified: httpd/httpd/trunk/docs/conf/httpd.conf.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/conf/httpd.conf.in?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/conf/httpd.conf.in (original)
+++ httpd/httpd/trunk/docs/conf/httpd.conf.in Sun Nov 13 06:11:48 2005
@@ -1,9 +1,9 @@
 #
 # This is the main Apache HTTP server configuration file.  It contains the
 # configuration directives that give the server its instructions.
-# See <URL:http://httpd.apache.org/docs-2.1/> for detailed information.
+# See <URL:http://httpd.apache.org/docs/trunk/> for detailed information.
 # In particular, see 
-# <URL:http://httpd.apache.org/docs-2.1/mod/directives.html>
+# <URL:http://httpd.apache.org/docs/trunk/mod/directives.html>
 # for a discussion of each configuration directive.
 #
 # Do NOT simply read the instructions in here without understanding
@@ -138,7 +138,7 @@
     # doesn't give it to you.
     #
     # The Options directive is both complicated and important.  Please see
-    # http://httpd.apache.org/docs-2.1/mod/core.html#options
+    # http://httpd.apache.org/docs/trunk/mod/core.html#options
     # for more information.
     #
     Options Indexes FollowSymLinks

Modified: httpd/httpd/trunk/docs/manual/faq/all_in_one.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/faq/all_in_one.xml?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/faq/all_in_one.xml (original)
+++ httpd/httpd/trunk/docs/manual/faq/all_in_one.xml Sun Nov 13 06:11:48 2005
@@ -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.1/faq/"
-    >http://httpd.apache.org/docs-2.1/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>If you don't find the answer to your question in the below
     sections, please also consult the <a

Modified: httpd/httpd/trunk/docs/manual/faq/all_in_one.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/faq/all_in_one.xml.ja?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/faq/all_in_one.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/faq/all_in_one.xml.ja [iso-2022-jp] Sun Nov 13 06:11:48 2005
@@ -29,8 +29,8 @@
 
 <summary>
     <p>Apache の主サイト、&lt;<a
-	href="http://httpd.apache.org/docs-2.1/faq/"
-	>http://httpd.apache.org/docs-2.1/faq/</a>&gt;
+	href="http://httpd.apache.org/docs/&httpd.docs;/faq/"
+	>http://httpd.apache.org/docs/&httpd.docs;/faq/</a>&gt;
       から最新版の FAQ を常に手に入れることができます。</p>
 
     <p>Apache 2.0 はまだ新しいので、何が<em>よくある質問</em>なのか

Modified: httpd/httpd/trunk/docs/manual/faq/all_in_one.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/faq/all_in_one.xml.ko?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/faq/all_in_one.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/faq/all_in_one.xml.ko [euc-kr] Sun Nov 13 06:11:48 2005
@@ -29,8 +29,8 @@
 
 <summary>
     <p>FAQ 최신판은 아파치 웹사이트 &lt;<a
-    href="http://httpd.apache.org/docs-2.1/faq/"
-    >http://httpd.apache.org/docs-2.1/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>자주

Modified: httpd/httpd/trunk/docs/manual/faq/index.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/faq/index.xml?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/faq/index.xml (original)
+++ httpd/httpd/trunk/docs/manual/faq/index.xml Sun Nov 13 06:11:48 2005
@@ -29,8 +29,10 @@
 
 <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.1/faq/"
-    >http://httpd.apache.org/docs-2.1/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>
 

Modified: httpd/httpd/trunk/docs/manual/faq/index.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/faq/index.xml.ja?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/faq/index.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/faq/index.xml.ja [iso-2022-jp] Sun Nov 13 06:11:48 2005
@@ -29,8 +29,8 @@
 
 <summary>
     <p>Apache の主サイト、&lt;<a
-	href="http://httpd.apache.org/docs-2.1/faq/"
-	>http://httpd.apache.org/docs-2.1/faq/</a>&gt;
+	href="http://httpd.apache.org/docs/&httpd.docs;/faq/"
+	>http://httpd.apache.org/docs/&httpd.docs;/faq/</a>&gt;
       から最新版の FAQ を常に手に入れることができます。
       また、簡単な検索や印刷のためにこの FAQ の
       <a href="all_in_one.html">一ページ版</a>もあります。</p>

Modified: httpd/httpd/trunk/docs/manual/faq/index.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/faq/index.xml.ko?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/faq/index.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/faq/index.xml.ko [euc-kr] Sun Nov 13 06:11:48 2005
@@ -29,8 +29,8 @@
 
 <summary>
     <p>FAQ 최신판은 아파치 웹사이트 &lt;<a
-    href="http://httpd.apache.org/docs-2.1/faq/"
-    >http://httpd.apache.org/docs-2.1/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>
 

Modified: httpd/httpd/trunk/docs/manual/faq/support.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/faq/support.xml?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/faq/support.xml (original)
+++ httpd/httpd/trunk/docs/manual/faq/support.xml Sun Nov 13 06:11:48 2005
@@ -56,7 +56,7 @@
       <dd>Nearly all problems can be solved by reading the error log.</dd>
       
       <dt>Check the <a
-      href="http://httpd.apache.org/docs/2.3/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>
 

Modified: httpd/httpd/trunk/docs/manual/faq/support.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/faq/support.xml.ja?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/faq/support.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/faq/support.xml.ja [iso-2022-jp] Sun Nov 13 06:11:48 2005
@@ -53,7 +53,7 @@
       module="core">ErrorLog</directive> を見てください。</dd>
 
       <dt><a
-      href="http://httpd.apache.org/docs-2.1/faq/">FAQ</a> を調べる!</dt>
+      href="http://httpd.apache.org/docs/&httpd.docs;/faq/">FAQ</a> を調べる!</dt>
       <dd>Apache のよくある質問の最新版は常に Apache の主ウェブサイトに
       あります。</dd>
 

Modified: httpd/httpd/trunk/docs/manual/faq/support.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/faq/support.xml.ko?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/faq/support.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/faq/support.xml.ko [euc-kr] Sun Nov 13 06:11:48 2005
@@ -53,7 +53,7 @@
       module="core">ErrorLog</directive> 지시어를 참고하라.</dd>
 
       <dt><a
-      href="http://httpd.apache.org/docs-2.1/faq/">FAQ</a>를
+      href="http://httpd.apache.org/docs/&httpd.docs;/faq/">FAQ</a>를
       확인하라!</dt>
       <dd>아파치 웹사이트에서 항상 아파치 FAQ 최신판을 볼 수
       있다.</dd>

Modified: httpd/httpd/trunk/docs/manual/glossary.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/glossary.xml?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/glossary.xml (original)
+++ httpd/httpd/trunk/docs/manual/glossary.xml Sun Nov 13 06:11:48 2005
@@ -444,7 +444,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 might
-    be <code>http://httpd.apache.org/docs-2.1/glossary.html</code>.
+    be <code>http://httpd.apache.org/docs/&httpd.docs;/glossary.html</code>.
   </dd> 
 
   <dt><a name="uniformresourceidentifier"

Modified: httpd/httpd/trunk/docs/manual/glossary.xml.de
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/glossary.xml.de?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/glossary.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/glossary.xml.de Sun Nov 13 06:11:48 2005
@@ -496,7 +496,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"

Modified: httpd/httpd/trunk/docs/manual/glossary.xml.es
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/glossary.xml.es?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/glossary.xml.es (original)
+++ httpd/httpd/trunk/docs/manual/glossary.xml.es Sun Nov 13 06:11:48 2005
@@ -401,7 +401,7 @@
 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.1/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

Modified: httpd/httpd/trunk/docs/manual/glossary.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/glossary.xml.ko?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/glossary.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/glossary.xml.ko [euc-kr] Sun Nov 13 06:11:48 2005
@@ -351,7 +351,7 @@
 Identifier</a>라고 하는 것의 일상적인 비공식 명칭이다. 보통 URL은
 <code>http</code>나 <code>https</code>같은 스킴(scheme), 호스트명,
 경로로 구성된다. 이 페이지의 URL은
-<code>http://httpd.apache.org/docs-2.1/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>

Modified: httpd/httpd/trunk/docs/manual/index.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/index.xml?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/index.xml (original)
+++ httpd/httpd/trunk/docs/manual/index.xml Sun Nov 13 06:11:48 2005
@@ -23,7 +23,8 @@
 <indexpage metafile="index.xml.meta">
 <parentdocument href="http://httpd.apache.org/docs-project/" />
 
-<title>Apache HTTP Server Version 2.3 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_4.html">New features with Apache 2.3/2.4</page>

Modified: httpd/httpd/trunk/docs/manual/index.xml.de
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/index.xml.de?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/index.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/index.xml.de Sun Nov 13 06:11:48 2005
@@ -23,7 +23,8 @@
 <indexpage metafile="index.xml.meta">
 <parentdocument href="http://httpd.apache.org/docs-project/" />
 
-<title>Dokumentation zum Apache HTTP Server Version 2.1</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_2.html">Neue Funktionen in Version 2.1/2.2</page>

Modified: httpd/httpd/trunk/docs/manual/index.xml.es
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/index.xml.es?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/index.xml.es (original)
+++ httpd/httpd/trunk/docs/manual/index.xml.es Sun Nov 13 06:11:48 2005
@@ -23,7 +23,7 @@
 <indexpage metafile="index.xml.meta">
 <parentdocument href="http://httpd.apache.org/docs-project/" />
 
-<title>Versi&#243;n 2.1 de la documentaci&#243;n del Servidor de HTTP Apache</title>
+<title>Versi&#243;n &httpd.major;.&httpd.minor; de la documentaci&#243;n del Servidor de HTTP Apache</title>
 
 <category id="release"><title>Notas de la Versi&#243;n</title> 
     <page href="new_features_2_0.html">Nuevas funcionalidades en

Modified: httpd/httpd/trunk/docs/manual/index.xml.fr
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/index.xml.fr?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/index.xml.fr (original)
+++ httpd/httpd/trunk/docs/manual/index.xml.fr Sun Nov 13 06:11:48 2005
@@ -23,7 +23,8 @@
 <indexpage metafile="index.xml.meta">
 <parentdocument href="http://httpd.apache.org/docs-project/" />
 
-<title>Documentation du Serveur HTTP Apache Version 2.1</title>
+<title>Documentation du Serveur HTTP 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&#233;s de la version 2.0</page>

Modified: httpd/httpd/trunk/docs/manual/index.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/index.xml.ja?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/index.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/index.xml.ja [iso-2022-jp] Sun Nov 13 06:11:48 2005
@@ -23,7 +23,7 @@
 <indexpage metafile="index.xml.meta">
 <parentdocument href="http://httpd.apache.org/docs-project/" />
 
-<title>Apache HTTP サーバ バージョン 2.1 ドキュメント</title>
+<title>Apache HTTP サーバ バージョン &httpd.major;.&httpd.minor; ドキュメント</title>
 
 <category id="release"><title>リリースノート</title>
     <page href="new_features_2_2.html">Apache 2.1/2.2 の新機能</page>

Modified: httpd/httpd/trunk/docs/manual/index.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/index.xml.ko?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/index.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/index.xml.ko [euc-kr] Sun Nov 13 06:11:48 2005
@@ -23,7 +23,7 @@
 <indexpage metafile="index.xml.meta">
 <parentdocument href="http://httpd.apache.org/docs-project/" />
 
-<title>Apache HTTP Server Version 2.1 문서</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>

Modified: httpd/httpd/trunk/docs/manual/index.xml.pt-br
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/index.xml.pt-br?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/index.xml.pt-br (original)
+++ httpd/httpd/trunk/docs/manual/index.xml.pt-br Sun Nov 13 06:11:48 2005
@@ -23,7 +23,8 @@
 <indexpage metafile="index.xml.meta">
 <parentdocument href="http://httpd.apache.org/docs-project/" />
 
-<title>Documenta&#231;&#227;o do Servidor HTTP Apache Vers&#227;o 2.1</title>
+<title>Documenta&#231;&#227;o do Servidor HTTP Apache Vers&#227;o
+&httpd.major;.&httpd.minor;</title>
 
 <category id="release"><title>Notas da Vers&#227;o</title>
     <page href="new_features_2_2.html">Novas funcionalidades no Apache 2.1/2.2</page>

Modified: httpd/httpd/trunk/docs/manual/install.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/install.xml?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/install.xml (original)
+++ httpd/httpd/trunk/docs/manual/install.xml Sun Nov 13 06:11:48 2005
@@ -309,9 +309,9 @@
 
     <p>Have a look at the Apache manual under <a
     href="./">docs/manual/</a> or consult <a
-    href="http://httpd.apache.org/docs-2.1/"
-    >http://httpd.apache.org/docs-2.1/</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>
 

Modified: httpd/httpd/trunk/docs/manual/install.xml.de
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/install.xml.de?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/install.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/install.xml.de Sun Nov 13 06:11:48 2005
@@ -324,8 +324,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.1/"
-    >http://httpd.apache.org/docs-2.1/</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>

Modified: httpd/httpd/trunk/docs/manual/install.xml.es
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/install.xml.es?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/install.xml.es (original)
+++ httpd/httpd/trunk/docs/manual/install.xml.es Sun Nov 13 06:11:48 2005
@@ -340,8 +340,8 @@
 
     <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.1/"
-    >http://httpd.apache.org/docs-2.1/</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>

Modified: httpd/httpd/trunk/docs/manual/install.xml.fr
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/install.xml.fr?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/install.xml.fr (original)
+++ httpd/httpd/trunk/docs/manual/install.xml.fr Sun Nov 13 06:11:48 2005
@@ -343,8 +343,8 @@
 
     <p>A consulter : le manuel d'Apache dans
     <a href="./">docs/manual/</a> ou bien <a
-    href="http://httpd.apache.org/docs-2.1/"
-    >http://httpd.apache.org/docs-2.1/</a> pour la derni&#232;re version de ce
+    href="http://httpd.apache.org/docs/&httpd.docs;/"
+    >http://httpd.apache.org/docs/&httpd.docs;/</a> pour la derni&#232;re version de ce
     manuel, ainsi qu'une r&#233;f&#233;rence compl&#232;te de toutes les
     <a href="mod/directives.html">directives de configuration</a>.</p>
 </section>

Modified: httpd/httpd/trunk/docs/manual/install.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/install.xml.ja?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/install.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/install.xml.ja [iso-2022-jp] Sun Nov 13 06:11:48 2005
@@ -318,7 +318,7 @@
 
     <p><a href="./">docs/manual/</a> の Apache マニュアルをざっと見てください。
     または、<a
-    href="http://httpd.apache.org/docs-2.1/">http://httpd.apache.org/docs-2.1/</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>

Modified: httpd/httpd/trunk/docs/manual/install.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/install.xml.ko?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/install.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/install.xml.ko [euc-kr] Sun Nov 13 06:11:48 2005
@@ -289,8 +289,8 @@
     <p>사용가능한 <a href="mod/directives.html">설정 지시어</a>에
     대한 완전한 설명과 이 문서의 가장 최근 판은 <a
     href="./">docs/manual/</a>이나 <a
-    href="http://httpd.apache.org/docs-2.1/"
-    >http://httpd.apache.org/docs-2.1/</a>에 있는 아파치 설명서를
+    href="http://httpd.apache.org/docs/&httpd.docs;/"
+    >http://httpd.apache.org/docs/&httpd.docs;/</a>에 있는 아파치 설명서를
     참고하라.</p>
 </section>
 

Modified: httpd/httpd/trunk/docs/manual/mod/mod_info.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_info.xml?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_info.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_info.xml Sun Nov 13 06:11:48 2005
@@ -164,8 +164,8 @@
     <example>
       AddModuleInfo mod_deflate.c 'See &lt;a \<br />
       <indent>
-        href="http://www.apache.org/docs-2.1/mod/mod_deflate.html"&gt;\<br />
-        http://www.apache.org/docs-2.1/mod/mod_deflate.html&lt;/a&gt;'
+        href="http://www.apache.org/docs/&httpd.docs;/mod/mod_deflate.html"&gt;\<br />
+        http://www.apache.org/docs/&httpd.docs;/mod/mod_deflate.html&lt;/a&gt;'
       </indent>
     </example>
 </usage>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_info.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_info.xml.ja?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_info.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_info.xml.ja [iso-2022-jp] Sun Nov 13 06:11:48 2005
@@ -159,8 +159,8 @@
     <example>
       AddModuleInfo mod_deflate.c 'See &lt;a \<br />
       <indent>
-        href="http://www.apache.org/docs-2.1/mod/mod_deflate.html"&gt;\<br />
-        http://www.apache.org/docs-2.1/mod/mod_deflate.html&lt;/a&gt;'
+        href="http://www.apache.org/docs/&httpd.docs;/mod/mod_deflate.html"&gt;\<br />
+        http://www.apache.org/docs/&httpd.docs;/mod/mod_deflate.html&lt;/a&gt;'
       </indent>
     </example>
 </usage>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_info.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_info.xml.ko?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_info.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_info.xml.ko [euc-kr] Sun Nov 13 06:11:48 2005
@@ -143,8 +143,8 @@
     <example>
       AddModuleInfo mod_deflate.c 'See &lt;a \<br />
       <indent>
-        href="http://www.apache.org/docs-2.1/mod/mod_deflate.html"&gt;\<br />
-        http://www.apache.org/docs-2.1/mod/mod_deflate.html&lt;/a&gt;'
+        href="http://www.apache.org/docs/&httpd.docs;/mod/mod_deflate.html"&gt;\<br />
+        http://www.apache.org/docs/docs/&httpd.docs;/mod/mod_deflate.html&lt;/a&gt;'
       </indent>
     </example>
 </usage>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_ssl.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_ssl.xml?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ssl.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ssl.xml Sun Nov 13 06:11:48 2005
@@ -223,7 +223,7 @@
 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>
+<directive module="mpm_common">AcceptMutex</directive> directive.</p>
 <p>
 The following Mutex <em>types</em> are available:</p>
 <ul>

Modified: httpd/httpd/trunk/docs/manual/programs/suexec.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/programs/suexec.xml?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/suexec.xml (original)
+++ httpd/httpd/trunk/docs/manual/programs/suexec.xml Sun Nov 13 06:11:48 2005
@@ -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.1/suexec.html"
-     >http://httpd.apache.org/docs-2.1/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>

Modified: httpd/httpd/trunk/docs/manual/programs/suexec.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/programs/suexec.xml.ko?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/suexec.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/programs/suexec.xml.ko [euc-kr] Sun Nov 13 06:11:48 2005
@@ -35,8 +35,8 @@
      다른 사용자가 쓰기권한을 가지면 안된다.</p>
 
      <p>suexec의 개념과 보안모델에 대한 정보는 suexec 문서를
-     (<a href="http://httpd.apache.org/docs-2.1/suexec.html"
-     >http://httpd.apache.org/docs-2.1/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>

Modified: httpd/httpd/trunk/docs/manual/sitemap.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/sitemap.xml?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/sitemap.xml (original)
+++ httpd/httpd/trunk/docs/manual/sitemap.xml Sun Nov 13 06:11:48 2005
@@ -26,7 +26,8 @@
 
 <summary>
 <p>This page lists the currently available documents of the
-<a href="./">Apache HTTP Server Version 2.3 Documentation</a>.</p>
+<a href="./">Apache HTTP Server Version &httpd.major;.&httpd.minor;
+Documentation</a>.</p>
 </summary>
 
 <category id="release">

Modified: httpd/httpd/trunk/docs/manual/sitemap.xml.es
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/sitemap.xml.es?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/sitemap.xml.es (original)
+++ httpd/httpd/trunk/docs/manual/sitemap.xml.es Sun Nov 13 06:11:48 2005
@@ -26,8 +26,8 @@
 
 <summary>
 <p>Esta p&#225;gina contiene la lista con los documentos actualmente
-disponibles de la <a href="./">Versi&#243;n 2.1 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">

Modified: httpd/httpd/trunk/docs/manual/sitemap.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/sitemap.xml.ja?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/sitemap.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/sitemap.xml.ja [iso-2022-jp] Sun Nov 13 06:11:48 2005
@@ -26,7 +26,7 @@
 
 <summary>
 <p>このページは現時点で利用可能な
-<a href="./">Apache HTTP サーババージョン 2.1 のドキュメンテーション</a>
+<a href="./">Apache HTTP サーババージョン &httpd.major;.&httpd.minor; のドキュメンテーション</a>
 の一覧です。</p>
 </summary>
 

Modified: httpd/httpd/trunk/docs/manual/sitemap.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/sitemap.xml.ko?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/sitemap.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/sitemap.xml.ko [euc-kr] Sun Nov 13 06:11:48 2005
@@ -26,7 +26,7 @@
 
 <summary>
 <p>이 페이지는 현재
-<a href="./">Apache HTTP Server Version 2.1 문서</a> 목록을
+<a href="./">Apache HTTP Server Version &httpd.major;.&httpd.minor; 문서</a> 목록을
 보여준다.</p>
 </summary>
 

Modified: httpd/httpd/trunk/docs/manual/ssl/ssl_faq.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/ssl/ssl_faq.xml?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/ssl/ssl_faq.xml (original)
+++ httpd/httpd/trunk/docs/manual/ssl/ssl_faq.xml Sun Nov 13 06:11:48 2005
@@ -924,8 +924,8 @@
 
     <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.

Modified: httpd/httpd/trunk/docs/manual/style/build.properties
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/style/build.properties?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/build.properties (original)
+++ httpd/httpd/trunk/docs/manual/style/build.properties Sun Nov 13 06:11:48 2005
@@ -1,7 +1,6 @@
 # This file contains version specific properties
 
 # No xml files yet
-noxml.fr=upgrading.html.fr
+noxml.fr = upgrading.html.fr
 
-# (pending) httpd version
-httpd.version=2.3.0
+httpd.version = 2.3.0

Modified: httpd/httpd/trunk/docs/manual/style/common.dtd
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/style/common.dtd?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/common.dtd (original)
+++ httpd/httpd/trunk/docs/manual/style/common.dtd Sun Nov 13 06:11:48 2005
@@ -34,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 +50,8 @@
 <!ENTITY % Block "(%blocktags;)*">
 <!ENTITY % Inline "(#PCDATA | %inlinetags;)*">
 <!ENTITY % BlockOrInline "(#PCDATA | %inlinetags; | %blocktags;)*">
+
+<!-- Common Elements -->
 
 <!ELEMENT title %Inline;>
 

Added: httpd/httpd/trunk/docs/manual/style/lang.dtd
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/style/lang.dtd?rev=333005&view=auto
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang.dtd (added)
+++ httpd/httpd/trunk/docs/manual/style/lang.dtd Sun Nov 13 06:11:48 2005
@@ -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;">
+

Propchange: httpd/httpd/trunk/docs/manual/style/lang.dtd
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: httpd/httpd/trunk/docs/manual/style/lang/de.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/style/lang/de.xml?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/de.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/de.xml Sun Nov 13 06:11:48 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE language [ <!ENTITY nbsp "&#160;"> ]>
+<!DOCTYPE language SYSTEM "../lang.dtd">
 <!-- English Revision: 106753 -->
 
 <!--
@@ -100,7 +100,7 @@
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Apache HTTP Server</message>
         <message id="apachehttpserver">Apache HTTP Server Version
-            2.3</message>
+            &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 -->
@@ -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.3</message>
+        <message id="version">Version &httpd.major;.&httpd.minor;</message>
 
         <!-- super menu -->
         <message id="modules">Module</message>

Modified: httpd/httpd/trunk/docs/manual/style/lang/en.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/style/lang/en.xml?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/en.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/en.xml Sun Nov 13 06:11:48 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE language [ <!ENTITY nbsp "&#160;"> ]>
+<!DOCTYPE language SYSTEM "../lang.dtd">
 <!-- $LastChangedRevision$ -->
 
 <!--
@@ -100,7 +100,8 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Apache HTTP Server</message>
-        <message id="apachehttpserver">Apache HTTP Server Version 2.3</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 -->
@@ -110,7 +111,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">HTTP Server</message>
         <message id="documentation">Documentation</message>
-        <message id="version">Version 2.3</message>
+        <message id="version">Version &httpd.major;.&httpd.minor;</message>
 
         <!-- super menu -->
         <message id="modules">Modules</message>

Modified: httpd/httpd/trunk/docs/manual/style/lang/es.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/style/lang/es.xml?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/es.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/es.xml Sun Nov 13 06:11:48 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE language [ <!ENTITY nbsp "&#160;"> ]>
+<!DOCTYPE language SYSTEM "../lang.dtd">
 <!-- English revision: 106753 -->
 
 <!--
@@ -98,8 +98,8 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Servidor HTTP Apache</message>
-        <message id="apachehttpserver">Versi&#243;n 2.3 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 -->
@@ -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.3</message>
+        <message id="version">Versi&#243;n &httpd.major;.&httpd.minor;</message>
 
         <!-- super menu -->
         <message id="modules">M&#243;dulos</message>

Modified: httpd/httpd/trunk/docs/manual/style/lang/fr.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/style/lang/fr.xml?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/fr.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/fr.xml Sun Nov 13 06:11:48 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE language [ <!ENTITY nbsp "&#160;"> ]>
+<!DOCTYPE language SYSTEM "../lang.dtd">
 <!-- English revision: 106753 -->
 
 <!--
@@ -101,7 +101,8 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Serveur Apache HTTP</message>
-        <message id="apachehttpserver">Serveur Apache HTTP Version 2.3</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.3</message>
+        <message id="version">Version &httpd.major;.&httpd.minor;</message>
 
         <!-- super menu -->
         <message id="modules">Modules</message>

Modified: httpd/httpd/trunk/docs/manual/style/lang/ja.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/style/lang/ja.xml?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/ja.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/ja.xml Sun Nov 13 06:11:48 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
-<!DOCTYPE language [ <!ENTITY nbsp "&#160;"> ]>
+<!DOCTYPE language SYSTEM "../lang.dtd">
 <!-- English revision: 106753 -->
 
 <!--
@@ -97,7 +97,8 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Apache HTTP $B%5!<%P(B</message>
-        <message id="apachehttpserver">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.3</message>
+        <message id="apachehttpserver">Apache HTTP $B%5!<%P(B
+            $B%P!<%8%g%s(B &httpd.major;.&httpd.minor;</message>
         <message id="apachedocalt">[APACHE DOCUMENTATION]</message>
         <message id="search">Google Search</message> <!-- search button -->
         <message id="index">$B:w0z(B</message> <!-- deprecated -->
@@ -107,7 +108,8 @@
         <message id="apache">Apache</message>
         <message id="http-server">HTTP $B%5!<%P(B</message>
         <message id="documentation">$B%I%-%e%a%s%F!<%7%g%s(B</message>
-        <message id="version">$B%P!<%8%g%s(B 2.3</message>
+        <message id="version">$B%P!<%8%g%s(B
+            &httpd.major;.&httpd.minor;</message>
 
         <!-- super menu -->
         <message id="modules">$B%b%8%e!<%k(B</message>

Modified: httpd/httpd/trunk/docs/manual/style/lang/ko.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/style/lang/ko.xml?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/ko.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/ko.xml Sun Nov 13 06:11:48 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="EUC-KR"?>
-<!DOCTYPE language [ <!ENTITY nbsp "&#160;"> ]>
+<!DOCTYPE language SYSTEM "../lang.dtd">
 <!-- English revision: 106753 -->
 
 <!--
@@ -103,7 +103,8 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Apache HTTP Server</message>
-        <message id="apachehttpserver">Apache HTTP Server Version 2.3</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.3</message>
+        <message id="version">Version &httpd.major;.&httpd.minor;</message>
 
         <!-- super menu -->
         <message id="modules">¸ðµâ</message>

Modified: httpd/httpd/trunk/docs/manual/style/lang/pt-br.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/style/lang/pt-br.xml?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/pt-br.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/pt-br.xml Sun Nov 13 06:11:48 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE language [ <!ENTITY nbsp "&#160;"> ]>
+<!DOCTYPE language SYSTEM "../lang.dtd">
 <!-- English Revision: 106753 -->
 
 <!--
@@ -102,7 +102,8 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Servidor HTTP Apache</message>
-        <message id="apachehttpserver">Servidor HTTP Apache Vers&#227;o 2.3</message>
+        <message id="apachehttpserver">Servidor HTTP Apache Vers&#227;o
+            &httpd.major;.&httpd.minor;</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 +113,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.3</message>
+        <message id="version">Vers&#227;o &httpd.major;.&httpd.minor;</message>
 
         <!-- super menu -->
         <message id="modules">M&#243;dulos</message>

Modified: httpd/httpd/trunk/docs/manual/style/lang/ru.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/style/lang/ru.xml?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/ru.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/ru.xml Sun Nov 13 06:11:48 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="KOI8-R"?>
-<!DOCTYPE language [ <!ENTITY nbsp "&#160;"> ]>
+<!DOCTYPE language SYSTEM "../lang.dtd">
 <!-- English revision: 106753 -->
 
 <!--
@@ -87,7 +87,8 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- HTTP ÓÅÒ×ÅÒ Apache</message>
-        <message id="apachehttpserver">HTTP ÓÅÒ×ÅÒ Apache ÷ÅÒÓÉÑ 2.3</message>
+        <message id="apachehttpserver">HTTP ÓÅÒ×ÅÒ Apache ÷ÅÒÓÉÑ
+            &httpd.major;.&httpd.minor;</message>
         <message id="apachedocalt">[äïëõíåîôáãéñ APACHE]</message>
         <message id="search">Google Search</message> <!-- search button -->
         <message id="index">ïÇÌÁ×ÌÅÎÉÅ</message> <!-- deprecated -->
@@ -97,7 +98,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">HTTP ÓÅÒ×ÅÒ</message>
         <message id="documentation">äÏËÕÍÅÎÔÁÃÉÑ</message>
-        <message id="version">÷ÅÒÓÉÑ 2.3</message>
+        <message id="version">÷ÅÒÓÉÑ &httpd.major;.&httpd.minor;</message>
 
         <!-- super menu -->
         <message id="modules">íÏÄÕÌÉ</message>

Modified: httpd/httpd/trunk/docs/manual/style/latex/latex.xsl
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/style/latex/latex.xsl?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/latex/latex.xsl (original)
+++ httpd/httpd/trunk/docs/manual/style/latex/latex.xsl Sun Nov 13 06:11:48 2005
@@ -122,7 +122,7 @@
 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

Added: httpd/httpd/trunk/docs/manual/style/version.ent
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/style/version.ent?rev=333005&view=auto
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/version.ent (added)
+++ httpd/httpd/trunk/docs/manual/style/version.ent Sun Nov 13 06:11:48 2005
@@ -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 "3">
+<!ENTITY httpd.patch "0">
+
+<!ENTITY httpd.docs "trunk">

Propchange: httpd/httpd/trunk/docs/manual/style/version.ent
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: httpd/httpd/trunk/docs/manual/style/xsl/indexpage.xsl
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/style/xsl/indexpage.xsl?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/xsl/indexpage.xsl (original)
+++ httpd/httpd/trunk/docs/manual/style/xsl/indexpage.xsl Sun Nov 13 06:11:48 2005
@@ -175,8 +175,9 @@
     <!-- (submit the original button and name) -->
     <input type="hidden" name="btnG" value="Google Search" />
 
-    <!-- including the exact phrase "Version 2.1" -->
-    <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" />

Modified: httpd/httpd/trunk/docs/manual/suexec.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/suexec.xml?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/suexec.xml (original)
+++ httpd/httpd/trunk/docs/manual/suexec.xml Sun Nov 13 06:11:48 2005
@@ -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.1/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

Modified: httpd/httpd/trunk/docs/manual/suexec.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/suexec.xml.ja?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/suexec.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/suexec.xml.ja [iso-2022-jp] Sun Nov 13 06:11:48 2005
@@ -545,7 +545,7 @@
 
     <p><strong>注意!</strong>
     この章は完全ではありません。この章の最新改訂版については、
-    Apache グループの<a href="http://httpd.apache.org/docs-2.1/suexec.html">
+    Apache グループの<a href="http://httpd.apache.org/docs/&httpd.docs;/suexec.html">
     オンラインドキュメント</a>版を参照してください。
     </p>
 

Modified: httpd/httpd/trunk/docs/manual/suexec.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/suexec.xml.ko?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/suexec.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/suexec.xml.ko [euc-kr] Sun Nov 13 06:11:48 2005
@@ -477,7 +477,7 @@
 
     <p><strong>주의!</strong> 이 섹션은 완전하지 않을 수 있다.
     아파치그룹의 <a
-    href="http://httpd.apache.org/docs-2.1/suexec.html">온라인
+    href="http://httpd.apache.org/docs/&httpd.docs;/suexec.html">온라인
     문서</a>에서 이 문서의 최신판을 참고하라.</p>
 
     <p>wrapper가 서버 설정을 제약하는 몇가지 흥미로운 점이 있다.

Modified: httpd/httpd/trunk/docs/manual/upgrading.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/upgrading.xml?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/upgrading.xml (original)
+++ httpd/httpd/trunk/docs/manual/upgrading.xml Sun Nov 13 06:11:48 2005
@@ -34,7 +34,7 @@
 
   <p>This document describes only the changes from 2.2 to 2.4.  If you
   are upgrading from version 2.0, you should also consult the <a
-  href="http://httpd.apache.org/docs-2.1/upgrading.html">2.0 to 2.2
+  href="http://httpd.apache.org/docs/&httpd.docs;/upgrading.html">2.0 to 2.2
   upgrading document.</a></p>
 
 </summary>

Modified: httpd/httpd/trunk/docs/manual/upgrading.xml.de
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/upgrading.xml.de?rev=333005&r1=333004&r2=333005&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/upgrading.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/upgrading.xml.de Sun Nov 13 06:11:48 2005
@@ -35,7 +35,7 @@
   <p>Dieses Dokument beschreibt lediglich die &Auml;nderungen von Version
     2.2 gegen&uuml;ber Version 2.0. Wenn Sie ein Upgrade von Version 1.3
     durchf&uuml;hren, sollten Sie auch <a
-    href="http://httpd.apache.org/docs-2.0/upgrading.html">Upgrade von 1.3
+    href="http://httpd.apache.org/docs/2.0/upgrading.html">Upgrade von 1.3
     auf 2.0</a> zu Rate ziehen.</p>
 </summary>
 <seealso><a href="new_features_2_0.html">&Uuml;bersicht der neuen Funktionen



Mime
View raw message