From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 20 Jan 2011 20:43:12 +0000 (+0000)
Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50441
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=3fbcf13847a2d8584095ef0c9a7bde37217c07e1;p=tomcat7.0

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50441
Clarify when docBase can be set

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

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bdab65521..6c80dbe06 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,6 +127,10 @@
         the default cluster membership. (markt)
       </fix>
       <fix>
+        <bug>50441</bug>: Clarify when it is valid to set the docBase attribute
+        in a Context element. (markt)
+      </fix>
+      <fix>
         <bug>50526</bug>: Provide additional documetation on configuring
         JavaMail resources. (markt)
       </fix>
diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index 56829cfad..c3f37d5ca 100644
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -231,9 +231,9 @@
         an absolute pathname for this directory or WAR file, or a pathname
         that is relative to the <code>appBase</code> directory of the
         owning <a href="host.html">Host</a>.</p>
-        <p>The value of this field must not be set when the Context is
-        configured using a <code>META-INF/context.xml</code> file as it will be
-        inferred by the automatic deployment process.</p>
+        <p>The value of this field must not be set unless the Context element is
+        defined in server.xml or the <code>docBase</code> is not located under
+        the <a href="host.html">Host</a>&apos;s <code>appBase</code>.</p>
       </attribute>
 
       <attribute name="logEffectiveWebXml" required="false">