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/trunk@982658 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 68 insertions, 0 deletions

diff --git a/CHANGES b/CHANGES
index d6ab8cf6..87cb5103 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,29 @@ Version 1.1.0
 
 This version has not been released yet.
 
+Version 1.0.1
+-------------
+
+Replicator:
+
+  * Added support for replication via an HTTP/HTTP proxy.
+  * 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.
+  * More robust Accept-header detection.
+
+Authentication:
+
+  * Enable basic-auth popup when required to access the server, to prevent
+    people from getting locked out.
+
+Futon:
+
+  * User interface element for querying stale (cached) views.
+
 Version 1.0.0
 -------------
 
@@ -27,6 +50,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
 --------------
 
diff --git a/NEWS b/NEWS
index 8e4f4e8b..1c39b241 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,16 @@ Version 1.1.0
 
 This version has not been released yet.
 
+Version 1.0.1
+-------------
+
+  * Added support for replication via an HTTP/HTTP proxy.
+  * Fixed various replicator bugs for interop with older CouchDB versions.
+  * Show fields saved along with _deleted=true. Allows for auditing of deletes.
+  * Enable basic-auth popup when required to access the server, to prevent
+    people from getting locked out.
+  * User interface element for querying stale (cached) views.
+
 Version 1.0.0
 -------------
 
@@ -23,6 +33,15 @@ Version 1.0.0
  * Faster default view collation.
  * Added option to include update_seq in view responses.
 
+Version 0.11.2
+--------------
+
+  * Replicator buxfixes for design documents and secured databases.
+  * Better error messages on invalid URL requests.
+  * User documents can now be deleted by admins or the user.
+  * Avoid potential DOS attack by guarding all creation of atoms.
+  * Some Futon and JavaScript library bugfixes.
+
 Version 0.11.1
 --------------