Sync the all_in_one index page with the regular index page and

update transformations.

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

diff --git a/docs/manual/faq/all_in_one.html.en b/docs/manual/faq/all_in_one.html.en
index 182b56f37c37fe6c2c3f75186e2c27cbd5f003d4..3dcdea6cf9102ed0a4d7c2ef9052d133d389bfbe 100644 (file)
--- a/docs/manual/faq/all_in_one.html.en
+++ b/docs/manual/faq/all_in_one.html.en
@@ -26,10 +26,9 @@
     <p>The latest version of this FAQ is always available from the main Apache
     web site, at &lt;<a href="http://httpd.apache.org/docs-2.1/faq/">http://httpd.apache.org/docs-2.1/faq/</a>&gt;.</p>
 
-    <p>Since Apache 2.0 is quite new, we don't yet know what the <em>Frequently
-    Asked Questions</em> will be. While this section fills up, you should also
-    consult the <a href="http://httpd.apache.org/docs/misc/FAQ.html">Apache 1.3
-    FAQ</a> to see if your question is answered there.</p>
+    <p>If you don't find the answer to your question in the below
+    sections, please also consult the <a href="http://httpd.apache.org/docs/misc/FAQ.html">Apache 1.3
+    FAQ</a> to see if your question is answered there.</p> 
 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#topics">Topics</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#background">Background</a></li>

diff --git a/docs/manual/faq/all_in_one.xml b/docs/manual/faq/all_in_one.xml
index f4c210940d2fc5d9be15d0541bae6c07d5eaa902..af90ad04b50b75106e37f9101b5e32eca368d104 100644 (file)
--- a/docs/manual/faq/all_in_one.xml
+++ b/docs/manual/faq/all_in_one.xml
@@ -32,10 +32,10 @@
     web site, at &lt;<a href="http://httpd.apache.org/docs-2.1/faq/"
     >http://httpd.apache.org/docs-2.1/faq/</a>&gt;.</p>
 
-    <p>Since Apache 2.0 is quite new, we don't yet know what the <em>Frequently
-    Asked Questions</em> will be. While this section fills up, you should also
-    consult the <a href="http://httpd.apache.org/docs/misc/FAQ.html">Apache 1.3
-    FAQ</a> to see if your question is answered there.</p>
+    <p>If you don't find the answer to your question in the below
+    sections, please also consult the <a
+    href="http://httpd.apache.org/docs/misc/FAQ.html">Apache 1.3
+    FAQ</a> to see if your question is answered there.</p> 
 </summary>
 
 &categories;

diff --git a/docs/manual/faq/error.xml.ja b/docs/manual/faq/error.xml.ja
index 6c781a9e4c75feecf7f6ed80562a1a35d4c34bbf..08c6a46a026aac87643eaafcc1aac9dc1f168036 100644 (file)
--- a/docs/manual/faq/error.xml.ja
+++ b/docs/manual/faq/error.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp" ?>
 <!DOCTYPE faq SYSTEM "../style/faq.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<!-- English Revision: 151408 -->
+<!-- English Revision: 151408:240301 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,

diff --git a/docs/manual/faq/error.xml.ko b/docs/manual/faq/error.xml.ko
index 0906e84bdffdaef10ed859d8dd0c218bb7badd74..0e6236ccdd68ebec0163cf34f89b8502310b716a 100644 (file)
--- a/docs/manual/faq/error.xml.ko
+++ b/docs/manual/faq/error.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE faq SYSTEM "../style/faq.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 151408 -->
+<!-- English Revision: 151408:240301 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,

diff --git a/docs/manual/faq/error.xml.meta b/docs/manual/faq/error.xml.meta
index d202df6763f0a3af72d8e6480928503c9b4b9fcd..f70c3d52903963f8b46f16ea0a5887a718d5d741 100644 (file)
--- a/docs/manual/faq/error.xml.meta
+++ b/docs/manual/faq/error.xml.meta
@@ -7,7 +7,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>ja</variant>
-    <variant>ko</variant>
+    <variant outdated="yes">ja</variant>
+    <variant outdated="yes">ko</variant>
   </variants>
 </metafile>

diff --git a/docs/manual/faq/index.xml.ja b/docs/manual/faq/index.xml.ja
index c270fa6df9e51da1a1483551a5fb30bfee202413..8563f5a250b70f96627561afd0c9f83302e40c44 100644 (file)
--- a/docs/manual/faq/index.xml.ja
+++ b/docs/manual/faq/index.xml.ja
@@ -3,7 +3,7 @@
     <!ENTITY categories SYSTEM "categories.xml.ja">
 ]>
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 151408 -->
+<!-- English Revision: 151408:240301 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,

diff --git a/docs/manual/faq/index.xml.ko b/docs/manual/faq/index.xml.ko
index cdeff3fed43e1046e20fca652e51bce515947970..2acc98ccae8d52dab75c8a943a8e01317e9d0671 100644 (file)
--- a/docs/manual/faq/index.xml.ko
+++ b/docs/manual/faq/index.xml.ko
@@ -3,7 +3,7 @@
     <!ENTITY categories SYSTEM "categories.xml.ko">
 ]>
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 151408 -->
+<!-- English Revision: 151408:240301 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,

diff --git a/docs/manual/faq/index.xml.meta b/docs/manual/faq/index.xml.meta
index a3a99d706cd28fae842b16505b5dfecc20b12c36..43a89cfa5f3804b9c0499e8c9f94a93d2807b947 100644 (file)
--- a/docs/manual/faq/index.xml.meta
+++ b/docs/manual/faq/index.xml.meta
@@ -7,7 +7,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>ja</variant>
-    <variant>ko</variant>
+    <variant outdated="yes">ja</variant>
+    <variant outdated="yes">ko</variant>
   </variants>
 </metafile>