From cd977b9221229649fe1aeca15b4ed112ec7576b5 Mon Sep 17 00:00:00 2001 From: Gabriel Hurley Date: Tue, 28 Dec 2010 23:24:34 +0000 Subject: [PATCH] Fixed #14905 -- Corrected some misleading linking and language in the FileField docs. Thanks to Keryn Knight for the report and draft patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15088 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/ref/models/fields.txt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt index d3933a23b3..2dd429c250 100644 --- a/docs/ref/models/fields.txt +++ b/docs/ref/models/fields.txt @@ -546,10 +546,17 @@ four-digit year, ``'%m'`` is the two-digit month and ``'%d'`` is the two-digit day. If you upload a file on Jan. 15, 2007, it will be saved in the directory ``/home/media/photos/2007/01/15``. -If you want to retrieve the upload file's on-disk filename, or a URL that refers -to that file, or the file's size, you can use the -:attr:`~django.core.files.File.name`, :attr:`~django.core.files.File.url` -and :attr:`~django.core.files.File.size` attributes; see :doc:`/topics/files`. +If you wanted to retrieve the uploaded file's on-disk filename, or the file's +size, you could use the :attr:`~django.core.files.File.name` and +:attr:`~django.core.files.File.size` attributes respectively; for more +information on the available attributes and methods, see the +:class:`~django.core.files.File` class reference and the :doc:`/topics/files` +topic guide. + +The uploaded file's relative URL can be obtained using the +:attr:`~django.db.models.fields.FileField.url` attribute. Internally, +this calls the :meth:`~django.core.files.storage.Storage.url` method of the +underlying :class:`~django.core.files.storage.Storage` class. Note that whenever you deal with uploaded files, you should pay close attention to where you're uploading them and what type of files they are, to avoid