From: Eric Covener <covener@apache.org>
Date: Sat, 4 Dec 2010 03:41:01 +0000 (+0000)
Subject: clarify about "enable/disable".
X-Git-Tag: 2.3.10~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=561d44d71feade9d4ebc71d12cbd963be197f09a;p=thirdparty%2Fapache%2Fhttpd.git

clarify about "enable/disable".



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

diff --git a/CHANGES b/CHANGES
index e026c79bf61..a74219c3621 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,8 +2,9 @@
 
 Changes with Apache 2.3.10
 
-  *) mod_userdir: Add merging of enable, disable, and filename arguments 
-     to UserDir directive, leave userlists unmerged. PR 44076 [Eric Covener]
+  *) mod_userdir: Add merging of (enable, disable, and filename arguments 
+     to UserDir directive, leaving enable/disable userlists unmerged. 
+     PR 44076 [Eric Covener]
 
   *) httpd: When no -k option is provided on the httpd command line, the server
      was starting without checking for an existing pidfile.  PR 50350