Add a CHANGES entry for the simple-conf branch changes.

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

diff --git a/CHANGES b/CHANGES
index b77882a74c57b78511a38c641e367fec31fe3206..77c5b75dd0d238692846921176d371bafef2ecac 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,22 @@ Changes with Apache 2.1.5
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Change the default (when not present in the config file) setting
+     for UseCanonicalName to Off.
+     [Joshua Slive]
+
+  *) mod_userdir: The module no longer does any remapping unless the
+     UserDir directive is present in the config file.
+     [Joshua Slive]
+
+  *) Massively simplify the distributed httpd.conf by removing
+     many features and many directives that are at their default
+     setting.  Add a selection of example config excerpts for adding
+     extra features in the conf/extra/ directory.  Install the
+     distributed config and the extra config examples in the
+     conf/original/ directory during make install.
+     [Joshua Slive, Justin Erenkrantz]
+
   *) NetWare: Reposition mod_asis, mod_actions, mod_cgi, mod_imagemap,
      mod_userdir and mod_autoindex as shared modules rather than 
      built-in modules within the NetWare build.