summaryrefslogtreecommitdiff
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:18 -0400
commit7d90fed1a073318defbb7cf80015530a38a09bbc (patch)
treec795d845ab9f789d32f3d0e97d290c5e88e5d274
parenta57f32411fa778005af0774c557b87c8ab32c1eb (diff)
[1.6.x] Fixed #23676 -- Rearranged sentence; "by default" applies only to max length
Backport of c1b9f99a81 from master
-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 122610a0d5..156709394a 100644
--- a/docs/ref/models/fields.txt
+++ b/docs/ref/models/fields.txt
@@ -647,8 +647,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
@@ -779,8 +779,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``
@@ -831,9 +831,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`.