Commit 84e0055e authored by Carl Meyer's avatar Carl Meyer
Browse files

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
parent eaea9dec

docs/internals/deprecation.txt

+4 −4
Original line number Diff line number Diff line
@@ -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

---

docs/ref/forms/fields.txt

+3 −3
Original line number Diff line number Diff line
@@ -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

docs/ref/models/fields.txt

+3 −4
Original line number Diff line number Diff line
@@ -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