From afa4a772da3cb5218360b9e54490f49acab3bdbe Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Mon, 10 Jun 2019 22:34:45 +0900
Subject: [PATCH 1/2] Bump to 2.1.1 final

---
 CHANGES            | 16 ++--------------
 sphinx/__init__.py |  4 ++--
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/CHANGES b/CHANGES
index a1a1e7e79..6a4492639 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,20 +1,11 @@
-Release 2.1.1 (in development)
-==============================
-
-Dependencies
-------------
+Release 2.1.1 (released Jun 10, 2019)
+=====================================
 
 Incompatible changes
 --------------------
 
 * #6447: autodoc: Stop to generate document for undocumented module variables
 
-Deprecated
-----------
-
-Features added
---------------
-
 Bugs fixed
 ----------
 
@@ -28,9 +19,6 @@ Bugs fixed
   underscore
 * #6440: apidoc: missing blank lines between modules
 
-Testing
---------
-
 Release 2.1.0 (released Jun 02, 2019)
 =====================================
 
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index 8a6bdcc8b..15a18de83 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.1+'
+__version__ = '2.1.1'
 __released__ = '2.1.1'  # used when Sphinx builds its own docs
 
 #: Version info for better programmatic use.
@@ -43,7 +43,7 @@ __released__ = '2.1.1'  # used when Sphinx builds its own docs
 #:
 #: .. versionadded:: 1.2
 #:    Before version 1.2, check the string ``sphinx.__version__``.
-version_info = (2, 1, 1, 'beta', 0)
+version_info = (2, 1, 1, 'final', 0)
 
 package_dir = path.abspath(path.dirname(__file__))
 

From 5b307fcf4f73517e79352b6b6857c35f4f1783ba Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Mon, 10 Jun 2019 22:36:32 +0900
Subject: [PATCH 2/2] Bump version

---
 CHANGES            | 21 +++++++++++++++++++++
 sphinx/__init__.py |  6 +++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6a4492639..937e6133f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,24 @@
+Release 2.1.2 (in development)
+==============================
+
+Dependencies
+------------
+
+Incompatible changes
+--------------------
+
+Deprecated
+----------
+
+Features added
+--------------
+
+Bugs fixed
+----------
+
+Testing
+--------
+
 Release 2.1.1 (released Jun 10, 2019)
 =====================================
 
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index 15a18de83..094884e5b 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -32,8 +32,8 @@ if 'PYTHONWARNINGS' not in os.environ:
 warnings.filterwarnings('ignore', "'U' mode is deprecated",
                         DeprecationWarning, module='docutils.io')
 
-__version__ = '2.1.1'
-__released__ = '2.1.1'  # used when Sphinx builds its own docs
+__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.1'  # used when Sphinx builds its own docs
 #:
 #: .. versionadded:: 1.2
 #:    Before version 1.2, check the string ``sphinx.__version__``.
-version_info = (2, 1, 1, 'final', 0)
+version_info = (2, 1, 2, 'beta', 0)
 
 package_dir = path.abspath(path.dirname(__file__))