From: Daniel Gruno <humbedooh@apache.org>
Date: Mon, 16 Apr 2012 18:06:51 +0000 (+0000)
Subject: Merge r1326711 from trunk
X-Git-Tag: 2.4.3~564
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ab2e55cdd65647b9c78a16a30ec4bc278cc4735;p=apache

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 fa45b751a6..e9c0a75eb3 100644
--- 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