summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Deily <nad@python.org>2016-10-10 15:34:47 -0400
committerNed Deily <nad@python.org>2016-10-10 15:34:47 -0400
commit96feeab0e2de7b17bf4b286018b5778a66899057 (patch)
treef9e9f6508a53b56b8667a158618136bc41084c90
parent44fa3d3a9739da63aad1005071b8f073252d47a9 (diff)
parente326a9172feba69ecfde6fe2ab5e0d9ae3496df9 (diff)
downloadcpython-git-96feeab0e2de7b17bf4b286018b5778a66899057.tar.gz
merge with 3.6
-rw-r--r--Mac/BuildScript/resources/ReadMe.rtf6
1 files changed, 3 insertions, 3 deletions
diff --git a/Mac/BuildScript/resources/ReadMe.rtf b/Mac/BuildScript/resources/ReadMe.rtf
index 04dceafa3a..523fabb29a 100644
--- a/Mac/BuildScript/resources/ReadMe.rtf
+++ b/Mac/BuildScript/resources/ReadMe.rtf
@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1504
+{\rtf1\ansi\ansicpg1252\cocoartf1504\cocoasubrtf390
{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 CourierNewPSMT;}
{\colortbl;\red255\green255\blue255;}
{\*\expandedcolortbl;\csgray\c100000;}
@@ -43,7 +43,7 @@ Certificate verification and OpenSSL\
\f1 certifi
\f0 package ({\field{\*\fldinst{HYPERLINK "https://pypi.python.org/pypi/certifi"}}{\fldrslt https://pypi.python.org/pypi/certifi}}). If you choose to use
\f1 certifi
-\f0 , you should consider subscribing to the{\field{\*\fldinst{HYPERLINK "https://certifi.io/en/latest/"}}{\fldrslt project's email update service}} to be notified when the certificate bundle is updated.\
+\f0 , you should consider subscribing to the{\field{\*\fldinst{HYPERLINK "https://certifi.io/en/latest/"}}{\fldrslt project's email update service}} to be notified when the certificate bundle is updated. More options will be provided prior to the final release of 3.6.0.\
\
The bundled
\f1 pip
@@ -58,7 +58,7 @@ To use IDLE or other programs that use the Tkinter graphical user interface tool
\i Tcl/Tk
\i0 frameworks. Visit {\field{\*\fldinst{HYPERLINK "https://www.python.org/download/mac/tcltk/"}}{\fldrslt https://www.python.org/download/mac/tcltk/}} for current information about supported and recommended versions of
\i Tcl/Tk
-\i0 for this version of Python and of Mac OS X. For the initial alpha releases of Python 3.6, the installer is still linked with Tcl/Tk 8.5; this will change prior to the beta 2 release of 3.6.0.\
+\i0 for this version of Python and of Mac OS X. For the initial preview releases of Python 3.6, the installer is still linked with Tcl/Tk 8.5; this will likely change prior to the final release of 3.6.0.\
\b \ul \
Other changes\