Merge r1326711 from trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1326717 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_alias.xml b/docs/manual/mod/mod_alias.xml
index fa45b751a637c06f5788a1271cb6d774ddd56e1f..e9c0a75eb3c05f2a5d85fe3b96dc77917df741aa 100644 (file)
--- a/docs/manual/mod/mod_alias.xml
+++ b/docs/manual/mod/mod_alias.xml
@@ -59,7 +59,7 @@ href="../urlmapping.html">Mapping URLs to the filesystem</a></seealso>
 
 <section id="order"><title>Order of Processing</title>
 
-    <p>Aliases and Redirects occuring in different contexts are processed
+    <p>Aliases and Redirects occurring in different contexts are processed
     like other directives according to standard <a
     href="../sections.html#mergin">merging rules</a>.  But when multiple
     Aliases or Redirects occur in the same context (for example, in the