Fixed #14141: docs now use the :doc: construct for links between documents.

Thanks, Ramiro Morales.

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

3 files changed, 14 insertions, 20 deletions

diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt
index 3e267531de..3c4e3b34e4 100644
--- a/docs/ref/templates/api.txt
+++ b/docs/ref/templates/api.txt
@@ -1,12 +1,10 @@
-.. _ref-templates-api:
-
 ====================================================
 The Django template language: For Python programmers
 ====================================================
 
 This document explains the Django template system from a technical
 perspective -- how it works and how to extend it. If you're just looking for
-reference on the language syntax, see :ref:`topics-templates`.
+reference on the language syntax, see :doc:`/topics/templates`.
 
 If you're looking to use the Django template system as part of another
 application -- i.e., without the rest of the framework -- make sure to read
@@ -323,7 +321,7 @@ and return a dictionary of items to be merged into the context. By default,
 
 .. versionadded:: 1.2
    The ``'messages'`` context processor was added.  For more information, see
-   the :ref:`messages documentation <ref-contrib-messages>`.
+   the :doc:`messages documentation </ref/contrib/messages>`.
 
 .. versionchanged:: 1.2
     The auth context processor was moved in this release from its old location
@@ -384,7 +382,7 @@ If :setting:`TEMPLATE_CONTEXT_PROCESSORS` contains this processor, every
       logged in).
 
     * ``messages`` -- A list of messages (as strings) that have been set
-      via the :ref:`messages framework <ref-contrib-messages>`.
+      via the :doc:`messages framework </ref/contrib/messages>`.
 
     * ``perms`` -- An instance of
       ``django.core.context_processors.PermWrapper``, representing the
@@ -397,7 +395,7 @@ If :setting:`TEMPLATE_CONTEXT_PROCESSORS` contains this processor, every
 .. versionchanged:: 1.2
    Prior to version 1.2, the ``messages`` variable was a lazy accessor for
    ``user.get_and_delete_messages()``. It has been changed to include any
-   messages added via the :ref:`messages framework <ref-contrib-messages>`.
+   messages added via the :doc:`messages framework </ref/contrib/messages>`.
 
 django.core.context_processors.debug
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -423,7 +421,7 @@ If :setting:`TEMPLATE_CONTEXT_PROCESSORS` contains this processor, every
     * ``LANGUAGE_CODE`` -- ``request.LANGUAGE_CODE``, if it exists. Otherwise,
       the value of the :setting:`LANGUAGE_CODE` setting.
 
-See :ref:`topics-i18n` for more.
+See :doc:`/topics/i18n/index` for more.
 
 django.core.context_processors.media
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -440,7 +438,7 @@ django.core.context_processors.csrf
 .. versionadded:: 1.2
 
 This processor adds a token that is needed by the ``csrf_token`` template tag
-for protection against :ref:`Cross Site Request Forgeries <ref-contrib-csrf>`.
+for protection against :doc:`Cross Site Request Forgeries </ref/contrib/csrf>`.
 
 django.core.context_processors.request
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -458,7 +456,7 @@ If :setting:`TEMPLATE_CONTEXT_PROCESSORS` contains this processor, every
 
     * ``messages`` -- A list of messages (as strings) that have been set
       via the user model (using ``user.message_set.create``) or through
-      the :ref:`messages framework <ref-contrib-messages>`.
+      the :doc:`messages framework </ref/contrib/messages>`.
 
 .. versionadded:: 1.2
    This template context variable was previously supplied by the ``'auth'``
@@ -716,7 +714,7 @@ settings you wish to specify. You might want to consider setting at least
 :setting:`TEMPLATE_DIRS` (if you're going to use template loaders),
 :setting:`DEFAULT_CHARSET` (although the default of ``utf-8`` is probably fine)
 and :setting:`TEMPLATE_DEBUG`. All available settings are described in the
-:ref:`settings documentation <ref-settings>`, and any setting starting with
+:doc:`settings documentation </ref/settings>`, and any setting starting with
 ``TEMPLATE_`` is of obvious interest.
 
 .. _topic-template-alternate-language:
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 0cf445cab7..ac7fa576a1 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -1,5 +1,3 @@
-.. _ref-templates-builtins:
-
 ==================================
 Built-in template tags and filters
 ==================================
@@ -60,8 +58,8 @@ csrf_token
 
 In the Django 1.1.X series, this is a no-op tag that returns an empty string for
 future compatibility purposes.  In Django 1.2 and later, it is used for CSRF
-protection, as described in the documentation for :ref:`Cross Site Request
-Forgeries <ref-contrib-csrf>`.
+protection, as described in the documentation for :doc:`Cross Site Request
+Forgeries </ref/contrib/csrf>`.
 
 .. templatetag:: cycle
 
@@ -633,7 +631,7 @@ load
 
 Load a custom template tag set.
 
-See :ref:`Custom tag and filter libraries <howto-custom-template-tags>` for more information.
+See :doc:`Custom tag and filter libraries </howto/custom-template-tags>` for more information.
 
 .. templatetag:: now
 
@@ -2062,7 +2060,7 @@ django.contrib.humanize
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 A set of Django template filters useful for adding a "human touch" to data. See
-:ref:`ref-contrib-humanize`.
+:doc:`/ref/contrib/humanize`.
 
 django.contrib.markup
 ~~~~~~~~~~~~~~~~~~~~~
@@ -2079,7 +2077,7 @@ django.contrib.webdesign
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 A collection of template tags that can be useful while designing a website,
-such as a generator of Lorem Ipsum text. See :ref:`ref-contrib-webdesign`.
+such as a generator of Lorem Ipsum text. See :doc:`/ref/contrib/webdesign`.
 
 i18n
 ~~~~
diff --git a/docs/ref/templates/index.txt b/docs/ref/templates/index.txt
index 6655b3da18..0aa4798a94 100644
--- a/docs/ref/templates/index.txt
+++ b/docs/ref/templates/index.txt
@@ -1,5 +1,3 @@
-.. _ref-templates-index:
-
 =========
 Templates
 =========
@@ -18,4 +16,4 @@ an understanding of HTML; no knowledge of Python is required.
 .. seealso::
 
     For information on writing your own custom tags and filters, see
-    :ref:`howto-custom-template-tags`.
+    :doc:`/howto/custom-template-tags`.