You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2014/02/01 23:31:34 UTC
svn commit: r1563497 - in /httpd/httpd/branches/2.4.x/docs/manual/style: ./
css/ lang/ xsl/
Author: nd
Date: Sat Feb 1 22:31:33 2014
New Revision: 1563497
URL: http://svn.apache.org/r1563497
Log:
port retirement styles from trunk
Modified:
httpd/httpd/branches/2.4.x/docs/manual/style/build.properties
httpd/httpd/branches/2.4.x/docs/manual/style/css/manual.css
httpd/httpd/branches/2.4.x/docs/manual/style/faq.dtd
httpd/httpd/branches/2.4.x/docs/manual/style/lang/da.xml
httpd/httpd/branches/2.4.x/docs/manual/style/lang/de.xml
httpd/httpd/branches/2.4.x/docs/manual/style/lang/en.xml
httpd/httpd/branches/2.4.x/docs/manual/style/lang/es.xml
httpd/httpd/branches/2.4.x/docs/manual/style/lang/fr.xml
httpd/httpd/branches/2.4.x/docs/manual/style/lang/ja.xml
httpd/httpd/branches/2.4.x/docs/manual/style/lang/ko.xml
httpd/httpd/branches/2.4.x/docs/manual/style/lang/pt-br.xml
httpd/httpd/branches/2.4.x/docs/manual/style/lang/ru.xml
httpd/httpd/branches/2.4.x/docs/manual/style/lang/tr.xml
httpd/httpd/branches/2.4.x/docs/manual/style/lang/zh-cn.xml
httpd/httpd/branches/2.4.x/docs/manual/style/manualpage.dtd
httpd/httpd/branches/2.4.x/docs/manual/style/modulesynopsis.dtd
httpd/httpd/branches/2.4.x/docs/manual/style/sitemap.dtd
httpd/httpd/branches/2.4.x/docs/manual/style/xsl/common.xsl
httpd/httpd/branches/2.4.x/docs/manual/style/xsl/directiveindex.xsl
httpd/httpd/branches/2.4.x/docs/manual/style/xsl/faq.xsl
httpd/httpd/branches/2.4.x/docs/manual/style/xsl/indexpage.xsl
httpd/httpd/branches/2.4.x/docs/manual/style/xsl/language.xsl
httpd/httpd/branches/2.4.x/docs/manual/style/xsl/manualpage.xsl
httpd/httpd/branches/2.4.x/docs/manual/style/xsl/moduleindex.xsl
httpd/httpd/branches/2.4.x/docs/manual/style/xsl/quickreference.xsl
httpd/httpd/branches/2.4.x/docs/manual/style/xsl/sitemap.xsl
httpd/httpd/branches/2.4.x/docs/manual/style/xsl/synopsis.xsl
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/build.properties
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/build.properties?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/build.properties (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/build.properties Sat Feb 1 22:31:33 2014
@@ -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 \
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/css/manual.css
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/css/manual.css?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/css/manual.css (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/css/manual.css Sat Feb 1 22:31:33 2014
@@ -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
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/faq.dtd
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/faq.dtd?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/faq.dtd (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/faq.dtd Sat Feb 1 22:31:33 2014
@@ -26,6 +26,7 @@ seealso*, (section | categories))>
<!ATTLIST faq metafile CDATA #REQUIRED
all-in-one (yes | no ) "no"
+ upgrade CDATA #IMPLIED
>
<!ELEMENT categories (categoryfile*)>
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/lang/da.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/lang/da.xml?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/lang/da.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/lang/da.xml Sat Feb 1 22:31:33 2014
@@ -141,6 +141,15 @@
<message id="nottranslated">The documentation for this directive has
not been translated yet. Please have a look at the English
version.</message>
+
+ <!-- retirement -->
+ <message id="retired.headline">Please note</message>
+ <message id="retired.description">
+ <p>This document refers to the <strong>2.0</strong> version of Apache httpd, which <strong>is no longer maintained</strong>. Upgrade, and refer to the current version of httpd instead, documented at:</p>
+ </message>
+ <message id="retired.current">Current release version of Apache HTTP Server documentation</message>
+ <message id="retired.document">You may follow <link>this link</link> to go to the current version of this document.</message>
+
</messages>
</language>
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/lang/de.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/lang/de.xml?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/lang/de.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/lang/de.xml Sat Feb 1 22:31:33 2014
@@ -144,5 +144,14 @@
<message id="nottranslated">Die Dokumentation zu dieser Direktive wurde
noch nicht übersetzt. Bitte schauen Sie in die englische
Version.</message>
+
+ <!-- retirement -->
+ <message id="retired.headline">Bitte beachten!</message>
+ <message id="retired.description">
+ <p>Dieses Dokument bezieht sich auf Version <strong>2.0</strong> des Apache httpd, die <strong>nicht mehr gepflegt wird</strong>. Bitte aktualisieren Sie die Software und verwenden Sie stattdessen eine aktuelle Version des httpd, die an folgender Stelle dokumentiert ist:</p>
+ </message>
+ <message id="retired.current">Dokumentation des Apache HTTP Server für die zuletzt erschienene Version</message>
+ <message id="retired.document">Sie können <link>diesem Link</link> folgen, um zur aktuellen Version dieses Dokuments zu gelangen.</message>
+
</messages>
</language>
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/lang/en.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/lang/en.xml?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/lang/en.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/lang/en.xml Sat Feb 1 22:31:33 2014
@@ -144,5 +144,14 @@
<message id="nottranslated">The documentation for this directive has
not been translated yet. Please have a look at the English
version.</message>
+
+ <!-- retirement -->
+ <message id="retired.headline">Please note</message>
+ <message id="retired.description">
+ <p>This document refers to the <strong>2.0</strong> version of Apache httpd, which <strong>is no longer maintained</strong>. Upgrade, and refer to the current version of httpd instead, documented at:</p>
+ </message>
+ <message id="retired.current">Current release version of Apache HTTP Server documentation</message>
+ <message id="retired.document">You may follow <link>this link</link> to go to the current version of this document.</message>
+
</messages>
</language>
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/lang/es.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/lang/es.xml?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/lang/es.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/lang/es.xml Sat Feb 1 22:31:33 2014
@@ -144,5 +144,14 @@
<message id="nottranslated">The documentation for this directive has
not been translated yet. Please have a look at the English
version.</message>
+
+ <!-- retirement -->
+ <message id="retired.headline">Please note</message>
+ <message id="retired.description">
+ <p>This document refers to the <strong>2.0</strong> version of Apache httpd, which <strong>is no longer maintained</strong>. Upgrade, and refer to the current version of httpd instead, documented at:</p>
+ </message>
+ <message id="retired.current">Current release version of Apache HTTP Server documentation</message>
+ <message id="retired.document">You may follow <link>this link</link> to go to the current version of this document.</message>
+
</messages>
</language>
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/lang/fr.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/lang/fr.xml?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/lang/fr.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/lang/fr.xml Sat Feb 1 22:31:33 2014
@@ -145,5 +145,14 @@
<message id="nottranslated">La documentation de cette directive
n'a pas encore été traduite. Veuillez vous reporter à la version
en langue anglaise.</message>
+
+ <!-- retirement -->
+ <message id="retired.headline">Please note</message>
+ <message id="retired.description">
+ <p>This document refers to the <strong>2.0</strong> version of Apache httpd, which <strong>is no longer maintained</strong>. Upgrade, and refer to the current version of httpd instead, documented at:</p>
+ </message>
+ <message id="retired.current">Current release version of Apache HTTP Server documentation</message>
+ <message id="retired.document">You may follow <link>this link</link> to go to the current version of this document.</message>
+
</messages>
</language>
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/lang/ja.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/lang/ja.xml?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/lang/ja.xml [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/lang/ja.xml [utf-8] Sat Feb 1 22:31:33 2014
@@ -143,5 +143,14 @@
<message id="nottranslated">このディレクティブの解説文書は
まだ翻訳されていません。英語版をご覧ください。
</message>
+
+ <!-- retirement -->
+ <message id="retired.headline">Please note</message>
+ <message id="retired.description">
+ <p>This document refers to the <strong>2.0</strong> version of Apache httpd, which <strong>is no longer maintained</strong>. Upgrade, and refer to the current version of httpd instead, documented at:</p>
+ </message>
+ <message id="retired.current">Current release version of Apache HTTP Server documentation</message>
+ <message id="retired.document">You may follow <link>this link</link> to go to the current version of this document.</message>
+
</messages>
</language>
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/lang/ko.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/lang/ko.xml?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/lang/ko.xml [euc-kr] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/lang/ko.xml [euc-kr] Sat Feb 1 22:31:33 2014
@@ -147,5 +147,14 @@
<message id="nottranslated">The documentation for this directive has
not been translated yet. Please have a look at the English
version.</message>
+
+ <!-- retirement -->
+ <message id="retired.headline">Please note</message>
+ <message id="retired.description">
+ <p>This document refers to the <strong>2.0</strong> version of Apache httpd, which <strong>is no longer maintained</strong>. Upgrade, and refer to the current version of httpd instead, documented at:</p>
+ </message>
+ <message id="retired.current">Current release version of Apache HTTP Server documentation</message>
+ <message id="retired.document">You may follow <link>this link</link> to go to the current version of this document.</message>
+
</messages>
</language>
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/lang/pt-br.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/lang/pt-br.xml?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/lang/pt-br.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/lang/pt-br.xml Sat Feb 1 22:31:33 2014
@@ -142,5 +142,14 @@
<message id="nottranslated">The documentation for this directive has
not been translated yet. Please have a look at the English
version.</message>
+
+ <!-- retirement -->
+ <message id="retired.headline">Please note</message>
+ <message id="retired.description">
+ <p>This document refers to the <strong>2.0</strong> version of Apache httpd, which <strong>is no longer maintained</strong>. Upgrade, and refer to the current version of httpd instead, documented at:</p>
+ </message>
+ <message id="retired.current">Current release version of Apache HTTP Server documentation</message>
+ <message id="retired.document">You may follow <link>this link</link> to go to the current version of this document.</message>
+
</messages>
</language>
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/lang/ru.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/lang/ru.xml?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/lang/ru.xml [koi8-r] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/lang/ru.xml [koi8-r] Sat Feb 1 22:31:33 2014
@@ -139,5 +139,14 @@
<message id="nottranslated">The documentation for this directive has
not been translated yet. Please have a look at the English
version.</message>
+
+ <!-- retirement -->
+ <message id="retired.headline">Please note</message>
+ <message id="retired.description">
+ <p>This document refers to the <strong>2.0</strong> version of Apache httpd, which <strong>is no longer maintained</strong>. Upgrade, and refer to the current version of httpd instead, documented at:</p>
+ </message>
+ <message id="retired.current">Current release version of Apache HTTP Server documentation</message>
+ <message id="retired.document">You may follow <link>this link</link> to go to the current version of this document.</message>
+
</messages>
</language>
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/lang/tr.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/lang/tr.xml?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/lang/tr.xml [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/lang/tr.xml [utf-8] Sat Feb 1 22:31:33 2014
@@ -143,5 +143,14 @@
<!-- directive not translated yet -->
<message id="nottranslated">Bu yönergenin belgesi henüz Türkçeye çevrilmedi.
Lütfen İngilizce sürümüne bakınız.</message>
+
+ <!-- retirement -->
+ <message id="retired.headline">Please note</message>
+ <message id="retired.description">
+ <p>This document refers to the <strong>2.0</strong> version of Apache httpd, which <strong>is no longer maintained</strong>. Upgrade, and refer to the current version of httpd instead, documented at:</p>
+ </message>
+ <message id="retired.current">Current release version of Apache HTTP Server documentation</message>
+ <message id="retired.document">You may follow <link>this link</link> to go to the current version of this document.</message>
+
</messages>
</language>
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/lang/zh-cn.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/lang/zh-cn.xml?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/lang/zh-cn.xml [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/lang/zh-cn.xml [utf-8] Sat Feb 1 22:31:33 2014
@@ -137,5 +137,14 @@
<message id="outofdate">此翻译可能过期。要了解最近的更改，请阅读英文版。</message>
<!-- directive not translated yet -->
<message id="nottranslated">此指令的文档还没有被翻译。请阅读英文版。</message>
+
+ <!-- retirement -->
+ <message id="retired.headline">Please note</message>
+ <message id="retired.description">
+ <p>This document refers to the <strong>2.0</strong> version of Apache httpd, which <strong>is no longer maintained</strong>. Upgrade, and refer to the current version of httpd instead, documented at:</p>
+ </message>
+ <message id="retired.current">Current release version of Apache HTTP Server documentation</message>
+ <message id="retired.document">You may follow <link>this link</link> to go to the current version of this document.</message>
+
</messages>
</language>
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/manualpage.dtd
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/manualpage.dtd?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/manualpage.dtd (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/manualpage.dtd Sat Feb 1 22:31:33 2014
@@ -24,4 +24,6 @@
<!ELEMENT manualpage (parentdocument?, title, summary?,
seealso*, section*)>
-<!ATTLIST manualpage metafile CDATA #REQUIRED>
+<!ATTLIST manualpage metafile CDATA #REQUIRED
+ upgrade CDATA #IMPLIED
+>
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/modulesynopsis.dtd
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/modulesynopsis.dtd?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/modulesynopsis.dtd (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/modulesynopsis.dtd Sat Feb 1 22:31:33 2014
@@ -24,7 +24,8 @@
identifier? , compatibility? , summary? , seealso* , section*,
directivesynopsis*)>
-<!ATTLIST modulesynopsis metafile CDATA #REQUIRED>
+<!ATTLIST modulesynopsis metafile CDATA #REQUIRED
+ upgrade CDATA #IMPLIED>
<!ELEMENT directivesynopsis (name , description? , syntax? , default?
, contextlist? , override? , modulelist?, status?, compatibility? ,
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/sitemap.dtd
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/sitemap.dtd?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/sitemap.dtd (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/sitemap.dtd Sat Feb 1 22:31:33 2014
@@ -23,12 +23,16 @@
<!-- <sitemap> is the root element -->
<!ELEMENT sitemap (title, summary?, seealso*, category*)>
-<!ATTLIST sitemap metafile CDATA #REQUIRED>
+<!ATTLIST sitemap metafile CDATA #REQUIRED
+ upgrade CDATA #IMPLIED
+>
<!-- <indexpage> is another root element -->
<!ELEMENT indexpage (parentdocument, title, category*)>
-<!ATTLIST indexpage metafile CDATA #REQUIRED>
+<!ATTLIST indexpage metafile CDATA #REQUIRED
+ upgrade CDATA #IMPLIED
+>
<!ELEMENT category (title, page*)>
<!ATTLIST category id ID #IMPLIED>
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/xsl/common.xsl
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/xsl/common.xsl?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/xsl/common.xsl (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/xsl/common.xsl Sat Feb 1 22:31:33 2014
@@ -33,6 +33,7 @@
<!-- -->
<!-- Injected variables: -->
+<!-- $is-retired - (boolean) Is this httpd version retired? -->
<!-- $is-chm - (boolean) target is for CHM generation or not -->
<!-- $is-zip - (boolean) target is for ZIP generation or not -->
<!-- $message - (node-set) localized common text snippets -->
@@ -70,6 +71,7 @@
<!-- make sure, we set relative anchors only, if we're actually -->
<!-- transforming a modulefile (see <directive> template) -->
<xsl:variable name="in-modulesynopsis" select="boolean(/modulesynopsis)" />
+<xsl:variable name="upgrade" select="boolean(/*/@upgrade)" />
<!-- when referencing to a directory, we may need to complete the path -->
<!-- with the index file (for offline applications like *.chm files) -->
@@ -175,6 +177,18 @@
<!-- chm files do not need a favicon -->
<xsl:if test="not($is-chm or $is-zip)">&lf;
<link rel="shortcut icon" href="{$path}/images/favicon.ico" />
+ <xsl:if test="$is-retired">
+ <xsl:choose>
+ <xsl:when test="$upgrade">
+ <xsl:if test="not(/*/@upgrade = '')">
+ <link rel="canonical" href="http://httpd.apache.org/docs/current{concat($metafile/path, /*/@upgrade, '.html')}"/>
+ </xsl:if>
+ </xsl:when>
+ <xsl:otherwise>
+ <link rel="canonical" href="http://httpd.apache.org/docs/current{concat($metafile/path, $metafile/basename, '.html')}"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:if>
</xsl:if>
</head>
</xsl:template>
@@ -270,6 +284,92 @@
<!-- ==================================================================== -->
+<!-- retired -->
+<!-- ==================================================================== -->
+<xsl:template name="retired">
+<xsl:if test="$is-retired">
+ <xsl:variable name="base">
+ <xsl:choose>
+ <xsl:when test="$upgrade">
+ <xsl:if test="not(/*/@upgrade = '')">
+ <xsl:value-of select="/*/@upgrade" />
+ </xsl:if>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
+ select="$metafile/basename" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:variable name="future">
+ <xsl:choose>
+ <xsl:when test="$base = 'index'">
+ <xsl:value-of select="$metafile/path" />
+ </xsl:when>
+ <xsl:when test="$base = ''">
+ <!-- nothing -->
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="concat($metafile/path, $base, '.html')" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <div class="retired">
+ <h4><xsl:value-of select="$message[@id='retired.headline']" /></h4>
+ <xsl:apply-templates select="$message[@id='retired.description']" />
+ <ul>
+ <li><a href="http://httpd.apache.org/docs/current/">
+ <xsl:value-of select="$message[@id='retired.current']" /></a>
+ </li>
+ </ul>
+ <xsl:if test="not($future = '')">
+ <p><xsl:apply-templates select="$message[@id='retired.document']" mode="retired" /></p>
+ </xsl:if>
+ </div>
+</xsl:if>
+</xsl:template>
+<!-- /retired -->
+
+<xsl:template match="message">
+ <xsl:apply-templates />
+</xsl:template>
+
+<xsl:template match="link" mode="retired">
+<xsl:variable name="base">
+ <xsl:choose>
+ <xsl:when test="$upgrade">
+ <xsl:if test="not(/*/@upgrade = '')">
+ <xsl:value-of select="/*/@upgrade" />
+ </xsl:if>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
+ select="$metafile/basename" />
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:variable>
+<xsl:variable name="future">
+ <xsl:choose>
+ <xsl:when test="$base = 'index'">
+ <xsl:value-of select="$metafile/path" />
+ </xsl:when>
+ <xsl:when test="$base = ''">
+ <!-- nothing -->
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="concat($metafile/path, $base, '.html')" />
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:variable>
+
+<a href="http://httpd.apache.org/docs/current{$future}">
+ <xsl:apply-templates />
+</a>
+</xsl:template>
+
+
+<!-- ==================================================================== -->
<!-- out of date -->
<!-- ==================================================================== -->
<xsl:template name="outofdate">
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/xsl/directiveindex.xsl
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/xsl/directiveindex.xsl?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/xsl/directiveindex.xsl (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/xsl/directiveindex.xsl Sat Feb 1 22:31:33 2014
@@ -52,6 +52,8 @@
</xsl:call-template>
</xsl:variable>
+ <xsl:call-template name="retired" />
+
<div id="preamble">
<h1>
<xsl:value-of select="title" />
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/xsl/faq.xsl
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/xsl/faq.xsl?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/xsl/faq.xsl (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/xsl/faq.xsl Sat Feb 1 22:31:33 2014
@@ -43,6 +43,8 @@
<xsl:call-template name="top" />
<div id="page-content">
+ <xsl:call-template name="retired" />
+
<div id="preamble">
<h1>
<xsl:value-of select="title" />
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/xsl/indexpage.xsl
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/xsl/indexpage.xsl?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/xsl/indexpage.xsl (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/xsl/indexpage.xsl Sat Feb 1 22:31:33 2014
@@ -55,6 +55,8 @@
<xsl:call-template name="top"/>&lf;
<div id="page-content">
+ <xsl:call-template name="retired" />
+
<h1>
<xsl:value-of select="title"/>
</h1>&lf;
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/xsl/language.xsl
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/xsl/language.xsl?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/xsl/language.xsl (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/xsl/language.xsl Sat Feb 1 22:31:33 2014
@@ -34,6 +34,7 @@
<xsl:param name="type" />
<xsl:param name="langs" />
+<xsl:param name="retired" />
<!-- ==================================================================== -->
<!-- / -->
@@ -556,6 +557,21 @@ Some targets have additional requirement
</xsl:choose>
</xsl:attribute>
</xsl:element>
+ &lf;
+
+ <xsl:element name="xsl:variable">
+ <xsl:attribute name="name">is-retired</xsl:attribute>
+ <xsl:attribute name="select">
+ <xsl:choose>
+ <xsl:when test="$retired = 'yes'">
+ <xsl:text>true()</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>false()</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ </xsl:element>
&lf;&lf;
</xsl:if>
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/xsl/manualpage.xsl
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/xsl/manualpage.xsl?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/xsl/manualpage.xsl (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/xsl/manualpage.xsl Sat Feb 1 22:31:33 2014
@@ -41,6 +41,8 @@
<xsl:call-template name="top"/>
<div id="page-content">
+ <xsl:call-template name="retired" />
+
<div id="preamble">
<h1>
<xsl:value-of select="title"/>
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/xsl/moduleindex.xsl
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/xsl/moduleindex.xsl?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/xsl/moduleindex.xsl (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/xsl/moduleindex.xsl Sat Feb 1 22:31:33 2014
@@ -36,6 +36,8 @@
<xsl:call-template name="top"/>
<div id="page-content">
+ <xsl:call-template name="retired" />
+
<div id="preamble">
<h1>
<xsl:value-of select="title" />
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/xsl/quickreference.xsl
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/xsl/quickreference.xsl?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/xsl/quickreference.xsl (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/xsl/quickreference.xsl Sat Feb 1 22:31:33 2014
@@ -35,6 +35,8 @@
<body id="directive-index">&lf;
<xsl:call-template name="top"/>&lf;
+ <xsl:call-template name="retired" />
+
<div id="preamble">
<h1>
<xsl:value-of select="title" />
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/xsl/sitemap.xsl
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/xsl/sitemap.xsl?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/xsl/sitemap.xsl (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/xsl/sitemap.xsl Sat Feb 1 22:31:33 2014
@@ -36,6 +36,8 @@
<xsl:call-template name="top" />&lf;
<div id="page-content">
+ <xsl:call-template name="retired" />
+
<div id="preamble">
<h1>
<xsl:value-of select="title" />
Modified: httpd/httpd/branches/2.4.x/docs/manual/style/xsl/synopsis.xsl
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/xsl/synopsis.xsl?rev=1563497&r1=1563496&r2=1563497&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/xsl/synopsis.xsl (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/xsl/synopsis.xsl Sat Feb 1 22:31:33 2014
@@ -36,6 +36,8 @@
<xsl:call-template name="top" />&lf;
<div id="page-content">&lf;
+ <xsl:call-template name="retired" />
+
<div id="preamble">
<h1>
<xsl:choose>