FAQ links to wiki

use the xslt task instead of style task

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

diff --git a/build.xml b/build.xml
index b2401b4..ce8f87d 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -350,55 +350,55 @@
     <mkdir dir="${tomcat.build}/webapps/docs/funcspecs" />
 
     <!-- XSL processing -->
-    <style basedir="webapps/docs"
+    <xslt basedir="webapps/docs"
            destdir="${tomcat.build}/webapps/docs"
          extension=".html"
              style="webapps/docs/tomcat-docs.xsl"
           excludes="build.xml project.xml"
           includes="*.xml">
       <param name="relative-path" expression="."/>
-    </style>
-    <style basedir="webapps/docs/appdev"
+    </xslt>
+    <xslt basedir="webapps/docs/appdev"
            destdir="${tomcat.build}/webapps/docs/appdev"
          extension=".html"
              style="webapps/docs/tomcat-docs.xsl"
           excludes="project.xml"
           includes="*.xml">
       <param name="relative-path" expression=".."/>
-    </style>
-    <style basedir="webapps/docs/funcspecs"
+    </xslt>
+    <xslt basedir="webapps/docs/funcspecs"
            destdir="${tomcat.build}/webapps/docs/funcspecs"
          extension=".html"
              style="webapps/docs/tomcat-docs.xsl"
           excludes="project.xml"
           includes="*.xml">
       <param name="relative-path" expression=".."/>
-    </style>
-    <style basedir="webapps/docs/config"
+    </xslt>
+    <xslt basedir="webapps/docs/config"
            destdir="${tomcat.build}/webapps/docs/config"
          extension=".html"
              style="webapps/docs/tomcat-docs.xsl"
           excludes="project.xml"
           includes="*.xml">
       <param name="relative-path" expression=".."/>
-    </style>
-    <style basedir="webapps/docs/architecture"
+    </xslt>
+    <xslt basedir="webapps/docs/architecture"
            destdir="${tomcat.build}/webapps/docs/architecture"
          extension=".html"
              style="webapps/docs/tomcat-docs.xsl"
           excludes="project.xml"
           includes="*.xml">
       <param name="relative-path" expression=".."/>
-    </style>
+    </xslt>
 
-    <style basedir="webapps/docs/tribes"
+    <xslt basedir="webapps/docs/tribes"
                destdir="${tomcat.build}/webapps/docs/tribes"
              extension=".html"
                  style="webapps/docs/tomcat-docs.xsl"
               excludes="project.xml"
               includes="*.xml">
           <param name="relative-path" expression=".."/>
-    </style>
+    </xslt>
   </target>
 
   <target name="deploy" depends="build-only,build-docs">

diff --git a/webapps/docs/cluster-howto.xml b/webapps/docs/cluster-howto.xml
index 59c73cf..a9809ca 100644 (file)
--- a/webapps/docs/cluster-howto.xml
+++ b/webapps/docs/cluster-howto.xml
@@ -693,7 +693,7 @@ List of Cluster Mbeans<br/>
 </section>
 
 <section name="FAQ">
-<p>Please see <a href="http://tomcat.apache.org/faq/cluster.html">the clustering section of the FAQ</a>.</p>
+<p>Please see <a href="http://wiki.apache.org/tomcat/FAQ/Clustering">the clustering section of the FAQ</a>.</p>
 </section>
 
 </body>

diff --git a/webapps/docs/introduction.xml b/webapps/docs/introduction.xml
index 3c282a7..858c021 100644 (file)
--- a/webapps/docs/introduction.xml
+++ b/webapps/docs/introduction.xml
@@ -115,7 +115,7 @@ different.</p>
     to fully read the relevant documentation as it will save you much time
     and effort. There's nothing like scouring the web only to find out that
     the answer was right in front of you all along!</li>
-<li><a href="http://tomcat.apache.org/faq/">Tomcat FAQ</a> as maintained by the developers.</li>
+<li><a href="http://wiki.apache.org/tomcat/FAQ">Tomcat FAQ</a> as maintained by the developers.</li>
 <li><a href="http://wiki.apache.org/tomcat/">Tomcat WIKI</a></li>
 <li>Tomcat FAQ at <a href="http://www.jguru.com/faq/home.jsp?topic=Tomcat">jGuru</a></li>
 <li>Tomcat mailing list archives - numerous sites archive the Tomcat mailing

diff --git a/webapps/docs/tribes/project.xml b/webapps/docs/tribes/project.xml
index b5e4355..467256f 100644 (file)
--- a/webapps/docs/tribes/project.xml
+++ b/webapps/docs/tribes/project.xml
@@ -27,7 +27,7 @@
 
     <menu name="Links">
         <item name="Docs Home"             href="../index.html"/>
-        <item name="FAQ"                   href="http://tomcat.apache.org/faq" />
+        <item name="FAQ"                   href="http://wiki.apache.org/tomcat/FAQ" />
     </menu>
 
     <menu name="User Guide">