summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMariatta <Mariatta@users.noreply.github.com>2017-07-31 19:53:43 -0700
committerGitHub <noreply@github.com>2017-07-31 19:53:43 -0700
commitf6306e737203ac1bf1717bbf62bc58dac24b68db (patch)
tree21f2bc0c6230be2dfd6b89da87b9267f0e0b8e48
parentFix trivial typo in multiprocessing documentation (GH-2930) (GH-2941) (diff)
downloadcpython-f6306e737203ac1bf1717bbf62bc58dac24b68db.tar.gz
cpython-f6306e737203ac1bf1717bbf62bc58dac24b68db.tar.bz2
cpython-f6306e737203ac1bf1717bbf62bc58dac24b68db.zip
bpo-25910: Update LICENSE (GH-2873) (GH-2968)
Use the copy provided in https://bugs.python.org/issue25910GH-msg295200 (cherry picked from commit 8474d87165593bac2bc231287f42c4cff3fd6aaf)
-rw-r--r--LICENSE11
1 files changed, 5 insertions, 6 deletions
diff --git a/LICENSE b/LICENSE
index f5d0b39a0cd..529349e4b38 100644
--- a/LICENSE
+++ b/LICENSE
@@ -13,12 +13,11 @@ software.
In May 2000, Guido and the Python core development team moved to
BeOpen.com to form the BeOpen PythonLabs team. In October of the same
-year, the PythonLabs team moved to Digital Creations (now Zope
-Corporation, see http://www.zope.com). In 2001, the Python Software
-Foundation (PSF, see http://www.python.org/psf/) was formed, a
-non-profit organization created specifically to own Python-related
-Intellectual Property. Zope Corporation is a sponsoring member of
-the PSF.
+year, the PythonLabs team moved to Digital Creations, which became
+Zope Corporation. In 2001, the Python Software Foundation (PSF, see
+https://www.python.org/psf/) was formed, a non-profit organization
+created specifically to own Python-related Intellectual Property.
+Zope Corporation was a sponsoring member of the PSF.
All Python releases are Open Source (see http://www.opensource.org for
the Open Source Definition). Historically, most, but not all, Python