summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-10-05 13:59:57 (GMT)
committerBrad King <brad.king@kitware.com>2017-10-05 13:59:57 (GMT)
commitba8aa6899d69068cfc5d04a5d21552fe45a3380c (patch)
treeac9d4d836c583db795bf34d919d51693fb5ef0b4 /Help
parent7f9783c2db342ea7fdb8a390713b427965aa635e (diff)
downloadCMake-ba8aa6899d69068cfc5d04a5d21552fe45a3380c.zip
CMake-ba8aa6899d69068cfc5d04a5d21552fe45a3380c.tar.gz
CMake-ba8aa6899d69068cfc5d04a5d21552fe45a3380c.tar.bz2
Begin post-3.10 development
Diffstat (limited to 'Help')
-rw-r--r--Help/release/dev/0-sample-topic.rst7
-rw-r--r--Help/release/index.rst2
2 files changed, 9 insertions, 0 deletions
diff --git a/Help/release/dev/0-sample-topic.rst b/Help/release/dev/0-sample-topic.rst
new file mode 100644
index 0000000..e4cc01e
--- /dev/null
+++ b/Help/release/dev/0-sample-topic.rst
@@ -0,0 +1,7 @@
+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 0c7572f..6472b51 100644
--- a/Help/release/index.rst
+++ b/Help/release/index.rst
@@ -7,6 +7,8 @@ CMake Release Notes
This file should include the adjacent "dev.txt" file
in development versions but not in release versions.
+.. include:: dev.txt
+
Releases
========