From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 24 Jul 2017 14:50:37 +0000 (-0400)
Subject: - Merge directory holder README from 1.0.x and also 1.0's changelog
X-Git-Tag: rel_1_1_12~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e794a199d0a9be955d079a17acd11ceaa9317cc;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- Merge directory holder README from 1.0.x and also 1.0's changelog

Change-Id: I588eebd027b4ad3428bd522f36a6f1cd77f105bb
(cherry picked from commit 39c72682b85c1d3912ced383733d03eca7a43845)
---

diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index d282fa3a11..95ec163219 100644
--- a/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@ -18,16 +18,7 @@
 
 .. changelog::
     :version: 1.0.18
-
-    .. change:: 3937
-        :tags: bug, oracle
-        :tickets: 3937
-        :versions: 1.1.7
-
-        A fix to cx_Oracle's WITH_UNICODE mode which was uncovered by the
-        fact that cx_Oracle 5.3 now seems to hardcode this flag on in
-        the build; an internal method that uses this mode wasn't using
-        the correct signature.
+    :include_notes_from: unreleased_10
 
 
 .. changelog::
diff --git a/doc/build/changelog/unreleased_10/3937.rst b/doc/build/changelog/unreleased_10/3937.rst
new file mode 100644
index 0000000000..191da65e8e
--- /dev/null
+++ b/doc/build/changelog/unreleased_10/3937.rst
@@ -0,0 +1,9 @@
+.. change:: 3937
+    :tags: bug, oracle
+    :tickets: 3937
+    :versions: 1.1.7
+
+    A fix to cx_Oracle's WITH_UNICODE mode which was uncovered by the
+    fact that cx_Oracle 5.3 now seems to hardcode this flag on in
+    the build; an internal method that uses this mode wasn't using
+    the correct signature.
diff --git a/doc/build/changelog/unreleased_10/README.txt b/doc/build/changelog/unreleased_10/README.txt
new file mode 100644
index 0000000000..86b91221f4
--- /dev/null
+++ b/doc/build/changelog/unreleased_10/README.txt
@@ -0,0 +1,11 @@
+Individual per-changelog files go here
+in .rst format, which are pulled in by
+changelog (version 0.4.0 or higher) to
+be rendered into the changelog_xx.rst file.
+At release time, the files here are removed and written
+directly into the changelog.
+
+Rationale is so that multiple changes being merged
+into gerrit don't produce conflicts.   Note that
+gerrit does not support custom merge handlers unlike
+git itself.
diff --git a/doc/build/changelog/unreleased_11/README.txt b/doc/build/changelog/unreleased_11/README.txt
new file mode 100644
index 0000000000..1d2b3446e4
--- /dev/null
+++ b/doc/build/changelog/unreleased_11/README.txt
@@ -0,0 +1,12 @@
+Individual per-changelog files go here
+in .rst format, which are pulled in by
+changelog (version 0.4.0 or higher) to
+be rendered into the changelog_xx.rst file.
+At release time, the files here are removed and written
+directly into the changelog.
+
+Rationale is so that multiple changes being merged
+into gerrit don't produce conflicts.   Note that
+gerrit does not support custom merge handlers unlike
+git itself.
+