Author: kkolinko
Date: Sun Mar 17 04:53:32 2013
New Revision: 1457374
URL: http://svn.apache.org/r1457374
Log:
CTR: docs
Merged revision 1061503 from tomcat/trunk:
Clarify when docBase can be set
It fixes https://issues.apache.org/bugzilla/show_bug.cgi?id=50441
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1061503
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml?rev=1457374&r1=1457373&r2=1457374&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml Sun Mar 17 04:53:32
2013
@@ -259,9 +259,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>
<p>If a symbolic link is used for docBase then changes to the
symbolic link will only be effective after a Tomcat restart or
by undeploying and redeploying the context. A context reload is not
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
