Reverting files checked in by mistake

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

diff --git a/docs/manual/style/build.properties b/docs/manual/style/build.properties
index c8a1a385793467b53ff946b0b1992a18dc8742d1..164820a0ae020c8191e7b4184901279bc0a5ed55 100644 (file)
--- a/docs/manual/style/build.properties
+++ b/docs/manual/style/build.properties
@@ -1,8 +1,7 @@
 # This file contains version specific properties
 
 # No xml files yet
-noxml.ja=howto/auth.html.ja.euc-jp developer/modules.html.ja.euc-jp
 noxml.fr=new_features_2_0.html.fr upgrading.html.fr
 
 # (pending) httpd version
-httpd.version=2.0.51
+httpd.version=2.1.0-dev

diff --git a/docs/manual/style/css/manual-zip.css b/docs/manual/style/css/manual-zip.css
index ee965291016e5adb71c9443b0d4adbc3c596e5f3..4677c775215e4d79e3645b3cb46de143dd7eb8a5 100644 (file)
--- a/docs/manual/style/css/manual-zip.css
+++ b/docs/manual/style/css/manual-zip.css
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+
 h1 {
     margin: 0 0 0.5em 0;
 }

diff --git a/docs/manual/style/lang-targets.xml b/docs/manual/style/lang-targets.xml
index d08514c3249eef9c5d997cc4f9af1a043afc15ac..9a4fd9677f6a1e6dc9948152097ea1e7a689a50a 100644 (file)
--- a/docs/manual/style/lang-targets.xml
+++ b/docs/manual/style/lang-targets.xml
@@ -21,8 +21,8 @@
 <!-- ==================================================================== -->
 <project name="lang-targets">
 
-<target description="- builds all HTML files and nroff man pages" name="all" depends="de, en, es, ja, ko, ru"/>
-<target description="- builds all zip download packages" name="zip-all" depends="zip-de, zip-en, zip-es, zip-ja, zip-ko, zip-ru"/>
+<target description="- builds all HTML files and nroff man pages" name="all" depends="de, en, es, fr, ja, ko, ru"/>
+<target description="- builds all zip download packages" name="zip-all" depends="zip-de, zip-en, zip-es, zip-fr, zip-ja, zip-ko, zip-ru"/>
 
 <!-- German                                                               -->
 <!-- ==================================================================== -->
@@ -76,6 +76,18 @@
     <chm.generic lang="es"/>
 </target>
 
+<!-- French                                                               -->
+<!-- ==================================================================== -->
+<property value=".xml.fr" name="inputext.fr"/>
+<property value=".html.fr" name="outputext.fr"/>
+
+<target description="- builds French HTML files" name="fr">
+    <html.generic lang="fr"/>
+</target>
+<target description="- builds the French zipped download package" name="zip-fr">
+    <zip.generic lang="fr"/>
+</target>
+
 <!-- Japanese                                                             -->
 <!-- ==================================================================== -->
 <property value=".xml.ja" name="inputext.ja"/>
@@ -129,6 +141,7 @@
             <include name="**/*.xml.de"/>
             <include name="**/*.xml"/>
             <include name="**/*.xml.es"/>
+            <include name="**/*.xml.fr"/>
             <include name="**/*.xml.ja"/>
             <include name="**/*.xml.ko"/>
             <include name="**/*.xml.ru"/>

diff --git a/docs/manual/style/lang/de.xml b/docs/manual/style/lang/de.xml
index ad92b61f594d4b9945b6b44566a2ceb1265b9af0..42b84d477e77b95601bad6014bcdf9657ea82235 100644 (file)
--- a/docs/manual/style/lang/de.xml
+++ b/docs/manual/style/lang/de.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE messages [ <!ENTITY nbsp "&#160;"> ]>
-<!-- English revision: 1.6.2.4 -->
+<!DOCTYPE language [ <!ENTITY nbsp "&#160;"> ]>
+<!-- English Revision: 1.9 -->
 
 <!--
  Copyright 2002-2004 The Apache Software Foundation
@@ -84,7 +84,8 @@
              in directivesynopsis headings will be replaced by the given string.
              (see de.xml for an example) -->
         <message id="directive" replace-space-with="-">Direktive</message>
-        <message id="nodirectives">Dieses Modul enth&#228;lt keine Direktiven.</message>
+        <message id="nodirectives">Dieses Modul enth&#228;lt keine
+            Direktiven.</message>
 
         <!-- Used in summaries -->
         <message id="summary">Zusammenfassung</message>
@@ -94,7 +95,8 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Apache HTTP Server</message>
-        <message id="apachehttpserver">Apache HTTP Server Version 2.0</message>
+        <message id="apachehttpserver">Apache HTTP Server Version
+            2.1</message>
         <message id="apachedocalt">[APACHE DOCUMENTATION]</message>
         <message id="search">Google-Suche</message> <!-- search button -->
         <message id="index">Index</message> <!-- deprecated -->
@@ -104,7 +106,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">HTTP-Server</message>
         <message id="documentation">Dokumentation</message>
-        <message id="version">Version 2.0</message>
+        <message id="version">Version 2.1</message>
 
         <!-- super menu -->
         <message id="modules">Module</message>

diff --git a/docs/manual/style/lang/en.xml b/docs/manual/style/lang/en.xml
index 97a3d948ee9f6983a2dd7ba5dd1538b571866af8..e4cbad57931d01c3ddc2d43196485ded2567ba4d 100644 (file)
--- a/docs/manual/style/lang/en.xml
+++ b/docs/manual/style/lang/en.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE messages [ <!ENTITY nbsp "&#160;"> ]>
+<!DOCTYPE language [ <!ENTITY nbsp "&#160;"> ]>
+<!-- $Revision: 1.20 $ -->
 
 <!--
  Copyright 2002-2004 The Apache Software Foundation
@@ -40,7 +41,7 @@
         <!-- language link titles -->
         <message id="nativename">English</message>
 
-         <!-- Used for the moduleindex -->
+        <!-- Used for the moduleindex -->
         <message id="corefeatures">Core Features and Multi-Processing
             Modules</message>
         <message id="othermodules">Other Modules</message>
@@ -87,14 +88,15 @@
              in directivesynopsis headings will be replaced by the given string.
              (see de.xml for an example) -->
         <message id="directive">Directive</message>
-        <message id="nodirectives">This module provides no directives.</message>
+        <message id="nodirectives">This module provides no
+            directives.</message>
 
         <!-- Used in summaries -->
         <message id="summary">Summary</message>
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Apache HTTP Server</message>
-        <message id="apachehttpserver">Apache HTTP Server Version 2.0</message>
+        <message id="apachehttpserver">Apache HTTP Server Version 2.1</message>
         <message id="apachedocalt">[APACHE DOCUMENTATION]</message>
         <message id="search">Google Search</message> <!-- search button -->
         <message id="index">Index</message> <!-- deprecated -->
@@ -104,7 +106,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">HTTP Server</message>
         <message id="documentation">Documentation</message>
-        <message id="version">Version 2.0</message>
+        <message id="version">Version 2.1</message>
 
         <!-- super menu -->
         <message id="modules">Modules</message>

diff --git a/docs/manual/style/lang/fr.xml b/docs/manual/style/lang/fr.xml
index ac7b94fd899940322a4171cc71d4f5bf04140132..4a419bf0575981ea3268f78f38344b89af95542a 100644 (file)
--- a/docs/manual/style/lang/fr.xml
+++ b/docs/manual/style/lang/fr.xml
@@ -23,7 +23,7 @@
     <source-ext>.xml.fr</source-ext>
     <target-ext>.html.fr</target-ext>
 
-<!-- No sitemap so far
+<!-- No sitemap -> no CHM
     <chm>
         <lang>0x40c French (France)</lang>
         <toc-font>,8,0</toc-font>
@@ -31,4 +31,95 @@
         <settings>French (France)</settings>
     </chm>
 -->
+
+<!-- currently no deployment of non-english man pages
+    <man>
+        <charset>ISO-8859-1</charset>
+    </man>
+-->
+    <!-- Some strings might be used in other contexts, than stated in the -->
+    <!-- comments...                                                      -->
+    <messages>
+        <!-- language link titles -->
+        <message id="nativename">Fran&#231;ais</message>
+
+        <!-- Used for the moduleindex -->
+        <message id="corefeatures">Fonctionalit&#233;s de Base et Modules Multi-Processus (MPM)</message>
+        <message id="othermodules">Autres Modules</message>
+        <message id="obsoletemodules">Modules D&#233;suets</message>
+
+        <!-- Used for the modulesynopsis and sitemap -->
+        <message id="obsoleteapachemodule">Module Apache D&#233;suet</message>
+        <message id="apachemodule">Mudule Apache</message>
+        <message id="apachecore">Fonctionalit&#233;s de Base Apache</message>
+        <message id="apachempmcommon">Apache MPM: Directives Communes</message>
+        <message id="apachempm">Apache MPM</message>
+
+        <!-- Used in description box for modulesynopsis -->
+        <message id="description">Description</message>
+        <message id="seealso">Voir aussi</message>
+        <message id="topics">Sujets</message>
+        <message id="status">Status</message>
+        <message id="moduleidentifier">Identificateur&nbsp;de&nbsp;Module</message>
+        <message id="sourcefile">Fichier&nbsp;Source</message>
+        <message id="compatibility">Compatibilit&#233;</message>
+
+        <!-- Used in manualpage -->
+        <message id="relatedmodules">Modules Apparent&#233;s</message>
+        <message id="relateddirectives">Directives Apparent&#233;es</message>
+
+        <!-- Used in description box for directives -->
+        <message id="syntax">Syntaxe</message>
+        <message id="default">Defaut</message>
+        <message id="context">Contexte</message>
+        <message id="override">Annuler</message>
+        <message id="status">Status</message>
+        <message id="module">Module</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>
+
+        <!-- Used for directive lists -->
+        <message id="directives">Directives</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">Directive</message>
+        <message id="nodirectives">Ce module ne fournit aucune directive.</message>
+
+        <!-- Used in summaries -->
+        <message id="summary">Sommaire</message>
+
+        <!-- Used in headers and footers -->
+        <message id="apachetitle">- Serveur Apache HTTP</message>
+        <message id="apachehttpserver">Serveur Apache HTTP Version 2.1</message>
+        <message id="apachedocalt">[DOCUMENTATION APACHE]</message>
+        <message id="search">Recherche Google</message> <!-- search button -->
+        <message id="index">Index</message> <!-- deprecated -->
+        <message id="home">Accueil</message> <!-- deprecated -->
+
+        <!-- breadcrumb links -->
+        <message id="apache">Apache</message>
+        <message id="http-server">Serveur HTTP</message>
+        <message id="documentation">Documentation</message>
+        <message id="version">Version 2.1</message>
+
+        <!-- super menu -->
+        <message id="modules">Modules</message>
+        <message id="faq">FAQ</message>
+        <message id="glossary">Glossaire</message>
+        <message id="sitemap">Plan du site</message>
+
+        <!-- footer line -->
+        <message id="licensed">Authoris&#233; sous</message>
+        <message id="langavail">Langues Disponibles</message>
+ 
+        <!-- not up to date -->
+        <message id="outofdate">Cette traduction peut &#234;tre p&#233;rim&#233;e. Verifiez la version
+            Anglaise pour les changements r&#233;cents.</message>
+    </messages>
 </language>

diff --git a/docs/manual/style/lang/ja.xml b/docs/manual/style/lang/ja.xml
index 640f8cca3dffe5abf08336b495975e419c25e3ae..c5dfd179d5aa6e2ddcd2d1f428cdb09de79aa724 100644 (file)
--- a/docs/manual/style/lang/ja.xml
+++ b/docs/manual/style/lang/ja.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
-<!DOCTYPE messages [ <!ENTITY nbsp "&#160;"> ]>
+<!DOCTYPE language [ <!ENTITY nbsp "&#160;"> ]>
 <!-- English revision: 1.5 -->
 
 <!--
@@ -37,7 +37,7 @@
         <!-- language link titles -->
         <message id="nativename">Japanese</message>
 
-         <!-- Used for the moduleindex -->
+        <!-- Used for the moduleindex -->
         <message id="corefeatures">\e$B%3%"5!G=$H\e(B MPM</message>
         <message id="othermodules">\e$BB>$N%b%8%e!<%k\e(B</message>
 
@@ -84,7 +84,7 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Apache HTTP \e$B%5!<%P\e(B</message>
-        <message id="apachehttpserver">Apache HTTP \e$B%5!<%P\e(B \e$B%P!<%8%g%s\e(B 2.0</message>
+        <message id="apachehttpserver">Apache HTTP \e$B%5!<%P\e(B \e$B%P!<%8%g%s\e(B 2.1</message>
         <message id="apachedocalt">[APACHE DOCUMENTATION]</message>
         <message id="search">Google Search</message> <!-- search button -->
         <message id="index">\e$B:w0z\e(B</message> <!-- deprecated -->
@@ -94,7 +94,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">HTTP \e$B%5!<%P\e(B</message>
         <message id="documentation">\e$B%I%-%e%a%s%F!<%7%g%s\e(B</message>
-        <message id="version">\e$B%P!<%8%g%s\e(B 2.0</message>
+        <message id="version">\e$B%P!<%8%g%s\e(B 2.1</message>
 
         <!-- super menu -->
         <message id="modules">\e$B%b%8%e!<%k\e(B</message>

diff --git a/docs/manual/style/lang/ko.xml b/docs/manual/style/lang/ko.xml
index 8addc386914851b3dce5426aa7f4930997b62bba..83a6587223c9384e87989e910edd7d4708d32641 100644 (file)
--- a/docs/manual/style/lang/ko.xml
+++ b/docs/manual/style/lang/ko.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-KR"?>
 <!DOCTYPE language [ <!ENTITY nbsp "&#160;"> ]>
-<!-- English Revision: 1.6.2.10 -->
+<!-- English Revision: 1.18 -->
 
 <!--
  Copyright 2003-2004 The Apache Software Foundation
@@ -43,7 +43,7 @@
         <!-- language link titles -->
         <message id="nativename">Korean</message>
 
-         <!-- Used for the moduleindex -->
+        <!-- Used for the moduleindex -->
         <message id="corefeatures">ÇÙ½É ±â´É°ú ´ÙÁßó¸® ¸ðµâ</message>
         <message id="othermodules">´Ù¸¥ ¸ðµâ</message>
         <message id="obsoletemodules">ÀÌÀü ¸ðµâ</message>
@@ -99,7 +99,7 @@
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Apache HTTP Server</message>
-        <message id="apachehttpserver">Apache HTTP Server Version 2.0</message>
+        <message id="apachehttpserver">Apache HTTP Server Version 2.1</message>
         <message id="apachedocalt">[APACHE DOCUMENTATION]</message>
         <message id="search">Google °Ë»ö</message> <!-- search button -->
         <message id="index">Index</message> <!-- deprecated -->
@@ -109,7 +109,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">HTTP Server</message>
         <message id="documentation">Documentation</message>
-        <message id="version">Version 2.0</message>
+        <message id="version">Version 2.1</message>
 
         <!-- super menu -->
         <message id="modules">¸ðµâ</message>

diff --git a/docs/manual/style/lang/ru.xml b/docs/manual/style/lang/ru.xml
index 4e1b1440a491e0f3de4d5062b2e6bdbb9add9fc7..30ebbab18063eb64abc86a1de384b435af16bf58 100644 (file)
--- a/docs/manual/style/lang/ru.xml
+++ b/docs/manual/style/lang/ru.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="KOI8-R"?>
-<!DOCTYPE messages [ <!ENTITY nbsp "&#160;"> ]>
+<!DOCTYPE language [ <!ENTITY nbsp "&#160;"> ]>
 <!-- English revision: 1.4 -->
 
 <!--
@@ -40,15 +40,15 @@
         <message id="nativename">Russian</message>
 
         <!-- Used for the moduleindex -->
-        <message id="corefeatures">ñÄÒÏ É ÍÕÌØÔÉ-ÐÒÏÃÅÓÓÎÙÅ ÍÏÄÕÌÉ</message>
+        <message id="corefeatures">ïÓÏÂÅÎÎÏÓÔÉ ÑÄÒÁ É ÍÕÌØÔÉ-ÐÒÏÃÅÓÓÎÙÅ
+            ÍÏÄÕÌÉ</message>
         <message id="othermodules">äÒÕÇÉÅ ÍÏÄÕÌÉ</message>
-        <message id="obsoletemodules">õÓÔÁÒÅ×ÛÉÅ ÍÏÄÕÌÉ</message>
 
         <!-- Used for the modulesynopsis and sitemap -->
-        <message id="obsoleteapachemodule">õÓÔÁÒÅ×ÛÉÊ ÍÏÄÕÌØ Apache</message>
         <message id="apachemodule">íÏÄÕÌØ Apache</message>
-        <message id="apachecore">ñÄÒÏ Apache</message>
-        <message id="apachempmcommon">ïÂÝÉÅ ÄÌÑ ×ÓÅÈ íð-ÍÏÄÕÌÅÊ ÄÉÒÅËÔÉ×Ù Apache</message>
+        <message id="apachecore">ïÓÏÂÅÎÎÏÓÔÉ ÑÄÒÁ Apache</message>
+        <message id="apachempmcommon">ïÂÝÉÅ ÄÌÑ ×ÓÅÈ íð-ÍÏÄÕÌÅÊ ÄÉÒÅËÔÉ×Ù
+            Apache</message>
         <message id="apachempm">íÕÌØÔÉ-ÐÒÏÃÅÓÓÎÙÅ ÍÏÄÕÌÉ Apache</message>
 
         <!-- Used in description box for modulesynopsis -->
@@ -71,26 +71,21 @@
         <message id="override">òÁÚÒÅÛÅÎÉÅ</message>
         <message id="status">óÔÁÔÕÓ</message>
         <message id="module">íÏÄÕÌØ</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>
- 
+
         <!-- Used for directive lists -->
         <message id="directives">äÉÒÅËÔÉ×Ù</message>
         <message id="directive">äÉÒÅËÔÉ×Á</message>
-        <message id="nodirectives">üÔÏÔ ÍÏÄÕÌØ ÎÅ ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ÎÉËÁËÉÈ ÄÉÒÅËÔÉ×.</message>
+        <message id="nodirectives">üÔÏÔ ÍÏÄÕÌØ ÎÅ ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ÎÉËÁËÉÈ
+            ÄÉÒÅËÔÉ×.</message>
 
         <!-- Used in summaries -->
         <message id="summary">òÅÚÀÍÅ</message>
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- HTTP ÓÅÒ×ÅÒ Apache</message>
-        <message id="apachehttpserver">HTTP ÓÅÒ×ÅÒ Apache ×ÅÒÓÉÉ 2.0</message>
+        <message id="apachehttpserver">HTTP ÓÅÒ×ÅÒ Apache ÷ÅÒÓÉÑ 2.1</message>
         <message id="apachedocalt">[äïëõíåîôáãéñ APACHE]</message>
-        <message id="search">ðÏÉÓË × Google</message> <!-- search button -->
+        <message id="search">Google Search</message> <!-- search button -->
         <message id="index">ïÇÌÁ×ÌÅÎÉÅ</message> <!-- deprecated -->
         <message id="home">îÁ ÇÌÁ×ÎÕÀ ÓÔÒÁÎÉÃÕ</message> <!-- deprecated -->
 
@@ -98,7 +93,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">HTTP ÓÅÒ×ÅÒ</message>
         <message id="documentation">äÏËÕÍÅÎÔÁÃÉÑ</message>
-        <message id="version">÷ÅÒÓÉÑ 2.0</message>
+        <message id="version">÷ÅÒÓÉÑ 2.1</message>
 
         <!-- super menu -->
         <message id="modules">íÏÄÕÌÉ</message>
@@ -108,7 +103,7 @@
 
         <!-- footer line -->
         <message id="licensed">Licensed under the</message>
-        <message id="langavail">äÏÓÔÕÐÎÙÅ ÑÚÙËÉ</message>
+        <message id="langavail">Available Languages</message>
 
         <!-- not up to date -->
         <message id="outofdate">This translation may be out of date. Check the

diff --git a/docs/manual/style/xsl/common.xsl b/docs/manual/style/xsl/common.xsl
index 7a384a1da96f1573f870464e50bef15314fcfc0d..3e801f5698c2abc6c2affa9a92f84ce78e2ac68e 100644 (file)
--- a/docs/manual/style/xsl/common.xsl
+++ b/docs/manual/style/xsl/common.xsl
@@ -325,17 +325,10 @@
                     <xsl:attribute name="rel">alternate</xsl:attribute>
                 </xsl:if>
                 <xsl:attribute name="title">
-                    <xsl:choose>
-                    <xsl:when test=". != 'fr'"> <!-- no language file avail. -->
-                        <xsl:value-of select="document(concat('../lang/', .,
-                                                       '.xml'))
-                                              /language/messages/message
-                                              [@id='nativename']" />
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:text>Fran&#231;ais</xsl:text>
-                    </xsl:otherwise>
-                    </xsl:choose>
+                    <xsl:value-of select="document(concat('../lang/', .,
+                                                   '.xml'))
+                                          /language/messages/message
+                                          [@id='nativename']" />
                 </xsl:attribute>
 
                 &nbsp;