[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

https://hg.python.org/cpython/rev/6f6e78931875
changeset:   95833:6f6e78931875
parent:      95830:661cdbd617b8
parent:      95831:96e2c0101672
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Apr 30 17:38:14 2015 -0400
summary:
  merge 3.4

files:
  Misc/python.man |  12 ++++++------
  1 files changed, 6 insertions(+), 6 deletions(-)


diff --git a/Misc/python.man b/Misc/python.man
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -431,17 +431,17 @@
 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

-- 
Repository URL: https://hg.python.org/cpython