From c7b154eaf47719923c41498453571e04b6de1141 Mon Sep 17 00:00:00 2001 From: jonathan vanasco Date: Mon, 13 Apr 2020 17:24:47 -0400 Subject: [PATCH] consolidating README --- doc/build/changelog/{unreleased_XX => }/README.txt | 4 +++- doc/build/changelog/unreleased_10/README.txt | 11 ----------- doc/build/changelog/unreleased_11/README.txt | 12 ------------ doc/build/changelog/unreleased_12/README.txt | 12 ------------ doc/build/changelog/unreleased_13/README.txt | 12 ------------ doc/build/changelog/unreleased_14/README.txt | 12 ------------ 6 files changed, 3 insertions(+), 60 deletions(-) rename doc/build/changelog/{unreleased_XX => }/README.txt (83%) delete mode 100644 doc/build/changelog/unreleased_10/README.txt delete mode 100644 doc/build/changelog/unreleased_11/README.txt delete mode 100644 doc/build/changelog/unreleased_12/README.txt delete mode 100644 doc/build/changelog/unreleased_13/README.txt delete mode 100644 doc/build/changelog/unreleased_14/README.txt 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 037a23509d..8f9a2a649d 100644 --- 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 index 86b91221f4..0000000000 --- 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 index 1d2b3446e4..0000000000 --- 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 index 1d2b3446e4..0000000000 --- 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 index 1d2b3446e4..0000000000 --- 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 index 1d2b3446e4..0000000000 --- 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. - -- 2.47.3