summaryrefslogtreecommitdiff
path: root/docs/ref/models
diff options
context:
space:
mode:
authorTimo Graham <timograham@gmail.com>2010-12-26 00:46:36 +0000
committerTimo Graham <timograham@gmail.com>2010-12-26 00:46:36 +0000
commit89cb543f9e4f823fe53140c3b597e2d4b6418562 (patch)
tree5152a46990fe4fe8833484096a973a725803a051 /docs/ref/models
parent40f2bb37c9e3c5f11716f513a4739a88bc82ca34 (diff)
[1.2.X] Fixed #14000 - Remove versionadded/changed tags for 1.0. thanks ramiro!
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15056 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/models')
-rw-r--r--docs/ref/models/fields.txt21
-rw-r--r--docs/ref/models/instances.txt7
-rw-r--r--docs/ref/models/options.txt4
-rw-r--r--docs/ref/models/querysets.txt37
4 files changed, 0 insertions, 69 deletions
diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt
index 146ca43828..99d9b29830 100644
--- a/docs/ref/models/fields.txt
+++ b/docs/ref/models/fields.txt
@@ -173,8 +173,6 @@ If ``True``, djadmin:`django-admin.py sqlindexes <sqlindexes>` will output a
.. attribute:: Field.db_tablespace
-.. versionadded:: 1.0
-
The name of the database tablespace to use for this field's index, if this field
is indexed. The default is the project's :setting:`DEFAULT_INDEX_TABLESPACE`
setting, if set, or the :attr:`~Field.db_tablespace` of the model, if any. If
@@ -432,8 +430,6 @@ JavaScript shortcuts.
``DecimalField``
----------------
-.. versionadded:: 1.0
-
.. class:: DecimalField(max_digits=None, decimal_places=None, [**options])
A fixed-precision decimal number, represented in Python by a
@@ -489,8 +485,6 @@ Has one **required** argument:
date/time of the file upload (so that uploaded files don't fill up the given
directory).
- .. versionchanged:: 1.0
-
This may also be a callable, such as a function, which will be called to
obtain the upload path, including the filename. This callable must be able
to accept two arguments, and return a Unix-style path (with forward slashes)
@@ -519,8 +513,6 @@ Also has one optional argument:
.. attribute:: FileField.storage
- .. versionadded:: 1.0
-
Optional. A storage object, which handles the storage and retrieval of your
files. See :doc:`/topics/files` for details on how to provide this object.
@@ -567,9 +559,6 @@ without validation, to a directory that's within your Web server's document
root, then somebody could upload a CGI or PHP script and execute that script by
visiting its URL on your site. Don't allow that.
-.. versionadded:: 1.0
- The ``max_length`` argument was added in this version.
-
By default, :class:`FileField` instances are
created as ``varchar(100)`` columns in your database. As with other fields, you
can change the maximum length using the :attr:`~CharField.max_length` argument.
@@ -652,9 +641,6 @@ base filename, not the full path. So, this example::
because the :attr:`~FilePathField.match` applies to the base filename
(``foo.gif`` and ``bar.gif``).
-.. versionadded:: 1.0
- The ``max_length`` argument was added in this version.
-
By default, :class:`FilePathField` instances are
created as ``varchar(100)`` columns in your database. As with other fields, you
can change the maximum length using the :attr:`~CharField.max_length` argument.
@@ -664,8 +650,6 @@ can change the maximum length using the :attr:`~CharField.max_length` argument.
.. class:: FloatField([**options])
-.. versionchanged:: 1.0
-
A floating-point number represented in Python by a ``float`` instance.
The admin represents this as an ``<input type="text">`` (a single-line input).
@@ -699,9 +683,6 @@ Requires the `Python Imaging Library`_.
.. _Python Imaging Library: http://www.pythonware.com/products/pil/
-.. versionadded:: 1.0
- The ``max_length`` argument was added in this version.
-
By default, :class:`ImageField` instances are created as ``varchar(100)``
columns in your database. As with other fields, you can change the maximum
length using the :attr:`~CharField.max_length` argument.
@@ -874,8 +855,6 @@ you can use the name of the model, rather than the model object itself::
class Manufacturer(models.Model):
# ...
-.. versionadded:: 1.0
-
To refer to models defined in another application, you can explicitly specify
a model with the full application label. For example, if the ``Manufacturer``
model above is defined in another application called ``production``, you'd
diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt
index 1730ec69c0..a5e19e6b64 100644
--- a/docs/ref/models/instances.txt
+++ b/docs/ref/models/instances.txt
@@ -133,9 +133,6 @@ To save an object back to the database, call ``save()``:
.. method:: Model.save([force_insert=False, force_update=False, using=DEFAULT_DB_ALIAS])
-.. versionadded:: 1.0
- The ``force_insert`` and ``force_update`` arguments were added.
-
.. versionadded:: 1.2
The ``using`` argument was added.
@@ -168,8 +165,6 @@ documentation for ``AutoField`` for more details.
The ``pk`` property
~~~~~~~~~~~~~~~~~~~
-.. versionadded:: 1.0
-
.. attribute:: Model.pk
Regardless of whether you define a primary key field yourself, or let Django
@@ -278,8 +273,6 @@ auto-primary-key values`_ above and `Forcing an INSERT or UPDATE`_ below.
Forcing an INSERT or UPDATE
~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.. versionadded:: 1.0
-
In some rare circumstances, it's necessary to be able to force the ``save()``
method to perform an SQL ``INSERT`` and not fall back to doing an ``UPDATE``.
Or vice-versa: update, if possible, but not insert a new row. In these cases
diff --git a/docs/ref/models/options.txt b/docs/ref/models/options.txt
index e82974fa25..3109f34aae 100644
--- a/docs/ref/models/options.txt
+++ b/docs/ref/models/options.txt
@@ -65,8 +65,6 @@ Django quotes column and table names behind the scenes.
.. attribute:: Options.db_tablespace
-.. versionadded:: 1.0
-
The name of the database tablespace to use for the model. If the backend doesn't
support tablespaces, this option is ignored.
@@ -238,8 +236,6 @@ It's used in the Django admin and is enforced at the database level (i.e., the
appropriate ``UNIQUE`` statements are included in the ``CREATE TABLE``
statement).
-.. versionadded:: 1.0
-
For convenience, unique_together can be a single list when dealing with a single
set of fields::
diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index 9f0de1f352..b67837aba9 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -279,13 +279,6 @@ ordering piece of data for each of the main items you are selecting, the
ordering may well be exactly what you want to do. Use ordering on multi-valued
fields with care and make sure the results are what you expect.
-.. versionadded:: 1.0
-
-The syntax for ordering across related models has changed. See the `Django 0.96
-documentation`_ for the old behaviour.
-
-.. _Django 0.96 documentation: http://www.djangoproject.com/documentation/0.96/model-api/#floatfield
-
There's no way to specify whether ordering should be case sensitive. With
respect to case-sensitivity, Django will order results however your database
backend normally orders them.
@@ -304,8 +297,6 @@ reverse
.. method:: reverse()
-.. versionadded:: 1.0
-
Use the ``reverse()`` method to reverse the order in which a queryset's
elements are returned. Calling ``reverse()`` a second time restores the
ordering back to the normal direction.
@@ -432,11 +423,6 @@ A couple of subtleties that are worth mentioning:
if the ``extra()`` clause is used after the ``values()``, the
fields added by the select will be included automatically.
-.. versionadded:: 1.0
-
-Previously, it was not possible to pass ``blog_id`` to ``values()`` in the above
-example, only ``blog``.
-
A ``ValuesQuerySet`` is useful when you know you're only going to need values
from a small number of the available fields and you won't need the
functionality of a model instance object. It's more efficient to select only
@@ -459,8 +445,6 @@ values_list
.. method:: values_list(*fields)
-.. versionadded:: 1.0
-
This is similar to ``values()`` except that instead of returning dictionaries,
it returns tuples when iterated over. Each tuple contains the value from the
respective field passed into the ``values_list()`` call -- so the first item is
@@ -525,8 +509,6 @@ none
.. method:: none()
-.. versionadded:: 1.0
-
Returns an ``EmptyQuerySet`` -- a ``QuerySet`` that always evaluates to
an empty list. This can be used in cases where you know that you should
return an empty result set and your caller is expecting a ``QuerySet``
@@ -542,8 +524,6 @@ all
.. method:: all()
-.. versionadded:: 1.0
-
Returns a *copy* of the current ``QuerySet`` (or ``QuerySet`` subclass you
pass in). This can be useful in some situations where you might want to pass
in either a model manager or a ``QuerySet`` and do further filtering on the
@@ -657,11 +637,6 @@ call). It's an error to use both a list of fields and the ``depth``
parameter in the same ``select_related()`` call, since they are
conflicting options.
-.. versionadded:: 1.0
-
-Both the ``depth`` argument and the ability to specify field names in the call
-to ``select_related()`` are new in Django version 1.0.
-
.. versionchanged:: 1.2
You can also refer to the reverse direction of a ``OneToOneFields`` in
@@ -734,8 +709,6 @@ of the arguments is required, but you should use at least one of them.
some database backends, such as some MySQL versions, don't support
subqueries.
- .. versionadded:: 1.0
-
In some rare cases, you might wish to pass parameters to the SQL fragments
in ``extra(select=...)``. For this purpose, use the ``select_params``
parameter. Since ``select_params`` is a sequence and the ``select``
@@ -1309,12 +1282,6 @@ SQL equivalents::
SELECT ... WHERE id = 14;
SELECT ... WHERE id IS NULL;
-.. versionchanged:: 1.0
- The semantics of ``id__exact=None`` have changed in Django 1.0. Previously,
- it was (intentionally) converted to ``WHERE id = NULL`` at the SQL level,
- which would never match anything. It has now been changed to behave the
- same as ``id__isnull=True``.
-
.. admonition:: MySQL comparisons
In MySQL, a database table's "collation" setting determines whether
@@ -1723,8 +1690,6 @@ full text searches. `See the MySQL documentation for additional details.
regex
~~~~~
-.. versionadded:: 1.0
-
Case-sensitive regular expression match.
The regular expression syntax is that of the database backend in use.
@@ -1754,8 +1719,6 @@ regular expression syntax is recommended.
iregex
~~~~~~
-.. versionadded:: 1.0
-
Case-insensitive regular expression match.
Example::