You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by el...@apache.org on 2016/04/30 22:52:47 UTC
svn commit: r1741814 - in /httpd/httpd/branches/2.4.x/docs/manual/style:
lang/da.xml lang/de.xml lang/en.xml lang/es.xml lang/fr.xml lang/ja.xml
lang/ko.xml lang/pt-br.xml lang/ru.xml lang/tr.xml lang/zh-cn.xml
xsl/manualpage.xsl xsl/synopsis.xsl
Author: elukey
Date: Sat Apr 30 20:52:47 2016
New Revision: 1741814
URL: http://svn.apache.org/viewvc?rev=1741814&view=rev
Log:
Backport of the "Bugfix checklist" panel from trunk. Each module's page gets
a new section on the right panel containing three links:
- httpd changelog
- Bugzilla issues related to the module
- Open a bugzilla issue related to the module
This commit also fixes a minor inconsistency for the "comments" link, that is
now always displayed under "See also"
Modified:
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/xsl/manualpage.xsl
httpd/httpd/branches/2.4.x/docs/manual/style/xsl/synopsis.xsl
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=1741814&r1=1741813&r2=1741814&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 Apr 30 20:52:47 2016
@@ -72,6 +72,10 @@
<message id="uppercase">ABCDEFGHIJKLMNOPQRSTUVWXYZÆØÅ</message>
<message id="name-section">NAVN</message>
<message id="hyphenation"></message>
+ <message id="foundabug">Bugfix checklist</message>
+ <message id="httpdchangelog">httpd changelog</message>
+ <message id="httpdknownissues">Known issues</message>
+ <message id="httpdreportabug">Report a bug</message>
<!-- Used in description box for directives -->
<message id="syntax">Syntaks</message>
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=1741814&r1=1741813&r2=1741814&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 Apr 30 20:52:47 2016
@@ -67,6 +67,10 @@
<message id="uppercase">ABCDEFGHIJKLMNOPQRSTUVWXYZ</message>
<message id="name-section">NAME</message>
<message id="hyphenation"></message>
+ <message id="foundabug">Bugfix checklist</message>
+ <message id="httpdchangelog">httpd changelog</message>
+ <message id="httpdknownissues">Known issues</message>
+ <message id="httpdreportabug">Report a bug</message>
<!-- Used in description box for directives -->
<message id="syntax">Syntax</message>
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=1741814&r1=1741813&r2=1741814&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 Apr 30 20:52:47 2016
@@ -71,6 +71,10 @@
<message id="uppercase">ABCDEFGHIJKLMNOPQRSTUVWXYZ</message>
<message id="name-section">NAME</message>
<message id="hyphenation"></message>
+ <message id="foundabug">Bugfix checklist</message>
+ <message id="httpdchangelog">httpd changelog</message>
+ <message id="httpdknownissues">Known issues</message>
+ <message id="httpdreportabug">Report a bug</message>
<!-- Used in description box for directives -->
<message id="syntax">Syntax</message>
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=1741814&r1=1741813&r2=1741814&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 Apr 30 20:52:47 2016
@@ -69,6 +69,10 @@
<message id="uppercase">ABCDEFGHIJKLMNOPQRSTUVWXYZ</message>
<message id="name-section">NOMBRE</message>
<message id="hyphenation">Cesura</message>
+ <message id="foundabug">Bugfix checklist</message>
+ <message id="httpdchangelog">httpd changelog</message>
+ <message id="httpdknownissues">Known issues</message>
+ <message id="httpdreportabug">Report a bug</message>
<!-- Used in description box for directives -->
<message id="syntax">Sintaxis</message>
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=1741814&r1=1741813&r2=1741814&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 Apr 30 20:52:47 2016
@@ -71,6 +71,10 @@
<message id="uppercase">ABCDEFGHIJKLMNOPQRSTUVWXYZ</message>
<message id="name-section">NOM</message>
<message id="hyphenation">Césure</message>
+ <message id="foundabug">Bugfix checklist</message>
+ <message id="httpdchangelog">httpd changelog</message>
+ <message id="httpdknownissues">Known issues</message>
+ <message id="httpdreportabug">Report a bug</message>
<!-- Used in description box for directives -->
<message id="syntax">Syntaxe</message>
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=1741814&r1=1741813&r2=1741814&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 Apr 30 20:52:47 2016
@@ -66,6 +66,10 @@
<message id="uppercase">ABCDEFGHIJKLMNOPQRSTUVWXYZ</message>
<message id="name-section">NAME</message>
<message id="hyphenation"></message>
+ <message id="foundabug">Bugfix checklist</message>
+ <message id="httpdchangelog">httpd changelog</message>
+ <message id="httpdknownissues">Known issues</message>
+ <message id="httpdreportabug">Report a bug</message>
<!-- Used in description box for directives -->
<message id="syntax">構文</message>
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=1741814&r1=1741813&r2=1741814&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 Apr 30 20:52:47 2016
@@ -72,6 +72,10 @@
<message id="uppercase">ABCDEFGHIJKLMNOPQRSTUVWXYZ</message>
<message id="name-section">NAME</message>
<message id="hyphenation"></message>
+ <message id="foundabug">Bugfix checklist</message>
+ <message id="httpdchangelog">httpd changelog</message>
+ <message id="httpdknownissues">Known issues</message>
+ <message id="httpdreportabug">Report a bug</message>
<!-- Used in description box for directives -->
<message id="syntax">문법</message>
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=1741814&r1=1741813&r2=1741814&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 Apr 30 20:52:47 2016
@@ -70,6 +70,10 @@
<!-- Used in manualpage -->
<message id="relatedmodules">Módulos Relacionados</message>
<message id="relateddirectives">Diretrizes Relacionadas</message>
+ <message id="foundabug">Bugfix checklist</message>
+ <message id="httpdchangelog">httpd changelog</message>
+ <message id="httpdknownissues">Known issues</message>
+ <message id="httpdreportabug">Report a bug</message>
<!-- Used in description box for directives -->
<message id="syntax">Sintaxe</message>
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=1741814&r1=1741813&r2=1741814&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 Apr 30 20:52:47 2016
@@ -70,6 +70,10 @@
<message id="uppercase">ABCDEFGHIJKLMNOPQRSTUVWXYZ</message>
<message id="name-section">NAME</message>
<message id="hyphenation"></message>
+ <message id="foundabug">Bugfix checklist</message>
+ <message id="httpdchangelog">httpd changelog</message>
+ <message id="httpdknownissues">Known issues</message>
+ <message id="httpdreportabug">Report a bug</message>
<!-- Used in description box for directives -->
<message id="syntax">Синтаксис</message>
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=1741814&r1=1741813&r2=1741814&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 Apr 30 20:52:47 2016
@@ -73,6 +73,10 @@
<message id="uppercase">ABCÇDEFGĞHIİJKLMNOÖPQRSŞTUÜVWXYZ</message>
<message id="name-section">İSİM</message>
<message id="hyphenation">.nh</message>
+ <message id="foundabug">Bugfix checklist</message>
+ <message id="httpdchangelog">httpd changelog</message>
+ <message id="httpdknownissues">Known issues</message>
+ <message id="httpdreportabug">Report a bug</message>
<!-- Used in description box for directives -->
<message id="syntax">Sözdizimi</message>
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=1741814&r1=1741813&r2=1741814&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 Apr 30 20:52:47 2016
@@ -69,6 +69,10 @@
<message id="uppercase">ABCDEFGHIJKLMNOPQRSTUVWXYZ</message>
<message id="name-section">名称</message>
<message id="hyphenation"></message>
+ <message id="foundabug">Bugfix checklist</message>
+ <message id="httpdchangelog">httpd changelog</message>
+ <message id="httpdknownissues">Known issues</message>
+ <message id="httpdreportabug">Report a bug</message>
<!-- Used in description box for directives -->
<message id="syntax">语法</message>
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=1741814&r1=1741813&r2=1741814&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 Apr 30 20:52:47 2016
@@ -38,12 +38,12 @@
<xsl:attribute name="class">no-sidebar</xsl:attribute>
</xsl:if>
- <xsl:call-template name="top"/>
+ <xsl:call-template name="top"/>
<div id="page-content">
<xsl:call-template name="retired" />
- <div id="preamble">
+ <div id="preamble">
<h1>
<xsl:value-of select="title"/>
</h1>&lf;
@@ -52,7 +52,7 @@
<xsl:apply-templates select="summary" />
</div>&lf; <!-- /#preamble -->
-
+
<xsl:if test="(not($is-chm) and count(section) > 1) or seealso">
<div id="quickview">
<xsl:if test="not($is-chm) and count(section) > 1">
@@ -61,7 +61,10 @@
</ul>
</xsl:if>
- <xsl:if test="seealso">
+ <!-- The seealso section shows links to related documents
+ explicitly set in .xml docs or simply the comments. -->
+ <xsl:if test="seealso or not($is-chm or $is-zip or
+ $metafile/basename = 'index')">
<h3>
<xsl:value-of
select="$message[@id='seealso']" />
@@ -72,15 +75,13 @@
<xsl:apply-templates />
</li>
</xsl:for-each>
+ <xsl:if test="not($is-chm or $is-zip or $metafile/basename = 'index')">
+ <li><a href="#comments_section"><xsl:value-of
+ select="$message[@id='comments']" /></a>
+ </li>
+ </xsl:if>
</ul>
</xsl:if>
- <xsl:if test="not($is-chm or $is-zip or $metafile/basename = 'index')">
- <ul class="seealso">
- <li><a href="#comments_section"><xsl:value-of
- select="$message[@id='comments']" /></a>
- </li>
- </ul>
- </xsl:if>
</div>&lf; <!-- /#quickview -->
</xsl:if>
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=1741814&r1=1741813&r2=1741814&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 Apr 30 20:52:47 2016
@@ -244,7 +244,72 @@
</xsl:choose>
</xsl:if> <!-- /!is-chm -->
- <xsl:if test="seealso">
+ <h3>
+ <xsl:value-of select="$message[@id='foundabug']" />
+ </h3>
+ <ul class="seealso">
+ <!-- Bugzilla mpm components are prefixed with
+ 'mpm_', meanwhile the page name in the docs do
+ not contain it. For example, Bugzilla has
+ the 'mpm_event' component and the doc has the
+ 'event' page. This creates an inconsistency
+ in the URL generation, fixed by the following
+ check. -->
+ <xsl:variable name="bugzilla_prefix">
+ <xsl:choose>
+ <xsl:when test="name='worker' or name='event'
+ or name='prefork'">
+ <xsl:value-of select="string('mpm_')"/>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:variable>
+ <li>
+ <!-- The link below is not dynamic and points only
+ to the 2.4 release since it makes sense to keep
+ it as reference even for trunk. -->
+ <a href="https://www.apache.org/dist/httpd/CHANGES_2.4">
+ <xsl:value-of
+ select="$message[@id='httpdchangelog']" />
+ </a>
+ </li>
+ <li>
+ <!-- Bugzilla mpm components are prefixed with
+ 'mpm_', meanwhile the page name in the docs do
+ not contain it. For example, Bugzilla has
+ the 'mpm_event' component and the doc has the
+ 'event' page. This creates a inconsistency
+ in the URL generation, fixed by the following
+ check. -->
+ <xsl:variable name="bugzilla_prefix">
+ <xsl:choose>
+ <xsl:when test="name='worker' or name='event'
+ or name='prefork'">
+ <xsl:value-of select="string('mpm_')"/>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:variable>
+
+ <!-- The line below is not splitted in multiple
+ lines to avoid rendering a broken URL. -->
+ <a href="https://bz.apache.org/bugzilla/buglist.cgi?bug_status=__open__&list_id=144532&product=Apache%20httpd-2&query_format=specific&order=changeddate%20DESC%2Cpriority%2Cbug_severity&component={$bugzilla_prefix}{name}">
+
+ <xsl:value-of
+ select="$message[@id='httpdknownissues']" />
+ </a>
+ </li>
+ <li>
+ <!-- The line below is not splitted in multiple
+ lines to avoid rendering a broken URL. -->
+ <a href="https://bz.apache.org/bugzilla/enter_bug.cgi?product=Apache%20httpd-2&component={$bugzilla_prefix}{name}">
+ <xsl:value-of
+ select="$message[@id='httpdreportabug']" />
+ </a>
+ </li>
+ </ul>
+ <!-- The seealso section shows links to related documents
+ explicitly set in .xml docs or simply the comments. -->
+ <xsl:if test="seealso or not($is-chm or $is-zip or
+ $metafile/basename = 'index')">
<h3>
<xsl:value-of select="$message
[@id='seealso']" />
@@ -256,15 +321,13 @@
<xsl:apply-templates />
</li>&lf;
</xsl:for-each>
+ <xsl:if test="not($is-chm or $is-zip or $metafile/basename = 'index')">
+ <li><a href="#comments_section"><xsl:value-of
+ select="$message[@id='comments']" /></a>
+ </li>
+ </xsl:if>
</ul>
</xsl:if>
- <xsl:if test="not($is-chm or $is-zip or $metafile/basename = 'index')">
- <ul class="seealso">
- <li><a href="#comments_section"><xsl:value-of
- select="$message[@id='comments']" /></a>
- </li>
- </ul>
- </xsl:if>
</div> <!-- /#quickview -->
</xsl:if>&lf; <!-- have sidebar -->