tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r674340 - in /tomcat/tc6.0.x/trunk/webapps/docs: changelog.xml config/context.xml
Date Sun, 06 Jul 2008 20:06:58 GMT
Author: markt
Date: Sun Jul  6 13:06:57 2008
New Revision: 674340

URL: http://svn.apache.org/viewvc?rev=674340&view=rev
Log:
Fix Fix bug 45323. Add note that context.xml files can only contain a single Context.

Modified:
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
    tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=674340&r1=674339&r2=674340&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Jul  6 13:06:57 2008
@@ -32,6 +32,16 @@
   </properties>
 
 <body>
+<section name="Tomcat 6.0.18 (remm)">
+  <subsection name="Webapps">
+    <changelog>
+      <update>
+        <bug>45323</bug>: Add note that context.xml files can only contain a
+        single Context element. (markt)
+      </update>
+    </changelog>
+  </subsection>
+</section>
 <section name="Tomcat 6.0.17 (remm)">
   <subsection name="General">
     <changelog>

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=674340&r1=674339&r2=674340&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml Sun Jul  6 13:06:57 2008
@@ -94,6 +94,10 @@
   </ul>
   </p>
 
+  <p>With the exception of server.xml, files that define <strong>Context
+  </strong> elements may only define a single <strong>Context</strong>
element.
+  </p>
+
   <p>In addition to explicitly specified Context elements, there are
   several techniques by which Context elements can be created automatically
   for you.  See <a href="host.html#Automatic Application Deployment">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message