summaryrefslogtreecommitdiff
path: root/doc/source
diff options
context:
space:
mode:
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/dev/development_workflow.rst5
-rw-r--r--doc/source/release.rst1
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/source/dev/development_workflow.rst b/doc/source/dev/development_workflow.rst
index 291b1df73..900431374 100644
--- a/doc/source/dev/development_workflow.rst
+++ b/doc/source/dev/development_workflow.rst
@@ -203,8 +203,9 @@ function, you should
a description of and a motivation for your changes. This may generate
changes and feedback. It might be prudent to start with this step if your
change may be controversial.
-- add a release note to the ``changelog`` directory, following the instructions
- and format in the ``changelog/README.rst`` file.
+- add a release note to the ``doc/release/upcoming_changes/`` directory,
+ following the instructions and format in the
+ ``doc/release/upcoming_changes/README.rst`` file.
.. _rebasing-on-master:
diff --git a/doc/source/release.rst b/doc/source/release.rst
index 8dfb8db1d..f8d83726f 100644
--- a/doc/source/release.rst
+++ b/doc/source/release.rst
@@ -2,7 +2,6 @@
Release Notes
*************
-.. include:: ../release/1.18.0-notes.rst
.. include:: ../release/1.17.0-notes.rst
.. include:: ../release/1.16.4-notes.rst
.. include:: ../release/1.16.3-notes.rst