fixed up version numbers, etc

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

2 files changed, 34 insertions, 16 deletions

diff --git a/CHANGES b/CHANGES
index 1c609a20..8cf39aab 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,11 +2,32 @@ Apache CouchDB CHANGES
 ======================
 
 Version 1.1.0
---------------
+-------------
 
 This version has not been released yet.
 
 Version 1.0.0
+-------------
+
+Security:
+
+* Added authentication caching, to avoid repeated opening and closing of the
+  users database for each request requiring authentication.
+
+Storage System:
+
+* Small optimization for reordering result lists.
+* More efficient header commits.
+* Use O_APPEND to save lseeks.
+* Faster implementation of pread_iolist(). Further improves performance on
+  concurrent reads.
+
+View Server:
+
+* Faster default view collation.
+* Added option to include update_seq in view responses.
+
+Version 0.11.1
 --------------
 
 HTTP Interface:
@@ -43,8 +64,6 @@ Build and System Integration:
 Security:
 
  * Added authentication redirect URL to log in clients.
- * Added authentication caching, to avoid repeated opening and closing of the
-   users database for each request requiring authentication.
  * Fixed query parameter encoding issue in oauth.js.
  * Made authentication timeout configurable.
  * Temporary views are now admin-only resources.
@@ -56,14 +75,9 @@ Storage System:
    it's correct.
  * Make file deletions async to avoid pauses during compaction and db
    deletion.
- * Small optimization for reordering result lists.
  * Fixed for wrong offset when writing headers and converting them to blocks,
    only triggered when header is larger than 4k.
- * More efficient header commits.
  * Preserve _revs_limit and instance_start_time after compaction.
- * Use O_APPEND to save lseeks.
- * Faster implementation of pread_iolist(). Further improves performance on
-   concurrent reads.
 
 Configuration System:
 
@@ -84,9 +98,7 @@ View Server:
 
  * Provide a UUID to update functions (and all other functions) that they can
    use to create new docs.
- * Faster default view collation.
  * Upgrade CommonJS modules support to 1.1.1.
- * Added option to include update_seq in view responses.
  * Fixed erlang filter funs and normalize filter fun API.
  * Fixed hang in view shutdown.
 
diff --git a/NEWS b/NEWS
index cbda7fda..d0ad8cfd 100644
--- a/NEWS
+++ b/NEWS
@@ -8,11 +8,22 @@ For details about backwards incompatible changes, see:
 Each release section notes when backwards incompatible changes have been made.
 
 Version 1.1.0
---------------
+-------------
 
 This version has not been released yet.
 
 Version 1.0.0
+-------------
+
+* More efficient header commits.
+* Use O_APPEND to save lseeks.
+* Faster implementation of pread_iolist(). Further improves performance on
+  concurrent reads.
+* Added authentication caching
+* Faster default view collation.
+* Added option to include update_seq in view responses.
+
+Version 0.11.1
 --------------
 
  * Mask passwords in active tasks and logging.
@@ -41,11 +52,7 @@ Version 1.0.0
    deletion.
  * Fixed for wrong offset when writing headers and converting them to blocks,
    only triggered when header is larger than 4k.
- * More efficient header commits.
  * Preserve _revs_limit and instance_start_time after compaction.
- * Use O_APPEND to save lseeks.
- * Faster implementation of pread_iolist(). Further improves performance on
-   concurrent reads.
  * Fixed timeout with large .ini files.
  * Added tests for couch.js and jquery.couch.js
  * Added various API features to jquery.couch.js
@@ -61,7 +68,6 @@ Version 1.0.0
  * Allow isolation of databases with vhosts.
  * Made the test suite overall more reliable.
 
-
 Version 0.11.0
 --------------