Author: kkolinko
Date: Mon Feb 4 21:30:17 2013
New Revision: 1442376
URL: http://svn.apache.org/viewvc?rev=1442376&view=rev
Log:
Catching up with tc6.0.x/trunk
Merged revisions 1440001-1442373 from tc6.0.x/trunk.
Modified:
tomcat/tc6.0.x/branches/tomcat6-testing/ (props changed)
tomcat/tc6.0.x/branches/tomcat6-testing/STATUS.txt
tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/architecture/overview.xml
Propchange: tomcat/tc6.0.x/branches/tomcat6-testing/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1441348
Merged /tomcat/tc6.0.x/trunk:r1440001-1442373
Modified: tomcat/tc6.0.x/branches/tomcat6-testing/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing/STATUS.txt?rev=1442376&r1=1442375&r2=1442376&view=diff
==============================================================================
--- tomcat/tc6.0.x/branches/tomcat6-testing/STATUS.txt (original)
+++ tomcat/tc6.0.x/branches/tomcat6-testing/STATUS.txt Mon Feb 4 21:30:17 2013
@@ -112,6 +112,7 @@ PATCHES PROPOSED TO BACKPORT:
+1: schultz
-1:
+
PATCHES/ISSUES THAT ARE STALLED
* Backport JSP unloading patch (BZ48358).
Modified:
tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/architecture/overview.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/architecture/overview.xml?rev=1442376&r1=1442375&r2=1442376&view=diff
==============================================================================
---
tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/architecture/overview.xml
(original)
+++
tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/architecture/overview.xml
Mon Feb 4 21:30:17 2013
@@ -63,7 +63,7 @@ implementation is simple and sufficient:
An
<a href="../config/engine.html">Engine</a> represents request processing
pipeline for a specific Service. As a Service may have multiple Connectors,
-the Engine received and processes all requests from these connectors, handing
+the Engine receives and processes all requests from these connectors, handing
the response back to the appropriate connector for transmission to the client.
The <a href="../api/org/apache/catalina/Engine.html">Engine interface</a>
may be implemented to supply custom Engines, though this is uncommon.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
