]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Fix typo.
authorRainer Jung <rjung@apache.org>
Mon, 18 Feb 2013 22:10:06 +0000 (22:10 +0000)
committerRainer Jung <rjung@apache.org>
Mon, 18 Feb 2013 22:10:06 +0000 (22:10 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1447520 13f79535-47bb-0310-9956-ffa450edef68

CHANGES

diff --git a/CHANGES b/CHANGES
index 17bb152fcf30e8b58d8aff69931274dd26699b5c..e8dd9ef8135fddde0e309125a601ad6e47fb31f2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -10,7 +10,7 @@ Changes with Apache 2.2.24
      XSS in mod_proxy_balancer manager interface. [Jim Jagielski,
      Niels Heinen <heinenn google com>]
 
-  *) mod_rewrite: Stop mergeing RewriteBase down to subdirectories
+  *) mod_rewrite: Stop merging RewriteBase down to subdirectories
      unless new option 'RewriteOptions MergeBase' is configured.
      Merging RewriteBase was unconditionally turned on in 2.2.23.
      PR 53963. [Eric Covener]