Use "impl-detail" directive where applicable.

Doc/library/__builtin__.rst

@@ -33,9 +33,10 @@ that wants to implement an :func:`open` function that wraps the built-in
 
        # ...
 
-As an implementation detail, most modules have the name ``__builtins__`` (note
+.. impl-detail::
-the ``'s'``) made available as part of their globals.  The value of
-``__builtins__`` is normally either this module or the value of this modules's
-:attr:`__dict__` attribute.  Since this is an implementation detail, it may not
-be used by alternate implementations of Python.
 
+   Most modules have the name ``__builtins__`` (note the ``'s'``) made available
+   as part of their globals.  The value of ``__builtins__`` is normally either
+   this module or the value of this modules's :attr:`__dict__` attribute.  Since
+   this is an implementation detail, it may not be used by alternate
+   implementations of Python.

Doc/library/functions.rst

@@ -523,8 +523,10 @@ available.  They are listed here in alphabetical order.
 
    Return the "identity" of an object.  This is an integer (or long integer) which
    is guaranteed to be unique and constant for this object during its lifetime.
-   Two objects with non-overlapping lifetimes may have the same :func:`id` value.
+   Two objects with non-overlapping lifetimes may have the same :func:`id`
-   (Implementation note: this is the address of the object.)
+   value.
+
+   .. impl-detail:: This is the address of the object.
 
 
 .. function:: input([prompt])
@@ -1384,14 +1386,15 @@ available.  They are listed here in alphabetical order.
    elements are never used (such as when the loop is usually terminated with
    :keyword:`break`).
 
-   .. note::
+   .. impl-detail::
 
-      :func:`xrange` is intended to be simple and fast. Implementations may impose
+      :func:`xrange` is intended to be simple and fast.  Implementations may
-      restrictions to achieve this. The C implementation of Python restricts all
+      impose restrictions to achieve this.  The C implementation of Python
-      arguments to native C longs ("short" Python integers), and also requires that
+      restricts all arguments to native C longs ("short" Python integers), and
-      the number of elements fit in a native C long.  If a larger range is needed,
+      also requires that the number of elements fit in a native C long.  If a
-      an alternate version can be crafted using the :mod:`itertools` module:
+      larger range is needed, an alternate version can be crafted using the
-      ``islice(count(start, step), (stop-start+step-1)//step)``.
+      :mod:`itertools` module: ``islice(count(start, step),
+      (stop-start+step-1)//step)``.
 
 
 .. function:: zip([iterable, ...])

Doc/library/inspect.rst

@@ -353,9 +353,11 @@ Note:
 
    Return true if the object is a getset descriptor.
 
-   getsets are attributes defined in extension modules via ``PyGetSetDef``
+   .. impl-detail::
-   structures.  For Python implementations without such types, this method will
+
-   always return ``False``.
+      getsets are attributes defined in extension modules via
+      :ctype:`PyGetSetDef` structures.  For Python implementations without such
+      types, this method will always return ``False``.
 
    .. versionadded:: 2.5
 
@@ -364,9 +366,11 @@ Note:
 
    Return true if the object is a member descriptor.
 
-   Member descriptors are attributes defined in extension modules via
+   .. impl-detail::
-   ``PyMemberDef`` structures.  For Python implementations without such types,
+
-   this method will always return ``False``.
+      Member descriptors are attributes defined in extension modules via
+      :ctype:`PyMemberDef` structures.  For Python implementations without such
+      types, this method will always return ``False``.
 
    .. versionadded:: 2.5
 
@@ -567,10 +571,12 @@ line.
 
    Return the frame object for the caller's stack frame.
 
-   This function relies on Python stack frame support in the interpreter, which
+   .. impl-detail::
-   isn't guaranteed to exist in all implementations of Python. If running in
+
-   an implementation without Python stack frame support this function returns
+      This function relies on Python stack frame support in the interpreter,
-   ``None``.
+      which isn't guaranteed to exist in all implementations of Python.  If
+      running in an implementation without Python stack frame support this
+      function returns ``None``.
 
 
 .. function:: stack([context])

Doc/library/math.rst

@@ -331,7 +331,7 @@ Constants
    The mathematical constant *e*.
 
 
-.. note::
+.. impl-detail::
 
    The :mod:`math` module consists mostly of thin wrappers around the platform C
    math library functions.  Behavior in exceptional cases is loosely specified

Doc/library/platform.rst

@@ -98,7 +98,7 @@ Cross Platform
 .. function:: python_implementation()
 
    Returns a string identifying the Python implementation. Possible return values
-   are: 'CPython', 'IronPython', 'Jython'
+   are: 'CPython', 'IronPython', 'Jython'.
 
    .. versionadded:: 2.6
 

Doc/library/stdtypes.rst

@@ -195,9 +195,11 @@ Instances of a class normally compare as non-equal unless the class defines the
 :meth:`__cmp__` method.  Refer to :ref:`customization`) for information on the
 use of this method to effect object comparisons.
 
-**Implementation note:** Objects of different types except numbers are ordered
+.. impl-detail::
-by their type names; objects of the same types that don't support proper
+
-comparison are ordered by their address.
+   Objects of different types except numbers are ordered by their type names;
+   objects of the same types that don't support proper comparison are ordered by
+   their address.
 
 .. index::
    operator: in
@@ -796,13 +798,15 @@ Notes:
    If *k* is ``None``, it is treated like ``1``.
 
 (6)
-   If *s* and *t* are both strings, some Python implementations such as CPython can
+   .. impl-detail::
-   usually perform an in-place optimization for assignments of the form ``s=s+t``
+
-   or ``s+=t``.  When applicable, this optimization makes quadratic run-time much
+      If *s* and *t* are both strings, some Python implementations such as
-   less likely.  This optimization is both version and implementation dependent.
+      CPython can usually perform an in-place optimization for assignments of
-   For performance sensitive code, it is preferable to use the :meth:`str.join`
+      the form ``s = s + t`` or ``s += t``.  When applicable, this optimization
-   method which assures consistent linear concatenation performance across versions
+      makes quadratic run-time much less likely.  This optimization is both
-   and implementations.
+      version and implementation dependent.  For performance sensitive code, it
+      is preferable to use the :meth:`str.join` method which assures consistent
+      linear concatenation performance across versions and implementations.
 
    .. versionchanged:: 2.4
       Formerly, string concatenation never occurred in-place.
@@ -1629,10 +1633,13 @@ Notes:
    example, sort by department, then by salary grade).
 
 (10)
-   While a list is being sorted, the effect of attempting to mutate, or even
+   .. impl-detail::
-   inspect, the list is undefined.  The C implementation of Python 2.3 and newer
+
-   makes the list appear empty for the duration, and raises :exc:`ValueError` if it
+      While a list is being sorted, the effect of attempting to mutate, or even
-   can detect that the list has been mutated during a sort.
+      inspect, the list is undefined.  The C implementation of Python 2.3 and
+      newer makes the list appear empty for the duration, and raises
+      :exc:`ValueError` if it can detect that the list has been mutated during a
+      sort.
 
 
 .. _types-set:
@@ -2006,20 +2013,21 @@ pairs within braces, for example: ``{'jack': 4098, 'sjoerd': 4127}`` or ``{4098:
 
       Return a copy of the dictionary's list of ``(key, value)`` pairs.
 
-      .. note::
+      .. impl-detail::
 
          Keys and values are listed in an arbitrary order which is non-random,
          varies across Python implementations, and depends on the dictionary's
-         history of insertions and deletions. If :meth:`items`, :meth:`keys`,
+         history of insertions and deletions.
-         :meth:`values`, :meth:`iteritems`, :meth:`iterkeys`, and
+
-         :meth:`itervalues` are called with no intervening modifications to the
+      If :meth:`items`, :meth:`keys`, :meth:`values`, :meth:`iteritems`,
-         dictionary, the lists will directly correspond.  This allows the
+      :meth:`iterkeys`, and :meth:`itervalues` are called with no intervening
-         creation of ``(value, key)`` pairs using :func:`zip`: ``pairs =
+      modifications to the dictionary, the lists will directly correspond.  This
-         zip(d.values(), d.keys())``.  The same relationship holds for the
+      allows the creation of ``(value, key)`` pairs using :func:`zip`: ``pairs =
-         :meth:`iterkeys` and :meth:`itervalues` methods: ``pairs =
+      zip(d.values(), d.keys())``.  The same relationship holds for the
-         zip(d.itervalues(), d.iterkeys())`` provides the same value for
+      :meth:`iterkeys` and :meth:`itervalues` methods: ``pairs =
-         ``pairs``. Another way to create the same list is ``pairs = [(v, k) for
+      zip(d.itervalues(), d.iterkeys())`` provides the same value for
-         (k, v) in d.iteritems()]``.
+      ``pairs``. Another way to create the same list is ``pairs = [(v, k) for
+      (k, v) in d.iteritems()]``.
 
    .. method:: iteritems()
 

Doc/library/sys.rst

@@ -417,8 +417,10 @@ always available.
    that is deeper than the call stack, :exc:`ValueError` is raised.  The default
    for *depth* is zero, returning the frame at the top of the call stack.
 
-   This function should be used for internal and specialized purposes only. It
+   .. impl-detail::
-   is not guaranteed to exist in all implementations of Python.
+
+      This function should be used for internal and specialized purposes only.
+      It is not guaranteed to exist in all implementations of Python.
 
 
 .. function:: getprofile()
@@ -440,12 +442,12 @@ always available.
 
    Get the trace function as set by :func:`settrace`.
 
-   .. note::
+   .. impl-detail::
 
       The :func:`gettrace` function is intended only for implementing debuggers,
-      profilers, coverage tools and the like. Its behavior is part of the
+      profilers, coverage tools and the like.  Its behavior is part of the
-      implementation platform, rather than part of the language definition,
+      implementation platform, rather than part of the language definition, and
-      and thus may not be available in all Python implementations.
+      thus may not be available in all Python implementations.
 
    .. versionadded:: 2.6
 
@@ -830,12 +832,12 @@ always available.
 
    For more information on code and frame objects, refer to :ref:`types`.
 
-   .. note::
+   .. impl-detail::
 
       The :func:`settrace` function is intended only for implementing debuggers,
-      profilers, coverage tools and the like. Its behavior is part of the
+      profilers, coverage tools and the like.  Its behavior is part of the
-      implementation platform, rather than part of the language definition, and thus
+      implementation platform, rather than part of the language definition, and
-      may not be available in all Python implementations.
+      thus may not be available in all Python implementations.
 
 
 .. function:: settscdump(on_flag)

Doc/library/types.rst

@@ -241,8 +241,11 @@ The module defines the following names:
    as ``datetime.timedelta.days``.  This type is used as descriptor for simple C
    data members which use standard conversion functions; it has the same purpose
    as the :class:`property` type, but for classes defined in extension modules.
-   In other implementations of Python, this type may be identical to
+
-   ``GetSetDescriptorType``.
+   .. impl-detail::
+
+      In other implementations of Python, this type may be identical to
+      ``GetSetDescriptorType``.
 
    .. versionadded:: 2.5
 

Doc/reference/datamodel.rst

@@ -56,13 +56,16 @@ Objects are never explicitly destroyed; however, when they become unreachable
 they may be garbage-collected.  An implementation is allowed to postpone garbage
 collection or omit it altogether --- it is a matter of implementation quality
 how garbage collection is implemented, as long as no objects are collected that
-are still reachable.  (Implementation note: CPython currently uses a
+are still reachable.
-reference-counting scheme with (optional) delayed detection of cyclically linked
+
-garbage, which collects most objects as soon as they become unreachable, but is
+.. impl-detail::
-not guaranteed to collect garbage containing circular references.  See the
+
-documentation of the :mod:`gc` module for information on controlling the
+   CPython currently uses a reference-counting scheme with (optional) delayed
-collection of cyclic garbage.  Other implementations act differently and CPython
+   detection of cyclically linked garbage, which collects most objects as soon
-may change.)
+   as they become unreachable, but is not guaranteed to collect garbage
+   containing circular references.  See the documentation of the :mod:`gc`
+   module for information on controlling the collection of cyclic garbage.
+   Other implementations act differently and CPython may change.
 
 Note that the use of the implementation's tracing or debugging facilities may
 keep objects alive that would normally be collectable. Also note that catching

Doc/reference/executionmodel.rst

@@ -128,7 +128,7 @@ the built-in module :mod:`__builtin__` (note: no 's'); when in any other module,
 itself.  ``__builtins__`` can be set to a user-created dictionary to create a
 weak form of restricted execution.
 
-.. note::
+.. impl-detail::
 
    Users should not touch ``__builtins__``; it is strictly an implementation
    detail.  Users wanting to override values in the built-in namespace should

Doc/reference/expressions.rst

@@ -663,13 +663,13 @@ slots for which no default value is specified, a :exc:`TypeError` exception is
 raised.  Otherwise, the list of filled slots is used as the argument list for
 the call.
 
-.. note::
+.. impl-detail::
 
-   An implementation may provide built-in functions whose positional parameters do
+   An implementation may provide built-in functions whose positional parameters
-   not have names, even if they are 'named' for the purpose of documentation, and
+   do not have names, even if they are 'named' for the purpose of documentation,
-   which therefore cannot be supplied by keyword.  In CPython, this is the case for
+   and which therefore cannot be supplied by keyword.  In CPython, this is the
-   functions implemented in C that use :cfunc:`PyArg_ParseTuple` to parse their
+   case for functions implemented in C that use :cfunc:`PyArg_ParseTuple` to
-   arguments.
+   parse their arguments.
 
 If there are more positional arguments than there are formal parameter slots, a
 :exc:`TypeError` exception is raised, unless a formal parameter using the syntax

Doc/reference/simple_stmts.rst

@@ -219,9 +219,11 @@ Assignment of an object to a single target is recursively defined as follows.
   the length of the assigned sequence, thus changing the length of the target
   sequence, if the object allows it.
 
-(In the current implementation, the syntax for targets is taken to be the same
+.. impl-detail::
-as for expressions, and invalid syntax is rejected during the code generation
+
-phase, causing less detailed error messages.)
+   In the current implementation, the syntax for targets is taken to be the same
+   as for expressions, and invalid syntax is rejected during the code generation
+   phase, causing less detailed error messages.
 
 WARNING: Although the definition of assignment implies that overlaps between the
 left-hand side and the right-hand side are 'safe' (for example ``a, b = b, a``
@@ -946,9 +948,11 @@ Names listed in a :keyword:`global` statement must not be defined as formal
 parameters or in a :keyword:`for` loop control target, :keyword:`class`
 definition, function definition, or :keyword:`import` statement.
 
-(The current implementation does not enforce the latter two restrictions, but
+.. impl-detail::
-programs should not abuse this freedom, as future implementations may enforce
+
-them or silently change the meaning of the program.)
+   The current implementation does not enforce the latter two restrictions, but
+   programs should not abuse this freedom, as future implementations may enforce
+   them or silently change the meaning of the program.
 
 .. index::
    statement: exec

Doc/using/cmdline.rst

@@ -8,7 +8,7 @@ Command line and environment
 The CPython interpreter scans the command line and the environment for various
 settings.
 
-.. note::
+.. impl-detail::
 
    Other implementations' command line schemes may differ.  See
    :ref:`implementations` for further resources.