aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-09-13 02:29:37 +0000
committerBenjamin Peterson <benjamin@python.org>2009-09-13 02:29:37 +0000
commitb2f9e3bd5bcea5e0f10db61b6ad873844fdacded (patch)
tree41d925c97fd2b5ad8285ea94f6c12b4b9bf08734 /Misc/python.man
parentMerged revisions 74748 via svnmerge from (diff)
downloadcpython-b2f9e3bd5bcea5e0f10db61b6ad873844fdacded.tar.gz
cpython-b2f9e3bd5bcea5e0f10db61b6ad873844fdacded.tar.bz2
cpython-b2f9e3bd5bcea5e0f10db61b6ad873844fdacded.zip
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 ................
Diffstat (limited to 'Misc/python.man')
-rw-r--r--Misc/python.man8
1 files changed, 3 insertions, 5 deletions
diff --git a/Misc/python.man b/Misc/python.man
index 2f0e7444854..ff4e0ff7a8a 100644
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -368,15 +368,13 @@ The Python Software Foundation: http://www.python.org/psf
.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