summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-02-06 15:11:11 (GMT)
committerBrad King <brad.king@kitware.com>2019-02-06 15:11:11 (GMT)
commit062cfd991faac000d484c74e5af7d65726c655dc (patch)
tree85aa18a18446854cfcb25537937f88b0668d9457 /Help
parente97a4bed4f35e2508227460b0c537c9868925a6e (diff)
downloadCMake-062cfd991faac000d484c74e5af7d65726c655dc.zip
CMake-062cfd991faac000d484c74e5af7d65726c655dc.tar.gz
CMake-062cfd991faac000d484c74e5af7d65726c655dc.tar.bz2
Begin post-3.14 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 4fcd4ca..2318e03 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
========