merge with 3.4

This commit is contained in:
Georg Brandl 2014-10-28 23:00:36 +01:00
commit 796fe2c934
1 changed files with 2 additions and 2 deletions

View File

@ -51,9 +51,9 @@ for detailed information about platforms with pre-compiled installers.
by Mark Pilgrim, 2004, by Mark Pilgrim, 2004,
ISBN 1-59059-356-1 ISBN 1-59059-356-1
`For Windows users <http://swaroopch.com/text/Byte_of_Python:Installing_Python#For_Windows_users>`_ `For Windows users <http://www.swaroopch.com/notes/python/#install_windows>`_
in "Installing Python" in "Installing Python"
in "`A Byte of Python <http://www.byteofpython.info>`_" in "`A Byte of Python <http://www.swaroopch.com/notes/python/>`_"
by Swaroop C H, 2003 by Swaroop C H, 2003