summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-10-08 14:05:28 (GMT)
committerBrad King <brad.king@kitware.com>2021-10-08 14:05:28 (GMT)
commit89c4dd6242b7e803a2f50e66d0f8d5f02ebe03d3 (patch)
treea9372fd66c173831aff3db02fd51652d06ccad84 /Help
parent8c27ccd9455559aed03c04750b41a8e741ec0074 (diff)
parent975b93512944e04c3817cbfe91fee1327ddfb834 (diff)
downloadCMake-89c4dd6242b7e803a2f50e66d0f8d5f02ebe03d3.zip
CMake-89c4dd6242b7e803a2f50e66d0f8d5f02ebe03d3.tar.gz
CMake-89c4dd6242b7e803a2f50e66d0f8d5f02ebe03d3.tar.bz2
Merge branch 'release-3.22'
Diffstat (limited to 'Help')
-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 131595a..3d2ed43 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
========