From 3fbcf13847a2d8584095ef0c9a7bde37217c07e1 Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 20 Jan 2011 20:43:12 +0000 Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50441 Clarify when docBase can be set git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1061503 13f79535-47bb-0310-9956-ffa450edef68 --- webapps/docs/changelog.xml | 4 ++++ webapps/docs/config/context.xml | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index bdab65521..6c80dbe06 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -127,6 +127,10 @@ the default cluster membership. (markt) + 50441: Clarify when it is valid to set the docBase attribute + in a Context element. (markt) + + 50526: Provide additional documetation on configuring JavaMail resources. (markt) diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml index 56829cfad..c3f37d5ca 100644 --- a/webapps/docs/config/context.xml +++ b/webapps/docs/config/context.xml @@ -231,9 +231,9 @@ an absolute pathname for this directory or WAR file, or a pathname that is relative to the appBase directory of the owning Host.

-

The value of this field must not be set when the Context is - configured using a META-INF/context.xml file as it will be - inferred by the automatic deployment process.

+

The value of this field must not be set unless the Context element is + defined in server.xml or the docBase is not located under + the Host's appBase.

-- 2.11.0