From 37ab955d69ea541b4c66e225cc24dc0a2ee057be Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Fri, 17 Oct 2014 13:01:42 -0700 Subject: [PATCH] [1.7.x] Fixed #23676 -- Rearranged sentence; "by default" applies only to max length Backport of c1b9f99a81 from master --- docs/ref/models/fields.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt index b762b0357ba..11fcf1bef6c 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`.