Author: kkolinko
Date: Wed Jan 26 16:35:48 2011
New Revision: 1063782
URL: http://svn.apache.org/viewvc?rev=1063782&view=rev
Log:
Correct some old typo in context docs:
move comment about docBase bahaviour with symlinks to where it belongs.
No need to update 5.5 ones: they are OK already.
CTR: docs
Modified:
tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml
tomcat/trunk/webapps/docs/config/context.xml
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=1063782&r1=1063781&r2=1063782&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml Wed Jan 26 16:35:48
2011
@@ -189,6 +189,10 @@
<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>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
+ sufficient.</p>
</attribute>
<attribute name="override" required="false">
@@ -196,10 +200,6 @@
Context element override any corresponding settings in either the
global
or <a href="host.html">Host</a> default contexts. By default, settings
from a default context will be used.</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
- sufficient.</p>
</attribute>
<attribute name="privileged" required="false">
Modified: tomcat/trunk/webapps/docs/config/context.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=1063782&r1=1063781&r2=1063782&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/trunk/webapps/docs/config/context.xml Wed Jan 26 16:35:48 2011
@@ -234,6 +234,10 @@
<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
+ sufficient.</p>
</attribute>
<attribute name="logEffectiveWebXml" required="false">
@@ -250,10 +254,6 @@
or <a href="host.html">Host</a> default contexts. By default, settings
from a default context will be used but may be overridden by a setting
the same attribute explicitly for the Context.</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
- sufficient.</p>
</attribute>
<attribute name="privileged" required="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
