Make rules on settng path clearer

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

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8cac95d..9caec84 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -129,6 +129,11 @@
         if the connector is also configured with
         <code>URIEncoding=&quot;UTF-8&quot;</code>.(markt)  
       </update>
+      <update>
+        Update the documentation web application to be even more explicit about
+        the implications of setting the path attribute on a Context element in
+        server.xml. (markt)
+      </update>
     </changelog>
   </subsection>
   <subsection name="Other">

diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index f877231..30a52f9 100644 (file)
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -307,9 +307,15 @@
         If you specify a context path of an empty string (""), you are
         defining the <em>default</em> web application for this Host, which
         will process all requests not assigned to other Contexts.</p>
-        <p>The value of this field must not be set except when statically
-        defining a Context in server.xml, as it will be inferred from the
-        filenames used for either the .xml context file or the docBase.</p>
+        <p>This attribute must only be used when statically defining a Context
+        in server.xml. In all other circumstances, the path will be inferred
+        from the filenames used for either the .xml context file or the docBase.
+        </p>
+        <p>Even when statically defining a Context in server.xml, this attribute
+        must not be set unless either the docBase is not located under the
+        <a href="host.html">Host</a>&apos;s <code>appBase</code> or both
+        <code>deployOnStartup</code> and <code>autoDeploy</code> are false. If
+        this rule is not followed, double deployment is likely to result.</p>
       </attribute>
 
       <attribute name="preemptiveAuthentication" required="false">