From 28edff7a940d76db9ee6bac869730d23042e10f7 Mon Sep 17 00:00:00 2001 From: remm Date: Mon, 16 Oct 2006 13:45:11 +0000 Subject: [PATCH] - Tweaks. git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@464491 13f79535-47bb-0310-9956-ffa450edef68 --- webapps/docs/config/ajp.xml | 2 +- webapps/docs/config/context.xml | 2 +- webapps/docs/config/host.xml | 4 ++-- webapps/docs/config/http.xml | 4 +--- webapps/docs/config/index.xml | 2 +- webapps/docs/config/loader.xml | 10 ++-------- webapps/docs/config/realm.xml | 4 ++-- webapps/docs/config/valve.xml | 4 ++-- 8 files changed, 12 insertions(+), 20 deletions(-) diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml index 707152622..d61c49b7d 100644 --- a/webapps/docs/config/ajp.xml +++ b/webapps/docs/config/ajp.xml @@ -21,7 +21,7 @@

The AJP Connector element represents a Connector component that communicates with a web connector via the AJP protocol. This is used for cases - where you wish to invisibly integrate Tomcat 5 into an existing (or new) + where you wish to invisibly integrate Tomcat 6 into an existing (or new) Apache installation, and you want Apache to handle the static content contained in the web application, and/or utilize Apache's SSL processing.

diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml index 77857ebb2..989f5cfe9 100644 --- a/webapps/docs/config/context.xml +++ b/webapps/docs/config/context.xml @@ -63,7 +63,7 @@ Application Deployment for more information. This method allows dynamic reconfiguration of the web application, since the main conf/server.xml file cannot be reloaded without restarting - Tomcat. Please note that for tomcat 5, unlike tomcat 4.x, it is NOT + Tomcat. Please note that for tomcat 6, unlike tomcat 4.x, it is NOT recommended to place <Context> elements directly in the server.xml file. Instead, put them in the META-INF/context.xml directory of your WAR file or the conf directory as described above. diff --git a/webapps/docs/config/host.xml b/webapps/docs/config/host.xml index 9fd51e2f4..e07bf919b 100644 --- a/webapps/docs/config/host.xml +++ b/webapps/docs/config/host.xml @@ -41,9 +41,9 @@

The description below uses the variable name $CATALINA_HOME - to refer to the directory into which you have installed Tomcat 5, + to refer to the directory into which you have installed Tomcat 6, and is the base directory against which most relative paths are - resolved. However, if you have configured Tomcat 5 for multiple + resolved. However, if you have configured Tomcat 6 for multiple instances by setting a CATALINA_BASE directory, you should use $CATALINA_BASE instead of $CATALINA_HOME for each of these references.

diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index 8121ba57d..8cd4ef115 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -32,9 +32,7 @@ mod_jk 1.2.x connector for Apache 1.3), see here instead.

-

At server startup time, this Connector will create a - number of request processing threads (based on the value configured for - the minSpareThreads attribute). Each incoming request requires +

Each incoming request requires a thread for the duration of that request. If more simultaneous requests are received than can be handled by the currently available request processing threads, additional threads will be created up to the diff --git a/webapps/docs/config/index.xml b/webapps/docs/config/index.xml index f94de892b..9f67b3e0b 100644 --- a/webapps/docs/config/index.xml +++ b/webapps/docs/config/index.xml @@ -18,7 +18,7 @@

This manual contains reference information about all of the configuration directives that can be included in a conf/server.xml file to -configure the behavior of the Tomcat 5 Servlet/JSP container. It does not +configure the behavior of the Tomcat 6 Servlet/JSP container. It does not attempt to describe which configuration directives should be used to perform specific tasks - for that, see the various HOW-TO documents on the main index page.

diff --git a/webapps/docs/config/loader.xml b/webapps/docs/config/loader.xml index a11c3c70e..1722b2f09 100644 --- a/webapps/docs/config/loader.xml +++ b/webapps/docs/config/loader.xml @@ -39,9 +39,9 @@

The description below uses the variable name $CATALINA_HOME - to refer to the directory into which you have installed Tomcat 5, + to refer to the directory into which you have installed Tomcat 6, and is the base directory against which most relative paths are - resolved. However, if you have configured Tomcat 5 for multiple + resolved. However, if you have configured Tomcat 6 for multiple instances by setting a CATALINA_BASE directory, you should use $CATALINA_BASE instead of $CATALINA_HOME for each of these references.

@@ -105,12 +105,6 @@ - -

The number of seconds between checks for modified classes and - resources, if reloadable has been set to - true. The default is 15 seconds.

- -

Java class name of the java.lang.ClassLoader implementation class to use. If not specified, the default value is diff --git a/webapps/docs/config/realm.xml b/webapps/docs/config/realm.xml index c14797848..8f36f69cd 100644 --- a/webapps/docs/config/realm.xml +++ b/webapps/docs/config/realm.xml @@ -38,9 +38,9 @@

The description below uses the variable name $CATALINA_HOME - to refer to the directory into which you have installed Tomcat 5, + to refer to the directory into which you have installed Tomcat 6, and is the base directory against which most relative paths are - resolved. However, if you have configured Tomcat 5 for multiple + resolved. However, if you have configured Tomcat 6 for multiple instances by setting a CATALINA_BASE directory, you should use $CATALINA_BASE instead of $CATALINA_HOME for each of these references.

diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml index 5f97d9641..6c0425777 100644 --- a/webapps/docs/config/valve.xml +++ b/webapps/docs/config/valve.xml @@ -25,9 +25,9 @@

The description below uses the variable name $CATALINA_HOME - to refer to the directory into which you have installed Tomcat 5, + to refer to the directory into which you have installed Tomcat 6, and is the base directory against which most relative paths are - resolved. However, if you have configured Tomcat 5 for multiple + resolved. However, if you have configured Tomcat 6 for multiple instances by setting a CATALINA_BASE directory, you should use $CATALINA_BASE instead of $CATALINA_HOME for each of these references.

-- 2.11.0