summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2011-08-16 18:03:50 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2011-08-16 18:03:50 (GMT)
commitb51a3c9d22e2ed9f56b9afd003e5a408d5e7dad0 (patch)
tree6eaa68aba02a0612a73d9cf7fa216719ccdc44fd
parent6e5222d5f87b5e34a1d039f86e5e71d89419cdc1 (diff)
parentf6b25b9e357a6324118cb80cf84cd7f84d6fd5f7 (diff)
downloadcpython-b51a3c9d22e2ed9f56b9afd003e5a408d5e7dad0.zip
cpython-b51a3c9d22e2ed9f56b9afd003e5a408d5e7dad0.tar.gz
cpython-b51a3c9d22e2ed9f56b9afd003e5a408d5e7dad0.tar.bz2
merge with 3.2
-rw-r--r--Doc/license.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/license.rst b/Doc/license.rst
index d0b370f..9119f18 100644
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -875,7 +875,7 @@ zlib
----
The :mod:`zlib` extension is built using an included copy of the zlib
-sources unless the zlib version found on the system is too old to be
+sources if the zlib version found on the system is too old to be
used for the build::
Copyright (C) 1995-2011 Jean-loup Gailly and Mark Adler