You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2006/10/16 15:45:12 UTC
svn commit: r464491 - in /tomcat/tc6.0.x/trunk/webapps/docs/config: ajp.xml
context.xml host.xml http.xml index.xml loader.xml realm.xml valve.xml
Author: remm
Date: Mon Oct 16 06:45:11 2006
New Revision: 464491
URL: http://svn.apache.org/viewvc?view=rev&rev=464491
Log:
- Tweaks.
Modified:
tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/index.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/loader.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/realm.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml?view=diff&rev=464491&r1=464490&r2=464491
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml Mon Oct 16 06:45:11 2006
@@ -21,7 +21,7 @@
<p>The <strong>AJP Connector</strong> element represents a
<strong>Connector</strong> component that communicates with a web
connector via the <code>AJP</code> 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.</p>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml?view=diff&rev=464491&r1=464490&r2=464491
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml Mon Oct 16 06:45:11 2006
@@ -63,7 +63,7 @@
Application Deployment</a> for more information. This method allows dynamic
reconfiguration of the web application, since the main
<code>conf/server.xml</code> file cannot be reloaded without restarting
- Tomcat. <b>Please note that for tomcat 5, unlike tomcat 4.x, it is NOT
+ Tomcat. <b>Please note that for tomcat 6, unlike tomcat 4.x, it is NOT
recommended to place <Context> elements directly in the server.xml file.</b>
Instead, put them in the META-INF/context.xml directory of your WAR file or
the conf directory as described above.
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml?view=diff&rev=464491&r1=464490&r2=464491
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml Mon Oct 16 06:45:11 2006
@@ -41,9 +41,9 @@
<blockquote><em>
<p>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.</p>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml?view=diff&rev=464491&r1=464490&r2=464491
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml Mon Oct 16 06:45:11 2006
@@ -32,9 +32,7 @@
<code>mod_jk 1.2.x</code> connector for Apache 1.3), see
<a href="ajp.html">here</a> instead.</p>
- <p>At server startup time, this <strong>Connector</strong> will create a
- number of request processing threads (based on the value configured for
- the <code>minSpareThreads</code> attribute). Each incoming request requires
+ <p>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
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/index.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/index.xml?view=diff&rev=464491&r1=464490&r2=464491
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/index.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/index.xml Mon Oct 16 06:45:11 2006
@@ -18,7 +18,7 @@
<p>This manual contains reference information about all of the configuration
directives that can be included in a <code>conf/server.xml</code> 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 <em>HOW-TO</em> documents on the
main index page.</p>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/loader.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/loader.xml?view=diff&rev=464491&r1=464490&r2=464491
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/loader.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/loader.xml Mon Oct 16 06:45:11 2006
@@ -39,9 +39,9 @@
<blockquote><em>
<p>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.</p>
@@ -104,12 +104,6 @@
common attributes listed above):</p>
<attributes>
-
- <attribute name="checkInterval" required="false">
- <p>The number of seconds between checks for modified classes and
- resources, if <code>reloadable</code> has been set to
- <code>true</code>. The default is 15 seconds.</p>
- </attribute>
<attribute name="loaderClass" required="false">
<p>Java class name of the <code>java.lang.ClassLoader</code>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/realm.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/realm.xml?view=diff&rev=464491&r1=464490&r2=464491
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/realm.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/realm.xml Mon Oct 16 06:45:11 2006
@@ -38,9 +38,9 @@
<blockquote><em>
<p>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.</p>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml?view=diff&rev=464491&r1=464490&r2=464491
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml Mon Oct 16 06:45:11 2006
@@ -25,9 +25,9 @@
<blockquote><em>
<p>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.</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org