[Python-checkins] cpython (merge 3.2 -> default): Merge with 3.2.

Thu Sep 1 07:03:31 CEST 2011

http://hg.python.org/cpython/rev/e5c2d623c20b
changeset: 72159:e5c2d623c20b
parent: 72157:74671651540d
parent: 72158:65bd22be72dc
user: Ross Lagerwall <rosslagerwall at gmail.com>
date: Thu Sep 01 07:02:31 2011 +0200
summary:
 Merge with 3.2.
files:
 Doc/library/os.rst | 5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -29,11 +29,6 @@
 objects, and result in an object of the same type, if a path or file name is
 returned.
 
-.. note::
-
- If not separately noted, all functions that claim "Availability: Unix" are
- supported on Mac OS X, which builds on a Unix core.
-
 * An "Availability: Unix" note means that this function is commonly found on
 Unix systems. It does not make any claims about its existence on a specific
 operating system.
-- 
Repository URL: http://hg.python.org/cpython
