Author: markt
Date: Tue Oct 28 04:54:03 2008
New Revision: 708542
URL: http://svn.apache.org/viewvc?rev=708542&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46106
Remove references to DefaultContext from docs
Modified:
tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/engine.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/globalresources.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/host.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=708542&r1=708541&r2=708542&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml Tue Oct 28 04:54:03
2008
@@ -179,10 +179,9 @@
<attribute name="override" required="false">
<p>Set to <code>true</code> to have explicit settings in this
- Context element override any corresponding settings in the
- <a href="defaultcontext.html">DefaultContext</a> element associated
- with our owning <a href="host.html">Host</a>. By default, settings
- in the DefaultContext element will be used.</p>
+ 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 conext. A context reload is not
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/engine.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/engine.xml?rev=708542&r1=708541&r2=708542&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/engine.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/engine.xml Tue Oct 28 04:54:03 2008
@@ -130,10 +130,6 @@
have a name that matches the name specified for the
<code>defaultHost</code> attribute, listed above.</p>
- <p>You can optional nest a <a href="defaultcontext.html">DefaultContext</a>
- element inside this <strong>Engine</strong> element, to define the default
- characteristics of web applications that are automatically deployed.</p>
-
<p>You can nest at most one instance of the following utility components
by nesting a corresponding element inside your <strong>Engine</strong>
element:</p>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/globalresources.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/globalresources.xml?rev=708542&r1=708541&r2=708542&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/globalresources.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/globalresources.xml Tue Oct 28
04:54:03 2008
@@ -219,21 +219,20 @@
<p>Use <a href="context.html#Resource Links"><ResourceLink></a>
elements to link resources from the global context into
per-web-application contexts. Here is an example of making a custom
- factory available to all applications in the server, based on the example
- definition in the
+ factory available to an application, based on the example definition in
the
<a href="../jndi-resources-howto.html#Generic JavaBean Resources">
JNDI Resource HOW-TO</a>:
</p>
<source>
<![CDATA[
- <DefaultContext>
+ <Context>
<ResourceLink
name="bean/MyBeanFactory"
global="bean/MyBeanFactory"
type="com.mycompany.MyBean"
/>
- </DefaultContext>
+ </Context>
]]>
</source>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml?rev=708542&r1=708541&r2=708542&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml Tue Oct 28 04:54:03 2008
@@ -528,8 +528,7 @@
considerations:</p>
<ul>
<li>Each user web application will be deployed with characteristics
- established by any <a href="defaultcontext.html">DefaultContext</a>
- element you have configured for this Host.</li>
+ established by the global and host level default context settings.</li>
<li>It is legal to include more than one instance of this Listener
element. This would only be useful, however, in circumstances
where you wanted to configure more than one "homeBase" directory.</li>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
