BZ - 20068

Patch by Wendy Smoak wsmoak at apache org

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

diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index 223b3bd..3973319 100644 (file)
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -75,7 +75,7 @@
   host</li>
   <li>in individual files (with a ".xml" extension) in the
   <code>$CATALINA_HOME/conf/[enginename]/[hostname]/</code> directory.
-  The name of the file (less the .xml) extension will be used as the
+  The name of the file (less the .xml extension) will be used as the
   context path. Multi-level context paths may be defined using #, e.g.
   <code>context#path.xml</code>. The default web application may be defined
   by using a file called <code>ROOT.xml</code>.</li>
@@ -95,9 +95,9 @@
 
     <blockquote><em>
     <p>The description below uses the variable name $CATALINA_HOME
-    to refer to the directory into which you have installed Tomcat 5,
+    to refer to the directory into which you have installed Tomcat 6,
     and is the base directory against which most relative paths are
-    resolved.  However, if you have configured Tomcat 5 for multiple
+    resolved.  However, if you have configured Tomcat 6 for multiple
     instances by setting a CATALINA_BASE directory, you should use
     $CATALINA_BASE instead of $CATALINA_HOME for each of these
     references.</p>
@@ -607,7 +607,9 @@
     nesting a <strong>Listener</strong> element inside this element.  The
     class name you specify must implement the
     <code>org.apache.catalina.LifecycleListener</code> interface, and
-    it will be notified about the occurrence of the coresponding
+    the class must be packaged in a jar and placed in the 
+    <code>$CATALINA_HOME/lib</code> directory. 
+    It will be notified about the occurrence of the corresponding
     lifecycle events.  Configuration of such a listener looks like this:</p>
 
 <source>