From 95c74b9d699c29fe808684774548e2864d64665a Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris+github@qwirx.com>
Date: Tue, 4 Mar 2014 14:12:13 +0000
Subject: Fixed #22206 -- Passed models.TextField.max_length to
 forms.CharField.maxlength

---
 docs/ref/models/fields.txt | 7 +++++++
 docs/releases/1.7.txt      | 4 ++++
 2 files changed, 11 insertions(+)

(limited to 'docs')

diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt
index 4e02c66ca0..b3523334c0 100644
--- a/docs/ref/models/fields.txt
+++ b/docs/ref/models/fields.txt
@@ -968,6 +968,13 @@ databases supported by Django.
 A large text field. The default form widget for this field is a
 :class:`~django.forms.Textarea`.
 
+.. versionchanged:: 1.7
+
+    If you specify a ``max_length`` attribute, it will be reflected in the
+    :class:`~django.forms.Textarea` widget of the auto-generated form field.
+    However it is not enforced at the model or database level. Use a
+    :class:`CharField` for that.
+
 .. admonition:: MySQL users
 
     If you are using this field with MySQLdb 1.2.1p2 and the ``utf8_bin``
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 441a39616a..096415c5b8 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -488,6 +488,10 @@ Forms
   Each radio button or checkbox includes an ``id_for_label`` attribute to
   output the element's ID.
 
+* The ``<textarea>`` tags rendered by :class:`~django.forms.Textarea` now
+  include a ``maxlength`` attribute if the :class:`~django.db.models.TextField`
+  model field has a ``max_length``.
+
 * :attr:`Field.choices<django.db.models.Field.choices>` now allows you to
   customize the "empty choice" label by including a tuple with an empty string
   or ``None`` for the key and the custom label as the value. The default blank
-- 
cgit v1.3