* 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/trunk@636495 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_mime.xml.ja b/docs/manual/mod/mod_mime.xml.ja
index 5276f9bffc58a77ef2aec2e8dc15fc0261c2b07d..109a92d0b7fa443771c20420de442eba4b6cfbc7 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 b12b519b32bf7de0153f083f7ae527d9a83a465d..ab4d11a45bfda6986ede204cf9549eca86a17af3 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 cc8ff4936f9aa9dac99a8c807221e04d8afe6e3d..75e2a94ae16652b0fc45558140e70c81cd32af02 100644 (file)
--- a/docs/manual/mod/quickreference.xml
+++ b/docs/manual/mod/quickreference.xml
@@ -37,24 +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>
-      <tr><th>T</th><td>External</td></tr>
-    </table>
-  </legend>
 </quickreference>

diff --git a/docs/manual/mod/quickreference.xml.de b/docs/manual/mod/quickreference.xml.de
index 87b22e5d85fbbd28e55a1246456d3ff4ea3a6d4d..6a729370e69a443480f760710946fe92185fdbde 100644 (file)
--- a/docs/manual/mod/quickreference.xml.de
+++ b/docs/manual/mod/quickreference.xml.de
@@ -39,24 +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>
-      <tr><th>T</th><td>extern</td></tr>
-    </table>
-  </legend>
 </quickreference>

diff --git a/docs/manual/mod/quickreference.xml.es b/docs/manual/mod/quickreference.xml.es
index 0f5028c0fa98206557fc1c6a83ba1e670a6ce552..2e42ab24e72b4af5b48d3c3ab532b12f1bf9381a 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 6f500daafcfa4d6427c7856c0d1c306833c416c5..8aa0046e49922d5cc390212e1f7ff0ff7003de7e 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 fa5d17501b581cafaeb6956ab54eaa61a973bde6..6a63db44d630a05bb40ee834e4ae7ad1d63b7688 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 64252bc21ead5109c07921fa3c27d4a22a758585..007c5d42c06e5372ed0fa191b63e407607688c7b 100644 (file)
--- a/docs/manual/style/lang/de.xml
+++ b/docs/manual/style/lang/de.xml
@@ -72,11 +72,19 @@
         <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>
+        <message id="external" letter="T">extern</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>
@@ -119,7 +127,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 307d44c2a0e3f0d5b6064f2756ac3f15a196f0fa..454f5ef26dac0b69d9fe422ac7de60f67396fc07 100644 (file)
--- a/docs/manual/style/lang/en.xml
+++ b/docs/manual/style/lang/en.xml
@@ -76,11 +76,19 @@
         <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>
+        <message id="external" letter="T">External</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>
@@ -120,7 +128,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 bda4a50a505543e4861a30ca65d58721b593faf2..23143dc5162ecfccea4175777bd845712e793a81 100644 (file)
--- a/docs/manual/style/lang/es.xml
+++ b/docs/manual/style/lang/es.xml
@@ -74,11 +74,19 @@
         <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>
+        <message id="external" letter="T">External</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 +126,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 bb1c600cd565680cff8d65bd9d2dddeb4ecd349a..1f7dbb4719d96aa1b119ef582ab09723fd07944b 100644 (file)
--- a/docs/manual/style/lang/fr.xml
+++ b/docs/manual/style/lang/fr.xml
@@ -78,11 +78,19 @@
         <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>
+        <message id="external" letter="T">External</message>
+
         <!-- Used in directive context lists -->
-        <message id="serverconfig">configuration du serveur</message>
-        <message id="virtualhost">serveur virtuel</message>
-        <message id="directory">r&#233;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&#233;pertoire</message>
+        <message id="htaccess" letter="h">.htaccess</message>
 
         <!-- Used for directive lists -->
         <message id="directives">Directives</message>
@@ -121,7 +129,8 @@
         <message id="sitemap">Plan du site</message>
 
         <!-- footer line -->
-        <message id="licensed">Authoris&#233; sous</message>
+        <message id="before-license">Authoris&#233; 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 613456ac0c2cb72436ab7041cd2091b169e256ef..1b2c6b6994ec616daa40178f0b458ccca5f1d7e1 100644 (file)
--- a/docs/manual/style/lang/ja.xml
+++ b/docs/manual/style/lang/ja.xml
@@ -71,11 +71,19 @@
         <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>
+        <message id="external" letter="T">External</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>
@@ -118,7 +126,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 f8afe2d6351bad2bfbf283c160cc8660e421c4e0..e9c986e6059b182a0ab19c1cdcc418a7dfeeca96 100644 (file)
--- a/docs/manual/style/lang/ko.xml
+++ b/docs/manual/style/lang/ko.xml
@@ -77,11 +77,19 @@
         <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>
+        <message id="external" letter="T">External</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 +131,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/pt-br.xml b/docs/manual/style/lang/pt-br.xml
index 3fc6836f1dcfae09da666e3d3d8b75807b8e1982..93b0c2064311ed1aaf593b4ff70db01915843035 100644 (file)
--- a/docs/manual/style/lang/pt-br.xml
+++ b/docs/manual/style/lang/pt-br.xml
@@ -79,11 +79,19 @@
         <message id="status">Status</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">Extension</message>
+        <message id="experimental" letter="X">Experimental</message>
+        <message id="external" letter="T">External</message>
+
         <!-- Used in directive context lists -->
-        <message id="serverconfig">configura&#231;&#227;o do servidor</message>
-        <message id="virtualhost">hospedeiro virtual</message>
-        <message id="directory">diret&#243;rio</message>
-        <message id="htaccess">.htaccess</message>
+        <message id="serverconfig" letter="s">configura&#231;&#227;o do servidor</message>
+        <message id="virtualhost" letter="v">hospedeiro virtual</message>
+        <message id="directory" letter="d">diret&#243;rio</message>
+        <message id="htaccess" letter="h">.htaccess</message>
 
         <!-- Used for directive lists -->
         <message id="directives">Diretrizes</message>
@@ -122,7 +130,8 @@
         <message id="sitemap">Mapa do site</message>
 
         <!-- footer line -->   
-        <message id="licensed">Licenciado sob a</message>
+        <message id="before-license">Licenciado sob a</message>
+        <message id="after-license"></message>
         <message id="langavail">L&#237;nguas Dispon&#237;veis</message>
  
         <!-- not up to date -->

diff --git a/docs/manual/style/lang/ru.xml b/docs/manual/style/lang/ru.xml
index 311343402576f292454322310e31f686b24f19af..1e9b4817265fd2fabe265b1354dcbce174bcfc5b 100644 (file)
--- a/docs/manual/style/lang/ru.xml
+++ b/docs/manual/style/lang/ru.xml
@@ -44,8 +44,10 @@
         <message id="corefeatures">ïÓÏÂÅÎÎÏÓÔÉ ÑÄÒÁ É ÍÕÌØÔÉ-ÐÒÏÃÅÓÓÎÙÅ
             ÍÏÄÕÌÉ</message>
         <message id="othermodules">äÒÕÇÉÅ ÍÏÄÕÌÉ</message>
+        <message id="obsoletemodules">Obsolete Modules</message>
 
         <!-- Used for the modulesynopsis and sitemap -->
+        <message id="obsoleteapachemodule">Obsolete Apache Module</message>
         <message id="apachemodule">íÏÄÕÌØ Apache</message>
         <message id="apachecore">ïÓÏÂÅÎÎÏÓÔÉ ÑÄÒÁ Apache</message>
         <message id="apachempmcommon">ïÂÝÉÅ ÄÌÑ ×ÓÅÈ íð-ÍÏÄÕÌÅÊ ÄÉÒÅËÔÉ×Ù
@@ -73,6 +75,20 @@
         <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>
+        <message id="external" letter="T">External</message>
+
+        <!-- Used in directive context lists -->
+        <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>
         <message id="directive">äÉÒÅËÔÉ×Á</message>
@@ -107,7 +123,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">Available Languages</message>
 
         <!-- not up to date -->

diff --git a/docs/manual/style/lang/tr.xml b/docs/manual/style/lang/tr.xml
index 2b72b856469c24dcf81429be2e4e1f17bda28125..4c47f0c05e9e63790a4b09d99052310e438119d4 100644 (file)
--- a/docs/manual/style/lang/tr.xml
+++ b/docs/manual/style/lang/tr.xml
@@ -17,7 +17,7 @@
  limitations under the License.
 -->
 <!--
-  Translated by Nilgün Belma Bugüner <nilgun (at) belgeler dot org>
+  Translated by Nilgün Belma Bugüner <nilgun (at) belgeler dot org>
   (March, 2008)
   Reviewed by Orhan Berent <berent (at) belgeler dot org>
 -->
@@ -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>
@@ -43,88 +43,97 @@
     <!-- comments...                                                      -->
     <messages>
         <!-- language link titles -->
-        <message id="nativename">Türkçe</message>
+        <message id="nativename">Türkçe</message>
 
          <!-- Used for the moduleindex -->
-        <message id="corefeatures">Temel Özellikler ve Çoklu İşlem Modülleri</message>
-        <message id="othermodules">Diğer Modüller</message>
-        <message id="obsoletemodules">Atıl Modüller</message>
+        <message id="corefeatures">Temel Özellikler ve Çoklu ¿¿lem Modülleri</message>
+        <message id="othermodules">Di¿er Modüller</message>
+        <message id="obsoletemodules">At¿l Modüller</message>
 
         <!-- Used for the modulesynopsis and sitemap -->
-        <message id="obsoleteapachemodule">Atıl Apache Modülü</message>
-        <message id="apachemodule">Apache Modülü</message>
-        <message id="apachecore">Apache Temel Özellikleri</message>
-        <message id="apachempmcommon">Apache MPM Ortak Yönergeleri</message>
+        <message id="obsoleteapachemodule">At¿l Apache Modülü</message>
+        <message id="apachemodule">Apache Modülü</message>
+        <message id="apachecore">Apache Temel Özellikleri</message>
+        <message id="apachempmcommon">Apache MPM Ortak Yönergeleri</message>
         <message id="apachempm">Apache MPM</message>
 
         <!-- Used in description box for modulesynopsis -->
-        <message id="description">Açıklama</message>
-        <message id="seealso">Ayrıca bkz,</message>
+        <message id="description">Aç¿klama</message>
+        <message id="seealso">Ayr¿ca bkz,</message>
         <message id="topics">Konular</message>
         <message id="status">Durum</message>
-        <message id="moduleidentifier">Modül&nbsp;Betimleyici</message>
-        <message id="sourcefile">Kaynak&nbsp;Dosyası</message>
+        <message id="moduleidentifier">Modül&nbsp;Betimleyici</message>
+        <message id="sourcefile">Kaynak&nbsp;Dosyas¿</message>
         <message id="compatibility">Uyumluluk</message>
 
         <!-- Used in manualpage -->
-        <message id="relatedmodules">İlgili Modüller</message>
-        <message id="relateddirectives">İlgili Yönergeler</message>
+        <message id="relatedmodules">¿lgili Modüller</message>
+        <message id="relateddirectives">¿lgili Yönergeler</message>
 
         <!-- Used in description box for directives -->
-        <message id="syntax">Sözdizimi</message>
-        <message id="default">Öntanımlı</message>
-        <message id="context">Bağlam</message>
-        <message id="override">Geçersizleştirme</message>
+        <message id="syntax">Sözdizimi</message>
+        <message id="default">Öntan¿ml¿</message>
+        <message id="context">Ba¿lam</message>
+        <message id="override">Geçersizle¿tirme</message>
         <message id="status">Durum</message>
-        <message id="module">Modül</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>
+        <message id="external" letter="H">Harici</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>
+        <message id="directives">Yönergeler</message>
         <!-- the optional attribute replace-space-with takes a string.
              if present, the space between <directive name> and 'Directive'
              in directivesynopsis headings will be replaced by the given string.
              (see de.xml for an example) -->
-        <message id="directive">Yönerge</message>
-        <message id="nodirectives">Bu modül yönerge içermez.</message>
+        <message id="directive">Yönerge</message>
+        <message id="nodirectives">Bu modül yönerge içermez.</message>
 
         <!-- Used in summaries -->
-        <message id="summary">Özet</message>
+        <message id="summary">Özet</message>
 
         <!-- Used for glossary link titles -->
-        <message id="glossarylink">sözlüğe bakınız</message>
+        <message id="glossarylink">sözlü¿e bak¿n¿z</message>
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Apache HTTP Sunucusu</message>
-        <message id="apachehttpserver">Apache HTTP Sunucusu Sürüm
+        <message id="apachehttpserver">Apache HTTP Sunucusu Sürüm
             &httpd.major;.&httpd.minor;</message>
         <message id="apachedocalt">[APACHE BELGELEME]</message>
-        <message id="search">Google’de Ara</message> <!-- search button -->
+        <message id="search">Google¿de Ara</message> <!-- search button -->
         <message id="index">Dizin</message> <!-- deprecated -->
-        <message id="home">Baş Sayfa</message> <!-- deprecated -->
+        <message id="home">Ba¿ Sayfa</message> <!-- deprecated -->
 
         <!-- breadcrumb links -->
         <message id="apache">Apache</message>
         <message id="http-server">HTTP Sunucusu</message>
         <message id="documentation">Belgeleme</message>
-        <message id="version">Sürüm &httpd.major;.&httpd.minor;</message>
+        <message id="version">Sürüm &httpd.major;.&httpd.minor;</message>
 
         <!-- super menu -->
-        <message id="modules">Modüller</message>
+        <message id="modules">Modüller</message>
         <message id="faq">SSS</message>
         <message id="glossary">Terimler</message>
-        <message id="sitemap">Site Haritası</message>
+        <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 -->
-        <message id="outofdate">Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.</message>
+        <message id="outofdate">Bu çeviri güncel olmayabilir. Son de¿i¿iklikler için ¿ngilizce sürüm geçerlidir.</message>
     </messages>
 </language>

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 09a2e13c0067f492e8a75e63c0f234b8a38881e7..0ba2fd431e935363da76b830cf2f60bf4959e59a 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 26c08c64d181cbc7da5dedaadd379521945146d1..9af5bac3d3e42b7866f6db3c7c47b9f6ef1f9757 100644 (file)
--- a/docs/manual/style/xsl/quickreference.xsl
+++ b/docs/manual/style/xsl/quickreference.xsl
@@ -68,10 +68,112 @@
                     </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;
+                    <tr>
+                        <th>
+                            <xsl:value-of
+                                select="$message[@id='external']/@letter"/>
+                        </th>
+                        <td>
+                            <xsl:value-of
+                                select="$message[@id='external']"/>
+                        </td>
+                    </tr>&lf;
+                    </table>
                 </td>
             </tr>&lf;
             </table>&lf;
@@ -156,29 +258,42 @@
         </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:when test="../status='External'">
                 <xsl:choose>
                 <xsl:when test="../status/@href">
-                    <a href="{../status/@href}">T</a>
+                    <a href="{../status/@href}">
+                        <xsl:value-of
+                            select="$message[@id='external']/@letter"/>
+                    </a>
                 </xsl:when>
-                <xsl:otherwise>T</xsl:otherwise>
+                <xsl:otherwise>
+                    <xsl:value-of select="$message[@id='external']/@letter"/>
+                </xsl:otherwise>
                 </xsl:choose>
             </xsl:when>
+            <xsl:otherwise>
+                <xsl:variable name="status" select="translate(
+                    ../status, $uppercase, $lowercase)"/>
+                <xsl:value-of select="$message[@id=$status]/@letter"/>
+            </xsl:otherwise>
             </xsl:choose>
         </td>
     </tr>

diff --git a/docs/manual/style/xsl/synopsis.xsl b/docs/manual/style/xsl/synopsis.xsl
index dbda9d0710b5c37e7d137c317194f5fee704b494..ffa18e0e029c3b9021aea6abdbe458ab45de6dbf 100644 (file)
--- a/docs/manual/style/xsl/synopsis.xsl
+++ b/docs/manual/style/xsl/synopsis.xsl
@@ -89,14 +89,17 @@
                         </a>
                     </th>
                     <td>
+                        <xsl:variable name="status" select="translate(
+                            status, $uppercase, $lowercase)"/>
                         <xsl:choose>
                         <xsl:when test="status = 'External' and status/@href">
                             <a href="{status/@href}">
-                                <xsl:value-of select="status" />
+                                <xsl:value-of select="$message[@id=$status]"/>
                             </a>
                         </xsl:when>
                         <xsl:otherwise>
-                            <xsl:value-of select="status" />
+                            <xsl:value-of
+                                select="$message[@id=$status]"/>
                         </xsl:otherwise>
                         </xsl:choose>
                     </td>
@@ -384,7 +387,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;