summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorBrian Rosner <brosner@gmail.com>2008-07-03 15:24:08 +0000
committerBrian Rosner <brosner@gmail.com>2008-07-03 15:24:08 +0000
commit7dd2666bd07736056932cfaca5e2ab809d68247b (patch)
treee49f8185803c0df9b46ac94d5ab370ea8b0fe0c3 /docs
parentf918f9180f38451e3924fa04da453bb81a9dc6ed (diff)
newforms-admin: Merged from trunk up to [7829].
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7830 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/upload_handling.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/upload_handling.txt b/docs/upload_handling.txt
index 068acf3a42..34cd085ac9 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
@@ -72,7 +72,7 @@ methods to access the uploaded content:
reading in multiple chunks. By default this will be any file
larger than 2.5 megabytes, but that's configurable; see below.
- ``UploadedFile.chunks()``
+ ``UploadedFile.chunk()``
A generator returning chunks of the file. If ``multiple_chunks()`` is
``True``, you should use this method in a loop instead of ``read()``.
@@ -299,7 +299,7 @@ attributes:
multiple chunk sizes provided by multiple handlers, Django will use the
smallest chunk size defined by any handler.
- The default is 64*2\ :sup:`10` bytes, or 64 Kb.
+ The default is 64*2\ :sup:`10` bytes, or 64 KB.
``FileUploadHandler.new_file(self, field_name, file_name, content_type, content_length, charset)``
Callback signaling that a new file upload is starting. This is called
@@ -325,7 +325,7 @@ attributes:
``FileUploadHandler.upload_complete(self)``
Callback signaling that the entire upload (all files) has completed.
- ``FileUploadHandler.``handle_raw_input(self, input_data, META, content_length, boundary, encoding)``
+ ``FileUploadHandler.handle_raw_input(self, input_data, META, content_length, boundary, encoding)``
Allows the handler to completely override the parsing of the raw
HTTP input.