summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2013-09-09 06:55:31 (GMT)
committerRaymond Hettinger <python@rcn.com>2013-09-09 06:55:31 (GMT)
commit223b9c36ad71378b0a34bae817c79befdb9480b1 (patch)
tree73c280970266cd203f88e0f2b86690817a615e9a /Doc
parentee09458e08c61b78481dac7c3de670415dc9ec4a (diff)
parent455bfdea2fd24e5b5f966860b9987fd6321dcde0 (diff)
downloadcpython-223b9c36ad71378b0a34bae817c79befdb9480b1.zip
cpython-223b9c36ad71378b0a34bae817c79befdb9480b1.tar.gz
cpython-223b9c36ad71378b0a34bae817c79befdb9480b1.tar.bz2
merge
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/enum.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/library/enum.rst b/Doc/library/enum.rst
index 3661469..236275d 100644
--- a/Doc/library/enum.rst
+++ b/Doc/library/enum.rst
@@ -38,7 +38,8 @@ follows::
... blue = 3
...
-..note: Nomenclature
+.. note:: Nomenclature
+
- The class :class:`Color` is an *enumeration* (or *enum*)
- The attributes :attr:`Color.red`, :attr:`Color.green`, etc., are
*enumeration members* (or *enum members*).
@@ -474,7 +475,7 @@ Some rules:
4. %-style formatting: `%s` and `%r` call :class:`Enum`'s :meth:`__str__` and
:meth:`__repr__` respectively; other codes (such as `%i` or `%h` for
IntEnum) treat the enum member as its mixed-in type.
-5. :class:`str`.:meth:`__format__` (or :func:`format`) will use the mixed-in
+5. :meth:`str.__format__` (or :func:`format`) will use the mixed-in
type's :meth:`__format__`. If the :class:`Enum`'s :func:`str` or
:func:`repr` is desired use the `!s` or `!r` :class:`str` format codes.