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.
........
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 @@
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