summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-10-06 08:28:18 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-10-06 08:28:18 +0000
commite0a09b7dacea4c8ecdca94decc3ec54bdf336743 (patch)
tree113cc662b8c25a9812c04a57fdaf1cb120948c73 /docs
parenta011a494570dbe66db11e5a9bbb901d8b3e27be7 (diff)
downloaddjango-e0a09b7dacea4c8ecdca94decc3ec54bdf336743.tar.gz
Fixed a couple of markup errors in the documentation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9164 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/models/instances.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt
index c7ea4f3d49..d7c4ee377a 100644
--- a/docs/ref/models/instances.txt
+++ b/docs/ref/models/instances.txt
@@ -7,9 +7,9 @@ Model instance reference
.. currentmodule:: django.db.models
This document describes the details of the ``Model`` API. It builds on the
-material presented in the :ref:`model <topics-db-models>` and `database query
-<topics-db-queries>` guides, so you'll probably want to read and understand
-those documents before reading this one.
+material presented in the :ref:`model <topics-db-models>` and :ref:`database
+query <topics-db-queries>` guides, so you'll probably want to read and
+understand those documents before reading this one.
Throughout this reference we'll use the :ref:`example weblog models
<queryset-model-example>` presented in the :ref:`database query guide
@@ -294,7 +294,7 @@ in the URLConf file and in the model.
You can further decouple your models from the URLconf using the ``permalink``
decorator:
-.. function:: django.db.models.permalink()
+.. function:: permalink()
This decorator is passed the view function, a list of positional parameters and
(optionally) a dictionary of named parameters. Django then works out the correct