From 2068628e64879e63c7bd6255ff5058833bbb1fa4 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 14 Jan 2009 20:02:35 +0000
Subject: [PATCH] Version updates for the docs

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@734501 13f79535-47bb-0310-9956-ffa450edef68
---
 webapps/docs/api/index.html                     |  2 +-
 webapps/docs/appdev/deployment.xml              |  2 +-
 webapps/docs/appdev/installation.xml            |  2 +-
 webapps/docs/appdev/processes.xml               |  4 ++--
 webapps/docs/building.xml                       |  9 ++++-----
 webapps/docs/class-loader-howto.xml             |  2 +-
 webapps/docs/cluster-howto.xml                  |  6 +++---
 webapps/docs/config/cluster-receiver.xml        |  2 +-
 webapps/docs/config/cluster-sender.xml          |  2 +-
 webapps/docs/config/http.xml                    |  6 +++---
 webapps/docs/config/listeners.xml               |  2 +-
 webapps/docs/default-servlet.xml                |  2 +-
 webapps/docs/deployer-howto.xml                 |  4 ++--
 webapps/docs/index.xml                          |  5 +++--
 webapps/docs/jasper-howto.xml                   |  4 ++--
 webapps/docs/jndi-datasource-examples-howto.xml |  2 +-
 webapps/docs/logging.xml                        | 10 +++++-----
 webapps/docs/monitoring.xml                     |  6 +++---
 webapps/docs/project.xml                        |  2 +-
 19 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/webapps/docs/api/index.html b/webapps/docs/api/index.html
index c57305299..bd48398e7 100644
--- a/webapps/docs/api/index.html
+++ b/webapps/docs/api/index.html
@@ -27,7 +27,7 @@ Tomcat's internal javadoc is no longer installed by default. Download and instal
 the "fulldocs" package to get it.
 
 You can also access the javadoc online in the Tomcat 
-<a href="http://tomcat.apache.org/tomcat-6.0-doc/">documentation bundle</a>.
+<a href="http://tomcat.apache.org/tomcat-7.0-doc/">documentation bundle</a>.
 
 </body>
 </html>
diff --git a/webapps/docs/appdev/deployment.xml b/webapps/docs/appdev/deployment.xml
index 0cfa31c81..f7753089e 100644
--- a/webapps/docs/appdev/deployment.xml
+++ b/webapps/docs/appdev/deployment.xml
@@ -133,7 +133,7 @@ drivers that are required for both your application or internal Tomcat use
 <p>Out of the box, a standard Tomcat 6 installation includes a variety
 of pre-installed shared library files, including:</p>
 <ul>
-<li>The <em>Servlet 2.5</em> and <em>JSP 2.1</em> APIs that are fundamental
+<li>The <em>Servlet 3.0</em> and <em>JSP 2.1</em> APIs that are fundamental
     to writing servlets and JavaServer Pages.<br/><br/></li>
 <li>An <em>XML Parser</em> compliant with the JAXP (version 1.2) APIs, so
     your application can perform DOM-based or SAX-based processing of
diff --git a/webapps/docs/appdev/installation.xml b/webapps/docs/appdev/installation.xml
index 24f7816b6..913056cc0 100644
--- a/webapps/docs/appdev/installation.xml
+++ b/webapps/docs/appdev/installation.xml
@@ -39,7 +39,7 @@ in the following subsections.</p>
 
 <subsection name="JDK">
 
-<p>Tomcat 6.0 was designed to run on J2SE 5.0.
+<p>Tomcat 7.0 was designed to run on J2SE 6.0.
 </p>
 
 <p>Compatible JDKs for many platforms (or links to where they can be found)
diff --git a/webapps/docs/appdev/processes.xml b/webapps/docs/appdev/processes.xml
index 0e667038a..0cd1b7758 100644
--- a/webapps/docs/appdev/processes.xml
+++ b/webapps/docs/appdev/processes.xml
@@ -133,8 +133,8 @@ You might end up with something like this:</p>
 # Context path to install this application on
 app.path=/hello
 
-# Tomcat 6 installation directory
-catalina.home=/usr/local/apache-tomcat-6.0
+# Tomcat 7 installation directory
+catalina.home=/usr/local/apache-tomcat-7.0
 
 # Manager webapp username and password
 manager.username=myusername
diff --git a/webapps/docs/building.xml b/webapps/docs/building.xml
index 361db50f6..31561128b 100644
--- a/webapps/docs/building.xml
+++ b/webapps/docs/building.xml
@@ -75,11 +75,11 @@ available, which will be used to actually perform the build.
 
 </section>
 
-<section name="Checkout or obtain the source code for Tomcat 6.0">
+<section name="Checkout or obtain the source code for Tomcat 7.0">
 
   <p>
   Tomcat SVN repository URL:
-  <code>http://svn.apache.org/repos/asf/tomcat/tc6.0.x/</code>
+  <code>http://svn.apache.org/repos/asf/tomcat/tc7.0.x/</code>
   </p>
   
   <p>
@@ -90,7 +90,7 @@ available, which will be used to actually perform the build.
   <p>
   Checkout the source using SVN, selecting the desired version or
   branch (current development source is at 
-  <code>http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/</code>), or 
+  <code>http://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk/</code>), or 
   unpack the source package. The location where the source has been
   placed will be referred as ${tomcat.source}.
   </p>
@@ -187,8 +187,7 @@ From there import the root directory where you have checked out tomcat.
 Eclipse .project and .classpath files are provided in to root directory of tomcat repository
 should allow Eclipse to find all source trees and jars, and
 hopefully compile without problems. <b>Note</b> that these
-files assume you are using Eclipse with a 5.0 or later JDK; also, the
-connectors module must be built with a compiler compliance level of 5.0.
+files assume you are using Eclipse with a 6.0 or later JDK.
 </p>
 
 <p>
diff --git a/webapps/docs/class-loader-howto.xml b/webapps/docs/class-loader-howto.xml
index 6c361d120..c49437550 100644
--- a/webapps/docs/class-loader-howto.xml
+++ b/webapps/docs/class-loader-howto.xml
@@ -113,7 +113,7 @@ loaders as it is initialized:</p>
     <li><em>jasper-el.jar</em> - Jasper 2 EL implementation.</li>
     <li><em>jasper-jdt.jar</em> - Eclipse JDT 3.2 Java compiler.</li>
     <li><em>jsp-api.jar</em> - JSP 2.1 API.</li>
-    <li><em>servlet-api.jar</em> - Servlet 2.5 API.</li>
+    <li><em>servlet-api.jar</em> - Servlet 3.0 API.</li>
     <li><em>tomcat-coyote.jar</em> - Tomcat connectors and utility classes.</li>
     <li><em>tomcat-dbcp.jar</em> - package renamed database connection 
         pool based on Commons DBCP.</li>
diff --git a/webapps/docs/cluster-howto.xml b/webapps/docs/cluster-howto.xml
index a9809ca9f..43d373e43 100644
--- a/webapps/docs/cluster-howto.xml
+++ b/webapps/docs/cluster-howto.xml
@@ -105,7 +105,7 @@
 
 <section name="Cluster Basics">
 
-<p>To run session replication in your Tomcat 6.0 container, the following steps
+<p>To run session replication in your Tomcat 7.0 container, the following steps
 should be completed:</p>
 <ul>
   <li>All your session attributes must implement <code>java.io.Serializable</code></li>
@@ -189,7 +189,7 @@ should be completed:</p>
     Synchronous vs asynchronous is configured using the <code>channelSendOptions</code>
     flag and is an integer value. The default value for the <code>SimpleTcpCluster/DeltaManager</code> combo is
     8, which is asynchronous. You can read more on the <a href="tribes/introduction.html">send flag(overview)</a> or the 
-    <a href="http://tomcat.apache.org/tomcat-6.0-doc/api/org/apache/catalina/tribes/Channel.html">send flag(javadoc)</a>.
+    <a href="http://tomcat.apache.org/tomcat-7.0-doc/api/org/apache/catalina/tribes/Channel.html">send flag(javadoc)</a>.
     During async replication, the request is returned before the data has been replicated. async replication yields shorter
     request times, and synchronous replication guarantees the session to be replicated before the request returns.
 </p>
@@ -289,7 +289,7 @@ should be completed:</p>
       The main element, inside this element all cluster details can be configured.
       The <code>channelSendOptions</code> is the flag that is attached to each message sent by the
       SimpleTcpCluster class or any objects that are invoking the SimpleTcpCluster.send method.
-      The description of the send flags is available at <a href="http://tomcat.apache.org/tomcat-6.0-doc/api/org/apache/catalina/tribes/Channel.html">
+      The description of the send flags is available at <a href="http://tomcat.apache.org/tomcat-7.0-doc/api/org/apache/catalina/tribes/Channel.html">
       our javadoc site</a>
       The <code>DeltaManager</code> sends information using the SimpleTcpCluster.send method, while the backup manager
       sends it itself directly through the channel.
diff --git a/webapps/docs/config/cluster-receiver.xml b/webapps/docs/config/cluster-receiver.xml
index 007b2dfb6..ff8abaef7 100644
--- a/webapps/docs/config/cluster-receiver.xml
+++ b/webapps/docs/config/cluster-receiver.xml
@@ -141,7 +141,7 @@
     </attribute>
     <attribute name="soTrafficClass" required="false">
      Sets the traffic class level for the socket, the value is between 0 and 255.
-     Different values are defined in <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/net/Socket.html#setTrafficClass(int)">
+     Different values are defined in <a href="http://java.sun.com/j2se/1.6.0/docs/api/java/net/Socket.html#setTrafficClass(int)">
      java.net.Socket#setTrafficClass(int)</a>.
     </attribute>
     <attribute name="tcpNoDelay" required="false">
diff --git a/webapps/docs/config/cluster-sender.xml b/webapps/docs/config/cluster-sender.xml
index f7fdccd84..70ba9202f 100644
--- a/webapps/docs/config/cluster-sender.xml
+++ b/webapps/docs/config/cluster-sender.xml
@@ -144,7 +144,7 @@
       <attribute name="soTrafficClass" required="false">
        Sets the traffic class level for the socket, the value is between 0 and 255.
        Default value is <code>int soTrafficClass = 0x04 | 0x08 | 0x010;</code>
-       Different values are defined in <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/net/Socket.html#setTrafficClass(int)">
+       Different values are defined in <a href="http://java.sun.com/j2se/1.6.0/docs/api/java/net/Socket.html#setTrafficClass(int)">
        java.net.Socket#setTrafficClass(int)</a>.
       </attribute>
       <attribute name="tcpNoDelay" required="false">
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index eab1c60c9..035b38e2a 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -423,19 +423,19 @@
       </attribute>      
       <attribute name="socket.performanceConnectionTime" required="false">
         <p>(int)The first value for the performance settings. See
-        <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/net/Socket.html#setPerformancePreferences(int,%20int,%20int)">Socket Performance Options</a>
+        <a href="http://java.sun.com/j2se/1.6.0/docs/api/java/net/Socket.html#setPerformancePreferences(int,%20int,%20int)">Socket Performance Options</a>
         All three performance attributes must be set else the JVM defaults will
         be used for all three.</p>
       </attribute>      
       <attribute name="socket.performanceLatency" required="false">
         <p>(int)The second value for the performance settings. See
-        <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/net/Socket.html#setPerformancePreferences(int,%20int,%20int)">Socket Performance Options</a>
+        <a href="http://java.sun.com/j2se/1.6.0/docs/api/java/net/Socket.html#setPerformancePreferences(int,%20int,%20int)">Socket Performance Options</a>
         All three performance attributes must be set else the JVM defaults will
         be used for all three.</p>
       </attribute>      
       <attribute name="socket.performanceBandwidth" required="false">
         <p>(int)The third value for the performance settings. See
-        <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/net/Socket.html#setPerformancePreferences(int,%20int,%20int)">Socket Performance Options</a>
+        <a href="http://java.sun.com/j2se/1.6.0/docs/api/java/net/Socket.html#setPerformancePreferences(int,%20int,%20int)">Socket Performance Options</a>
         All three performance attributes must be set else the JVM defaults will
         be used for all three.</p>
       </attribute>      
diff --git a/webapps/docs/config/listeners.xml b/webapps/docs/config/listeners.xml
index 7fe1b778f..ffa0eb89a 100644
--- a/webapps/docs/config/listeners.xml
+++ b/webapps/docs/config/listeners.xml
@@ -148,7 +148,7 @@
     behind a firewall. Only this port is configured via the listener. The
     remainder of the configuration is via the standard system properties for
     configuring JMX. For further information on configuring JMX see
-    <a href="http://java.sun.com/j2se/1.5.0/docs/guide/management/agent.html">
+    <a href="http://java.sun.com/j2se/1.6.0/docs/guide/management/agent.html">
     Monitoring and Management Using JMX</a> included with the Java SDK
     documentation.</p>
 
diff --git a/webapps/docs/default-servlet.xml b/webapps/docs/default-servlet.xml
index 914c2b989..fc2e83fe9 100644
--- a/webapps/docs/default-servlet.xml
+++ b/webapps/docs/default-servlet.xml
@@ -272,7 +272,7 @@ The following is a sample xsl file which mimics the default tomcat behavior:
         &lt;/table&gt;
       &lt;xsl:apply-templates select="readme"/&gt;
       &lt;hr size="1" /&gt;
-      &lt;h3&gt;Apache Tomcat/6.0&lt;/h3&gt;
+      &lt;h3&gt;Apache Tomcat/7.0&lt;/h3&gt;
     &lt;/body&gt;
    &lt;/html&gt;
   &lt;/xsl:template&gt;
diff --git a/webapps/docs/deployer-howto.xml b/webapps/docs/deployer-howto.xml
index 61dddfc9d..bdc1627a8 100644
--- a/webapps/docs/deployer-howto.xml
+++ b/webapps/docs/deployer-howto.xml
@@ -83,7 +83,7 @@
             The TCD is not packaged with the Tomcat core 
             distribution, and must therefore be downloaded separately from 
             the Downloads area. The download is usually labelled 
-            <i>apache-tomcat-6.0.x-deployer</i>.
+            <i>apache-tomcat-7.0.x-deployer</i>.
         </p>
         <p>
             TCD has prerequisites of Apache Ant 1.6.2+ and a Java installation.
@@ -279,7 +279,7 @@
                 <code>compile</code> (default): Compile and validate the web 
                 application. This can be used standalone, and does not need a running
                 Tomcat server. The compiled application will only run on the associated
-                Tomcat 6.0.x server release, and is not guaranteed to work on another
+                Tomcat 7.0.x server release, and is not guaranteed to work on another
                 Tomcat release, as the code generated by Jasper depends on its runtime
                 component. It should also be noted that this target will also compile
                 automatically any Java source file located in the 
diff --git a/webapps/docs/index.xml b/webapps/docs/index.xml
index 8b72ca8b5..3d3c11c7e 100644
--- a/webapps/docs/index.xml
+++ b/webapps/docs/index.xml
@@ -34,9 +34,9 @@
 <section name="Introduction">
 
 <p>This is the top-level entry point of the documentation bundle for the
-<strong>Apache Tomcat</strong> Servlet/JSP container.  Apache Tomcat version 6.0
+<strong>Apache Tomcat</strong> Servlet/JSP container.  Apache Tomcat version 7.0
 implements the
-Servlet 2.5 and JavaServer Pages 2.1 specifications from the
+Servlet 3.0 and JavaServer Pages 2.1 specifications from the
 <a href="http://www.jcp.org">Java Community Process</a>, and includes many
 additional features that make it a useful platform for developing and deploying
 web applications and web services.</p>
@@ -149,6 +149,7 @@ are responsible for installing, configuring, and operating a Apache Tomcat 6 ser
     - Complete documentation and HOWTOs on the JK native webserver connector,
       used to interface Apache Tomcat with servers like Apache HTTPd, IIS
       and others.</li>
+<!--  TODO SERVLET3 Update when URL is available -->
 <li><a href="http://java.sun.com/products/servlet/2.5/docs/servlet-2_5-mr2/index.html">
     <strong>Servlet API Javadocs</strong></a> - The Servlet 2.5 API Javadocs.</li>
 <li><a href="http://java.sun.com/products/jsp/2.1/docs/jsp-2_1-pfd2/index.html">
diff --git a/webapps/docs/jasper-howto.xml b/webapps/docs/jasper-howto.xml
index 8d8027bc6..3c1669cc2 100644
--- a/webapps/docs/jasper-howto.xml
+++ b/webapps/docs/jasper-howto.xml
@@ -42,8 +42,8 @@
 
 <section name="Introduction">
 
-<p>Tomcat 6.0 uses the Jasper 2 JSP Engine to implement
-the <a href="http://java.sun.com/products/jsp/">JavaServer Pages 2.0</a>
+<p>Tomcat 7.0 uses the Jasper 2 JSP Engine to implement
+the <a href="http://java.sun.com/products/jsp/">JavaServer Pages 2.1</a>
 specification.</p>
 
 <p>Jasper 2 has been redesigned to significantly improve performance over
diff --git a/webapps/docs/jndi-datasource-examples-howto.xml b/webapps/docs/jndi-datasource-examples-howto.xml
index aad3804b3..c0689aed2 100644
--- a/webapps/docs/jndi-datasource-examples-howto.xml
+++ b/webapps/docs/jndi-datasource-examples-howto.xml
@@ -61,7 +61,7 @@ to the wider audience, or if you feel we can improve this section in anyway.</p>
 <b>Please note that JNDI resource configuration changed somewhat between
 Tomcat 5.0.x and Tomcat 5.5.x.</b>  You will most likely need to modify older
 JNDI resource configurations to match the syntax in the example below in order
-to make them work in Tomcat 6.x.x.
+to make them work in Tomcat 7.x.x.
 </p>
 
 <p>
diff --git a/webapps/docs/logging.xml b/webapps/docs/logging.xml
index ac90f9fbe..f73e3f493 100644
--- a/webapps/docs/logging.xml
+++ b/webapps/docs/logging.xml
@@ -42,7 +42,7 @@
   
   <section name="Introduction">
   <p>
-    Tomcat 6.0 uses 
+    Tomcat 7.0 uses 
     <a href="http://commons.apache.org/logging">Commons Logging</a>
     throughout its internal code allowing the 
     developer to choose a logging configuration that suits their needs, e.g
@@ -53,7 +53,7 @@
     logging implementation.
   </p>
   <p>
-    An important consequence for Tomcat 6.0 is that the &lt;Logger&gt; element found in 
+    An important consequence for Tomcat 7.0 is that the &lt;Logger&gt; element found in 
     previous versions to create a <code>localhost_log</code> is no longer a valid nested element 
     of &lt;Context&gt;. Instead, the default Tomcat configuration will use java.util.logging. 
     If the developer wishes to collect detailed internal Tomcat logging (i.e what is happening 
@@ -65,7 +65,7 @@
 
   <section name="log4j">
     <p>
-      Tomcat 6.0 has done away with <code>localhost_log</code> which you may be familiar with
+      Tomcat 7.0 has done away with <code>localhost_log</code> which you may be familiar with
       as the runtime exception/stack trace log. These types of error are usually thrown
       by uncaught exceptions, but are still valuable to the developer. They can now be
       found in the <code>stdout</code> log.
@@ -170,7 +170,7 @@
     constructs which allows more freedom for defining handlers and assigning them to loggers.
   </p>
   <p>
-    JULI is enabled by default in Tomcat 6.0, and supports per classloader configuration, in addition to 
+    JULI is enabled by default in Tomcat 7.0, and supports per classloader configuration, in addition to 
     the regular global java.util.logging configuration. This means that logging can be configured at 
     the following layers:
     <ul>
@@ -204,7 +204,7 @@
       <li>A prefix may be added to handler names, so that multiple handlers of a single class may be 
       instantiated. A prefix is a String which starts with a digit, and ends with '.'. For example, 
       <code>22foobar.</code> is a valid prefix.</li>
-      <li>As in Java 5.0, loggers can define a list of handlers using the <code>loggerName.handlers</code>
+      <li>As in Java 6.0, loggers can define a list of handlers using the <code>loggerName.handlers</code>
       property.</li>
       <li>By default, loggers will not delegate to their parent if they have associated handlers. This
       may be changed per logger using the <code>loggerName.useParentHandlers</code> property, which accepts 
diff --git a/webapps/docs/monitoring.xml b/webapps/docs/monitoring.xml
index 4a94a71ca..eaa2034de 100644
--- a/webapps/docs/monitoring.xml
+++ b/webapps/docs/monitoring.xml
@@ -41,10 +41,10 @@
   <section name="Enabling JMX Remote">
 
     <p>The Sun website includes the list of options and how to configure JMX Remote on Java 5:
-        <a href="http://java.sun.com/j2se/1.5.0/docs/guide/management/agent.html">
-        http://java.sun.com/j2se/1.5.0/docs/guide/management/agent.html</a>.
+        <a href="http://java.sun.com/j2se/1.6.0/docs/guide/management/agent.html">
+        http://java.sun.com/j2se/1.6.0/docs/guide/management/agent.html</a>.
     </p>
-    <p>The following is a quick configuration guide for Java 5:</p>
+    <p>The following is a quick configuration guide for Java 6:</p>
     <p>Add the following parameters to your Tomcat startup script:
     <source>
     set CATALINA_OPTS="-Dcom.sun.management.jmxremote \
diff --git a/webapps/docs/project.xml b/webapps/docs/project.xml
index fec18f5c4..bb5ab1fb6 100644
--- a/webapps/docs/project.xml
+++ b/webapps/docs/project.xml
@@ -18,7 +18,7 @@
 <project name="Apache Tomcat Documentation"
         href="http://tomcat.apache.org/">
 
-    <title>Apache Tomcat 6.0</title>
+    <title>Apache Tomcat 7.0</title>
 
     <logo href="/images/tomcat.gif">
       The Apache Tomcat Servlet/JSP Container
-- 
2.11.0