From 6bda4d4dc7e376fb284a9c9bd837fa22a0f89726 Mon Sep 17 00:00:00 2001
From: Julien Palard <julien@palard.fr>
Date: Mon, 19 Jul 2021 14:34:35 +0200
Subject: [PATCH 1/3] Fix small rst issue in NEWS.d/.

---
 .../next/Library/2021-07-02-18-17-56.bpo-44554.aBUmJo.rst       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Misc/NEWS.d/next/Library/2021-07-02-18-17-56.bpo-44554.aBUmJo.rst b/Misc/NEWS.d/next/Library/2021-07-02-18-17-56.bpo-44554.aBUmJo.rst
index 6ca8cdc22fa6e8..2c225b80839516 100644
--- a/Misc/NEWS.d/next/Library/2021-07-02-18-17-56.bpo-44554.aBUmJo.rst
+++ b/Misc/NEWS.d/next/Library/2021-07-02-18-17-56.bpo-44554.aBUmJo.rst
@@ -1 +1 @@
-Refactor argument processing in :func:pdb.main to simplify detection of errors in input loading and clarify behavior around module or script invocation.
+Refactor argument processing in :func:`pdb.main` to simplify detection of errors in input loading and clarify behavior around module or script invocation.

From cdea1c1264c14b058586cae7ab4d626a2a833d7e Mon Sep 17 00:00:00 2001
From: Julien Palard <julien@palard.fr>
Date: Mon, 19 Jul 2021 14:43:25 +0200
Subject: [PATCH 2/3] Add a check in rstlint to spot this.

---
 Doc/tools/rstlint.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Doc/tools/rstlint.py b/Doc/tools/rstlint.py
index c9bff80995bfd3..f7ea4901087a42 100755
--- a/Doc/tools/rstlint.py
+++ b/Doc/tools/rstlint.py
@@ -90,7 +90,6 @@
     ":newsgroup:",
     ":code:",
     ":py:func:",
-    ":memory:",
     ":makevar:",
     ":guilabel:",
     ":title-reference:",
@@ -123,6 +122,13 @@
 double_backtick_role = re.compile(r"(?<!``)%s``" % all_roles)
 
 
+# Find role used with no backticks instead of simple backticks like:
+# :const:None
+# instead of:
+# :const:`None`
+role_with_no_backticks = re.compile(r"%s[^` ]" % all_roles)
+
+
 default_role_re = re.compile(r"(^| )`\w([^`]*?\w)?`($| )")
 leaked_markup_re = re.compile(r"[a-z]::\s|`|\.\.\s*\w+:")
 
@@ -168,6 +174,8 @@ def check_suspicious_constructs(fn, lines):
             yield lno, "directive should start with two dots, not three."
         if double_backtick_role.search(line):
             yield lno, "role use a single backtick, double backtick found."
+        if role_with_no_backticks.search(line):
+            yield lno, "role use a single backtick, backtick found."
         if ".. productionlist::" in line:
             inprod = True
         elif not inprod and default_role_re.search(line):

From 33e86e0dc789986385b94e5208151f38eefc0d4f Mon Sep 17 00:00:00 2001
From: Julien Palard <julien@palard.fr>
Date: Mon, 19 Jul 2021 15:02:06 +0200
Subject: [PATCH 3/3] d'oh.

---
 Doc/tools/rstlint.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Doc/tools/rstlint.py b/Doc/tools/rstlint.py
index f7ea4901087a42..91aed80b1e9a6c 100755
--- a/Doc/tools/rstlint.py
+++ b/Doc/tools/rstlint.py
@@ -175,7 +175,7 @@ def check_suspicious_constructs(fn, lines):
         if double_backtick_role.search(line):
             yield lno, "role use a single backtick, double backtick found."
         if role_with_no_backticks.search(line):
-            yield lno, "role use a single backtick, backtick found."
+            yield lno, "role use a single backtick, no backtick found."
         if ".. productionlist::" in line:
             inprod = True
         elif not inprod and default_role_re.search(line):