diff options
| author | Andr챕 Malo <nd@apache.org> | 2005-11-13 15:11:48 +0100 |
|---|---|---|
| committer | Andr챕 Malo <nd@apache.org> | 2005-11-13 15:11:48 +0100 |
| commit | 0550e8f49cdf3a5ef4b1b8a90de2efae8bc3e17f (patch) | |
| tree | eeac94e667852eff729c786897a290a05468346a /docs/manual | |
| parent | Add an Irish Translation (diff) | |
| download | apache2-0550e8f49cdf3a5ef4b1b8a90de2efae8bc3e17f.tar.xz apache2-0550e8f49cdf3a5ef4b1b8a90de2efae8bc3e17f.zip | |
centralize the versioning of the httpd and the docs directories
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@333005 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/manual')
56 files changed, 161 insertions, 92 deletions
diff --git a/docs/manual/faq/all_in_one.xml b/docs/manual/faq/all_in_one.xml index af90ad04b5..ab34dbf3c1 100644 --- 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 <<a href="http://httpd.apache.org/docs-2.1/faq/" - >http://httpd.apache.org/docs-2.1/faq/</a>>.</p> + web site, at <<a href="http://httpd.apache.org/docs/&httpd.docs;/faq/" + >http://httpd.apache.org/docs/&httpd.docs;/faq/</a>>.</p> <p>If you don't find the answer to your question in the below sections, please also consult the <a diff --git a/docs/manual/faq/all_in_one.xml.ja b/docs/manual/faq/all_in_one.xml.ja index 7260ff77d1..817fc06302 100644 --- a/docs/manual/faq/all_in_one.xml.ja +++ b/docs/manual/faq/all_in_one.xml.ja @@ -29,8 +29,8 @@ <summary> <p>Apache $B$N<g%5%$%H!"(B<<a - href="http://httpd.apache.org/docs-2.1/faq/" - >http://httpd.apache.org/docs-2.1/faq/</a>> + href="http://httpd.apache.org/docs/&httpd.docs;/faq/" + >http://httpd.apache.org/docs/&httpd.docs;/faq/</a>> $B$+$i:G?7HG$N(B FAQ $B$r>o$K<j$KF~$l$k$3$H$,$G$-$^$9!#(B</p> <p>Apache 2.0 $B$O$^$@?7$7$$$N$G!"2?$,(B<em>$B$h$/$"$k<ALd(B</em>$B$J$N$+(B diff --git a/docs/manual/faq/all_in_one.xml.ko b/docs/manual/faq/all_in_one.xml.ko index baf5b5fdcc..9e6e1c8110 100644 --- a/docs/manual/faq/all_in_one.xml.ko +++ b/docs/manual/faq/all_in_one.xml.ko @@ -29,8 +29,8 @@ <summary> <p>FAQ 최신판은 아파치 웹사이트 <<a - href="http://httpd.apache.org/docs-2.1/faq/" - >http://httpd.apache.org/docs-2.1/faq/</a>>에서 볼 수 + href="http://httpd.apache.org/docs/&httpd.docs;/faq/" + >http://httpd.apache.org/docs/&httpd.docs;/faq/</a>>에서 볼 수 있다.</p> <p>아파치 2.0이 나온지 얼마 안되서 우리는 아직 <em>자주 diff --git a/docs/manual/faq/index.xml b/docs/manual/faq/index.xml index c6215f74c6..c4c549f5e9 100644 --- a/docs/manual/faq/index.xml +++ b/docs/manual/faq/index.xml @@ -29,8 +29,10 @@ <summary> <p>The latest version of this FAQ is always available from the - main Apache web site, at <<a href="http://httpd.apache.org/docs-2.1/faq/" - >http://httpd.apache.org/docs-2.1/faq/</a>>. In addition, you can view + main Apache web site, at <<a + href="http://httpd.apache.org/docs/&httpd.docs;/faq/" + >http://httpd.apache.org/docs/&httpd.docs;/faq/</a>>. 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.ja b/docs/manual/faq/index.xml.ja index 8563f5a250..26fa836907 100644 --- a/docs/manual/faq/index.xml.ja +++ b/docs/manual/faq/index.xml.ja @@ -29,8 +29,8 @@ <summary> <p>Apache $B$N<g%5%$%H!"(B<<a - href="http://httpd.apache.org/docs-2.1/faq/" - >http://httpd.apache.org/docs-2.1/faq/</a>> + href="http://httpd.apache.org/docs/&httpd.docs;/faq/" + >http://httpd.apache.org/docs/&httpd.docs;/faq/</a>> $B$+$i:G?7HG$N(B FAQ $B$r>o$K<j$KF~$l$k$3$H$,$G$-$^$9!#(B $B$^$?!"4JC1$J8!:w$d0u:~$N$?$a$K$3$N(B FAQ $B$N(B <a href="all_in_one.html">$B0l%Z!<%8HG(B</a>$B$b$"$j$^$9!#(B</p> diff --git a/docs/manual/faq/index.xml.ko b/docs/manual/faq/index.xml.ko index 2acc98ccae..6870e9beaa 100644 --- a/docs/manual/faq/index.xml.ko +++ b/docs/manual/faq/index.xml.ko @@ -29,8 +29,8 @@ <summary> <p>FAQ 최신판은 아파치 웹사이트 <<a - href="http://httpd.apache.org/docs-2.1/faq/" - >http://httpd.apache.org/docs-2.1/faq/</a>>에서 볼 수 + href="http://httpd.apache.org/docs/&httpd.docs;/faq/" + >http://httpd.apache.org/docs/&httpd.docs;/faq/</a>>에서 볼 수 있다. 또, 검색하고 출력하기 편하게 FAQ를 <a href="all_in_one.html">한 페이지로</a> 볼 수 있다.</p> diff --git a/docs/manual/faq/support.xml b/docs/manual/faq/support.xml index 27d587d1ce..aa4284363b 100644 --- a/docs/manual/faq/support.xml +++ b/docs/manual/faq/support.xml @@ -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> diff --git a/docs/manual/faq/support.xml.ja b/docs/manual/faq/support.xml.ja index a7faaf3cdc..e68d83a31d 100644 --- a/docs/manual/faq/support.xml.ja +++ b/docs/manual/faq/support.xml.ja @@ -53,7 +53,7 @@ module="core">ErrorLog</directive> $B$r8+$F$/$@$5$$!#(B</dd> <dt><a - href="http://httpd.apache.org/docs-2.1/faq/">FAQ</a> $B$rD4$Y$k(B!</dt> + href="http://httpd.apache.org/docs/&httpd.docs;/faq/">FAQ</a> $B$rD4$Y$k(B!</dt> <dd>Apache $B$N$h$/$"$k<ALd$N:G?7HG$O>o$K(B Apache $B$N<g%&%'%V%5%$%H$K(B $B$"$j$^$9!#(B</dd> diff --git a/docs/manual/faq/support.xml.ko b/docs/manual/faq/support.xml.ko index 11b3c60adf..1587e2732f 100644 --- a/docs/manual/faq/support.xml.ko +++ b/docs/manual/faq/support.xml.ko @@ -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> diff --git a/docs/manual/glossary.xml b/docs/manual/glossary.xml index eb86206300..8f647ad7f1 100644 --- a/docs/manual/glossary.xml +++ b/docs/manual/glossary.xml @@ -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" diff --git a/docs/manual/glossary.xml.de b/docs/manual/glossary.xml.de index 622bcf5f7d..97069a1c44 100644 --- a/docs/manual/glossary.xml.de +++ b/docs/manual/glossary.xml.de @@ -496,7 +496,7 @@ Identifier</glossary>. URLs bestehen üblicherweise aus einem Schema wie <code>http</code> oder <code>https</code>, einem Hostnamen und einem Pfad. Die URL fü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 95440889b5..e908766924 100644 --- a/docs/manual/glossary.xml.es +++ b/docs/manual/glossary.xml.es @@ -401,7 +401,7 @@ llama un <a href="#uniformresourceidentifier">Identificador de Recursos Uniforme</a>. Las URLs está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á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 diff --git a/docs/manual/glossary.xml.ko b/docs/manual/glossary.xml.ko index 381e21c64c..081f44e5c3 100644 --- a/docs/manual/glossary.xml.ko +++ b/docs/manual/glossary.xml.ko @@ -351,7 +351,7 @@ href="#uniformresourceidentifier">Uniform Resource 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> diff --git a/docs/manual/index.xml b/docs/manual/index.xml index 12fed221b1..8357909da4 100644 --- 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.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> diff --git a/docs/manual/index.xml.de b/docs/manual/index.xml.de index 831cbbb70f..80d65cd61e 100644 --- a/docs/manual/index.xml.de +++ b/docs/manual/index.xml.de @@ -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> diff --git a/docs/manual/index.xml.es b/docs/manual/index.xml.es index b1830c1afa..60bb01f858 100644 --- a/docs/manual/index.xml.es +++ b/docs/manual/index.xml.es @@ -23,7 +23,7 @@ <indexpage metafile="index.xml.meta"> <parentdocument href="http://httpd.apache.org/docs-project/" /> -<title>Versión 2.1 de la documentación del Servidor de HTTP Apache</title> +<title>Versión &httpd.major;.&httpd.minor; de la documentación del Servidor de HTTP Apache</title> <category id="release"><title>Notas de la Versió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 2eb96732a6..09c54fbee5 100644 --- a/docs/manual/index.xml.fr +++ b/docs/manual/index.xml.fr @@ -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és de la version 2.0</page> diff --git a/docs/manual/index.xml.ja b/docs/manual/index.xml.ja index 33c554b979..bf529448f2 100644 --- a/docs/manual/index.xml.ja +++ b/docs/manual/index.xml.ja @@ -23,7 +23,7 @@ <indexpage metafile="index.xml.meta"> <parentdocument href="http://httpd.apache.org/docs-project/" /> -<title>Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.1 $B%I%-%e%a%s%H(B</title> +<title>Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B &httpd.major;.&httpd.minor; $B%I%-%e%a%s%H(B</title> <category id="release"><title>$B%j%j!<%9%N!<%H(B</title> <page href="new_features_2_2.html">Apache 2.1/2.2 $B$N?75!G=(B</page> diff --git a/docs/manual/index.xml.ko b/docs/manual/index.xml.ko index c1183a076c..c37110bb24 100644 --- a/docs/manual/index.xml.ko +++ b/docs/manual/index.xml.ko @@ -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> diff --git a/docs/manual/index.xml.pt-br b/docs/manual/index.xml.pt-br index 1c425fb521..0515e9bcbe 100644 --- a/docs/manual/index.xml.pt-br +++ b/docs/manual/index.xml.pt-br @@ -23,7 +23,8 @@ <indexpage metafile="index.xml.meta"> <parentdocument href="http://httpd.apache.org/docs-project/" /> -<title>Documentação do Servidor HTTP Apache Versão 2.1</title> +<title>Documentação do Servidor HTTP Apache Versão +&httpd.major;.&httpd.minor;</title> <category id="release"><title>Notas da Versão</title> <page href="new_features_2_2.html">Novas funcionalidades no Apache 2.1/2.2</page> diff --git a/docs/manual/install.xml b/docs/manual/install.xml index 619d84fc82..65ab618d2a 100644 --- a/docs/manual/install.xml +++ b/docs/manual/install.xml @@ -309,9 +309,9 @@ $ tar xvf httpd-2_1_<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.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> diff --git a/docs/manual/install.xml.de b/docs/manual/install.xml.de index dcc9045296..da75c69417 100644 --- a/docs/manual/install.xml.de +++ b/docs/manual/install.xml.de @@ -324,8 +324,8 @@ href="./">docs/manual/</a>. Die aktuellste Version dieses Handbuchs sowie eine komplette Referenz der verfü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> diff --git a/docs/manual/install.xml.es b/docs/manual/install.xml.es index 8b5d08c045..a0ba5dca76 100644 --- a/docs/manual/install.xml.es +++ b/docs/manual/install.xml.es @@ -340,8 +340,8 @@ directorios</title> <p>échele un vistazo al Manual de Apache que está 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ón más + href="http://httpd.apache.org/docs/&httpd.docs;/" + >http://httpd.apache.org/docs/&httpd.docs;/</a> la versión más reciente de este manual y la Guia de Referencia de todas las <a href="mod/directives.html">directivas de configuración</a> disponibles.</p> diff --git a/docs/manual/install.xml.fr b/docs/manual/install.xml.fr index bff8727734..4ffdf2b6d7 100644 --- a/docs/manual/install.xml.fr +++ b/docs/manual/install.xml.fr @@ -343,8 +343,8 @@ $ tar xvf httpd-2_1_<em>NN</em>.tar <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ère version de ce + href="http://httpd.apache.org/docs/&httpd.docs;/" + >http://httpd.apache.org/docs/&httpd.docs;/</a> pour la dernière version de ce manuel, ainsi qu'une référence complète de toutes les <a href="mod/directives.html">directives de configuration</a>.</p> </section> diff --git a/docs/manual/install.xml.ja b/docs/manual/install.xml.ja index 440146805f..19c86e743e 100644 --- a/docs/manual/install.xml.ja +++ b/docs/manual/install.xml.ja @@ -318,7 +318,7 @@ $ tar xvf httpd-2_1_<em>NN</em>.tar <p><a href="./">docs/manual/</a> $B$N(B Apache $B%^%K%e%"%k$r$6$C$H8+$F$/$@$5$$!#(B $B$^$?$O!"(B<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> $B$K$"$k%^%K%e%"%k:G?7HG!"(B<a href="mod/directives.html">$B@_Dj%G%#%l%/%F%#%V(B</a>$B$KEv$?$C$F$_$F$/$@$5$$!#(B</p> </section> diff --git a/docs/manual/install.xml.ko b/docs/manual/install.xml.ko index ae7dfd18f1..3a40318a49 100644 --- a/docs/manual/install.xml.ko +++ b/docs/manual/install.xml.ko @@ -289,8 +289,8 @@ $ tar xvf httpd-2_1_<em>NN</em>.tar <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> diff --git a/docs/manual/mod/mod_info.xml b/docs/manual/mod/mod_info.xml index 24696f6ad2..9e0867d302 100644 --- a/docs/manual/mod/mod_info.xml +++ b/docs/manual/mod/mod_info.xml @@ -164,8 +164,8 @@ information displayed by the server-info handler</description> <example> AddModuleInfo mod_deflate.c 'See <a \<br /> <indent> - href="http://www.apache.org/docs-2.1/mod/mod_deflate.html">\<br /> - http://www.apache.org/docs-2.1/mod/mod_deflate.html</a>' + href="http://www.apache.org/docs/&httpd.docs;/mod/mod_deflate.html">\<br /> + http://www.apache.org/docs/&httpd.docs;/mod/mod_deflate.html</a>' </indent> </example> </usage> diff --git a/docs/manual/mod/mod_info.xml.ja b/docs/manual/mod/mod_info.xml.ja index bd2cabd360..6a5e3e1a1a 100644 --- a/docs/manual/mod/mod_info.xml.ja +++ b/docs/manual/mod/mod_info.xml.ja @@ -159,8 +159,8 @@ <example> AddModuleInfo mod_deflate.c 'See <a \<br /> <indent> - href="http://www.apache.org/docs-2.1/mod/mod_deflate.html">\<br /> - http://www.apache.org/docs-2.1/mod/mod_deflate.html</a>' + href="http://www.apache.org/docs/&httpd.docs;/mod/mod_deflate.html">\<br /> + http://www.apache.org/docs/&httpd.docs;/mod/mod_deflate.html</a>' </indent> </example> </usage> diff --git a/docs/manual/mod/mod_info.xml.ko b/docs/manual/mod/mod_info.xml.ko index 6f7d193ed7..0c5c0e6622 100644 --- a/docs/manual/mod/mod_info.xml.ko +++ b/docs/manual/mod/mod_info.xml.ko @@ -143,8 +143,8 @@ <example> AddModuleInfo mod_deflate.c 'See <a \<br /> <indent> - href="http://www.apache.org/docs-2.1/mod/mod_deflate.html">\<br /> - http://www.apache.org/docs-2.1/mod/mod_deflate.html</a>' + href="http://www.apache.org/docs/&httpd.docs;/mod/mod_deflate.html">\<br /> + http://www.apache.org/docs/docs/&httpd.docs;/mod/mod_deflate.html</a>' </indent> </example> </usage> diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml index 3182012f66..1689d3ba3c 100644 --- a/docs/manual/mod/mod_ssl.xml +++ b/docs/manual/mod/mod_ssl.xml @@ -223,7 +223,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> +<directive module="mpm_common">AcceptMutex</directive> 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 14649f1225..0723f82f29 100644 --- 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.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> diff --git a/docs/manual/programs/suexec.xml.ko b/docs/manual/programs/suexec.xml.ko index a0f198ba19..811fb49487 100644 --- a/docs/manual/programs/suexec.xml.ko +++ b/docs/manual/programs/suexec.xml.ko @@ -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> diff --git a/docs/manual/sitemap.xml b/docs/manual/sitemap.xml index 13ae7fad87..f8f5a38ea5 100644 --- 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.3 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.es b/docs/manual/sitemap.xml.es index 8bd248ab14..44af461b3f 100644 --- a/docs/manual/sitemap.xml.es +++ b/docs/manual/sitemap.xml.es @@ -26,8 +26,8 @@ <summary> <p>Esta página contiene la lista con los documentos actualmente -disponibles de la <a href="./">Versión 2.1 de la Documentación del -Servidor HTTP Apache</a>.</p> +disponibles de la <a href="./">Versión &httpd.major;.&httpd.minor; de la +Documentació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 894d68c9fd..134f9eb89e 100644 --- a/docs/manual/sitemap.xml.ja +++ b/docs/manual/sitemap.xml.ja @@ -26,7 +26,7 @@ <summary> <p>$B$3$N%Z!<%8$O8=;~E@$GMxMQ2DG=$J(B -<a href="./">Apache HTTP $B%5!<%P%P!<%8%g%s(B 2.1 $B$N%I%-%e%a%s%F!<%7%g%s(B</a> +<a href="./">Apache HTTP $B%5!<%P%P!<%8%g%s(B &httpd.major;.&httpd.minor; $B$N%I%-%e%a%s%F!<%7%g%s(B</a> $B$N0lMw$G$9!#(B</p> </summary> diff --git a/docs/manual/sitemap.xml.ko b/docs/manual/sitemap.xml.ko index eedcd343ea..6ed46ae549 100644 --- a/docs/manual/sitemap.xml.ko +++ b/docs/manual/sitemap.xml.ko @@ -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> diff --git a/docs/manual/ssl/ssl_faq.xml b/docs/manual/ssl/ssl_faq.xml index 3267e2662f..36b4e7af75 100644 --- a/docs/manual/ssl/ssl_faq.xml +++ b/docs/manual/ssl/ssl_faq.xml @@ -924,8 +924,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/build.properties b/docs/manual/style/build.properties index 5ac43c991d..eb2e00e483 100644 --- a/docs/manual/style/build.properties +++ b/docs/manual/style/build.properties @@ -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 diff --git a/docs/manual/style/common.dtd b/docs/manual/style/common.dtd index 8d99ac7dd1..b1e603fb66 100644 --- a/docs/manual/style/common.dtd +++ b/docs/manual/style/common.dtd @@ -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 | @@ -46,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;> diff --git a/docs/manual/style/lang.dtd b/docs/manual/style/lang.dtd new file mode 100644 index 0000000000..f117e8d9bf --- /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 " "> + diff --git a/docs/manual/style/lang/de.xml b/docs/manual/style/lang/de.xml index 93eee6ddb9..969584e1bb 100644 --- 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 language [ <!ENTITY nbsp " "> ]> +<!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> diff --git a/docs/manual/style/lang/en.xml b/docs/manual/style/lang/en.xml index 06205cc1a6..6ab1a2f48c 100644 --- 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 language [ <!ENTITY nbsp " "> ]> +<!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> diff --git a/docs/manual/style/lang/es.xml b/docs/manual/style/lang/es.xml index 5b288f5743..9738ce0501 100644 --- 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 language [ <!ENTITY nbsp " "> ]> +<!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ón 2.3 del Servidor HTTP - Apache</message> + <message id="apachehttpserver">Versió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">Índice</message> <!-- deprecated --> @@ -109,7 +109,7 @@ <message id="apache">Apache</message> <message id="http-server">Servidor HTTP</message> <message id="documentation">Documentación</message> - <message id="version">Versión 2.3</message> + <message id="version">Versión &httpd.major;.&httpd.minor;</message> <!-- super menu --> <message id="modules">Módulos</message> diff --git a/docs/manual/style/lang/fr.xml b/docs/manual/style/lang/fr.xml index 501f4d1584..f14cdf141f 100644 --- 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 " "> ]> +<!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> diff --git a/docs/manual/style/lang/ja.xml b/docs/manual/style/lang/ja.xml index a0e0ceb5ce..e52b2be633 100644 --- 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 language [ <!ENTITY nbsp " "> ]> +<!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> diff --git a/docs/manual/style/lang/ko.xml b/docs/manual/style/lang/ko.xml index 0511c924da..deedd10c5c 100644 --- 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 " "> ]> +<!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> diff --git a/docs/manual/style/lang/pt-br.xml b/docs/manual/style/lang/pt-br.xml index 212abf9505..9651c446aa 100644 --- a/docs/manual/style/lang/pt-br.xml +++ b/docs/manual/style/lang/pt-br.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!DOCTYPE language [ <!ENTITY nbsp " "> ]> +<!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ão 2.3</message> + <message id="apachehttpserver">Servidor HTTP Apache Versão + &httpd.major;.&httpd.minor;</message> <message id="apachedocalt">[DOCUMENTAÇÃO APACHE]</message> <message id="search">Busca Google</message> <!-- search button --> <message id="index">Índice</message> <!-- deprecated --> @@ -112,7 +113,7 @@ <message id="apache">Apache</message> <message id="http-server">Servidor HTTP</message> <message id="documentation">Documentação</message> - <message id="version">Versão 2.3</message> + <message id="version">Versão &httpd.major;.&httpd.minor;</message> <!-- super menu --> <message id="modules">Módulos</message> diff --git a/docs/manual/style/lang/ru.xml b/docs/manual/style/lang/ru.xml index 9764883170..fbcb1cd750 100644 --- 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 language [ <!ENTITY nbsp " "> ]> +<!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> diff --git a/docs/manual/style/latex/latex.xsl b/docs/manual/style/latex/latex.xsl index b4068b268d..9d7bb0a5cf 100644 --- a/docs/manual/style/latex/latex.xsl +++ b/docs/manual/style/latex/latex.xsl @@ -122,7 +122,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 index 0000000000..5af87be70d --- /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 "3"> +<!ENTITY httpd.patch "0"> + +<!ENTITY httpd.docs "trunk"> diff --git a/docs/manual/style/xsl/indexpage.xsl b/docs/manual/style/xsl/indexpage.xsl index 71a2f9dd54..dae6b7777c 100644 --- 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.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" /> diff --git a/docs/manual/suexec.xml b/docs/manual/suexec.xml index 875960dfc2..85d0fc75b2 100644 --- 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.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 diff --git a/docs/manual/suexec.xml.ja b/docs/manual/suexec.xml.ja index 8d82a45943..84b31f85fd 100644 --- a/docs/manual/suexec.xml.ja +++ b/docs/manual/suexec.xml.ja @@ -545,7 +545,7 @@ <p><strong>$BCm0U(B!</strong> $B$3$N>O$O40A4$G$O$"$j$^$;$s!#$3$N>O$N:G?72~D{HG$K$D$$$F$O!"(B - Apache $B%0%k!<%W$N(B<a href="http://httpd.apache.org/docs-2.1/suexec.html"> + Apache $B%0%k!<%W$N(B<a href="http://httpd.apache.org/docs/&httpd.docs;/suexec.html"> $B%*%s%i%$%s%I%-%e%a%s%H(B</a>$BHG$r;2>H$7$F$/$@$5$$!#(B </p> diff --git a/docs/manual/suexec.xml.ko b/docs/manual/suexec.xml.ko index 938e527246..98bd51f6f0 100644 --- a/docs/manual/suexec.xml.ko +++ b/docs/manual/suexec.xml.ko @@ -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가 서버 설정을 제약하는 몇가지 흥미로운 점이 있다. diff --git a/docs/manual/upgrading.xml b/docs/manual/upgrading.xml index 6e227c4559..c7120ba75d 100644 --- a/docs/manual/upgrading.xml +++ b/docs/manual/upgrading.xml @@ -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> diff --git a/docs/manual/upgrading.xml.de b/docs/manual/upgrading.xml.de index 5c356819f6..45e5426c42 100644 --- a/docs/manual/upgrading.xml.de +++ b/docs/manual/upgrading.xml.de @@ -35,7 +35,7 @@ <p>Dieses Dokument beschreibt lediglich die Änderungen von Version 2.2 gegenüber Version 2.0. Wenn Sie ein Upgrade von Version 1.3 durchfü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">Übersicht der neuen Funktionen |