Skip to content

Commit

Permalink
Removed references to changes made in 1.2.
Browse files Browse the repository at this point in the history
Thanks Florian Apolloner for the patch.
  • Loading branch information
aaugustin committed Jun 7, 2012
1 parent 6492e8e commit c28e700
Show file tree
Hide file tree
Showing 46 changed files with 22 additions and 474 deletions.
2 changes: 0 additions & 2 deletions docs/faq/models.txt
Expand Up @@ -26,8 +26,6 @@ SELECTs, etc. Each time your app hits the database, the query will be recorded.
Note that the SQL recorded here may be :ref:`incorrectly quoted under SQLite
<sqlite-connection-queries>`.

.. versionadded:: 1.2

If you are using :doc:`multiple databases</topics/db/multi-db>`, you can use the
same interface on each member of the ``connections`` dictionary::

Expand Down
18 changes: 0 additions & 18 deletions docs/howto/custom-model-fields.txt
Expand Up @@ -313,9 +313,6 @@ Custom database types

.. method:: Field.db_type(self, connection)

.. versionadded:: 1.2
The ``connection`` argument was added to support multiple databases.

Returns the database column data type for the :class:`~django.db.models.Field`,
taking into account the connection object, and the settings associated with it.

Expand Down Expand Up @@ -452,9 +449,6 @@ Converting Python objects to query values

.. method:: Field.get_prep_value(self, value)

.. versionadded:: 1.2
This method was factored out of ``get_db_prep_value()``

This is the reverse of :meth:`.to_python` when working with the
database backends (as opposed to serialization). The ``value``
parameter is the current value of the model's attribute (a field has
Expand All @@ -480,9 +474,6 @@ Converting query values to database values

.. method:: Field.get_db_prep_value(self, value, connection, prepared=False)

.. versionadded:: 1.2
The ``connection`` and ``prepared`` arguments were added to support multiple databases.

Some data types (for example, dates) need to be in a specific format
before they can be used by a database backend.
:meth:`.get_db_prep_value` is the method where those conversions should
Expand All @@ -499,9 +490,6 @@ processing.

.. method:: Field.get_db_prep_save(self, value, connection)

.. versionadded:: 1.2
The ``connection`` argument was added to support multiple databases.

Same as the above, but called when the Field value must be *saved* to
the database. As the default implementation just calls
:meth:`.get_db_prep_value`, you shouldn't need to implement this method
Expand Down Expand Up @@ -540,9 +528,6 @@ two phase process.

.. method:: Field.get_prep_lookup(self, lookup_type, value)

.. versionadded:: 1.2
This method was factored out of ``get_db_prep_lookup()``

:meth:`.get_prep_lookup` performs the first phase of lookup preparation,
performing generic data validity checks

Expand Down Expand Up @@ -591,9 +576,6 @@ accepted lookup types to ``exact`` and ``in``::

.. method:: Field.get_db_prep_lookup(self, lookup_type, value, connection, prepared=False)

.. versionadded:: 1.2
The ``connection`` and ``prepared`` arguments were added to support multiple databases.

Performs any database-specific data conversions required by a lookup.
As with :meth:`.get_db_prep_value`, the specific connection that will
be used for the query is passed as the ``connection`` parameter.
Expand Down
2 changes: 0 additions & 2 deletions docs/howto/custom-template-tags.txt
Expand Up @@ -540,8 +540,6 @@ tag is used inside a :ttag:`{% autoescape off %}<autoescape>` block.
Thread-safety considerations
~~~~~~~~~~~~~~~~~~~~~~~~~~~~

.. versionadded:: 1.2

Once a node is parsed, its ``render`` method may be called any number of times.
Since Django is sometimes run in multi-threaded environments, a single node may
be simultaneously rendering with different contexts in response to two separate
Expand Down
Expand Up @@ -127,8 +127,6 @@ should be considered non-trivial, just ask.
Javascript patches
------------------

.. versionadded:: 1.2

Django's admin system leverages the jQuery framework to increase the
capabilities of the admin interface. In conjunction, there is an emphasis on
admin javascript performance and minimizing overall admin media file size.
Expand Down
40 changes: 5 additions & 35 deletions docs/ref/contrib/admin/index.txt
Expand Up @@ -115,8 +115,6 @@ subclass::

.. attribute:: ModelAdmin.actions_selection_counter

.. versionadded:: 1.2

Controls whether a selection counter is display next to the action dropdown.
By default, the admin changelist will display it
(``actions_selection_counter = True``).
Expand Down Expand Up @@ -177,12 +175,9 @@ subclass::
fields = ('url', 'title', 'content')

In the above example, only the fields ``url``, ``title`` and ``content``
will be displayed, sequentially, in the form.

.. versionadded:: 1.2

``fields`` can contain values defined in :attr:`ModelAdmin.readonly_fields`
to be displayed as read-only.
will be displayed, sequentially, in the form. ``fields`` can contain
values defined in :attr:`ModelAdmin.readonly_fields` to be displayed as
read-only.

.. versionadded:: 1.4

Expand Down Expand Up @@ -262,8 +257,6 @@ subclass::
'fields': (('first_name', 'last_name'), 'address', 'city', 'state'),
}

.. versionadded:: 1.2

``fields`` can contain values defined in
:attr:`~ModelAdmin.readonly_fields` to be displayed as read-only.

Expand Down Expand Up @@ -380,8 +373,6 @@ subclass::

.. attribute:: ModelAdmin.get_changelist

.. versionchanged:: 1.2

Returns the Changelist class to be used for listing. By default,
``django.contrib.admin.views.main.ChangeList`` is used. By inheriting this
class you can change the behavior of the listing.
Expand Down Expand Up @@ -819,8 +810,6 @@ subclass::

.. attribute:: ModelAdmin.readonly_fields

.. versionadded:: 1.2

By default the admin shows all fields as editable. Any fields in this
option (which should be a ``list`` or ``tuple``) will display its data
as-is and non-editable. This option behaves nearly identical to
Expand Down Expand Up @@ -928,8 +917,6 @@ templates used by the :class:`ModelAdmin` views:

.. attribute:: ModelAdmin.add_form_template

.. versionadded:: 1.2

Path to a custom template, used by :meth:`add_view`.

.. attribute:: ModelAdmin.change_form_template
Expand All @@ -947,8 +934,6 @@ templates used by the :class:`ModelAdmin` views:

.. attribute:: ModelAdmin.delete_selected_confirmation_template

.. versionadded:: 1.2

Path to a custom template, used by the :meth:`delete_selected`
action method for displaying a confirmation page when deleting one
or more objects. See the :doc:`actions
Expand Down Expand Up @@ -1035,8 +1020,6 @@ templates used by the :class:`ModelAdmin` views:

.. method:: ModelAdmin.get_readonly_fields(self, request, obj=None)

.. versionadded:: 1.2

The ``get_readonly_fields`` method is given the ``HttpRequest`` and the
``obj`` being edited (or ``None`` on an add form) and is expected to return
a ``list`` or ``tuple`` of field names that will be displayed as read-only,
Expand Down Expand Up @@ -1405,20 +1388,17 @@ adds some of its own (the shared features are actually defined in the
- :attr:`~InlineModelAdmin.form`
- :attr:`~ModelAdmin.fieldsets`
- :attr:`~ModelAdmin.fields`
- :attr:`~ModelAdmin.formfield_overrides`
- :attr:`~ModelAdmin.exclude`
- :attr:`~ModelAdmin.filter_horizontal`
- :attr:`~ModelAdmin.filter_vertical`
- :attr:`~ModelAdmin.prepopulated_fields`
- :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.2

- :attr:`~ModelAdmin.readonly_fields`
- :attr:`~ModelAdmin.formfield_overrides`

.. versionadded:: 1.3

- :attr:`~ModelAdmin.ordering`
Expand Down Expand Up @@ -1463,8 +1443,6 @@ The ``InlineModelAdmin`` class adds:
:doc:`formsets documentation </topics/forms/formsets>` for more
information.

.. versionadded:: 1.2

For users with JavaScript-enabled browsers, an "Add another" link is
provided to enable any number of additional inlines to be added in addition
to those provided as a result of the ``extra`` argument.
Expand Down Expand Up @@ -1541,8 +1519,6 @@ automatically::
Working with many-to-many models
--------------------------------

.. versionadded:: 1.2

By default, admin widgets for many-to-many relations will be displayed
on whichever model contains the actual reference to the
:class:`~django.db.models.ManyToManyField`. Depending on your ``ModelAdmin``
Expand Down Expand Up @@ -1842,21 +1818,15 @@ Templates can override or extend base admin templates as described in

.. attribute:: AdminSite.logout_template

.. versionadded:: 1.2

Path to a custom template that will be used by the admin site logout view.

.. attribute:: AdminSite.password_change_template

.. versionadded:: 1.2

Path to a custom template that will be used by the admin site password
change view.

.. attribute:: AdminSite.password_change_done_template

.. versionadded:: 1.2

Path to a custom template that will be used by the admin site password
change done view.

Expand Down
2 changes: 0 additions & 2 deletions docs/ref/contrib/comments/example.txt
Expand Up @@ -37,8 +37,6 @@ available in the context, then you can refer to it directly::
{% get_comment_count for entry as comment_count %}
<p>{{ comment_count }} comments have been posted.</p>

.. versionadded:: 1.2

Next, we can use the :ttag:`render_comment_list` tag, to render all comments
to the given instance (``entry``) by using the ``comments/list.html`` template::

Expand Down
2 changes: 0 additions & 2 deletions docs/ref/contrib/comments/index.txt
Expand Up @@ -130,8 +130,6 @@ details.
Linking to comments
-------------------

.. versionadded:: 1.2

To provide a permalink to a specific comment, use :ttag:`get_comment_permalink`::

{% get_comment_permalink comment_obj [format_string] %}
Expand Down
6 changes: 0 additions & 6 deletions docs/ref/contrib/csrf.txt
Expand Up @@ -434,8 +434,6 @@ A number of settings can be used to control Django's CSRF behavior.
CSRF_COOKIE_DOMAIN
------------------

.. versionadded:: 1.2

Default: ``None``

The domain to be used when setting the CSRF cookie. This can be useful for
Expand All @@ -450,8 +448,6 @@ mechanism is not safe against cross-subdomain attacks -- see `Limitations`_.
CSRF_COOKIE_NAME
----------------

.. versionadded:: 1.2

Default: ``'csrftoken'``

The name of the cookie to use for the CSRF authentication token. This can be
Expand Down Expand Up @@ -485,8 +481,6 @@ cookie is only sent under an HTTPS connection.
CSRF_FAILURE_VIEW
-----------------

.. versionadded:: 1.2

Default: ``'django.views.csrf.csrf_failure'``

A dotted path to the view function to be used when an incoming request
Expand Down
2 changes: 0 additions & 2 deletions docs/ref/contrib/formtools/form-preview.txt
Expand Up @@ -110,8 +110,6 @@ default templates.
Advanced ``FormPreview`` methods
================================

.. versionadded:: 1.2

.. method:: FormPreview.process_preview

Given a validated form, performs any extra processing before displaying the
Expand Down
6 changes: 1 addition & 5 deletions docs/ref/contrib/gis/db-api.txt
Expand Up @@ -12,11 +12,7 @@ GeoDjango Database API
Spatial Backends
================

.. versionadded:: 1.2

In Django 1.2, support for :doc:`multiple databases </topics/db/multi-db>` was
introduced. In order to support multiple databases, GeoDjango has segregated
its functionality into full-fledged spatial database backends:
GeoDjango currently provides the following spatial database backends:

* :mod:`django.contrib.gis.db.backends.postgis`
* :mod:`django.contrib.gis.db.backends.mysql`
Expand Down
10 changes: 0 additions & 10 deletions docs/ref/contrib/gis/gdal.txt
Expand Up @@ -212,8 +212,6 @@ __ http://www.gdal.org/ogr/ogr_formats.html

.. attribute:: spatial_filter

.. versionadded:: 1.2

Property that may be used to retrieve or set a spatial filter for this
layer. A spatial filter can only be set with an :class:`OGRGeometry`
instance, a 4-tuple extent, or ``None``. When set with something
Expand Down Expand Up @@ -490,15 +488,9 @@ systems and coordinate transformation::

.. attribute:: coord_dim

.. versionchanged:: 1.2

Returns or sets the coordinate dimension of this geometry. For
example, the value would be 2 for two-dimensional geometries.

.. note::

Setting this property is only available in versions 1.2 and above.

.. attribute:: geom_count

Returns the number of elements in this geometry::
Expand Down Expand Up @@ -619,8 +611,6 @@ systems and coordinate transformation::

.. attribute:: ewkt

.. versionadded:: 1.2

Returns the EWKT representation of this geometry.

.. method:: clone()
Expand Down
12 changes: 0 additions & 12 deletions docs/ref/contrib/gis/geoquerysets.txt
Expand Up @@ -117,8 +117,6 @@ SpatiaLite ``Contains(poly, geom)``
contains_properly
-----------------

.. versionadded:: 1.2

*Availability*: PostGIS

Returns true if the lookup geometry intersects the interior of the
Expand Down Expand Up @@ -803,8 +801,6 @@ Geometry Editors

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

.. versionadded:: 1.2

*Availability*: PostGIS

Returns a modified version of the polygon/multipolygon in which all
Expand All @@ -816,8 +812,6 @@ of the vertices follow the Right-Hand-Rule, and attaches as a

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

.. versionadded:: 1.2

*Availability*: PostGIS, Oracle

Reverse the coordinate order of the geometry field, and attaches as a
Expand Down Expand Up @@ -943,8 +937,6 @@ of the geometry field in each model converted to the requested output format.

.. method:: GeoQuerySet.geohash(precision=20, **kwargs)

.. versionadded:: 1.2

Attaches a ``geohash`` attribute to every model the queryset
containing the `GeoHash`__ representation of the geometry.

Expand Down Expand Up @@ -1136,8 +1128,6 @@ Example::

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

.. versionadded:: 1.2

*Availability*: PostGIS

Returns the 3D extent of the ``GeoQuerySet`` as a six-tuple, comprising
Expand Down Expand Up @@ -1224,8 +1214,6 @@ Returns the same as the :meth:`GeoQuerySet.extent` aggregate method.

.. class:: Extent3D(geo_field)

.. versionadded:: 1.2

Returns the same as the :meth:`GeoQuerySet.extent3d` aggregate method.

``MakeLine``
Expand Down

0 comments on commit c28e700

Please sign in to comment.