summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDuane Hilton <duane9@gmail.com>2014-09-27 16:12:34 -0600
committerTim Graham <timograham@gmail.com>2014-09-29 18:17:13 -0400
commitf0e7a695f5c3723ccf171aefe1b3f0e47c09a28a (patch)
tree1bb3c2a7935faea04fbc78c5271184d6caea6676 /docs
parentf9e8da154225fb2829fda834f934d5e268fa7c83 (diff)
[1.7.x] Fixed #17638 -- Added crosslinks between topic and reference guides.
Thanks oinopion for the suggestion and jarus for the initial patch. Backport of 054bdfeff1 from master
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/class-based-views/index.txt4
-rw-r--r--docs/ref/forms/formsets.txt7
-rw-r--r--docs/ref/forms/index.txt3
-rw-r--r--docs/ref/forms/models.txt3
-rw-r--r--docs/ref/migration-operations.txt3
-rw-r--r--docs/ref/settings.txt3
-rw-r--r--docs/ref/templates/index.txt3
-rw-r--r--docs/topics/db/models.txt6
-rwxr-xr-xdocs/topics/migrations.txt6
-rw-r--r--docs/topics/settings.txt5
-rw-r--r--docs/topics/templates.txt6
11 files changed, 42 insertions, 7 deletions
diff --git a/docs/ref/class-based-views/index.txt b/docs/ref/class-based-views/index.txt
index 7962a81cbb..1a7682f731 100644
--- a/docs/ref/class-based-views/index.txt
+++ b/docs/ref/class-based-views/index.txt
@@ -2,8 +2,8 @@
Built-in Class-based views API
==============================
-Class-based views API reference. For introductory material, see
-:doc:`/topics/class-based-views/index`.
+Class-based views API reference. For introductory material, see the
+:doc:`/topics/class-based-views/index` topic guide.
.. toctree::
:maxdepth: 3
diff --git a/docs/ref/forms/formsets.txt b/docs/ref/forms/formsets.txt
index 342375b4ee..5b12732066 100644
--- a/docs/ref/forms/formsets.txt
+++ b/docs/ref/forms/formsets.txt
@@ -1,6 +1,9 @@
-====================
+=================
Formset Functions
-====================
+=================
+
+Formset API reference. For introductory material about formsets, see the
+:doc:`/topics/forms/formsets` topic guide.
.. module:: django.forms.formsets
:synopsis: Django's functions for building formsets.
diff --git a/docs/ref/forms/index.txt b/docs/ref/forms/index.txt
index e6edc88ca1..618c705b92 100644
--- a/docs/ref/forms/index.txt
+++ b/docs/ref/forms/index.txt
@@ -2,7 +2,8 @@
Forms
=====
-Detailed form API reference. For introductory material, see :doc:`/topics/forms/index`.
+Detailed form API reference. For introductory material, see the
+:doc:`/topics/forms/index` topic guide.
.. toctree::
:maxdepth: 2
diff --git a/docs/ref/forms/models.txt b/docs/ref/forms/models.txt
index 688b800a40..32d6c3f993 100644
--- a/docs/ref/forms/models.txt
+++ b/docs/ref/forms/models.txt
@@ -2,6 +2,9 @@
Model Form Functions
====================
+Model Form API reference. For introductory material about model forms, see the
+:doc:`/topics/forms/modelforms` topic guide.
+
.. module:: django.forms.models
:synopsis: Django's functions for building model forms and formsets.
diff --git a/docs/ref/migration-operations.txt b/docs/ref/migration-operations.txt
index dc769dca69..e377a251f4 100644
--- a/docs/ref/migration-operations.txt
+++ b/docs/ref/migration-operations.txt
@@ -28,6 +28,9 @@ output incorrect code.
All of the core Django operations are available from the
``django.db.migrations.operations`` module.
+For introductory material, see the :doc:`migrations topic guide
+</topics/migrations>`.
+
Schema Operations
=================
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 7e434fc6c7..8154ffd0d9 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -18,7 +18,8 @@ Core settings
Here's a list of settings available in Django core and their default values.
Settings provided by contrib apps are listed below, followed by a topical index
-of the core settings.
+of the core settings. For introductory material, see the :doc:`settings topic
+guide </topics/settings>`.
.. setting:: ABSOLUTE_URL_OVERRIDES
diff --git a/docs/ref/templates/index.txt b/docs/ref/templates/index.txt
index 0aa4798a94..0e70b7326f 100644
--- a/docs/ref/templates/index.txt
+++ b/docs/ref/templates/index.txt
@@ -5,7 +5,8 @@ Templates
Django's template engine provides a powerful mini-language for defining the
user-facing layer of your application, encouraging a clean separation of
application and presentation logic. Templates can be maintained by anyone with
-an understanding of HTML; no knowledge of Python is required.
+an understanding of HTML; no knowledge of Python is required. For introductory
+material, see :doc:`/topics/templates` topic guide.
.. toctree::
:maxdepth: 2
diff --git a/docs/topics/db/models.txt b/docs/topics/db/models.txt
index 383d72b97e..cee8b703ff 100644
--- a/docs/topics/db/models.txt
+++ b/docs/topics/db/models.txt
@@ -1373,3 +1373,9 @@ different database tables).
Django will raise a :exc:`~django.core.exceptions.FieldError` if you override
any model field in any ancestor model.
+
+.. seealso::
+
+ :doc:`The Models Reference </ref/models/index>`
+ Covers all the model related APIs including model fields, related
+ objects, and ``QuerySet``.
diff --git a/docs/topics/migrations.txt b/docs/topics/migrations.txt
index 319955e9ca..739e8ed165 100755
--- a/docs/topics/migrations.txt
+++ b/docs/topics/migrations.txt
@@ -660,3 +660,9 @@ your Django migrations in the ``migrations`` directory.
More information is available in the
`South 1.0 release notes <http://south.readthedocs.org/en/latest/releasenotes/1.0.html#library-migration-path>`_.
+
+.. seealso::
+
+ :doc:`The Migrations Operations Reference </ref/migration-operations>`
+ Covers the schema operations API, special operations, and writing your
+ own operations.
diff --git a/docs/topics/settings.txt b/docs/topics/settings.txt
index 3da5226be9..ff5532eb70 100644
--- a/docs/topics/settings.txt
+++ b/docs/topics/settings.txt
@@ -267,3 +267,8 @@ It boils down to this: Use exactly one of either ``configure()`` or
``DJANGO_SETTINGS_MODULE``. Not both, and not neither.
.. _@login_required: ../authentication/#the-login-required-decorator
+
+.. seealso::
+
+ :doc:`The Settings Reference </ref/settings>`
+ Contains the complete list of core and contrib app settings.
diff --git a/docs/topics/templates.txt b/docs/topics/templates.txt
index 57ce6ae090..c74e0305f1 100644
--- a/docs/topics/templates.txt
+++ b/docs/topics/templates.txt
@@ -695,3 +695,9 @@ access to the humanize template tags and filters. The child template is
responsible for its own ``{% load humanize %}``.
This is a feature for the sake of maintainability and sanity.
+
+.. seealso::
+
+ :doc:`The Templates Reference </ref/templates/index>`
+ Covers built-in tags, built-in filters, using an alternative template,
+ language, and more.