You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2008/11/15 20:48:42 UTC
svn commit: r717919 - in /tomcat/tc6.0.x/trunk: ./ BUILDING.txt build.xml
webapps/docs/changelog.xml webapps/docs/cluster-howto.xml
webapps/docs/introduction.xml webapps/docs/tribes/project.xml
Author: markt
Date: Sat Nov 15 11:48:42 2008
New Revision: 717919
URL: http://svn.apache.org/viewvc?rev=717919&view=rev
Log:
Port r606992 from trunk
FAQ links to wiki
Use the xslt task instead of style task
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/BUILDING.txt
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/cluster-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml
tomcat/tc6.0.x/trunk/webapps/docs/tribes/project.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 15 11:48:42 2008
@@ -1 +1 @@
-/tomcat/trunk:601180,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709816,711126
+/tomcat/trunk:601180,606992,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709816,711126
Modified: tomcat/tc6.0.x/trunk/BUILDING.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/BUILDING.txt?rev=717919&r1=717918&r2=717919&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/BUILDING.txt (original)
+++ tomcat/tc6.0.x/trunk/BUILDING.txt Sat Nov 15 11:48:42 2008
@@ -130,7 +130,11 @@
cd ${tomcat.source}
ant -f dist.xml dist-javadoc
-(6) Building a release running tests:
+(6) Building the extras (commons-logging, webservices etc.).
+ cd ${tomcat.source}
+ ant -f extras.xml
+
+(7) Building a release running tests:
cd ${tomcat.source}
ant -f dist.xml release
Modified: tomcat/tc6.0.x/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=717919&r1=717918&r2=717919&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Sat Nov 15 11:48:42 2008
@@ -377,55 +377,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">
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=717919&r1=717918&r2=717919&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Nov 15 11:48:42 2008
@@ -291,6 +291,10 @@
Use CSS based solution for printer-friendly docs. Patch provided by
vitezslav.smid as part of GSoc with additional work by Tim Funk. (markt)
</fix>
+ <fix>
+ Update the FAQ linsk in the docs to refer to the wiki. Use xlst task
+ rather than style task to generate docs. (funkman/markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
Modified: tomcat/tc6.0.x/trunk/webapps/docs/cluster-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/cluster-howto.xml?rev=717919&r1=717918&r2=717919&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/cluster-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/cluster-howto.xml Sat Nov 15 11:48:42 2008
@@ -693,7 +693,7 @@
</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>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml?rev=717919&r1=717918&r2=717919&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml Sat Nov 15 11:48:42 2008
@@ -117,7 +117,7 @@
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
Modified: tomcat/tc6.0.x/trunk/webapps/docs/tribes/project.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/tribes/project.xml?rev=717919&r1=717918&r2=717919&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/tribes/project.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/tribes/project.xml Sat Nov 15 11:48:42 2008
@@ -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">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org