summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-02-06 16:27:26 (GMT)
committerBrad King <brad.king@kitware.com>2017-02-06 16:27:26 (GMT)
commitc9bb3530dc6117b495237113d38dc7d812b23b72 (patch)
tree497fd2a0543b40fedd7427441d797c46fc5b3ebf /Help
parent92be2fb392d694dffc80e635f4ac10212cfd7ef9 (diff)
parent566d20771f82492081c55c9da6f1768941eee40a (diff)
downloadCMake-c9bb3530dc6117b495237113d38dc7d812b23b72.zip
CMake-c9bb3530dc6117b495237113d38dc7d812b23b72.tar.gz
CMake-c9bb3530dc6117b495237113d38dc7d812b23b72.tar.bz2
Merge branch 'release'
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 292c9a8..8f0f252 100644
--- a/Help/release/index.rst
+++ b/Help/release/index.rst
@@ -5,8 +5,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
========