Merged revisions 66452 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66452 | georg.brandl | 2008-09-13 19:41:16 +0200 (Sat, 13 Sep 2008) | 2 lines

  Remove things specific to the old Macintosh, and spell "Mac OS X" consistently.
........
This commit is contained in:
Georg Brandl 2008-09-13 17:46:05 +00:00
parent a6fc212d2a
commit c575c90647
28 changed files with 161 additions and 176 deletions

View file

@ -23,7 +23,7 @@ You could write a Unix shell script or Windows batch files for some of these
tasks, but shell scripts are best at moving around files and changing text data,
not well-suited for GUI applications or games. You could write a C/C++/Java
program, but it can take a lot of development time to get even a first-draft
program. Python is simpler to use, available on Windows, MacOS X, and Unix
program. Python is simpler to use, available on Windows, Mac OS X, and Unix
operating systems, and will help you get the job done more quickly.
Python is simple to use, but it is a real programming language, offering much

View file

@ -160,9 +160,9 @@ shell scripts, by putting the line ::
(assuming that the interpreter is on the user's :envvar:`PATH`) at the beginning
of the script and giving the file an executable mode. The ``#!`` must be the
first two characters of the file. On some platforms, this first line must end
with a Unix-style line ending (``'\n'``), not a Mac OS (``'\r'``) or Windows
(``'\r\n'``) line ending. Note that the hash, or pound, character, ``'#'``, is
used to start a comment in Python.
with a Unix-style line ending (``'\n'``), not a Windows (``'\r\n'``) line
ending. Note that the hash, or pound, character, ``'#'``, is used to start a
comment in Python.
The script can be given an executable mode, or permission, using the
:program:`chmod` command::