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

2 files changed, 11 insertions, 3 deletions

diff --git a/docs/ref/generic-views.txt b/docs/ref/generic-views.txt
index a7d67c74e3..9c83363ef9 100644
--- a/docs/ref/generic-views.txt
+++ b/docs/ref/generic-views.txt
@@ -96,6 +96,8 @@ If the given URL is ``None``, Django will return an ``HttpResponseGone`` (410).
 .. 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 @@ In addition to ``extra_context``, the template's context will be:
 
     * ``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.
 
diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt
index b8b08829e9..064f1201f7 100644
--- a/docs/ref/request-response.txt
+++ b/docs/ref/request-response.txt
@@ -40,13 +40,13 @@ All attributes except ``session`` should be considered read-only.
     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 @@ Methods
 
     .. _`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