From: André Malo Date: Sun, 13 Nov 2005 15:45:47 +0000 (+0000) Subject: centralize the versioning of httpd and docs directories X-Git-Tag: 2.1.10~33 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20ef1465918bf0b29787ca848d4d24ddd4bb5481;p=thirdparty%2Fapache%2Fhttpd.git centralize the versioning of httpd and docs directories git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@333030 13f79535-47bb-0310-9956-ffa450edef68 --- 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 9533dce17a7..51d58fced12 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..a1881ada33f 100644 --- a/docs/manual/faq/index.xml +++ b/docs/manual/faq/index.xml @@ -29,10 +29,11 @@

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 - this FAQ all in one page for easy searching - and printing.

+ 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.

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$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 35a87f0a82f..2855cff0112 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.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 könnte - http://httpd.apache.org/docs-2.1/glossary.html lauten. + http://httpd.apache.org/docs/&httpd.docs;/glossary.html + lauten.
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 53d81443f95..aa77222b949 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 4ec066efced..e7060da28cd 100644 --- a/docs/manual/index.xml +++ b/docs/manual/index.xml @@ -23,7 +23,8 @@ -Apache HTTP Server Version 2.2 Documentation +Apache HTTP Server Version &httpd.major;.&httpd.minor; +Documentation Release Notes New features with Apache 2.1/2.2 diff --git a/docs/manual/index.xml.de b/docs/manual/index.xml.de index c13410c9195..90738593216 100644 --- a/docs/manual/index.xml.de +++ b/docs/manual/index.xml.de @@ -22,7 +22,8 @@ -Dokumentation zum Apache HTTP Server Version 2.2 +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 fd868cc5ba3..ca1a062a0fa 100644 --- a/docs/manual/index.xml.es +++ b/docs/manual/index.xml.es @@ -23,7 +23,8 @@ -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 ade688f0cf7..3e409473487 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 485b6cfe36e..5ac84ac5cb9 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 d6bcea4496f..a30762722d8 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 15610870dde..d9773ec180a 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 02e5b3b0a31..560340d200e 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 8ac96388c39..705b31396e9 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 5b7a0a83718..8b9d344d6fb 100644 --- a/docs/manual/install.xml.fr +++ b/docs/manual/install.xml.fr @@ -343,9 +343,10 @@ $ 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 - manuel, ainsi qu'une référence complète de toutes les + 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 0812f03e84f..b9be7c26bff 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 a5ede0e16ba..c0af3a99d7f 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..51ceebbf8f9 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/&httpd.docs;/mod/mod_deflate.html</a>' diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml index 011510455d6..6f78cfd1244 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 65888c5935f..3273b3616b0 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.2 Documentation.

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

 diff --git a/docs/manual/sitemap.xml.de b/docs/manual/sitemap.xml.de index e86bf5587db..7c70a38eb57 100644 --- a/docs/manual/sitemap.xml.de +++ b/docs/manual/sitemap.xml.de @@ -26,7 +26,8 @@

Diese Seite verzeichnet die zur Zeit verfügbaren Dokumente der -Dokumentation zum Apache HTTP Server Version 2.1.

+Dokumentation zum Apache HTTP Server Version +&httpd.major;.&httpd.minor;.

 diff --git a/docs/manual/sitemap.xml.es b/docs/manual/sitemap.xml.es index 2cfe4e1198c..9f776229509 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 29bec37a921..436ecee6ceb 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 162d34bb57c..31fa75698b2 100644 --- a/docs/manual/sitemap.xml.ko +++ b/docs/manual/sitemap.xml.ko @@ -26,8 +26,8 @@

ÀÌ ÆäÀÌÁö´Â ÇöÀç -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 e69cbd6fbb9..98eaa207591 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 bed909c0a1e..e9f96d52636 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.2.0 +httpd.version = 2.2.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 2ff785a28b8..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.2 + &httpd.major;.&httpd.minor; [APACHE DOCUMENTATION] Google-Suche Index @@ -110,7 +110,7 @@ Apache HTTP-Server Dokumentation - Version 2.2 + Version &httpd.major;.&httpd.minor; Module diff --git a/docs/manual/style/lang/en.xml b/docs/manual/style/lang/en.xml index f9f15b8e2f4..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.2 + Apache HTTP Server Version + &httpd.major;.&httpd.minor; [APACHE DOCUMENTATION] Google Search Index @@ -110,7 +111,7 @@ Apache HTTP Server Documentation - Version 2.2 + Version &httpd.major;.&httpd.minor; Modules diff --git a/docs/manual/style/lang/es.xml b/docs/manual/style/lang/es.xml index 575a49f981e..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.2 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.2 + 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 24483b0418e..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.2 + Serveur Apache HTTP Version + &httpd.major;.&httpd.minor; [DOCUMENTATION APACHE] Recherche Google Index @@ -111,7 +112,7 @@ Apache Serveur HTTP Documentation - Version 2.2 + Version &httpd.major;.&httpd.minor; Modules diff --git a/docs/manual/style/lang/ja.xml b/docs/manual/style/lang/ja.xml index 3f215258ce3..2f78cbf07c9 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.2 + 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,7 @@ Apache HTTP $B%5!<%P(B $B%I%-%e%a%s%F!<%7%g%s(B - $B%P!<%8%g%s(B 2.2 + $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 95bb3d6c03b..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.2 + Apache HTTP Server Version + &httpd.major;.&httpd.minor; [APACHE DOCUMENTATION] Google °Ë»ö Index @@ -113,7 +114,7 @@ Apache HTTP Server Documentation - Version 2.2 + Version &httpd.major;.&httpd.minor; ¸ðµâ diff --git a/docs/manual/style/lang/pt-br.xml b/docs/manual/style/lang/pt-br.xml index 0776a440243..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.2 + 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.2 + 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 3cb78533d58..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.2 + HTTP ÓÅÒ×ÅÒ Apache ÷ÅÒÓÉÑ + &httpd.major;.&httpd.minor; [äïëõíåîôáãéñ APACHE] Google Search ïÇÌÁ×ÌÅÎÉÅ @@ -97,7 +98,7 @@ Apache HTTP ÓÅÒ×ÅÒ äÏËÕÍÅÎÔÁÃÉÑ - ÷ÅÒÓÉÑ 2.2 + ÷ÅÒÓÉÑ &httpd.major;.&httpd.minor; íÏÄÕÌÉ diff --git a/docs/manual/style/latex/latex.xsl b/docs/manual/style/latex/latex.xsl index b4068b268da..dc705d01ed4 100644 --- a/docs/manual/style/latex/latex.xsl +++ b/docs/manual/style/latex/latex.xsl @@ -1,4 +1,8 @@ + + %HTTPD-VERSION; +]> + + + + + + diff --git a/docs/manual/style/xsl/indexpage.xsl b/docs/manual/style/xsl/indexpage.xsl index 71a2f9dd54c..5c7aa719da9 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.de b/docs/manual/upgrading.xml.de index 5c388fd3ccb..33ece638b2a 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