mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #14000 - remove versionadded/changed tags for Django 1.0 and 1.1

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Timo Graham
2010-12-26 00:37:14 +00:00
parent 00c554f89e
commit 2ea93f9327
58 changed files with 49 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/ref/contrib/admin/actions.txt
View File

@@ -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,

27
docs/ref/contrib/admin/index.txt
View File

@@ -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
@@ -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
@@ -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``).
@@ -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`::
@@ -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::
@@ -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
@@ -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`
@@ -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
@@ -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``,
@@ -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
@@ -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>`.

1
docs/ref/contrib/csrf.txt
View File

@@ -241,7 +241,6 @@ it.
Exceptions
----------
.. versionadded:: 1.1
.. versionchanged:: 1.2
Import paths for the decorators below were changed.

2
docs/ref/contrib/flatpages.txt
View File

@@ -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.

2
docs/ref/contrib/formtools/form-wizard.txt
View File

@@ -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

8
docs/ref/contrib/gis/gdal.txt
View File

@@ -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__
@@ -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
@@ -889,8 +885,6 @@ systems and coordinate transformation::
.. method:: expand_to_include(self, *args)
.. versionadded:: 1.1
Coordinate System Objects
=========================
@@ -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)

7
docs/ref/contrib/gis/geoquerysets.txt
View File

@@ -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.
@@ -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
@@ -1102,7 +1098,6 @@ the ``GeoQuerySet``; otherwise sets with ``None``.
Spatial Aggregates
==================
.. versionadded:: 1.1
Aggregate Methods
-----------------
@@ -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

88
docs/ref/contrib/gis/geos.txt
View File

@@ -33,10 +33,10 @@ features include:
* A BSD-licensed interface to the GEOS geometry routines, implemented purely
in Python using ``ctypes``.
* Loosely-coupled to GeoDjango. For example, :class:`GEOSGeometry` objects
may be used outside of a django project/application. In other words,
may be used outside of a django project/application. In other words,
no need to have ``DJANGO_SETTINGS_MODULE`` set or use a database, etc.
* Mutability: :class:`GEOSGeometry` objects may be modified.
* Cross-platform and tested; compatible with Windows, Linux, Solaris, and Mac
* Cross-platform and tested; compatible with Windows, Linux, Solaris, and Mac
OS X platforms.
.. _geos-tutorial:
@@ -44,7 +44,7 @@ features include:
Tutorial
========
This section contains a brief introduction and tutorial to using
This section contains a brief introduction and tutorial to using
:class:`GEOSGeometry` objects.
Creating a Geometry
@@ -75,7 +75,7 @@ return a :class:`GEOSGeometry` object from an input string or a file::
>>> pnt = fromfile('/path/to/pnt.wkt')
>>> pnt = fromfile(open('/path/to/pnt.wkt'))
Geometries are Pythonic
Geometries are Pythonic
-----------------------
:class:`GEOSGeometry` objects are 'Pythonic', in other words components may
be accessed, modified, and iterated over using standard Python conventions.
@@ -146,7 +146,7 @@ are accepted:
============= ======================
Format Input Type
============= ======================
WKT / EWKT ``str`` or ``unicode``
WKT / EWKT ``str`` or ``unicode``
HEX / HEXEWKB ``str`` or ``unicode``
WKB / EWKB ``buffer``
GeoJSON ``str`` or ``unicode``
@@ -161,7 +161,7 @@ Returns the coordinates of the geometry as a tuple.
.. attribute:: GEOSGeometry.empty
Returns whether or not the set of points in the geometry is empty.
Returns whether or not the set of points in the geometry is empty.
.. attribute:: GEOSGeometry.geom_type
@@ -219,11 +219,11 @@ definition.
Returns a boolean indicating whether the geometry is valid.
.. attribute:: GEOSGeometry.valid_reason
.. attribute:: GEOSGeometry.valid_reason
.. versionadded:: 1.3
.. versionadded:: 1.3
Returns a string describing the reason why a geometry is invalid.
Returns a string describing the reason why a geometry is invalid.
.. attribute:: GEOSGeometry.srid
@@ -248,27 +248,27 @@ another object.
Returns the "extended" Well-Known Text of the geometry. This representation
is specific to PostGIS and is a super set of the OGC WKT standard. [#fnogc]_
Essentially the SRID is prepended to the WKT representation, for example
``SRID=4326;POINT(5 23)``.
Essentially the SRID is prepended to the WKT representation, for example
``SRID=4326;POINT(5 23)``.
.. note::
The output from this property does not include the 3dm, 3dz, and 4d
The output from this property does not include the 3dm, 3dz, and 4d
information that PostGIS supports in its EWKT representations.
.. attribute:: GEOSGeometry.hex
Returns the WKB of this Geometry in hexadecimal form. Please note
that the SRID and Z values are not included in this representation
because it is not a part of the OGC specification (use the
because it is not a part of the OGC specification (use the
:attr:`GEOSGeometry.hexewkb` property instead).
.. attribute:: GEOSGeometry.hexewkb
.. versionadded:: 1.2
Returns the EWKB of this Geometry in hexadecimal form. This is an
extension of the WKB specification that includes SRID and Z values
Returns the EWKB of this Geometry in hexadecimal form. This is an
extension of the WKB specification that includes SRID and Z values
that are a part of this geometry.
.. note::
@@ -290,12 +290,12 @@ Alias for :attr:`GEOSGeometry.json`.
.. attribute:: GEOSGeometry.kml
Returns a `KML`__ (Keyhole Markup Language) representation of the
geometry. This should only be used for geometries with an SRID of
geometry. This should only be used for geometries with an SRID of
4326 (WGS84), but this restriction is not enforced.
.. attribute:: GEOSGeometry.ogr
Returns an :class:`~django.contrib.gis.gdal.OGRGeometry` object
Returns an :class:`~django.contrib.gis.gdal.OGRGeometry` object
correspondg to the GEOS geometry.
.. note::
@@ -344,7 +344,7 @@ Returns ``True`` if :meth:`GEOSGeometry.within` is ``False``.
.. method:: GEOSGeometry.crosses(other)
Returns ``True`` if the DE-9IM intersection matrix for the two Geometries
is ``T*T******`` (for a point and a curve,a point and an area or a line
is ``T*T******`` (for a point and a curve,a point and an area or a line
and an area) ``0********`` (for two curves).
.. method:: GEOSGeometry.disjoint(other)
@@ -354,7 +354,7 @@ is ``FF*FF****``.
.. method:: GEOSGeometry.equals(other)
Returns ``True`` if the DE-9IM intersection matrix for the two geometries
Returns ``True`` if the DE-9IM intersection matrix for the two geometries
is ``T*F**FFF*``.
.. method:: GEOSGeometry.equals_exact(other, tolerance=0)
@@ -377,8 +377,8 @@ is ``T*T***T**`` (for two points or two surfaces) ``1*T***T**``
.. method:: GEOSGeometry.relate_pattern(other, pattern)
Returns ``True`` if the elements in the DE-9IM intersection matrix
for this geometry and the other matches the given ``pattern`` --
Returns ``True`` if the elements in the DE-9IM intersection matrix
for this geometry and the other matches the given ``pattern`` --
a string of nine characters from the alphabet: {``T``, ``F``, ``*``, ``0``}.
.. method:: GEOSGeometry.touches(other)
@@ -397,8 +397,8 @@ Topological Methods
.. method:: GEOSGeometry.buffer(width, quadsegs=8)
Returns a :class:`GEOSGeometry` that represents all points whose distance
from this geometry is less than or equal to the given ``width``. The optional
``quadsegs`` keyword sets the number of segments used to approximate a
from this geometry is less than or equal to the given ``width``. The optional
``quadsegs`` keyword sets the number of segments used to approximate a
quarter circle (defaults is 8).
.. method:: GEOSGeometry.difference(other)
@@ -423,21 +423,21 @@ algorithm to the specified tolerance. A higher tolerance value implies
less points in the output. If no tolerance is tolerance provided,
it defaults to 0.
By default, this function does not preserve topology - e.g.,
By default, this function does not preserve topology - e.g.,
:class:`Polygon` objects can be split, collapsed into lines or disappear.
:class:`Polygon` holes can be created or disappear, and lines can cross.
By specifying ``preserve_topology=True``, the result will have the same
dimension and number of components as the input, however, this is
significantly slower.
dimension and number of components as the input, however, this is
significantly slower.
.. method:: GEOSGeometry.sym_difference(other)
Returns a :class:`GEOSGeometry` combining the points in this geometry
Returns a :class:`GEOSGeometry` combining the points in this geometry
not in other, and the points in other not in this geometry.
.. method:: GEOSGeometry.union(other)
Returns a :class:`GEOSGeometry` representing all the points in this
Returns a :class:`GEOSGeometry` representing all the points in this
geometry and the other.
Topological Properties
@@ -477,7 +477,7 @@ This property returns the area of the Geometry.
.. attribute:: GEOSGeometry.extent
This property returns the extent of this geometry as a 4-tuple,
This property returns the extent of this geometry as a 4-tuple,
consisting of (xmin, ymin, xmax, ymax).
.. method:: GEOSGeometry.clone()
@@ -492,24 +492,22 @@ Returns the distance between the closest points on this geometry and the given
.. note::
GEOS distance calculations are linear -- in other words, GEOS does not
perform a spherical calculation even if the SRID specifies a geographic
perform a spherical calculation even if the SRID specifies a geographic
coordinate system.
.. attribute:: GEOSGeometry.length
Returns the length of this geometry (e.g., 0 for a :class:`Point`,
the length of a :class:`LineString`, or the circumference of
Returns the length of this geometry (e.g., 0 for a :class:`Point`,
the length of a :class:`LineString`, or the circumference of
a :class:`Polygon`).
.. attribute:: GEOSGeometry.prepared
.. versionadded:: 1.1
.. note::
Support for prepared geometries requires GEOS 3.1.
Returns a GEOS ``PreparedGeometry`` for the contents of this geometry.
Returns a GEOS ``PreparedGeometry`` for the contents of this geometry.
``PreparedGeometry`` objects are optimized for the contains, intersects,
and covers operations. Refer to the :ref:`prepared-geometries` documentation
for more information.
@@ -529,7 +527,7 @@ corresponding to the SRID of the geometry or ``None``.
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
a PROJ.4 string, a :class:`~django.contrib.gis.gdal.SpatialReference` object, or a
:class:`~django.contrib.gis.gdal.CoordTransform` object. By default, the geometry
is transformed in-place and nothing is returned. However if the ``clone`` keyword
is set, then the geometry is not modified and a transformed clone of the geometry
@@ -611,8 +609,6 @@ is returned instead.
.. classmethod:: from_bbox(bbox)
.. versionadded:: 1.1
Returns a polygon object from the given bounding-box, a 4-tuple
comprising (xmin, ymin, xmax, ymax).
@@ -651,11 +647,9 @@ Geometry Collections
.. attribute:: merged
.. versionadded:: 1.1
Returns a :class:`LineString` representing the line merge of
all the components in this ``MultiLineString``.
``MultiPolygon``
----------------
@@ -673,8 +667,6 @@ Geometry Collections
.. attribute:: cascaded_union
.. versionadded:: 1.1
Returns a :class:`Polygon` that is the union of all of the component
polygons in this collection. The algorithm employed is significantly
more efficient (faster) than trying to union the geometries together
@@ -702,13 +694,11 @@ Geometry Collections
Prepared Geometries
===================
.. versionadded: 1.1
In order to obtain a prepared geometry, just access the
:attr:`GEOSGeometry.prepared` property. Once you have a
``PreparedGeometry`` instance its spatial predicate methods, listed below,
may be used with other ``GEOSGeometry`` objects. An operation with a prepared
geometry can be orders of magnitude faster -- the more complex the geometry
geometry can be orders of magnitude faster -- the more complex the geometry
that is prepared, the larger the speedup in the operation. For more information,
please consult the `GEOS wiki page on prepared geometries <http://trac.osgeo.org/geos/wiki/PreparedGeometry>`_.
@@ -770,8 +760,6 @@ Example::
I/O Objects
===========
.. versionadded: 1.1
Reader Objects
--------------
@@ -807,7 +795,7 @@ include the SRID and 3D values (in other words, EWKB).
.. class:: WKBWriter
``WKBWriter`` provides the most control over its output. By default it
returns OGC-compliant WKB when it's ``write`` method is called. However,
returns OGC-compliant WKB when it's ``write`` method is called. However,
it has properties that allow for the creation of EWKB, a superset of the
WKB standard that includes additional information.
@@ -925,5 +913,5 @@ location (e.g., ``/home/bob/lib/libgeos_c.so``).
.. note::
The setting must be the *full* path to the **C** shared library; in
The setting must be the *full* path to the **C** shared library; in
other words you want to use ``libgeos_c.so``, not ``libgeos.so``.

2
docs/ref/contrib/gis/index.txt
View File

@@ -4,8 +4,6 @@
GeoDjango
=========
.. versionadded:: 1.0
.. module:: django.contrib.gis
:synopsis: Geographic Information System (GIS) extensions for Django

1
docs/ref/contrib/gis/install.txt
View File

@@ -357,7 +357,6 @@ file::
SpatiaLite
----------
.. versionadded:: 1.1
.. note::

10
docs/ref/contrib/gis/testing.txt
View File

@@ -28,8 +28,6 @@ Settings
``POSTGIS_TEMPLATE``
^^^^^^^^^^^^^^^^^^^^
.. versionadded:: 1.1
.. versionchanged:: 1.2
This setting may be used to customize the name of the PostGIS template
@@ -42,8 +40,6 @@ defaults to ``'template_postgis'`` (the same name used in the
``POSTGIS_VERSION``
^^^^^^^^^^^^^^^^^^^
.. versionadded:: 1.1
When GeoDjango's spatial backend initializes on PostGIS, it has to perform
a SQL query to determine the version in order to figure out what
features are available. Advanced users wishing to prevent this additional
@@ -118,8 +114,6 @@ spatial database entitled ``template_postgis``.
SpatiaLite
==========
.. versionadded:: 1.1
You will need to download the `initialization SQL`__ script for SpatiaLite::
$ wget http://www.gaia-gis.it/spatialite/init_spatialite-2.3.zip
@@ -138,8 +132,6 @@ Settings
``SPATIALITE_SQL``
^^^^^^^^^^^^^^^^^^
.. versionadded:: 1.1
By default, the GeoDjango test runner looks for the SpatiaLite SQL in the
same directory where it was invoked (by default the same directory where
``manage.py`` is located). If you want to use a different location, then
@@ -201,7 +193,7 @@ all of the databases in the settings file must be using one of the
.. warning::
Do not change the :setting:`TEST_RUNNER` setting
Do not change the :setting:`TEST_RUNNER` setting
when running the GeoDjango tests with ``runtests.py``.
Example

2
docs/ref/contrib/humanize.txt
View File

@@ -68,8 +68,6 @@ You can pass in either an integer or a string representation of an integer.
naturalday
----------
.. versionadded:: 1.0
For dates that are the current day or within one day, return "today",
"tomorrow" or "yesterday", as appropriate. Otherwise, format the date using
the passed in format string.

4
docs/ref/contrib/index.txt
View File

@@ -61,10 +61,6 @@ See :doc:`/topics/auth`.
comments
========
.. versionchanged:: 1.0
The comments application has been rewriten. See :doc:`/ref/contrib/comments/upgrade`
for information on howto upgrade.
A simple yet flexible comments system. See :doc:`/ref/contrib/comments/index`.
contenttypes

2
docs/ref/contrib/sitemaps.txt
View File

@@ -365,8 +365,6 @@ Pinging Google via `manage.py`
.. django-admin:: ping_google
.. versionadded:: 1.0
Once the sitemaps application is added to your project, you may also
ping Google using the ``ping_google`` management command::

4
docs/ref/contrib/sites.txt
View File

@@ -240,8 +240,6 @@ To do this, you can use the sites framework. A simple example::
Caching the current ``Site`` object
===================================
.. versionadded:: 1.0
As the current site is stored in the database, each call to
``Site.objects.get_current()`` could result in a database query. But Django is a
little cleverer than that: on the first request, the current site is cached, and
@@ -395,8 +393,6 @@ Here's how Django uses the sites framework:
.. _requestsite-objects:
.. versionadded:: 1.0
Some :doc:`django.contrib </ref/contrib/index>` applications take advantage of
the sites framework but are architected in a way that doesn't *require* the
sites framework to be installed in your database. (Some people don't want to, or