[3.8] Update macOS installer display files for 3.8.0 (GH-16766)

ned-deily · web-flow · commit ac53ba6c7c0c · 2019-10-14T04:36:34.000-04:00
diff --git a/Mac/BuildScript/resources/License.rtf b/Mac/BuildScript/resources/License.rtf
@@ -1,16 +1,17 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf160
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 CourierNewPS-BoldMT;\f2\fmodern\fcharset0 CourierNewPSMT;
-}
+{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf600
+{\fonttbl\f0\fswiss\fcharset0 Helvetica-Bold;\f1\fswiss\fcharset0 Helvetica;\f2\fmodern\fcharset0 CourierNewPS-BoldMT;
+\f3\fmodern\fcharset0 CourierNewPSMT;}
 {\colortbl;\red255\green255\blue255;}
+{\*\expandedcolortbl;;}
 \margl1440\margr1440\vieww14620\viewh13380\viewkind0
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
 
 \f0\b\fs36 \cf0 \ul \ulc0 HISTORY AND LICENSE\
 
 \fs24 \
 HISTORY OF THE SOFTWARE\
 
-\b0 \ulnone \
+\f1\b0 \ulnone \
 Python was created in the early 1990s by Guido van Rossum at Stichting Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands as a successor of a language called ABC. Guido remains Python's principal author, although it includes many contributions from others.\
 \
 In 1995, Guido continued his work on Python at the Corporation for National Research Initiatives (CNRI, see http://www.cnri.reston.va.us) in Reston, Virginia where he released several versions of the software.\
@@ -20,10 +21,10 @@ In May 2000, Guido and the Python core development team moved to BeOpen.com to f
 All Python releases are Open Source (see http://www.opensource.org for the Open Source Definition). Historically, most, but not all, Python releases have also been GPL-compatible; the table below summarizes the various releases.\
 \
 
-\f1\b Release         Derived     Year        Owner       GPL-\
+\f2\b Release         Derived     Year        Owner       GPL-\
                 from                                compatible?\
 
-\f2\b0 \
+\f3\b0 \
 0.9.0 thru 1.2  n/a         1991-1995   CWI         yes\
 1.3 thru 1.5.2  1.2         1995-1999   CNRI        yes\
 1.6             1.5.2       2000        CNRI        no\
@@ -36,25 +37,25 @@ All Python releases are Open Source (see http://www.opensource.org for the Open
 2.1.3           2.1.2       2002        PSF         yes\
 2.2 and above   2.1.1       2001-now    PSF         yes\
 
-\f0 \
+\f1 \
 
-\b Note:  
-\b0 GPL-compatible doesn't mean that we're distributing Python under the GPL. All Python licenses, unlike the GPL, let you distribute a modified version without making your changes open source. The GPL-compatible licenses make it possible to combine Python with other software that is released under the GPL; the others don't.\
+\f0\b Note:  
+\f1\b0 GPL-compatible doesn't mean that we're distributing Python under the GPL. All Python licenses, unlike the GPL, let you distribute a modified version without making your changes open source. The GPL-compatible licenses make it possible to combine Python with other software that is released under the GPL; the others don't.\
 \
 Thanks to the many outside volunteers who have worked under Guido's direction to make these releases possible.\
 \
 \
 
-\b \ul TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON\
+\f0\b \ul TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON\
 
-\b0 \ulnone \
+\f1\b0 \ulnone \
 
-\b PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2\
+\f0\b PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2\
 
-\b0 \
+\f1\b0 \
 1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and the Individual or Organization ("Licensee") accessing and otherwise using this software ("Python") in source or binary form and its associated documentation.\
 \
-2. Subject to the terms and conditions of this License Agreement, PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Python Software Foundation; All Rights Reserved" are retained in Python alone or in any derivative version prepared by Licensee.\
+2. Subject to the terms and conditions of this License Agreement, PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Python Software Foundation; All Rights Reserved" are retained in Python alone or in any derivative version prepared by Licensee.\
 \
 3. In the event Licensee prepares a derivative work that is based on or incorporates Python or any part thereof, and wants to make the derivative work available to others as provided herein, then Licensee hereby agrees to include in any such work a brief summary of the changes made to Python.\
 \
@@ -70,9 +71,9 @@ Thanks to the many outside volunteers who have worked under Guido's direction to
 \
 \
 
-\b BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0\
+\f0\b BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0\
 
-\b0 \
+\f1\b0 \
 BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1\
 \
 1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the Individual or Organization ("Licensee") accessing and otherwise using this software in source or binary form and its associated documentation ("the Software").\
@@ -91,9 +92,9 @@ BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1\
 \
 \
 
-\b CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1\
+\f0\b CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1\
 
-\b0 \
+\f1\b0 \
 1. This LICENSE AGREEMENT is between the Corporation for National Research Initiatives, having an office at 1895 Preston White Drive, Reston, VA 20191 ("CNRI"), and the Individual or Organization ("Licensee") accessing and otherwise using Python 1.6.1 software in source or binary form and its associated documentation.\
 \
 2. Subject to the terms and conditions of this License Agreement, CNRI hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python 1.6.1 alone or in any derivative version, provided, however, that CNRI's License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) 1995-2001 Corporation for National Research Initiatives; All Rights Reserved" are retained in Python 1.6.1 alone or in any derivative version prepared by Licensee. Alternately, in lieu of CNRI's License Agreement, Licensee may substitute the following text (omitting the quotes): "Python 1.6.1 is made available subject to the terms and conditions in CNRI's License Agreement. This Agreement together with Python 1.6.1 may be located on the Internet using the following unique, persistent identifier (known as a handle): 1895.22/1013. This Agreement may also be obtained from a proxy server on the Internet using the following URL: http://hdl.handle.net/1895.22/1013".\
@@ -114,9 +115,9 @@ BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1\
 \
 \
 
-\b CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2\
+\f0\b CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2\
 
-\b0 \
+\f1\b0 \
 Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, The Netherlands. All rights reserved.\
 \
 Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of Stichting Mathematisch Centrum or CWI not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission.\
@@ -125,16 +126,16 @@ STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFT
 \
 \
 
-\b \ul LICENSES AND ACKNOWLEDGEMENTS FOR INCORPORATED SOFTWARE\
+\f0\b \ul LICENSES AND ACKNOWLEDGEMENTS FOR INCORPORATED SOFTWARE\
 
-\b0 \ulnone \
+\f1\b0 \ulnone \
 This installer incorporates portions of the following third-party software:\
 \
 
-\f2 $THIRD_PARTY_LIBS\
+\f3 $THIRD_PARTY_LIBS\
 \
 
-\f0 For licenses and acknowledgements for these and other third-party software incorporated in this Python distribution, please refer to the on-line documentation {\field{\*\fldinst{HYPERLINK "https://docs.python.org/$VERSION/license.html#licenses-and-acknowledgements-for-incorporated-software"}}{\fldrslt here}}.\
+\f1 For licenses and acknowledgements for these and other third-party software incorporated in this Python distribution, please refer to the on-line documentation {\field{\*\fldinst{HYPERLINK "https://docs.python.org/$VERSION/license.html#licenses-and-acknowledgements-for-incorporated-software"}}{\fldrslt here}}.\
 \
 \
 \
diff --git a/Mac/BuildScript/resources/ReadMe.rtf b/Mac/BuildScript/resources/ReadMe.rtf
@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf500
+{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf600
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 Helvetica-Bold;\f2\fswiss\fcharset0 Helvetica-Oblique;
 \f3\fmodern\fcharset0 CourierNewPSMT;}
 {\colortbl;\red255\green255\blue255;}
@@ -8,12 +8,6 @@
 
 \f0\fs24 \cf0 This package will install Python $FULL_VERSION for macOS $MACOSX_DEPLOYMENT_TARGET for the following architecture(s): $ARCHITECTURES.\
 \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
-
-\f1\b \cf0 NOTE: 
-\f0\b0 This is a beta test preview of Python 3.8.0, the next feature release of Python 3.8.  It is not intended for production use.\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
-\cf0 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
 
 \f1\b \cf0 \ul \ulc0 Certificate verification and OpenSSL\
@@ -29,21 +23,35 @@ This package includes its own private copy of OpenSSL 1.1.1.   The trust certifi
 \f3 /Applications/Python 3.8
 \f0  to install a curated bundle of default root certificates from the third-party 
 \f3 certifi
-\f0  package ({\field{\*\fldinst{HYPERLINK "https://pypi.org/project/certifi/"}}{\fldrslt https://pypi.org/project/certifi/}}).  If you choose to use 
-\f3 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  package ({\field{\*\fldinst{HYPERLINK "https://pypi.org/project/certifi/"}}{\fldrslt https://pypi.org/project/certifi/}}).  Double-click on 
+\f3 Install Certificates
+\f0  to run it.\
 \
 The bundled 
 \f3 pip
-\f0  included with this installer has its own default certificate store for verifying download connections.\
+\f0  has its own default certificate store for verifying download connections.\
 \
 
 \f1\b \ul Using IDLE or other Tk applications 
 \f0\b0 \ulnone \
 \
 This package includes its own private version of Tcl/Tk 8.6. It does not use any system-supplied or third-party supplied versions of Tcl/Tk.\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
+\cf0 \
+Due to new security checks on macOS 10.15 Catalina, when launching IDLE macOS may open a window with a message 
+\f1\b "Python" would like to access files in your Documents folder
+\f0\b0 .  This is normal as IDLE uses your 
+\f1\b Documents
+\f0\b0  folder as its default when opening and saving files; you can still choose other locations in the 
+\f1\b Open
+\f0\b0  and 
+\f1\b Save
+\f0\b0  file dialog windows.  Click on the 
+\f1\b OK
+\f0\b0  button to proceed.\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
 
-\f1\b \ul \
+\f1\b \cf0 \ul \ulc0 \
 Other changes\
 
 \f0\b0 \ulnone \
@@ -52,34 +60,4 @@ For other changes in this release, see the
 \f0\i0  section in the {\field{\*\fldinst{HYPERLINK "https://www.python.org/doc/"}}{\fldrslt Documentation Set}} for this release and its 
 \f2\i Release Notes
 \f0\i0  link at {\field{\*\fldinst{HYPERLINK "https://www.python.org/downloads/"}}{\fldrslt https://www.python.org/downloads/}}.\
-
-\f1\b \ul \
-Python 3 and Python 2 Co-existence\
-
-\f0\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, 
-\f3 python3
-\f0  (or
-\f3  python$VERSION
-\f0 ), 
-\f3 idle3
-\f0  (or i
-\f3 dle$VERSION
-\f0 ), 
-\f3 pip3
-\f0  (or 
-\f3 pip$VERSION
-\f0 ), etc.  Python 2.7 command names contain a 2 or no digit: 
-\f3 python2
-\f0  (or 
-\f3 python2.7
-\f0  or 
-\f3 python
-\f0 ), 
-\f3 idle2
-\f0  (or 
-\f3 idle2.7
-\f0  or 
-\f3 idle
-\f0 ), etc.\
 }
diff --git a/Mac/BuildScript/resources/Welcome.rtf b/Mac/BuildScript/resources/Welcome.rtf
@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf500
+{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf600
 \cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 Helvetica-Bold;\f2\fmodern\fcharset0 CourierNewPSMT;
 }
 {\colortbl;\red255\green255\blue255;}
@@ -14,15 +14,13 @@
 \
 
 \f1\b Python for macOS
-\f0\b0  consists of the Python programming language interpreter, plus a set of programs to allow easy access to it for macOS users including an integrated development environment 
+\f0\b0  consists of the {\field{\*\fldinst{HYPERLINK "https://www.python.org"}}{\fldrslt Python}} programming language interpreter and its batteries-included standard library to allow easy access to macOS features.  It also includes the Python integrated development environment, 
 \f1\b IDLE
-\f0\b0 .\
+\f0\b0 .  You can also use the included 
+\f1\b pip
+\f0\b0  to download and install third-party packages from the {\field{\*\fldinst{HYPERLINK "https://pypi.org"}}{\fldrslt Python Package Index}}. \
 \
 At the end of this install, click on 
 \f2 Install Certificates
-\f0  for SSL root certificates\
-\
-
-\f1\b NOTE: 
-\f0\b0 This is a beta test preview of Python 3.8.0, the next feature release of Python 3.8.  It is not intended for production use.\
+\f0  to install a set of current SSL root certificates.\
 }

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,17 @@`
`1`		`-{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf160`
`2`		`-{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 CourierNewPS-BoldMT;\f2\fmodern\fcharset0 CourierNewPSMT;`
`3`		`-}`
	`1`	`+{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf600`
	`2`	`+{\fonttbl\f0\fswiss\fcharset0 Helvetica-Bold;\f1\fswiss\fcharset0 Helvetica;\f2\fmodern\fcharset0 CourierNewPS-BoldMT;`
	`3`	`+\f3\fmodern\fcharset0 CourierNewPSMT;}`
`4`	`4`	`{\colortbl;\red255\green255\blue255;}`
	`5`	`+{\*\expandedcolortbl;;}`
`5`	`6`	`\margl1440\margr1440\vieww14620\viewh13380\viewkind0`
`6`		`-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural`
	`7`	`+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0`
`7`	`8`
`8`	`9`	`\f0\b\fs36 \cf0 \ul \ulc0 HISTORY AND LICENSE\`
`9`	`10`
`10`	`11`	`\fs24 \`
`11`	`12`	`HISTORY OF THE SOFTWARE\`
`12`	`13`
`13`		`-\b0 \ulnone \`
	`14`	`+\f1\b0 \ulnone \`
`14`	`15`	`Python was created in the early 1990s by Guido van Rossum at Stichting Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands as a successor of a language called ABC. Guido remains Python's principal author, although it includes many contributions from others.\`
`15`	`16`	`\`
`16`	`17`	`In 1995, Guido continued his work on Python at the Corporation for National Research Initiatives (CNRI, see http://www.cnri.reston.va.us) in Reston, Virginia where he released several versions of the software.\`
`@@ -20,10 +21,10 @@ In May 2000, Guido and the Python core development team moved to BeOpen.com to f`
`20`	`21`	`All Python releases are Open Source (see http://www.opensource.org for the Open Source Definition). Historically, most, but not all, Python releases have also been GPL-compatible; the table below summarizes the various releases.\`
`21`	`22`	`\`
`22`	`23`
`23`		`-\f1\b Release Derived Year Owner GPL-\`
	`24`	`+\f2\b Release Derived Year Owner GPL-\`
`24`	`25`	`from compatible?\`
`25`	`26`
`26`		`-\f2\b0 \`
	`27`	`+\f3\b0 \`
`27`	`28`	`0.9.0 thru 1.2 n/a 1991-1995 CWI yes\`
`28`	`29`	`1.3 thru 1.5.2 1.2 1995-1999 CNRI yes\`
`29`	`30`	`1.6 1.5.2 2000 CNRI no\`
`@@ -36,25 +37,25 @@ All Python releases are Open Source (see http://www.opensource.org for the Open`
`36`	`37`	`2.1.3 2.1.2 2002 PSF yes\`
`37`	`38`	`2.2 and above 2.1.1 2001-now PSF yes\`
`38`	`39`
`39`		`-\f0 \`
	`40`	`+\f1 \`
`40`	`41`
`41`		`-\b Note:`
`42`		`-\b0 GPL-compatible doesn't mean that we're distributing Python under the GPL. All Python licenses, unlike the GPL, let you distribute a modified version without making your changes open source. The GPL-compatible licenses make it possible to combine Python with other software that is released under the GPL; the others don't.\`
	`42`	`+\f0\b Note:`
	`43`	`+\f1\b0 GPL-compatible doesn't mean that we're distributing Python under the GPL. All Python licenses, unlike the GPL, let you distribute a modified version without making your changes open source. The GPL-compatible licenses make it possible to combine Python with other software that is released under the GPL; the others don't.\`
`43`	`44`	`\`
`44`	`45`	`Thanks to the many outside volunteers who have worked under Guido's direction to make these releases possible.\`
`45`	`46`	`\`
`46`	`47`	`\`
`47`	`48`
`48`		`-\b \ul TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON\`
	`49`	`+\f0\b \ul TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON\`
`49`	`50`
`50`		`-\b0 \ulnone \`
	`51`	`+\f1\b0 \ulnone \`
`51`	`52`
`52`		`-\b PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2\`
	`53`	`+\f0\b PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2\`
`53`	`54`
`54`		`-\b0 \`
	`55`	`+\f1\b0 \`
`55`	`56`	`1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and the Individual or Organization ("Licensee") accessing and otherwise using this software ("Python") in source or binary form and its associated documentation.\`
`56`	`57`	`\`
`57`		-2. Subject to the terms and conditions of this License Agreement, PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Python Software Foundation; All Rights Reserved" are retained in Python alone or in any derivative version prepared by Licensee.\
	`58`	+2. Subject to the terms and conditions of this License Agreement, PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Python Software Foundation; All Rights Reserved" are retained in Python alone or in any derivative version prepared by Licensee.\
`58`	`59`	`\`
`59`	`60`	`3. In the event Licensee prepares a derivative work that is based on or incorporates Python or any part thereof, and wants to make the derivative work available to others as provided herein, then Licensee hereby agrees to include in any such work a brief summary of the changes made to Python.\`
`60`	`61`	`\`
`@@ -70,9 +71,9 @@ Thanks to the many outside volunteers who have worked under Guido's direction to`
`70`	`71`	`\`
`71`	`72`	`\`
`72`	`73`
`73`		`-\b BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0\`
	`74`	`+\f0\b BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0\`
`74`	`75`
`75`		`-\b0 \`
	`76`	`+\f1\b0 \`
`76`	`77`	`BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1\`
`77`	`78`	`\`
`78`	`79`	`1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the Individual or Organization ("Licensee") accessing and otherwise using this software in source or binary form and its associated documentation ("the Software").\`
`@@ -91,9 +92,9 @@ BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1\`
`91`	`92`	`\`
`92`	`93`	`\`
`93`	`94`
`94`		`-\b CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1\`
	`95`	`+\f0\b CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1\`
`95`	`96`
`96`		`-\b0 \`
	`97`	`+\f1\b0 \`
`97`	`98`	`1. This LICENSE AGREEMENT is between the Corporation for National Research Initiatives, having an office at 1895 Preston White Drive, Reston, VA 20191 ("CNRI"), and the Individual or Organization ("Licensee") accessing and otherwise using Python 1.6.1 software in source or binary form and its associated documentation.\`
`98`	`99`	`\`
`99`	`100`	2. Subject to the terms and conditions of this License Agreement, CNRI hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python 1.6.1 alone or in any derivative version, provided, however, that CNRI's License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) 1995-2001 Corporation for National Research Initiatives; All Rights Reserved" are retained in Python 1.6.1 alone or in any derivative version prepared by Licensee. Alternately, in lieu of CNRI's License Agreement, Licensee may substitute the following text (omitting the quotes): "Python 1.6.1 is made available subject to the terms and conditions in CNRI's License Agreement. This Agreement together with Python 1.6.1 may be located on the Internet using the following unique, persistent identifier (known as a handle): 1895.22/1013. This Agreement may also be obtained from a proxy server on the Internet using the following URL: http://hdl.handle.net/1895.22/1013".\
`@@ -114,9 +115,9 @@ BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1\`
`114`	`115`	`\`
`115`	`116`	`\`
`116`	`117`
`117`		`-\b CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2\`
	`118`	`+\f0\b CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2\`
`118`	`119`
`119`		`-\b0 \`
	`120`	`+\f1\b0 \`
`120`	`121`	`Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, The Netherlands. All rights reserved.\`
`121`	`122`	`\`
`122`	`123`	`Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of Stichting Mathematisch Centrum or CWI not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission.\`
`@@ -125,16 +126,16 @@ STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFT`
`125`	`126`	`\`
`126`	`127`	`\`
`127`	`128`
`128`		`-\b \ul LICENSES AND ACKNOWLEDGEMENTS FOR INCORPORATED SOFTWARE\`
	`129`	`+\f0\b \ul LICENSES AND ACKNOWLEDGEMENTS FOR INCORPORATED SOFTWARE\`
`129`	`130`
`130`		`-\b0 \ulnone \`
	`131`	`+\f1\b0 \ulnone \`
`131`	`132`	`This installer incorporates portions of the following third-party software:\`
`132`	`133`	`\`
`133`	`134`
`134`		`-\f2 $THIRD_PARTY_LIBS\`
	`135`	`+\f3 $THIRD_PARTY_LIBS\`
`135`	`136`	`\`
`136`	`137`
`137`		`-\f0 For licenses and acknowledgements for these and other third-party software incorporated in this Python distribution, please refer to the on-line documentation {\field{\*\fldinst{HYPERLINK "https://docs.python.org/$VERSION/license.html#licenses-and-acknowledgements-for-incorporated-software"}}{\fldrslt here}}.\`
	`138`	`+\f1 For licenses and acknowledgements for these and other third-party software incorporated in this Python distribution, please refer to the on-line documentation {\field{\*\fldinst{HYPERLINK "https://docs.python.org/$VERSION/license.html#licenses-and-acknowledgements-for-incorporated-software"}}{\fldrslt here}}.\`
`138`	`139`	`\`
`139`	`140`	`\`
`140`	`141`	`\`