summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Lagerwall <rosslagerwall@gmail.com>2011-09-01 05:02:31 (GMT)
committerRoss Lagerwall <rosslagerwall@gmail.com>2011-09-01 05:02:31 (GMT)
commit7194efe8b403548c8f1efd6a933cefaf716f23af (patch)
tree433e903a498bd0410bb16cb6abea41e378278f08
parent8f8cc8ba6b79450497bea7f3003865501b14e53e (diff)
parenta9353db2cd0b1c2c08793a18364da6058db50caf (diff)
downloadcpython-7194efe8b403548c8f1efd6a933cefaf716f23af.zip
cpython-7194efe8b403548c8f1efd6a933cefaf716f23af.tar.gz
cpython-7194efe8b403548c8f1efd6a933cefaf716f23af.tar.bz2
Merge with 3.2.
-rw-r--r--Doc/library/os.rst5
1 files changed, 0 insertions, 5 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index e9352d9..636ac24 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -29,11 +29,6 @@ Notes on the availability of these functions:
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.