Merge pull request #100 from openrsp/radovan/mv-changelog

make changelog part of the manual/website
openrsp · Jun 30, 2020 · fe767cf · fe767cf
2 parents 523f417 + cf68c2f
commit fe767cf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -61,7 +61,7 @@ and for external contributors:
   PR page.
 * The title of your pull request should be marked with `[WIP]` if it’s a work
   in progress. Feel free to use as many labels as you think necessary!
-* Update the [`ChangeLog.rst`] file. We follow the conventions and recommendations detailed at
+* Update the [doc/changelog.rst](../doc/changelog.rst) file. We follow the conventions and recommendations detailed at
   [keepachangelog.com]
 * When you're ready to be considered for merging, check the "Ready to go" box
   on the PR page to let the OpenRSP team know that the changes are complete.
@@ -91,6 +91,5 @@ and for external contributors:
 [STYLE_GUIDE.md file]: ../STYLE_GUIDE.md
 [Developer Certificate of Origin]: https://developercertificate.org/
 [pull request]: https://help.github.com/articles/using-pull-requests/
-[`ChangeLog.rst`]: ../ChangeLog.rst
 [keepachangelog.com]: https://keepachangelog.com/en/1.0.0/
 [LGPL v2.1 License]: ../LICENSE
diff --git a/ChangeLog.rst → doc/changelog.rst b/ChangeLog.rst → doc/changelog.rst
@@ -1,7 +1,8 @@
 
 
-OpenRSP changelog
-=================
+Version history and changelog
+=============================
+
 
 Version 1.0.0-alpha (2018)
 --------------------------

diff --git a/doc/index.rst b/doc/index.rst
@@ -15,6 +15,7 @@ you can get involved.
    authors.rst
    citations.rst
    history.rst
+   changelog.rst
    programs_with_openrsp.rst
    papers_openrsp_all.rst
    theoretical_background.rst