diff options
| author | Vincent Laporte | 2019-05-13 13:26:34 +0000 |
|---|---|---|
| committer | Vincent Laporte | 2019-05-13 13:26:34 +0000 |
| commit | 9f11eeefc204bdad029b66f30bc6c52377af63ae (patch) | |
| tree | f6fe5b471871383973fc1adf1cee180ef6a35128 /doc | |
| parent | 34fbc9cc6b30fc8e7dc2bd37756d5ede29074de0 (diff) | |
| parent | 60e976a627b213445443952342a8eec7193d9b85 (diff) | |
Merge PR #10085: Do not include unreleased changelog in released versions.
Ack-by: SkySkimmer
Ack-by: Zimmi48
Ack-by: jfehrle
Reviewed-by: vbgl
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/changelog/12-misc/09964-changes.rst | 5 | ||||
| -rw-r--r-- | doc/sphinx/changes.rst | 4 | ||||
| -rwxr-xr-x | doc/sphinx/conf.py | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/doc/changelog/12-misc/09964-changes.rst b/doc/changelog/12-misc/09964-changes.rst index 1113782180..dd873cfdd5 100644 --- a/doc/changelog/12-misc/09964-changes.rst +++ b/doc/changelog/12-misc/09964-changes.rst @@ -8,6 +8,7 @@ `#9668 <https://github.com/coq/coq/pull/9668>`_, `#9939 <https://github.com/coq/coq/pull/9939>`_, `#9964 <https://github.com/coq/coq/pull/9964>`_, + and `#10085 <https://github.com/coq/coq/pull/10085>`_, by Théo Zimmermann, - with help and ideas from Emilio Jesús Gallego Arias, - Clément Pit-Claudel, Matthieu Sozeau, and Enrico Tassi). + with help and ideas from Emilio Jesús Gallego Arias, Gaëtan + Gilbert, Clément Pit-Claudel, Matthieu Sozeau, and Enrico Tassi). diff --git a/doc/sphinx/changes.rst b/doc/sphinx/changes.rst index 5704587ae0..574b943a78 100644 --- a/doc/sphinx/changes.rst +++ b/doc/sphinx/changes.rst @@ -2,7 +2,9 @@ Recent changes -------------- -.. include:: ../unreleased.rst +.. ifconfig:: not coq_config.is_a_released_version + + .. include:: ../unreleased.rst Version 8.10 ------------ diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py index 972a53ae36..ec3343dac6 100755 --- a/doc/sphinx/conf.py +++ b/doc/sphinx/conf.py @@ -53,6 +53,7 @@ needs_sphinx = '1.7.8' # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. extensions = [ + 'sphinx.ext.ifconfig', 'sphinx.ext.mathjax', 'sphinx.ext.todo', 'sphinxcontrib.bibtex', @@ -100,6 +101,7 @@ def copy_formatspecific_files(app): def setup(app): app.connect('builder-inited', copy_formatspecific_files) + app.add_config_value('coq_config', coq_config, 'env') # The master toctree document. # We create this file in `copy_master_doc` above. |