Permalink
Browse files

Fixed #18934 - Removed versionadded/changed annotations for Django 1.3

  • Loading branch information...
1 parent e06b543 commit 837425b425c2d58596f3ed04a7ed79541279ee7e @timgraham timgraham committed Sep 19, 2012
Showing with 23 additions and 346 deletions.
  1. +0 −2 docs/howto/custom-template-tags.txt
  2. +0 −4 docs/howto/error-reporting.txt
  3. +0 −2 docs/howto/static-files.txt
  4. +0 −2 docs/misc/api-stability.txt
  5. +2 −19 docs/ref/contrib/admin/index.txt
  6. +0 −21 docs/ref/contrib/comments/example.txt
  7. +0 −4 docs/ref/contrib/comments/moderation.txt
  8. +0 −2 docs/ref/contrib/contenttypes.txt
  9. +0 −2 docs/ref/contrib/flatpages.txt
  10. +0 −4 docs/ref/contrib/gis/geos.txt
  11. +0 −2 docs/ref/contrib/gis/testing.txt
  12. +0 −7 docs/ref/contrib/localflavor.txt
  13. +0 −2 docs/ref/contrib/sitemaps.txt
  14. +2 −6 docs/ref/contrib/sites.txt
  15. +0 −2 docs/ref/contrib/staticfiles.txt
  16. +4 −24 docs/ref/django-admin.txt
  17. +3 −9 docs/ref/files/storage.txt
  18. +0 −2 docs/ref/forms/api.txt
  19. +0 −2 docs/ref/forms/fields.txt
  20. +0 −7 docs/ref/forms/widgets.txt
  21. +0 −2 docs/ref/models/fields.txt
  22. +5 −13 docs/ref/models/querysets.txt
  23. +0 −13 docs/ref/request-response.txt
  24. +2 −24 docs/ref/settings.txt
  25. +0 −10 docs/ref/signals.txt
  26. +0 −2 docs/ref/template-response.txt
  27. +0 −12 docs/ref/templates/api.txt
  28. +0 −12 docs/ref/templates/builtins.txt
  29. +0 −13 docs/topics/auth.txt
  30. +0 −22 docs/topics/cache.txt
  31. +0 −5 docs/topics/class-based-views/generic-display.txt
  32. +0 −2 docs/topics/class-based-views/index.txt
  33. +0 −2 docs/topics/class-based-views/mixins.txt
  34. +0 −3 docs/topics/db/queries.txt
  35. +2 −7 docs/topics/db/sql.txt
  36. +0 −5 docs/topics/db/transactions.txt
  37. +0 −5 docs/topics/email.txt
  38. +3 −13 docs/topics/forms/formsets.txt
  39. +0 −2 docs/topics/forms/media.txt
  40. +0 −2 docs/topics/http/middleware.txt
  41. +0 −2 docs/topics/http/shortcuts.txt
  42. +0 −7 docs/topics/http/urls.txt
  43. +0 −6 docs/topics/i18n/formatting.txt
  44. +0 −15 docs/topics/i18n/translation.txt
  45. +0 −2 docs/topics/logging.txt
  46. +0 −4 docs/topics/signals.txt
  47. +0 −16 docs/topics/testing.txt
@@ -760,8 +760,6 @@ 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:
@@ -44,8 +44,6 @@ 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>`.
@@ -99,8 +97,6 @@ The best way to disable this behavior is to set
.. seealso::
- .. versionadded:: 1.3
-
404 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.
@@ -2,8 +2,6 @@
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,
@@ -155,8 +155,6 @@ 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
@@ -129,8 +129,6 @@ 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.
@@ -576,8 +574,6 @@ 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::
@@ -748,8 +744,6 @@ 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
@@ -966,8 +960,6 @@ 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.
@@ -1213,8 +1205,6 @@ 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`.
@@ -1295,8 +1285,6 @@ 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
@@ -1394,18 +1382,15 @@ 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`
@@ -1813,8 +1798,6 @@ 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.
@@ -152,27 +152,6 @@ 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
==========
@@ -136,10 +136,6 @@ 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
--------------------------------
@@ -423,8 +423,6 @@ 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
@@ -239,8 +239,6 @@ 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>`.
@@ -237,8 +237,6 @@ 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
@@ -535,8 +533,6 @@ 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
@@ -134,8 +134,6 @@ 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>`.
@@ -267,8 +267,6 @@ 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
@@ -658,11 +656,6 @@ 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.
@@ -330,8 +330,6 @@ 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::
@@ -159,8 +159,6 @@ 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
@@ -169,12 +167,10 @@ 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.
@@ -437,7 +433,7 @@ 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
@@ -5,8 +5,6 @@ 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.
@@ -176,8 +176,6 @@ 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.
@@ -195,18 +193,10 @@ easy for humans to read, so you can use the ``--indent`` option to
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.
-
-In addition to specifying application names, you can provide a list of
-individual models, in the form of ``appname.Model``. If you specify a model
-name to ``dumpdata``, the dumped output will be restricted to that model,
-rather than the entire application. You can also mix application names and
-model names.
+applications or models (specified as in the form of ``appname.ModelName``) from
+being dumped. If you specify a model name to ``dumpdata``, the dumped output
+will be restricted to that model, rather than the entire application. You can
+also mix application names and model names.
The :djadminopt:`--database` option can be used to specify the database
from which data will be dumped.
@@ -463,8 +453,6 @@ 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.
@@ -640,15 +628,11 @@ 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.
@@ -674,8 +658,6 @@ 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``.
@@ -1113,8 +1095,6 @@ 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.
Oops, something went wrong.

0 comments on commit 837425b

Please sign in to comment.