summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-12-06 11:51:32 -0500
committerTim Graham <timograham@gmail.com>2014-12-06 11:52:26 -0500
commite24ec760f11807c974277a89491b25bbafcef401 (patch)
tree4a3e658ad414ec3cdc09b6622c80bf4587622c92 /docs
parent62048bcd62351043f76cc86732053051c8895341 (diff)
[1.6.x] Fixed #23965 -- Mentioned that FieldFile inherits from File
Backport of 5281d9620d13386fd4403f7aa6b9a2afd9b5a93f from master
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/models/fields.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt
index f01714fd49..84c88b000b 100644
--- a/docs/ref/models/fields.txt
+++ b/docs/ref/models/fields.txt
@@ -660,8 +660,9 @@ FileField and FieldFile
When you access a :class:`~django.db.models.FileField` on a model, you are
given an instance of :class:`FieldFile` as a proxy for accessing the underlying
-file. This class has several attributes and methods that can be used to
-interact with file data:
+file. In addition to the functionality inherited from
+:class:`django.core.files.File`, this class has several attributes and methods
+that can be used to interact with file data:
.. attribute:: FieldFile.url