summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-André Lemburg <mal@egenix.com>2010-09-21 11:56:39 (GMT)
committerMarc-André Lemburg <mal@egenix.com>2010-09-21 11:56:39 (GMT)
commit5a58772c2a36b6adcec6bf84f00b039fd821b44c (patch)
tree9bf8be4580c17829567ede060ef2124ce5eda2d4
parent8680735a45c80f332c829c771a959da67fd2f164 (diff)
downloadcpython-5a58772c2a36b6adcec6bf84f00b039fd821b44c.zip
cpython-5a58772c2a36b6adcec6bf84f00b039fd821b44c.tar.gz
cpython-5a58772c2a36b6adcec6bf84f00b039fd821b44c.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 d3764e3..4c654ae 100644
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -754,8 +754,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