Fixed #8918 -- Made FileField.upload_to optional.

Thanks leahculver for the suggestion and dc and vajrasky for work
on the patch.

1 files changed, 3 insertions, 4 deletions

diff --git a/docs/faq/usage.txt b/docs/faq/usage.txt
index be3839e08f..ecc473762f 100644
--- a/docs/faq/usage.txt
+++ b/docs/faq/usage.txt
@@ -45,10 +45,9 @@ Using a :class:`~django.db.models.FileField` or an
    account.
 
 #. Add the :class:`~django.db.models.FileField` or
-   :class:`~django.db.models.ImageField` to your model, making sure to
-   define the :attr:`~django.db.models.FileField.upload_to` option to tell
-   Django to which subdirectory of :setting:`MEDIA_ROOT` it should upload
-   files.
+   :class:`~django.db.models.ImageField` to your model, defining the
+   :attr:`~django.db.models.FileField.upload_to` option to specify a
+   subdirectory of :setting:`MEDIA_ROOT` to use for uploaded files.
 
 #. All that will be stored in your database is a path to the file
    (relative to :setting:`MEDIA_ROOT`). You'll most likely want to use the