Documentation duplicates

[pakal <chambon.pascal@…>]

In documentation page "the Django admin site" : a section is written twice in a row, the one starting with :
"If the string given is a method of the model, ModelAdmin or a callable, Django will HTML-escape the output by default. If you'd rather not escape the output of the method, give the method an allow_tags attribute whose value is True."

Besides, in request-response doc , two different sections deal with setting/reading request headers, maybe they should be merged :

"""
Here's a full example model:

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.

[....]

Setting headers

To set a header in your response, just treat it like a dictionary:
"""

Cheers,
Pascal

[Alex Gaynor]

Added formatting.

[Horst Gutmann]

While the first issue I can't reproduce (the paragraphs started with the same phrases but then went in totally different directions), +1 on the second issue. I attached a patch for that based on 1.2.X

[pakal <chambon.pascal@…>]

Indeed I can't find issue 1 again, either it's been fixed since then or I just got confused.

[Tim Graham]

more concise wording, correct position of versionadded tag

[Jannis Leidel]

(In [13966]) Fixed #13876 -- Fixed duplication in docs. Thanks, zerok and timo.

[Jannis Leidel]

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

Backport from trunk (r13966).