Context Navigation

Back to Ticket #18934

Ticket #18934: 18934.diff

File 18934.diff, 49.0 KB (added by Tim Graham, 12 years ago)

docs/howto/custom-template-tags.txt

diff --git a/docs/howto/custom-template-tags.txt b/docs/howto/custom-template-tags.txt
index 5b27af8..70b6288 100644

                A few things to note about the ``simple_tag`` helper function:
 * If the argument was a template variable, our function is passed the
   current value of the variable, not the variable itself.
-.. versionadded:: 1.3
 If your template tag needs to access the current context, you can use the
 ``takes_context`` argument when registering your tag:

docs/howto/error-reporting.txt

diff --git a/docs/howto/error-reporting.txt b/docs/howto/error-reporting.txt
index 64af2a0..78e797b 100644

                setting.
 .. seealso::
-   .. versionadded:: 1.3
    Server error emails are sent using the logging framework, so you can
    customize this behavior by :doc:`customizing your logging configuration
    </topics/logging>`.
-…
+               The best way to disable this behavior is to set
 .. seealso::
-   .. versionadded:: 1.3
 errors are logged using the logging framework. By default, these log
    records are ignored, but you can use them for error reporting by writing a
    handler and :doc:`configuring logging </topics/logging>` appropriately.

docs/howto/static-files.txt

diff --git a/docs/howto/static-files.txt b/docs/howto/static-files.txt
index f8c5918..964b5fa 100644

-              a
 Managing static files
 =====================
-.. versionadded:: 1.3
 Django developers mostly concern themselves with the dynamic parts of web
 applications -- the views and templates that render anew for each request. But
 web applications have other parts: the static files (images, CSS,

docs/misc/api-stability.txt

diff --git a/docs/misc/api-stability.txt b/docs/misc/api-stability.txt
index 2839ee3..4f232e7 100644

                Certain APIs are explicitly marked as "internal" in a couple of ways:
 Local flavors
 -------------
-.. versionchanged:: 1.3
 :mod:`django.contrib.localflavor` contains assorted pieces of code
 that are useful for particular countries or cultures. This data is
 local in nature, and is subject to change on timelines that will

docs/ref/contrib/admin/index.txt

diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 66a5a2c..2aabc55 100644

                subclass::
         date_hierarchy = 'pub_date'
-    .. versionadded:: 1.3
     This will intelligently populate itself based on available data,
     e.g. if all the dates are in one month, it'll show the day-level
     drill-down only.
-…
+               subclass::
           class PersonAdmin(ModelAdmin):
               list_filter = ('is_staff', 'company')
-      .. versionadded:: 1.3
       Field names in ``list_filter`` can also span relations
       using the ``__`` lookup, for example::
-…
+               subclass::
 .. attribute:: ModelAdmin.paginator
-    .. versionadded:: 1.3
     The paginator class to be used for pagination. By default,
     :class:`django.core.paginator.Paginator` is used. If the custom paginator
     class doesn't have the same constructor interface as
-…
+               templates used by the :class:`ModelAdmin` views:
 .. method:: ModelAdmin.delete_model(self, request, obj)
-    .. versionadded:: 1.3
     The ``delete_model`` method is given the ``HttpRequest`` and a model
     instance. Use this method to do pre- or post-delete operations.
-…
+               templates used by the :class:`ModelAdmin` views:
 .. method:: ModelAdmin.get_paginator(queryset, per_page, orphans=0, allow_empty_first_page=True)
-    .. versionadded:: 1.3
     Returns an instance of the paginator to use for this view. By default,
     instantiates an instance of :attr:`paginator`.
-…
+               on your ``ModelAdmin``::
+            }
             js = ("my_code.js",)
-.. versionchanged:: 1.3
 The :doc:`staticfiles app </ref/contrib/staticfiles>` prepends
 :setting:`STATIC_URL` (or :setting:`MEDIA_URL` if :setting:`STATIC_URL` is
 ``None``) to any media paths. The same rules apply as :ref:`regular media
-…
+               adds some of its own (the shared features are actually defined in the
 - :attr:`~ModelAdmin.exclude`
 - :attr:`~ModelAdmin.filter_horizontal`
 - :attr:`~ModelAdmin.filter_vertical`
+- :attr:`~ModelAdmin.ordering`
 - :attr:`~ModelAdmin.prepopulated_fields`
+- :meth:`~ModelAdmin.queryset`
 - :attr:`~ModelAdmin.radio_fields`
 - :attr:`~ModelAdmin.readonly_fields`
 - :attr:`~InlineModelAdmin.raw_id_fields`
 - :meth:`~ModelAdmin.formfield_for_foreignkey`
 - :meth:`~ModelAdmin.formfield_for_manytomany`
-.. versionadded:: 1.3
-- :attr:`~ModelAdmin.ordering`
-- :meth:`~ModelAdmin.queryset`
 .. versionadded:: 1.4
 - :meth:`~ModelAdmin.has_add_permission`
-…
+               Templates can override or extend base admin templates as described in
 .. attribute:: AdminSite.login_form
-    .. versionadded:: 1.3
     Subclass of :class:`~django.contrib.auth.forms.AuthenticationForm` that
     will be used by the admin site login view.

docs/ref/contrib/comments/example.txt

diff --git a/docs/ref/contrib/comments/example.txt b/docs/ref/contrib/comments/example.txt
index e78d83c..2bff778 100644

                enable it in your project's ``urls.py``:
 Now you should have the latest comment feeds being served off ``/feeds/latest/``.
-.. versionchanged:: 1.3
-Prior to Django 1.3, the LatestCommentFeed was deployed using the
-syndication feed view:
-.. code-block:: python
-    from django.conf.urls import patterns
-    from django.contrib.comments.feeds import LatestCommentFeed
-    feeds = {
-        'latest': LatestCommentFeed,
+    }
-    urlpatterns = patterns('',
-    # ...
-        (r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed',
-            {'feed_dict': feeds}),
-    # ...
+    )
 Moderation
 ==========

docs/ref/contrib/comments/moderation.txt

diff --git a/docs/ref/contrib/comments/moderation.txt b/docs/ref/contrib/comments/moderation.txt
index f03c7fd..39b3ea7 100644

                Simply subclassing :class:`CommentModerator` and changing the values of these
 options will automatically enable the various moderation methods for any
 models registered using the subclass.
-.. versionchanged:: 1.3
-``moderate_after`` and ``close_after`` now accept 0 as a valid value.
 Adding custom moderation methods
 --------------------------------

docs/ref/contrib/contenttypes.txt

diff --git a/docs/ref/contrib/contenttypes.txt b/docs/ref/contrib/contenttypes.txt
index 0226435..aba6ebb 100644

                pointing at it will be deleted as well. In the example above, this means that
 if a ``Bookmark`` object were deleted, any ``TaggedItem`` objects pointing at
 it would be deleted at the same time.
-.. versionadded:: 1.3
 Unlike :class:`~django.db.models.ForeignKey`,
 :class:`~django.contrib.contenttypes.generic.GenericForeignKey` does not accept
 an :attr:`~django.db.models.ForeignKey.on_delete` argument to customize this

docs/ref/contrib/flatpages.txt

diff --git a/docs/ref/contrib/flatpages.txt b/docs/ref/contrib/flatpages.txt
index 3de4497..38cedc4 100644

                template.
 Getting a list of :class:`~django.contrib.flatpages.models.FlatPage` objects in your templates
 ==============================================================================================
-.. versionadded:: 1.3
 The flatpages app provides a template tag that allows you to iterate
 over all of the available flatpages on the :ref:`current site
 <hooking-into-current-site-from-views>`.

docs/ref/contrib/gis/geos.txt

diff --git a/docs/ref/contrib/gis/geos.txt b/docs/ref/contrib/gis/geos.txt
index f4e706d..b8fb7b4 100644

                Returns a boolean indicating whether the geometry is valid.
 .. attribute:: GEOSGeometry.valid_reason
-.. versionadded:: 1.3
 Returns a string describing the reason why a geometry is invalid.
 .. attribute:: GEOSGeometry.srid
-…
+               corresponding to the SRID of the geometry or ``None``.
 .. method:: GEOSGeometry.transform(ct, clone=False)
-.. versionchanged:: 1.3
 Transforms the geometry according to the given coordinate transformation paramter
 (``ct``), which may be an integer SRID, spatial reference WKT string,
 a PROJ.4 string, a :class:`~django.contrib.gis.gdal.SpatialReference` object, or a

docs/ref/contrib/gis/testing.txt

diff --git a/docs/ref/contrib/gis/testing.txt b/docs/ref/contrib/gis/testing.txt
index d12c884..86979f0 100644

                your settings::
 GeoDjango tests
 ===============
-.. versionchanged:: 1.3
 GeoDjango's test suite may be run in one of two ways, either by itself or
 with the rest of :ref:`Django's unit tests <running-unit-tests>`.

docs/ref/contrib/localflavor.txt

diff --git a/docs/ref/contrib/localflavor.txt b/docs/ref/contrib/localflavor.txt
index 4595f51..0d1319e 100644

                Austria (``at``)
 Belgium (``be``)
 ================
-.. versionadded:: 1.3
 .. class:: be.forms.BEPhoneNumberField
     A form field that validates input as a Belgium phone number, with one of
-…
+               Indonesia (``id``)
     A ``Select`` widget that uses a list of Indonesian provinces as its choices.
-.. versionchanged:: 1.3
-    The province "Nanggroe Aceh Darussalam (NAD)" has been removed
-    from the province list in favor of the new official designation
-    "Aceh (ACE)".
 .. class:: id.forms.IDPhoneNumberField
     A form field that validates input as an Indonesian telephone number.

docs/ref/contrib/sitemaps.txt

diff --git a/docs/ref/contrib/sitemaps.txt b/docs/ref/contrib/sitemaps.txt
index 2393a4a..ef6c64d 100644

                with a caching decorator -- you must name your sitemap view and pass
 Template customization
 ======================
-.. versionadded:: 1.3
 If you wish to use a different template for each sitemap or sitemap index
 available on your site, you may specify it by passing a ``template_name``
 parameter to the ``sitemap`` and ``index`` views via the URLconf::

docs/ref/contrib/sites.txt

diff --git a/docs/ref/contrib/sites.txt b/docs/ref/contrib/sites.txt
index 8fc434b..8bb7b27 100644

                the :class:`~django.contrib.sites.models.Site` model's manager has a
         else:
             # Do something else.
-.. versionchanged:: 1.3
 For code which relies on getting the current domain but cannot be certain
 that the sites framework will be installed for any given project, there is a
 utility function :func:`~django.contrib.sites.models.get_current_site` that
-…
+               the sites framework is installed) or a RequestSite instance (if it is not).
 This allows loose coupling with the sites framework and provides a usable
 fallback for cases where it is not installed.
-.. versionadded:: 1.3
 .. function:: get_current_site(request)
     Checks if contrib.sites is installed and returns either the current
     :class:`~django.contrib.sites.models.Site` object or a
+    :class:`~django.contrib.sites.models.Site` object or a
     :class:`~django.contrib.sites.models.RequestSite` object based on
     the request.
-…
+               fallback when the database-backed sites framework is not available.
         Sets the ``name`` and ``domain`` attributes to the value of
         :meth:`~django.http.HttpRequest.get_host`.
 A :class:`~django.contrib.sites.models.RequestSite` object has a similar
 interface to a normal :class:`~django.contrib.sites.models.Site` object, except

docs/ref/contrib/staticfiles.txt

diff --git a/docs/ref/contrib/staticfiles.txt b/docs/ref/contrib/staticfiles.txt
index cbe8ad5..3a74797 100644

                The staticfiles app
 .. module:: django.contrib.staticfiles
    :synopsis: An app for handling static files.
-.. versionadded:: 1.3
 ``django.contrib.staticfiles`` collects static files from each of your
 applications (and any other places you specify) into a single location that
 can easily be served in production.

docs/ref/django-admin.txt

diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 5ff7ecb..b606bd3 100644

                records to dump. If you're using a :ref:`custom manager <custom-managers>` as
 the default manager and it filters some of the available records, not all of the
 objects will be dumped.
-.. versionadded:: 1.3
 The :djadminopt:`--all` option may be provided to specify that
 ``dumpdata`` should use Django's base manager, dumping records which
 might otherwise be filtered or modified by a custom manager.
-…
+               pretty-print the output with a number of indentation spaces.
 The :djadminopt:`--exclude` option may be provided to prevent specific
 applications from being dumped.
-.. versionadded:: 1.3
 The :djadminopt:`--exclude` option may also be provided to prevent specific
 models (specified as in the form of ``appname.ModelName``) from being dumped.
-…
+               Use the ``--no-default-ignore`` option to disable the default values of
 .. django-admin-option:: --no-wrap
-.. versionadded:: 1.3
 Use the ``--no-wrap`` option to disable breaking long message lines into
 several lines in language files.
-…
+               machines on your network. To make your development server viewable to other
 machines on the network, use its own IP address (e.g. ``192.168.2.1``) or
 ``0.0.0.0`` or ``::`` (with IPv6 enabled).
-.. versionchanged:: 1.3
 You can provide an IPv6 address surrounded by brackets
 (e.g. ``[200a::1]:8000``). This will automatically enable IPv6 support.
 A hostname containing ASCII-only characters can also be used.
-.. versionchanged:: 1.3
 If the :doc:`staticfiles</ref/contrib/staticfiles>` contrib app is enabled
 (default in new projects) the :djadmin:`runserver` command will be overriden
 with an own :djadmin:`runserver<staticfiles-runserver>` command.
-…
+               development server.
 .. django-admin-option:: --ipv6, -6
-.. versionadded:: 1.3
 Use the ``--ipv6`` (or shorter ``-6``) option to tell Django to use IPv6 for
 the development server. This changes the default IP address from
 ``127.0.0.1`` to ``::1``.
-…
+               To run on 1.2.3.4:7000 with a ``test`` fixture::
     django-admin.py testserver --addrport 1.2.3.4:7000 test
-.. versionadded:: 1.3
 The :djadminopt:`--noinput` option may be provided to suppress all user
 prompts.

docs/ref/files/storage.txt

diff --git a/docs/ref/files/storage.txt b/docs/ref/files/storage.txt
index b3f8909..f9bcf9b 100644

                Django provides two convenient ways to access the current storage class:
 .. function:: get_storage_class([import_path=None])
     Returns a class or module which implements the storage API.
     When called without the ``import_path`` parameter ``get_storage_class``
     will return the current default storage system as defined by
     :setting:`DEFAULT_FILE_STORAGE`. If ``import_path`` is provided,
-…
+               The FileSystemStorage Class
     basic file storage on a local filesystem. It inherits from
     :class:`~django.core.files.storage.Storage` and provides implementations
     for all the public methods thereof.
     .. note::
         The :class:`FileSystemStorage.delete` method will not raise
         raise an exception if the given file name does not exist.
-…
+               The Storage Class
     .. method:: accessed_time(name)
-        .. versionadded:: 1.3
         Returns a ``datetime`` object containing the last accessed time of the
         file. For storage systems that aren't able to return the last accessed
         time this will raise ``NotImplementedError`` instead.
     .. method:: created_time(name)
-        .. versionadded:: 1.3
         Returns a ``datetime`` object containing the creation time of the file.
         For storage systems that aren't able to return the creation time this
         will raise ``NotImplementedError`` instead.
-…
+               The Storage Class
     .. method:: modified_time(name)
-        .. versionadded:: 1.3
         Returns a ``datetime`` object containing the last modified time. For
         storage systems that aren't able to return the last modified time, this
         will raise ``NotImplementedError`` instead.

docs/ref/forms/api.txt

diff --git a/docs/ref/forms/api.txt b/docs/ref/forms/api.txt
index 777d73e..2323425 100644

                those classes as an argument::
 .. method:: BoundField.value()
-   .. versionadded:: 1.3
 Use this method to render the raw value of this field as it would be rendered
 by a ``Widget``::

docs/ref/forms/fields.txt

diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt
index 2a8f449..98c8a81 100644

                For each field, we describe the default widget used if you don't specify
 ``TypedMultipleChoiceField``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.. versionadded:: 1.3
 .. class:: TypedMultipleChoiceField(**kwargs)
     Just like a :class:`MultipleChoiceField`, except :class:`TypedMultipleChoiceField`

docs/ref/forms/widgets.txt

diff --git a/docs/ref/forms/widgets.txt b/docs/ref/forms/widgets.txt
index eab314a..34be52b 100644

                commonly used groups of widgets:
         Determines whether the widget will have a value filled in when the
         form is re-displayed after a validation error (default is ``False``).
-        .. versionchanged:: 1.3
-            The default value for
-            :attr:`~PasswordInput.render_value` was
-            changed from ``True`` to ``False``
 ``HiddenInput``
 ~~~~~~~~~~~~~~~
-…
+               commonly used groups of widgets:
 .. class:: ClearableFileInput
-    .. versionadded:: 1.3
     File upload input: ``<input type='file' ...>``, with an additional checkbox
     input to clear the field's value, if the field is not required and has
     initial data.

docs/ref/models/fields.txt

diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt
index 8b3c31f..384e226 100644

                define the details of how the relation works.
     The field on the related object that the relation is to. By default, Django
     uses the primary key of the related object.
-.. versionadded:: 1.3
 .. attribute:: ForeignKey.on_delete
     When an object referenced by a :class:`ForeignKey` is deleted, Django by

docs/ref/models/querysets.txt

diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index 80b3158..39c9f01 100644

                followed (optionally) by any output-affecting methods (such as ``values()``),
 but it doesn't really matter. This is your chance to really flaunt your
 individualism.
+.. versionchanged:: 1.3
+The ``values()`` method previously did not return anything for
+:class:`~django.db.models.ManyToManyField` attributes and would raise an error
+if you tried to pass this type of field to it.
+This restriction has been lifted, and you can now also refer to fields on
+related models with reverse relations through ``OneToOneField``, ``ForeignKey``
+and ``ManyToManyField`` attributes::
+You can also refer to fields on related models with reverse relations through
+``OneToOneField``, ``ForeignKey`` and ``ManyToManyField`` attributes::
     Blog.objects.values('name', 'entry__headline')
     [{'name': 'My blog', 'entry__headline': 'An entry'},
-…
+               For example::
     # This will delete all Blogs and all of their Entry objects.
     blogs.delete()
+.. versionadded:: 1.3
+    This cascade behavior is customizable via the
+    :attr:`~django.db.models.ForeignKey.on_delete` argument to the
+    :class:`~django.db.models.ForeignKey`.
+This cascade behavior is customizable via the
+:attr:`~django.db.models.ForeignKey.on_delete` argument to the
+:class:`~django.db.models.ForeignKey`.
 The ``delete()`` method does a bulk delete and does not call any ``delete()``
 methods on your models. It does, however, emit the

docs/ref/request-response.txt

diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt
index 21e99de..cc2a351 100644

                All attributes should be considered read-only, unless stated otherwise below.
     data in different ways than conventional HTML forms: binary images,
     XML payload etc. For processing conventional form data, use ``HttpRequest.POST``.
-    .. versionadded:: 1.3
     You can also read from an HttpRequest using a file-like interface. See
     :meth:`HttpRequest.read()`.
-…
+               Methods
 .. method:: HttpRequest.xreadlines()
 .. method:: HttpRequest.__iter__()
-    .. versionadded:: 1.3
     Methods implementing a file-like interface for reading from an
     HttpRequest instance. This makes it possible to consume an incoming
     request in a streaming fashion. A common use-case would be to process a
-…
+               In addition, ``QueryDict`` has the following methods:
         >>> q.urlencode()
         'a=2&b=3&b=5'
-    .. versionchanged:: 1.3
-       The ``safe`` parameter was added.
     Optionally, urlencode can be passed characters which
     do not require encoding. For example::
-…
+               Methods
 .. method:: HttpResponse.set_cookie(key, value='', max_age=None, expires=None, path='/', domain=None, secure=None, httponly=True)
-    .. versionchanged:: 1.3
-    The possibility of specifying a ``datetime.datetime`` object in
-    ``expires``, and the auto-calculation of ``max_age`` in such case
-    was added. The ``httponly`` argument was also added.
     .. versionchanged:: 1.4
     The default value for httponly was changed from ``False`` to ``True``.

docs/ref/settings.txt

diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index f443138..ec48d08 100644

                The site-specific user profile model used by this site. See
 CACHES
 ------
-.. versionadded:: 1.3
 Default::
+    {
-…
+               Only supported for the ``mysql`` backend (see the `MySQL manual`_ for details).
 TEST_DEPENDENCIES
 ~~~~~~~~~~~~~~~~~
-.. versionadded:: 1.3
 Default: ``['default']``, for all databases other than ``default``,
 which has no dependencies.
-…
+               the ``locale`` directory (i.e. ``'/path/to/locale'``).
 LOGGING
 -------
-.. versionadded:: 1.3
 Default: A logging configuration dictionary.
 A data structure containing configuration information. The contents of
-…
+               email log handler; all other log messages are given to a NullHandler.
 LOGGING_CONFIG
 --------------
-.. versionadded:: 1.3
 Default: ``'django.utils.log.dictConfig'``
 A path to a callable that will be used to configure logging in the
-…
+               MEDIA_URL
 Default: ``''`` (Empty string)
 URL that handles the media served from :setting:`MEDIA_ROOT`, used
+for :doc:`managing stored files </topics/files>`.
+for :doc:`managing stored files </topics/files>`. It must end in a slash if set
+to a non-empty value.
 Example: ``"http://media.example.com/"``
-.. versionchanged:: 1.3
-   It must end in a slash if set to a non-empty value.
 MESSAGE_LEVEL
 -------------
-…
+               A tuple of callables that are used to populate the context in ``RequestContext``
 These callables take a request object as their argument and return a dictionary
 of items to be merged into the context.
-.. versionadded:: 1.3
-    The ``django.core.context_processors.static`` context processor
-    was added in this release.
 .. versionadded:: 1.4
     The ``django.core.context_processors.tz`` context processor
     was added in this release.
-…
+               See also :setting:`TIME_ZONE`, :setting:`USE_I18N` and :setting:`USE_L10N`.
 USE_X_FORWARDED_HOST
 --------------------
-.. versionadded:: 1.3.1
 Default: ``False``
 A boolean that specifies whether to use the X-Forwarded-Host header in

docs/ref/signals.txt

diff --git a/docs/ref/signals.txt b/docs/ref/signals.txt
index b2f2e85..f96ef30 100644

                Arguments sent with this signal:
     records in the database as the database might not be in a
     consistent state yet.
-.. versionadded:: 1.3
 ``using``
     The database alias being used.
-…
+               Arguments sent with this signal:
     records in the database as the database might not be in a
     consistent state yet.
-.. versionadded:: 1.3
 ``using``
     The database alias being used.
-…
+               Arguments sent with this signal:
 ``instance``
     The actual instance being deleted.
-.. versionadded:: 1.3
 ``using``
     The database alias being used.
-…
+               Arguments sent with this signal:
     Note that the object will no longer be in the database, so be very
     careful what you do with this instance.
-.. versionadded:: 1.3
 ``using``
     The database alias being used.
-…
+               Arguments sent with this signal:
     For the ``pre_clear`` and ``post_clear`` actions, this is ``None``.
-.. versionadded:: 1.3
 ``using``
     The database alias being used.

docs/ref/template-response.txt

diff --git a/docs/ref/template-response.txt b/docs/ref/template-response.txt
index 9e09077..d9b7130 100644

-              a
 TemplateResponse and SimpleTemplateResponse
 ===========================================
-.. versionadded:: 1.3
 .. module:: django.template.response
    :synopsis: Classes dealing with lazy-rendered HTTP responses.

docs/ref/templates/api.txt

diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt
index 48bd346..f29d2ac 100644

                it. Example::
     >>> t.render(Context({"person": PersonClass2}))
     "My name is Samantha."
-.. versionchanged:: 1.3
-    Previously, only variables that originated with an attribute lookup would
-    be called by the template system. This change was made for consistency
-    across lookup types.
 Callable variables are slightly more complex than variables which only require
 straight lookups. Here are some things to keep in mind:
-…
+               If :setting:`TEMPLATE_CONTEXT_PROCESSORS` contains this processor, every
   ``django.contrib.auth.context_processors.PermWrapper``, representing the
   permissions that the currently logged-in user has.
-.. versionchanged:: 1.3
-    Prior to version 1.3, ``PermWrapper`` was located in
-    ``django.contrib.auth.context_processors``.
 django.core.context_processors.debug
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-…
+               django.core.context_processors.static
 .. function:: django.core.context_processors.static
-.. versionadded:: 1.3
 If :setting:`TEMPLATE_CONTEXT_PROCESSORS` contains this processor, every
 ``RequestContext`` will contain a variable ``STATIC_URL``, providing the
 value of the :setting:`STATIC_URL` setting.

docs/ref/templates/builtins.txt

diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 072eebf..514953d 100644

                In this syntax, each value gets interpreted as a literal string, and there's no
 way to specify variable values. Or literal commas. Or spaces. Did we mention
 you shouldn't use this syntax in any new projects?
-.. versionadded:: 1.3
 By default, when you use the ``as`` keyword with the cycle tag, the
 usage of ``{% cycle %}`` that declares the cycle will itself output
 the first value in the cycle. This could be a problem if you want to
-…
+               including it. This example produces the output ``"Hello, John"``:
     {{ greeting }}, {{ person|default:"friend" }}!
-.. versionchanged:: 1.3
-   Additional context and exclusive context.
 You can pass additional context to the template using keyword arguments::
     {% include "name_snippet.html" with person="Jane" greeting="Hello" %}
-…
+               registered in ``somelibrary`` and ``otherlibrary`` located in package
     {% load somelibrary package.otherlibrary %}
-.. versionchanged:: 1.3
 You can also selectively load individual filters or tags from a library, using
 the ``from`` argument. In this example, the template tags/filters named ``foo``
 and ``bar`` will be loaded from ``somelibrary``::
-…
+               which is rounded up to 88).
 with
 ^^^^
-.. versionchanged:: 1.3
-   New keyword argument format and multiple variable assignments.
 Caches a complex variable under a simpler name. This is useful when accessing
 an "expensive" method (e.g., one that hits the database) multiple times.
-…
+               For example::
 If ``value`` is ``"http://www.example.org/foo?a=b&c=d"``, the output will be
 ``"http%3A//www.example.org/foo%3Fa%3Db%26c%3Dd"``.
-.. versionadded:: 1.3
 An optional argument containing the characters which should not be escaped can
 be provided.

docs/topics/auth.txt

diff --git a/docs/topics/auth.txt b/docs/topics/auth.txt
index c45e4bb..c4c4bc9 100644

                How to log a user out
 Login and logout signals
 ------------------------
-.. versionadded:: 1.3
 The auth framework uses two :doc:`signals </topics/signals>` that can be used
 for notification when a user logs in or out.
-…
+               The login_required decorator
     context variable which stores the redirect path will use the value of
     ``redirect_field_name`` as its key rather than ``"next"`` (the default).
-    .. versionadded:: 1.3
     :func:`~django.contrib.auth.decorators.login_required` also takes an
     optional ``login_url`` parameter. Example::
-…
+               includes a few other useful built-in views located in
     that can be used to reset the password, and sending that link to the
     user's registered email address.
-    .. versionchanged:: 1.3
-        The ``from_email`` argument was added.
     .. versionchanged:: 1.4
         Users flagged with an unusable password (see
         :meth:`~django.contrib.auth.models.User.set_unusable_password()`
-…
+               The currently logged-in user's permissions are stored in the template variable
 :class:`django.contrib.auth.context_processors.PermWrapper`, which is a
 template-friendly proxy of permissions.
-.. versionchanged:: 1.3
-    Prior to version 1.3, ``PermWrapper`` was located in
-    ``django.core.context_processors``.
 In the ``{{ perms }}`` object, single-attribute lookup is a proxy to
 :meth:`User.has_module_perms <django.contrib.auth.models.User.has_module_perms>`.
 This example would display ``True`` if the logged-in user had any permissions
-…
+               for example, to control anonymous access.
 Authorization for inactive users
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.. versionchanged:: 1.3
 An inactive user is a one that is authenticated but has its attribute
 ``is_active`` set to ``False``. However this does not mean they are not
 authorized to do anything. For example they are allowed to activate their

docs/topics/cache.txt

diff --git a/docs/topics/cache.txt b/docs/topics/cache.txt
index f13238e..77d2de7 100644

                Your cache preference goes in the :setting:`CACHES` setting in your
 settings file. Here's an explanation of all available values for
 :setting:`CACHES`.
-.. versionchanged:: 1.3
-    The settings used to configure caching changed in Django 1.3. In
-    Django 1.2 and earlier, you used a single string-based
-    :setting:`CACHE_BACKEND` setting to configure caches. This has
-    been replaced with the new dictionary-based :setting:`CACHES`
-    setting.
 .. _memcached:
 Memcached
-…
+               two most common are `python-memcached`_ and `pylibmc`_.
 .. _`python-memcached`: ftp://ftp.tummy.com/pub/python-memcached/
 .. _`pylibmc`: http://sendapatch.se/projects/pylibmc/
-.. versionchanged:: 1.3
-    Support for ``pylibmc`` was added.
 To use Memcached with Django:
 * Set :setting:`BACKEND <CACHES-BACKEND>` to
-…
+               nonexistent cache key.::
 Cache key prefixing
 -------------------
-.. versionadded:: 1.3
 If you are sharing a cache instance between servers, or between your
 production and development environments, it's possible for data cached
 by one server to be used by another server. If the format of cached
-…
+               collisions in cache values.
 Cache versioning
 ----------------
-.. versionadded:: 1.3
 When you change running code that uses cached values, you may need to
 purge any existing cached values. The easiest way to do this is to
 flush the entire cache, but this can lead to the loss of cache values
-…
+               keys unaffected. Continuing our previous example::
 Cache key transformation
 ------------------------
-.. versionadded:: 1.3
 As described in the previous two sections, the cache key provided by a
 user is not used verbatim -- it is combined with the cache prefix and
 key version to provide a final cache key. By default, the three parts
-…
+               be used instead of the default key combining function.
 Cache key warnings
 ------------------
-.. versionadded:: 1.3
 Memcached, the most commonly-used production cache backend, does not allow
 cache keys longer than 250 characters or containing whitespace or control
 characters, and using such keys will cause an exception. To encourage
-…
+               mechanism should take into account when building its cache key. For example, if
 the contents of a Web page depend on a user's language preference, the page is
 said to "vary on language."
-.. versionchanged:: 1.3
-    In Django 1.3 the full request path -- including the query -- is used
-    to create the cache keys, instead of only the path component in Django 1.2.
 By default, Django's cache system creates its cache keys using the requested
 path and query -- e.g., ``"/stories/2005/?order_by=author"``. This means every
 request to that URL will use the same cached version, regardless of user-agent

docs/topics/class-based-views/index.txt

diff --git a/docs/topics/class-based-views/index.txt b/docs/topics/class-based-views/index.txt
index 2d3e00a..a738221 100644

-              a
 Class-based views
 =================
-.. versionadded:: 1.3
 A view is a callable which takes a request and returns a
 response. This can be more than just a function, and Django provides
 an example of some classes which can be used as views. These allow you

docs/topics/class-based-views/mixins.txt

diff --git a/docs/topics/class-based-views/mixins.txt b/docs/topics/class-based-views/mixins.txt
index f07769f..f349c23 100644

-              a
 Using mixins with class-based views
 ===================================
-.. versionadded:: 1.3
 .. caution::
     This is an advanced topic. A working knowledge of :doc:`Django's

docs/topics/db/queries.txt

diff --git a/docs/topics/db/queries.txt b/docs/topics/db/queries.txt
index 5385b2a..dd16065 100644

                issue the query::
     >>> Entry.objects.filter(authors__name=F('blog__name'))
-.. versionadded:: 1.3
 For date and date/time fields, you can add or subtract a
 :class:`~datetime.timedelta` object. The following would return all entries
 that were modified more than 3 days after they were published::
-…
+               it. For example::
     # This will delete the Blog and all of its Entry objects.
     b.delete()
-.. versionadded:: 1.3
     This cascade behavior is customizable via the
     :attr:`~django.db.models.ForeignKey.on_delete` argument to the
     :class:`~django.db.models.ForeignKey`.

docs/topics/db/sql.txt

diff --git a/docs/topics/db/sql.txt b/docs/topics/db/sql.txt
index 19daffd..310dcb5 100644

                By default, the Python DB API will return results without their field
 names, which means you end up with a ``list`` of values, rather than a
 ``dict``. At a small performance cost, you can return results as a
 ``dict`` by using something like this::
     def dictfetchall(cursor):
         "Returns all rows from a cursor as a dict"
         desc = cursor.description
-…
+               Here is an example of the difference between the two::
     >>> cursor.execute("SELECT id, parent_id from test LIMIT 2");
     >>> cursor.fetchall()
     ((54360982L, None), (54360880L, None))
     >>> cursor.execute("SELECT id, parent_id from test LIMIT 2");
     >>> dictfetchall(cursor)
     [{'parent_id': None, 'id': 54360982L}, {'parent_id': None, 'id': 54360880L}]
-…
+               transaction containing those calls is closed correctly. See :ref:`the
 notes on the requirements of Django's transaction handling
 <topics-db-transactions-requirements>` for more details.
-.. versionchanged:: 1.3
-Prior to Django 1.3, it was necessary to manually mark a transaction
-as dirty using ``transaction.set_dirty()`` when using raw SQL calls.
 Connections and cursors
 -----------------------

docs/topics/db/transactions.txt

diff --git a/docs/topics/db/transactions.txt b/docs/topics/db/transactions.txt
index 9928354..4a52c5a 100644

                database cursor (which is mapped to its own database connection internally).
 Controlling transaction management in views
 ===========================================
-.. versionchanged:: 1.3
-   Transaction management context managers are new in Django 1.3.
 For most people, implicit request-based transactions work wonderfully. However,
 if you need more fine-grained control over how transactions are managed, you can
 use a set of functions in ``django.db.transaction`` to control transactions on a
-…
+               managers, too.
 Requirements for transaction handling
 =====================================
-.. versionadded:: 1.3
 Django requires that every transaction that is opened is closed before
 the completion of a request. If you are using :func:`autocommit` (the
 default commit mode) or :func:`commit_on_success`, this will be done

docs/topics/email.txt

diff --git a/docs/topics/email.txt b/docs/topics/email.txt
index 0cc476e..b3d7254 100644

                The "From:" header of the email will be the value of the
 This method exists for convenience and readability.
-.. versionchanged:: 1.3
 If ``html_message`` is provided, the resulting email will be a
 :mimetype:`multipart/alternative` email with ``message`` as the
 :mimetype:`text/plain` content type and ``html_message`` as the
-…
+               following parameters (in the given order, if positional arguments are used).
 All parameters are optional and can be set at any time prior to calling the
 ``send()`` method.
-.. versionchanged:: 1.3
-   The ``cc`` argument was added.
 * ``subject``: The subject line of the email.
 * ``body``: The body text. This should be a plain text message.

docs/topics/forms/formsets.txt

diff --git a/docs/topics/forms/formsets.txt b/docs/topics/forms/formsets.txt
index 2a83172..7c1771b 100644

                display two blank forms::
     >>> ArticleFormSet = formset_factory(ArticleForm, extra=2)
+.. versionchanged:: 1.3
+Prior to Django 1.3, formset instances were not iterable. To render
+the formset you iterated over the ``forms`` attribute::
+    >>> formset = ArticleFormSet()
+    >>> for form in formset.forms:
+    ...     print(form.as_table())
+Iterating over ``formset.forms`` will render the forms in the order
+they were created. The default formset iterator also renders the forms
+in this order, but you can change this order by providing an alternate
+implementation for the :meth:`__iter__()` method.
+Iterating over the ``formset`` will render the forms in the order they were
+created. You can change this order by providing an alternate implementation for
+the :meth:`__iter__()` method.
 Formsets can also be indexed into, which returns the corresponding form. If you
 override ``__iter__``, you will need to also override ``__getitem__`` to have

docs/topics/forms/media.txt

diff --git a/docs/topics/forms/media.txt b/docs/topics/forms/media.txt
index 615dd71..eba65d2 100644

                return values for dynamic media properties.
 Paths in media definitions
 --------------------------
-.. versionchanged:: 1.3
 Paths used to specify media can be either relative or absolute. If a path
 starts with '/', 'http://' or 'https://', it will be interpreted as an absolute
 path, and left as-is. All other paths will be prepended with the value of

docs/topics/http/middleware.txt

diff --git a/docs/topics/http/middleware.txt b/docs/topics/http/middleware.txt
index fe92bc5..a8347e5 100644

                middleware is always called on every response.
 ``process_template_response``
 -----------------------------
-.. versionadded:: 1.3
 .. method:: process_template_response(self, request, response)
 ``request`` is an :class:`~django.http.HttpRequest` object. ``response`` is a

docs/topics/http/shortcuts.txt

diff --git a/docs/topics/http/shortcuts.txt b/docs/topics/http/shortcuts.txt
index 10be353..0dc38b1 100644

                introduce controlled coupling for convenience's sake.
 .. function:: render(request, template_name[, dictionary][, context_instance][, content_type][, status][, current_app])
-   .. versionadded:: 1.3
    Combines a given template with a given context dictionary and returns an
    :class:`~django.http.HttpResponse` object with that rendered text.

docs/topics/http/urls.txt

diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt
index 4503bbd..e8a220e 100644

                A :class:`ResolverMatch` object can also be assigned to a triple::
     func, args, kwargs = resolve('/some/path/')
-.. versionchanged:: 1.3
-    Triple-assignment exists for backwards-compatibility. Prior to
-    Django 1.3, :func:`~django.core.urlresolvers.resolve` returned a
-    triple containing (view function, arguments, keyword arguments);
-    the :class:`ResolverMatch` object (as well as the namespace and pattern
-    information it provides) is not available in earlier Django releases.
 One possible use of :func:`~django.core.urlresolvers.resolve` would be to test
 whether a view would raise a ``Http404`` error before redirecting to it::

docs/topics/i18n/formatting.txt

diff --git a/docs/topics/i18n/formatting.txt b/docs/topics/i18n/formatting.txt
index b091647..fc3f37d 100644

                Template tags
 localize
 ~~~~~~~~
-.. versionadded:: 1.3
 Enables or disables localization of template variables in the
 contained block.
-…
+               Template filters
 localize
 ~~~~~~~~
-.. versionadded:: 1.3
 Forces localization of a single value.
 For example::
-…
+               tag.
 unlocalize
 ~~~~~~~~~~
-.. versionadded:: 1.3
 Forces a single value to be printed without localization.
 For example::

docs/topics/i18n/translation.txt

diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt
index a7f48fe..aaf728b 100644

                translations wouldn't be able to reorder placeholder text.
 Comments for translators
 ------------------------
-.. versionadded:: 1.3
 If you would like to give translators hints about a translatable string, you
 can add a comment prefixed with the ``Translators`` keyword on the line
 preceding the string, e.g.::
-…
+               cardinality of the elements at play.
 Contextual markers
 ------------------
-.. versionadded:: 1.3
 Sometimes words have several meanings, such as ``"May"`` in English, which
 refers to a month name and to a verb. To enable translators to translate
 these words correctly in different contexts, you can use the
-…
+               Localized names of languages
 .. function:: get_language_info
-.. versionadded:: 1.3
 The ``get_language_info()`` function provides detailed information about
 languages::
-…
+               using the ``context`` keyword:
 ``blocktrans`` template tag
 ---------------------------
-.. versionchanged:: 1.3
-   New keyword argument format.
 Contrarily to the :ttag:`trans` tag, the ``blocktrans`` tag allows you to mark
 complex sentences consisting of literals and variable content for translation
 by making use of placeholders::
-…
+               string, so they don't need to be aware of translations.
     translator might translate the string ``"yes,no"`` as ``"ja,nein"``
     (keeping the comma intact).
-.. versionadded:: 1.3
 You can also retrieve information about any of the available languages using
 provided template tags and filters. To get information about a single language,
 use the ``{% get_language_info %}`` tag::
-…
+               directories listed in :setting:`LOCALE_PATHS` have the highest precedence with
 the ones appearing first having higher precedence than the ones appearing
 later.
-.. versionchanged:: 1.3
-    Directories listed in :setting:`LOCALE_PATHS` weren't included in the
-    lookup algorithm until version 1.3.
 Using the JavaScript translation catalog
 ----------------------------------------

docs/topics/logging.txt

diff --git a/docs/topics/logging.txt b/docs/topics/logging.txt
index b54a947..ae49af5 100644

-              a
 Logging
 =======
-.. versionadded:: 1.3
 .. module:: django.utils.log
    :synopsis: Logging tools for Django applications

docs/topics/signals.txt

diff --git a/docs/topics/signals.txt b/docs/topics/signals.txt
index db1bcb0..1078d03 100644

                Now, our ``my_callback`` function will be called each time a request finishes.
 Note that ``receiver`` can also take a list of signals to connect a function
 to.
-.. versionadded:: 1.3
-The ``receiver`` decorator was added in Django 1.3.
 .. versionchanged:: 1.5
 The ability to pass a list of signals was added.

docs/topics/testing.txt

diff --git a/docs/topics/testing.txt b/docs/topics/testing.txt
index c4c7373..7afdbe8 100644

                module defines tests in class-based approach.
 .. admonition:: unittest2
-    .. versionchanged:: 1.3
     Python 2.7 introduced some major changes to the unittest library,
     adding some extremely useful features. To ensure that every Django
     project can benefit from these new features, Django ships with a
-…
+               two databases.
 Controlling creation order for test databases
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.. versionadded:: 1.3
 By default, Django will always create the ``default`` database first.
 However, no guarantees are made on the creation order of any other
 databases in your test setup.
-…
+               Specifically, a ``Response`` object has the following attributes:
         The HTTP status of the response, as an integer. See
         :rfc:`2616#section-10` for a full list of HTTP status codes.
-    .. versionadded:: 1.3
     .. attribute:: templates
         A list of ``Template`` instances used to render the final content, in
-…
+               The request factory
 .. class:: RequestFactory
-.. versionadded:: 1.3
 The :class:`~django.test.client.RequestFactory` shares the same API as
 the test client. However, instead of behaving like a browser, the
 RequestFactory provides a way to generate a request instance that can
-…
+               This means, instead of instantiating a ``Client`` in each test::
 Customizing the test client
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.. versionadded:: 1.3
 .. attribute:: TestCase.client_class
 If you want to use a different ``Client`` class (for example, a subclass
-…
+               your test suite.
 .. method:: TestCase.assertQuerysetEqual(qs, values, transform=repr, ordered=True)
-    .. versionadded:: 1.3
     Asserts that a queryset ``qs`` returns a particular list of values ``values``.
     The comparison of the contents of ``qs`` and ``values`` is performed using
-…
+               your test suite.
 .. method:: TestCase.assertNumQueries(num, func, *args, **kwargs)
-    .. versionadded:: 1.3
     Asserts that when ``func`` is called with ``*args`` and ``**kwargs`` that
     ``num`` database queries are executed.
-…
+               Skipping tests
 .. currentmodule:: django.test
-.. versionadded:: 1.3
 The unittest library provides the :func:`@skipIf <unittest.skipIf>` and
 :func:`@skipUnless <unittest.skipUnless>` decorators to allow you to skip tests
 if you know ahead of time that those tests are going to fail under certain

Download in other formats:

Original Format

Issues

Context Navigation

Ticket #18934: 18934.diff

Download in other formats: