Port fix for bug 38198. Improve context name aspect of host documentation.

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

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 736332f..598079a 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -26,6 +26,11 @@
         defined in logging.properties files. (markt)
       </fix>
       <fix>
+        <bug>38198</bug>: Add reference to Context documentation from Host
+        documentation that explains how Context name is obtained from the
+        Context filename. (markt)
+      </fix>
+      <fix>
         <bug>40844</bug> Missing syncs in JDBCRealm. (markt)
       </fix>
        <fix>

diff --git a/webapps/docs/config/host.xml b/webapps/docs/config/host.xml
index e07bf91..6846a57 100644 (file)
--- a/webapps/docs/config/host.xml
+++ b/webapps/docs/config/host.xml
@@ -272,7 +272,8 @@
         attribute of this <code>&lt;Context&gt;</code> element will typically
         be the absolute pathname to a web application directory, or the
         absolute pathname of a web application archive (WAR) file (which
-        will not be expanded).</li>
+        will not be expanded). The path attribute will be automatically set
+        as defined in the <a href="context.html">Context</a> documentation.</li>
     <li>Any web application archive file within the application base (appBase)
         directory that does not have a corresponding
         directory of the same name (without the ".war" extension) will be