summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-André Lemburg <mal@egenix.com>2010-09-21 11:56:42 (GMT)
committerMarc-André Lemburg <mal@egenix.com>2010-09-21 11:56:42 (GMT)
commitbd5283f7ad090d32be737030191b7e6d11a4f354 (patch)
tree5ec250979177e1df1e23cf1d6be86b5d66e8efd7
parente94fa057f99cd3a74195dc741e1847694a89577d (diff)
downloadcpython-bd5283f7ad090d32be737030191b7e6d11a4f354.zip
cpython-bd5283f7ad090d32be737030191b7e6d11a4f354.tar.gz
cpython-bd5283f7ad090d32be737030191b7e6d11a4f354.tar.bz2
Merged revisions 84941 via svnmerge from
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. ........
-rw-r--r--Doc/license.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/license.rst b/Doc/license.rst
index 58f5d37..a4f0994 100644
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -707,8 +707,8 @@ 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, we include a copy of the
-OpenSSL license::
+include a copy of the OpenSSL libraries, so we include a copy of the
+OpenSSL license here::
LICENSE ISSUES