summaryrefslogtreecommitdiffstats
path: root/Doc/api
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2005-02-13 22:56:41 (GMT)
committerBrett Cannon <bcannon@gmail.com>2005-02-13 22:56:41 (GMT)
commit150d61d37ee7f6b0103a40e59d5473fec9a5eddf (patch)
tree6da6e1c2178921d731e2198d759d26e24940c65d /Doc/api
parent688a0ca97b9e78f40f8c2a97150406db712a3547 (diff)
downloadcpython-150d61d37ee7f6b0103a40e59d5473fec9a5eddf.zip
cpython-150d61d37ee7f6b0103a40e59d5473fec9a5eddf.tar.gz
cpython-150d61d37ee7f6b0103a40e59d5473fec9a5eddf.tar.bz2
Update refences to "Macintosh" to reflect the state of affairs for OS X and not
Mac OS 9. Backport of patch #1095802.
Diffstat (limited to 'Doc/api')
-rw-r--r--Doc/api/init.tex7
-rw-r--r--Doc/api/utilities.tex2
2 files changed, 4 insertions, 5 deletions
diff --git a/Doc/api/init.tex b/Doc/api/init.tex
index e8d3583..96a13d3 100644
--- a/Doc/api/init.tex
+++ b/Doc/api/init.tex
@@ -239,9 +239,8 @@
program name (set by \cfunction{Py_SetProgramName()} above) and some
environment variables. The returned string consists of a series of
directory names separated by a platform dependent delimiter
- character. The delimiter character is \character{:} on \UNIX,
- \character{;} on Windows, and \character{\e n} (the \ASCII{}
- newline character) on Macintosh. The returned string points into
+ character. The delimiter character is \character{:} on \UNIX and Mac OS X,
+ \character{;} on Windows. The returned string points into
static storage; the caller should not modify its value. The value
is available to Python code as the list
\code{sys.path}\withsubitem{(in module sys)}{\ttindex{path}}, which
@@ -272,7 +271,7 @@
this is formed from the ``official'' name of the operating system,
converted to lower case, followed by the major revision number;
e.g., for Solaris 2.x, which is also known as SunOS 5.x, the value
- is \code{'sunos5'}. On Macintosh, it is \code{'mac'}. On Windows,
+ is \code{'sunos5'}. On Mac OS X, it is \code{'darwin'}. On Windows,
it is \code{'win'}. The returned string points into static storage;
the caller should not modify its value. The value is available to
Python code as \code{sys.platform}.
diff --git a/Doc/api/utilities.tex b/Doc/api/utilities.tex
index 590df6c..397643e 100644
--- a/Doc/api/utilities.tex
+++ b/Doc/api/utilities.tex
@@ -34,7 +34,7 @@ values from C values.
Return true when the interpreter runs out of stack space. This is a
reliable check, but is only available when \constant{USE_STACKCHECK}
is defined (currently on Windows using the Microsoft Visual \Cpp{}
- compiler and on the Macintosh). \constant{USE_CHECKSTACK} will be
+ compiler). \constant{USE_CHECKSTACK} will be
defined automatically; you should never change the definition in
your own code.
\end{cfuncdesc}