Code

Ticket #16586: 16586.diff

File 16586.diff, 36.5 KB (added by aaugustin, 3 years ago)
Line 
1Index: docs/intro/tutorial03.txt
2===================================================================
3--- docs/intro/tutorial03.txt   (révision 16590)
4+++ docs/intro/tutorial03.txt   (copie de travail)
5@@ -122,14 +122,13 @@
6 ``http://www.example.com/myapp/?page=3``, the URLconf will look for ``myapp/``.
7 
8 If you need help with regular expressions, see `Wikipedia's entry`_ and the
9-`Python documentation`_. Also, the O'Reilly book "Mastering Regular Expressions"
10-by Jeffrey Friedl is fantastic.
11+:mod:`Python documentation<re>`. Also, the O'Reilly book "Mastering Regular
12+Expressions" by Jeffrey Friedl is fantastic.
13 
14 Finally, a performance note: these regular expressions are compiled the first
15 time the URLconf module is loaded. They're super fast.
16 
17 .. _Wikipedia's entry: http://en.wikipedia.org/wiki/Regular_expression
18-.. _Python documentation: http://docs.python.org/library/re.html
19 
20 Write your first view
21 =====================
22Index: docs/internals/contributing/writing-code/branch-policy.txt
23===================================================================
24--- docs/internals/contributing/writing-code/branch-policy.txt  (révision 16590)
25+++ docs/internals/contributing/writing-code/branch-policy.txt  (copie de travail)
26@@ -146,8 +146,8 @@
27 location of the branch's ``django`` package. If you want to switch back, just
28 change the symlink to point to the old code.
29 
30-A third option is to use a `path file`_ (``<something>.pth``). First, make sure
31-there are no files, directories or symlinks named ``django`` in your
32+A third option is to use a :mod:`path file<site>` (``<something>.pth``). First,
33+make sure there are no files, directories or symlinks named ``django`` in your
34 ``site-packages`` directory. Then create a text file named ``django.pth`` and
35 save it to your ``site-packages`` directory. That file should contain a path to
36 your copy of Django on a single line and optional comments. Here is an example
37@@ -168,5 +168,4 @@
38     # On windows a path may look like this:
39     # C:/path/to/<branch>
40 
41-.. _path file: http://docs.python.org/library/site.html
42 .. _django-developers: http://groups.google.com/group/django-developers
43Index: docs/howto/outputting-csv.txt
44===================================================================
45--- docs/howto/outputting-csv.txt       (révision 16590)
46+++ docs/howto/outputting-csv.txt       (copie de travail)
47@@ -3,17 +3,15 @@
48 ==========================
49 
50 This document explains how to output CSV (Comma Separated Values) dynamically
51-using Django views. To do this, you can either use the `Python CSV library`_ or
52-the Django template system.
53+using Django views. To do this, you can either use the Python CSV library or the
54+Django template system.
55 
56-.. _Python CSV library: http://docs.python.org/library/csv.html
57-
58 Using the Python CSV library
59 ============================
60 
61-Python comes with a CSV library, ``csv``. The key to using it with Django is
62-that the ``csv`` module's CSV-creation capability acts on file-like objects, and
63-Django's :class:`~django.http.HttpResponse` objects are file-like objects.
64+Python comes with a CSV library, :mod:`csv`. The key to using it with Django is
65+that the :mod:`csv` module's CSV-creation capability acts on file-like objects,
66+and Django's :class:`~django.http.HttpResponse` objects are file-like objects.
67 
68 Here's an example::
69 
70@@ -72,12 +70,11 @@
71     * Use the `python-unicodecsv module`_, which aims to be a drop-in
72       replacement for ``csv`` that gracefully handles Unicode.
73 
74-For more information, see the Python `CSV File Reading and Writing`_
75+For more information, see the Python :mod:`CSV File Reading and Writing<csv>`
76 documentation.
77 
78 .. _`csv module's examples section`: http://docs.python.org/library/csv.html#examples
79 .. _`python-unicodecsv module`: https://github.com/jdunck/python-unicodecsv
80-.. _`CSV File Reading and Writing`: http://docs.python.org/library/csv.html
81 
82 Using the template system
83 =========================
84Index: docs/howto/custom-template-tags.txt
85===================================================================
86--- docs/howto/custom-template-tags.txt (révision 16590)
87+++ docs/howto/custom-template-tags.txt (copie de travail)
88@@ -335,15 +335,14 @@
89 
90 For example, let's write a template tag, ``{% current_time %}``, that displays
91 the current date/time, formatted according to a parameter given in the tag, in
92-`strftime syntax`_. It's a good idea to decide the tag syntax before anything
93-else. In our case, let's say the tag should be used like this:
94+:func:`strftime syntax<time.strftime>`. It's a good idea to decide the tag
95+syntax before anything else. In our case, let's say the tag should be used like
96+this:
97 
98 .. code-block:: html+django
99 
100     <p>The time is {% current_time "%Y-%m-%d %I:%M %p" %}.</p>
101 
102-.. _`strftime syntax`: http://docs.python.org/library/time.html#time.strftime
103-
104 The parser for this function should grab the parameter and create a ``Node``
105 object::
106 
107Index: docs/howto/outputting-pdf.txt
108===================================================================
109--- docs/howto/outputting-pdf.txt       (révision 16590)
110+++ docs/howto/outputting-pdf.txt       (copie de travail)
111@@ -97,9 +97,10 @@
112 ============
113 
114 If you're creating a complex PDF document with ReportLab, consider using the
115-cStringIO_ library as a temporary holding place for your PDF file. The cStringIO
116-library provides a file-like object interface that is particularly efficient.
117-Here's the above "Hello World" example rewritten to use ``cStringIO``::
118+:mod:`cStringIO` library as a temporary holding place for your PDF file. The
119+``cStringIO`` library provides a file-like object interface that is particularly
120+efficient. Here's the above "Hello World" example rewritten to use
121+``cStringIO``::
122 
123     # Fall back to StringIO in environments where cStringIO is not available
124     try:
125@@ -133,8 +134,6 @@
126         response.write(pdf)
127         return response
128 
129-.. _cStringIO: http://docs.python.org/library/stringio.html#module-cStringIO
130-
131 Further resources
132 =================
133 
134Index: docs/topics/http/file-uploads.txt
135===================================================================
136--- docs/topics/http/file-uploads.txt   (révision 16590)
137+++ docs/topics/http/file-uploads.txt   (copie de travail)
138@@ -149,8 +149,8 @@
139 
140     :setting:`FILE_UPLOAD_PERMISSIONS`
141         The numeric mode (i.e. ``0644``) to set newly uploaded files to. For
142-        more information about what these modes mean, see the `documentation for
143-        os.chmod`_
144+        more information about what these modes mean, see the documentation for
145+        :func:`os.chmod`.
146 
147         If this isn't given or is ``None``, you'll get operating-system
148         dependent behavior. On most platforms, temporary files will have a mode
149@@ -179,8 +179,6 @@
150         Which means "try to upload to memory first, then fall back to temporary
151         files."
152 
153-.. _documentation for os.chmod: http://docs.python.org/library/os.html#os.chmod
154-
155 ``UploadedFile`` objects
156 ========================
157 
158Index: docs/topics/http/sessions.txt
159===================================================================
160--- docs/topics/http/sessions.txt       (révision 16590)
161+++ docs/topics/http/sessions.txt       (copie de travail)
162@@ -549,15 +549,13 @@
163 =================
164 
165     * The session dictionary should accept any pickleable Python object. See
166-      `the pickle module`_ for more information.
167+      :mod:`the pickle module <pickle>` for more information.
168 
169     * Session data is stored in a database table named ``django_session`` .
170 
171     * Django only sends a cookie if it needs to. If you don't set any session
172       data, it won't send a session cookie.
173 
174-.. _`the pickle module`: http://docs.python.org/library/pickle.html
175-
176 Session IDs in URLs
177 ===================
178 
179Index: docs/topics/testing.txt
180===================================================================
181--- docs/topics/testing.txt     (révision 16590)
182+++ docs/topics/testing.txt     (copie de travail)
183@@ -68,7 +68,7 @@
184 Writing unit tests
185 ------------------
186 
187-Django's unit tests use a Python standard library module: unittest_. This
188+Django's unit tests use a Python standard library module: :mod:`unittest`. This
189 module defines tests in class-based approach.
190 
191 .. admonition:: unittest2
192@@ -136,20 +136,18 @@
193 Python documentation for more details on how to construct a complex test
194 suite.
195 
196-For more details about ``unittest``, see the `standard library unittest
197-documentation`_.
198+For more details about ``unittest``, see the :mod:`standard library unittest
199+documentation <unittest>`.
200 
201-.. _unittest: http://docs.python.org/library/unittest.html
202-.. _standard library unittest documentation: unittest_
203 .. _suggested organization: http://docs.python.org/library/unittest.html#organizing-tests
204 
205 Writing doctests
206 ----------------
207 
208-Doctests use Python's standard doctest_ module, which searches your docstrings
209-for statements that resemble a session of the Python interactive interpreter.
210-A full explanation of how doctest works is out of the scope of this document;
211-read Python's official documentation for the details.
212+Doctests use :mod:`Python's standard doctest module <doctest>`, which searches
213+your docstrings for statements that resemble a session of the Python interactive
214+interpreter. A full explanation of how doctest works is out of the scope of this
215+document; read Python's official documentation for the details.
216 
217 .. admonition:: What's a **docstring**?
218 
219@@ -221,13 +219,9 @@
220 on this.) Note that to use this feature, the database user Django is connecting
221 as must have ``CREATE DATABASE`` rights.
222 
223-For more details about how doctest works, see the `standard library
224-documentation for doctest`_.
225+For more details about how doctest works, see the :mod:`standard library
226+documentation for doctest<doctest>`.
227 
228-.. _doctest: http://docs.python.org/library/doctest.html
229-.. _standard library documentation for doctest: doctest_
230-
231-
232 Which should I use?
233 -------------------
234 
235@@ -639,7 +633,8 @@
236 
237       The test client is not capable of retrieving Web pages that are not
238       powered by your Django project. If you need to retrieve other Web pages,
239-      use a Python standard library module such as urllib_ or urllib2_.
240+      use a Python standard library module such as :mod:`urllib` or
241+      :mod:`urllib2`.
242 
243     * To resolve URLs, the test client uses whatever URLconf is pointed-to by
244       your :setting:`ROOT_URLCONF` setting.
245@@ -668,10 +663,6 @@
246           >>> from django.test import Client
247           >>> csrf_client = Client(enforce_csrf_checks=True)
248 
249-
250-.. _urllib: http://docs.python.org/library/urllib.html
251-.. _urllib2: http://docs.python.org/library/urllib2.html
252-
253 Making requests
254 ~~~~~~~~~~~~~~~
255 
256@@ -1003,7 +994,7 @@
257 .. attribute:: Client.cookies
258 
259     A Python ``SimpleCookie`` object, containing the current values of all the
260-    client cookies. See the `Cookie module documentation`_ for more.
261+    client cookies. See the :mod:`Cookie module documentation<cookie>` for more.
262 
263 .. attribute:: Client.session
264 
265@@ -1019,8 +1010,6 @@
266             session['somekey'] = 'test'
267             session.save()
268 
269-.. _Cookie module documentation: http://docs.python.org/library/cookie.html
270-
271 Example
272 ~~~~~~~
273 
274Index: docs/topics/logging.txt
275===================================================================
276--- docs/topics/logging.txt     (révision 16590)
277+++ docs/topics/logging.txt     (copie de travail)
278@@ -11,12 +11,10 @@
279 ======================
280 
281 Django uses Python's builtin logging module to perform system logging.
282-The usage of the logging module is discussed in detail in `Python's
283-own documentation`_. However, if you've never used Python's logging
284+The usage of the logging module is discussed in detail in :mod:`Python's
285+own documentation <logging>`. However, if you've never used Python's logging
286 framework (or even if you have), here's a quick primer.
287 
288-.. _Python's own documentation: http://docs.python.org/library/logging.html
289-
290 The cast of players
291 -------------------
292 
293Index: docs/topics/email.txt
294===================================================================
295--- docs/topics/email.txt       (révision 16590)
296+++ docs/topics/email.txt       (copie de travail)
297@@ -5,16 +5,14 @@
298 .. module:: django.core.mail
299    :synopsis: Helpers to easily send email.
300 
301-Although Python makes sending email relatively easy via the `smtplib
302-library`_, Django provides a couple of light wrappers over it. These wrappers
303-are provided to make sending email extra quick, to make it easy to test
304-email sending during development, and to provide support for platforms that
305-can't use SMTP.
306+Although Python makes sending email relatively easy via the :mod:`smtplib module
307+<smtplib>`, Django provides a couple of light wrappers over it. These wrappers
308+are provided to make sending email extra quick, to make it easy to test email
309+sending during development, and to provide support for platforms that can't use
310+SMTP.
311 
312 The code lives in the ``django.core.mail`` module.
313 
314-.. _smtplib library: http://docs.python.org/library/smtplib.html
315-
316 Quick example
317 =============
318 
319@@ -54,8 +52,9 @@
320       member of ``recipient_list`` will see the other recipients in the "To:"
321       field of the email message.
322     * ``fail_silently``: A boolean. If it's ``False``, ``send_mail`` will raise
323-      an ``smtplib.SMTPException``. See the `smtplib docs`_ for a list of
324-      possible exceptions, all of which are subclasses of ``SMTPException``.
325+      an ``smtplib.SMTPException``. See the :mod:`smtplib docs <smtplib>` for a
326+      list of possible exceptions, all of which are subclasses of
327+      ``SMTPException``.
328     * ``auth_user``: The optional username to use to authenticate to the SMTP
329       server. If this isn't provided, Django will use the value of the
330       :setting:`EMAIL_HOST_USER` setting.
331@@ -67,8 +66,6 @@
332       See the documentation on :ref:`Email backends <topic-email-backends>`
333       for more details.
334 
335-.. _smtplib docs: http://docs.python.org/library/smtplib.html
336-
337 send_mass_mail()
338 ================
339 
340@@ -608,10 +605,8 @@
341 :setting:`EMAIL_PORT` accordingly, and you are set.
342 
343 For a more detailed discussion of testing and processing of emails locally,
344-see the Python documentation on the `SMTP Server`_.
345+see the Python documentation on the :mod:`SMTP Server <smtpd>`.
346 
347-.. _SMTP Server: http://docs.python.org/library/smtpd.html
348-
349 SMTPConnection
350 ==============
351 
352Index: docs/releases/1.3.txt
353===================================================================
354--- docs/releases/1.3.txt       (révision 16590)
355+++ docs/releases/1.3.txt       (copie de travail)
356@@ -664,11 +664,9 @@
357 
358 Code taking advantage of any of the features below will raise a
359 ``PendingDeprecationWarning`` in Django 1.3. This warning will be
360-silent by default, but may be turned on using Python's `warnings
361-module`_, or by running Python with a ``-Wd`` or `-Wall` flag.
362+silent by default, but may be turned on using Python's :mod:`warnings
363+module <warnings>`, or by running Python with a ``-Wd`` or `-Wall` flag.
364 
365-.. _warnings module: http://docs.python.org/library/warnings.html
366-
367 In Django 1.4, these warnings will become a ``DeprecationWarning``,
368 which is *not* silent. In Django 1.5 support for these features will
369 be removed entirely.
370Index: docs/releases/1.3-alpha-1.txt
371===================================================================
372--- docs/releases/1.3-alpha-1.txt       (révision 16590)
373+++ docs/releases/1.3-alpha-1.txt       (copie de travail)
374@@ -279,11 +279,9 @@
375 
376 Code taking advantage of any of the features below will raise a
377 ``PendingDeprecationWarning`` in Django 1.3. This warning will be
378-silent by default, but may be turned on using Python's `warnings
379-module`_, or by running Python with a ``-Wd`` or `-Wall` flag.
380+silent by default, but may be turned on using Python's :mod:`warnings
381+module <warnings>`, or by running Python with a ``-Wd`` or `-Wall` flag.
382 
383-.. _warnings module: http://docs.python.org/library/warnings.html
384-
385 In Django 1.4, these warnings will become a ``DeprecationWarning``,
386 which is *not* silent. In Django 1.5 support for these features will
387 be removed entirely.
388Index: docs/releases/0.96.txt
389===================================================================
390--- docs/releases/0.96.txt      (révision 16590)
391+++ docs/releases/0.96.txt      (copie de travail)
392@@ -216,8 +216,8 @@
393 ------------------
394 
395 Django now includes a test framework so you can start transmuting fear into
396-boredom (with apologies to Kent Beck). You can write tests based on doctest_
397-or unittest_ and test your views with a simple test client.
398+boredom (with apologies to Kent Beck). You can write tests based on
399+:mod:`doctest` or :mod:`unittest` and test your views with a simple test client.
400 
401 There is also new support for "fixtures" -- initial data, stored in any of the
402 supported `serialization formats`_, that will be loaded into your database at the
403@@ -225,8 +225,6 @@
404 
405 See `the testing documentation`_ for the full details.
406 
407-.. _doctest: http://docs.python.org/library/doctest.html
408-.. _unittest: http://docs.python.org/library/unittest.html
409 .. _the testing documentation: http://www.djangoproject.com/documentation/0.96/testing/
410 .. _serialization formats: http://www.djangoproject.com/documentation/0.96/serialization/
411 
412Index: docs/releases/1.2.txt
413===================================================================
414--- docs/releases/1.2.txt       (révision 16590)
415+++ docs/releases/1.2.txt       (copie de travail)
416@@ -764,11 +764,9 @@
417 
418 Code taking advantage of any of the features below will raise a
419 ``PendingDeprecationWarning`` in Django 1.2. This warning will be
420-silent by default, but may be turned on using Python's `warnings
421-module`_, or by running Python with a ``-Wd`` or `-Wall` flag.
422+silent by default, but may be turned on using Python's :mod:`warnings
423+module <warnings>`, or by running Python with a ``-Wd`` or `-Wall` flag.
424 
425-.. _warnings module: http://docs.python.org/library/warnings.html
426-
427 In Django 1.3, these warnings will become a ``DeprecationWarning``,
428 which is *not* silent. In Django 1.4 support for these features will
429 be removed entirely.
430Index: docs/ref/models/querysets.txt
431===================================================================
432--- docs/ref/models/querysets.txt       (révision 16590)
433+++ docs/ref/models/querysets.txt       (copie de travail)
434@@ -81,7 +81,7 @@
435 Pickling QuerySets
436 ------------------
437 
438-If you pickle_ a ``QuerySet``, this will force all the results to be loaded
439+If you :mod:`pickle` a ``QuerySet``, this will force all the results to be loaded
440 into memory prior to pickling. Pickling is usually used as a precursor to
441 caching and when the cached queryset is reloaded, you want the results to
442 already be present and ready for use (reading from the database can take some
443@@ -112,8 +112,6 @@
444        Django version N+1. Pickles should not be used as part of a long-term
445        archival strategy.
446 
447-.. _pickle: http://docs.python.org/library/pickle.html
448-
449 .. _queryset-api:
450 
451 QuerySet API
452Index: docs/ref/models/fields.txt
453===================================================================
454--- docs/ref/models/fields.txt  (révision 16590)
455+++ docs/ref/models/fields.txt  (copie de travail)
456@@ -500,9 +500,9 @@
457     setting to determine the value of the :attr:`~django.core.files.File.url`
458     attribute.
459 
460-    This path may contain `strftime formatting`_, which will be replaced by the
461-    date/time of the file upload (so that uploaded files don't fill up the given
462-    directory).
463+    This path may contain :func:`strftime formatting <time.strftime>`, which
464+    will be replaced by the date/time of the file upload (so that uploaded files
465+    don't fill up the given directory).
466 
467     This may also be a callable, such as a function, which will be called to
468     obtain the upload path, including the filename. This callable must be able
469@@ -560,10 +560,10 @@
470 
471 For example, say your :setting:`MEDIA_ROOT` is set to ``'/home/media'``, and
472 :attr:`~FileField.upload_to` is set to ``'photos/%Y/%m/%d'``. The ``'%Y/%m/%d'``
473-part of :attr:`~FileField.upload_to` is `strftime formatting`_; ``'%Y'`` is the
474-four-digit year, ``'%m'`` is the two-digit month and ``'%d'`` is the two-digit
475-day. If you upload a file on Jan. 15, 2007, it will be saved in the directory
476-``/home/media/photos/2007/01/15``.
477+part of :attr:`~FileField.upload_to` is :func:`strftime formatting
478+<time.strftime>`; ``'%Y'`` is the four-digit year, ``'%m'`` is the two-digit
479+month and ``'%d'`` is the two-digit day. If you upload a file on Jan. 15, 2007,
480+it will be saved in the directory ``/home/media/photos/2007/01/15``.
481 
482 If you wanted to retrieve the uploaded file's on-disk filename, or the file's
483 size, you could use the :attr:`~django.core.files.File.name` and
484@@ -595,8 +595,6 @@
485 created as ``varchar(100)`` columns in your database. As with other fields, you
486 can change the maximum length using the :attr:`~CharField.max_length` argument.
487 
488-.. _`strftime formatting`: http://docs.python.org/library/time.html#time.strftime
489-
490 FileField and FieldFile
491 ~~~~~~~~~~~~~~~~~~~~~~~
492 
493@@ -712,11 +710,8 @@
494     represent those numbers differently. ``FloatField`` uses Python's ``float``
495     type internally, while ``DecimalField`` uses Python's ``Decimal`` type. For
496     information on the difference between the two, see Python's documentation on
497-    `Decimal fixed point and floating point arithmetic`_.
498+    :mod:`Decimal fixed point and floating point arithmetic <decimal>`.
499 
500-.. _Decimal fixed point and floating point arithmetic: http://docs.python.org/library/decimal.html
501-
502-
503 ``ImageField``
504 --------------
505 
506Index: docs/ref/generic-views.txt
507===================================================================
508--- docs/ref/generic-views.txt  (révision 16590)
509+++ docs/ref/generic-views.txt  (copie de travail)
510@@ -346,11 +346,11 @@
511 
512 **Optional arguments:**
513 
514-    * ``month_format``: A format string that regulates what format the
515-      ``month`` parameter uses. This should be in the syntax accepted by
516-      Python's ``time.strftime``. (See the `strftime docs`_.) It's set to
517-      ``"%b"`` by default, which is a three-letter month abbreviation. To
518-      change it to use numbers, use ``"%m"``.
519+    * ``month_format``: A format string that regulates what format the ``month``
520+      parameter uses. This should be in the syntax accepted by Python's
521+      :func:`time.strftime``. It's set to ``"%b"`` by default, which is a
522+      three-letter month abbreviation. To change it to use numbers, use
523+      ``"%m"``.
524 
525     * ``template_name``: The full name of a template to use in rendering the
526       page. This lets you override the default template name (see below).
527@@ -415,8 +415,6 @@
528       is ``'object'`` by default. If ``template_object_name`` is ``'foo'``,
529       this variable's name will be ``foo_list``.
530 
531-.. _strftime docs: http://docs.python.org/library/time.html#time.strftime
532-
533 ``django.views.generic.date_based.archive_week``
534 ------------------------------------------------
535 
536@@ -516,11 +514,11 @@
537 
538 **Optional arguments:**
539 
540-    * ``month_format``: A format string that regulates what format the
541-      ``month`` parameter uses. This should be in the syntax accepted by
542-      Python's ``time.strftime``. (See the `strftime docs`_.) It's set to
543-      ``"%b"`` by default, which is a three-letter month abbreviation. To
544-      change it to use numbers, use ``"%m"``.
545+    * ``month_format``: A format string that regulates what format the ``month``
546+      parameter uses. This should be in the syntax accepted by Python's
547+      :func:`time.strftime`. It's set to ``"%b"`` by default, which is a
548+      three-letter month abbreviation. To change it to use numbers, use
549+      ``"%m"``.
550 
551     * ``day_format``: Like ``month_format``, but for the ``day`` parameter.
552       It defaults to ``"%d"`` (day of the month as a decimal number, 01-31).
553@@ -624,11 +622,11 @@
554 
555 **Optional arguments:**
556 
557-    * ``month_format``: A format string that regulates what format the
558-      ``month`` parameter uses. This should be in the syntax accepted by
559-      Python's ``time.strftime``. (See the `strftime docs`_.) It's set to
560-      ``"%b"`` by default, which is a three-letter month abbreviation. To
561-      change it to use numbers, use ``"%m"``.
562+    * ``month_format``: A format string that regulates what format the ``month``
563+      parameter uses. This should be in the syntax accepted by Python's
564+      :func:`time.strftime`. It's set to ``"%b"`` by default, which is a
565+      three-letter month abbreviation. To change it to use numbers, use
566+      ``"%m"``.
567 
568     * ``day_format``: Like ``month_format``, but for the ``day`` parameter.
569       It defaults to ``"%d"`` (day of the month as a decimal number, 01-31).
570Index: docs/ref/class-based-views.txt
571===================================================================
572--- docs/ref/class-based-views.txt      (révision 16590)
573+++ docs/ref/class-based-views.txt      (copie de travail)
574@@ -586,11 +586,9 @@
575 
576     .. attribute:: year_format
577 
578-        The strftime_ format to use when parsing the year. By default, this is
579-        ``'%Y'``.
580+        The :func:`strftime<time.strftime>` format to use when parsing the year.
581+        By default, this is ``'%Y'``.
582 
583-    .. _strftime: http://docs.python.org/library/time.html#time.strftime
584-
585     .. attribute:: year
586 
587         **Optional** The value for the year (as a string). By default, set to
588@@ -598,7 +596,7 @@
589 
590     .. method:: get_year_format()
591 
592-        Returns the strftime_ format to use when parsing the year. Returns
593+        Returns the :func:`strftime<time.strftime>` format to use when parsing the year. Returns
594         :attr:`YearMixin.year_format` by default.
595 
596     .. method:: get_year()
597@@ -621,7 +619,7 @@
598 
599     .. attribute:: month_format
600 
601-        The strftime_ format to use when parsing the month. By default, this is
602+        The :func:`strftime<time.strftime>` format to use when parsing the month. By default, this is
603         ``'%b'``.
604 
605     .. attribute:: month
606@@ -631,7 +629,7 @@
607 
608     .. method:: get_month_format()
609 
610-        Returns the strftime_ format to use when parsing the month. Returns
611+        Returns the :func:`strftime<time.strftime>` format to use when parsing the month. Returns
612         :attr:`MonthMixin.month_format` by default.
613 
614     .. method:: get_month()
615@@ -667,7 +665,7 @@
616 
617     .. attribute:: day_format
618 
619-        The strftime_ format to use when parsing the day. By default, this is
620+        The :func:`strftime<time.strftime>` format to use when parsing the day. By default, this is
621         ``'%d'``.
622 
623     .. attribute:: day
624@@ -677,7 +675,7 @@
625 
626     .. method:: get_day_format()
627 
628-        Returns the strftime_ format to use when parsing the day. Returns
629+        Returns the :func:`strftime<time.strftime>` format to use when parsing the day. Returns
630         :attr:`DayMixin.day_format` by default.
631 
632     .. method:: get_day()
633@@ -712,7 +710,7 @@
634 
635     .. attribute:: week_format
636 
637-        The strftime_ format to use when parsing the week. By default, this is
638+        The :func:`strftime<time.strftime>` format to use when parsing the week. By default, this is
639         ``'%U'``.
640 
641     .. attribute:: week
642@@ -722,7 +720,7 @@
643 
644     .. method:: get_week_format()
645 
646-        Returns the strftime_ format to use when parsing the week. Returns
647+        Returns the :func:`strftime<time.strftime>` format to use when parsing the week. Returns
648         :attr:`WeekMixin.week_format` by default.
649 
650     .. method:: get_week()
651Index: docs/ref/templates/builtins.txt
652===================================================================
653--- docs/ref/templates/builtins.txt     (révision 16590)
654+++ docs/ref/templates/builtins.txt     (copie de travail)
655@@ -1254,7 +1254,8 @@
656     c                 ISO 8601 format. (Note: unlike others     ``2008-01-02T10:30:00.000123+02:00``,
657                       formatters, such as "Z", "O" or "r",      or ``2008-01-02T10:30:00.000123`` if the datetime is naive
658                       the "c" formatter will not add timezone
659-                      offset if value is a `naive datetime`_.)
660+                      offset if value is a :class:`naive
661+                      datetime <datetime.tzinfo>`.)
662     d                 Day of the month, 2 digits with           ``'01'`` to ``'31'``
663                       leading zeros.
664     D                 Day of the week, textual, 3 letters.      ``'Fri'``
665@@ -1346,8 +1347,6 @@
666 .. versionchanged:: 1.2
667     Predefined formats can now be influenced by the current locale.
668 
669-.. _naive datetime: http://docs.python.org/library/datetime.html#datetime.tzinfo
670-
671 .. templatefilter:: default
672 
673 default
674@@ -1815,10 +1814,8 @@
675 pprint
676 ^^^^^^
677 
678-A wrapper around `pprint.pprint`__ -- for debugging, really.
679+A wrapper around :func:`pprint.pprint` -- for debugging, really.
680 
681-__ http://docs.python.org/library/pprint.html
682-
683 .. templatefilter:: random
684 
685 random
686Index: docs/ref/exceptions.txt
687===================================================================
688--- docs/ref/exceptions.txt     (révision 16590)
689+++ docs/ref/exceptions.txt     (copie de travail)
690@@ -147,8 +147,6 @@
691 Python Exceptions
692 =================
693 
694-Django raises built-in Python exceptions when appropriate as well. See
695-the Python `documentation`_ for further information on the built-in
696-exceptions.
697-
698-.. _`documentation`: http://docs.python.org/lib/module-exceptions.html
699+Django raises built-in Python exceptions when appropriate as well. See the
700+:mod:`Python documentation <exceptions>` for further information on the
701+built-in exceptions.
702Index: docs/ref/contrib/gis/install.txt
703===================================================================
704--- docs/ref/contrib/gis/install.txt    (révision 16590)
705+++ docs/ref/contrib/gis/install.txt    (copie de travail)
706@@ -1235,13 +1235,17 @@
707     postgres# CREATE DATABASE geodjango OWNER geodjango TEMPLATE template_postgis ENCODING 'utf8';
708 
709 .. rubric:: Footnotes
710-.. [#] The datum shifting files are needed for converting data to and from certain projections.
711-       For example, the PROJ.4 string for the `Google projection (900913) <http://spatialreference.org/ref/epsg/900913/proj4>`_
712-       requires the ``null`` grid file only included in the extra datum shifting files.
713-       It is easier to install the shifting files now, then to have debug a problem caused by their absence later.
714-.. [#] Specifically, GeoDjango provides support for the `OGR <http://gdal.org/ogr>`_ library, a component of GDAL.
715+.. [#] The datum shifting files are needed for converting data to and from
716+       certain projections.
717+       For example, the PROJ.4 string for the `Google projection (900913)
718+       <http://spatialreference.org/ref/epsg/900913/proj4>`_ requires the
719+       ``null`` grid file only included in the extra datum shifting files.
720+       It is easier to install the shifting files now, then to have debug a
721+       problem caused by their absence later.
722+.. [#] Specifically, GeoDjango provides support for the `OGR
723+       <http://gdal.org/ogr>`_ library, a component of GDAL.
724 .. [#] See `GDAL ticket #2382 <http://trac.osgeo.org/gdal/ticket/2382>`_.
725-.. [#] GeoDjango uses the `find_library <http://docs.python.org/library/ctypes.html#finding-shared-libraries>`_
726-       routine from ``ctypes.util`` to locate shared libraries.
727+.. [#] GeoDjango uses the :func:`find_library <ctypes.util.find_library>`
728+       routine from :mod:`ctypes.util` to locate shared libraries.
729 .. [#] The ``psycopg2`` Windows installers are packaged and maintained by
730        `Jason Erickson <http://www.stickpeople.com/projects/python/win-psycopg/>`_.
731Index: docs/ref/contrib/syndication.txt
732===================================================================
733--- docs/ref/contrib/syndication.txt    (révision 16590)
734+++ docs/ref/contrib/syndication.txt    (copie de travail)
735@@ -852,7 +852,7 @@
736 
737     All parameters, if given, should be Unicode objects, except:
738 
739-        * ``pubdate`` should be a `Python datetime object`_.
740+        * ``pubdate`` should be a :class:`Python datetime object<datetime.datetime>`.
741         * ``enclosure`` should be an instance of ``feedgenerator.Enclosure``.
742         * ``categories`` should be a sequence of Unicode objects.
743 
744@@ -884,7 +884,6 @@
745     </feed>
746 
747 .. _django/utils/feedgenerator.py: http://code.djangoproject.com/browser/django/trunk/django/utils/feedgenerator.py
748-.. _Python datetime object: http://docs.python.org/library/datetime.html#datetime-objects
749 
750 .. currentmodule:: django.contrib.syndication
751 
752@@ -913,9 +912,9 @@
753 
754 ``SyndicationFeed.add_root_elements(self, handler)``
755     Callback to add elements inside the root feed element
756-    (``feed``/``channel``). ``handler`` is an `XMLGenerator`_ from Python's
757-    built-in SAX library; you'll call methods on it to add to the XML
758-    document in process.
759+    (``feed``/``channel``). ``handler`` is an :class:`XMLGenerator
760+    <xml.sax.saxutils.XMLGenerator>` from Python's built-in SAX library; you'll
761+    call methods on it to add to the XML document in process.
762 
763 ``SyndicationFeed.item_attributes(self, item)``
764     Return a ``dict`` of attributes to add to each item (``item``/``entry``)
765@@ -945,5 +944,3 @@
766 
767 Obviously there's a lot more work to be done for a complete custom feed class,
768 but the above example should demonstrate the basic idea.
769-
770-.. _XMLGenerator: http://docs.python.org/dev/library/xml.sax.utils.html#xml.sax.saxutils.XMLGenerator
771Index: docs/ref/request-response.txt
772===================================================================
773--- docs/ref/request-response.txt       (révision 16590)
774+++ docs/ref/request-response.txt       (copie de travail)
775@@ -645,8 +645,8 @@
776     ``expires``, and the auto-calculation of ``max_age`` in such case
777     was added. The ``httponly`` argument was also added.
778 
779-    Sets a cookie. The parameters are the same as in the `cookie Morsel`_
780-    object in the Python standard library.
781+    Sets a cookie. The parameters are the same as in the :class:`cookie Morsel
782+    <Cookie.Morsel>` object in the Python standard library.
783 
784         * ``max_age`` should be a number of seconds, or ``None`` (default) if
785           the cookie should last only as long as the client's browser session.
786@@ -670,7 +670,6 @@
787           risk of client side script accessing the protected cookie
788           data.
789 
790-    .. _`cookie Morsel`: http://docs.python.org/library/cookie.html#Cookie.Morsel
791     .. _HTTPOnly: http://www.owasp.org/index.php/HTTPOnly
792 
793 .. method:: HttpResponse.set_signed_cookie(key, value='', salt='', max_age=None, expires=None, path='/', domain=None, secure=None, httponly=False)
794Index: docs/ref/django-admin.txt
795===================================================================
796--- docs/ref/django-admin.txt   (révision 16590)
797+++ docs/ref/django-admin.txt   (copie de travail)
798@@ -455,7 +455,7 @@
799 .. django-admin-option:: --ignore
800 
801 Use the ``--ignore`` or ``-i`` option to ignore files or directories matching
802-the given `glob-style pattern`_. Use multiple times to ignore more.
803+the given :mod:`glob-style pattern <glob>`. Use multiple times to ignore more.
804 
805 These patterns are used by default: ``'CVS'``, ``'.*'``, ``'*~'``
806 
807@@ -463,8 +463,6 @@
808 
809     django-admin.py makemessages --locale=en_US --ignore=apps/* --ignore=secret/*.html
810 
811-.. _`glob-style pattern`: http://docs.python.org/library/glob.html
812-
813 .. django-admin-option:: --no-default-ignore
814 
815 Use the ``--no-default-ignore`` option to disable the default values of
816Index: docs/ref/settings.txt
817===================================================================
818--- docs/ref/settings.txt       (révision 16590)
819+++ docs/ref/settings.txt       (copie de travail)
820@@ -950,8 +950,8 @@
821 Default: ``None``
822 
823 The numeric mode (i.e. ``0644``) to set newly uploaded files to. For
824-more information about what these modes mean, see the `documentation for
825-os.chmod`_
826+more information about what these modes mean, see the documentation for
827+:func:`os.chmod`.
828 
829 If this isn't given or is ``None``, you'll get operating-system
830 dependent behavior. On most platforms, temporary files will have a mode
831@@ -968,8 +968,6 @@
832     get totally incorrect behavior.
833 
834 
835-.. _documentation for os.chmod: http://docs.python.org/library/os.html#os.chmod
836-
837 .. setting:: FILE_UPLOAD_TEMP_DIR
838 
839 FILE_UPLOAD_TEMP_DIR
840Index: docs/conf.py
841===================================================================
842--- docs/conf.py        (révision 16590)
843+++ docs/conf.py        (copie de travail)
844@@ -26,7 +26,7 @@
845 
846 # Add any Sphinx extension module names here, as strings. They can be extensions
847 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
848-extensions = ["djangodocs"]
849+extensions = ["djangodocs", "sphinx.ext.intersphinx"]
850 
851 # Add any paths that contain templates here, relative to this directory.
852 # templates_path = []
853@@ -92,6 +92,13 @@
854 # Note: exclude_dirnames is new in Sphinx 0.5
855 exclude_dirnames = ['.svn']
856 
857+# Links to Python's docs should reference the most recent version of the 2.x
858+# branch, which is located at this URL.
859+intersphinx_mapping = {'python': ('http://docs.python.org', None)}
860+
861+# Python's docs don't change every week.
862+intersphinx_cache_limit = 90 # days
863+
864 # -- Options for HTML output ---------------------------------------------------
865 
866 # The theme to use for HTML and HTML Help pages.  See the documentation for