From 544ad1ed908a2e8f1b604109146f752d48253a4a Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 15 Jul 2009 07:03:17 +0000
Subject: [PATCH] Remove Jakarta references from the docs. Update those
 sections of the docs as necessary.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@794160 13f79535-47bb-0310-9956-ffa450edef68
---
 webapps/docs/class-loader-howto.xml             |  2 +-
 webapps/docs/funcspecs/fs-admin-apps.xml        |  2 +-
 webapps/docs/jndi-datasource-examples-howto.xml | 11 +++++------
 webapps/docs/setup.xml                          |  4 ----
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/webapps/docs/class-loader-howto.xml b/webapps/docs/class-loader-howto.xml
index f88e13d85..024121756 100644
--- a/webapps/docs/class-loader-howto.xml
+++ b/webapps/docs/class-loader-howto.xml
@@ -91,7 +91,7 @@ loaders as it is initialized:</p>
     <li><em>$CATALINA_HOME/bin/bootstrap.jar</em> - Contains the main() method
         that is used to initialize the Tomcat 6 server, and the class loader
         implementation classes it depends on.</li>
-    <li><em>$CATALINA_HOME/bin/tomcat-juli.jar</em> - Package renamed Jakarta commons 
+    <li><em>$CATALINA_HOME/bin/tomcat-juli.jar</em> - Package renamed Commons 
         logging API, and java.util.logging LogManager.</li>
     </ul></li>
 <li><strong>Common</strong> - This class loader contains additional classes
diff --git a/webapps/docs/funcspecs/fs-admin-apps.xml b/webapps/docs/funcspecs/fs-admin-apps.xml
index 5e655a22f..4940a7635 100644
--- a/webapps/docs/funcspecs/fs-admin-apps.xml
+++ b/webapps/docs/funcspecs/fs-admin-apps.xml
@@ -180,7 +180,7 @@
     <li><a href="http://www.jcp.org/jsr/detail/152.jsp">JavaServer Pages 2.0</a>
         (supported natively by Tomcat 6)</li>
     <li><a href="http://jakarta.apache.org/taglibs/doc/standard-doc/intro.html">JavaServer Pages Standard Tag Library 1.0 (Jakarta Taglibs-Standard 1.0.3)</a></li>
-    <li><a href="http://jakarta.apache.org/struts/">Struts Framework</a>
+    <li><a href="http://struts.apache.org/">Struts Framework</a>
         (Version 1.0) - MVC Framework for Web Applications</li>
     <li><strong>TO BE DETERMINED</strong> - Application for hosting SOAP
         based web services</li>
diff --git a/webapps/docs/jndi-datasource-examples-howto.xml b/webapps/docs/jndi-datasource-examples-howto.xml
index 9bf6445ce..795183d9f 100644
--- a/webapps/docs/jndi-datasource-examples-howto.xml
+++ b/webapps/docs/jndi-datasource-examples-howto.xml
@@ -80,17 +80,16 @@ will support JDBC 3.0. Please let us know if you have used DBCP and its
 JDBC 3.0 features with a 1.4 JVM.
 </p>
 
-<p>See the <a href="http://jakarta.apache.org/commons/dbcp/configuration.html">
+<p>See the <a href="http://commons.apache.org/dbcp/configuration.html">
 DBCP documentation</a> for a complete list of configuration parameters.
 </p>
 
 <subsection name="Installation">
-<p>DBCP uses the Jakarta-Commons Database Connection Pool. It relies on
-number of Jakarta-Commons components:
+<p>DBCP uses the Commons Database Connection Pool. It relies on
+number of Commons components:
 <ul>
-<li>Jakarta-Commons DBCP</li>
-<li>Jakarta-Commons Collections</li>
-<li>Jakarta-Commons Pool</li>
+<li>Commons DBCP</li>
+<li>Commons Pool</li>
 </ul>
 These libraries are located in a single JAR at 
 <code>$CATALINA_HOME/lib/tomcat-dbcp.jar</code>. However,
diff --git a/webapps/docs/setup.xml b/webapps/docs/setup.xml
index ef31557d1..0e5936511 100644
--- a/webapps/docs/setup.xml
+++ b/webapps/docs/setup.xml
@@ -101,10 +101,6 @@
     <p>Please note that you should use the GNU make (gmake) instead of
        the native BSD make on FreeBSD systems.</p>
 
-    <p>Download a commons-daemon binary from the Jakarta Commons download page, 
-       and place jsvc.tar.gz and commons-daemon.jar in the 
-       <code>$CATALINA_HOME/bin</code> folder.</p>
-
 <source>
     cd $CATALINA_HOME/bin
     tar xvfz jsvc.tar.gz
-- 
2.11.0