Author: markt
Date: Thu Jan 20 20:43:12 2011
New Revision: 1061503
URL: http://svn.apache.org/viewvc?rev=1061503&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50441
Clarify when docBase can be set
Modified:
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/context.xml
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1061503&r1=1061502&r2=1061503&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jan 20 20:43:12 2011
@@ -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>
Modified: tomcat/trunk/webapps/docs/config/context.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=1061503&r1=1061502&r2=1061503&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/trunk/webapps/docs/config/context.xml Thu Jan 20 20:43:12 2011
@@ -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>'s <code>appBase</code>.</p>
</attribute>
<attribute name="logEffectiveWebXml" required="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
