Permalink
Browse files

Removed versionadded/changed annotations for 1.6.

  • Loading branch information...
1 parent ec08d62 commit 51c8045145b29fed604f716d4d17958aa803b5ea @timgraham timgraham committed Mar 24, 2014
Showing with 70 additions and 550 deletions.
  1. +0 −4 docs/howto/custom-management-commands.txt
  2. +0 −5 docs/howto/legacy-databases.txt
  3. +0 −6 docs/ref/class-based-views/base.txt
  4. +4 −10 docs/ref/class-based-views/mixins-editing.txt
  5. +0 −4 docs/ref/class-based-views/mixins-multiple-object.txt
  6. +2 −4 docs/ref/clickjacking.txt
  7. +1 −38 docs/ref/contrib/admin/index.txt
  8. +0 −11 docs/ref/contrib/auth.txt
  9. +3 −7 docs/ref/contrib/contenttypes.txt
  10. +0 −8 docs/ref/contrib/formtools/form-wizard.txt
  11. +0 −2 docs/ref/contrib/gis/forms-api.txt
  12. +0 −2 docs/ref/contrib/messages.txt
  13. +0 −4 docs/ref/contrib/sites.txt
  14. +0 −2 docs/ref/contrib/syndication.txt
  15. +0 −25 docs/ref/databases.txt
  16. +0 −32 docs/ref/django-admin.txt
  17. +0 −5 docs/ref/exceptions.txt
  18. +7 −18 docs/ref/forms/api.txt
  19. +5 −10 docs/ref/forms/fields.txt
  20. +0 −4 docs/ref/forms/formsets.txt
  21. +0 −10 docs/ref/forms/models.txt
  22. +0 −2 docs/ref/forms/validation.txt
  23. +4 −14 docs/ref/forms/widgets.txt
  24. +0 −24 docs/ref/middleware.txt
  25. +2 −14 docs/ref/models/fields.txt
  26. +10 −18 docs/ref/models/instances.txt
  27. +1 −3 docs/ref/models/options.txt
  28. +1 −29 docs/ref/models/querysets.txt
  29. +0 −8 docs/ref/request-response.txt
  30. +0 −18 docs/ref/settings.txt
  31. +2 −6 docs/ref/templates/builtins.txt
  32. +0 −2 docs/ref/urls.txt
  33. +0 −9 docs/ref/utils.txt
  34. +5 −7 docs/releases/1.3.txt
  35. +2 −2 docs/releases/1.6.txt
  36. +4 −21 docs/topics/auth/customizing.txt
  37. +0 −16 docs/topics/auth/default.txt
  38. +2 −11 docs/topics/auth/passwords.txt
  39. +0 −5 docs/topics/cache.txt
  40. +0 −4 docs/topics/db/managers.txt
  41. +0 −14 docs/topics/db/sql.txt
  42. +4 −31 docs/topics/db/transactions.txt
  43. +0 −14 docs/topics/forms/formsets.txt
  44. +4 −7 docs/topics/forms/index.txt
  45. +2 −12 docs/topics/forms/modelforms.txt
  46. +2 −2 docs/topics/http/middleware.txt
  47. +0 −2 docs/topics/http/sessions.txt
  48. +0 −2 docs/topics/http/views.txt
  49. +0 −2 docs/topics/i18n/translation.txt
  50. +0 −2 docs/topics/logging.txt
  51. +0 −5 docs/topics/serialization.txt
  52. +0 −4 docs/topics/testing/advanced.txt
  53. +0 −15 docs/topics/testing/overview.txt
  54. +3 −14 docs/topics/testing/tools.txt
@@ -269,10 +269,6 @@ All attributes can be set in your derived class and can be used in
because attempting to set the locale needs access to settings. This condition
will generate a :class:`CommandError`.
-.. versionadded:: 1.6
-
- The ``leave_locale_alone`` option was added in Django 1.6.
-
Methods
-------
@@ -74,11 +74,6 @@ with Django you'd need to change the ``managed`` option highlighted above to
This serves as an explicit opt-in to give your nascent Django project write
access to your precious data on a model by model basis.
-.. versionchanged:: 1.6
-
- The behavior by which introspected models are created as unmanaged ones is new
- in Django 1.6.
-
Install the core Django tables
==============================
@@ -213,8 +213,6 @@ RedirectView
.. attribute:: pattern_name
- .. versionadded:: 1.6
-
The name of the URL pattern to redirect to. Reversing will be done
using the same args and kwargs as are passed in for this view.
@@ -238,10 +236,6 @@ RedirectView
Constructs the target URL for redirection.
- .. versionchanged:: 1.6
-
- The signature of this method was changed to include ``*args``.
-
The default implementation uses :attr:`url` as a starting
string and performs expansion of ``%`` named parameters in that string
using the named groups captured in the URL.
@@ -37,8 +37,6 @@ FormMixin
.. attribute:: prefix
- .. versionadded:: 1.6
-
The :attr:`~django.forms.Form.prefix` for the generated form.
.. method:: get_initial()
@@ -66,8 +64,6 @@ FormMixin
.. method:: get_prefix()
- .. versionadded:: 1.6
-
Determine the :attr:`~django.forms.Form.prefix` for the generated form.
Returns :attr:`~django.views.generic.edit.FormMixin.prefix` by default.
@@ -234,12 +230,10 @@ DeletionMixin
The url to redirect to when the nominated object has been
successfully deleted.
- .. versionadded:: 1.6
-
- ``success_url`` may contain dictionary string formatting, which
- will be interpolated against the object's field attributes. For
- example, you could use ``success_url="/parent/%(parent_id)s/"`` to
- redirect to a URL composed out of the ``parent_id`` field on a model.
+ ``success_url`` may contain dictionary string formatting, which will be
+ interpolated against the object's field attributes. For example, you
+ could use ``success_url="/parent/%(parent_id)s/"`` to redirect to a URL
+ composed out of the ``parent_id`` field on a model.
.. method:: get_success_url()
@@ -81,8 +81,6 @@ MultipleObjectMixin
.. attribute:: paginate_orphans
- .. versionadded:: 1.6
-
An integer specifying the number of "overflow" objects the last page
can contain. This extends the :attr:`paginate_by` limit on the last
page by up to ``paginate_orphans``, in order to keep the last page from
@@ -135,8 +133,6 @@ MultipleObjectMixin
.. method:: get_paginate_orphans()
- .. versionadded:: 1.6
-
An integer specifying the number of "overflow" objects the last page
can contain. By default this simply returns the value of
:attr:`paginate_orphans`.
@@ -61,10 +61,8 @@ To set the same ``X-Frame-Options`` value for all responses in your site, put
...
)
-.. versionchanged:: 1.6
-
- This middleware is enabled in the settings file generated by
- :djadmin:`startproject`.
+This middleware is enabled in the settings file generated by
+:djadmin:`startproject`.
By default, the middleware will set the ``X-Frame-Options`` header to
``SAMEORIGIN`` for every outgoing ``HttpResponse``. If you want ``DENY``
@@ -17,10 +17,6 @@ Overview
The admin is enabled in the default project template used by
:djadmin:`startproject`.
-.. versionchanged:: 1.6
-
- In previous versions, the admin wasn't enabled by default.
-
For reference, here are the requirements:
1. Add ``'django.contrib.admin'`` to your :setting:`INSTALLED_APPS` setting.
@@ -419,8 +415,6 @@ subclass::
.. admonition:: Note
- .. versionchanged:: 1.6
-
If you define the ``Meta.model`` attribute on a
:class:`~django.forms.ModelForm`, you must also define the
``Meta.fields`` attribute (or the ``Meta.exclude`` attribute). However,
@@ -693,9 +687,7 @@ subclass::
list_display = ('full_name',)
- * .. versionadded:: 1.6
-
- The field names in ``list_display`` will also appear as CSS classes in
+ * The field names in ``list_display`` will also appear as CSS classes in
the HTML output, in the form of ``column-<field_name>`` on each ``<th>``
element. This can be used to set column widths in a CSS file for example.
@@ -918,8 +910,6 @@ subclass::
the list of objects on the admin change list page. This can save you a
bunch of database queries.
- .. versionchanged:: 1.6
-
The value should be either a boolean, a list or a tuple. Default is
``False``.
@@ -978,8 +968,6 @@ subclass::
.. attribute:: ModelAdmin.preserve_filters
- .. versionadded:: 1.6
-
The admin now preserves filters on the list view after creating, editing
or deleting an object. You can restore the previous behavior of clearing
filters by setting this attribute to ``False``.
@@ -1286,8 +1274,6 @@ templates used by the :class:`ModelAdmin` views:
.. method:: ModelAdmin.get_search_results(request, queryset, search_term)
- .. versionadded:: 1.6
-
The ``get_search_results`` method modifies the list of objects displayed in
to those that match the provided search term. It accepts the request, a
queryset that applies the current filters, and the user-provided search term.
@@ -1598,8 +1584,6 @@ templates used by the :class:`ModelAdmin` views:
.. admonition:: Note
- .. versionchanged:: 1.6
-
If you define the ``Meta.model`` attribute on a
:class:`~django.forms.ModelForm`, you must also define the
``Meta.fields`` attribute (or the ``Meta.exclude`` attribute). However,
@@ -1659,10 +1643,6 @@ templates used by the :class:`ModelAdmin` views:
return qs
return qs.filter(author=request.user)
- .. versionchanged:: 1.6
-
- The ``get_queryset`` method was previously named ``queryset``.
-
.. method:: ModelAdmin.message_user(request, message, level=messages.INFO, extra_tags='', fail_silently=False)
Sends a message to the user using the :mod:`django.contrib.messages`
@@ -1817,10 +1797,6 @@ To avoid conflicts with user-supplied scripts or libraries, Django's jQuery
in your own admin JavaScript without including a second copy, you can use the
``django.jQuery`` object on changelist and add/edit views.
-.. versionchanged:: 1.6
-
- The embedded jQuery has been upgraded from 1.4.2 to 1.9.1.
-
The :class:`ModelAdmin` class requires jQuery by default, so there is no need
to add jQuery to your ``ModelAdmin``’s list of media resources unless you have
a specific need. For example, if you require the jQuery library to be in the
@@ -1975,8 +1951,6 @@ The ``InlineModelAdmin`` class adds:
The dynamic link will not appear if the number of currently displayed forms
exceeds ``max_num``, or if the user does not have JavaScript enabled.
- .. versionadded:: 1.6
-
:meth:`InlineModelAdmin.get_extra` also allows you to customize the number
of extra forms.
@@ -1988,8 +1962,6 @@ The ``InlineModelAdmin`` class adds:
doesn't directly correlate to the number of objects, but can if the value
is small enough. See :ref:`model-formsets-max-num` for more information.
- .. versionadded:: 1.6
-
:meth:`InlineModelAdmin.get_max_num` also allows you to customize the
maximum number of extra forms.
@@ -2035,8 +2007,6 @@ The ``InlineModelAdmin`` class adds:
.. method:: InlineModelAdmin.get_extra(request, obj=None, **kwargs)
- .. versionadded:: 1.6
-
Returns the number of extra inline forms to use. By default, returns the
:attr:`InlineModelAdmin.extra` attribute.
@@ -2055,8 +2025,6 @@ The ``InlineModelAdmin`` class adds:
.. method:: InlineModelAdmin.get_max_num(request, obj=None, **kwargs)
- .. versionadded:: 1.6
-
Returns the maximum number of extra inline forms to use. By default,
returns the :attr:`InlineModelAdmin.max_num` attribute.
@@ -2551,11 +2519,6 @@ your URLconf. Specifically, add these four patterns:
url(r'^reset/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$', 'django.contrib.auth.views.password_reset_confirm', name='password_reset_confirm'),
url(r'^reset/done/$', 'django.contrib.auth.views.password_reset_complete', name='password_reset_complete'),
-.. versionchanged:: 1.6
-
- The pattern for :func:`~django.contrib.auth.views.password_reset_confirm`
- changed as the ``uid`` is now base 64 encoded.
-
(This assumes you've added the admin at ``admin/`` and requires that you put
the URLs starting with ``^admin/`` before the line that includes the admin app
itself).
View
@@ -143,23 +143,12 @@ Methods
:meth:`~django.contrib.auth.models.User.set_unusable_password()`
were used.
- .. versionchanged:: 1.6
-
- In Django 1.4 and 1.5, a blank string was unintentionally stored
- as an unusable password.
-
.. method:: check_password(raw_password)
Returns ``True`` if the given raw string is the correct password for
the user. (This takes care of the password hashing in making the
comparison.)
- .. versionchanged:: 1.6
-
- In Django 1.4 and 1.5, a blank string was unintentionally
- considered to be an unusable password, resulting in this method
- returning ``False`` for such a password.
-
.. method:: set_unusable_password()
Marks the user as having no password set. This isn't the same as
@@ -291,8 +291,6 @@ model:
.. attribute:: GenericForeignKey.for_concrete_model
- .. versionadded:: 1.6
-
If ``False``, the field will be able to reference proxy models. Default
is ``True``. This mirrors the ``for_concrete_model`` argument to
:meth:`~django.contrib.contenttypes.models.ContentTypeManager.get_for_model`.
@@ -508,11 +506,9 @@ The :mod:`django.contrib.contenttypes.forms` module provides:
:func:`~django.forms.models.modelformset_factory` and
:func:`~django.forms.models.inlineformset_factory`.
- .. versionadded:: 1.6
-
- The ``for_concrete_model`` argument corresponds to the
- :class:`~django.contrib.contenttypes.fields.GenericForeignKey.for_concrete_model`
- argument on ``GenericForeignKey``.
+ The ``for_concrete_model`` argument corresponds to the
+ :class:`~django.contrib.contenttypes.fields.GenericForeignKey.for_concrete_model`
+ argument on ``GenericForeignKey``.
.. versionchanged:: 1.7
@@ -260,8 +260,6 @@ wizard's ``as_view()`` method takes a list of your
(r'^contact/$', ContactWizard.as_view([ContactForm1, ContactForm2])),
)
-.. versionchanged:: 1.6
-
You can also pass the form list as a class attribute named ``form_list``::
class ContactWizard(WizardView):
@@ -317,8 +315,6 @@ The ``urls.py`` file would contain something like::
(r'^checkout/$', OrderWizard.as_view(FORMS, condition_dict={'cc': pay_by_credit_card})),
)
-.. versionchanged:: 1.6
-
The ``condition_dict`` can be passed as attribute for the ``as_view()`
method or as a class attribute named ``condition_dict``::
@@ -493,8 +489,6 @@ Advanced ``WizardView`` methods
.. method:: WizardView.render_goto_step(step, goto_step, **kwargs)
- .. versionadded:: 1.6
-
This method is called when the step should be changed to something else
than the next step. By default, this method just stores the requested
step ``goto_step`` in the storage and then renders the new step.
@@ -598,8 +592,6 @@ Providing initial data for the forms
The ``initial_dict`` can also take a list of dictionaries for a specific
step if the step is a ``FormSet``.
- .. versionchanged:: 1.6
-
The ``initial_dict`` can also be added as a class attribute named
``initial_dict`` to avoid having the initial data in the ``urls.py``.
@@ -7,8 +7,6 @@ GeoDjango Forms API
.. module:: django.contrib.gis.forms
:synopsis: GeoDjango forms API.
-.. versionadded:: 1.6
-
GeoDjango provides some specialized form fields and widgets in order to visually
display and edit geolocalized data on a map. By default, they use
`OpenLayers`_-powered maps, with a base WMS layer provided by `Metacarta`_.
@@ -354,8 +354,6 @@ example::
Adding messages in Class Based Views
------------------------------------
-.. versionadded:: 1.6
-
.. class:: views.SuccessMessageMixin
Adds a success message attribute to
@@ -249,10 +249,6 @@ To do this, you can use the sites framework. A simple example::
Enabling the sites framework
============================
-.. versionchanged:: 1.6
-
- In previous versions, the sites framework was enabled by default.
-
To enable the sites framework, follow these steps:
1. Add ``'django.contrib.sites'`` to your :setting:`INSTALLED_APPS`
@@ -139,8 +139,6 @@ into those elements.
.. method:: Feed.get_context_data(**kwargs)
- .. versionadded:: 1.6
-
There is also a way to pass additional information to title and description
templates, if you need to supply more than the two variables mentioned
before. You can provide your implementation of ``get_context_data`` method
Oops, something went wrong.

0 comments on commit 51c8045

Please sign in to comment.