Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46106

Remove references to DefaultContext from docs

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

diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index ef927c2..088acd1 100644 (file)
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -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

diff --git a/webapps/docs/config/engine.xml b/webapps/docs/config/engine.xml
index a64c25a..15e7842 100644 (file)
--- a/webapps/docs/config/engine.xml
+++ b/webapps/docs/config/engine.xml
@@ -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>

diff --git a/webapps/docs/config/globalresources.xml b/webapps/docs/config/globalresources.xml
index c3929ed..59f03a5 100644 (file)
--- a/webapps/docs/config/globalresources.xml
+++ b/webapps/docs/config/globalresources.xml
@@ -219,21 +219,20 @@
     <p>Use <a href="context.html#Resource Links">&lt;ResourceLink&gt;</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>
 

diff --git a/webapps/docs/config/host.xml b/webapps/docs/config/host.xml
index 5027694..492a9ae 100644 (file)
--- a/webapps/docs/config/host.xml
+++ b/webapps/docs/config/host.xml
@@ -528,8 +528,7 @@ http://www.mycompany.com:8080/~craigmcc
     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>