summaryrefslogtreecommitdiff
path: root/docs/topics
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-10-01 02:00:52 +0000
committerJannis Leidel <jannis@leidel.info>2010-10-01 02:00:52 +0000
commite77f16144b91c5079c7dcaef9ec3737b6f933e16 (patch)
tree21e1b38aa65f37d528331cde866dd60cd8ebfa7b /docs/topics
parent136bf00615c3dadd697e746185f5c35258aa418a (diff)
Fixed #14281 -- A few documentation fixes. Thanks, Ramiro and Timo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/topics')
-rw-r--r--docs/topics/http/urls.txt6
-rw-r--r--docs/topics/signals.txt7
-rw-r--r--docs/topics/templates.txt2
3 files changed, 10 insertions, 5 deletions
diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt
index 1f499909ee..3ba217ba8d 100644
--- a/docs/topics/http/urls.txt
+++ b/docs/topics/http/urls.txt
@@ -939,9 +939,9 @@ Normally, you should always use :func:`~django.core.urlresolvers.reverse` or
However, if your application constructs part of the URL hierarchy itself, you
may occasionally need to generate URLs. In that case, you need to be able to
find the base URL of the Django project within its web server
-(normally, :func:`~django.core.urlresolvers.reverse` takes care of this for
+(normally, :func:`~django.core.urlresolvers.reverse` takes care of this for
you). In that case, you can call ``get_script_prefix()``, which will return the
script prefix portion of the URL for your Django project. If your Django
project is at the root of its webserver, this is always ``"/"``, but it can be
-changed, for instance by using ``django.root`` (see :ref:`How to use
-Django with Apache and mod_python <howto-deployment-modpython>`).
+changed, for instance by using ``django.root`` (see :doc:`How to use
+Django with Apache and mod_python </howto/deployment/modpython>`).
diff --git a/docs/topics/signals.txt b/docs/topics/signals.txt
index 78790db071..56700581ca 100644
--- a/docs/topics/signals.txt
+++ b/docs/topics/signals.txt
@@ -89,7 +89,8 @@ manual connect route:
request_finished.connect(my_callback)
-Alternatively, you can use a decorator used when you define your receiver:
+Alternatively, you can use a ``receiver`` decorator when you define your
+receiver:
.. code-block:: python
@@ -102,6 +103,10 @@ Alternatively, you can use a decorator used when you define your receiver:
Now, our ``my_callback`` function will be called each time a request finishes.
+.. versionadded:: 1.3
+
+The ``receiver`` decorator was added in Django 1.3.
+
.. admonition:: Where should this code live?
You can put signal handling and registration code anywhere you like.
diff --git a/docs/topics/templates.txt b/docs/topics/templates.txt
index c3fdd2cf0e..fb04a3a233 100644
--- a/docs/topics/templates.txt
+++ b/docs/topics/templates.txt
@@ -590,7 +590,7 @@ a model called "comment" with a foreign key relationship to a model called
{{ comment }}
{% endfor %}
-Similarly, :doc:`QuerySets<ref/models/querysets>` provide a ``count()`` method
+Similarly, :doc:`QuerySets</ref/models/querysets>` provide a ``count()`` method
to count the number of objects they contain. Therefore, you can obtain a count
of all comments related to the current task with::