summaryrefslogtreecommitdiffstats
path: root/Doc/license.rst
Commit message (Collapse)AuthorAgeFilesLines
* merge 3.3Benjamin Peterson2015-01-011-1/+1
|\
| * merge 3.2Benjamin Peterson2015-01-011-1/+1
| |\
| | * update for copyright for 2015Benjamin Peterson2015-01-011-1/+1
| | |
| | * Copyright year update, add version to licenses.v3.2.6rc1Georg Brandl2014-10-041-1/+5
| | |
* | | Issue #17128: Use private version of OpenSSL for 3.x OS X 10.5+ installers.Ned Deily2014-12-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Among other issues, the Apple-supplied 0.9.7 libs for the 10.5 ABI cannot verify newer SHA-256 certs as now used by python.org services. Document in the installer ReadMe some of the certificate management issues that users now need to be more concerned with due to PEP 476's enabling cert verification by default. For now, continue to use the Apple-supplied 0.9.8 libs for the 10.6+ installer since they use Apple private APIs to verify certificates using the system- and user-managed CA keychain stores.
* | | Fixing broken links in doc, part 3: the restGeorg Brandl2014-10-291-1/+1
| | |
* | | Use https:// URLs when referring to python.org hosts.Georg Brandl2014-10-291-1/+1
| | |
* | | Final documentation fixes for 3.4.0 final.v3.4.0Larry Hastings2014-03-161-3/+3
| | |
* | | * Issue #16113: Remove sha3 module again.Martin v. Löwis2014-01-031-19/+0
| | | | | | | | | | | | Patch by Christian Heimes, with modifications.
* | | merge 3.3Benjamin Peterson2014-01-011-1/+1
|\ \ \ | |/ /
| * | update copyright yearBenjamin Peterson2014-01-011-1/+1
| | |
* | | Fix typo.Stefan Krah2013-12-091-1/+1
| | |
* | | Fix whitespace.Stefan Krah2013-12-091-1/+1
| | |
* | | Merge 3.3.Stefan Krah2013-12-091-0/+33
|\ \ \ | |/ /
| * | Add libmpdec license.Stefan Krah2013-12-081-0/+33
| | |
* | | Issue #18874: Implement the PEP 454 (tracemalloc)Victor Stinner2013-11-231-0/+41
| | |
* | | ssue #19183: Implement PEP 456 'secure and interchangeable hash algorithm'.Christian Heimes2013-11-201-0/+29
| | | | | | | | | | | | Python now uses SipHash24 on all major platforms.
* | | merge with 3.3Georg Brandl2013-09-221-73/+1
|\ \ \ | |/ /
| * | Closes #19043: remove detailed listing of versions from license filesGeorg Brandl2013-09-221-71/+1
| | | | | | | | | | | | | | | | | | Since all versions since 2.2 are under the same licensing terms, this saves the release manager from touching the two files for very new minor release.
* | | merge with 3.3Georg Brandl2013-04-061-0/+2
|\ \ \ | |/ /
| * | Add 3.3.1 to LICENSE files.Georg Brandl2013-04-061-0/+2
| | |
* | | merge with 3.3Georg Brandl2013-04-061-0/+2
|\ \ \ | |/ /
| * | merge with 3.2 branchGeorg Brandl2013-04-061-0/+2
| |\ \ | | |/
| | * Copyright update to 2013.Georg Brandl2013-03-231-1/+3
| | |
* | | merge 3.3Benjamin Peterson2013-01-011-1/+1
|\ \ \ | |/ /
| * | bring Python into 2013Benjamin Peterson2013-01-011-1/+1
| | |
* | | Issue #16113: integrade SHA-3 (Keccak) patch from ↵Christian Heimes2012-10-061-0/+19
| | | | | | | | | | | | http://hg.python.org/sandbox/cheimes
* | | Bump version to 3.4.0 alpha 0.Georg Brandl2012-09-291-0/+2
|/ /
* | #16014: merge with 3.2.Ezio Melotti2012-09-241-3/+3
|\ \ | |/
| * #16014: fix broken link.Ezio Melotti2012-09-241-3/+3
| |
| * Add 3.2.3 to license.Georg Brandl2012-02-231-0/+2
| |
* | Add 3.2.3 version to the license table.Georg Brandl2012-06-241-0/+2
| |
* | Update copyright years and version name.v3.3.0a1Georg Brandl2012-03-041-1/+1
| |
* | merge 3.2Benjamin Peterson2012-01-011-1/+1
|\ \ | |/
| * add another year to glorious PSF IPBenjamin Peterson2012-01-011-1/+1
| |
* | Merge with 3.2.Georg Brandl2011-09-041-1/+9
|\ \ | |/
| * #12761: fix wording of zlib license sectionSandro Tosi2011-08-161-1/+1
| |
| * Update versions in LICENSE files.v3.2.2rc1Georg Brandl2011-08-131-1/+9
| |
* | merge with 3.2Sandro Tosi2011-08-161-1/+1
|\ \
| * | #12761: fix wording of zlib license sectionSandro Tosi2011-08-161-1/+1
| |/
* | Merge from 3.2 (#10318, #12255, #12043, #12417 and other fixes)Éric Araujo2011-07-291-30/+0
|\ \ | |/
| * Merge profile docs followup (#12417) from 3.1Éric Araujo2011-07-281-30/+0
| |\
| | * Remove mentions of previous license in profile module docs (#12417 followup).Éric Araujo2011-07-281-30/+0
| | | | | | | | | | | | Also remove an extra docstring.
| | * Merged revisions 84941 via svnmerge fromMarc-André Lemburg2010-09-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+pythonssh://pythondev@svn.python.org/python/branches/py3k ........ r84941 | marc-andre.lemburg | 2010-09-21 13:55:27 +0200 (Tue, 21 Sep 2010) | 3 lines Add missing word. ........
| | * Merged revisions 84938 via svnmerge fromMarc-André Lemburg2010-09-211-1/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+pythonssh://pythondev@svn.python.org/python/branches/py3k ........ r84938 | marc-andre.lemburg | 2010-09-21 13:37:43 +0200 (Tue, 21 Sep 2010) | 5 lines Add OpenSSL license to the Python license documenation page. See #9119. ........
| | * Merged revisions 84743 via svnmerge fromMatthias Klose2010-09-121-0/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84743 | matthias.klose | 2010-09-12 18:31:58 +0200 (So, 12 Sep 2010) | 3 lines - Issue #9817: Add expat COPYING file; add expat, libffi and expat licenses to Doc/license.rst. ........
| | * Merged revisions 77206-77207 via svnmerge fromEzio Melotti2010-01-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r77206 | benjamin.peterson | 2010-01-01 06:47:54 +0200 (Fri, 01 Jan 2010) | 9 lines Merged revisions 77203 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77203 | benjamin.peterson | 2009-12-31 22:00:55 -0600 (Thu, 31 Dec 2009) | 1 line update copyright year ........ ................ r77207 | benjamin.peterson | 2010-01-01 06:49:25 +0200 (Fri, 01 Jan 2010) | 9 lines Merged revisions 77204 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77204 | ezio.melotti | 2009-12-31 22:16:42 -0600 (Thu, 31 Dec 2009) | 1 line more copyright year updates ........ ................
| | * Merged revisions 76906 via svnmerge fromEzio Melotti2009-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r76906 | ezio.melotti | 2009-12-20 01:26:38 +0200 (Sun, 20 Dec 2009) | 9 lines Merged revisions 76904 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76904 | ezio.melotti | 2009-12-20 00:41:49 +0200 (Sun, 20 Dec 2009) | 1 line #7388: "python".capitalize() in the Doc ........ ................
| | * Merged revisions 76787-76789 via svnmerge fromBenjamin Peterson2009-12-131-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r76787 | benjamin.peterson | 2009-12-13 08:21:46 -0600 (Sun, 13 Dec 2009) | 9 lines Merged revisions 76785 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76785 | benjamin.peterson | 2009-12-13 08:18:08 -0600 (Sun, 13 Dec 2009) | 1 line add 2.6.x point releases ........ ................ r76788 | benjamin.peterson | 2009-12-13 08:23:30 -0600 (Sun, 13 Dec 2009) | 1 line fix markup ................ r76789 | benjamin.peterson | 2009-12-13 08:26:42 -0600 (Sun, 13 Dec 2009) | 1 line update 3.x versions ................
* | | Merge doc fixes from 3.2Éric Araujo2011-06-091-2/+2
|\ \ \ | |/ /