Merged revisions 87188-87190,87192-87194 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87188 | antoine.pitrou | 2010-12-12 19:25:25 +0100 (dim., 12 déc. 2010) | 3 lines
Make this a warning and fix indentation
........
r87189 | antoine.pitrou | 2010-12-12 20:59:47 +0100 (dim., 12 déc. 2010) | 3 lines
Better explain the buffer interface (hopefully)
........
r87190 | antoine.pitrou | 2010-12-12 21:01:43 +0100 (dim., 12 déc. 2010) | 3 lines
Add link to the buffer protocol description from the memory description.
........
r87192 | antoine.pitrou | 2010-12-12 21:09:18 +0100 (dim., 12 déc. 2010) | 3 lines
Remove redundant sentence, and fix markup
........
r87193 | antoine.pitrou | 2010-12-12 21:13:31 +0100 (dim., 12 déc. 2010) | 3 lines
Fix heading level
........
r87194 | antoine.pitrou | 2010-12-12 21:17:29 +0100 (dim., 12 déc. 2010) | 3 lines
Consistent ordering of availability statements
........
diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
index fdc45b9..28a7aff 100644
--- a/Doc/library/os.path.rst
+++ b/Doc/library/os.path.rst
@@ -227,7 +227,7 @@
*start* defaults to :attr:`os.curdir`.
- Availability: Windows, Unix.
+ Availability: Unix, Windows.
.. function:: samefile(path1, path2)
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 4b7ae39..f2563dd 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2081,9 +2081,9 @@
memoryview Types
================
-:class:`memoryview`\s allow Python code to access the internal data of an object
-that supports the buffer protocol without copying. Memory can be interpreted as
-simple bytes or complex data structures.
+:class:`memoryview` objects allow Python code to access the internal data
+of an object that supports the :ref:`buffer protocol <bufferobjects>` without
+copying. Memory is generally interpreted as simple bytes.
.. class:: memoryview(obj)
@@ -2203,12 +2203,9 @@
single: protocol; context management
Python's :keyword:`with` statement supports the concept of a runtime context
-defined by a context manager. This is implemented using two separate methods
+defined by a context manager. This is implemented using a pair of methods
that allow user-defined classes to define a runtime context that is entered
-before the statement body is executed and exited when the statement ends.
-
-The :dfn:`context management protocol` consists of a pair of methods that need
-to be provided for a context manager object to define a runtime context:
+before the statement body is executed and exited when the statement ends:
.. method:: contextmanager.__enter__()
@@ -2256,9 +2253,9 @@
their implementation of the context management protocol. See the
:mod:`contextlib` module for some examples.
-Python's :term:`generator`\s and the ``contextlib.contextmanager`` :term:`decorator`
+Python's :term:`generator`\s and the :class:`contextlib.contextmanager` decorator
provide a convenient way to implement these protocols. If a generator function is
-decorated with the ``contextlib.contextmanager`` decorator, it will return a
+decorated with the :class:`contextlib.contextmanager` decorator, it will return a
context manager implementing the necessary :meth:`__enter__` and
:meth:`__exit__` methods, rather than the iterator produced by an undecorated
generator function.
diff --git a/Doc/library/test.rst b/Doc/library/test.rst
index 0b16109..ecb2e5c 100644
--- a/Doc/library/test.rst
+++ b/Doc/library/test.rst
@@ -5,12 +5,12 @@
:synopsis: Regression tests package containing the testing suite for Python.
.. sectionauthor:: Brett Cannon <brett@python.org>
-.. note::
- The :mod:`test` package is meant for internal use by Python only. It is
- documented for the benefit of the core developers of Python. Any use of
- this package outside of Python's standard library is discouraged as code
- mentioned here can change or be removed without notice between releases of
- Python.
+.. warning::
+ The :mod:`test` package is meant for internal use by Python only. It is
+ documented for the benefit of the core developers of Python. Any use of
+ this package outside of Python's standard library is discouraged as code
+ mentioned here can change or be removed without notice between releases of
+ Python.
The :mod:`test` package contains all regression tests for Python as well as the