diff options
| author | Ned Deily <nad@acm.org> | 2014-12-13 08:32:51 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2014-12-13 08:32:51 (GMT) |
| commit | a4158a0408d816d692ea288c27344274f00895c7 (patch) | |
| tree | bb2691bd111810ab002fba9a58a58ad82b9bcf52 /Doc | |
| parent | c4c79a0e82ca701ad09d51eacfc4f2c57c769ceb (diff) | |
| parent | 5d3febf0cf845b2bdfc97f3a36c3dea04800992b (diff) | |
| download | cpython-a4158a0408d816d692ea288c27344274f00895c7.zip cpython-a4158a0408d816d692ea288c27344274f00895c7.tar.gz cpython-a4158a0408d816d692ea288c27344274f00895c7.tar.bz2 | |
Issue #17128: Merge / update from 3.4
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/license.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/license.rst b/Doc/license.rst index bbeacfc..32c172e 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -654,9 +654,9 @@ OpenSSL The modules :mod:`hashlib`, :mod:`posix`, :mod:`ssl`, :mod:`crypt` use the OpenSSL library for added performance if made available by the -operating system. Additionally, the Windows installers for Python -include a copy of the OpenSSL libraries, so we include a copy of the -OpenSSL license here:: +operating system. Additionally, the Windows and Mac OS X installers for +Python may include a copy of the OpenSSL libraries, so we include a copy +of the OpenSSL license here:: LICENSE ISSUES |