Follow up for the Bugfix checklist panel. Remove ":" from Bugfix checklist, moved...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1741065 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/style/lang/da.xml b/docs/manual/style/lang/da.xml
index 8d0419a04548af579be72bbebc271efac74809cb..c7be52ae55ec54bdd369d0f4eb662ef3e4283666 100644 (file)
--- a/docs/manual/style/lang/da.xml
+++ b/docs/manual/style/lang/da.xml
@@ -72,8 +72,8 @@
         <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="foundabug">Bugfix checklist</message>
+        <message id="httpdchangelog">httpd changelog</message>
         <message id="httpdknownissues">Known issues</message>
         <message id="httpdreportabug">Report a bug</message>
 

diff --git a/docs/manual/style/lang/de.xml b/docs/manual/style/lang/de.xml
index 4f4b0c2b553a6a202bb7b0047a020c1d4eea1133..653f3db0dc8a0588b72902c00203c7e29cfcc542 100644 (file)
--- a/docs/manual/style/lang/de.xml
+++ b/docs/manual/style/lang/de.xml
@@ -67,8 +67,8 @@
         <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="foundabug">Bugfix checklist</message>
+        <message id="httpdchangelog">httpd changelog</message>
         <message id="httpdknownissues">Known issues</message>
         <message id="httpdreportabug">Report a bug</message>
 

diff --git a/docs/manual/style/lang/en.xml b/docs/manual/style/lang/en.xml
index 62e6f58b280bac9d98d1ab1c8fb1e06cca12e810..4e97a89091fb9f39ab8c3d98795887295fd78312 100644 (file)
--- a/docs/manual/style/lang/en.xml
+++ b/docs/manual/style/lang/en.xml
@@ -71,8 +71,8 @@
         <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="foundabug">Bugfix checklist</message>
+        <message id="httpdchangelog">httpd changelog</message>
         <message id="httpdknownissues">Known issues</message>
         <message id="httpdreportabug">Report a bug</message>
 

diff --git a/docs/manual/style/lang/es.xml b/docs/manual/style/lang/es.xml
index 3f1ee5d856fa1c4e4aa7917676559e2a52e743e2..08d75ed671a21b992aeeef31eb425721e3625248 100644 (file)
--- a/docs/manual/style/lang/es.xml
+++ b/docs/manual/style/lang/es.xml
@@ -69,8 +69,8 @@
         <message id="uppercase">ABCDEFGHIJKLMNÑOPQRSTUVWXYZ</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="foundabug">Bugfix checklist</message>
+        <message id="httpdchangelog">httpd changelog</message>
         <message id="httpdknownissues">Known issues</message>
         <message id="httpdreportabug">Report a bug</message>
 

diff --git a/docs/manual/style/lang/fr.xml b/docs/manual/style/lang/fr.xml
index 0a5815caf67ba879f93fc5ec2eb3168cc01a1843..c4548d98408936af42bac1b885b0215e80738f28 100644 (file)
--- a/docs/manual/style/lang/fr.xml
+++ b/docs/manual/style/lang/fr.xml
@@ -71,8 +71,8 @@
         <message id="uppercase">ABCDEFGHIJKLMNOPQRSTUVWXYZ</message>
         <message id="name-section">NOM</message>
         <message id="hyphenation">C&#233;sure</message>
-        <message id="foundabug">Bugfix checklist:</message>
-        <message id="httpdchangelog">HTTPD changelog</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>
 

diff --git a/docs/manual/style/lang/ja.xml b/docs/manual/style/lang/ja.xml
index cdd52ee744f8fcc81d1a005ecea6202944d3efc9..060bf2d5a24254fafabfc4c823afa583db435ada 100644 (file)
--- a/docs/manual/style/lang/ja.xml
+++ b/docs/manual/style/lang/ja.xml
@@ -66,8 +66,8 @@
         <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="foundabug">Bugfix checklist</message>
+        <message id="httpdchangelog">httpd changelog</message>
         <message id="httpdknownissues">Known issues</message>
         <message id="httpdreportabug">Report a bug</message>
 

diff --git a/docs/manual/style/lang/ko.xml b/docs/manual/style/lang/ko.xml
index cdd23251fc42949f64af619a728b67e89b75e884..b219246ffb7fda5f579e6aa03d612a4ce6ddaae1 100644 (file)
--- a/docs/manual/style/lang/ko.xml
+++ b/docs/manual/style/lang/ko.xml
@@ -72,8 +72,8 @@
         <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="foundabug">Bugfix checklist</message>
+        <message id="httpdchangelog">httpd changelog</message>
         <message id="httpdknownissues">Known issues</message>
         <message id="httpdreportabug">Report a bug</message>
 

diff --git a/docs/manual/style/lang/pt-br.xml b/docs/manual/style/lang/pt-br.xml
index 1d98c9d3469094117b8ea4c2bdf289a58fa0a4d0..d2e4ad54862acc488826ae0b82bd2becfaef79ed 100644 (file)
--- a/docs/manual/style/lang/pt-br.xml
+++ b/docs/manual/style/lang/pt-br.xml
@@ -70,8 +70,8 @@
         <!-- Used in manualpage -->
         <message id="relatedmodules">M&#243;dulos Relacionados</message>
         <message id="relateddirectives">Diretrizes Relacionadas</message>
-        <message id="foundabug">Bugfix checklist:</message>
-        <message id="httpdchangelog">HTTPD changelog</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>
 

diff --git a/docs/manual/style/lang/ru.xml b/docs/manual/style/lang/ru.xml
index 1a47b17130676bf97cec4ad6fa34087bb9080287..0a7d3df89cd5a843556bd476fab73de5a124d329 100644 (file)
--- a/docs/manual/style/lang/ru.xml
+++ b/docs/manual/style/lang/ru.xml
@@ -70,8 +70,8 @@
         <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="foundabug">Bugfix checklist</message>
+        <message id="httpdchangelog">httpd changelog</message>
         <message id="httpdknownissues">Known issues</message>
         <message id="httpdreportabug">Report a bug</message>
 

diff --git a/docs/manual/style/lang/tr.xml b/docs/manual/style/lang/tr.xml
index 002bcf2b98dbf9dcbd21ec5219421d7363c2c857..68d05bec1a87ba0bc422eaa7555a486ece36da77 100644 (file)
--- a/docs/manual/style/lang/tr.xml
+++ b/docs/manual/style/lang/tr.xml
@@ -73,8 +73,8 @@
         <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="foundabug">Bugfix checklist</message>
+        <message id="httpdchangelog">httpd changelog</message>
         <message id="httpdknownissues">Known issues</message>
         <message id="httpdreportabug">Report a bug</message>
 

diff --git a/docs/manual/style/lang/zh-cn.xml b/docs/manual/style/lang/zh-cn.xml
index ca97602b81b023a7a76d8dcd530f3663e15e15a0..04b7f851d4ab1543b7190ef04220c0f10484b83a 100644 (file)
--- a/docs/manual/style/lang/zh-cn.xml
+++ b/docs/manual/style/lang/zh-cn.xml
@@ -69,8 +69,8 @@
         <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="foundabug">Bugfix checklist</message>
+        <message id="httpdchangelog">httpd changelog</message>
         <message id="httpdknownissues">Known issues</message>
         <message id="httpdreportabug">Report a bug</message>
 

diff --git a/docs/manual/style/xsl/synopsis.xsl b/docs/manual/style/xsl/synopsis.xsl
index 6cfc069e73be4850facd659381bd8565f33a4428..eda684c3b75fa939105bbe50e3b7a675932b91e6 100644 (file)
--- a/docs/manual/style/xsl/synopsis.xsl
+++ b/docs/manual/style/xsl/synopsis.xsl
@@ -248,6 +248,21 @@
                        <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
@@ -258,22 +273,6 @@
                             </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 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>
-
                             <!-- 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__&amp;list_id=144532&amp;product=Apache%20httpd-2&amp;query_format=specific&amp;order=changeddate%20DESC%2Cpriority%2Cbug_severity&amp;component={$bugzilla_prefix}{name}">
@@ -284,7 +283,7 @@
                         <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">
+                            <a href="https://bz.apache.org/bugzilla/enter_bug.cgi?product=Apache%20httpd-2&amp;component={$bugzilla_prefix}{name}">
                                 <xsl:value-of
                                     select="$message[@id='httpdreportabug']" />
                             </a>