diff options
| author | Carl Meyer <carl@oddbird.net> | 2011-09-10 03:26:13 +0000 |
|---|---|---|
| committer | Carl Meyer <carl@oddbird.net> | 2011-09-10 03:26:13 +0000 |
| commit | 84e0055e8df00ff7406f424b39ce6a86f648b51f (patch) | |
| tree | 7882aa1267f9a9ea7b28f057f718cebac2a431ec /docs | |
| parent | eaea9deca849262a677fec0f0d74495bb146f691 (diff) | |
Corrected documentation inconsistencies regarding deprecation of URLField.verify_exists.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16776 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/internals/deprecation.txt | 8 | ||||
| -rw-r--r-- | docs/ref/forms/fields.txt | 6 | ||||
| -rw-r--r-- | docs/ref/models/fields.txt | 7 |
3 files changed, 10 insertions, 11 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt index 8d5baaf407..14004b034a 100644 --- a/docs/internals/deprecation.txt +++ b/docs/internals/deprecation.txt @@ -115,10 +115,6 @@ their deprecation, as per the :ref:`deprecation policy beyond that of a simple ``TextField`` since the removal of oldforms. All uses of ``XMLField`` can be replaced with ``TextField``. - * ``django.db.models.fields.URLField.verify_exists`` has been - deprecated due to intractable security and performance - issues. Validation behavior has been removed in 1.4, and the - argument will be removed in 1.5. 1.5 --- @@ -185,6 +181,10 @@ their deprecation, as per the :ref:`deprecation policy required to end with a trailing slash to ensure there is a consistent way to combine paths in templates. + * ``django.db.models.fields.URLField.verify_exists`` was deprecated in 1.4 + due to intractable security and performance issues. The argument will be + removed in 1.5. + 1.6 --- diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt index 437610384e..33aa62bffb 100644 --- a/docs/ref/forms/fields.txt +++ b/docs/ref/forms/fields.txt @@ -799,10 +799,10 @@ Takes the following optional arguments: If ``True``, the validator will attempt to load the given URL, raising ``ValidationError`` if the page gives a 404. Defaults to ``False``. -.. deprecated:: 1.3.1 +.. deprecated:: 1.4 - ``verify_exists`` was deprecated for security reasons and will be - removed in 1.4. This deprecation also removes ``validator_user_agent``. + ``verify_exists`` was deprecated for security reasons and will be removed in + Django 1.5. This deprecation also removes ``validator_user_agent``. .. attribute:: URLField.validator_user_agent diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt index 8b5c0db7f5..cc89142b4d 100644 --- a/docs/ref/models/fields.txt +++ b/docs/ref/models/fields.txt @@ -876,11 +876,10 @@ shortcuts. A :class:`CharField` for a URL. Has one extra optional argument: -.. deprecated:: 1.3.1 +.. deprecated:: 1.4 - ``verify_exists`` is deprecated for security reasons as of 1.3.1 - and will be removed in 1.4. Prior to 1.3.1, the default value was - ``True``. + ``verify_exists`` is deprecated for security reasons as of 1.4 and will be + removed in Django 1.5. Prior to 1.3.1, the default value was ``True``. .. attribute:: URLField.verify_exists |