Ticket #6092: 6092-docs.2.diff

docs/newforms.txt

@@ -1315 +1315 @@
       moderately complex regular expression.
     * Error message keys: ``required``, ``invalid``
 
-Has two optional arguments for validation, ``max_length`` and ``min_length``.
-If provided, these arguments ensure that the string is at most or at least the
-given length.
 
+Also takes the following optional arguments:
+    ======================  =====================================================
+    Argument                Description
+    ======================  =====================================================
+    ``max_length``          Ensures the string has at most this many characters.
+    ``min_length``          Ensures the string has at least this many characters.
+    ``regex``               A compiled regex which will be used instead of the 
+                            default email validation pattern.
+    ======================  =====================================================
+
 ``FileField``
 ~~~~~~~~~~~~~
 
@@ -1482 +1489 @@
     ``validator_user_agent``  String used as the user-agent used when checking for
                               a URL's existence. Defaults to the value of the
                               ``URL_VALIDATOR_USER_AGENT`` setting.
+    ``regex``                 A compiled regex which will be used instead of 
+                              the default url validation pattern.
     ========================  =====================================================
 
 Slightly complex built-in ``Field`` classes

docs/model-api.txt

@@ -227 +227 @@
 automatically set to 75. In the Django development version, ``max_length`` is
 set to 75 by default, but you can specify it to override default behavior.
 
+It also accepts ``regex``, which is a compiled regex which will be used instead
+of the default email validation regular expression pattern.
+
 ``FileField``
 ~~~~~~~~~~~~~
 
@@ -468 +471 @@
 
 The admin represents this as an ``<input type="text">`` (a single-line input).
 
-``URLField`` takes an optional argument, ``max_length``, the maximum length (in
-characters) of the field. The maximum length is enforced at the database level and
-in Django's validation. If you don't specify ``max_length``, a default of 200
+``URLField`` takes two optional arguments.  The first is ``max_length``, the maximum 
+length (in characters) of the field. The maximum length is enforced at the database 
+level and in Django's validation. If you don't specify ``max_length``, a default of 200
 is used.
 
+The second is ``regex``, which is a compiled regex which will be used instead
+of the default url validation regular expression pattern.
+
 ``USStateField``
 ~~~~~~~~~~~~~~~~