[Python-checkins] Fix numbered lists in stdtypes.rst. (GH-10989)
Miss Islington (bot)
webhook-mailer at python.org
Mon Dec 10 15:51:37 EST 2018
https://github.com/python/cpython/commit/b3ffe47bcbb83e31b71644031d4092f7f9456a34
commit: b3ffe47bcbb83e31b71644031d4092f7f9456a34
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018年12月10日T12:51:32-08:00
summary:
Fix numbered lists in stdtypes.rst. (GH-10989)
(cherry picked from commit de9e9b476ec4abfb0b9161cff0e86bb7085ca8c6)
Co-authored-by: Andre Delfino <adelfino at gmail.com>
files:
M Doc/library/stdtypes.rst
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 416790b796f5..42c92824b25e 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2123,28 +2123,26 @@ object. [5]_ Otherwise, *values* must be a tuple with exactly the number of
items specified by the format string, or a single mapping object (for example, a
dictionary).
+.. index::
+ single: () (parentheses); in printf-style formatting
+ single: * (asterisk); in printf-style formatting
+ single: . (dot); in printf-style formatting
+
A conversion specifier contains two or more characters and has the following
components, which must occur in this order:
#. The ``'%'`` character, which marks the start of the specifier.
-.. index::
- single: () (parentheses); in printf-style formatting
-
#. Mapping key (optional), consisting of a parenthesised sequence of characters
(for example, ``(somename)``).
#. Conversion flags (optional), which affect the result of some conversion
types.
-.. index:: single: * (asterisk); in printf-style formatting
-
#. Minimum field width (optional). If specified as an ``'*'`` (asterisk), the
actual width is read from the next element of the tuple in *values*, and the
object to convert comes after the minimum field width and optional precision.
-.. index:: single: . (dot); in printf-style formatting
-
#. Precision (optional), given as a ``'.'`` (dot) followed by the precision. If
specified as ``'*'`` (an asterisk), the actual precision is read from the next
element of the tuple in *values*, and the value to convert comes after the
@@ -3257,28 +3255,26 @@ object. [5]_ Otherwise, *values* must be a tuple with exactly the number of
items specified by the format bytes object, or a single mapping object (for
example, a dictionary).
+.. index::
+ single: () (parentheses); in printf-style formatting
+ single: * (asterisk); in printf-style formatting
+ single: . (dot); in printf-style formatting
+
A conversion specifier contains two or more characters and has the following
components, which must occur in this order:
#. The ``'%'`` character, which marks the start of the specifier.
-.. index::
- single: () (parentheses); in printf-style formatting
-
#. Mapping key (optional), consisting of a parenthesised sequence of characters
(for example, ``(somename)``).
#. Conversion flags (optional), which affect the result of some conversion
types.
-.. index:: single: * (asterisk); in printf-style formatting
-
#. Minimum field width (optional). If specified as an ``'*'`` (asterisk), the
actual width is read from the next element of the tuple in *values*, and the
object to convert comes after the minimum field width and optional precision.
-.. index:: single: . (dot); in printf-style formatting
-
#. Precision (optional), given as a ``'.'`` (dot) followed by the precision. If
specified as ``'*'`` (an asterisk), the actual precision is read from the next
element of the tuple in *values*, and the value to convert comes after the
More information about the Python-checkins
mailing list