diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-11-15 05:51:25 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-11-15 05:51:25 +0000 |
| commit | 644ad9073f1e488fa0cc8dd9fa6d59c6bd504da9 (patch) | |
| tree | 0f9eed3b18aa9cf08fde728fafeb0914c51d1f67 /docs/ref | |
| parent | 06f89325e152f1d7084f6d200d6879ffa940fd44 (diff) | |
Fixed #9477 -- Removed and edited a bunch of references to "development
version". Some were replaced with versionadded or versionchanged directives.
Other, more minor ones, were removed altogether.
Based on a patch from James Bennett.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9454 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/contrib/syndication.txt | 9 | ||||
| -rw-r--r-- | docs/ref/django-admin.txt | 17 | ||||
| -rw-r--r-- | docs/ref/forms/fields.txt | 5 | ||||
| -rw-r--r-- | docs/ref/models/fields.txt | 10 | ||||
| -rw-r--r-- | docs/ref/models/querysets.txt | 8 | ||||
| -rw-r--r-- | docs/ref/settings.txt | 9 |
6 files changed, 17 insertions, 41 deletions
diff --git a/docs/ref/contrib/syndication.txt b/docs/ref/contrib/syndication.txt index a75f736e6b..e467a9396b 100644 --- a/docs/ref/contrib/syndication.txt +++ b/docs/ref/contrib/syndication.txt @@ -36,12 +36,6 @@ class and point to it in your :ref:`URLconf <topics-http-urls>`. Initialization -------------- -If you're not using the latest Django development version, you'll need to make -sure Django's sites framework is installed -- including its database table. (See -the :mod:`sites framework documentation <django.contrib.sites>` for more -information.) This has changed in the Django development version; the -syndication feed framework no longer requires the sites framework. - To activate syndication feeds on your Django site, add this line to your :ref:`URLconf <topics-http-urls>`:: @@ -152,8 +146,7 @@ into those elements. * ``{{ site }}`` -- A :class:`django.contrib.sites.models.Site` object representing the current site. This is useful for ``{{ site.domain - }}`` or ``{{ site.name }}``. Note that if you're using the latest - Django development version and do *not* have the Django sites + }}`` or ``{{ site.name }}``. If you do *not* have the Django sites framework installed, this will be set to a :class:`django.contrib.sites.models.RequestSite` object. See the :ref:`RequestSite section of the sites framework documentation diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 3135382103..13b591e1bb 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -51,13 +51,9 @@ Getting runtime help .. django-admin-option:: --help -In Django 0.96, run ``django-admin.py --help`` to display a help message that -includes a terse list of all available subcommands and options. - -In the Django development version, run ``django-admin.py help`` to display a -list of all available subcommands. Run ``django-admin.py help <subcommand>`` -to display a description of the given subcommand and a list of its available -options. +Run ``django-admin.py help`` to display a list of all available subcommands. +Run ``django-admin.py help <subcommand>`` to display a description of the +given subcommand and a list of its available options. App names --------- @@ -242,13 +238,6 @@ executed. This means that all data will be removed from the database, any post-synchronization handlers will be re-executed, and the ``initial_data`` fixture will be re-installed. -The behavior of this command has changed in the Django development version. -Previously, this command cleared *every* table in the database, including any -table that Django didn't know about (i.e., tables that didn't have associated -models and/or weren't in ``INSTALLED_APPS``). Now, the command only clears -tables that are represented by Django models and are activated in -``INSTALLED_APPS``. - .. django-admin-option:: --noinput Use the ``--noinput`` option to suppress all user prompting, such as "Are diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt index 0656c323ae..3e3ec0253e 100644 --- a/docs/ref/forms/fields.txt +++ b/docs/ref/forms/fields.txt @@ -316,8 +316,9 @@ For each field, we describe the default widget used if you don't specify * 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 development version. + 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:: diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt index ac1e2ffffb..4f2a92a66b 100644 --- a/docs/ref/models/fields.txt +++ b/docs/ref/models/fields.txt @@ -413,11 +413,6 @@ The admin represents this as an ``<input type="text">`` (a single-line input). A :class:`CharField` that checks that the value is a valid e-mail address. -In Django 0.96, this doesn't accept :attr:`~CharField.max_length`; its -:class:`~CharField.max_length` is automatically set to 75. In the Django -development version, :class:`~CharField.max_length` is set to 75 by default, but -you can specify it to override default behavior. - ``FileField`` ------------- @@ -577,11 +572,6 @@ A floating-point number represented in Python by a ``float`` instance. The admin represents this as an ``<input type="text">`` (a single-line input). -**NOTE:** The semantics of :class:`FloatField` have changed in the Django -development version. See the `Django 0.96 documentation`_ for the old behavior. - -.. _Django 0.96 documentation: http://www.djangoproject.com/documentation/0.96/model-api/#floatfield - ``ImageField`` -------------- diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index c1fbdce5ca..3525865ac6 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -959,10 +959,10 @@ SQL equivalents:: SELECT ... WHERE id IS NULL; .. versionchanged:: 1.0 - The semantics of ``id__exact=None`` have - changed in the development version. 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``. + 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 diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index e347aab0bf..7652249514 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -151,16 +151,19 @@ DATABASE_ENGINE Default: ``''`` (Empty string) -The database backend to use. The build-in database backends are +The database backend to use. The built-in database backends are ``'postgresql_psycopg2'``, ``'postgresql'``, ``'mysql'``, ``'sqlite3'``, and ``'oracle'``. -In the Django development version, you can use a database backend that doesn't -ship with Django by setting ``DATABASE_ENGINE`` to a fully-qualified path (i.e. +You can use a database backend that doesn't ship with Django by setting +``DATABASE_ENGINE`` to a fully-qualified path (i.e. ``mypackage.backends.whatever``). Writing a whole new database backend from scratch is left as an exercise to the reader; see the other backends for examples. +.. versionadded:: 1.0 + Support for external database backends is new in 1.0. + .. setting:: DATABASE_HOST DATABASE_HOST |
