From 222d366eadc1afa6c9344e9f0d3781a11a8c1ac4 Mon Sep 17 00:00:00 2001
From: Julien Schueller <schueller@phimeca.com>
Date: Thu, 5 Jan 2023 12:54:32 +0100
Subject: [PATCH 1/3] imgmath: Fix relative file path (#10965)

---
 CHANGES               | 2 ++
 sphinx/ext/imgmath.py | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 303dae009..577c1c783 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,8 @@ Features added
 Bugs fixed
 ----------
 
+* #10944: imgmath:  Fix resolving image paths for files in nested folders.
+
 Testing
 --------
 
diff --git a/sphinx/ext/imgmath.py b/sphinx/ext/imgmath.py
index 0c034a599..5ebf8d8d2 100644
--- a/sphinx/ext/imgmath.py
+++ b/sphinx/ext/imgmath.py
@@ -207,10 +207,9 @@ def render_math(
     """Render the LaTeX math expression *math* using latex and dvipng or
     dvisvgm.
 
-    Return the filename relative to the built document and the "depth",
+    Return the image absolute filename and the "depth",
     that is, the distance of image bottom and baseline in pixels, if the
     option to use preview_latex is switched on.
-    Also return the temporary and destination files.
 
     Error handling may seem strange, but follows a pattern: if LaTeX or dvipng
     (dvisvgm) aren't available, only a warning is generated (since that enables
@@ -317,7 +316,8 @@ def html_visit_math(self: HTMLTranslator, node: nodes.math) -> None:
             image_format = self.builder.config.imgmath_image_format.lower()
             img_src = render_maths_to_base64(image_format, rendered_path)
         else:
-            relative_path = path.relpath(rendered_path, self.builder.outdir)
+            bname = path.basename(rendered_path)
+            relative_path = path.join(self.builder.imgpath, 'math', bname)
             img_src = relative_path.replace(path.sep, '/')
         c = f'<img class="math" src="{img_src}"' + get_tooltip(self, node)
         if depth is not None:
@@ -357,7 +357,8 @@ def html_visit_displaymath(self: HTMLTranslator, node: nodes.math_block) -> None
             image_format = self.builder.config.imgmath_image_format.lower()
             img_src = render_maths_to_base64(image_format, rendered_path)
         else:
-            relative_path = path.relpath(rendered_path, self.builder.outdir)
+            bname = path.basename(rendered_path)
+            relative_path = path.join(self.builder.imgpath, 'math', bname)
             img_src = relative_path.replace(path.sep, '/')
         self.body.append(f'<img src="{img_src}"' + get_tooltip(self, node) +
                          '/></p>\n</div>')

From 821569ea8af353a9ca56b44bf19b94be2b37ae22 Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
Date: Thu, 5 Jan 2023 11:55:56 +0000
Subject: [PATCH 2/3] Add note for Pygments

---
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index 577c1c783..3198da086 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,8 @@ Release 6.0.1 (in development)
 Dependencies
 ------------
 
+* Require Pygments 2.13 or later.
+
 Incompatible changes
 --------------------
 

From a27d262ffed11ef5717edfe93ae892c6f6e9fed5 Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
Date: Thu, 5 Jan 2023 11:58:30 +0000
Subject: [PATCH 3/3] Bump to 6.0.1 final

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

diff --git a/CHANGES b/CHANGES
index 3198da086..6c1709801 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,28 +1,16 @@
-Release 6.0.1 (in development)
-==============================
+Release 6.0.1 (released Jan 05, 2023)
+=====================================
 
 Dependencies
 ------------
 
 * Require Pygments 2.13 or later.
 
-Incompatible changes
---------------------
-
-Deprecated
-----------
-
-Features added
---------------
-
 Bugs fixed
 ----------
 
 * #10944: imgmath:  Fix resolving image paths for files in nested folders.
 
-Testing
---------
-
 Release 6.0.0 (released Dec 29, 2022)
 =====================================
 
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index f88de426c..55dbe27f2 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -30,11 +30,11 @@ __display_version__ = __version__  # used for command line version
 #:
 #: .. versionadded:: 1.2
 #:    Before version 1.2, check the string ``sphinx.__version__``.
-version_info = (6, 0, 1, 'beta', 0)
+version_info = (6, 0, 1, 'final', 0)
 
 package_dir = path.abspath(path.dirname(__file__))
 
-_in_development = True
+_in_development = False
 if _in_development:
     # Only import subprocess if needed
     import subprocess