forward ported NEWS and CHANGES from 0.11.2 to 1.0.1 and trunk

git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.0.x@982658 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 28 insertions, 13 deletions

diff --git a/CHANGES b/CHANGES
index fb2cc85a..65768af4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,32 +7,21 @@ Version 1.0.1
 Replicator:
 
   * Added support for replication via an HTTP/HTTP proxy.
-  * Fix bug when pushing design docs by non-admins, which was hanging the 
-    replicator for no good reason.
-  * Fix bug when pulling design documents from a source that requires 
-    basic-auth.
-  * Fix pull replication of attachments from 0.11 to 1.0.x
+  * Fix pull replication of attachments from 0.11 to 1.0.x.
   * Make the _changes feed work with non-integer seqnums.
-    
+
 HTTP Interface:
 
   * Show fields saved along with _deleted=true. Allows for auditing of deletes.
-  * Better error messages on invalid URL requests.
   * More robust Accept-header detection.
 
 Authentication:
 
   * Enable basic-auth popup when required to access the server, to prevent
     people from getting locked out.
-  * User documents can now be deleted by admins or the user.
-
-Security:
 
-  * Avoid potential DOS attack by guarding all creation of atoms.
-  
 Futon:
 
-  * Add some Futon files that were missing from the Makefile.
   * User interface element for querying stale (cached) views.
 
 Version 1.0.0
@@ -56,6 +45,32 @@ View Server:
  * Faster default view collation.
  * Added option to include update_seq in view responses.
 
+Version 0.11.2
+--------------
+
+Replicator:
+
+  * Fix bug when pushing design docs by non-admins, which was hanging the
+    replicator for no good reason.
+  * Fix bug when pulling design documents from a source that requires
+    basic-auth.
+
+HTTP Interface:
+
+  * Better error messages on invalid URL requests.
+
+Authentication:
+
+  * User documents can now be deleted by admins or the user.
+
+Security:
+
+  * Avoid potential DOS attack by guarding all creation of atoms.
+
+Futon:
+
+  * Add some Futon files that were missing from the Makefile.
+
 Version 0.11.1
 --------------