From 53e7272884b18e887971bb34e45793e0e486667f Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Sun, 11 Apr 2021 20:27:10 +0900
Subject: [PATCH 1/3] Bump to 3.5.4 final

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

diff --git a/CHANGES b/CHANGES
index e8acb14a8..5b4041644 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,20 +1,11 @@
-Release 3.5.4 (in development)
-==============================
+Release 3.5.4 (released Apr 11, 2021)
+=====================================
 
 Dependencies
 ------------
 
 * #9071: Restrict docutils to 0.16
 
-Incompatible changes
---------------------
-
-Deprecated
-----------
-
-Features added
---------------
-
 Bugs fixed
 ----------
 
@@ -26,9 +17,6 @@ Bugs fixed
   - The content of ``sidebar`` directive
   - figures
 
-Testing
---------
-
 Release 3.5.3 (released Mar 20, 2021)
 =====================================
 
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index e72c9f81c..179bcd241 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__ = '3.5.4+'
+__version__ = '3.5.4'
 __released__ = '3.5.4'  # used when Sphinx builds its own docs
 
 #: Version info for better programmatic use.
@@ -43,7 +43,7 @@ __released__ = '3.5.4'  # used when Sphinx builds its own docs
 #:
 #: .. versionadded:: 1.2
 #:    Before version 1.2, check the string ``sphinx.__version__``.
-version_info = (3, 5, 4, 'beta', 0)
+version_info = (3, 5, 4, 'final', 0)
 
 package_dir = path.abspath(path.dirname(__file__))
 

From fe64693b2e90ae25489a3ebb007c63d07881c8c4 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Sun, 11 Apr 2021 20:28:18 +0900
Subject: [PATCH 2/3] Bump version

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

diff --git a/CHANGES b/CHANGES
index 5b4041644..b7cb2554a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,24 @@
+Release 3.5.5 (in development)
+==============================
+
+Dependencies
+------------
+
+Incompatible changes
+--------------------
+
+Deprecated
+----------
+
+Features added
+--------------
+
+Bugs fixed
+----------
+
+Testing
+--------
+
 Release 3.5.4 (released Apr 11, 2021)
 =====================================
 
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index 179bcd241..5a4c931e7 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__ = '3.5.4'
-__released__ = '3.5.4'  # used when Sphinx builds its own docs
+__version__ = '3.5.5+'
+__released__ = '3.5.5'  # used when Sphinx builds its own docs
 
 #: Version info for better programmatic use.
 #:
@@ -43,7 +43,7 @@ __released__ = '3.5.4'  # used when Sphinx builds its own docs
 #:
 #: .. versionadded:: 1.2
 #:    Before version 1.2, check the string ``sphinx.__version__``.
-version_info = (3, 5, 4, 'final', 0)
+version_info = (3, 5, 5, 'final', 0)
 
 package_dir = path.abspath(path.dirname(__file__))
 

From cb78512835462a9cc297130ce66287c3048a59da Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Sat, 24 Apr 2021 18:37:30 +0900
Subject: [PATCH 3/3] doc: Fix minor mark-up misses up

---
 doc/latex.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/latex.rst b/doc/latex.rst
index ff1af9286..6e2a34c3b 100644
--- a/doc/latex.rst
+++ b/doc/latex.rst
@@ -158,6 +158,7 @@ Keys that you may want to override include:
       Greek or Cyrillic in a document using ``'pdflatex'`` engine.
 
    .. versionchanged:: 4.0.0
+
       - The font substitution commands added at ``2.0`` have been moved
         to the ``'fontsubstitution'`` key, as their presence here made
         it complicated for user to customize the value of ``'fontpkg'``.
@@ -165,7 +166,6 @@ Keys that you may want to override include:
         Helvetica clones for serif and sans serif, but via better, more
         complete TeX fonts and associated LaTeX packages.  The
         monospace font has been changed to better match the Times clone.
-        
 
 ``'fncychap'``
    Inclusion of the "fncychap" package (which makes fancy chapter titles),