Typo in Doc/license.rst

[jwilk]

BPO	12761
Nosy	@tjguk, @jwilk, @ezio-melotti, @briancurtin, @sandrotosi
Files	patch.diff

^{Note: these values reflect the state of the issue at the time it was migrated and might not reflect the current state.}

Show more details

GitHub fields:

assignee = None
closed_at = <Date 2011-10-29.18:37:54.561>
created_at = <Date 2011-08-16.16:41:40.573>
labels = ['docs']
title = 'Typo in Doc/license.rst'
updated_at = <Date 2011-10-29.18:37:54.561>
user = 'https://github.com/jwilk'

bugs.python.org fields:

activity = <Date 2011-10-29.18:37:54.561>
actor = 'petri.lehtinen'
assignee = 'docs@python'
closed = True
closed_date = <Date 2011-10-29.18:37:54.561>
closer = 'petri.lehtinen'
components = ['Documentation']
creation = <Date 2011-08-16.16:41:40.573>
creator = 'jwilk'
dependencies = []
files = ['22912']
hgrepos = []
issue_num = 12761
keywords = ['patch']
message_count = 5.0
messages = ['142205', '142211', '142213', '142370', '143483']
nosy_count = 7.0
nosy_names = ['tim.golden', 'jwilk', 'ezio.melotti', 'brian.curtin', 'sandro.tosi', 'docs@python', 'python-dev']
pr_nums = []
priority = 'normal'
resolution = 'fixed'
stage = 'resolved'
status = 'closed'
superseder = None
type = None
url = 'https://bugs.python.org/issue12761'
versions = ['Python 2.7', 'Python 3.2', 'Python 3.3']

[jwilk]

"The 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 used for the build"

I believe it should be "if" rather than "unless".

[python-dev]

New changeset 80ac94ad381e by Sandro Tosi in branch '2.7':
bpo-12761: fix wording of zlib license section
http://hg.python.org/cpython/rev/80ac94ad381e

New changeset 16a02530fd81 by Sandro Tosi in branch '3.2':
bpo-12761: fix wording of zlib license section
http://hg.python.org/cpython/rev/16a02530fd81

[sandrotosi]

Thanks Jakub for the report and Gennadiy for the patch (that I applied on all the active braches).

[sandrotosi]

After a closer look (thanks Ezio), the proper patch should be something like:

diff --git a/Doc/license.rst b/Doc/license.rst
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -874,9 +874,8 @@
zlib
----

 
-The :mod:`zlib` extension is built using an included copy of the zlib
-sources if the zlib version found on the system is too old to be
-used for the build::
+The :mod:`zlib` extension is built using the zlib version found on the system,
+but an included copy of the zlib sources is shipped for the Windows build::
 
   Copyright (C) 1995-2011 Jean-loup Gailly and Mark Adler

because the embedded zlib is not used in the linux build (but always the system one, and if absent, no zlib module is built) while we have several references of Modules/zlib/ files in PC/VC* and PCbuild/*.vcproj (that I can't read); adding to nosy the windows expert to have their opinion.

[python-dev]

New changeset 5b21312c3800 by Sandro Tosi in branch '3.2':
bpo-12761: fix wording of zlib license section
http://hg.python.org/cpython/rev/5b21312c3800