Ticket #14281: 14281.diff

docs/howto/deployment/modpython.txt

@@ -1 @@
-.. _howto-deployment-modpython:
-
 ============================================
 How to use Django with Apache and mod_python
 ============================================

docs/topics/http/urls.txt

@@ -939 +939 @@
 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>`).

docs/topics/templates.txt

@@ -590 +590 @@
         {{ 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::
 

docs/topics/signals.txt

@@ -89 +89 @@
 
     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 +103 @@
 
 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.

docs/ref/generic-views.txt

@@ -96 +96 @@
 .. 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 +382 @@
 
     * ``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.
 

docs/ref/request-response.txt

@@ -46 +46 @@
     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 +542 @@
 
     .. _`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