Author: carljm
Date: 2011-09-09 20:26:13 -0700 (Fri, 09 Sep 2011)
New Revision: 16776

Modified:
   django/trunk/docs/internals/deprecation.txt
   django/trunk/docs/ref/forms/fields.txt
   django/trunk/docs/ref/models/fields.txt
Log:
Corrected documentation inconsistencies regarding deprecation of 
URLField.verify_exists.

Modified: django/trunk/docs/internals/deprecation.txt
===================================================================
--- django/trunk/docs/internals/deprecation.txt 2011-09-10 03:04:30 UTC (rev 
16775)
+++ django/trunk/docs/internals/deprecation.txt 2011-09-10 03:26:13 UTC (rev 
16776)
@@ -115,10 +115,6 @@
       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 @@
       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
 ---
 

Modified: django/trunk/docs/ref/forms/fields.txt
===================================================================
--- django/trunk/docs/ref/forms/fields.txt      2011-09-10 03:04:30 UTC (rev 
16775)
+++ django/trunk/docs/ref/forms/fields.txt      2011-09-10 03:26:13 UTC (rev 
16776)
@@ -799,10 +799,10 @@
     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
 

Modified: django/trunk/docs/ref/models/fields.txt
===================================================================
--- django/trunk/docs/ref/models/fields.txt     2011-09-10 03:04:30 UTC (rev 
16775)
+++ django/trunk/docs/ref/models/fields.txt     2011-09-10 03:26:13 UTC (rev 
16776)
@@ -876,11 +876,10 @@
 
 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
 

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to