Skip to content

Commit 8b6775a

Browse files
author
georg.brandl
committed
Remove things specific to the old Macintosh, and spell "Mac OS X" consistently.
git-svn-id: http://svn.python.org/projects/python/trunk@66452 6015fed2-1504-0410-9fe1-9d1591cc4771
1 parent cc6dc0e commit 8b6775a

34 files changed

Lines changed: 189 additions & 205 deletions

‎Doc/distutils/apiref.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ This module provides the following functions.
326326
``'posix'``, ``'nt'``), and *compiler* defaults to the default compiler for
327327
that platform. Currently only ``'posix'`` and ``'nt'`` are supported, and the
328328
default compilers are "traditional Unix interface" (:class:`UnixCCompiler`
329-
class) and Visual C++(:class:`MSVCCompiler` class). Note that it's perfectly
329+
class) and Visual C++ (:class:`MSVCCompiler` class). Note that it's perfectly
330330
possible to ask for a Unix compiler object under Windows, and a Microsoft
331331
compiler object under Unix---if you supply a value for *compiler*, *plat* is
332332
ignored.

‎Doc/distutils/builtdist.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,8 @@ or the :command:`bdist` command with the :option:`--formats` option::
302302

303303
If you have a pure module distribution (only containing pure Python modules and
304304
packages), the resulting installer will be version independent and have a name
305-
like :file:`foo-1.0.win32.exe`. These installers can even be created on Unix or
306-
Mac OS platforms.
305+
like :file:`foo-1.0.win32.exe`. These installers can even be created on Unix
306+
platforms or Mac OS X.
307307

308308
If you have a non-pure distribution, the extensions can only be created on a
309309
Windows platform, and will be Python version dependent. The installer filename

‎Doc/distutils/commandref.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ regular filename characters, ``?`` matches any single regular filename
8888
character, and ``[range]`` matches any of the characters in *range* (e.g.,
8989
``a-z``, ``a-zA-Z``, ``a-f0-9_.``). The definition of "regular filename
9090
character" is platform-specific: on Unix it is anything except slash; on Windows
91-
anything except backslash or colon; on Mac OS 9 anything except colon.
91+
anything except backslash or colon.
9292

9393
**\*\*** Windows support not there yet **\*\***
9494

‎Doc/distutils/setupscript.rst‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ Distutils will take care of converting this platform-neutral representation into
4646
whatever is appropriate on your current platform before actually using the
4747
pathname. This makes your setup script portable across operating systems, which
4848
of course is one of the major goals of the Distutils. In this spirit, all
49-
pathnames in this document are slash-separated. (Mac OS 9 programmers should
50-
keep in mind that the *absence* of a leading slash indicates a relative path,
51-
the opposite of the Mac OS convention with colons.)
49+
pathnames in this document are slash-separated.
5250

5351
This, of course, only applies to pathnames given to Distutils functions. If
5452
you, for example, use standard Python functions such as :func:`glob.glob` or

‎Doc/extending/embedding.rst‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,9 @@ the Python interpreter to run some Python code.
2525

2626
So if you are embedding Python, you are providing your own main program. One of
2727
the things this main program has to do is initialize the Python interpreter. At
28-
the very least, you have to call the function :cfunc:`Py_Initialize` (on Mac OS,
29-
call :cfunc:`PyMac_Initialize` instead). There are optional calls to pass
30-
command line arguments to Python. Then later you can call the interpreter from
31-
any part of the application.
28+
the very least, you have to call the function :cfunc:`Py_Initialize`. There are
29+
optional calls to pass command line arguments to Python. Then later you can
30+
call the interpreter from any part of the application.
3231

3332
There are several different ways to call the interpreter: you can pass a string
3433
containing Python statements to :cfunc:`PyRun_SimpleString`, or you can pass a

‎Doc/howto/sockets.rst‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,7 @@ files. Don't try this on Windows. On Windows, ``select`` works with sockets
390390
only. Also note that in C, many of the more advanced socket options are done
391391
differently on Windows. In fact, on Windows I usually use threads (which work
392392
very, very well) with my sockets. Face it, if you want any kind of performance,
393-
your code will look very different on Windows than on Unix. (I haven't the
394-
foggiest how you do this stuff on a Mac.)
393+
your code will look very different on Windows than on Unix.
395394

396395

397396
Performance

‎Doc/howto/unicode.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ Unicode filenames
568568
Most of the operating systems in common use today support filenames that contain
569569
arbitrary Unicode characters. Usually this is implemented by converting the
570570
Unicode string into some encoding that varies depending on the system. For
571-
example, MacOS X uses UTF-8 while Windows uses a configurable encoding; on
571+
example, Mac OS X uses UTF-8 while Windows uses a configurable encoding; on
572572
Windows, Python uses the name "mbcs" to refer to whatever the currently
573573
configured encoding is. On Unix systems, there will only be a filesystem
574574
encoding if you've set the ``LANG`` or ``LC_CTYPE`` environment variables; if

‎Doc/library/binhex.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ There is an alternative, more powerful interface to the coder and decoder, see
5858
the source for details.
5959

6060
If you code or decode textfiles on non-Macintosh platforms they will still use
61-
the Macintosh newline convention (carriage-return as end of line).
61+
the old Macintosh newline convention (carriage-return as end of line).
6262

6363
As of this writing, :func:`hexbin` appears to not work in all cases.
6464

‎Doc/library/carbon.rst‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

22
.. _toolbox:
33

4-
*********************
5-
MacOS Toolbox Modules
6-
*********************
4+
**********************
5+
Mac OS Toolbox Modules
6+
**********************
77

8-
There are a set of modules that provide interfaces to various MacOS toolboxes.
8+
There are a set of modules that provide interfaces to various Mac OS toolboxes.
99
If applicable the module will define a number of Python objects for the various
1010
structures declared by the toolbox, and operations will be implemented as
1111
methods of the object. Other operations will be implemented as functions in the
@@ -240,7 +240,7 @@ The ``CFBase``, ``CFArray``, ``CFData``, ``CFDictionary``, ``CFString`` and
240240
:deprecated:
241241

242242

243-
This module is only fully available on MacOS9 and earlier under classic PPC
243+
This module is only fully available on Mac OS 9 and earlier under classic PPC
244244
MacPython. Very limited functionality is available under Carbon MacPython.
245245

246246
.. index:: single: Scrap Manager

‎Doc/library/cgihttpserver.rst‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ run CGI scripts.
1919

2020
.. note::
2121

22-
This module can run CGI scripts on Unix and Windows systems; on Mac OS it will
23-
only be able to run Python scripts within the same process as itself.
22+
This module can run CGI scripts on Unix and Windows systems.
2423

2524
.. note::
2625

0 commit comments

Comments
 (0)