From: André Malo Date: Sat, 1 Feb 2014 22:31:33 +0000 (+0000) Subject: port retirement styles from trunk X-Git-Tag: 2.4.8~172 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6da9c97c00bbcf176fb130767f7e25ab8526eb73;p=apache port retirement styles from trunk git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1563497 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/style/build.properties b/docs/manual/style/build.properties index 53aab01fb5..1a9c0792a5 100644 --- a/docs/manual/style/build.properties +++ b/docs/manual/style/build.properties @@ -3,6 +3,11 @@ # No xml files yet or anymore #noxml.fr = rewrite/rewrite_guide.html.fr rewrite/rewrite_guide_advanced.html.fr +# This httpd version is not retired +# (run build bootstrap on change) +retired = no + + manpages.8 = \ apachectl \ fcgistarter \ diff --git a/docs/manual/style/css/manual.css b/docs/manual/style/css/manual.css index c76fcfa043..821f97f8bb 100644 --- a/docs/manual/style/css/manual.css +++ b/docs/manual/style/css/manual.css @@ -936,12 +936,17 @@ table div.warning { margin-right: 1em; } -div.outofdate { - background-color: #ffffe0; +div.outofdate, +div.retired{ + background-color: #ffffc0; color: #036; padding: 0.5em; margin: 1em 2em 1em 1em; } +div.retired{ + border: solid 1px #ff0000; + margin-left: 3em; +} /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * quotations, indented paragraphs, forms and figures diff --git a/docs/manual/style/faq.dtd b/docs/manual/style/faq.dtd index 9af4f113de..2285453048 100644 --- a/docs/manual/style/faq.dtd +++ b/docs/manual/style/faq.dtd @@ -26,6 +26,7 @@ seealso*, (section | categories))> diff --git a/docs/manual/style/lang/da.xml b/docs/manual/style/lang/da.xml index d1c35baede..0531b1d9fc 100644 --- a/docs/manual/style/lang/da.xml +++ b/docs/manual/style/lang/da.xml @@ -141,6 +141,15 @@ The documentation for this directive has not been translated yet. Please have a look at the English version. + + + Please note + +

This document refers to the 2.0 version of Apache httpd, which is no longer maintained. Upgrade, and refer to the current version of httpd instead, documented at:

+ + Current release version of Apache HTTP Server documentation + You may follow this link to go to the current version of this document. + diff --git a/docs/manual/style/lang/de.xml b/docs/manual/style/lang/de.xml index 7d4da58ddd..3a9f2254a6 100644 --- a/docs/manual/style/lang/de.xml +++ b/docs/manual/style/lang/de.xml @@ -144,5 +144,14 @@ Die Dokumentation zu dieser Direktive wurde noch nicht übersetzt. Bitte schauen Sie in die englische Version. + + + Bitte beachten! + +

Dieses Dokument bezieht sich auf Version 2.0 des Apache httpd, die nicht mehr gepflegt wird. Bitte aktualisieren Sie die Software und verwenden Sie stattdessen eine aktuelle Version des httpd, die an folgender Stelle dokumentiert ist:

+ + Dokumentation des Apache HTTP Server für die zuletzt erschienene Version + Sie können diesem Link folgen, um zur aktuellen Version dieses Dokuments zu gelangen. + diff --git a/docs/manual/style/lang/en.xml b/docs/manual/style/lang/en.xml index a99d7f327e..2ef85dfec8 100644 --- a/docs/manual/style/lang/en.xml +++ b/docs/manual/style/lang/en.xml @@ -144,5 +144,14 @@ The documentation for this directive has not been translated yet. Please have a look at the English version. + + + Please note + +

This document refers to the 2.0 version of Apache httpd, which is no longer maintained. Upgrade, and refer to the current version of httpd instead, documented at:

+ + Current release version of Apache HTTP Server documentation + You may follow this link to go to the current version of this document. + diff --git a/docs/manual/style/lang/es.xml b/docs/manual/style/lang/es.xml index 7a422ac0ba..a928aeb929 100644 --- a/docs/manual/style/lang/es.xml +++ b/docs/manual/style/lang/es.xml @@ -144,5 +144,14 @@ The documentation for this directive has not been translated yet. Please have a look at the English version. + + + Please note + +

This document refers to the 2.0 version of Apache httpd, which is no longer maintained. Upgrade, and refer to the current version of httpd instead, documented at:

+ + Current release version of Apache HTTP Server documentation + You may follow this link to go to the current version of this document. + diff --git a/docs/manual/style/lang/fr.xml b/docs/manual/style/lang/fr.xml index 1b4ac429d2..0e23810d87 100644 --- a/docs/manual/style/lang/fr.xml +++ b/docs/manual/style/lang/fr.xml @@ -145,5 +145,14 @@ La documentation de cette directive n'a pas encore été traduite. Veuillez vous reporter à la version en langue anglaise. + + + Please note + +

This document refers to the 2.0 version of Apache httpd, which is no longer maintained. Upgrade, and refer to the current version of httpd instead, documented at:

+ + Current release version of Apache HTTP Server documentation + You may follow this link to go to the current version of this document. + diff --git a/docs/manual/style/lang/ja.xml b/docs/manual/style/lang/ja.xml index 3993a9bd7e..e251db5074 100644 --- a/docs/manual/style/lang/ja.xml +++ b/docs/manual/style/lang/ja.xml @@ -143,5 +143,14 @@ このディレクティブの解説文書は まだ翻訳されていません。英語版をご覧ください。 + + + Please note + +

This document refers to the 2.0 version of Apache httpd, which is no longer maintained. Upgrade, and refer to the current version of httpd instead, documented at:

+ + Current release version of Apache HTTP Server documentation + You may follow this link to go to the current version of this document. + diff --git a/docs/manual/style/lang/ko.xml b/docs/manual/style/lang/ko.xml index d33b2db222..bedc49ca67 100644 --- a/docs/manual/style/lang/ko.xml +++ b/docs/manual/style/lang/ko.xml @@ -147,5 +147,14 @@ The documentation for this directive has not been translated yet. Please have a look at the English version. + + + Please note + +

This document refers to the 2.0 version of Apache httpd, which is no longer maintained. Upgrade, and refer to the current version of httpd instead, documented at:

+ + Current release version of Apache HTTP Server documentation + You may follow this link to go to the current version of this document. + diff --git a/docs/manual/style/lang/pt-br.xml b/docs/manual/style/lang/pt-br.xml index 8f76470898..918b3a2581 100644 --- a/docs/manual/style/lang/pt-br.xml +++ b/docs/manual/style/lang/pt-br.xml @@ -142,5 +142,14 @@ The documentation for this directive has not been translated yet. Please have a look at the English version. + + + Please note + +

This document refers to the 2.0 version of Apache httpd, which is no longer maintained. Upgrade, and refer to the current version of httpd instead, documented at:

+ + Current release version of Apache HTTP Server documentation + You may follow this link to go to the current version of this document. + diff --git a/docs/manual/style/lang/ru.xml b/docs/manual/style/lang/ru.xml index 6676aa585f..9fa2351f69 100644 --- a/docs/manual/style/lang/ru.xml +++ b/docs/manual/style/lang/ru.xml @@ -139,5 +139,14 @@ The documentation for this directive has not been translated yet. Please have a look at the English version. + + + Please note + +

This document refers to the 2.0 version of Apache httpd, which is no longer maintained. Upgrade, and refer to the current version of httpd instead, documented at:

+ + Current release version of Apache HTTP Server documentation + You may follow this link to go to the current version of this document. + diff --git a/docs/manual/style/lang/tr.xml b/docs/manual/style/lang/tr.xml index 8fb6cb2b4e..e9b83e4227 100644 --- a/docs/manual/style/lang/tr.xml +++ b/docs/manual/style/lang/tr.xml @@ -143,5 +143,14 @@ Bu yönergenin belgesi henüz Türkçeye çevrilmedi. Lütfen İngilizce sürümüne bakınız. + + + Please note + +

This document refers to the 2.0 version of Apache httpd, which is no longer maintained. Upgrade, and refer to the current version of httpd instead, documented at:

+ + Current release version of Apache HTTP Server documentation + You may follow this link to go to the current version of this document. + diff --git a/docs/manual/style/lang/zh-cn.xml b/docs/manual/style/lang/zh-cn.xml index 6cc497be75..f01fd5ed44 100644 --- a/docs/manual/style/lang/zh-cn.xml +++ b/docs/manual/style/lang/zh-cn.xml @@ -137,5 +137,14 @@ 此翻译可能过期。要了解最近的更改，请阅读英文版。 此指令的文档还没有被翻译。请阅读英文版。 + + + Please note + +

This document refers to the 2.0 version of Apache httpd, which is no longer maintained. Upgrade, and refer to the current version of httpd instead, documented at:

+ + Current release version of Apache HTTP Server documentation + You may follow this link to go to the current version of this document. + diff --git a/docs/manual/style/manualpage.dtd b/docs/manual/style/manualpage.dtd index 17742548fb..e9c22a044b 100644 --- a/docs/manual/style/manualpage.dtd +++ b/docs/manual/style/manualpage.dtd @@ -24,4 +24,6 @@ - + diff --git a/docs/manual/style/modulesynopsis.dtd b/docs/manual/style/modulesynopsis.dtd index 50841cadf7..4dac5efc41 100644 --- a/docs/manual/style/modulesynopsis.dtd +++ b/docs/manual/style/modulesynopsis.dtd @@ -24,7 +24,8 @@ identifier? , compatibility? , summary? , seealso* , section*, directivesynopsis*)> - + is the root element --> - + - + diff --git a/docs/manual/style/xsl/common.xsl b/docs/manual/style/xsl/common.xsl index a4ae856a41..9feba1b714 100644 --- a/docs/manual/style/xsl/common.xsl +++ b/docs/manual/style/xsl/common.xsl @@ -33,6 +33,7 @@ + @@ -70,6 +71,7 @@ + @@ -175,6 +177,18 @@ &lf; + + + + + + + + + + + + @@ -269,6 +283,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

+ + + +

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/manual/style/xsl/directiveindex.xsl b/docs/manual/style/xsl/directiveindex.xsl index 062ad38801..75d81de5c3 100644 --- a/docs/manual/style/xsl/directiveindex.xsl +++ b/docs/manual/style/xsl/directiveindex.xsl @@ -52,6 +52,8 @@ + +

diff --git a/docs/manual/style/xsl/faq.xsl b/docs/manual/style/xsl/faq.xsl index 2cd3d3bb55..344bdb61ed 100644 --- a/docs/manual/style/xsl/faq.xsl +++ b/docs/manual/style/xsl/faq.xsl @@ -43,6 +43,8 @@
+ +

diff --git a/docs/manual/style/xsl/indexpage.xsl b/docs/manual/style/xsl/indexpage.xsl index d62814bfc1..789f0df22f 100644 --- a/docs/manual/style/xsl/indexpage.xsl +++ b/docs/manual/style/xsl/indexpage.xsl @@ -55,6 +55,8 @@ &lf;
+ +

&lf; diff --git a/docs/manual/style/xsl/language.xsl b/docs/manual/style/xsl/language.xsl index 946714a29b..a64443a19f 100644 --- a/docs/manual/style/xsl/language.xsl +++ b/docs/manual/style/xsl/language.xsl @@ -34,6 +34,7 @@ + @@ -556,6 +557,21 @@ Some targets have additional requirements: + &lf; + + + is-retired + + + + true() + + + false() + + + + &lf;&lf; diff --git a/docs/manual/style/xsl/manualpage.xsl b/docs/manual/style/xsl/manualpage.xsl index 555e769758..4f1073aa10 100644 --- a/docs/manual/style/xsl/manualpage.xsl +++ b/docs/manual/style/xsl/manualpage.xsl @@ -41,6 +41,8 @@
+ +

diff --git a/docs/manual/style/xsl/moduleindex.xsl b/docs/manual/style/xsl/moduleindex.xsl index e3651a4588..ad54441326 100644 --- a/docs/manual/style/xsl/moduleindex.xsl +++ b/docs/manual/style/xsl/moduleindex.xsl @@ -36,6 +36,8 @@
+ +

diff --git a/docs/manual/style/xsl/quickreference.xsl b/docs/manual/style/xsl/quickreference.xsl index d59769e7eb..0f2c8bc747 100644 --- a/docs/manual/style/xsl/quickreference.xsl +++ b/docs/manual/style/xsl/quickreference.xsl @@ -35,6 +35,8 @@ &lf; &lf; + +

diff --git a/docs/manual/style/xsl/sitemap.xsl b/docs/manual/style/xsl/sitemap.xsl index eaa2c413c6..f72dafcbf8 100644 --- a/docs/manual/style/xsl/sitemap.xsl +++ b/docs/manual/style/xsl/sitemap.xsl @@ -36,6 +36,8 @@ &lf;
+ +

diff --git a/docs/manual/style/xsl/synopsis.xsl b/docs/manual/style/xsl/synopsis.xsl index 0a8e4f1372..577c1c3b8f 100644 --- a/docs/manual/style/xsl/synopsis.xsl +++ b/docs/manual/style/xsl/synopsis.xsl @@ -36,6 +36,8 @@ &lf;
&lf; + +