summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES6
-rw-r--r--NEWS15
-rw-r--r--acinclude.m4.in4
3 files changed, 15 insertions, 10 deletions
diff --git a/CHANGES b/CHANGES
index 68f40e61..90852168 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,14 @@
Apache CouchDB CHANGES
======================
-Version 0.11.0
+Version 0.12.0
--------------
This version has not been released yet.
+Version 0.11.0
+--------------
+
Security:
* Added default cookie-authentication and users database.
@@ -69,6 +72,7 @@ Futon:
Build and System Integration:
+ * Updated and improved source documentation.
* Added support for building a Windows installer as part of 'make dist'.
* Bug fix for building couch.app's module list.
* ETap tests are now run during make distcheck. This included a number of
diff --git a/NEWS b/NEWS
index e3c8cbaa..c7dd4ffa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,19 +1,20 @@
Apache CouchDB NEWS
===================
-For details about backwards incompatible changes, please see:
+For details about backwards incompatible changes, see:
http://wiki.apache.org/couchdb/Breaking_changes
Each release section notes when backwards incompatible changes have been made.
-Version 0.11.0
+Version 0.12.0
--------------
-This version is a feature-freeze release candidate for Apache CouchDB 1.0.
-
This version has not been released yet.
+Version 0.11.0
+--------------
+
* Added support for building a Windows installer as part of 'make dist'.
* Added optional 'raw' binary collation for faster view builds where Unicode
collation is not important.
@@ -44,7 +45,7 @@ This version has not been released yet.
* Added proxy authentication handler.
* Added ability to replicate documents by id.
* Added virtual host handling.
- * Query server uses json2.js for JSON serialization compatiblity with native JSON.
+ * Uses json2.js for JSON serialization compatiblity with native JSON.
Version 0.10.1
--------------
@@ -185,8 +186,8 @@ Version 0.3.0
* CouchDB now fully supports Unicode and locale specific collation via the ICU
library, both in the Fabric engine and computed tables.
* The `in` operator has been added to Fabric.
- * The `startdoc` query string variable specifies the starting document to use if
- there are multiple rows with identical startkeys.
+ * The `startdoc` query string variable specifies the starting document to use
+ if there are multiple rows with identical startkeys.
* The `skip` query string variable specifies the number of rows to skip before
returning results. The `skip` value must be a positive integer. If used with
a `count` variable the skipped rows aren't counted as output.
diff --git a/acinclude.m4.in b/acinclude.m4.in
index 3d854750..ccfe9da7 100644
--- a/acinclude.m4.in
+++ b/acinclude.m4.in
@@ -17,9 +17,9 @@ m4_define([LOCAL_PACKAGE_TARNAME], [apache-couchdb])
m4_define([LOCAL_PACKAGE_NAME], [Apache CouchDB])
m4_define([LOCAL_BUG_URI], [https://issues.apache.org/jira/browse/COUCHDB])
m4_define([LOCAL_VERSION_MAJOR], [0])
-m4_define([LOCAL_VERSION_MINOR], [11])
+m4_define([LOCAL_VERSION_MINOR], [12])
m4_define([LOCAL_VERSION_REVISION], [0])
-m4_define([LOCAL_VERSION_STAGE], [b])
+m4_define([LOCAL_VERSION_STAGE], [a])
m4_define([LOCAL_VERSION_RELEASE], [%release%])
m4_define([LOCAL_VERSION_PRIMARY],
[LOCAL_VERSION_MAJOR.LOCAL_VERSION_MINOR.LOCAL_VERSION_REVISION])