From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 11 Nov 2016 17:04:37 +0000 (-0500)
Subject:  - oragnize the changelog with tokens per .. change:: to allow
X-Git-Tag: rel_1_0_16~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=014bc59237706b546c6177d5d29c996ac45e5250;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

 - oragnize the changelog with tokens per .. change:: to allow
   three way merges to succeed (hopefully). requires bump of changelog
   package.

Change-Id: Ia23b1754ad7e0841c6513647f0dd4987112a0511
---

diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index 85e4c8018c..fec02a2779 100644
--- a/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@ -18,7 +18,7 @@
 .. changelog::
     :version: 1.0.16
 
-    .. change::
+    .. change:: 3849
         :tags: bug, orm
         :tickets: 3849
         :versions: 1.1.4
@@ -66,7 +66,7 @@
         :meth:`.Session.bind_table`,
         or the constructor would fail to be correctly raised.
 
-    .. change::
+    .. change:: 3791
         :tags: bug, mssql
         :tickes: 3791
         :versions: 1.1.0
@@ -75,7 +75,7 @@
         disconnect exceptions that result in a connection pool reset.  Pull
         request courtesy Ken Robbins.
 
-    .. change::
+    .. change:: 3797
         :tags: bug, orm.declarative
         :tickets: 3797
         :versions: 1.1.0
@@ -85,7 +85,7 @@
         collection of the mapped table, thereby interfering with the
         initialization of relationships.
 
-    .. change::
+    .. change:: 3781
         :tags: bug, orm
         :tickets: 3781
         :versions: 1.1.4
@@ -94,9 +94,8 @@
         not function correctly in conjunction with a mapping that
         implements a version id counter.
 
-    .. 3778
-
-    .. change::
+    .. change:: 3778
+        :tags: bug, orm
         :tickets: 3778
         :versions: 1.1.4
 
diff --git a/doc/build/requirements.txt b/doc/build/requirements.txt
index d1eb23d0fe..94657001ff 100644
--- a/doc/build/requirements.txt
+++ b/doc/build/requirements.txt
@@ -1,3 +1,3 @@
-changelog>=0.3.4
+changelog>=0.3.5
 sphinx-paramlinks>=0.2.2
 git+https://bitbucket.org/zzzeek/zzzeeksphinx.git@HEAD#egg=zzzeeksphinx