consolidate CHANGES. [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1895901 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 05e967c2ae491527e04dbf551ae3b85ddfa2d8b7..d3af8ac61278332055765b670ff7804714ce15d5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,21 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.52
 
+  *) mod_http: Correctly sent a 100 Continue status code when sending an interim
+     response as result of an Expect: 100-Continue in the request and not the
+     current status code of the request. PR 65725 [Ruediger Pluem]
+
+  *) mod_dav: Some DAV extensions, like CalDAV, specify both document
+     elements and property elements that need to be taken into account
+     when generating a property. The document element and property element
+     are made available in the dav_liveprop_elem structure by calling
+     dav_get_liveprop_element(). [Graham Leggett]
+
+  *) mod_dav: Add utility functions dav_validate_root_ns(),
+     dav_find_child_ns(), dav_find_next_ns(), dav_find_attr_ns() and
+     dav_find_attr() so that other modules get to play too.
+     [Graham Leggett]
+
   *) mpm_event: Restart stopping of idle children after a load peak. PR 65626.
      [Yann Ylavic, Ruediger Pluem]
 

diff --git a/changes-entries/mod_dav-element.txt b/changes-entries/mod_dav-element.txt
deleted file mode 100644 (file)
index e797f27..0000000
--- a/changes-entries/mod_dav-element.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-  *) mod_dav: Some DAV extensions, like CalDAV, specify both document
-     elements and property elements that need to be taken into account
-     when generating a property. The document element and property element
-     are made available in the dav_liveprop_elem structure by calling
-     dav_get_liveprop_element(). [Graham Leggett]
-
-

diff --git a/changes-entries/mod_dav-ns.txt b/changes-entries/mod_dav-ns.txt
deleted file mode 100644 (file)
index 3061905..0000000
--- a/changes-entries/mod_dav-ns.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  *) mod_dav: Add utility functions dav_validate_root_ns(),
-     dav_find_child_ns(), dav_find_next_ns(), dav_find_attr_ns() and
-     dav_find_attr() so that other modules get to play too.
-     [Graham Leggett]
-

diff --git a/changes-entries/pr65725.txt b/changes-entries/pr65725.txt
deleted file mode 100644 (file)
index 3e8fee9..0000000
--- a/changes-entries/pr65725.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  *) mod_http: Correctly sent a 100 Continue status code when sending an interim
-     response as result of an Expect: 100-Continue in the request and not the
-     current status code of the request. PR 65725 [Ruediger Pluem]