summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES19
-rw-r--r--sphinx/__init__.py4
2 files changed, 4 insertions, 19 deletions
diff --git a/CHANGES b/CHANGES
index 8bd7f2063..a2233ad9e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,17 +1,5 @@
-Release 2.1.2 (in development)
-==============================
-
-Dependencies
-------------
-
-Incompatible changes
---------------------
-
-Deprecated
-----------
-
-Features added
---------------
+Release 2.1.2 (released Jun 19, 2019)
+=====================================
Bugs fixed
----------
@@ -19,9 +7,6 @@ Bugs fixed
* #6497: custom lexers fails highlighting when syntax error
* #6478, #6488: info field lists are incorrectly recognized
-Testing
---------
-
Release 2.1.1 (released Jun 10, 2019)
=====================================
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index 094884e5b..3f05fd0db 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -32,7 +32,7 @@ if 'PYTHONWARNINGS' not in os.environ:
warnings.filterwarnings('ignore', "'U' mode is deprecated",
DeprecationWarning, module='docutils.io')
-__version__ = '2.1.2+'
+__version__ = '2.1.2'
__released__ = '2.1.2' # used when Sphinx builds its own docs
#: Version info for better programmatic use.
@@ -43,7 +43,7 @@ __released__ = '2.1.2' # used when Sphinx builds its own docs
#:
#: .. versionadded:: 1.2
#: Before version 1.2, check the string ``sphinx.__version__``.
-version_info = (2, 1, 2, 'beta', 0)
+version_info = (2, 1, 2, 'final', 0)
package_dir = path.abspath(path.dirname(__file__))