diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c3d596783..4645d8363c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1386,12 +1386,13 @@ release: - pushd "${BIND_DIRECTORY}-release" - mv "../${BIND_DIRECTORY}.tar.xz" . - tar --extract --file="${BIND_DIRECTORY}.tar.xz" - - mv "${BIND_DIRECTORY}"/{CHANGES*,COPYRIGHT,LICENSE,README.md,srcid} . + - mv "${BIND_DIRECTORY}"/{COPYRIGHT,LICENSE,README.md,srcid} . - rm -rf "${BIND_DIRECTORY}" - mv "../doc/arm/_build/html" doc/arm/ - mv "../doc/arm/_build/latex/Bv9ARM.pdf" doc/arm/ - mv "../doc/arm/_build/epub/Bv9ARM.epub" doc/arm/ - echo 'Redirect' > "RELEASE-NOTES-${BIND_DIRECTORY}.html" + - echo 'Redirect' > "CHANGELOG-${BIND_DIRECTORY}.html" - popd needs: - job: tarball-create diff --git a/.reuse/dep5 b/.reuse/dep5 index afb28c298f..e96c40b78e 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -26,7 +26,6 @@ Files: **/*.after* .gitlab/* .mailmap AUTHORS - CHANGES COPYRIGHT Makefile Makefile.* diff --git a/CHANGES b/CHANGES deleted file mode 120000 index d0de56f114..0000000000 --- a/CHANGES +++ /dev/null @@ -1 +0,0 @@ -doc/arm/changelog.rst \ No newline at end of file diff --git a/Makefile.am b/Makefile.am index 2f09561659..38c1a6f4ac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,6 @@ dist_sysconf_DATA = bind.keys EXTRA_DIST = \ util/bindkeys.pl \ contrib \ - CHANGES \ COPYRIGHT \ LICENSE \ *.md diff --git a/README.md b/README.md index 6439c5b329..7caf130970 100644 --- a/README.md +++ b/README.md @@ -154,7 +154,7 @@ Additional information on various subjects can be found in other #### Bug report identifiers -Most notes in the CHANGES file include a reference to a bug report or +Most notes in the ARM Changelog appendix include a reference to a bug report or issue number. Prior to 2018, these were usually of the form `[RT #NNN]` and referred to entries in the "bind9-bugs" RT database, which was not open to the public. More recent entries use the form `[GL #NNN]` or, less often, diff --git a/doc/arm/changelog.rst b/doc/arm/changelog.rst index 4cef4ffa3d..7ad7b321e4 100644 --- a/doc/arm/changelog.rst +++ b/doc/arm/changelog.rst @@ -14,7 +14,7 @@ Changelog ========= -.. note:: The following list contains detailed information about BIND9's +.. note:: The following list contains detailed information about BIND 9 development. Regular users should refer to :ref:`Release Notes ` for changes relevant to them.