From 9ef9684177896f385cce9de2079abbe017356836 Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 28 Oct 2008 11:50:43 +0000 Subject: [PATCH] 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 --- webapps/docs/config/context.xml | 7 +++---- webapps/docs/config/engine.xml | 4 ---- webapps/docs/config/globalresources.xml | 7 +++---- webapps/docs/config/host.xml | 3 +-- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml index ef927c2b4..088acd1b6 100644 --- a/webapps/docs/config/context.xml +++ b/webapps/docs/config/context.xml @@ -179,10 +179,9 @@

Set to true to have explicit settings in this - Context element override any corresponding settings in the - DefaultContext element associated - with our owning Host. By default, settings - in the DefaultContext element will be used.

+ Context element override any corresponding settings in either the global + or Host default contexts. By default, settings + from a default context will be used.

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 a64c25a91..15e784247 100644 --- 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 defaultHost attribute, listed above.

-

You can optional nest a DefaultContext - element inside this Engine element, to define the default - characteristics of web applications that are automatically deployed.

-

You can nest at most one instance of the following utility components by nesting a corresponding element inside your Engine element:

diff --git a/webapps/docs/config/globalresources.xml b/webapps/docs/config/globalresources.xml index c3929edeb..59f03a5c4 100644 --- a/webapps/docs/config/globalresources.xml +++ b/webapps/docs/config/globalresources.xml @@ -219,21 +219,20 @@

Use <ResourceLink> 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 JNDI Resource HOW-TO:

+ - + ]]> diff --git a/webapps/docs/config/host.xml b/webapps/docs/config/host.xml index 5027694fb..492a9aef8 100644 --- a/webapps/docs/config/host.xml +++ b/webapps/docs/config/host.xml @@ -528,8 +528,7 @@ http://www.mycompany.com:8080/~craigmcc considerations: