merge 3.4

This commit is contained in:
Benjamin Peterson 2015-04-30 17:38:14 -04:00
commit 2e02875544
1 changed files with 6 additions and 6 deletions

View File

@ -431,17 +431,17 @@ values.
The integer must be a decimal number in the range [0,4294967295]. Specifying
the value 0 will disable hash randomization.
.SH AUTHOR
The Python Software Foundation: http://www.python.org/psf
The Python Software Foundation: https://www.python.org/psf
.SH INTERNET RESOURCES
Main website: http://www.python.org/
Main website: https://www.python.org/
.br
Documentation: http://docs.python.org/py3k/
Documentation: https://docs.python.org/
.br
Developer resources: http://docs.python.org/devguide/
Developer resources: https://docs.python.org/devguide/
.br
Downloads: http://python.org/download/
Downloads: https://www.python.org/downloads/
.br
Module repository: http://pypi.python.org/
Module repository: https://pypi.python.org/
.br
Newsgroups: comp.lang.python, comp.lang.python.announce
.SH LICENSING