summaryrefslogtreecommitdiffstats
path: root/Help/release
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-10-08 15:27:34 (GMT)
committerBrad King <brad.king@kitware.com>2020-10-08 15:27:34 (GMT)
commit5d1755fab1fdc9b00da926d35749151ac8985804 (patch)
tree7944df11eb04443bcfd1acb7b2bd7a18665fe2af /Help/release
parent85c2bb724f22b01e1b2f96b68ff73971c1638fbf (diff)
parent302b00a2628860eeac59688795db337b8b7984c1 (diff)
downloadCMake-5d1755fab1fdc9b00da926d35749151ac8985804.zip
CMake-5d1755fab1fdc9b00da926d35749151ac8985804.tar.gz
CMake-5d1755fab1fdc9b00da926d35749151ac8985804.tar.bz2
Merge branch 'release-3.19' into master
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 a8329a6..6fb0f1a 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
========