Author: kmtracey
Date: 2008-11-01 14:05:46 -0500 (Sat, 01 Nov 2008)
New Revision: 9313
Modified:
django/branches/releases/1.0.X/
django/branches/releases/1.0.X/docs/howto/custom-template-tags.txt
django/branches/releases/1.0.X/docs/howto/outputting-csv.txt
django/branches/releases/1.0.X/docs/howto/outputting-pdf.txt
django/branches/releases/1.0.X/docs/intro/tutorial03.txt
django/branches/releases/1.0.X/docs/ref/contrib/syndication.txt
django/branches/releases/1.0.X/docs/ref/generic-views.txt
django/branches/releases/1.0.X/docs/ref/request-response.txt
django/branches/releases/1.0.X/docs/ref/templates/builtins.txt
django/branches/releases/1.0.X/docs/topics/email.txt
django/branches/releases/1.0.X/docs/topics/http/sessions.txt
Log:
[1.0.X] Fixed #9487 -- Corrected several links into the Python docs that were
broken by the recent Python docs refactor.
[9312] from trunk.
Property changes on: django/branches/releases/1.0.X
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9310
+
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9312
Modified: django/branches/releases/1.0.X/docs/howto/custom-template-tags.txt
===================================================================
--- django/branches/releases/1.0.X/docs/howto/custom-template-tags.txt
2008-11-01 19:02:09 UTC (rev 9312)
+++ django/branches/releases/1.0.X/docs/howto/custom-template-tags.txt
2008-11-01 19:05:46 UTC (rev 9313)
@@ -344,7 +344,7 @@
<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::
Modified: django/branches/releases/1.0.X/docs/howto/outputting-csv.txt
===================================================================
--- django/branches/releases/1.0.X/docs/howto/outputting-csv.txt
2008-11-01 19:02:09 UTC (rev 9312)
+++ django/branches/releases/1.0.X/docs/howto/outputting-csv.txt
2008-11-01 19:05:46 UTC (rev 9313)
@@ -8,7 +8,7 @@
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
============================
Modified: django/branches/releases/1.0.X/docs/howto/outputting-pdf.txt
===================================================================
--- django/branches/releases/1.0.X/docs/howto/outputting-pdf.txt
2008-11-01 19:02:09 UTC (rev 9312)
+++ django/branches/releases/1.0.X/docs/howto/outputting-pdf.txt
2008-11-01 19:05:46 UTC (rev 9313)
@@ -131,7 +131,7 @@
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
=================
Modified: django/branches/releases/1.0.X/docs/intro/tutorial03.txt
===================================================================
--- django/branches/releases/1.0.X/docs/intro/tutorial03.txt 2008-11-01
19:02:09 UTC (rev 9312)
+++ django/branches/releases/1.0.X/docs/intro/tutorial03.txt 2008-11-01
19:05:46 UTC (rev 9313)
@@ -128,7 +128,7 @@
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
=====================
Modified: django/branches/releases/1.0.X/docs/ref/contrib/syndication.txt
===================================================================
--- django/branches/releases/1.0.X/docs/ref/contrib/syndication.txt
2008-11-01 19:02:09 UTC (rev 9312)
+++ django/branches/releases/1.0.X/docs/ref/contrib/syndication.txt
2008-11-01 19:05:46 UTC (rev 9313)
@@ -928,7 +928,7 @@
</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
----------------------
Modified: django/branches/releases/1.0.X/docs/ref/generic-views.txt
===================================================================
--- django/branches/releases/1.0.X/docs/ref/generic-views.txt 2008-11-01
19:02:09 UTC (rev 9312)
+++ django/branches/releases/1.0.X/docs/ref/generic-views.txt 2008-11-01
19:05:46 UTC (rev 9313)
@@ -406,7 +406,7 @@
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``
------------------------------------------------
Modified: django/branches/releases/1.0.X/docs/ref/request-response.txt
===================================================================
--- django/branches/releases/1.0.X/docs/ref/request-response.txt
2008-11-01 19:02:09 UTC (rev 9312)
+++ django/branches/releases/1.0.X/docs/ref/request-response.txt
2008-11-01 19:05:46 UTC (rev 9313)
@@ -499,7 +499,7 @@
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)
Modified: django/branches/releases/1.0.X/docs/ref/templates/builtins.txt
===================================================================
--- django/branches/releases/1.0.X/docs/ref/templates/builtins.txt
2008-11-01 19:02:09 UTC (rev 9312)
+++ django/branches/releases/1.0.X/docs/ref/templates/builtins.txt
2008-11-01 19:05:46 UTC (rev 9313)
@@ -1255,7 +1255,7 @@
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
Modified: django/branches/releases/1.0.X/docs/topics/email.txt
===================================================================
--- django/branches/releases/1.0.X/docs/topics/email.txt 2008-11-01
19:02:09 UTC (rev 9312)
+++ django/branches/releases/1.0.X/docs/topics/email.txt 2008-11-01
19:05:46 UTC (rev 9313)
@@ -13,7 +13,7 @@
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 @@
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()
================
Modified: django/branches/releases/1.0.X/docs/topics/http/sessions.txt
===================================================================
--- django/branches/releases/1.0.X/docs/topics/http/sessions.txt
2008-11-01 19:02:09 UTC (rev 9312)
+++ django/branches/releases/1.0.X/docs/topics/http/sessions.txt
2008-11-01 19:05:46 UTC (rev 9313)
@@ -466,7 +466,7 @@
* 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
===================
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
