summaryrefslogtreecommitdiffstats
path: root/Help/release
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-06-17 17:17:49 (GMT)
committerBrad King <brad.king@kitware.com>2021-06-17 17:17:49 (GMT)
commit2d335de47de83b5b403178415817b9abf96cfb06 (patch)
tree0179473fce736dd476eff1c25bcfbe822f91e205 /Help/release
parent8850f6e23fd6ab033b9e24eb041a6c4a21742c7b (diff)
parent22fb0713a25ac4ecfbbc1e1c24f440ba83a175b8 (diff)
downloadCMake-2d335de47de83b5b403178415817b9abf96cfb06.zip
CMake-2d335de47de83b5b403178415817b9abf96cfb06.tar.gz
CMake-2d335de47de83b5b403178415817b9abf96cfb06.tar.bz2
Merge branch 'release-3.21'
Diffstat (limited to 'Help/release')
-rw-r--r--Help/release/dev/0-sample-topic.rst7
-rw-r--r--Help/release/index.rst2
2 files changed, 0 insertions, 9 deletions
diff --git a/Help/release/dev/0-sample-topic.rst b/Help/release/dev/0-sample-topic.rst
deleted file mode 100644
index e4cc01e..0000000
--- a/Help/release/dev/0-sample-topic.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-0-sample-topic
---------------
-
-* This is a sample release note for the change in a topic.
- Developers should add similar notes for each topic branch
- making a noteworthy change. Each document should be named
- and titled to match the topic name to avoid merge conflicts.
diff --git a/Help/release/index.rst b/Help/release/index.rst
index 5938878..75667e5 100644
--- a/Help/release/index.rst
+++ b/Help/release/index.rst
@@ -7,8 +7,6 @@ CMake Release Notes
This file should include the adjacent "dev.txt" file
in development versions but not in release versions.
-.. include:: dev.txt
-
Releases
========