Fix typo. Add aliases to changelog

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

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2547e70..a0af70c 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -34,7 +34,7 @@
   <subsection name="Catalina">
     <changelog>
       <update>
-        <bug>46925</bug>: Replace recusive search for nested roles with
+        <bug>46925</bug>: Replace recursive search for nested roles with
         iterative search. Patch provided by Stefan Zoerner. (rjung)
       </update>
       <update>
@@ -102,6 +102,11 @@
         <rev>723889</rev> Provide the ability to configure the Executor job
         queue size and a timeout for adding jobs to the queue. (fhanik) 
       </add>
+      <add>
+        Add support for aliases to StandardContext. This allows content from other
+        directories and/or WAR files to be mapped to paths within the context.
+        (markt)
+      </add>
     </changelog>
   </subsection>
   <subsection name="Coyote">

diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index 852f09f..7bbe2de 100644 (file)
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -251,7 +251,7 @@
 
     <attributes>
 
-      <attribute name="alises" required="false">
+      <attribute name="aliases" required="false">
         <p>This attribute provides a list of external locations from which to
         load resources for this context. These external locations will not be
         emptied if the context is un-deployed. The list of aliases should be of