From: Joshua Slive <slive@apache.org>
Date: Sat, 9 Apr 2005 17:08:26 +0000 (+0000)
Subject: Add a CHANGES entry for the simple-conf branch changes.
X-Git-Tag: 2.1.5~205
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7dcf50f0030104e4128aaa6101bda506199e8da9;p=thirdparty%2Fapache%2Fhttpd.git

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 b77882a74c5..77c5b75dd0d 100644
--- 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.