* let status texts and letters completely depend on the language

* let directive contexts and letters completely depend on the language
* allow embedding the "licensed" footer text
* generate quickreference legend automatically
* fix some japanese documents where statusses where translated by accident

Initially submitted by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@636535 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_mime.xml.ja b/docs/manual/mod/mod_mime.xml.ja
index 2edd49e4493fb080d27184e41aa89d21524fbbe7..578ff1caaa25ab3f7923af327f8cc40921573a05 100644 (file)
--- a/docs/manual/mod/mod_mime.xml.ja
+++ b/docs/manual/mod/mod_mime.xml.ja
@@ -26,7 +26,7 @@
 <description>\e$B%j%/%(%9%H$5$l$?%U%!%$%k$N3HD%;R$H%U%!%$%k$N?6$kIq$$\e(B
     (\e$B%O%s%I%i$H%U%#%k%?\e(B)\e$B!"FbMF\e(B (MIME \e$B%?%$%W!"8@8l!"J8;z%;%C%H!"%(%s%3!<%G%#%s%0\e(B)
     \e$B$H$r4XO"IU$1$k\e(B</description>
-<status>\e$B%Y!<%9\e(B</status>
+<status>Base</status>
 <sourcefile>mod_mime.c</sourcefile>
 <identifier>mime_module</identifier>
 

diff --git a/docs/manual/mod/mod_suexec.xml.ja b/docs/manual/mod/mod_suexec.xml.ja
index 2113cd304657a71cf96d60c61d8edcd2c231a6ad..461a126bc92b0b9ce919cf2c045a100c74ec63c3 100644 (file)
--- a/docs/manual/mod/mod_suexec.xml.ja
+++ b/docs/manual/mod/mod_suexec.xml.ja
@@ -24,7 +24,7 @@
 
 <name>mod_suexec</name>
 <description>\e$B;XDj$5$l$?%f!<%6$H%0%k!<%W$G\e(B CGI \e$B%9%/%j%W%H$r<B9T$9$k\e(B</description>
-<status>\e$B3HD%\e(B</status>
+<status>Extension</status>
 <sourcefile>mod_suexec.c</sourcefile>
 <identifier>suexec_module</identifier>
 <compatibility>Apache 2.0 \e$B0J9_$G;HMQ2DG=\e(B</compatibility>

diff --git a/docs/manual/mod/quickreference.xml b/docs/manual/mod/quickreference.xml
index ecada3f8916d30535c9b39f912dfdddb37be7a71..75e2a94ae16652b0fc45558140e70c81cd32af02 100644 (file)
--- a/docs/manual/mod/quickreference.xml
+++ b/docs/manual/mod/quickreference.xml
@@ -37,23 +37,4 @@
     is allowed and the status of the directive according to the legend
     tables below.</p>
   </summary>
-
-  <legend>
-    <table>
-      <columnspec><column width=".1"/><column width=".2"/></columnspec>
-      <tr><th>s</th><td>server&#160;config</td></tr>
-      <tr><th>v</th><td>virtual&#160;host</td></tr>
-      <tr><th>d</th><td>directory</td></tr>
-      <tr><th>h</th><td>.htaccess</td></tr>
-    </table>
-
-    <table>
-      <columnspec><column width=".1"/><column width=".2"/></columnspec>
-      <tr><th>C</th><td>Core</td></tr>
-      <tr><th>M</th><td>MPM</td></tr>
-      <tr><th>B</th><td>Base</td></tr>
-      <tr><th>E</th><td>Extension</td></tr>
-      <tr><th>X</th><td>Experimental</td></tr>
-    </table>
-  </legend>
 </quickreference>

diff --git a/docs/manual/mod/quickreference.xml.de b/docs/manual/mod/quickreference.xml.de
index b9183fc559d6d96a9ff3f6f526420894bea8146e..8ad6e4f3189e1a50bd396783fa0be829e15bc947 100644 (file)
--- a/docs/manual/mod/quickreference.xml.de
+++ b/docs/manual/mod/quickreference.xml.de
@@ -39,23 +39,4 @@
     Direktive erlaubt ist, sowie den Status der Direktive entsprechend
     der Legende.</p>
   </summary>
-
-  <legend>
-    <table>
-      <columnspec><column width=".1"/><column width=".2"/></columnspec>
-      <tr><th>s</th><td>Serverkonfiguration</td></tr>
-      <tr><th>v</th><td>Virtual&#160;Host</td></tr>
-      <tr><th>d</th><td>Verzeichnis</td></tr>
-      <tr><th>h</th><td>.htaccess</td></tr>
-    </table>
-
-    <table>
-      <columnspec><column width=".1"/><column width=".2"/></columnspec>
-      <tr><th>C</th><td>Core</td></tr>
-      <tr><th>M</th><td>MPM</td></tr>
-      <tr><th>B</th><td>Basis</td></tr>
-      <tr><th>E</th><td>Erweiterung</td></tr>
-      <tr><th>X</th><td>experimentell</td></tr>
-    </table>
-  </legend>
 </quickreference>

diff --git a/docs/manual/mod/quickreference.xml.es b/docs/manual/mod/quickreference.xml.es
index bc45cdf6f9398015ea6b1eb1862ebbc2c89ebbc4..4f166e29a64455887f0f126787ace9f04f3f86aa 100644 (file)
--- a/docs/manual/mod/quickreference.xml.es
+++ b/docs/manual/mod/quickreference.xml.es
@@ -39,24 +39,5 @@
     la directiva puede funcionar y el estado de la directiva de
     acuerdo con las notas que detallan m&#225;s abajo.</p>
   </summary>
-
-  <legend>
-    <table>
-      <columnspec><column width=".1"/><column width=".2"/></columnspec>
-      <tr><th>s</th><td>server&#160;config</td></tr>
-      <tr><th>v</th><td>virtual&#160;host</td></tr>
-      <tr><th>d</th><td>directory</td></tr>
-      <tr><th>h</th><td>.htaccess</td></tr>
-    </table>
-
-    <table>
-      <columnspec><column width=".1"/><column width=".2"/></columnspec>
-      <tr><th>C</th><td>Core</td></tr>
-      <tr><th>M</th><td>MPM</td></tr>
-      <tr><th>B</th><td>Base</td></tr>
-      <tr><th>E</th><td>Extensi&#243;n</td></tr>
-      <tr><th>X</th><td>Experimental</td></tr>
-    </table>
-  </legend>
 </quickreference>
 

diff --git a/docs/manual/mod/quickreference.xml.ja b/docs/manual/mod/quickreference.xml.ja
index 22e6b77f6157568458e2519c3c38963d3d063433..f25b3a98daf486093be25f6109513eadf1831a2e 100644 (file)
--- a/docs/manual/mod/quickreference.xml.ja
+++ b/docs/manual/mod/quickreference.xml.ja
@@ -38,23 +38,4 @@
     \e$B%G%#%l%/%F%#%V$N;HMQ$G$-$k%3%s%F%-%9%H$H!"\e(B
     \e$B%G%#%l%/%F%#%V$N%9%F!<%?%9$,<($5$l$F$$$^$9!#\e(B</p>
   </summary>
-
-  <legend>
-    <table>
-      <columnspec><column width=".1"/><column width=".2"/></columnspec>
-      <tr><th>s</th><td>\e$B%5!<%P@_Dj%U%!%$%k\e(B</td></tr>
-      <tr><th>v</th><td>\e$B%P!<%A%c%k%[%9%H\e(B</td></tr>
-      <tr><th>d</th><td>\e$B%G%#%l%/%H%j\e(B</td></tr>
-      <tr><th>h</th><td>.htaccess</td></tr>
-    </table>
-
-    <table>
-      <columnspec><column width=".1"/><column width=".2"/></columnspec>
-      <tr><th>C</th><td>Core</td></tr>
-      <tr><th>M</th><td>MPM</td></tr>
-      <tr><th>B</th><td>Base</td></tr>
-      <tr><th>E</th><td>Extension</td></tr>
-      <tr><th>X</th><td>Experimental</td></tr>
-    </table>
-  </legend>
 </quickreference>

diff --git a/docs/manual/mod/quickreference.xml.ko b/docs/manual/mod/quickreference.xml.ko
index a152e88a204e7522aa48fcc9bae244da009c4ebc..2b35706b5323eb2af24ae875aaddf2debb8a3c80 100644 (file)
--- a/docs/manual/mod/quickreference.xml.ko
+++ b/docs/manual/mod/quickreference.xml.ko
@@ -34,23 +34,4 @@
     <p>¼¼¹ø°¿Í ³×¹ø° ¿­Àº °¢°¢ ¾Æ·¡ Ç¥¿¡ µû¶ó Áö½Ã¾î¸¦ »ç¿ëÇÒ
     ¼ö ÀÖ´Â Àå¼Ò¿Í Áö½Ã¾îÀÇ »óŸ¦ ³ªÅ¸³½´Ù.</p>
   </summary>
-
-  <legend>
-    <table>
-      <columnspec><column width=".1"/><column width=".2"/></columnspec>
-      <tr><th>s</th><td>ÁÖ¼­¹ö¼³Á¤</td></tr>
-      <tr><th>v</th><td>°¡»óÈ£½ºÆ®</td></tr>
-      <tr><th>d</th><td>directory</td></tr>
-      <tr><th>h</th><td>.htaccess</td></tr>
-    </table>
-
-    <table>
-      <columnspec><column width=".1"/><column width=".2"/></columnspec>
-      <tr><th>C</th><td>Core</td></tr>
-      <tr><th>M</th><td>MPM</td></tr>
-      <tr><th>B</th><td>Base</td></tr>
-      <tr><th>E</th><td>Extension</td></tr>
-      <tr><th>X</th><td>Experimental</td></tr>
-    </table>
-  </legend>
 </quickreference>

diff --git a/docs/manual/style/lang/de.xml b/docs/manual/style/lang/de.xml
index 19389930146989ad0b2ff4654b530e44648ae133..7feae6773191f64d26ae8d0b705b9bbfb7eb91ce 100644 (file)
--- a/docs/manual/style/lang/de.xml
+++ b/docs/manual/style/lang/de.xml
@@ -72,11 +72,18 @@
         <message id="status">Status</message>
         <message id="module">Modul</message>
 
+        <!-- Status descriptions -->
+        <message id="base" letter="B">Basis</message>
+        <message id="mpm" letter="M">MPM</message>
+        <message id="core" letter="C">Core</message>
+        <message id="extension" letter="E">Erweiterung</message>
+        <message id="experimental" letter="X">experimentell</message>
+
         <!-- Used in directive context lists -->
-        <message id="serverconfig">Serverkonfiguration</message>
-        <message id="virtualhost">Virtual Host</message>
-        <message id="directory">Verzeichnis</message>
-        <message id="htaccess">.htaccess</message>
+        <message id="serverconfig" letter="s">Serverkonfiguration</message>
+        <message id="virtualhost" letter="v">Virtual Host</message>
+        <message id="directory" letter="d">Verzeichnis</message>
+        <message id="htaccess" letter="h">.htaccess</message>
 
         <!-- Used for directive lists -->
         <message id="directives">Direktiven</message>
@@ -118,7 +125,8 @@
         <message id="sitemap">Seitenindex</message>
 
         <!-- footer line -->
-        <message id="licensed">Lizenziert unter der</message>
+        <message id="before-license">Lizenziert unter der</message>
+        <message id="after-license"></message>
         <message id="langavail">Verfügbare Sprachen</message>
 
         <!-- not up to date -->

diff --git a/docs/manual/style/lang/en.xml b/docs/manual/style/lang/en.xml
index d38911102bde06bba3e09e8784039a8240780e5e..eaaa0b05a4328eeecdb683857958c2622ebfdabd 100644 (file)
--- a/docs/manual/style/lang/en.xml
+++ b/docs/manual/style/lang/en.xml
@@ -76,11 +76,18 @@
         <message id="status">Status</message>
         <message id="module">Module</message>
 
+        <!-- Status descriptions -->
+        <message id="base" letter="B">Base</message>
+        <message id="mpm" letter="M">MPM</message>
+        <message id="core" letter="C">Core</message>
+        <message id="extension" letter="E">Extension</message>
+        <message id="experimental" letter="X">Experimental</message>
+
         <!-- Used in directive context lists -->
-        <message id="serverconfig">server config</message>
-        <message id="virtualhost">virtual host</message>
-        <message id="directory">directory</message>
-        <message id="htaccess">.htaccess</message>
+        <message id="serverconfig" letter="s">server config</message>
+        <message id="virtualhost" letter="v">virtual host</message>
+        <message id="directory" letter="d">directory</message>
+        <message id="htaccess" letter="h">.htaccess</message>
 
         <!-- Used for directive lists -->
         <message id="directives">Directives</message>
@@ -119,7 +126,8 @@
         <message id="sitemap">Sitemap</message>
 
         <!-- footer line -->
-        <message id="licensed">Licensed under the</message>
+        <message id="before-license">Licensed under the</message>
+        <message id="after-license"></message>
         <message id="langavail">Available Languages</message>
  
         <!-- not up to date -->

diff --git a/docs/manual/style/lang/es.xml b/docs/manual/style/lang/es.xml
index ef636fdebd2d48acca1fb472291b3d0254bd342d..0ec95c874e6007009c3b1054b78e28e1cc66a682 100644 (file)
--- a/docs/manual/style/lang/es.xml
+++ b/docs/manual/style/lang/es.xml
@@ -73,11 +73,18 @@
         <message id="status">Estado</message>
         <message id="module">M&#243;dulo</message>
 
+        <!-- Status descriptions -->
+        <message id="base" letter="B">Base</message>
+        <message id="mpm" letter="M">MPM</message>
+        <message id="core" letter="C">Core</message>
+        <message id="extension" letter="E">Extensi&#243;n</message>
+        <message id="experimental" letter="X">Experimental</message>
+
         <!-- Used in directive context lists -->
-        <message id="serverconfig">server config</message>
-        <message id="virtualhost">virtual host</message>
-        <message id="directory">directory</message>
-        <message id="htaccess">.htaccess</message>
+        <message id="serverconfig" letter="s">server config</message>
+        <message id="virtualhost" letter="v">virtual host</message>
+        <message id="directory" letter="d">directory</message>
+        <message id="htaccess" letter="h">.htaccess</message>
 
         <!-- Used for directive lists -->
         <message id="directives">Directivas</message>
@@ -118,7 +125,8 @@
         <message id="sitemap">Mapa de este sitio web</message>
 
         <!-- footer line -->
-        <message id="licensed">Licencia bajo los t&#233;rminos de la</message>
+        <message id="before-license">Licencia bajo los t&#233;rminos de la</message>
+        <message id="after-license"></message>
         <message id="langavail">Idiomas disponibles</message>
 
         <!-- not up to date -->

diff --git a/docs/manual/style/lang/fr.xml b/docs/manual/style/lang/fr.xml
index 374baad0ee507ca07810c7581e3a627ac90bc38b..18fc8cbdd36079afee267759454c6dedff2c4105 100644 (file)
--- a/docs/manual/style/lang/fr.xml
+++ b/docs/manual/style/lang/fr.xml
@@ -78,11 +78,18 @@
         <message id="status">Statut</message>
         <message id="module">Module</message>
 
+        <!-- Status descriptions -->
+        <message id="base" letter="B">Base</message>
+        <message id="mpm" letter="M">MPM</message>
+        <message id="core" letter="C">Core</message>
+        <message id="extension" letter="E">Extension</message>
+        <message id="experimental" letter="X">Experimental</message>
+
         <!-- Used in directive context lists -->
-        <message id="serverconfig">configuration du serveur</message>
-        <message id="virtualhost">serveur virtuel</message>
-        <message id="directory">répertoire</message>
-        <message id="htaccess">.htaccess</message>
+        <message id="serverconfig" letter="s">configuration du serveur</message>
+        <message id="virtualhost" letter="v">serveur virtuel</message>
+        <message id="directory" letter="d">répertoire</message>
+        <message id="htaccess" letter="h">.htaccess</message>
 
         <!-- Used for directive lists -->
         <message id="directives">Directives</message>
@@ -121,7 +128,8 @@
         <message id="sitemap">Plan du site</message>
 
         <!-- footer line -->
-        <message id="licensed">Autorisé sous</message>
+        <message id="before-license">Autorisé sous</message>
+        <message id="after-license"></message>
         <message id="langavail">Langues Disponibles</message>
  
         <!-- not up to date -->

diff --git a/docs/manual/style/lang/ja.xml b/docs/manual/style/lang/ja.xml
index f2d0f1f8e95e54f623adbb452ea8a5c09958cccf..05222d40d94adeb210a2b153bbbaf355743eea90 100644 (file)
--- a/docs/manual/style/lang/ja.xml
+++ b/docs/manual/style/lang/ja.xml
@@ -69,11 +69,18 @@
         <message id="status">\e$B%9%F!<%?%9\e(B</message>
         <message id="module">\e$B%b%8%e!<%k\e(B</message>
 
+        <!-- Status descriptions -->
+        <message id="base" letter="B">Base</message>
+        <message id="mpm" letter="M">MPM</message>
+        <message id="core" letter="C">Core</message>
+        <message id="extension" letter="E">Extension</message>
+        <message id="experimental" letter="X">Experimental</message>
+
         <!-- Used in directive context lists -->
-        <message id="serverconfig">\e$B%5!<%P@_Dj%U%!%$%k\e(B</message>
-        <message id="virtualhost">\e$B%P!<%A%c%k%[%9%H\e(B</message>
-        <message id="directory">\e$B%G%#%l%/%H%j\e(B</message>
-        <message id="htaccess">.htaccess</message>
+        <message id="serverconfig" letter="s">\e$B%5!<%P@_Dj%U%!%$%k\e(B</message>
+        <message id="virtualhost" letter="v">\e$B%P!<%A%c%k%[%9%H\e(B</message>
+        <message id="directory" letter="d">\e$B%G%#%l%/%H%j\e(B</message>
+        <message id="htaccess" letter="h">.htaccess</message>
 
         <!-- Used for directive lists -->
         <message id="directives">\e$B%G%#%l%/%F%#%V\e(B</message>
@@ -108,7 +115,8 @@
         <message id="sitemap">\e$B%5%$%H%^%C%W\e(B</message>
 
         <!-- footer line -->
-        <message id="licensed">Licensed under the</message>
+        <message id="before-license">Licensed under the</message>
+        <message id="after-license"></message>
         <message id="langavail">Available Languages</message>
 
         <!-- not up to date -->

diff --git a/docs/manual/style/lang/ko.xml b/docs/manual/style/lang/ko.xml
index 036cbf890bae45a6f178e5189351fd26dae57da2..49784bbaacc17f417d414e2bd6bf9ea2441af3f0 100644 (file)
--- a/docs/manual/style/lang/ko.xml
+++ b/docs/manual/style/lang/ko.xml
@@ -77,11 +77,18 @@
         <message id="status">»óÅÂ</message>
         <message id="module">¸ðµâ</message>
 
+        <!-- Status descriptions -->
+        <message id="base" letter="B">Base</message>
+        <message id="mpm" letter="M">MPM</message>
+        <message id="core" letter="C">Core</message>
+        <message id="extension" letter="E">Extension</message>
+        <message id="experimental" letter="X">Experimental</message>
+
         <!-- Used in directive context lists -->
-        <message id="serverconfig">ÁÖ¼­¹ö¼³Á¤</message>
-        <message id="virtualhost">°¡»óÈ£½ºÆ®</message>
-        <message id="directory">directory</message>
-        <message id="htaccess">.htaccess</message>
+        <message id="serverconfig" letter="s">ÁÖ¼­¹ö¼³Á¤</message>
+        <message id="virtualhost" letter="v">°¡»óÈ£½ºÆ®</message>
+        <message id="directory" letter="d">directory</message>
+        <message id="htaccess" letter="h">.htaccess</message>
 
         <!-- Used for directive lists -->
         <message id="directives">Áö½Ã¾îµé</message>
@@ -123,7 +130,8 @@
         <message id="sitemap">»çÀÌÆ®¸Ê</message>
 
         <!-- footer line -->
-        <message id="licensed">Licensed under the</message>
+        <message id="before-license">Licensed under the</message>
+        <message id="after-license"></message>
         <message id="langavail">°¡´ÉÇÑ ¾ð¾î</message>
 
         <!-- not up to date -->

diff --git a/docs/manual/style/lang/ru.xml b/docs/manual/style/lang/ru.xml
index 9f9ef32ba88145f6c19f47ae35c7b8cf3b7552bb..a112312e552717ee40a10af5f255c59d3fde84f1 100644 (file)
--- a/docs/manual/style/lang/ru.xml
+++ b/docs/manual/style/lang/ru.xml
@@ -73,11 +73,18 @@
         <message id="status">óÔÁÔÕÓ</message>
         <message id="module">íÏÄÕÌØ</message>
  
+        <!-- Status descriptions -->
+        <message id="base" letter="B">Base</message>
+        <message id="mpm" letter="M">MPM</message>
+        <message id="core" letter="C">Core</message>
+        <message id="extension" letter="E">Extension</message>
+        <message id="experimental" letter="X">Experimental</message>
+
         <!-- Used in directive context lists -->
-        <message id="serverconfig">server config</message>
-        <message id="virtualhost">virtual host</message>
-        <message id="directory">directory</message>
-        <message id="htaccess">.htaccess</message>
+        <message id="serverconfig" letter="s">server config</message>
+        <message id="virtualhost" letter="v">virtual host</message>
+        <message id="directory" letter="d">directory</message>
+        <message id="htaccess" letter="h">.htaccess</message>
  
         <!-- Used for directive lists -->
         <message id="directives">äÉÒÅËÔÉ×Ù</message>
@@ -112,7 +119,8 @@
         <message id="sitemap">ëÁÒÔÁ ÓÁÊÔÁ</message>
 
         <!-- footer line -->
-        <message id="licensed">Licensed under the</message>
+        <message id="before-license">Licensed under the</message>
+        <message id="after-license"></message>
         <message id="langavail">äÏÓÔÕÐÎÙÅ ÑÚÙËÉ</message>
 
         <!-- not up to date -->

diff --git a/docs/manual/style/lang/tr.xml b/docs/manual/style/lang/tr.xml
index 2b72b856469c24dcf81429be2e4e1f17bda28125..d00f811c3a12fb611e8a9bfe77cde4cdde9a2b6c 100644 (file)
--- a/docs/manual/style/lang/tr.xml
+++ b/docs/manual/style/lang/tr.xml
@@ -26,13 +26,13 @@
     <name>Turkish</name>
     <charset>UTF-8</charset>
     <source-ext>.xml.tr</source-ext>
-    <target-ext>.html.tr</target-ext>
+    <target-ext>.html.tr.utf8</target-ext>
 
     <chm>
         <lang>0x41f Turkish</lang>
         <toc-font>,8,0</toc-font>
         <charset>windows-1254</charset>
-        <settings>Türkçe</settings>
+        <settings>Turkish</settings>
     </chm>
 
     <man>
@@ -78,11 +78,18 @@
         <message id="status">Durum</message>
         <message id="module">Modül</message>
 
+        <!-- Status descriptions -->
+        <message id="base" letter="T">Temel</message>
+        <message id="mpm" letter="M">MPM</message>
+        <message id="core" letter="Ç">Çekirdek</message>
+        <message id="extension" letter="E">Eklenti</message>
+        <message id="experimental" letter="D">Deneysel</message>
+
         <!-- Used in directive context lists -->
-        <message id="serverconfig">sunucu yapılandırması</message>
-        <message id="virtualhost">sanal konak</message>
-        <message id="directory">dizin</message>
-        <message id="htaccess">.htaccess</message>
+        <message id="serverconfig" letter="s">sunucu yapılandırması</message>
+        <message id="virtualhost" letter="k">sanal konak</message>
+        <message id="directory" letter="d">dizin</message>
+        <message id="htaccess" letter="h">.htaccess</message>
 
         <!-- Used for directive lists -->
         <message id="directives">Yönergeler</message>
@@ -121,7 +128,8 @@
         <message id="sitemap">Site Haritası</message>
 
         <!-- footer line -->
-        <message id="licensed">Lisans:</message>
+        <message id="before-license"></message>
+        <message id="after-license">altında lisanslıdır</message>
         <message id="langavail">Mevcut Diller</message>
 
         <!-- not up to date -->

diff --git a/docs/manual/style/latex/quickreference.xsl b/docs/manual/style/latex/quickreference.xsl
index 02a27e2ad804472d427df4993a6c25b3b238b89e..e69d78f9d2ee230434772635655f1e69078141f8 100644 (file)
--- a/docs/manual/style/latex/quickreference.xsl
+++ b/docs/manual/style/latex/quickreference.xsl
@@ -85,25 +85,27 @@
       </xsl:if>
 
       <xsl:text>&amp;</xsl:text>
-
-            <xsl:if test="contextlist/context
-                          [normalize-space(.)='server config']">s</xsl:if>
-            <xsl:if test="contextlist/context
-                          [normalize-space(.)='virtual host']">v</xsl:if>
-            <xsl:if test="contextlist/context
-                          [normalize-space(.)='directory']">d</xsl:if>
-            <xsl:if test="contextlist/context
-                          [normalize-space(.)='.htaccess']">h</xsl:if>
+        <xsl:if test="contextlist/context
+                      [normalize-space(.)='server config']">
+            <xsl:value-of select="$message[@id='serverconfig']/@letter"/>
+        </xsl:if>
+        <xsl:if test="contextlist/context
+                      [normalize-space(.)='virtual host']">
+            <xsl:value-of select="$message[@id='virtualhost']/@letter"/>
+        </xsl:if>
+        <xsl:if test="contextlist/context
+                      [normalize-space(.)='directory']">
+            <xsl:value-of select="$message[@id='directory']/@letter"/>
+        </xsl:if>
+        <xsl:if test="contextlist/context
+                      [normalize-space(.)='.htaccess']">
+            <xsl:value-of select="$message[@id='htaccess']/@letter"/>
+        </xsl:if>
 
       <xsl:text>&amp;</xsl:text>
-            <xsl:choose>
-            <xsl:when test="../status='Base'">B</xsl:when>
-            <xsl:when test="../status='MPM'">M</xsl:when>
-            <xsl:when test="../status='Core'">C</xsl:when>
-            <xsl:when test="../status='Extension'">E</xsl:when>
-            <xsl:when test="../status='Experimental'">X</xsl:when>
-            </xsl:choose>
-
+        <xsl:variable name="status" select="translate(
+            ../status, $uppercase, $lowercase)"/>
+        <xsl:value-of select="$message[@id=$status]/@letter"/>
      <xsl:text>\\*
 </xsl:text>
 
@@ -134,7 +136,9 @@
 </xsl:template>
 
 <xsl:template match="legend">
-<xsl:apply-templates/>
+<!-- TODO: This table is no longer in source file
+     <xsl:apply-templates/>
+-->
 </xsl:template>
 
 </xsl:stylesheet>

diff --git a/docs/manual/style/latex/synopsis.xsl b/docs/manual/style/latex/synopsis.xsl
index 74780ac984bf60a3af187cb8edc6eb34c2608122..dd1ddddb7feeb705a4a14e41a4ba85e6b18472fc 100644 (file)
--- a/docs/manual/style/latex/synopsis.xsl
+++ b/docs/manual/style/latex/synopsis.xsl
@@ -65,7 +65,9 @@
 
 <xsl:value-of select="$message[@id='status']" />
 <xsl:text>: &amp;</xsl:text>
-<xsl:value-of select="status" />
+    <xsl:variable name="status" select="translate(
+        status, $uppercase, $lowercase)"/>
+    <xsl:value-of select="$message[@id=$status]"/>
 <xsl:text>\\
 </xsl:text>
 
@@ -234,7 +236,9 @@
 
 <xsl:value-of select="$message[@id='status']" />
 <xsl:text>: &amp;</xsl:text>
-<xsl:value-of select="../status" />
+<xsl:variable name="status" select="translate(
+    ../status, $uppercase, $lowercase)"/>
+<xsl:value-of select="$message[@id=$status]"/>
 <xsl:text> \\
 </xsl:text>
 

diff --git a/docs/manual/style/xsl/common.xsl b/docs/manual/style/xsl/common.xsl
index fbf82475f31a928baf5497a322de21e4ecd88a52..82a11548fccb405a350d0eb8a17af5a5abe44730 100644 (file)
--- a/docs/manual/style/xsl/common.xsl
+++ b/docs/manual/style/xsl/common.xsl
@@ -278,8 +278,10 @@
 <div id="footer">&lf;
     <p class="apache">
         <xsl:text>Copyright 2008 The Apache Software Foundation.</xsl:text><br />
-        <xsl:value-of select="$message[@id='licensed']"/>
-        <xsl:text> </xsl:text>
+        <xsl:if test="normalize-space($message[@id='before-license'])">
+            <xsl:value-of select="$message[@id='before-license']"/>
+            <xsl:text> </xsl:text>
+        </xsl:if>
 
         <a href="http://www.apache.org/licenses/LICENSE-2.0">
             <xsl:if test="$ext-target">
@@ -287,6 +289,11 @@
             </xsl:if>
             <xsl:text>Apache License, Version 2.0</xsl:text>
         </a>
+        <xsl:if test="normalize-space($message[@id='after-license'])">
+            <xsl:text> </xsl:text>
+            <xsl:value-of select="$message[@id='after-license']"/>
+        </xsl:if>
+
         <xsl:text>.</xsl:text>
     </p>&lf;
 

diff --git a/docs/manual/style/xsl/quickreference.xsl b/docs/manual/style/xsl/quickreference.xsl
index cf255dcd19627405a49240244ebd7d0886fb36a6..25c249b5ecf8e1205a6bc4fb497fe1801c030a05 100644 (file)
--- a/docs/manual/style/xsl/quickreference.xsl
+++ b/docs/manual/style/xsl/quickreference.xsl
@@ -68,10 +68,102 @@
                     </span>
                 </td>&lf;
                 <td>
-                    <xsl:apply-templates select="legend/table[position()=1]" />
+                    <table>
+                    <tr>
+                        <th>
+                            <xsl:value-of
+                                select="$message[@id='serverconfig']/@letter"/>
+                        </th>
+                        <td>
+                            <xsl:value-of
+                                select="$message[@id='serverconfig']"/>
+                        </td>
+                    </tr>&lf;
+                    <tr>
+                        <th>
+                            <xsl:value-of
+                                select="$message[@id='virtualhost']/@letter"/>
+                        </th>
+                        <td>
+                            <xsl:value-of
+                                select="$message[@id='virtualhost']"/>
+                        </td>
+                    </tr>&lf;
+                    <tr>
+                        <th>
+                            <xsl:value-of
+                                select="$message[@id='directory']/@letter"/>
+                        </th>
+                        <td>
+                            <xsl:value-of
+                                select="$message[@id='directory']"/>
+                        </td>
+                    </tr>&lf;
+                    <tr>
+                        <th>
+                            <xsl:value-of
+                                select="$message[@id='htaccess']/@letter"/>
+                        </th>
+                        <td>
+                            <xsl:value-of
+                                select="$message[@id='htaccess']"/>
+                        </td>
+                    </tr>&lf;
+                    </table>
                 </td>&lf;
                 <td>
-                    <xsl:apply-templates select="legend/table[position()=2]" />
+                    <table>
+                    <tr>
+                        <th>
+                            <xsl:value-of
+                                select="$message[@id='core']/@letter"/>
+                        </th>
+                        <td>
+                            <xsl:value-of
+                                select="$message[@id='core']"/>
+                        </td>
+                    </tr>&lf;
+                    <tr>
+                        <th>
+                            <xsl:value-of
+                                select="$message[@id='mpm']/@letter"/>
+                        </th>
+                        <td>
+                            <xsl:value-of
+                                select="$message[@id='mpm']"/>
+                        </td>
+                    </tr>&lf;
+                    <tr>
+                        <th>
+                            <xsl:value-of
+                                select="$message[@id='base']/@letter"/>
+                        </th>
+                        <td>
+                            <xsl:value-of
+                                select="$message[@id='base']"/>
+                        </td>
+                    </tr>&lf;
+                    <tr>
+                        <th>
+                            <xsl:value-of
+                                select="$message[@id='extension']/@letter"/>
+                        </th>
+                        <td>
+                            <xsl:value-of
+                                select="$message[@id='extension']"/>
+                        </td>
+                    </tr>&lf;
+                    <tr>
+                        <th>
+                            <xsl:value-of
+                                select="$message[@id='experimental']/@letter"/>
+                        </th>
+                        <td>
+                            <xsl:value-of
+                                select="$message[@id='experimental']"/>
+                        </td>
+                    </tr>&lf;
+                    </table>
                 </td>
             </tr>&lf;
             </table>&lf;
@@ -156,22 +248,26 @@
         </td>
         <td>
             <xsl:if test="contextlist/context
-                          [normalize-space(.)='server config']">s</xsl:if>
+                          [normalize-space(.)='server config']">
+                <xsl:value-of select="$message[@id='serverconfig']/@letter"/>
+            </xsl:if>
             <xsl:if test="contextlist/context
-                          [normalize-space(.)='virtual host']">v</xsl:if>
+                          [normalize-space(.)='virtual host']">
+                <xsl:value-of select="$message[@id='virtualhost']/@letter"/>
+            </xsl:if>
             <xsl:if test="contextlist/context
-                          [normalize-space(.)='directory']">d</xsl:if>
+                          [normalize-space(.)='directory']">
+                <xsl:value-of select="$message[@id='directory']/@letter"/>
+            </xsl:if>
             <xsl:if test="contextlist/context
-                          [normalize-space(.)='.htaccess']">h</xsl:if>
+                          [normalize-space(.)='.htaccess']">
+                <xsl:value-of select="$message[@id='htaccess']/@letter"/>
+            </xsl:if>
         </td>
         <td>
-            <xsl:choose>
-            <xsl:when test="../status='Base'">B</xsl:when>
-            <xsl:when test="../status='MPM'">M</xsl:when>
-            <xsl:when test="../status='Core'">C</xsl:when>
-            <xsl:when test="../status='Extension'">E</xsl:when>
-            <xsl:when test="../status='Experimental'">X</xsl:when>
-            </xsl:choose>
+            <xsl:variable name="status" select="translate(
+                ../status, $uppercase, $lowercase)"/>
+            <xsl:value-of select="$message[@id=$status]/@letter"/>
         </td>
     </tr>
     <tr>

diff --git a/docs/manual/style/xsl/synopsis.xsl b/docs/manual/style/xsl/synopsis.xsl
index d0769012b26e73563c4dbd537004de4be31571f1..3ddfa0e2e4020f89c574fac6e9051f2c272babb1 100644 (file)
--- a/docs/manual/style/xsl/synopsis.xsl
+++ b/docs/manual/style/xsl/synopsis.xsl
@@ -89,7 +89,9 @@
                         </a>
                     </th>
                     <td>
-                        <xsl:value-of select="status" />
+                        <xsl:variable name="status" select="translate(
+                            status, $uppercase, $lowercase)"/>
+                        <xsl:value-of select="$message[@id=$status]"/>
                     </td>
                 </tr>
 
@@ -375,7 +377,9 @@
                 </a>
             </th>
             <td>
-                <xsl:value-of select="../status" />
+                <xsl:variable name="status" select="translate(
+                    ../status, $uppercase, $lowercase)"/>
+                <xsl:value-of select="$message[@id=$status]"/>
             </td>
         </tr>&lf;