[1.2.X] Fixed #13876 -- Fixed duplication in docs. Thanks, zerok and timo.

Backport from trunk (r13966).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13972 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 5 insertions, 11 deletions

diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt
index bf984f4fa8..a944abeddc 100644
--- a/docs/ref/request-response.txt
+++ b/docs/ref/request-response.txt
@@ -405,16 +405,6 @@ file-like object::
     >>> response.write("<p>Here's the text of the Web page.</p>")
     >>> response.write("<p>Here's another paragraph.</p>")
 
-You can add and delete headers using dictionary syntax::
-
-    >>> response = HttpResponse()
-    >>> response['X-DJANGO'] = "It's the best."
-    >>> del response['X-PHP']
-    >>> response['X-DJANGO']
-    "It's the best."
-
-Note that ``del`` doesn't raise ``KeyError`` if the header doesn't exist.
-
 Passing iterators
 ~~~~~~~~~~~~~~~~~
 
@@ -429,10 +419,14 @@ hard-coded strings. If you use this technique, follow these guidelines:
 Setting headers
 ~~~~~~~~~~~~~~~
 
-To set a header in your response, just treat it like a dictionary::
+To set or remove a header in your response, treat it like a dictionary::
 
     >>> response = HttpResponse()
     >>> response['Cache-Control'] = 'no-cache'
+    >>> del response['Cache-Control']
+
+Note that unlike a dictionary, ``del`` doesn't raise ``KeyError`` if the header
+doesn't exist.
 
 .. versionadded:: 1.1