A nice end to a crazy day... laptop's fixed and life goes on.

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

diff --git a/CHANGES b/CHANGES
index 2b982b45cfaf294017c381d8036b0155fc5fa9ba..2bbb39b1bb19d6d215898a00ddd8b1117d101841 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 Changes with Apache 2.0.36
 
+  *) Fix Win32 NTFS Junctions (symlinks).  PR 8014  [William Rowe]
+
+  *) Fix Win32 'short name' aliases in httpd.conf directives.
+     PR 8009  [William Rowe]
+
   *) Fix generation of default httpd.conf when the layout paths are
      disjoint.  PR 7979, 8227.  [Justin Erenkrantz]