From: Victor Stinner <vstinner@python.org>
Date: Mon, 17 Aug 2020 06:41:42 +0000 (+0200)
Subject: bpo-40204: Fix duplicated productionlist names in the doc (GH-21900)
X-Git-Tag: v3.10.0a1~241
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1abeda80f760134b4233608e2c288790f955b95a;p=thirdparty%2FPython%2Fcpython.git

bpo-40204: Fix duplicated productionlist names in the doc (GH-21900)

Sphinx 3 disallows having more than one productionlist markup with
the same name. Simply remove names in this case, since names are not
shown anyway. For example, fix the Sphinx 3 warning:

Doc/reference/introduction.rst:96: duplicate token description
of *:name, other instance in reference/expressions
---

diff --git a/Doc/library/string.rst b/Doc/library/string.rst
index fa906f799c10..62e86d6dd970 100644
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -308,7 +308,7 @@ non-empty format specification typically modifies the result.
 
 The general form of a *standard format specifier* is:
 
-.. productionlist:: sf
+.. productionlist::
    format_spec: [[`fill`]`align`][`sign`][#][0][`width`][`grouping_option`][.`precision`][`type`]
    fill: <any character>
    align: "<" | ">" | "=" | "^"
diff --git a/Doc/reference/introduction.rst b/Doc/reference/introduction.rst
index bb7e3906dba6..62480bd7dd9a 100644
--- a/Doc/reference/introduction.rst
+++ b/Doc/reference/introduction.rst
@@ -93,7 +93,7 @@ Notation
 The descriptions of lexical analysis and syntax use a modified BNF grammar
 notation.  This uses the following style of definition:
 
-.. productionlist:: *
+.. productionlist::
    name: `lc_letter` (`lc_letter` | "_")*
    lc_letter: "a"..."z"