From 25a8dd790b57aea34673b7c81c2c134f83df7cf6 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 13 Sep 2009 02:22:00 +0000
Subject: [PATCH] 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
........
---
 Misc/python.man | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Misc/python.man b/Misc/python.man
index 2f0e7444854..855a9fe3a72 100644
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -370,13 +370,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