[Python-checkins] r74761 - in python/branches/release31-maint: Misc/python.man

[benjamin.peterson]

Author: benjamin.peterson
Date: Sun Sep 13 04:29:37 2009
New Revision: 74761

Log:
Merged revisions 74759-74760 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r74759 | benjamin.peterson | 2009-09-12 21:22:00 -0500 (Sat, 12 Sep 2009) | 9 lines
  
  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
  ........
................
  r74760 | benjamin.peterson | 2009-09-12 21:23:12 -0500 (Sat, 12 Sep 2009) | 1 line
  
  py3k documentation has its own url
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Misc/python.man

Modified: python/branches/release31-maint/Misc/python.man
==============================================================================
--- python/branches/release31-maint/Misc/python.man	(original)
+++ python/branches/release31-maint/Misc/python.man	Sun Sep 13 04:29:37 2009
@@ -368,15 +368,13 @@
 .SH INTERNET RESOURCES
 Main website:  http://www.python.org/
 .br
-Documentation:  http://docs.python.org/
-.br
-Community website:  http://starship.python.net/
+Documentation:  http://docs.python.org/py3k/
 .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