Fixed #9487 -- Corrected several links into the Python docs that were broken by the recent Python docs refactor.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9312 bcc190cf-cafb-0310-a4f2-bffc1f526a37

10 files changed, 11 insertions, 11 deletions

diff --git a/docs/howto/custom-template-tags.txt b/docs/howto/custom-template-tags.txt
index b680272f40..f5aa47d7d4 100644
--- a/docs/howto/custom-template-tags.txt
+++ b/docs/howto/custom-template-tags.txt
@@ -344,7 +344,7 @@ else. In our case, let's say the tag should be used like this:
 
     <p>The time is {% current_time "%Y-%m-%d %I:%M %p" %}.</p>
 
-.. _`strftime syntax`: http://www.python.org/doc/current/lib/module-time.html#l2h-1941
+.. _`strftime syntax`: http://docs.python.org/library/time.html#time.strftime
 
 The parser for this function should grab the parameter and create a ``Node``
 object::
diff --git a/docs/howto/outputting-csv.txt b/docs/howto/outputting-csv.txt
index 5192c51228..234454c265 100644
--- a/docs/howto/outputting-csv.txt
+++ b/docs/howto/outputting-csv.txt
@@ -8,7 +8,7 @@ This document explains how to output CSV (Comma Separated Values) dynamically
 using Django views. To do this, you can either use the `Python CSV library`_ or
 the Django template system.
 
-.. _Python CSV library: http://www.python.org/doc/current/lib/module-csv.html
+.. _Python CSV library: http://docs.python.org/library/csv.html
 
 Using the Python CSV library
 ============================
diff --git a/docs/howto/outputting-pdf.txt b/docs/howto/outputting-pdf.txt
index 13e07f8202..e739ca1da8 100644
--- a/docs/howto/outputting-pdf.txt
+++ b/docs/howto/outputting-pdf.txt
@@ -131,7 +131,7 @@ Here's the above "Hello World" example rewritten to use ``cStringIO``::
         response.write(pdf)
         return response
 
-.. _cStringIO: http://www.python.org/doc/current/lib/module-cStringIO.html
+.. _cStringIO: http://docs.python.org/library/stringio.html#module-cStringIO
 
 Further resources
 =================
diff --git a/docs/intro/tutorial03.txt b/docs/intro/tutorial03.txt
index 6d40a5bfcb..af6c4fcf97 100644
--- a/docs/intro/tutorial03.txt
+++ b/docs/intro/tutorial03.txt
@@ -128,7 +128,7 @@ Finally, a performance note: these regular expressions are compiled the first
 time the URLconf module is loaded. They're super fast.
 
 .. _Wikipedia's entry: http://en.wikipedia.org/wiki/Regular_expression
-.. _Python documentation: http://www.python.org/doc/current/lib/module-re.html
+.. _Python documentation: http://docs.python.org/library/re.html
 
 Write your first view
 =====================
diff --git a/docs/ref/contrib/syndication.txt b/docs/ref/contrib/syndication.txt
index 220c809aeb..a4690da4c5 100644
--- a/docs/ref/contrib/syndication.txt
+++ b/docs/ref/contrib/syndication.txt
@@ -928,7 +928,7 @@ For example, to create an Atom 1.0 feed and print it to standard output::
     </feed>
 
 .. _django/utils/feedgenerator.py: http://code.djangoproject.com/browser/django/trunk/django/utils/feedgenerator.py
-.. _Python datetime object: http://www.python.org/doc/current/lib/module-datetime.html
+.. _Python datetime object: http://docs.python.org/library/datetime.html#datetime-objects
 
 Custom feed generators
 ----------------------
diff --git a/docs/ref/generic-views.txt b/docs/ref/generic-views.txt
index f92674e15e..c14cc295d2 100644
--- a/docs/ref/generic-views.txt
+++ b/docs/ref/generic-views.txt
@@ -406,7 +406,7 @@ In addition to ``extra_context``, the template's context will be:
       is ``'object'`` by default. If ``template_object_name`` is ``'foo'``,
       this variable's name will be ``foo_list``.
 
-.. _strftime docs: http://www.python.org/doc/current/lib/module-time.html#l2h-1941
+.. _strftime docs: http://docs.python.org/library/time.html#time.strftime
 
 ``django.views.generic.date_based.archive_week``
 ------------------------------------------------
diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt
index 262b1276dc..18b8f665a5 100644
--- a/docs/ref/request-response.txt
+++ b/docs/ref/request-response.txt
@@ -499,7 +499,7 @@ Methods
           calendars.lawrence.com. Otherwise, a cookie will only be readable by
           the domain that set it.
 
-    .. _`cookie Morsel`: http://www.python.org/doc/current/lib/morsel-objects.html
+    .. _`cookie Morsel`: http://docs.python.org/library/cookie.html#Cookie.Morsel
 
 .. method:: HttpResponse.delete_cookie(key, path='/', domain=None)
 
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index cfff4309b4..4a922fbe7d 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -1255,7 +1255,7 @@ pprint
 
 A wrapper around `pprint.pprint`__ -- for debugging, really.
 
-__ http://www.python.org/doc/2.5/lib/module-pprint.html
+__ http://docs.python.org/library/pprint.html
 
 .. templatefilter:: random
 
diff --git a/docs/topics/email.txt b/docs/topics/email.txt
index 2521385c93..b44ab35a5b 100644
--- a/docs/topics/email.txt
+++ b/docs/topics/email.txt
@@ -13,7 +13,7 @@ extra quick.
 
 The code lives in a single module: ``django.core.mail``.
 
-.. _smtplib library: http://www.python.org/doc/current/lib/module-smtplib.html
+.. _smtplib library: http://docs.python.org/library/smtplib.html
 
 Quick example
 =============
@@ -63,7 +63,7 @@ are required.
       SMTP server. If this isn't provided, Django will use the value of the
       ``EMAIL_HOST_PASSWORD`` setting.
 
-.. _smtplib docs: http://www.python.org/doc/current/lib/module-smtplib.html
+.. _smtplib docs: http://docs.python.org/library/smtplib.html
 
 send_mass_mail()
 ================
diff --git a/docs/topics/http/sessions.txt b/docs/topics/http/sessions.txt
index 81d491700a..7c28768e30 100644
--- a/docs/topics/http/sessions.txt
+++ b/docs/topics/http/sessions.txt
@@ -466,7 +466,7 @@ Technical details
     * Django only sends a cookie if it needs to. If you don't set any session
       data, it won't send a session cookie.
 
-.. _`the pickle module`: http://www.python.org/doc/current/lib/module-pickle.html
+.. _`the pickle module`: http://docs.python.org/library/pickle.html
 
 Session IDs in URLs
 ===================