- 1.2.0b2

diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst
index 8c076a9bcd410a42caf96ae06af66f8fd294e6df..fb5b6b64834d93e9c663ff2126328a4101fbc649 100644 (file)
--- a/doc/build/changelog/changelog_12.rst
+++ b/doc/build/changelog/changelog_12.rst
@@ -12,7 +12,17 @@
 
 .. changelog::
     :version: 1.2.0b2
-    :include_notes_from: unreleased_12
+    :released: July 24, 2017
+
+    .. change:: 4033
+        :tags: bug, orm
+        :tickets: 4033
+
+        Fixed regression from 1.1.11 where adding additional non-entity
+        columns to a query that includes an entity with subqueryload
+        relationships would fail, due to an inspection added in 1.1.11 as a
+        result of :ticket:`4011`.
+
 
 .. changelog::
     :version: 1.2.0b1

diff --git a/doc/build/changelog/unreleased_12/4033.rst b/doc/build/changelog/unreleased_12/4033.rst
deleted file mode 100644 (file)
index 680ad2f..0000000
--- a/doc/build/changelog/unreleased_12/4033.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. change:: 4033
-    :tags: bug, orm
-    :tickets: 4033
-
-    Fixed regression from 1.1.11 where adding additional non-entity
-    columns to a query that includes an entity with subqueryload
-    relationships would fail, due to an inspection added in 1.1.11 as a
-    result of :ticket:`4011`.
-

diff --git a/doc/build/conf.py b/doc/build/conf.py
index eadd07dfc04039831c08515fc6efa7d35c6fe788..5a1d66aef80ef633a97d4289c88c1493c307b4e2 100644 (file)
--- a/doc/build/conf.py
+++ b/doc/build/conf.py
@@ -110,9 +110,9 @@ copyright = u'2007-2017, the SQLAlchemy authors and contributors'
 # The short X.Y version.
 version = "1.2"
 # The full version, including alpha/beta/rc tags.
-release = "1.2.0b1"
+release = "1.2.0b2"
 
-release_date = "July 10, 2017"
+release_date = "July 24, 2017"
 
 site_base = os.environ.get("RTD_SITE_BASE", "http://www.sqlalchemy.org")
 site_adapter_template = "docs_adapter.mako"