summaryrefslogtreecommitdiff
path: root/docs/request_response.txt
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-10-23 12:51:22 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-10-23 12:51:22 +0000
commit5e1a54a3a8285912fed02b2121b53d13fa1061fd (patch)
tree7854834beb4dbb639a918a790e5d29d8f5bd502c /docs/request_response.txt
parent1e1230c41c428c3909b52720e381cac18942e90e (diff)
queryset-refactor: Merged from trunk up to [6595].
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6597 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/request_response.txt')
-rw-r--r--docs/request_response.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/request_response.txt b/docs/request_response.txt
index 7806886841..8da00cdf09 100644
--- a/docs/request_response.txt
+++ b/docs/request_response.txt
@@ -381,8 +381,8 @@ Methods
``mimetype``. Historically, the parameter was only called ``mimetype``,
but since this is actually the value included in the HTTP ``Content-Type``
header, it can also include the character set encoding, which makes it
- more than just a MIME type specification. If ``mimetype`` is specifiedi
- (not None), that value is used. Otherwise, ``content_type`` is used. If
+ more than just a MIME type specification. If ``mimetype`` is specified
+ (not None), that value is used. Otherwise, ``content_type`` is used. If
neither is given, the ``DEFAULT_CONTENT_TYPE`` setting is used.
``__setitem__(header, value)``