diff --git a/docs/howto/custom-management-commands.txt b/docs/howto/custom-management-commands.txt index 42dd4bfc06..bbbd31af6c 100644 --- a/docs/howto/custom-management-commands.txt +++ b/docs/howto/custom-management-commands.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 ------- diff --git a/docs/howto/legacy-databases.txt b/docs/howto/legacy-databases.txt index a3a0bfc747..285f845f4d 100644 --- a/docs/howto/legacy-databases.txt +++ b/docs/howto/legacy-databases.txt @@ -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 ============================== diff --git a/docs/ref/class-based-views/base.txt b/docs/ref/class-based-views/base.txt index 7b627d3d44..fb98f9d80e 100644 --- a/docs/ref/class-based-views/base.txt +++ b/docs/ref/class-based-views/base.txt @@ -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. diff --git a/docs/ref/class-based-views/mixins-editing.txt b/docs/ref/class-based-views/mixins-editing.txt index cfa343c937..7a315ad7a3 100644 --- a/docs/ref/class-based-views/mixins-editing.txt +++ b/docs/ref/class-based-views/mixins-editing.txt @@ -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() diff --git a/docs/ref/class-based-views/mixins-multiple-object.txt b/docs/ref/class-based-views/mixins-multiple-object.txt index 160237f4e2..b3de1a7a94 100644 --- a/docs/ref/class-based-views/mixins-multiple-object.txt +++ b/docs/ref/class-based-views/mixins-multiple-object.txt @@ -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`. diff --git a/docs/ref/clickjacking.txt b/docs/ref/clickjacking.txt index bb50f97f08..5ce26ba43b 100644 --- a/docs/ref/clickjacking.txt +++ b/docs/ref/clickjacking.txt @@ -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`` diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt index 6df99742b6..7ebe90060b 100644 --- a/docs/ref/contrib/admin/index.txt +++ b/docs/ref/contrib/admin/index.txt @@ -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-`` on each ```` 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[0-9A-Za-z_\-]+)/(?P.+)/$', '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). diff --git a/docs/ref/contrib/auth.txt b/docs/ref/contrib/auth.txt index 34dcb010d5..534edb1f09 100644 --- a/docs/ref/contrib/auth.txt +++ b/docs/ref/contrib/auth.txt @@ -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 diff --git a/docs/ref/contrib/contenttypes.txt b/docs/ref/contrib/contenttypes.txt index ee4f7f1318..ccb9ccaa8e 100644 --- a/docs/ref/contrib/contenttypes.txt +++ b/docs/ref/contrib/contenttypes.txt @@ -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 diff --git a/docs/ref/contrib/formtools/form-wizard.txt b/docs/ref/contrib/formtools/form-wizard.txt index 1506b3c189..2934893776 100644 --- a/docs/ref/contrib/formtools/form-wizard.txt +++ b/docs/ref/contrib/formtools/form-wizard.txt @@ -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``. diff --git a/docs/ref/contrib/gis/forms-api.txt b/docs/ref/contrib/gis/forms-api.txt index c689f3df64..9ef33e03db 100644 --- a/docs/ref/contrib/gis/forms-api.txt +++ b/docs/ref/contrib/gis/forms-api.txt @@ -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`_. diff --git a/docs/ref/contrib/messages.txt b/docs/ref/contrib/messages.txt index 487e1dd86c..a020efe1e9 100644 --- a/docs/ref/contrib/messages.txt +++ b/docs/ref/contrib/messages.txt @@ -354,8 +354,6 @@ example:: Adding messages in Class Based Views ------------------------------------ -.. versionadded:: 1.6 - .. class:: views.SuccessMessageMixin Adds a success message attribute to diff --git a/docs/ref/contrib/sites.txt b/docs/ref/contrib/sites.txt index 7d1aa4adbf..3e330a0f70 100644 --- a/docs/ref/contrib/sites.txt +++ b/docs/ref/contrib/sites.txt @@ -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` diff --git a/docs/ref/contrib/syndication.txt b/docs/ref/contrib/syndication.txt index 277e51c71e..61adfef35d 100644 --- a/docs/ref/contrib/syndication.txt +++ b/docs/ref/contrib/syndication.txt @@ -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 diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index f2ed1c6b7a..c6fde68a1a 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -19,8 +19,6 @@ General notes Persistent connections ---------------------- -.. versionadded:: 1.6 - Persistent connections avoid the overhead of re-establishing a connection to the database in each request. They're controlled by the :setting:`CONN_MAX_AGE` parameter which defines the maximum lifetime of a @@ -114,34 +112,11 @@ will do some additional queries to set these parameters. .. _ALTER ROLE: http://www.postgresql.org/docs/current/interactive/sql-alterrole.html -.. _postgresql-autocommit-mode: - -Autocommit mode ---------------- - -.. versionchanged:: 1.6 - -In previous versions of Django, database-level autocommit could be enabled by -setting the ``autocommit`` key in the :setting:`OPTIONS` part of your database -configuration in :setting:`DATABASES`:: - - DATABASES = { - # ... - 'OPTIONS': { - 'autocommit': True, - }, - } - -Since Django 1.6, autocommit is turned on by default. This configuration is -ignored and can be safely removed. - .. _database-isolation-level: Isolation level --------------- -.. versionadded:: 1.6 - Like PostgreSQL itself, Django defaults to the ``READ COMMITTED`` `isolation level`_. If you need a higher isolation level such as ``REPEATABLE READ`` or ``SERIALIZABLE``, set it in the :setting:`OPTIONS` part of your database diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 2daca51382..ca418681d0 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -144,10 +144,6 @@ Example usage:: django-admin.py compilemessages -l pt_BR django-admin.py compilemessages -l pt_BR -l fr -.. versionchanged:: 1.6 - - Added the ability to specify multiple locales. - createcachetable ---------------- @@ -203,10 +199,6 @@ example, the default settings don't define :setting:`ROOT_URLCONF`, so The :djadminopt:`--all` option may be provided to display all settings, even if they have Django's default value. Such settings are prefixed by ``"###"``. -.. versionadded:: 1.6 - - The :djadminopt:`--all` option was added. - dumpdata -------------------------------------------------- @@ -278,8 +270,6 @@ Use :ref:`natural keys ` to represent any foreign key and many-to-many relationship with a model that provides a natural key definition. -.. versionadded:: 1.6 - .. django-admin-option:: --pks By default, ``dumpdata`` will output all the records of the model, but @@ -363,11 +353,6 @@ access to your precious data on a model by model basis. The :djadminopt:`--database` option may be used to specify the database to introspect. -.. versionchanged:: 1.6 - - The behavior by which introspected models are created as unmanaged ones is new - in Django 1.6. - loaddata ------------------------------ @@ -565,10 +550,6 @@ Example usage:: django-admin.py makemessages -l pt_BR django-admin.py makemessages -l pt_BR -l fr -.. versionchanged:: 1.6 - - Added the ability to specify multiple locales. - .. versionchanged:: 1.7 Added the ``--previous`` option to the ``msgmerge`` command when merging @@ -620,8 +601,6 @@ for technically skilled translators to understand each message's context. .. django-admin-option:: --keep-pot -.. versionadded:: 1.6 - Use the ``--keep-pot`` option to prevent Django from deleting the temporary .pot files it generates before creating the .po file. This is useful for debugging errors which may prevent the final language files from being created. @@ -977,10 +956,6 @@ behavior you can use the ``--no-startup`` option. e.g.:: django-admin.py shell --plain --no-startup -.. versionadded:: 1.6 - - The ``--no-startup`` option was added in Django 1.6. - sql ----------------------------- @@ -1043,8 +1018,6 @@ sqldropindexes .. django-admin:: sqldropindexes -.. versionadded:: 1.6 - Prints the DROP INDEX SQL statements for the given app name(s). The :djadminopt:`--database` option can be used to specify the database for @@ -1510,11 +1483,6 @@ By default, ``django-admin.py`` will show a simple error message whenever an for any other exception. If you specify ``--traceback``, ``django-admin.py`` will also output a full stack trace when a ``CommandError`` is raised. -.. versionchanged:: 1.6 - - Previously, Django didn't show a full stack trace by default for exceptions - other than ``CommandError``. - .. django-admin-option:: --verbosity Example usage:: diff --git a/docs/ref/exceptions.txt b/docs/ref/exceptions.txt index 18b77fdd71..6d545bfc13 100644 --- a/docs/ref/exceptions.txt +++ b/docs/ref/exceptions.txt @@ -187,11 +187,6 @@ information provided. (Note that this attribute is available under both Python 2 and Python 3, although :pep:`3134` normally only applies to Python 3.) -.. versionchanged:: 1.6 - - Previous versions of Django only wrapped ``DatabaseError`` and - ``IntegrityError``, and did not provide ``__cause__``. - .. exception:: models.ProtectedError Raised to prevent deletion of referenced objects when using diff --git a/docs/ref/forms/api.txt b/docs/ref/forms/api.txt index 53e47ed0c2..f2136b202d 100644 --- a/docs/ref/forms/api.txt +++ b/docs/ref/forms/api.txt @@ -623,10 +623,6 @@ By default, ``auto_id`` is set to the string ``'id_%s'``. A translatable string (defaults to a colon (``:``) in English) that will be appended after any label name when a form is rendered. -.. versionchanged:: 1.6 - - The default ``label_suffix`` is translatable. - It's possible to customize that character, or omit it entirely, using the ``label_suffix`` parameter:: @@ -647,8 +643,6 @@ Note that the label suffix is added only if the last character of the label isn't a punctuation character (in English, those are ``.``, ``!``, ``?`` or ``:``). -.. versionadded:: 1.6 - You can also customize the ``label_suffix`` on a per-field basis using the ``label_suffix`` parameter to :meth:`~django.forms.BoundField.label_tag`. @@ -795,18 +789,13 @@ Optionally, you can provide the ``contents`` parameter which will replace the auto-generated label tag. An optional ``attrs`` dictionary may contain additional attributes for the ``