From 68d568d7002629da7b1e9c7529e406bd8f0b65d6 Mon Sep 17 00:00:00 2001
From: funkman <funkman@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 22 Aug 2007 01:02:01 +0000
Subject: [PATCH] BZ - 20068 Patch by Wendy Smoak wsmoak at apache org

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@568346 13f79535-47bb-0310-9956-ffa450edef68
---
 webapps/docs/config/context.xml | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index 7615c5da9..3973319cf 100644
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <!DOCTYPE document [
   <!ENTITY project SYSTEM "project.xml">
 ]>
@@ -59,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>
@@ -79,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>
@@ -591,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>
-- 
2.11.0