diff --git a/docs/conf/extra/httpd-manual.conf.in b/docs/conf/extra/httpd-manual.conf.in index d20a93f0860..874b0933ec4 100644 --- a/docs/conf/extra/httpd-manual.conf.in +++ b/docs/conf/extra/httpd-manual.conf.in @@ -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 # diff --git a/docs/conf/extra/httpd-ssl.conf.in b/docs/conf/extra/httpd-ssl.conf.in index 40aa344e4a6..621ddb39b35 100644 --- a/docs/conf/extra/httpd-ssl.conf.in +++ b/docs/conf/extra/httpd-ssl.conf.in @@ -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 +# directives see # # 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 diff --git a/docs/conf/extra/httpd-vhosts.conf.in b/docs/conf/extra/httpd-vhosts.conf.in index bd59a127d76..d3f4e3cc441 100644 --- a/docs/conf/extra/httpd-vhosts.conf.in +++ b/docs/conf/extra/httpd-vhosts.conf.in @@ -7,7 +7,7 @@ # IP addresses. This is indicated by the asterisks in the directives below. # # Please see the documentation at -# +# # for further details before you try to setup virtual hosts. # # You may use the command line option '-S' to verify your virtual host diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf index e8f2aab46a8..3efd7f25e01 100644 --- a/docs/conf/httpd-win.conf +++ b/docs/conf/httpd-win.conf @@ -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 for detailed information. +# See for detailed information. # In particular, see -# +# # for a discussion of each configuration directive. # # Do NOT simply read the instructions in here without understanding @@ -183,7 +183,7 @@ DocumentRoot "@@ServerRoot@@/htdocs" # 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 diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in index 960bfaa6f4f..4727c8a10f0 100644 --- a/docs/conf/httpd.conf.in +++ b/docs/conf/httpd.conf.in @@ -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 for detailed information. +# See for detailed information. # In particular, see -# +# # for a discussion of each configuration directive. # # Do NOT simply read the instructions in here without understanding @@ -138,7 +138,7 @@ DocumentRoot "@exp_htdocsdir@" # 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 diff --git a/docs/manual/faq/all_in_one.xml b/docs/manual/faq/all_in_one.xml index af90ad04b50..ab34dbf3c1d 100644 --- a/docs/manual/faq/all_in_one.xml +++ b/docs/manual/faq/all_in_one.xml @@ -29,8 +29,8 @@

The latest version of this FAQ is always available from the main Apache - web site, at <http://httpd.apache.org/docs-2.1/faq/>.

+ web site, at <http://httpd.apache.org/docs/&httpd.docs;/faq/>.

If you don't find the answer to your question in the below sections, please also consult the

Apache $B$Nhttp://httpd.apache.org/docs-2.1/faq/> + href="http://httpd.apache.org/docs/&httpd.docs;/faq/" + >http://httpd.apache.org/docs/&httpd.docs;/faq/> $B$+$i:G?7HG$N(B FAQ $B$r>o$K

Apache 2.0 $B$O$^$@?7$7$$$N$G!"2?$,(B$B$h$/$"$k$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 baf5b5fdccf..9e6e1c8110c 100644 --- a/docs/manual/faq/all_in_one.xml.ko +++ b/docs/manual/faq/all_in_one.xml.ko @@ -29,8 +29,8 @@

FAQ 최신판은 아파치 웹사이트 <http://httpd.apache.org/docs-2.1/faq/>에서 볼 수 + href="http://httpd.apache.org/docs/&httpd.docs;/faq/" + >http://httpd.apache.org/docs/&httpd.docs;/faq/>에서 볼 수 있다.

아파치 2.0이 나온지 얼마 안되서 우리는 아직 자주 diff --git a/docs/manual/faq/index.xml b/docs/manual/faq/index.xml index c6215f74c67..c4c549f5e9c 100644 --- a/docs/manual/faq/index.xml +++ b/docs/manual/faq/index.xml @@ -29,8 +29,10 @@

The latest version of this FAQ is always available from the - main Apache web site, at <http://httpd.apache.org/docs-2.1/faq/>. In addition, you can view + main Apache web site, at <http://httpd.apache.org/docs/&httpd.docs;/faq/>. In addition, you + can view this FAQ all in one page for easy searching and printing.

diff --git a/docs/manual/faq/index.xml.ja b/docs/manual/faq/index.xml.ja index 8563f5a250b..26fa836907c 100644 --- a/docs/manual/faq/index.xml.ja +++ b/docs/manual/faq/index.xml.ja @@ -29,8 +29,8 @@

Apache $B$Nhttp://httpd.apache.org/docs-2.1/faq/> + href="http://httpd.apache.org/docs/&httpd.docs;/faq/" + >http://httpd.apache.org/docs/&httpd.docs;/faq/> $B$+$i:G?7HG$N(B FAQ $B$r>o$K$B0l%Z!<%8HG(B$B$b$"$j$^$9!#(B

diff --git a/docs/manual/faq/index.xml.ko b/docs/manual/faq/index.xml.ko index 2acc98ccae8..6870e9beaa0 100644 --- a/docs/manual/faq/index.xml.ko +++ b/docs/manual/faq/index.xml.ko @@ -29,8 +29,8 @@

FAQ 최신판은 아파치 웹사이트 <http://httpd.apache.org/docs-2.1/faq/>에서 볼 수 + href="http://httpd.apache.org/docs/&httpd.docs;/faq/" + >http://httpd.apache.org/docs/&httpd.docs;/faq/>에서 볼 수 있다. 또, 검색하고 출력하기 편하게 FAQ를 한 페이지로 볼 수 있다.

diff --git a/docs/manual/faq/support.xml b/docs/manual/faq/support.xml index 27d587d1cec..aa4284363bb 100644 --- a/docs/manual/faq/support.xml +++ b/docs/manual/faq/support.xml @@ -56,7 +56,7 @@
Nearly all problems can be solved by reading the error log.
Check the FAQ!
+ href="http://httpd.apache.org/docs/&httpd.docs;/faq/">FAQ!
The latest version of the Apache Frequently-Asked Questions list can always be found at the main Apache web site.
diff --git a/docs/manual/faq/support.xml.ja b/docs/manual/faq/support.xml.ja index a7faaf3cdc1..e68d83a31dc 100644 --- a/docs/manual/faq/support.xml.ja +++ b/docs/manual/faq/support.xml.ja @@ -53,7 +53,7 @@ module="core">ErrorLog $B$r8+$F$/$@$5$$!#(B
FAQ $B$rD4$Y$k(B!
+ href="http://httpd.apache.org/docs/&httpd.docs;/faq/">FAQ $B$rD4$Y$k(B!
Apache $B$N$h$/$"$ko$K(B Apache $B$N diff --git a/docs/manual/faq/support.xml.ko b/docs/manual/faq/support.xml.ko index 11b3c60adf9..1587e2732fe 100644 --- a/docs/manual/faq/support.xml.ko +++ b/docs/manual/faq/support.xml.ko @@ -53,7 +53,7 @@ module="core">ErrorLog 지시어를 참고하라.
FAQ를 + href="http://httpd.apache.org/docs/&httpd.docs;/faq/">FAQ를 확인하라!
아파치 웹사이트에서 항상 아파치 FAQ 최신판을 볼 수 있다.
diff --git a/docs/manual/glossary.xml b/docs/manual/glossary.xml index eb862063003..8f647ad7f13 100644 --- a/docs/manual/glossary.xml +++ b/docs/manual/glossary.xml @@ -444,7 +444,7 @@ ref="uniformresourceidentifier">Uniform Resource Identifier. URLs are usually made up of a scheme, like http or https, a hostname, and a path. A URL for this page might - be http://httpd.apache.org/docs-2.1/glossary.html. + be http://httpd.apache.org/docs/&httpd.docs;/glossary.html.
. URLs bestehen üblicherweise aus einem Schema wie http oder https, einem Hostnamen und einem Pfad. Die URL für diese Seite ist - http://httpd.apache.org/docs-2.1/glossary.html. + http://httpd.apache.org/docs/&httpd.docs;/glossary.html.
Identificador de Recursos Uniforme. Las URLs están compuestas normalmente por un esquema, tal como http o https, un nombre de host, y una ruta. Una URL para esta página es -http://httpd.apache.org/docs-2.1/glossary.html. +http://httpd.apache.org/docs/&httpd.docs;/glossary.html.
Identificador de Recursos Uniforme (URI)
Una cadena de caracteres diff --git a/docs/manual/glossary.xml.ko b/docs/manual/glossary.xml.ko index 381e21c64c0..081f44e5c38 100644 --- a/docs/manual/glossary.xml.ko +++ b/docs/manual/glossary.xml.ko @@ -351,7 +351,7 @@ href="#uniformresourceidentifier">Uniform Resource Identifier라고 하는 것의 일상적인 비공식 명칭이다. 보통 URL은 http나 https같은 스킴(scheme), 호스트명, 경로로 구성된다. 이 페이지의 URL은 -http://httpd.apache.org/docs-2.1/glossary.html이다.
+http://httpd.apache.org/docs/&httpd.docs;/glossary.html이다.
Uniform Resource Identifier (URI)
diff --git a/docs/manual/index.xml b/docs/manual/index.xml index 12fed221b18..8357909da44 100644 --- a/docs/manual/index.xml +++ b/docs/manual/index.xml @@ -23,7 +23,8 @@ -Apache HTTP Server Version 2.3 Documentation +Apache HTTP Server Version &httpd.major;.&httpd.minor; +Documentation Release Notes New features with Apache 2.3/2.4 diff --git a/docs/manual/index.xml.de b/docs/manual/index.xml.de index 831cbbb70fc..80d65cd61e1 100644 --- a/docs/manual/index.xml.de +++ b/docs/manual/index.xml.de @@ -23,7 +23,8 @@ -Dokumentation zum Apache HTTP Server Version 2.1 +Dokumentation zum Apache HTTP Server Version +&httpd.major;.&httpd.minor; Hinweise zur Version Neue Funktionen in Version 2.1/2.2 diff --git a/docs/manual/index.xml.es b/docs/manual/index.xml.es index b1830c1afa0..60bb01f858e 100644 --- a/docs/manual/index.xml.es +++ b/docs/manual/index.xml.es @@ -23,7 +23,7 @@ -Versión 2.1 de la documentación del Servidor de HTTP Apache +Versión &httpd.major;.&httpd.minor; de la documentación del Servidor de HTTP Apache Notas de la Versión Nuevas funcionalidades en diff --git a/docs/manual/index.xml.fr b/docs/manual/index.xml.fr index 2eb96732a66..09c54fbee54 100644 --- a/docs/manual/index.xml.fr +++ b/docs/manual/index.xml.fr @@ -23,7 +23,8 @@ -Documentation du Serveur HTTP Apache Version 2.1 +Documentation du Serveur HTTP Apache Version +&httpd.major;.&httpd.minor; Notes sur cette version Nouvelles Fonctionnalités de la version 2.0 diff --git a/docs/manual/index.xml.ja b/docs/manual/index.xml.ja index 33c554b979c..bf529448f2e 100644 --- a/docs/manual/index.xml.ja +++ b/docs/manual/index.xml.ja @@ -23,7 +23,7 @@ -Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.1 $B%I%-%e%a%s%H(B +Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B &httpd.major;.&httpd.minor; $B%I%-%e%a%s%H(B $B%j%j!<%9%N!<%H(B Apache 2.1/2.2 $B$N?75!G=(B diff --git a/docs/manual/index.xml.ko b/docs/manual/index.xml.ko index c1183a076cc..c37110bb249 100644 --- a/docs/manual/index.xml.ko +++ b/docs/manual/index.xml.ko @@ -23,7 +23,7 @@ -Apache HTTP Server Version 2.1 문서 +Apache HTTP Server Version &httpd.major;.&httpd.minor; 문서 발표문 버전 2.0의 새로운 기능 diff --git a/docs/manual/index.xml.pt-br b/docs/manual/index.xml.pt-br index 1c425fb5218..0515e9bcbee 100644 --- a/docs/manual/index.xml.pt-br +++ b/docs/manual/index.xml.pt-br @@ -23,7 +23,8 @@ -Documentação do Servidor HTTP Apache Versão 2.1 +Documentação do Servidor HTTP Apache Versão +&httpd.major;.&httpd.minor; Notas da Versão Novas funcionalidades no Apache 2.1/2.2 diff --git a/docs/manual/install.xml b/docs/manual/install.xml index 619d84fc823..65ab618d2a0 100644 --- a/docs/manual/install.xml +++ b/docs/manual/install.xml @@ -309,9 +309,9 @@ $ tar xvf httpd-2_1_NN.tar

Have a look at the Apache manual under docs/manual/ or consult http://httpd.apache.org/docs-2.1/ for the most recent version of - this manual and a complete reference of available http://httpd.apache.org/docs/&httpd.docs;/ for the most recent + version of this manual and a complete reference of available configuration directives.

diff --git a/docs/manual/install.xml.de b/docs/manual/install.xml.de index dcc90452965..da75c694171 100644 --- a/docs/manual/install.xml.de +++ b/docs/manual/install.xml.de @@ -324,8 +324,8 @@ href="./">docs/manual/. Die aktuellste Version dieses Handbuchs sowie eine komplette Referenz der verfügbaren Konfigurationsanweisungen finden - Sie unter http://httpd.apache.org/docs-2.1/.

+ Sie unter http://httpd.apache.org/docs/&httpd.docs;/.

Testen diff --git a/docs/manual/install.xml.es b/docs/manual/install.xml.es index 8b5d08c045d..a0ba5dca76f 100644 --- a/docs/manual/install.xml.es +++ b/docs/manual/install.xml.es @@ -340,8 +340,8 @@ directorios

échele un vistazo al Manual de Apache que está en docs/manual/ o consulte en http://httpd.apache.org/docs-2.1/ la versión más + href="http://httpd.apache.org/docs/&httpd.docs;/" + >http://httpd.apache.org/docs/&httpd.docs;/ la versión más reciente de este manual y la Guia de Referencia de todas las directivas de configuración disponibles.

diff --git a/docs/manual/install.xml.fr b/docs/manual/install.xml.fr index bff8727734b..4ffdf2b6d71 100644 --- a/docs/manual/install.xml.fr +++ b/docs/manual/install.xml.fr @@ -343,8 +343,8 @@ $ tar xvf httpd-2_1_NN.tar

A consulter : le manuel d'Apache dans docs/manual/ ou bien http://httpd.apache.org/docs-2.1/ pour la dernière version de ce + href="http://httpd.apache.org/docs/&httpd.docs;/" + >http://httpd.apache.org/docs/&httpd.docs;/ pour la dernière version de ce manuel, ainsi qu'une référence complète de toutes les directives de configuration.

diff --git a/docs/manual/install.xml.ja b/docs/manual/install.xml.ja index 440146805fe..19c86e743e2 100644 --- a/docs/manual/install.xml.ja +++ b/docs/manual/install.xml.ja @@ -318,7 +318,7 @@ $ tar xvf httpd-2_1_NN.tar

docs/manual/ $B$N(B Apache $B%^%K%e%"%k$r$6$C$H8+$F$/$@$5$$!#(B $B$^$?$O!"(Bhttp://httpd.apache.org/docs-2.1/ + href="http://httpd.apache.org/docs/&httpd.docs;/">http://httpd.apache.org/docs/&httpd.docs;/ $B$K$"$k%^%K%e%"%k:G?7HG!"(B$B@_Dj%G%#%l%/%F%#%V(B$B$KEv$?$C$F$_$F$/$@$5$$!#(B

diff --git a/docs/manual/install.xml.ko b/docs/manual/install.xml.ko index ae7dfd18f1d..3a40318a490 100644 --- a/docs/manual/install.xml.ko +++ b/docs/manual/install.xml.ko @@ -289,8 +289,8 @@ $ tar xvf httpd-2_1_NN.tar

사용가능한 설정 지시어에 대한 완전한 설명과 이 문서의 가장 최근 판은 docs/manual/이나 http://httpd.apache.org/docs-2.1/에 있는 아파치 설명서를 + href="http://httpd.apache.org/docs/&httpd.docs;/" + >http://httpd.apache.org/docs/&httpd.docs;/에 있는 아파치 설명서를 참고하라.

diff --git a/docs/manual/mod/mod_info.xml b/docs/manual/mod/mod_info.xml index 24696f6ad23..9e0867d3026 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 AddModuleInfo mod_deflate.c 'See <a \
- href="http://www.apache.org/docs-2.1/mod/mod_deflate.html">\
- http://www.apache.org/docs-2.1/mod/mod_deflate.html</a>' + href="http://www.apache.org/docs/&httpd.docs;/mod/mod_deflate.html">\
+ http://www.apache.org/docs/&httpd.docs;/mod/mod_deflate.html</a>' diff --git a/docs/manual/mod/mod_info.xml.ja b/docs/manual/mod/mod_info.xml.ja index bd2cabd360f..6a5e3e1a1a4 100644 --- a/docs/manual/mod/mod_info.xml.ja +++ b/docs/manual/mod/mod_info.xml.ja @@ -159,8 +159,8 @@ AddModuleInfo mod_deflate.c 'See <a \
- href="http://www.apache.org/docs-2.1/mod/mod_deflate.html">\
- http://www.apache.org/docs-2.1/mod/mod_deflate.html</a>' + href="http://www.apache.org/docs/&httpd.docs;/mod/mod_deflate.html">\
+ http://www.apache.org/docs/&httpd.docs;/mod/mod_deflate.html</a>' diff --git a/docs/manual/mod/mod_info.xml.ko b/docs/manual/mod/mod_info.xml.ko index 6f7d193ed70..0c5c0e66221 100644 --- a/docs/manual/mod/mod_info.xml.ko +++ b/docs/manual/mod/mod_info.xml.ko @@ -143,8 +143,8 @@ AddModuleInfo mod_deflate.c 'See <a \
- href="http://www.apache.org/docs-2.1/mod/mod_deflate.html">\
- http://www.apache.org/docs-2.1/mod/mod_deflate.html</a>' + href="http://www.apache.org/docs/&httpd.docs;/mod/mod_deflate.html">\
+ http://www.apache.org/docs/docs/&httpd.docs;/mod/mod_deflate.html</a>' diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml index 3182012f66d..1689d3ba3c2 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 -AcceptMutex directive

+AcceptMutex directive.

The following Mutex types are available:

    diff --git a/docs/manual/programs/suexec.xml b/docs/manual/programs/suexec.xml index 14649f1225e..0723f82f29d 100644 --- a/docs/manual/programs/suexec.xml +++ b/docs/manual/programs/suexec.xml @@ -35,8 +35,8 @@

    For further information about the concepts and and the security model of suexec please refer to the suexec documentation (http://httpd.apache.org/docs-2.1/suexec.html).

    + href="http://httpd.apache.org/docs/&httpd.docs;/suexec.html" + >http://httpd.apache.org/docs/&httpd.docs;/suexec.html).
Synopsis diff --git a/docs/manual/programs/suexec.xml.ko b/docs/manual/programs/suexec.xml.ko index a0f198ba19a..811fb494877 100644 --- a/docs/manual/programs/suexec.xml.ko +++ b/docs/manual/programs/suexec.xml.ko @@ -35,8 +35,8 @@ 다른 사용자가 쓰기권한을 가지면 안된다.

suexec의 개념과 보안모델에 대한 정보는 suexec 문서를 - (http://httpd.apache.org/docs-2.1/suexec.html) 참고하라.

+ (http://httpd.apache.org/docs/&httpd.docs;/suexec.html) 참고하라.
개요 diff --git a/docs/manual/sitemap.xml b/docs/manual/sitemap.xml index 13ae7fad875..f8f5a38ea5b 100644 --- a/docs/manual/sitemap.xml +++ b/docs/manual/sitemap.xml @@ -26,7 +26,8 @@

This page lists the currently available documents of the -Apache HTTP Server Version 2.3 Documentation.

+Apache HTTP Server Version &httpd.major;.&httpd.minor; +Documentation.

 diff --git a/docs/manual/sitemap.xml.es b/docs/manual/sitemap.xml.es index 8bd248ab142..44af461b3f5 100644 --- a/docs/manual/sitemap.xml.es +++ b/docs/manual/sitemap.xml.es @@ -26,8 +26,8 @@

Esta página contiene la lista con los documentos actualmente -disponibles de la Versión 2.1 de la Documentación del -Servidor HTTP Apache.

+disponibles de la Versión &httpd.major;.&httpd.minor; de la +Documentación del Servidor HTTP Apache.

 diff --git a/docs/manual/sitemap.xml.ja b/docs/manual/sitemap.xml.ja index 894d68c9fd5..134f9eb89e5 100644 --- a/docs/manual/sitemap.xml.ja +++ b/docs/manual/sitemap.xml.ja @@ -26,7 +26,7 @@

$B$3$N%Z!<%8$O8=;~E@$GMxMQ2DG=$J(B -Apache HTTP $B%5!<%P%P!<%8%g%s(B 2.1 $B$N%I%-%e%a%s%F!<%7%g%s(B +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 $B$N0lMw$G$9!#(B

 diff --git a/docs/manual/sitemap.xml.ko b/docs/manual/sitemap.xml.ko index eedcd343ea2..6ed46ae5498 100644 --- a/docs/manual/sitemap.xml.ko +++ b/docs/manual/sitemap.xml.ko @@ -26,7 +26,7 @@

이 페이지는 현재 -Apache HTTP Server Version 2.1 문서 목록을 +Apache HTTP Server Version &httpd.major;.&httpd.minor; 문서 목록을 보여준다.

 diff --git a/docs/manual/ssl/ssl_faq.xml b/docs/manual/ssl/ssl_faq.xml index 3267e2662f2..36b4e7af75e 100644 --- a/docs/manual/ssl/ssl_faq.xml +++ b/docs/manual/ssl/ssl_faq.xml @@ -924,8 +924,8 @@ for my core dump?
Answers in the User Manual's F.A.Q. List (this)
-
- http://httpd.apache.org/docs/2.1/ssl/ssl_faq.html
+
+ http://httpd.apache.org/docs/&httpd.docs;/ssl/ssl_faq.html
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 5ac43c991d1..eb2e00e483e 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 8d99ac7dd1a..b1e603fb66e 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; + + + diff --git a/docs/manual/style/lang.dtd b/docs/manual/style/lang.dtd new file mode 100644 index 00000000000..f117e8d9bf0 --- /dev/null +++ b/docs/manual/style/lang.dtd @@ -0,0 +1,24 @@ + + + + + +%HTTPD-VERSION; + + + diff --git a/docs/manual/style/lang/de.xml b/docs/manual/style/lang/de.xml index 93eee6ddb94..969584e1bba 100644 --- a/docs/manual/style/lang/de.xml +++ b/docs/manual/style/lang/de.xml @@ -1,5 +1,5 @@ - ]> + - Apache HTTP Server Apache HTTP Server Version - 2.3 + &httpd.major;.&httpd.minor; [APACHE DOCUMENTATION] Google-Suche Index @@ -110,7 +110,7 @@ Apache HTTP-Server Dokumentation - Version 2.3 + Version &httpd.major;.&httpd.minor; Module diff --git a/docs/manual/style/lang/en.xml b/docs/manual/style/lang/en.xml index 06205cc1a61..6ab1a2f48c6 100644 --- a/docs/manual/style/lang/en.xml +++ b/docs/manual/style/lang/en.xml @@ -1,5 +1,5 @@ - ]> + - Apache HTTP Server - Apache HTTP Server Version 2.3 + Apache HTTP Server Version + &httpd.major;.&httpd.minor; [APACHE DOCUMENTATION] Google Search Index @@ -110,7 +111,7 @@ Apache HTTP Server Documentation - Version 2.3 + Version &httpd.major;.&httpd.minor; Modules diff --git a/docs/manual/style/lang/es.xml b/docs/manual/style/lang/es.xml index 5b288f5743d..9738ce0501a 100644 --- a/docs/manual/style/lang/es.xml +++ b/docs/manual/style/lang/es.xml @@ -1,5 +1,5 @@ - ]> + - Servidor HTTP Apache - Versión 2.3 del Servidor HTTP - Apache + Versión &httpd.major;.&httpd.minor; + del Servidor HTTP Apache [APACHE DOCUMENTATION] Buscar en Google Índice @@ -109,7 +109,7 @@ Apache Servidor HTTP Documentación - Versión 2.3 + Versión &httpd.major;.&httpd.minor; Módulos diff --git a/docs/manual/style/lang/fr.xml b/docs/manual/style/lang/fr.xml index 501f4d1584c..f14cdf141f7 100644 --- a/docs/manual/style/lang/fr.xml +++ b/docs/manual/style/lang/fr.xml @@ -1,5 +1,5 @@ - ]> + - Serveur Apache HTTP - Serveur Apache HTTP Version 2.3 + Serveur Apache HTTP Version + &httpd.major;.&httpd.minor; [DOCUMENTATION APACHE] Recherche Google Index @@ -111,7 +112,7 @@ Apache Serveur HTTP Documentation - Version 2.3 + Version &httpd.major;.&httpd.minor; Modules diff --git a/docs/manual/style/lang/ja.xml b/docs/manual/style/lang/ja.xml index a0e0ceb5cea..e52b2be633c 100644 --- a/docs/manual/style/lang/ja.xml +++ b/docs/manual/style/lang/ja.xml @@ -1,5 +1,5 @@ - ]> + - Apache HTTP $B%5!<%P(B - Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.3 + Apache HTTP $B%5!<%P(B + $B%P!<%8%g%s(B &httpd.major;.&httpd.minor; [APACHE DOCUMENTATION] Google Search $B:w0z(B @@ -107,7 +108,8 @@ Apache HTTP $B%5!<%P(B $B%I%-%e%a%s%F!<%7%g%s(B - $B%P!<%8%g%s(B 2.3 + $B%P!<%8%g%s(B + &httpd.major;.&httpd.minor; $B%b%8%e!<%k(B diff --git a/docs/manual/style/lang/ko.xml b/docs/manual/style/lang/ko.xml index 0511c924dad..deedd10c5cd 100644 --- a/docs/manual/style/lang/ko.xml +++ b/docs/manual/style/lang/ko.xml @@ -1,5 +1,5 @@ - ]> + - Apache HTTP Server - Apache HTTP Server Version 2.3 + Apache HTTP Server Version + &httpd.major;.&httpd.minor; [APACHE DOCUMENTATION] Google 검색 Index @@ -113,7 +114,7 @@ Apache HTTP Server Documentation - Version 2.3 + Version &httpd.major;.&httpd.minor; 모듈 diff --git a/docs/manual/style/lang/pt-br.xml b/docs/manual/style/lang/pt-br.xml index 212abf9505c..9651c446aaf 100644 --- a/docs/manual/style/lang/pt-br.xml +++ b/docs/manual/style/lang/pt-br.xml @@ -1,5 +1,5 @@ - ]> + - Servidor HTTP Apache - Servidor HTTP Apache Versão 2.3 + Servidor HTTP Apache Versão + &httpd.major;.&httpd.minor; [DOCUMENTAÇÃO APACHE] Busca Google Índice @@ -112,7 +113,7 @@ Apache Servidor HTTP Documentação - Versão 2.3 + Versão &httpd.major;.&httpd.minor; Módulos diff --git a/docs/manual/style/lang/ru.xml b/docs/manual/style/lang/ru.xml index 97648831706..fbcb1cd7506 100644 --- a/docs/manual/style/lang/ru.xml +++ b/docs/manual/style/lang/ru.xml @@ -1,5 +1,5 @@ - ]> + - HTTP 膽弄텀 Apache - HTTP 膽弄텀 Apache 跆錄�� 2.3 + HTTP 膽弄텀 Apache 跆錄�� + &httpd.major;.&httpd.minor; [埃椅張塼率栯 APACHE] Google Search 點訣隆턱�� @@ -97,7 +98,7 @@ Apache HTTP 膽弄텀 晏坑考塊좍�� - 跆錄�� 2.3 + 跆錄�� &httpd.major;.&httpd.minor; 孱켭俓 diff --git a/docs/manual/style/latex/latex.xsl b/docs/manual/style/latex/latex.xsl index b4068b268da..9d7bb0a5cfa 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 00000000000..5af87be70d3 --- /dev/null +++ b/docs/manual/style/version.ent @@ -0,0 +1,24 @@ + + + + + + + + + diff --git a/docs/manual/style/xsl/indexpage.xsl b/docs/manual/style/xsl/indexpage.xsl index 71a2f9dd54c..dae6b7777c0 100644 --- a/docs/manual/style/xsl/indexpage.xsl +++ b/docs/manual/style/xsl/indexpage.xsl @@ -175,8 +175,9 @@ - - + + diff --git a/docs/manual/suexec.xml b/docs/manual/suexec.xml index 875960dfc29..85d0fc75b2e 100644 --- a/docs/manual/suexec.xml +++ b/docs/manual/suexec.xml @@ -545,7 +545,7 @@

NOTE! This section may not be complete. For the latest revision of this section of the documentation, see the Apache Group's Online + href="http://httpd.apache.org/docs/&httpd.docs;/suexec.html">Online Documentation version.

There are a few points of interest regarding diff --git a/docs/manual/suexec.xml.ja b/docs/manual/suexec.xml.ja index 8d82a459436..84b31f85fde 100644 --- a/docs/manual/suexec.xml.ja +++ b/docs/manual/suexec.xml.ja @@ -545,7 +545,7 @@

$BCm0U(B! $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 + Apache $B%0%k!<%W$N(B $B%*%s%i%$%s%I%-%e%a%s%H(B$BHG$r;2>H$7$F$/$@$5$$!#(B

diff --git a/docs/manual/suexec.xml.ko b/docs/manual/suexec.xml.ko index 938e527246b..98bd51f6f0a 100644 --- a/docs/manual/suexec.xml.ko +++ b/docs/manual/suexec.xml.ko @@ -477,7 +477,7 @@

주의! 이 섹션은 완전하지 않을 수 있다. 아파치그룹의 온라인 + href="http://httpd.apache.org/docs/&httpd.docs;/suexec.html">온라인 문서에서 이 문서의 최신판을 참고하라.

wrapper가 서버 설정을 제약하는 몇가지 흥미로운 점이 있다. diff --git a/docs/manual/upgrading.xml b/docs/manual/upgrading.xml index 6e227c4559c..c7120ba75de 100644 --- a/docs/manual/upgrading.xml +++ b/docs/manual/upgrading.xml @@ -34,7 +34,7 @@

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 2.0 to 2.2 + href="http://httpd.apache.org/docs/&httpd.docs;/upgrading.html">2.0 to 2.2 upgrading document.

 diff --git a/docs/manual/upgrading.xml.de b/docs/manual/upgrading.xml.de index 5c356819f6e..45e5426c425 100644 --- a/docs/manual/upgrading.xml.de +++ b/docs/manual/upgrading.xml.de @@ -35,7 +35,7 @@

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 Upgrade von 1.3 + href="http://httpd.apache.org/docs/2.0/upgrading.html">Upgrade von 1.3 auf 2.0 zu Rate ziehen.

 Übersicht der neuen Funktionen