summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-04-05 10:29:57 (GMT)
committerGeorg Brandl <georg@python.org>2009-04-05 10:29:57 (GMT)
commit89b1296ab92e0df1aa15a0d1ecad14249a1c910a (patch)
treeed3d268f8a2e882b859deb413e43e369d90f5f7d
parent9af0c5605779cded9fbe539066bf96dbfa55de7d (diff)
downloadcpython-89b1296ab92e0df1aa15a0d1ecad14249a1c910a.zip
cpython-89b1296ab92e0df1aa15a0d1ecad14249a1c910a.tar.gz
cpython-89b1296ab92e0df1aa15a0d1ecad14249a1c910a.tar.bz2
Normalize spelling of Mac OS X.
-rw-r--r--Doc/distutils/apiref.rst6
-rw-r--r--Doc/library/os.path.rst6
-rw-r--r--Doc/library/ttk.rst2
3 files changed, 7 insertions, 7 deletions
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
index e3608fb..a3b464a 100644
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -1091,17 +1091,17 @@ other utility module.
For non-POSIX platforms, currently just returns ``sys.platform``.
- For MacOS X systems the OS version reflects the minimal version on which
+ For Mac OS X systems the OS version reflects the minimal version on which
binaries will run (that is, the value of ``MACOSX_DEPLOYMENT_TARGET``
during the build of Python), not the OS version of the current system.
- For universal binary builds on MacOS X the architecture value reflects
+ For universal binary builds on Mac OS X the architecture value reflects
the univeral binary status instead of the architecture of the current
processor. For 32-bit universal binaries the architecture is ``fat``,
for 64-bit universal binaries the architecture is ``fat64``, and
for 4-way universal binaries the architecture is ``universal``.
- Examples of returned values on MacOS X:
+ Examples of returned values on Mac OS X:
* ``macosx-10.3-ppc``
diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
index bc2220d..01406e0 100644
--- a/Doc/library/os.path.rst
+++ b/Doc/library/os.path.rst
@@ -190,9 +190,9 @@ write files see :func:`open`, and for accessing the filesystem see the
.. function:: normcase(path)
- Normalize the case of a pathname. On Unix and MacOSX, this returns the path unchanged; on
- case-insensitive filesystems, it converts the path to lowercase. On Windows, it
- also converts forward slashes to backward slashes.
+ Normalize the case of a pathname. On Unix and Mac OS X, this returns the
+ path unchanged; on case-insensitive filesystems, it converts the path to
+ lowercase. On Windows, it also converts forward slashes to backward slashes.
.. function:: normpath(path)
diff --git a/Doc/library/ttk.rst b/Doc/library/ttk.rst
index f38664e..1795771 100644
--- a/Doc/library/ttk.rst
+++ b/Doc/library/ttk.rst
@@ -656,7 +656,7 @@ ones inherited from :class:`ttk.Widget`.
Platform-specific notes
^^^^^^^^^^^^^^^^^^^^^^^
-* On MacOS X, toplevel windows automatically include a built-in size grip
+* On Mac OS X, toplevel windows automatically include a built-in size grip
by default. Adding a :class:`Sizegrip` is harmless, since the built-in
grip will just mask the widget.