summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJames Bennett <ubernostrum@gmail.com>2008-07-01 16:37:28 +0000
committerJames Bennett <ubernostrum@gmail.com>2008-07-01 16:37:28 +0000
commitb0a38160cae71f42717805350fbcf50d0d5ade21 (patch)
treeb6b62a26766cdece5bbdaa2f4da8df18246cb8f2 /docs
parentd725cc9734272f867d41f7236235c28b3931a1b2 (diff)
Fix a small typo in docs/upload_handling.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7816 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/upload_handling.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/upload_handling.txt b/docs/upload_handling.txt
index 068acf3a42..b5aaf46fa8 100644
--- a/docs/upload_handling.txt
+++ b/docs/upload_handling.txt
@@ -7,7 +7,7 @@ File Uploads
Most Web sites wouldn't be complete without a way to upload files. When Django
handles a file upload, the file data ends up placed in ``request.FILES`` (for
more on the ``request`` object see the documentation for `request and response
-objects`_). This document explains how files are stored on disk an in memory,
+objects`_). This document explains how files are stored on disk and in memory,
and how to customize the default behavior.
.. _request and response objects: ../request_response/#attributes