Merge "Add history.rst that uses generated 'ChangeLog' file"

2015-06-29 02:57:09 +00:00
parent 857782e6bf a629f3fc9a
commit b8dab64a8c
3 changed files with 11 additions and 0 deletions
--- a/1
+++ b/1
@@ -0,0 +1 @@
+.. This is a generated file! Do not edit.
--- a/doc/source/history.rst
+++ b/doc/source/history.rst
@@ -0,0 +1,2 @@
+.. include:: ../../ChangeLog
+
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -103,6 +103,14 @@ projects, frameworks and libraries.

   shelf

+History
+-------
+
+.. toctree::
+   :maxdepth: 2
+
+   history
+
 Indices and tables
 ==================