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

8 files changed, 17 insertions, 33 deletions

diff --git a/docs/topics/http/file-uploads.txt b/docs/topics/http/file-uploads.txt
index ab8277599c..6b0a4d5722 100644
--- a/docs/topics/http/file-uploads.txt
+++ b/docs/topics/http/file-uploads.txt
@@ -1,5 +1,3 @@
-.. _topics-http-file-uploads:
-
 ============
 File Uploads
 ============
@@ -10,8 +8,8 @@ File Uploads
 
 When Django handles a file upload, the file data ends up placed in
 :attr:`request.FILES <django.http.HttpRequest.FILES>` (for more on the
-``request`` object see the documentation for :ref:`request and response objects
-<ref-request-response>`). This document explains how files are stored on disk
+``request`` object see the documentation for :doc:`request and response objects
+</ref/request-response>`). This document explains how files are stored on disk
 and in memory, and how to customize the default behavior.
 
 Basic file uploads
diff --git a/docs/topics/http/generic-views.txt b/docs/topics/http/generic-views.txt
index 5aa2c48ea5..15f895ea78 100644
--- a/docs/topics/http/generic-views.txt
+++ b/docs/topics/http/generic-views.txt
@@ -1,7 +1,5 @@
-.. _topics-http-generic-views:
-
 =============
 Generic views
 =============
 
-See :ref:`ref-generic-views`.
\ No newline at end of file
+See :doc:`/ref/generic-views`.
diff --git a/docs/topics/http/index.txt b/docs/topics/http/index.txt
index ae73c2c29b..5ef776dd7b 100644
--- a/docs/topics/http/index.txt
+++ b/docs/topics/http/index.txt
@@ -1,5 +1,3 @@
-.. _topics-http-index:
-
 Handling HTTP requests
 ======================
 
diff --git a/docs/topics/http/middleware.txt b/docs/topics/http/middleware.txt
index 215a4ec12c..eee398a3dc 100644
--- a/docs/topics/http/middleware.txt
+++ b/docs/topics/http/middleware.txt
@@ -1,5 +1,3 @@
-.. _topics-http-middleware:
-
 ==========
 Middleware
 ==========
@@ -14,8 +12,8 @@ an ``"X-View"`` HTTP header to every response to a ``HEAD`` request.
 
 This document explains how middleware works, how you activate middleware, and
 how to write your own middleware. Django ships with some built-in middleware
-you can use right out of the box; they're documented in the :ref:`built-in
-middleware reference <ref-middleware>`.
+you can use right out of the box; they're documented in the :doc:`built-in
+middleware reference </ref/middleware>`.
 
 Activating middleware
 =====================
@@ -173,9 +171,9 @@ Guidelines
       cares about is that the :setting:`MIDDLEWARE_CLASSES` setting includes
       the path to it.
 
-    * Feel free to look at :ref:`Django's available middleware
-      <ref-middleware>` for examples.
+    * Feel free to look at :doc:`Django's available middleware
+      </ref/middleware>` for examples.
 
     * If you write a middleware component that you think would be useful to
-      other people, contribute to the community! :ref:`Let us know
-      <internals-contributing>`, and we'll consider adding it to Django.
+      other people, contribute to the community! :doc:`Let us know
+      </internals/contributing>`, and we'll consider adding it to Django.
diff --git a/docs/topics/http/sessions.txt b/docs/topics/http/sessions.txt
index 68ead03b65..8a0f0d4b72 100644
--- a/docs/topics/http/sessions.txt
+++ b/docs/topics/http/sessions.txt
@@ -1,5 +1,3 @@
-.. _topics-http-sessions:
-
 ===================
 How to use sessions
 ===================
@@ -15,7 +13,7 @@ Cookies contain a session ID -- not the data itself.
 Enabling sessions
 =================
 
-Sessions are implemented via a piece of :ref:`middleware <ref-middleware>`.
+Sessions are implemented via a piece of :doc:`middleware </ref/middleware>`.
 
 To enable session functionality, do the following:
 
@@ -56,8 +54,8 @@ For better performance, you may want to use a cache-based session backend.
    Django 1.0 did not include the ``cached_db`` session backend.
 
 To store session data using Django's cache system, you'll first need to make
-sure you've configured your cache; see the :ref:`cache documentation
-<topics-cache>` for details.
+sure you've configured your cache; see the :doc:`cache documentation
+</topics/cache>` for details.
 
 .. warning::
 
@@ -412,7 +410,7 @@ in the past -- but your application may have different requirements.
 Settings
 ========
 
-A few :ref:`Django settings <ref-settings>` give you control over session behavior:
+A few :doc:`Django settings </ref/settings>` give you control over session behavior:
 
 SESSION_ENGINE
 --------------
diff --git a/docs/topics/http/shortcuts.txt b/docs/topics/http/shortcuts.txt
index 5510613355..6bd3058941 100644
--- a/docs/topics/http/shortcuts.txt
+++ b/docs/topics/http/shortcuts.txt
@@ -1,5 +1,3 @@
-.. _topics-http-shortcuts:
-
 =========================
 Django shortcut functions
 =========================
diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt
index d5746c52f2..1ea991959b 100644
--- a/docs/topics/http/urls.txt
+++ b/docs/topics/http/urls.txt
@@ -1,5 +1,3 @@
-.. _topics-http-urls:
-
 ==============
 URL dispatcher
 ==============
@@ -335,7 +333,7 @@ The view prefix
 You can specify a common prefix in your ``patterns()`` call, to cut down on
 code duplication.
 
-Here's the example URLconf from the :ref:`Django overview <intro-overview>`::
+Here's the example URLconf from the :doc:`Django overview </intro/overview>`::
 
     from django.conf.urls.defaults import *
 
@@ -537,8 +535,8 @@ In this example, for a request to ``/blog/2005/``, Django will call the
 
     year='2005', foo='bar'
 
-This technique is used in :ref:`generic views <ref-generic-views>` and in the
-:ref:`syndication framework <ref-contrib-syndication>` to pass metadata and
+This technique is used in :doc:`generic views </ref/generic-views>` and in the
+:doc:`syndication framework </ref/contrib/syndication>` to pass metadata and
 options to views.
 
 .. admonition:: Dealing with conflicts
diff --git a/docs/topics/http/views.txt b/docs/topics/http/views.txt
index 7d8743fe06..399e6b6ad1 100644
--- a/docs/topics/http/views.txt
+++ b/docs/topics/http/views.txt
@@ -1,5 +1,3 @@
-.. _topics-http-views:
-
 =============
 Writing Views
 =============
@@ -59,7 +57,7 @@ Mapping URLs to Views
 
 So, to recap, this view function returns an HTML page that includes the current
 date and time. To display this view at a particular URL, you'll need to create a
-*URLconf*; see :ref:`topics-http-urls` for instructions.
+*URLconf*; see :doc:`/topics/http/urls` for instructions.
 
 Returning errors
 ================