Author: markt
Date: Sat Nov 15 17:09:07 2008
New Revision: 717954
URL: http://svn.apache.org/viewvc?rev=717954&view=rev
Log:
Merge minor doc fixes from trunk
Modified:
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-interceptor.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/fs-default.xml
tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/security-manager-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/tribes/introduction.xml
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-interceptor.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-interceptor.xml?rev=717954&r1=717953&r2=717954&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-interceptor.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-interceptor.xml Sat Nov 15
17:09:07 2008
@@ -100,6 +100,7 @@
<attribute name="optionFlag" required="false">
The default and hard coded value is <code>8
(org.apache.catalina.tribes.Channel.SEND_OPTIONS_ASYNCHRONOUS)</code>.
The dispatcher will trigger on this value only, as it is predefined by
Tribes.
+ The other attributes are inherited from its base class
<code>org.apache.catalina.tribes.group.interceptors.MessageDispatchInterceptor</code>.
</attribute>
</attributes>
</subsection>
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?rev=717954&r1=717953&r2=717954&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml Sat Nov 15 17:09:07 2008
@@ -738,10 +738,10 @@
Classname Http11Protocol Http11NioProtocol
Http11AprProtocol
Tomcat Version 3.x 4.x 5.x 6.x 6.x
5.5.x 6.x
Support Polling NO YES
YES
- Polling Size N/A Unlimited - Restricted by mem
Unlimited
- Read HTTP Request Blocking Non blocking
Blocking
- Read HTTP Body Blocking Sim blocking
Blocking
- Write HTTP Response Blocking Sim blocking
Blocking
+ Polling Size N/A Unlimited - Restricted by mem
Unlimited - Configurable
+ Read HTTP Request Blocking Non Blocking
Blocking
+ Read HTTP Body Blocking Sim Blocking
Blocking
+ Write HTTP Response Blocking Sim Blocking
Blocking
SSL Support Java SSL Java SSL
OpenSSL
SSL Handshake Blocking Non blocking
Blocking
Max Connections maxThreads See polling size
See polling size
Modified: tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/fs-default.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/fs-default.xml?rev=717954&r1=717953&r2=717954&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/fs-default.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/fs-default.xml Sat Nov 15
17:09:07 2008
@@ -123,7 +123,7 @@
<subsection name="Initialization Functionality">
<p>The following processing must be performed when the <code>init()</code>
- method of the invoker servlet is called:</p>
+ method of the default servlet is called:</p>
<ul>
<li>Process and sanity check configuration parameters.</li>
</ul>
@@ -248,7 +248,7 @@
<p>In addition the the assertions implied by the functionality requirements
listed above, the following additional assertions shall be tested to
- validate the behavior of the invoker servlet:</p>
+ validate the behavior of the default servlet:</p>
<ul>
<li>Requests for resources that do not exist in the web application must
return HTTP status 404 (not found).</li>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml?rev=717954&r1=717953&r2=717954&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml Sat Nov 15 17:09:07 2008
@@ -261,7 +261,7 @@
<include name="*.jar"/>
</fileset>
<pathelement location="${tomcat.home}/lib"/>
- <fileset dir="${tomcat.home}/common/lib">
+ <fileset dir="${tomcat.home}/lib">
<include name="*.jar"/>
</fileset>
<fileset dir="${tomcat.home}/bin">
Modified: tomcat/tc6.0.x/trunk/webapps/docs/security-manager-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/security-manager-howto.xml?rev=717954&r1=717953&r2=717954&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/security-manager-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/security-manager-howto.xml Sat Nov 15
17:09:07 2008
@@ -180,7 +180,6 @@
//
// * Read access to the document root directory
//
-// $Id$
// ============================================================================
Modified: tomcat/tc6.0.x/trunk/webapps/docs/tribes/introduction.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/tribes/introduction.xml?rev=717954&r1=717953&r2=717954&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/tribes/introduction.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/tribes/introduction.xml Sat Nov 15
17:09:07 2008
@@ -260,7 +260,7 @@
<section name="Where can I get Tribes">
<p>
-
+ Tribes ships as a module with Tomcat, and is released as part of the
Apache Tomcat release.
</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
