diff options
| author | Timo Graham <timograham@gmail.com> | 2010-12-26 00:46:36 +0000 |
|---|---|---|
| committer | Timo Graham <timograham@gmail.com> | 2010-12-26 00:46:36 +0000 |
| commit | 89cb543f9e4f823fe53140c3b597e2d4b6418562 (patch) | |
| tree | 5152a46990fe4fe8833484096a973a725803a051 /docs/ref | |
| parent | 40f2bb37c9e3c5f11716f513a4739a88bc82ca34 (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')
| -rw-r--r-- | docs/ref/contrib/flatpages.txt | 18 | ||||
| -rw-r--r-- | docs/ref/contrib/formtools/form-wizard.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/index.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/humanize.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/index.txt | 4 | ||||
| -rw-r--r-- | docs/ref/contrib/sitemaps.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/sites.txt | 4 | ||||
| -rw-r--r-- | docs/ref/databases.txt | 2 | ||||
| -rw-r--r-- | docs/ref/django-admin.txt | 14 | ||||
| -rw-r--r-- | docs/ref/forms/api.txt | 5 | ||||
| -rw-r--r-- | docs/ref/forms/fields.txt | 18 | ||||
| -rw-r--r-- | docs/ref/forms/widgets.txt | 2 | ||||
| -rw-r--r-- | docs/ref/generic-views.txt | 12 | ||||
| -rw-r--r-- | docs/ref/middleware.txt | 7 | ||||
| -rw-r--r-- | docs/ref/models/fields.txt | 21 | ||||
| -rw-r--r-- | docs/ref/models/instances.txt | 7 | ||||
| -rw-r--r-- | docs/ref/models/options.txt | 4 | ||||
| -rw-r--r-- | docs/ref/models/querysets.txt | 37 | ||||
| -rw-r--r-- | docs/ref/request-response.txt | 12 | ||||
| -rw-r--r-- | docs/ref/settings.txt | 30 | ||||
| -rw-r--r-- | docs/ref/templates/api.txt | 2 | ||||
| -rw-r--r-- | docs/ref/templates/builtins.txt | 34 | ||||
| -rw-r--r-- | docs/ref/unicode.txt | 2 |
23 files changed, 14 insertions, 229 deletions
diff --git a/docs/ref/contrib/flatpages.txt b/docs/ref/contrib/flatpages.txt index 46b28dcfb2..5743382ed3 100644 --- a/docs/ref/contrib/flatpages.txt +++ b/docs/ref/contrib/flatpages.txt @@ -17,9 +17,7 @@ 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 +The content field may optionally be left blank if you prefer to put your content in a custom template. Here are some examples of flatpages on Django-powered sites: @@ -35,20 +33,20 @@ To install the flatpages app, follow these steps: 1. Install the :mod:`sites framework <django.contrib.sites>` by adding ``'django.contrib.sites'`` to your :setting:`INSTALLED_APPS` setting, if it's not already in there. - + Also make sure you've correctly set :setting:`SITE_ID` to the ID of the site the settings file represents. This will usually be ``1`` (i.e. ``SITE_ID = 1``, but if you're using the sites framework to manage multiple sites, it could be the ID of a different site. - + 2. Add ``'django.contrib.flatpages'`` to your :setting:`INSTALLED_APPS` setting. - + 3. Add ``'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware'`` to your :setting:`MIDDLEWARE_CLASSES` setting. - + 4. Run the command :djadmin:`manage.py syncdb <syncdb>`. - + How it works ============ @@ -67,7 +65,7 @@ If it finds a match, it follows this algorithm: * If the flatpage has a custom template, it loads that template. Otherwise, it loads the template :file:`flatpages/default.html`. - + * It passes that template a single context variable, :data:`flatpage`, which is the flatpage object. It uses :class:`~django.template.context.RequestContext` in rendering the @@ -94,7 +92,7 @@ For more on middleware, read the :doc:`middleware docs </topics/http/middleware>`. .. admonition:: Ensure that your 404 template works - + Note that the :class:`~django.contrib.flatpages.middleware.FlatpageFallbackMiddleware` only steps in once another view has successfully produced a 404 response. diff --git a/docs/ref/contrib/formtools/form-wizard.txt b/docs/ref/contrib/formtools/form-wizard.txt index 390d575cd3..c1f7317bb2 100644 --- a/docs/ref/contrib/formtools/form-wizard.txt +++ b/docs/ref/contrib/formtools/form-wizard.txt @@ -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 diff --git a/docs/ref/contrib/gis/index.txt b/docs/ref/contrib/gis/index.txt index c4959e0f84..7a4b447453 100644 --- a/docs/ref/contrib/gis/index.txt +++ b/docs/ref/contrib/gis/index.txt @@ -4,8 +4,6 @@ GeoDjango ========= -.. versionadded:: 1.0 - .. module:: django.contrib.gis :synopsis: Geographic Information System (GIS) extensions for Django diff --git a/docs/ref/contrib/humanize.txt b/docs/ref/contrib/humanize.txt index b5ec51840b..ef48f48fcc 100644 --- a/docs/ref/contrib/humanize.txt +++ b/docs/ref/contrib/humanize.txt @@ -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. diff --git a/docs/ref/contrib/index.txt b/docs/ref/contrib/index.txt index 90edf72c94..4c20cd5a36 100644 --- a/docs/ref/contrib/index.txt +++ b/docs/ref/contrib/index.txt @@ -60,10 +60,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 diff --git a/docs/ref/contrib/sitemaps.txt b/docs/ref/contrib/sitemaps.txt index eb29c6c0f0..7372359ed6 100644 --- a/docs/ref/contrib/sitemaps.txt +++ b/docs/ref/contrib/sitemaps.txt @@ -343,8 +343,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:: diff --git a/docs/ref/contrib/sites.txt b/docs/ref/contrib/sites.txt index 6d795d056c..5c1868fd87 100644 --- a/docs/ref/contrib/sites.txt +++ b/docs/ref/contrib/sites.txt @@ -238,8 +238,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 @@ -393,8 +391,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 diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index c49a3fc381..0ac5caaf87 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -601,8 +601,6 @@ many-to-many table would be stored in the ``indexes`` tablespace. The ``data`` field would also generate an index, but no tablespace for it is specified, so it would be stored in the model tablespace ``tables`` by default. -.. versionadded:: 1.0 - Use the :setting:`DEFAULT_TABLESPACE` and :setting:`DEFAULT_INDEX_TABLESPACE` settings to specify default values for the db_tablespace options. These are useful for setting a tablespace for the built-in Django apps and diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 70faa3c90d..11f62fb958 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -88,8 +88,6 @@ cleanup .. django-admin:: cleanup -.. versionadded:: 1.0 - Can be run as a cronjob or directly to clean out old data from the database (only expired sessions at the moment). @@ -98,9 +96,6 @@ compilemessages .. django-admin:: compilemessages -.. versionchanged:: 1.0 - Before 1.0 this was the "bin/compile-messages.py" command. - Compiles .po files created with ``makemessages`` to .mo files for use with the builtin gettext support. See :doc:`/topics/i18n/index`. @@ -191,8 +186,6 @@ By default, ``dumpdata`` will output all data on a single line. This isn't easy for humans to read, so you can use the ``--indent`` option to pretty-print the output with a number of indentation spaces. -.. versionadded:: 1.0 - The :djadminopt:`--exclude` option may be provided to prevent specific applications from being dumped. @@ -396,9 +389,6 @@ makemessages .. django-admin:: makemessages -.. versionchanged:: 1.0 - Before 1.0 this was the ``bin/make-messages.py`` command. - Runs over the entire source tree of the current directory and pulls out all strings marked for translation. It creates (or updates) a message file in the conf/locale (in the django tree) or locale (for project and application) @@ -910,8 +900,6 @@ testserver <fixture fixture ...> .. django-admin:: testserver -.. versionadded:: 1.0 - Runs a Django development server (as in ``runserver``) using data from the given fixture(s). @@ -1009,8 +997,6 @@ createsuperuser .. django-admin:: createsuperuser -.. versionadded:: 1.0 - This command is only available if Django's :doc:`authentication system </topics/auth>` (``django.contrib.auth``) is installed. diff --git a/docs/ref/forms/api.txt b/docs/ref/forms/api.txt index 613d7544a9..e0aa73a289 100644 --- a/docs/ref/forms/api.txt +++ b/docs/ref/forms/api.txt @@ -195,9 +195,6 @@ it, you can access the clean data via its ``cleaned_data`` attribute:: >>> f.cleaned_data {'cc_myself': True, 'message': u'Hi there', 'sender': u'foo@example.com', 'subject': u'hello'} -.. versionchanged:: 1.0 - The ``cleaned_data`` attribute was called ``clean_data`` in earlier releases. - Note that any text-based field -- such as ``CharField`` or ``EmailField`` -- always cleans the input into a Unicode string. We'll cover the encoding implications later in this document. @@ -667,8 +664,6 @@ those classes as an argument:: Binding uploaded files to a form -------------------------------- -.. versionadded:: 1.0 - Dealing with forms that have ``FileField`` and ``ImageField`` fields is a little more complicated than a normal form. diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt index 91f245a0ac..8c36d0652d 100644 --- a/docs/ref/forms/fields.txt +++ b/docs/ref/forms/fields.txt @@ -230,8 +230,6 @@ fields. We've specified ``auto_id=False`` to simplify the output:: ``error_messages`` ~~~~~~~~~~~~~~~~~~ -.. versionadded:: 1.0 - .. attribute:: Field.error_messages The ``error_messages`` argument lets you override the default messages that the @@ -303,11 +301,6 @@ For each field, we describe the default widget used if you don't specify the field has ``required=True``. * Error message keys: ``required`` -.. versionchanged:: 1.0 - The empty value for a ``CheckboxInput`` (and hence the standard - ``BooleanField``) has changed to return ``False`` instead of ``None`` in - the Django 1.0. - .. note:: Since all ``Field`` subclasses have ``required=True`` by default, the @@ -445,14 +438,9 @@ If no ``input_formats`` argument is provided, the default input formats are:: '%m/%d/%y %H:%M', # '10/25/06 14:30' '%m/%d/%y', # '10/25/06' -.. versionchanged:: 1.0 - The ``DateTimeField`` used to use a ``TextInput`` widget by default. This has now changed. - ``DecimalField`` ~~~~~~~~~~~~~~~~ -.. versionadded:: 1.0 - .. class:: DecimalField(**kwargs) * Default widget: ``TextInput`` @@ -505,8 +493,6 @@ given length. ``FileField`` ~~~~~~~~~~~~~ -.. versionadded:: 1.0 - .. class:: FileField(**kwargs) * Default widget: ``FileInput`` @@ -525,8 +511,6 @@ When you use a ``FileField`` in a form, you must also remember to ``FilePathField`` ~~~~~~~~~~~~~~~~~ -.. versionadded:: 1.0 - .. class:: FilePathField(**kwargs) * Default widget: ``Select`` @@ -571,8 +555,6 @@ These control the range of values permitted in the field. ``ImageField`` ~~~~~~~~~~~~~~ -.. versionadded:: 1.0 - .. class:: ImageField(**kwargs) * Default widget: ``FileInput`` diff --git a/docs/ref/forms/widgets.txt b/docs/ref/forms/widgets.txt index 9d78b8438e..7ca2adde84 100644 --- a/docs/ref/forms/widgets.txt +++ b/docs/ref/forms/widgets.txt @@ -57,8 +57,6 @@ commonly used groups of widgets: .. class:: DateTimeInput - .. versionadded:: 1.0 - Date/time input as a simple text box: ``<input type='text' ...>`` Takes one optional argument: diff --git a/docs/ref/generic-views.txt b/docs/ref/generic-views.txt index ea7fe2a49b..f0ce446875 100644 --- a/docs/ref/generic-views.txt +++ b/docs/ref/generic-views.txt @@ -176,8 +176,6 @@ a date in the *future* are not included unless you set ``allow_future`` to specified in ``date_field`` is greater than the current date/time. By default, this is ``False``. - .. versionadded:: 1.0 - * ``template_object_name``: Designates the name of the template variable to use in the template context. By default, this is ``'latest'``. @@ -202,9 +200,6 @@ In addition to ``extra_context``, the template's context will be: ``datetime.datetime`` objects. These are ordered in reverse. This is equivalent to ``queryset.dates(date_field, 'year')[::-1]``. - .. versionchanged:: 1.0 - The behaviour depending on ``template_object_name`` is new in this version. - * ``latest``: The ``num_latest`` objects in the system, ordered descending by ``date_field``. For example, if ``num_latest`` is ``10``, then ``latest`` will be a list of the latest 10 objects in ``queryset``. @@ -721,9 +716,6 @@ If ``template_name`` isn't specified, this view will use the template **Template context:** -.. versionadded:: 1.0 - The ``paginator`` and ``page_obj`` context variables are new. - In addition to ``extra_context``, the template's context will be: * ``object_list``: The list of objects. This variable's name depends on the @@ -767,8 +759,6 @@ represented as page ``1``. For more on pagination, read the :doc:`pagination documentation </topics/pagination>`. -.. versionadded:: 1.0 - As a special case, you are also permitted to use ``last`` as a value for ``page``:: @@ -853,8 +843,6 @@ Create/update/delete generic views The ``django.views.generic.create_update`` module contains a set of functions for creating, editing and deleting objects. -.. versionchanged:: 1.0 - ``django.views.generic.create_update.create_object`` and ``django.views.generic.create_update.update_object`` now use the new :doc:`forms library </topics/forms/index>` to build and display the form. diff --git a/docs/ref/middleware.txt b/docs/ref/middleware.txt index b3ddb23628..b1334a07cb 100644 --- a/docs/ref/middleware.txt +++ b/docs/ref/middleware.txt @@ -52,11 +52,6 @@ Adds a few conveniences for perfectionists: you don't have a valid URL pattern for ``foo.com/bar`` but *do* have a valid pattern for ``foo.com/bar/``. - .. versionchanged:: 1.0 - The behavior of :setting:`APPEND_SLASH` has changed slightly in this - version. It didn't used to check whether the pattern was matched in - the URLconf. - If :setting:`PREPEND_WWW` is ``True``, URLs that lack a leading "www." will be redirected to the same URL with a leading "www." @@ -186,8 +181,6 @@ CSRF protection middleware .. class:: CsrfMiddleware -.. versionadded:: 1.0 - Adds protection against Cross Site Request Forgeries by adding hidden form fields to POST forms and checking requests for the correct value. See the :doc:`Cross Site Request Forgery protection documentation </ref/contrib/csrf>`. 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:: diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt index c663c1edb5..fd01cf9138 100644 --- a/docs/ref/request-response.txt +++ b/docs/ref/request-response.txt @@ -46,7 +46,7 @@ All attributes except ``session`` should be considered read-only. attr:`~HttpRequest.path` can make your code much easier to move between test and deployment servers. - For example, if the ``django.root`` for your application is set to + For example, if the ``django.root`` for your application is set to ``"/minfo"``, then ``path`` might be ``"/minfo/music/bands/the_beatles/"`` and ``path_info`` would be ``"/music/bands/the_beatles/"``. @@ -117,16 +117,6 @@ All attributes except ``session`` should be considered read-only. ``enctype="multipart/form-data"``. Otherwise, ``FILES`` will be a blank dictionary-like object. - .. versionchanged:: 1.0 - - In previous versions of Django, ``request.FILES`` contained simple ``dict`` - objects representing uploaded files. This is no longer true -- files are - represented by :class:`UploadedFile` objects. - - These :class:`UploadedFile` objects will emulate the old-style ``dict`` - interface, but this is deprecated and will be removed in the next release - of Django. - .. attribute:: HttpRequest.META A standard Python dictionary containing all available HTTP headers. diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index ab1f28c5bd..7cf131e323 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -561,8 +561,6 @@ Never deploy a site into production with ``DEBUG`` turned on. DEBUG_PROPAGATE_EXCEPTIONS -------------------------- -.. versionadded:: 1.0 - Default: ``False`` If set to True, Django's normal exception handling of view functions @@ -628,8 +626,6 @@ site manager(s). DEFAULT_INDEX_TABLESPACE ------------------------ -.. versionadded:: 1.0 - Default: ``''`` (Empty string) Default tablespace to use for indexes on fields that don't specify @@ -640,8 +636,6 @@ one, if the backend supports it. DEFAULT_TABLESPACE ------------------ -.. versionadded:: 1.0 - Default: ``''`` (Empty string) Default tablespace to use for models that don't specify one, if the @@ -744,8 +738,6 @@ trailing space. EMAIL_USE_TLS ------------- -.. versionadded:: 1.0 - Default: ``False`` Whether to use a TLS (secure) connection when talking to the SMTP server. @@ -755,8 +747,6 @@ Whether to use a TLS (secure) connection when talking to the SMTP server. FILE_CHARSET ------------ -.. versionadded:: 1.0 - Default: ``'utf-8'`` The character encoding used to decode any files read from disk. This includes @@ -767,8 +757,6 @@ template files and initial SQL data files. FILE_UPLOAD_HANDLERS -------------------- -.. versionadded:: 1.0 - Default:: ("django.core.files.uploadhandler.MemoryFileUploadHandler", @@ -781,8 +769,6 @@ A tuple of handlers to use for uploading. See :doc:`/topics/files` for details. FILE_UPLOAD_MAX_MEMORY_SIZE --------------------------- -.. versionadded:: 1.0 - Default: ``2621440`` (i.e. 2.5 MB). The maximum size (in bytes) that an upload will be before it gets streamed to @@ -821,8 +807,6 @@ system's standard umask. FILE_UPLOAD_TEMP_DIR -------------------- -.. versionadded:: 1.0 - Default: ``None`` The directory to store data temporarily while uploading files. If ``None``, @@ -968,8 +952,6 @@ standard :term:`language format<language code>`. For example, U.S. English is LANGUAGE_COOKIE_NAME -------------------- -.. versionadded:: 1.0 - Default: ``'django_language'`` The name of the cookie to use for the language cookie. This can be whatever you @@ -1034,8 +1016,6 @@ See :ref:`using-translations-in-your-own-projects`. LOGIN_REDIRECT_URL ------------------ -.. versionadded:: 1.0 - Default: ``'/accounts/profile/'`` The URL where requests are redirected after login when the @@ -1049,8 +1029,6 @@ decorator, for example. LOGIN_URL --------- -.. versionadded:: 1.0 - Default: ``'/accounts/login/'`` The URL where requests are redirected for login, especially when using the @@ -1061,8 +1039,6 @@ The URL where requests are redirected for login, especially when using the LOGOUT_URL ---------- -.. versionadded:: 1.0 - Default: ``'/accounts/logout/'`` LOGIN_URL counterpart. @@ -1337,8 +1313,6 @@ should be different from ``LANGUAGE_COOKIE_NAME``). See the :doc:`/topics/http/s SESSION_COOKIE_PATH ------------------- -.. versionadded:: 1.0 - Default: ``'/'`` The path set on the session cookie. This should either match the URL path of your @@ -1365,8 +1339,6 @@ See the :doc:`/topics/http/sessions`. SESSION_ENGINE -------------- -.. versionadded:: 1.0 - .. versionchanged:: 1.1 The ``cached_db`` backend was added @@ -1396,8 +1368,6 @@ See the :doc:`/topics/http/sessions`. SESSION_FILE_PATH ----------------- -.. versionadded:: 1.0 - Default: ``None`` If you're using file-based session storage, this sets the directory in diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt index 1111869180..1b08542a90 100644 --- a/docs/ref/templates/api.txt +++ b/docs/ref/templates/api.txt @@ -456,8 +456,6 @@ See :doc:`/topics/i18n/index` for more. django.core.context_processors.media ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. versionadded:: 1.0 - If :setting:`TEMPLATE_CONTEXT_PROCESSORS` contains this processor, every ``RequestContext`` will contain a variable ``MEDIA_URL``, providing the value of the :setting:`MEDIA_URL` setting. diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index 44bbc37245..de14481d39 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -19,8 +19,6 @@ Built-in tag reference autoescape ~~~~~~~~~~ -.. versionadded:: 1.0 - Control the current auto-escaping behavior. This tag takes either ``on`` or ``off`` as an argument and that determines whether auto-escaping is in effect inside the block. The block is closed with an ``endautoescape`` ending tag. @@ -72,8 +70,7 @@ Forgeries </ref/contrib/csrf>`. cycle ~~~~~ -.. versionchanged:: 1.0 - Cycle among the given strings or variables each time this tag is encountered. +Cycle among the given strings or variables each time this tag is encountered. Within a loop, cycles among the given strings each time through the loop:: @@ -239,8 +236,6 @@ provided in ``athlete_list``:: You can loop over a list in reverse by using ``{% for obj in list reversed %}``. -.. versionadded:: 1.0 - If you need to loop over a list of lists, you can unpack the values in each sub-list into individual variables. For example, if your context contains a list of (x,y) coordinates called ``points``, you could use the @@ -887,8 +882,6 @@ such as this: The template tag will output the string ``/clients/client/123/``. -.. versionadded:: 1.0 - If you're using :ref:`named URL patterns <naming-url-patterns>`, you can refer to the name of the pattern in the ``url`` tag instead of using the path to the view. @@ -897,8 +890,6 @@ Note that if the URL you're reversing doesn't exist, you'll get an :exc:`NoReverseMatch` exception raised, which will cause your site to display an error page. -.. versionadded:: 1.0 - If you'd like to retrieve a URL without displaying it, you can use a slightly different call:: @@ -960,8 +951,6 @@ which is rounded up to 88). with ~~~~ -.. versionadded:: 1.0 - Caches a complex variable under a simpler name. This is useful when accessing an "expensive" method (e.g., one that hits the database) multiple times. @@ -1281,18 +1270,11 @@ applied to the result will only result in one round of escaping being done. So it is safe to use this function even in auto-escaping environments. If you want multiple escaping passes to be applied, use the ``force_escape`` filter. -.. versionchanged:: 1.0 - Due to auto-escaping, the behavior of this filter has changed slightly. - The replacements are only made once, after - all other filters are applied -- including filters before and after it. - .. templatefilter:: escapejs escapejs ~~~~~~~~ -.. versionadded:: 1.0 - Escapes characters for use in JavaScript strings. This does *not* make the string safe for use in HTML, but does protect you from syntax errors when using templates to generate JavaScript/JSON. @@ -1336,8 +1318,9 @@ If ``value`` is the list ``['a', 'b', 'c']``, the output will be ``'a'``. fix_ampersands ~~~~~~~~~~~~~~ -.. versionchanged:: 1.0 - This is rarely useful as ampersands are now automatically escaped. See escape_ for more information. +..note:: + + This is rarely useful as ampersands are automatically escaped. See escape_ for more information. Replaces ampersands with ``&`` entities. @@ -1394,8 +1377,6 @@ with an argument of ``-1``. force_escape ~~~~~~~~~~~~ -.. versionadded:: 1.0 - Applies HTML escaping to a string (see the ``escape`` filter for details). This filter is applied *immediately* and returns a new, escaped string. This is useful in the rare cases where you need multiple escaping or want to apply @@ -1455,8 +1436,6 @@ If ``value`` is the list ``['a', 'b', 'c']``, the output will be the string last ~~~~ -.. versionadded:: 1.0 - Returns the last item in a list. For example:: @@ -1926,9 +1905,6 @@ unordered_list Recursively takes a self-nested list and returns an HTML unordered list -- WITHOUT opening and closing <ul> tags. -.. versionchanged:: 1.0 - The format accepted by ``unordered_list`` has changed to be easier to understand. - The list is assumed to be in the proper format. For example, if ``var`` contains ``['States', ['Kansas', ['Lawrence', 'Topeka'], 'Illinois']]``, then ``{{ var|unordered_list }}`` would return:: @@ -1945,7 +1921,7 @@ The list is assumed to be in the proper format. For example, if ``var`` contains </ul> </li> -Note: the previous more restrictive and verbose format is still supported: +Note: An older, more restrictive and verbose input format is also supported: ``['States', [['Kansas', [['Lawrence', []], ['Topeka', []]]], ['Illinois', []]]]``, .. templatefilter:: upper diff --git a/docs/ref/unicode.txt b/docs/ref/unicode.txt index 8e110af5d5..c84347844b 100644 --- a/docs/ref/unicode.txt +++ b/docs/ref/unicode.txt @@ -2,8 +2,6 @@ Unicode data ============ -.. versionadded:: 1.0 - Django natively supports Unicode data everywhere. Providing your database can somehow store the data, you can safely pass around Unicode strings to templates, models and the database. |
