diff options
| author | Georg Brandl <georg@python.org> | 2008-09-13 17:46:05 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-09-13 17:46:05 (GMT) |
| commit | c575c9064769d37ac9555b7cd2907c25ab030810 (patch) | |
| tree | 8b15a940b50eba4b66a62a2610904efe88d94d18 /Doc/howto | |
| parent | a6fc212d2a2254ea2c3a6890bbb9b17cf0878529 (diff) | |
| download | cpython-c575c9064769d37ac9555b7cd2907c25ab030810.zip cpython-c575c9064769d37ac9555b7cd2907c25ab030810.tar.gz cpython-c575c9064769d37ac9555b7cd2907c25ab030810.tar.bz2 | |
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.
........
Diffstat (limited to 'Doc/howto')
| -rw-r--r-- | Doc/howto/sockets.rst | 3 | ||||
| -rw-r--r-- | Doc/howto/unicode.rst | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Doc/howto/sockets.rst b/Doc/howto/sockets.rst index c4d0961..2629d44 100644 --- a/Doc/howto/sockets.rst +++ b/Doc/howto/sockets.rst @@ -387,8 +387,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 454d25e..f86bd49 100644 --- a/Doc/howto/unicode.rst +++ b/Doc/howto/unicode.rst @@ -507,7 +507,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 |