From f8c3b69986a6e544c13b659efb1084b075f7cf34 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Sat, 22 Nov 2014 14:20:30 -0800 Subject: Add downloads page link to OS X installer README screens. --- Mac/BuildScript/resources/ReadMe.txt | 2 ++ Mac/BuildScript/resources/readme.rtf | 15 +++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Mac/BuildScript/resources/ReadMe.txt b/Mac/BuildScript/resources/ReadMe.txt index 8964b8b..f1d1203 100644 --- a/Mac/BuildScript/resources/ReadMe.txt +++ b/Mac/BuildScript/resources/ReadMe.txt @@ -29,6 +29,8 @@ The Python installer now includes an option to automatically install or upgrade To make it easier to use scripts installed by third-party Python packages, with pip or by other means, the Shell profile updater option is now enabled by default, as has been the case with Python 2.7.x installers. You can also turn this option off by selecting Customize and unchecking the Shell profile updater option. You can also update your shell profile later by launching the Update Shell Profile command found in the /Applications/Python $VERSION folder. You may need to start a new terminal window for the changes to take effect. +For other changes in this release, see the Release Notes link for this release at https://www.python.org/downloads/. + ============================= Python 3 and Python 2 Co-existence ============================= diff --git a/Mac/BuildScript/resources/readme.rtf b/Mac/BuildScript/resources/readme.rtf index 5b74801..58bec51 100644 --- a/Mac/BuildScript/resources/readme.rtf +++ b/Mac/BuildScript/resources/readme.rtf @@ -1,7 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210 +{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf160 {\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 CourierNewPSMT;} {\colortbl;\red255\green255\blue255;} -\margl1440\margr1440\vieww13020\viewh15160\viewkind0 +\margl1440\margr1440\vieww13380\viewh14600\viewkind0 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural \f0\fs24 \cf0 This package will install Python $FULL_VERSION for Mac OS X $MACOSX_DEPLOYMENT_TARGET for the following architecture(s): $ARCHITECTURES.\ @@ -41,8 +41,7 @@ With the change to the newer flat format installer package, the download file no \b \cf0 \ul \ulc0 New Installation Options and Defaults\ \ulnone [NEW for Python 3.4.0] \b0 \ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\cf0 \ +\ The Python installer now includes an option to automatically install or upgrade \f1 pip \f0 , a tool for installing and managing Python packages. This option is enabled by default and no Internet access is required. If you do not want the installer to do this, select the @@ -67,12 +66,12 @@ To make it easier to use scripts installed by third-party Python packages, with \f1 /Applications/Python $VERSION \f0 folder. You may need to start a new terminal window for the changes to take effect.\ \ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural +For other changes in this release, see the Release Notes link for this release at {\field{\*\fldinst{HYPERLINK "https://www.python.org/downloads/"}}{\fldrslt https://www.python.org/downloads/}}.\ +\ -\b \cf0 \ul \ulc0 Python 3 and Python 2 Co-existence\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural +\b \ul Python 3 and Python 2 Co-existence\ -\b0 \cf0 \ulnone \ +\b0 \ulnone \ Python.org Python $VERSION and 2.7.x versions can both be installed on your system and will not conflict. Command names for Python 3 contain a 3 in them, \f1 python3 \f0 (or -- cgit v0.12