Author: jezdez
Date: 2010-09-30 21:00:52 -0500 (Thu, 30 Sep 2010)
New Revision: 13964
Modified:
django/trunk/docs/howto/deployment/modpython.txt
django/trunk/docs/ref/generic-views.txt
django/trunk/docs/ref/request-response.txt
django/trunk/docs/topics/http/urls.txt
django/trunk/docs/topics/signals.txt
django/trunk/docs/topics/templates.txt
Log:
Fixed #14281 -- A few documentation fixes. Thanks, Ramiro and Timo.
Modified: django/trunk/docs/howto/deployment/modpython.txt
===================================================================
--- django/trunk/docs/howto/deployment/modpython.txt 2010-09-29 17:58:29 UTC
(rev 13963)
+++ django/trunk/docs/howto/deployment/modpython.txt 2010-10-01 02:00:52 UTC
(rev 13964)
@@ -1,5 +1,3 @@
-.. _howto-deployment-modpython:
-
============================================
How to use Django with Apache and mod_python
============================================
Modified: django/trunk/docs/ref/generic-views.txt
===================================================================
--- django/trunk/docs/ref/generic-views.txt 2010-09-29 17:58:29 UTC (rev
13963)
+++ django/trunk/docs/ref/generic-views.txt 2010-10-01 02:00:52 UTC (rev
13964)
@@ -96,6 +96,8 @@
.. versionadded:: 1.1
The ``permanent`` keyword argument is new in Django 1.1.
+.. versionadded:: 1.3
+ The ``query_string`` keyword argument is new in Django 1.3.
**Example:**
@@ -380,7 +382,7 @@
* ``date_list``: A list of ``datetime.date`` objects representing all
days that have objects available in the given month, according to
- ``queryset``, in ascending order.
+ ``queryset``, in ascending order.
* ``month``: A ``datetime.date`` object representing the given month.
Modified: django/trunk/docs/ref/request-response.txt
===================================================================
--- django/trunk/docs/ref/request-response.txt 2010-09-29 17:58:29 UTC (rev
13963)
+++ django/trunk/docs/ref/request-response.txt 2010-10-01 02:00:52 UTC (rev
13964)
@@ -40,13 +40,13 @@
Under some web server configurations, the portion of the URL after the host
name is split up into a script prefix portion and a path info portion
(this happens, for example, when using the ``django.root`` option
- with the :ref:`modpython handler from Apache
<howto-deployment-modpython>`).
+ with the :doc:`modpython handler from Apache
</howto/deployment/modpython>`).
The ``path_info`` attribute always contains the path info portion of the
path, no matter what web server is being used. Using this instead of
attr:`~HttpRequest.path` can make your code much easier to move between
test
and deployment servers.
- For example, if the ``django.root`` for your application is set to
+ For example, if the ``django.root`` for your application is set to
``"/minfo"``, then ``path`` might be ``"/minfo/music/bands/the_beatles/"``
and ``path_info`` would be ``"/music/bands/the_beatles/"``.
@@ -542,6 +542,12 @@
.. _`cookie Morsel`:
http://docs.python.org/library/cookie.html#Cookie.Morsel
+ .. versionchanged:: 1.3
+
+ Both the possibility of specifying a ``datetime.datetime`` object in
+ ``expires`` and the auto-calculation of ``max_age`` in such case were added
+ in Django 1.3.
+
.. method:: HttpResponse.delete_cookie(key, path='/', domain=None)
Deletes the cookie with the given key. Fails silently if the key doesn't
Modified: django/trunk/docs/topics/http/urls.txt
===================================================================
--- django/trunk/docs/topics/http/urls.txt 2010-09-29 17:58:29 UTC (rev
13963)
+++ django/trunk/docs/topics/http/urls.txt 2010-10-01 02:00:52 UTC (rev
13964)
@@ -939,9 +939,9 @@
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>`).
Modified: django/trunk/docs/topics/signals.txt
===================================================================
--- django/trunk/docs/topics/signals.txt 2010-09-29 17:58:29 UTC (rev
13963)
+++ django/trunk/docs/topics/signals.txt 2010-10-01 02:00:52 UTC (rev
13964)
@@ -89,7 +89,8 @@
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 @@
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.
Modified: django/trunk/docs/topics/templates.txt
===================================================================
--- django/trunk/docs/topics/templates.txt 2010-09-29 17:58:29 UTC (rev
13963)
+++ django/trunk/docs/topics/templates.txt 2010-10-01 02:00:52 UTC (rev
13964)
@@ -590,7 +590,7 @@
{{ 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::
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
