summaryrefslogtreecommitdiffstats
path: root/Doc/tutorial
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-10-29 09:27:06 (GMT)
committerGeorg Brandl <georg@python.org>2014-10-29 09:27:06 (GMT)
commit794e9bf1fe5bd0000f90c1502b16c96eb68a59af (patch)
tree0fe2b5742d9d244ffac97dc7b4928ee29eefe370 /Doc/tutorial
parent9e67d801bdef7c43e6704200770fb9cf2040dc11 (diff)
parent525d355984e1afa342aa72fc7867a56eea937a61 (diff)
downloadcpython-794e9bf1fe5bd0000f90c1502b16c96eb68a59af.zip
cpython-794e9bf1fe5bd0000f90c1502b16c96eb68a59af.tar.gz
cpython-794e9bf1fe5bd0000f90c1502b16c96eb68a59af.tar.bz2
merge with 3.4
Diffstat (limited to 'Doc/tutorial')
-rw-r--r--Doc/tutorial/whatnow.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/tutorial/whatnow.rst b/Doc/tutorial/whatnow.rst
index a9ff6f4..6b03cb5 100644
--- a/Doc/tutorial/whatnow.rst
+++ b/Doc/tutorial/whatnow.rst
@@ -38,12 +38,12 @@ More Python resources:
* https://docs.python.org: Fast access to Python's documentation.
-* https://pypi.python.org: The Python Package Index, previously also nicknamed
+* https://pypi.python.org/pypi: The Python Package Index, previously also nicknamed
the Cheese Shop, is an index of user-created Python modules that are available
for download. Once you begin releasing code, you can register it here so that
others can find it.
-* http://aspn.activestate.com/ASPN/Python/Cookbook/: The Python Cookbook is a
+* http://code.activestate.com/recipes/langs/python/: The Python Cookbook is a
sizable collection of code examples, larger modules, and useful scripts.
Particularly notable contributions are collected in a book also titled Python
Cookbook (O'Reilly & Associates, ISBN 0-596-00797-3.)