Edit for consistency between 2.4 and 2.2 CHANGES forks

Submitted by: jim

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

diff --git a/CHANGES b/CHANGES
index 11268be62ed5c67a523f3ce3f8344a2cedab0592..a84c48fecca6cd64315be0c1664e0cd3a66942ce 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,12 +2,10 @@
 Changes with Apache 2.2.30
 
   *) In alignment with RFC 7525, the default recommended SSLCipherSuite
-     and SSLProxyCipherSuite now exclude RC4 as well as MD5.  Existing
-     configurations must be adjusted by the administrator. [William Rowe]
-
-  *) In alignment with RFC 7525, the default recommended SSLProtocol and
-     SSLProxyProtocol directives now excludes SSLv3.  Existing configurations 
-     must be adjusted by the administrator. [William Rowe]
+     and SSLProxyCipherSuite now exclude RC4 as well as MD5. Also, the
+     default recommended SSLProtocol and SSLProxyProtocol directives now
+     excludes SSLv3. Existing configurations must be adjusted by the
+     administrator. [William Rowe]
 
   *) core: Avoid potential use of uninitialized (NULL) request data in
      request line error path. [Yann Ylavic]