consolidating README

diff --git a/doc/build/changelog/unreleased_XX/README.txt b/doc/build/changelog/README.txt
similarity index 83%
rename from doc/build/changelog/unreleased_XX/README.txt
rename to doc/build/changelog/README.txt
index 037a23509d24406da62777da737d65a6b7fca39f..8f9a2a649dff72a0174c7a036d063871393b2a9b 100644 (file)
--- a/doc/build/changelog/unreleased_XX/README.txt
+++ b/doc/build/changelog/README.txt
@@ -1,4 +1,6 @@
-Individual per-changelog files go here in `.rst` format, which are pulled in by
+Individual per-changelog files are placed into their corresponding release's
+directory (for example: changelog files for the `1.4` branch are placed in the 
+`./unreleased_14/` directory). Files are in `.rst` format, which are pulled in by
 changelog (https://github.com/sqlalchemyorg/changelog; version 0.4.0 or higher) 
 to be rendered into the `changelog_xx.rst` file.
 

diff --git a/doc/build/changelog/unreleased_10/README.txt b/doc/build/changelog/unreleased_10/README.txt
deleted file mode 100644 (file)
index 86b9122..0000000
--- a/doc/build/changelog/unreleased_10/README.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644 (file)
index 1d2b344..0000000
--- a/doc/build/changelog/unreleased_11/README.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-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_12/README.txt b/doc/build/changelog/unreleased_12/README.txt
deleted file mode 100644 (file)
index 1d2b344..0000000
--- a/doc/build/changelog/unreleased_12/README.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-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_13/README.txt b/doc/build/changelog/unreleased_13/README.txt
deleted file mode 100644 (file)
index 1d2b344..0000000
--- a/doc/build/changelog/unreleased_13/README.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-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_14/README.txt b/doc/build/changelog/unreleased_14/README.txt
deleted file mode 100644 (file)
index 1d2b344..0000000
--- a/doc/build/changelog/unreleased_14/README.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-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.
-