From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 11 May 2007 23:06:47 +0000 (+0000)
Subject: Update context info
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=a67ec8cefd6898318b56d1bbe1c1bd5152f9bb70;p=tomcat7.0

Update context info

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@537312 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/webapps/docs/deployer-howto.xml b/webapps/docs/deployer-howto.xml
index d0380ecd3..d7de9eab4 100644
--- a/webapps/docs/deployer-howto.xml
+++ b/webapps/docs/deployer-howto.xml
@@ -114,11 +114,9 @@
                 <li>$CATALINA_HOME/conf/[enginename]/[hostname]/context.xml</li>
                 <li>$CATALINA_HOME/webapps/[webappname]/META-INF/context.xml</li>
             </ol>
-            If a Context Descriptor is not provided for a Context, Tomcat
-            automatically creates one and places it in (1) with a filename of
-            [webappname].xml although if manually created, the filename need not
-            match the web application name as Tomcat is concerned only with the
-            Context configuration contained within the Context Descriptor file(s).
+            Files in (1) are named [webappname].xml but files in (2) are named
+            context.xml. If a Context Descriptor is not provided for a Context,
+            Tomcat configures the Context using default values. 
         </p>
     </section>