summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-06-01 14:58:02 (GMT)
committerBrad King <brad.king@kitware.com>2016-06-01 14:58:02 (GMT)
commitb2ef225ab9de94e9d5e46549c9bce5c956973ca8 (patch)
tree27eed9b16ebb673716031af90da1a94b14d5a0be /Help
parent9d81f1b3aaa82d12a3a87067572b3ff5e2b9c4d2 (diff)
parent91f6e7904aa89ae8249680a53c5971c4173a9bed (diff)
downloadCMake-b2ef225ab9de94e9d5e46549c9bce5c956973ca8.zip
CMake-b2ef225ab9de94e9d5e46549c9bce5c956973ca8.tar.gz
CMake-b2ef225ab9de94e9d5e46549c9bce5c956973ca8.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 e93b880..92c3b63 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
========