www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity

port retirement styles from 2.0 to trunk

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1563493 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
André Malo
2014-02-01 22:22:18 +00:00
parent 55f9574e26
commit 5539d793fe
27 changed files with 254 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/manual/style/build.properties
View File

@@ -3,6 +3,10 @@
# 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 \

9
docs/manual/style/css/manual.css
View File

@@ -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

1
docs/manual/style/faq.dtd
View File

@@ -26,6 +26,7 @@ seealso*, (section | categories))>
<!ATTLIST faq metafile CDATA #REQUIRED
all-in-one (yes | no ) "no"
upgrade CDATA #IMPLIED
>
<!ELEMENT categories (categoryfile*)>

9
docs/manual/style/lang/da.xml
View File

@@ -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>

9
docs/manual/style/lang/de.xml
View File

@@ -144,5 +144,14 @@
<message id="nottranslated">Die Dokumentation zu dieser Direktive wurde
noch nicht &#252;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&#252;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>

9
docs/manual/style/lang/en.xml
View File

@@ -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>

9
docs/manual/style/lang/es.xml
View File

@@ -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>

9
docs/manual/style/lang/fr.xml
View File

@@ -145,5 +145,14 @@
<message id="nottranslated">La documentation de cette directive
n'a pas encore &eacute;t&eacute; traduite. Veuillez vous reporter &agrave; 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>

9
docs/manual/style/lang/ja.xml
View File

@@ -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>

9
docs/manual/style/lang/ko.xml
View File

@@ -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>

9
docs/manual/style/lang/pt-br.xml
View File

@@ -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>

9
docs/manual/style/lang/ru.xml
View File

@@ -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>

9
docs/manual/style/lang/tr.xml
View File

@@ -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>

9
docs/manual/style/lang/zh-cn.xml
View File

@@ -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>

4
docs/manual/style/manualpage.dtd
View File

@@ -24,4 +24,6 @@
<!ELEMENT manualpage (parentdocument?, title, summary?,
seealso*, section*)>
<!ATTLIST manualpage metafile CDATA #REQUIRED>
<!ATTLIST manualpage metafile CDATA #REQUIRED
upgrade CDATA #IMPLIED
>

3
docs/manual/style/modulesynopsis.dtd
View File

@@ -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? ,

8
docs/manual/style/sitemap.dtd
View File

@@ -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>

100
docs/manual/style/xsl/common.xsl
View File

@@ -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>
@@ -269,6 +283,92 @@
<!-- /top -->
<!-- ==================================================================== -->
<!-- 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 -->
<!-- ==================================================================== -->

2
docs/manual/style/xsl/directiveindex.xsl
View File

@@ -52,6 +52,8 @@
</xsl:call-template>
</xsl:variable>
<xsl:call-template name="retired" />
<div id="preamble">
<h1>
<xsl:value-of select="title" />

2
docs/manual/style/xsl/faq.xsl
View File

@@ -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" />

2
docs/manual/style/xsl/indexpage.xsl
View File

@@ -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;

16
docs/manual/style/xsl/language.xsl
View File

@@ -34,6 +34,7 @@
<xsl:param name="type" />
<xsl:param name="langs" />
<xsl:param name="retired" />
<!-- ==================================================================== -->
<!-- / -->
@@ -557,6 +558,21 @@ Some targets have additional requirements:
</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>

2
docs/manual/style/xsl/manualpage.xsl
View File

@@ -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"/>

2
docs/manual/style/xsl/moduleindex.xsl
View File

@@ -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" />

2
docs/manual/style/xsl/quickreference.xsl
View File

@@ -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" />

2
docs/manual/style/xsl/sitemap.xsl
View File

@@ -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" />

2
docs/manual/style/xsl/synopsis.xsl
View File

@@ -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>