Splitting the release of new features in version 2.5

5 files changed, 17 insertions, 11 deletions

diff --git a/NEWS b/NEWS
index a30addf..8f4f258 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
-What's new in psycopg 2.4.6
----------------------------
+What's new in psycopg 2.5
+-------------------------
 
   - Added JSON adaptation.
   - Added support for PostgreSQL 9.2 range types.
@@ -10,6 +10,12 @@ What's new in psycopg 2.4.6
     Tobias Oberstein for the feature development.
   - connection.reset() implemented using DISCARD ALL on server versions
     supporting it.
+  - 'errorcodes' map updated to PostgreSQL 9.2.
+
+
+What's new in psycopg 2.4.5
+---------------------------
+
   - Fixed 'cursor()' arguments propagation in connection subclasses
     and overriding of the 'cursor_factory' argument.  Thanks to
     Corry Haines for the report and the initial patch (ticket #105).
@@ -21,12 +27,12 @@ What's new in psycopg 2.4.6
     (ticket #113).
   - 'register_hstore()', 'register_composite()', 'tpc_recover()' work with
     RealDictConnection and Cursor (ticket #114).
+  - Fixed broken pool for Zope (tickets #123, #125).
   - connect() raises an exception instead of swallowing keyword arguments
     when a connection string is specified as well (ticket #131).
   - Discard any result produced by 'executemany()' (ticket #133).
   - Fixed pickling of FixedOffsetTimezone objects (ticket #135).
   - Release the GIL around PQgetResult calls after COPY (ticket #140).
-  - 'errorcodes' map updated to PostgreSQL 9.2.
 
 
 What's new in psycopg 2.4.5
diff --git a/doc/src/connection.rst b/doc/src/connection.rst
index cc34155..997f96e 100644
--- a/doc/src/connection.rst
+++ b/doc/src/connection.rst
@@ -52,7 +52,7 @@ The ``connection`` class
         details.
 
         .. versionchanged:: 2.4.3 added the *withhold* argument.
-        .. versionchanged:: 2.4.6 added the *scrollable* argument.
+        .. versionchanged:: 2.5 added the *scrollable* argument.
 
         .. extension::
 
diff --git a/doc/src/cursor.rst b/doc/src/cursor.rst
index c7badb8..204fce2 100644
--- a/doc/src/cursor.rst
+++ b/doc/src/cursor.rst
@@ -132,7 +132,7 @@ The ``cursor`` class
             `connection.cursor()` *scrollable* parameter, otherwise the value
             will have no effect.
 
-        .. versionadded:: 2.4.6
+        .. versionadded:: 2.5
 
         .. extension::
 
diff --git a/doc/src/extras.rst b/doc/src/extras.rst
index fcb5a18..b42f1a4 100644
--- a/doc/src/extras.rst
+++ b/doc/src/extras.rst
@@ -137,7 +137,7 @@ Additional data types
 JSON_ adaptation
 ^^^^^^^^^^^^^^^^
 
-.. versionadded:: 2.4.6
+.. versionadded:: 2.5
 
 Psycopg can adapt Python objects to and from the PostgreSQL |pgjson|_ type.
 With PostgreSQL 9.2 adaptation is available out-of-the-box. To use JSON data
@@ -328,7 +328,7 @@ requires no adapter registration.
 
     .. versionchanged:: 2.4.3
         added support for array of composite types
-    .. versionchanged:: 2.4.6
+    .. versionchanged:: 2.5
         added the *factory* parameter
 
 
@@ -336,7 +336,7 @@ requires no adapter registration.
 
     .. automethod:: make
 
-        .. versionadded:: 2.4.6
+        .. versionadded:: 2.5
 
     Object attributes:
 
@@ -348,7 +348,7 @@ requires no adapter registration.
 
         The schema where the type is defined.
 
-        .. versionadded:: 2.4.6
+        .. versionadded:: 2.5
 
     .. attribute:: oid
 
@@ -379,7 +379,7 @@ requires no adapter registration.
 Range data types
 ^^^^^^^^^^^^^^^^
 
-.. versionadded:: 2.4.6
+.. versionadded:: 2.5
 
 Psycopg offers a `Range` Python type and supports adaptation between them and
 PostgreSQL |range|_ types. Builtin |range| types are supported out-of-the-box;
diff --git a/setup.py b/setup.py
index 34e2656..b48fab5 100644
--- a/setup.py
+++ b/setup.py
@@ -73,7 +73,7 @@ except ImportError:
 # Take a look at http://www.python.org/dev/peps/pep-0386/
 # for a consistent versioning pattern.
 
-PSYCOPG_VERSION = '2.4.6.dev0'
+PSYCOPG_VERSION = '2.5.dev0'
 
 version_flags   = ['dt', 'dec']