summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorJon Dufresne <jon.dufresne@gmail.com>2014-10-17 13:01:42 -0700
committerTim Graham <timograham@gmail.com>2014-10-18 06:56:12 -0400
commit37ab955d69ea541b4c66e225cc24dc0a2ee057be (patch)
tree697dcf02e7b52f101b8095ca57aec8e75ab3ec4c /docs/ref
parent55a5f0b49a7adca008076fa0af6f67ef64d575d8 (diff)
[1.7.x] Fixed #23676 -- Rearranged sentence; "by default" applies only to max length
Backport of c1b9f99a81 from master
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/models/fields.txt14
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt
index b762b0357b..11fcf1bef6 100644
--- a/docs/ref/models/fields.txt
+++ b/docs/ref/models/fields.txt
@@ -676,8 +676,8 @@ Also note that even an uploaded HTML file, since it can be executed by the
browser (though not by the server), can pose security threats that are
equivalent to XSS or CSRF attacks.
-By default, :class:`FileField` instances are
-created as ``varchar(100)`` columns in your database. As with other fields, you
+:class:`FileField` instances are created in your database as ``varchar``
+columns with a default max length of 100 characters. As with other fields, you
can change the maximum length using the :attr:`~CharField.max_length` argument.
FileField and FieldFile
@@ -803,8 +803,8 @@ base filename, not the full path. So, this example::
because the :attr:`~FilePathField.match` applies to the base filename
(``foo.png`` and ``bar.png``).
-By default, :class:`FilePathField` instances are
-created as ``varchar(100)`` columns in your database. As with other fields, you
+:class:`FilePathField` instances are created in your database as ``varchar``
+columns with a default max length of 100 characters. As with other fields, you
can change the maximum length using the :attr:`~CharField.max_length` argument.
``FloatField``
@@ -855,9 +855,9 @@ Requires the `Pillow`_ library.
.. _Pillow: http://pillow.readthedocs.org/en/latest/
-By default, :class:`ImageField` instances are created as ``varchar(100)``
-columns in your database. As with other fields, you can change the maximum
-length using the :attr:`~CharField.max_length` argument.
+:class:`ImageField` instances are created in your database as ``varchar``
+columns with a default max length of 100 characters. As with other fields, you
+can change the maximum length using the :attr:`~CharField.max_length` argument.
The default form widget for this field is a
:class:`~django.forms.ClearableFileInput`.