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/library/subprocess.rst b/Doc/library/subprocess.rst
index 51cc577..66e3c83 100644
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -99,7 +99,7 @@
 
    If *universal_newlines* is :const:`True`, the file objects stdout and stderr are
    opened as text files, but lines may be terminated by any of ``'\n'``, the Unix
-   end-of-line convention, ``'\r'``, the Macintosh convention or ``'\r\n'``, the
+   end-of-line convention, ``'\r'``, the old Macintosh convention or ``'\r\n'``, the
    Windows convention. All of these external representations are seen as ``'\n'``
    by the Python program.