Author: kmtracey
Date: 2008-11-01 14:47:09 -0500 (Sat, 01 Nov 2008)
New Revision: 9317
Modified:
django/branches/releases/1.0.X/
django/branches/releases/1.0.X/docs/topics/http/file-uploads.txt
Log:
[1.0.X] Fixed #9441 -- Corrected typo in file upload settings doc. Thanks gsf.
[9316] from trunk.
Property changes on: django/branches/releases/1.0.X
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9314
+
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9316
Modified: django/branches/releases/1.0.X/docs/topics/http/file-uploads.txt
===================================================================
--- django/branches/releases/1.0.X/docs/topics/http/file-uploads.txt
2008-11-01 19:45:03 UTC (rev 9316)
+++ django/branches/releases/1.0.X/docs/topics/http/file-uploads.txt
2008-11-01 19:47:09 UTC (rev 9317)
@@ -132,7 +132,7 @@
:setting:`FILE_UPLOAD_TEMP_DIR`
The directory where uploaded files larger than
- :setting:`FILE_UPLOAD_TEMP_DIR` will be stored.
+ :setting:`FILE_UPLOAD_MAX_MEMORY_SIZE` will be stored.
Defaults to your system's standard temporary directory (i.e. ``/tmp``
on
most Unix-like systems).
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
