summaryrefslogtreecommitdiffstats
path: root/Doc/howto
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-09-13 17:41:16 (GMT)
committerGeorg Brandl <georg@python.org>2008-09-13 17:41:16 (GMT)
commit9af9498c6e59aa9efe0370bcc476307b4c30c06c (patch)
treec8b5dee5200abd38af016b0e13fb93410e1b550b /Doc/howto
parentf2a2c796e37f888a254d7e2af8e4bc0dc0899530 (diff)
downloadcpython-9af9498c6e59aa9efe0370bcc476307b4c30c06c.zip
cpython-9af9498c6e59aa9efe0370bcc476307b4c30c06c.tar.gz
cpython-9af9498c6e59aa9efe0370bcc476307b4c30c06c.tar.bz2
Remove things specific to the old Macintosh, and spell "Mac OS X" consistently.
Diffstat (limited to 'Doc/howto')
-rw-r--r--Doc/howto/sockets.rst3
-rw-r--r--Doc/howto/unicode.rst2
2 files changed, 2 insertions, 3 deletions
diff --git a/Doc/howto/sockets.rst b/Doc/howto/sockets.rst
index 0b8db59..2747f81 100644
--- a/Doc/howto/sockets.rst
+++ b/Doc/howto/sockets.rst
@@ -390,8 +390,7 @@ files. Don't try this on Windows. On Windows, ``select`` works with sockets
only. Also note that in C, many of the more advanced socket options are done
differently on Windows. In fact, on Windows I usually use threads (which work
very, very well) with my sockets. Face it, if you want any kind of performance,
-your code will look very different on Windows than on Unix. (I haven't the
-foggiest how you do this stuff on a Mac.)
+your code will look very different on Windows than on Unix.
Performance
diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
index 64881444..21ae111 100644
--- a/Doc/howto/unicode.rst
+++ b/Doc/howto/unicode.rst
@@ -568,7 +568,7 @@ Unicode filenames
Most of the operating systems in common use today support filenames that contain
arbitrary Unicode characters. Usually this is implemented by converting the
Unicode string into some encoding that varies depending on the system. For
-example, MacOS X uses UTF-8 while Windows uses a configurable encoding; on
+example, Mac OS X uses UTF-8 while Windows uses a configurable encoding; on
Windows, Python uses the name "mbcs" to refer to whatever the currently
configured encoding is. On Unix systems, there will only be a filesystem
encoding if you've set the ``LANG`` or ``LC_CTYPE`` environment variables; if