[Python-checkins] cpython: Fixup abc.ABC wording and add versionadded.

[georg.brandl]

http://hg.python.org/cpython/rev/9e6cf246ca4e
changeset:   80878:9e6cf246ca4e
user:        Georg Brandl <georg at python.org>
date:        Sun Dec 16 13:32:33 2012 +0100
summary:
  Fixup abc.ABC wording and add versionadded.

files:
  Doc/library/abc.rst |  13 ++++++++-----
  1 files changed, 8 insertions(+), 5 deletions(-)


diff --git a/Doc/library/abc.rst b/Doc/library/abc.rst
--- a/Doc/library/abc.rst
+++ b/Doc/library/abc.rst
@@ -129,13 +129,16 @@
 
 .. class:: ABC
 
-   A helper class that has :class:`ABCMeta` as metaclass. :class:`ABC` is the
-   standard class to inherit from in order to create an abstract base class,
+   A helper class that has :class:`ABCMeta` as its metaclass.  With this class,
+   an abstract base class can be created by simply deriving from :class:`ABC`,
    avoiding sometimes confusing metaclass usage.
 
-   Note that :class:`ABC` type is still :class:`ABCMeta`, therefore inheriting
-   from :class:`ABC` requires usual precautions regarding metaclasses usage
-   as multiple inheritance may lead to metaclass conflicts.
+   Note that the type of :class:`ABC` is still :class:`ABCMeta`, therefore
+   inheriting from :class:`ABC` requires the usual precautions regarding metaclass
+   usage, as multiple inheritance may lead to metaclass conflicts.
+
+   .. versionadded:: 3.4
+
 
 The :mod:`abc` module also provides the following decorators:
 

-- 
Repository URL: http://hg.python.org/cpython