From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 11 Mar 2013 21:26:33 +0000 (-0400)
Subject: Merge with 3.2: Issue #17047: removed doubled words in Doc/*,
X-Git-Tag: v3.3.1rc1~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=caeb6bea9bd52859bceae8437bd931335aacad94;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2: Issue #17047: removed doubled words in Doc/*,
Mac/*, and Tool/* found by Serhiy Storchaka and Matthew Barnett
---

caeb6bea9bd52859bceae8437bd931335aacad94
diff --cc Mac/README
index f7bc6c3ad630,0b906f1eddb9..901a32405374
--- a/Mac/README
+++ b/Mac/README
@@@ -37,13 -30,12 +37,13 @@@ the Python distribution
  
  * ``--enable-universalsdk[=PATH]``
  
-   Create a universal binary build of of Python. This can be used with both
+   Create a universal binary build of Python. This can be used with both
    regular and framework builds.
  
 -  The optional argument specifies which OSX SDK should be used to perform the
 -  build. This defaults to ``/Developer/SDKs/MacOSX.10.4u.sdk``, specify 
 -  ``/`` when building on a 10.5 system, especially when building 64-bit code.
 +  The optional argument specifies which OS X SDK should be used to perform the
 +  build.  If xcodebuild is available and configured, this defaults to
 +  the Xcode default MacOS X SDK, otherwise ``/Developer/SDKs/MacOSX.10.4u.sdk``
 +  if available or ``/`` if not.
  
    See the section _`Building and using a universal binary of Python on Mac OS X`
    for more information.