[Python-checkins] cpython (merge default -> default): merge

Mon Sep 9 08:55:46 CEST 2013

http://hg.python.org/cpython/rev/e235ab6dda5d
changeset: 85636:e235ab6dda5d
parent: 85635:8f8c614dc284
parent: 85633:0e05b07a6f84
user: Raymond Hettinger <python at rcn.com>
date: Mon Sep 09 01:55:31 2013 -0500
summary:
 merge
files:
 Doc/library/enum.rst | 5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Doc/library/enum.rst b/Doc/library/enum.rst
--- a/Doc/library/enum.rst
+++ b/Doc/library/enum.rst
@@ -38,7 +38,8 @@
 ... 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 @@
 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.
 
-- 
Repository URL: http://hg.python.org/cpython
