Skip to content

Commit

Permalink
Fixed #14000 - remove versionadded/changed tags for Django 1.0 and 1.1
Browse files Browse the repository at this point in the history
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
timgraham committed Dec 26, 2010
1 parent 00c554f commit 2ea93f9
Show file tree
Hide file tree
Showing 58 changed files with 49 additions and 591 deletions.
2 changes: 0 additions & 2 deletions docs/howto/custom-management-commands.txt
Expand Up @@ -2,8 +2,6 @@
Writing custom django-admin commands
====================================

.. versionadded:: 1.0

Applications can register their own actions with ``manage.py``. For example,
you might want to add a ``manage.py`` action for a Django app that you're
distributing. In this document, we will be building a custom ``closepoll``
Expand Down
1 change: 0 additions & 1 deletion docs/howto/custom-model-fields.txt
Expand Up @@ -2,7 +2,6 @@
Writing custom model fields
===========================

.. versionadded:: 1.0
.. currentmodule:: django.db.models

Introduction
Expand Down
8 changes: 0 additions & 8 deletions docs/howto/custom-template-tags.txt
Expand Up @@ -155,8 +155,6 @@ will use the function's name as the filter name.
Filters and auto-escaping
~~~~~~~~~~~~~~~~~~~~~~~~~

.. versionadded:: 1.0

When writing a custom filter, give some thought to how the filter will interact
with Django's auto-escaping behavior. Note that three types of strings can be
passed around inside the template code:
Expand Down Expand Up @@ -426,8 +424,6 @@ without having to be parsed multiple times.
Auto-escaping considerations
~~~~~~~~~~~~~~~~~~~~~~~~~~~~

.. versionadded:: 1.0

The output from template tags is **not** automatically run through the
auto-escaping filters. However, there are still a couple of things you should
keep in mind when writing a template tag.
Expand Down Expand Up @@ -605,10 +601,6 @@ Now your tag should begin to look like this::
raise template.TemplateSyntaxError, "%r tag's argument should be in quotes" % tag_name
return FormatTimeNode(date_to_be_formatted, format_string[1:-1])

.. versionchanged:: 1.0
Variable resolution has changed in the 1.0 release of Django. ``template.resolve_variable()``
has been deprecated in favor of a new ``template.Variable`` class.

You also have to change the renderer to retrieve the actual contents of the
``date_updated`` property of the ``blog_entry`` object. This can be
accomplished by using the ``Variable()`` class in ``django.template``.
Expand Down
3 changes: 0 additions & 3 deletions docs/howto/deployment/modpython.txt
Expand Up @@ -64,9 +64,6 @@ This tells Apache: "Use mod_python for any URL at or under '/mysite/', using the
Django mod_python handler." It passes the value of :ref:`DJANGO_SETTINGS_MODULE
<django-settings-module>` so mod_python knows which settings to use.

.. versionadded:: 1.0
The ``PythonOption django.root ...`` is new in this version.

Because mod_python does not know we are serving this site from underneath the
``/mysite/`` prefix, this value needs to be passed through to the mod_python
handler in Django, via the ``PythonOption django.root ...`` line. The value set
Expand Down
3 changes: 0 additions & 3 deletions docs/intro/tutorial02.txt
Expand Up @@ -38,9 +38,6 @@ activate the admin site for your installation, do these three things:
need to know is that it maps URL roots to applications. In the end, you
should have a ``urls.py`` file that looks like this:

.. versionchanged:: 1.1
The method for adding admin urls has changed in Django 1.1.

.. parsed-literal::

from django.conf.urls.defaults import *
Expand Down
2 changes: 0 additions & 2 deletions docs/ref/authbackends.txt
Expand Up @@ -26,8 +26,6 @@ The following backends are available in :mod:`django.contrib.auth.backends`:

.. class:: RemoteUserBackend

.. versionadded:: 1.1

Use this backend to take advantage of external-to-Django-handled
authentication. It authenticates using usernames passed in
:attr:`request.META['REMOTE_USER'] <django.http.HttpRequest.META>`. See
Expand Down
2 changes: 0 additions & 2 deletions docs/ref/contrib/admin/actions.txt
Expand Up @@ -2,8 +2,6 @@
Admin actions
=============

.. versionadded:: 1.1

.. currentmodule:: django.contrib.admin

The basic workflow of Django's admin is, in a nutshell, "select an object,
Expand Down
27 changes: 0 additions & 27 deletions docs/ref/contrib/admin/index.txt
Expand Up @@ -434,8 +434,6 @@ subclass::

.. attribute:: ModelAdmin.list_editable

.. versionadded:: 1.1

Set ``list_editable`` to a list of field names on the model which will
allow editing on the change list page. That is, fields listed in
``list_editable`` will be displayed as form widgets on the change list
Expand Down Expand Up @@ -678,8 +676,6 @@ subclass::

.. attribute:: ModelAdmin.formfield_overrides

.. versionadded:: 1.1

This provides a quick-and-dirty way to override some of the
:class:`~django.forms.Field` options for use in the admin.
``formfield_overrides`` is a dictionary mapping a field class to a dict of
Expand Down Expand Up @@ -722,16 +718,12 @@ subclass::

.. attribute:: ModelAdmin.actions

.. versionadded:: 1.1

A list of actions to make available on the change list page. See
:doc:`/ref/contrib/admin/actions` for details.

.. attribute:: ModelAdmin.actions_on_top
.. attribute:: ModelAdmin.actions_on_bottom

.. versionadded:: 1.1

Controls where on the page the actions bar appears. By default, the admin
changelist displays actions at the top of the page (``actions_on_top = True;
actions_on_bottom = False``).
Expand Down Expand Up @@ -843,8 +835,6 @@ templates used by the :class:`ModelAdmin` views:

.. method:: ModelAdmin.get_urls(self)

.. versionadded:: 1.1

The ``get_urls`` method on a ``ModelAdmin`` returns the URLs to be used for
that ModelAdmin in the same way as a URLconf. Therefore you can extend
them as documented in :doc:`/topics/http/urls`::
Expand Down Expand Up @@ -903,8 +893,6 @@ templates used by the :class:`ModelAdmin` views:

.. method:: ModelAdmin.formfield_for_foreignkey(self, db_field, request, **kwargs)

.. versionadded:: 1.1

The ``formfield_for_foreignkey`` method on a ``ModelAdmin`` allows you to
override the default formfield for a foreign key field. For example, to
return a subset of objects for this foreign key field based on the user::
Expand All @@ -920,8 +908,6 @@ templates used by the :class:`ModelAdmin` views:

.. method:: ModelAdmin.formfield_for_manytomany(self, db_field, request, **kwargs)

.. versionadded:: 1.1

Like the ``formfield_for_foreignkey`` method, the
``formfield_for_manytomany`` method can be overridden to change the
default formfield for a many to many field. For example, if an owner can
Expand Down Expand Up @@ -1119,9 +1105,6 @@ adds some of its own (the shared features are actually defined in the
- :attr:`~ModelAdmin.prepopulated_fields`
- :attr:`~ModelAdmin.radio_fields`
- :attr:`~InlineModelAdmin.raw_id_fields`

.. versionadded:: 1.1

- :meth:`~ModelAdmin.formfield_for_foreignkey`
- :meth:`~ModelAdmin.formfield_for_manytomany`

Expand Down Expand Up @@ -1512,8 +1495,6 @@ creating your own ``AdminSite`` instance (see below), and changing the
Python class), and register your models and ``ModelAdmin`` subclasses
with it instead of using the default.

.. versionadded:: 1.1

When constructing an instance of an ``AdminSite``, you are able to provide
a unique instance name using the ``name`` argument to the constructor. This
instance name is used to identify the instance, especially when
Expand Down Expand Up @@ -1607,10 +1588,6 @@ It's easy to create multiple instances of the admin site on the same
Django-powered Web site. Just create multiple instances of ``AdminSite`` and
root each one at a different URL.

.. versionchanged:: 1.1
The method for hooking ``AdminSite`` instances into urls has changed in
Django 1.1.

In this example, the URLs ``/basic-admin/`` and ``/advanced-admin/`` feature
separate versions of the admin site -- using the ``AdminSite`` instances
``myproject.admin.basic_site`` and ``myproject.admin.advanced_site``,
Expand All @@ -1633,8 +1610,6 @@ is only necessary if you are using more than one ``AdminSite``.
Adding views to admin sites
---------------------------

.. versionadded:: 1.1

Just like :class:`ModelAdmin`, :class:`AdminSite` provides a
:meth:`~django.contrib.admin.ModelAdmin.get_urls()` method
that can be overridden to define additional views for the site. To add
Expand All @@ -1654,8 +1629,6 @@ a pattern for your new view.
Reversing Admin URLs
====================

.. versionadded:: 1.1

When an :class:`AdminSite` is deployed, the views provided by that site are
accessible using Django's :ref:`URL reversing system <naming-url-patterns>`.

Expand Down
1 change: 0 additions & 1 deletion docs/ref/contrib/csrf.txt
Expand Up @@ -241,7 +241,6 @@ it.
Exceptions
----------

.. versionadded:: 1.1
.. versionchanged:: 1.2
Import paths for the decorators below were changed.

Expand Down
2 changes: 0 additions & 2 deletions docs/ref/contrib/flatpages.txt
Expand Up @@ -17,8 +17,6 @@ custom Django application.
A flatpage can use a custom template or a default, systemwide flatpage
template. It can be associated with one, or multiple, sites.

.. versionadded:: 1.0

The content field may optionally be left blank if you prefer to put your
content in a custom template.

Expand Down
2 changes: 0 additions & 2 deletions docs/ref/contrib/formtools/form-wizard.txt
Expand Up @@ -5,8 +5,6 @@ Form wizard
.. module:: django.contrib.formtools.wizard
:synopsis: Splits forms across multiple Web pages.

.. versionadded:: 1.0

Django comes with an optional "form wizard" application that splits
:doc:`forms </topics/forms/index>` across multiple Web pages. It maintains
state in hashed HTML :samp:`<input type="hidden">` fields, and the data isn't
Expand Down
8 changes: 0 additions & 8 deletions docs/ref/contrib/gis/gdal.txt
Expand Up @@ -459,8 +459,6 @@ systems and coordinate transformation::

.. classmethod:: from_bbox(bbox)

.. versionadded:: 1.1

Constructs a :class:`Polygon` from the given bounding-box (a 4-tuple).

.. method:: __len__
Expand Down Expand Up @@ -601,8 +599,6 @@ systems and coordinate transformation::

.. attribute:: kml

.. versionadded:: 1.1

Returns a string representation of this geometry in KML format.

.. attribute:: wkb_size
Expand Down Expand Up @@ -889,8 +885,6 @@ systems and coordinate transformation::

.. method:: expand_to_include(self, *args)

.. versionadded:: 1.1

Coordinate System Objects
=========================

Expand Down Expand Up @@ -992,8 +986,6 @@ Coordinate System Objects
Import spatial reference from PROJ.4 string.

.. method:: import_user_input(user_input)

.. versionadded:: 1.1

.. method:: import_wkt(wkt)

Expand Down
7 changes: 0 additions & 7 deletions docs/ref/contrib/gis/geoquerysets.txt
Expand Up @@ -835,8 +835,6 @@ Reverse the coordinate order of the geometry field, and attaches as a

.. method:: GeoQuerySet.snap_to_grid(*args, **kwargs)

.. versionadded:: 1.1

Snap all points of the input geometry to the grid. How the
geometry is snapped to the grid depends on how many numeric
(either float, integer, or long) arguments are given.
Expand Down Expand Up @@ -957,8 +955,6 @@ __ http://geohash.org/

.. method:: GeoQuerySet.geojson(**kwargs)

.. versionadded:: 1.1

*Availability*: PostGIS

Attaches a ``geojson`` attribute to every model in the queryset that contains the
Expand Down Expand Up @@ -1102,7 +1098,6 @@ the ``GeoQuerySet``; otherwise sets with ``None``.

Spatial Aggregates
==================
.. versionadded:: 1.1

Aggregate Methods
-----------------
Expand All @@ -1112,8 +1107,6 @@ Aggregate Methods

.. method:: GeoQuerySet.collect(**kwargs)

.. versionadded:: 1.1

*Availability*: PostGIS

Returns a ``GEOMETRYCOLLECTION`` or a ``MULTI`` geometry object from the geometry
Expand Down

0 comments on commit 2ea93f9

Please sign in to comment.