- convert to spaces

- restore unreleased directories

Change-Id: Ia5c1142ffbdba6372f800c2e2521660ab62d9c4f

diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index 1fba5b9a389ceefddc2b8aebc3c60b8cfeb28761..7dd702325de67838d1f3ca11e9b56741e4312990 100644 (file)
--- a/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@ -18,6 +18,7 @@
 
 .. changelog::
     :version: 1.0.19
+    :include_notes_from: unreleased_10
 
 .. changelog::
     :version: 1.0.18

diff --git a/doc/build/changelog/changelog_11.rst b/doc/build/changelog/changelog_11.rst
index e79670390de453ab9563e2cc8cd792266243922f..74b00fac070848773adf59991a1c3f953352f5d7 100644 (file)
--- a/doc/build/changelog/changelog_11.rst
+++ b/doc/build/changelog/changelog_11.rst
@@ -20,6 +20,7 @@
 
 .. changelog::
     :version: 1.1.13
+    :include_notes_from: unreleased_11
 
 .. changelog::
     :version: 1.1.12

diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst
index f1bf05f6b13b3b6a5a2748aced72703ae04a3f08..4de1ae9bb2a14c5a6c648297cfe0617dc8f2f06f 100644 (file)
--- a/doc/build/changelog/changelog_12.rst
+++ b/doc/build/changelog/changelog_12.rst
@@ -12,6 +12,7 @@
 
 .. changelog::
     :version: 1.2.0b3
+    :include_notes_from: unreleased_12
 
 .. changelog::
     :version: 1.2.0b2

diff --git a/doc/build/changelog/unreleased_10/4035.rst b/doc/build/changelog/unreleased_10/4035.rst
index 74acdfe710c47ff0646b3a3563e19b313a155039..b1dcd7dccbfaed3134c4fc6fe97d68ccd5d7e5df 100644 (file)
--- a/doc/build/changelog/unreleased_10/4035.rst
+++ b/doc/build/changelog/unreleased_10/4035.rst
@@ -1,15 +1,15 @@
 .. change::
-       :tags: bug, oracle, performance, py2k
-       :tickets: 4035
-       :versions: 1.0.19, 1.1.13, 1.2.0b3
+    :tags: bug, oracle, performance, py2k
+    :tickets: 4035
+    :versions: 1.0.19, 1.1.13, 1.2.0b3
 
-       Fixed performance regression caused by the fix for :ticket:`3937` where
-       cx_Oracle as of version 5.3 dropped the ``.UNICODE`` symbol from its
-       namespace,  which was interpreted as cx_Oracle's "WITH_UNICODE" mode being
-       turned on unconditionally, which invokes functions on the SQLAlchemy
-       side which convert all strings to unicode unconditionally and causing
-       a performance impact.  In fact, per cx_Oracle's author the
-       "WITH_UNICODE" mode has been removed entirely as of 5.1, so the expensive unicode
-       conversion functions are no longer necessary and are disabled if
-       cx_Oracle 5.1 or greater is detected under Python 2.  The warning against
-       "WITH_UNICODE" mode that was removed under :ticket:`3937` is also restored.
+    Fixed performance regression caused by the fix for :ticket:`3937` where
+    cx_Oracle as of version 5.3 dropped the ``.UNICODE`` symbol from its
+    namespace,  which was interpreted as cx_Oracle's "WITH_UNICODE" mode being
+    turned on unconditionally, which invokes functions on the SQLAlchemy
+    side which convert all strings to unicode unconditionally and causing
+    a performance impact.  In fact, per cx_Oracle's author the
+    "WITH_UNICODE" mode has been removed entirely as of 5.1, so the expensive unicode
+    conversion functions are no longer necessary and are disabled if
+    cx_Oracle 5.1 or greater is detected under Python 2.  The warning against
+    "WITH_UNICODE" mode that was removed under :ticket:`3937` is also restored.