gis: Merged revisions 4786-5490 via svnmerge from

http://code.djangoproject.com/svn/django/trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5492 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 7 insertions, 2 deletions

diff --git a/docs/request_response.txt b/docs/request_response.txt
index 2b79903d13..0b985d563b 100644
--- a/docs/request_response.txt
+++ b/docs/request_response.txt
@@ -93,6 +93,7 @@ All attributes except ``session`` should be considered read-only.
         * ``CONTENT_TYPE``
         * ``HTTP_ACCEPT_ENCODING``
         * ``HTTP_ACCEPT_LANGUAGE``
+        * ``HTTP_HOST`` -- The HTTP Host header sent by the client.
         * ``HTTP_REFERER`` -- The referring page, if any.
         * ``HTTP_USER_AGENT`` -- The client's user-agent string.
         * ``QUERY_STRING`` -- The query string, as a single (unparsed) string.
@@ -416,6 +417,10 @@ types of HTTP responses. Like ``HttpResponse``, these subclasses live in
     The constructor doesn't take any arguments. Use this to designate that a
     page hasn't been modified since the user's last request.
 
+``HttpResponseBadRequest``
+    **New in Django development version.**
+    Acts just like ``HttpResponse`` but uses a 400 status code.
+
 ``HttpResponseNotFound``
     Acts just like ``HttpResponse`` but uses a 404 status code.
 
@@ -479,8 +484,8 @@ In order to use the ``Http404`` exception to its fullest, you should create a
 template that is displayed when a 404 error is raised. This template should be
 called ``404.html`` and located in the top level of your template tree.
 
-Customing error views
----------------------
+Customizing error views
+-----------------------
 
 The 404 (page not found) view
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~