From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 13 Sep 2009 02:21:55 +0000 (+0000)
Subject: Merged revisions 74757 via svnmerge from
X-Git-Tag: v2.6.3rc1~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae33becf0b1707361654d58409169a9c3d271fdd;p=python

Merged revisions 74757 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74757 | benjamin.peterson | 2009-09-12 20:59:31 -0500 (Sat, 12 Sep 2009) | 1 line

  update urls
........
---

diff --git a/Misc/python.man b/Misc/python.man
index 1564f8d754..1db77eaac5 100644
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -387,13 +387,11 @@ Main website:  http://www.python.org/
 .br
 Documentation:  http://docs.python.org/
 .br
-Community website:  http://starship.python.net/
-.br
 Developer resources:  http://www.python.org/dev/
 .br
-FTP:  ftp://ftp.python.org/pub/python/
+Downloads:  http://python.org/download/
 .br
-Module repository:  http://www.vex.net/parnassus/
+Module repository:  http://pypi.python.org/
 .br
 Newsgroups:  comp.lang.python, comp.lang.python.announce
 .SH LICENSING