Author: kkolinko
Date: Sat Jan 19 19:17:19 2013
New Revision: 1435643
URL: http://svn.apache.org/viewvc?rev=1435643&view=rev
Log:
Merged revision 1435642 from tomcat/trunk:
Correct broken sentence.
There are no loggers in Tomcat 7.
An XML parser is not bundled, as it is now provided by JRE.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1435642
Modified: tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml?rev=1435643&r1=1435642&r2=1435643&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml Sat Jan 19 19:17:19
2013
@@ -138,9 +138,6 @@ of pre-installed shared library files, i
<ul>
<li>The <em>Servlet 3.0</em> and <em>JSP 2.2</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
- XML documents.<br/><br/></li>
</ul>
</section>
@@ -177,10 +174,11 @@ the order defined by the DTD (see Sectio
<section name="Tomcat Context Descriptor">
<p>A /META-INF/context.xml file can be used to define Tomcat specific
-configuration options, such as loggers, data sources, session manager
+configuration options, such as an access log, data sources, session manager
configuration and more. This XML file must contain one Context element, which
will be considered as if it was the child of the Host element corresponding
-to the Host to which the The Tomcat configuration documentation contains
+to the Host to which the web application is being deployed. The
+<a href="../config/index.html">Tomcat configuration documentation</a> contains
information on the Context element.</p>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
