Skip to content

Commit

Permalink
[1.0.x] Fixed #9477 -- Removed and edited a bunch of references to "d…
Browse files Browse the repository at this point in the history
…evelopment

version". Some were replaced with versionadded or versionchanged directives.
Other, more minor ones, were removed altogether.

Based on a patch from James Bennett.

Backport of r9454 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9455 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
malcolmt committed Nov 15, 2008
1 parent a4782f0 commit c0feb2f
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 61 deletions.
7 changes: 0 additions & 7 deletions docs/faq/admin.txt
Expand Up @@ -94,10 +94,3 @@ site is built using semantic HTML and plenty of CSS hooks, so any changes you'd
like to make should be possible by editing the stylesheet. We've got a
:ref:`guide to the CSS used in the admin <obsolete-admin-css>` to get you started.

How do I create users without having to edit password hashes?
-------------------------------------------------------------

If you'd like to use the admin site to create users, upgrade to the Django
development version, where this problem was fixed on Aug. 4, 2006.

You can also use the Python API. See :ref:`creating users <topics-auth-creating-users>` for full info.
9 changes: 1 addition & 8 deletions docs/ref/contrib/syndication.txt
Expand Up @@ -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>`::

Expand Down Expand Up @@ -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
Expand Down
17 changes: 3 additions & 14 deletions docs/ref/django-admin.txt
Expand Up @@ -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
---------
Expand Down Expand Up @@ -246,13 +242,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
Expand Down
5 changes: 3 additions & 2 deletions docs/ref/forms/fields.txt
Expand Up @@ -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::

Expand Down
10 changes: 0 additions & 10 deletions docs/ref/models/fields.txt
Expand Up @@ -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``
-------------

Expand Down Expand Up @@ -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``
--------------

Expand Down
8 changes: 4 additions & 4 deletions docs/ref/models/querysets.txt
Expand Up @@ -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

Expand Down
9 changes: 6 additions & 3 deletions docs/ref/settings.txt
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions docs/topics/auth.txt
Expand Up @@ -320,8 +320,10 @@ Hashtype is either ``sha1`` (default), ``md5`` or ``crypt`` -- the algorithm
used to perform a one-way hash of the password. Salt is a random string used
to salt the raw password to create the hash. Note that the ``crypt`` method is
only supported on platforms that have the standard Python ``crypt`` module
available, and ``crypt`` support is only available in the Django development
version.
available.

.. versionadded:: 1.0
Support for the ``crypt`` module is new in Django 1.0.

For example::

Expand Down Expand Up @@ -626,7 +628,6 @@ The login_required decorator
def my_view(request):
# ...

In the Django development version,
:func:`~django.contrib.auth.decorators.login_required` also takes an
optional ``redirect_field_name`` parameter. Example::

Expand Down
4 changes: 2 additions & 2 deletions docs/topics/forms/modelforms.txt
Expand Up @@ -77,9 +77,9 @@ the full list of conversions:
=============================== ========================================


.. note::
.. versionadded:: 1.0
The ``FloatField`` form field and ``DecimalField`` model and form fields
are new in the development version.
are new in Django 1.0.

As you might expect, the ``ForeignKey`` and ``ManyToManyField`` model field
types are special cases:
Expand Down
3 changes: 1 addition & 2 deletions docs/topics/i18n.txt
Expand Up @@ -806,8 +806,7 @@ The view expects to be called via the ``POST`` method, with a ``language``
parameter set in request. If session support is enabled, the view
saves the language choice in the user's session. Otherwise, it saves the
language choice in a cookie that is by default named ``django_language``.
(The name can be changed through the ``LANGUAGE_COOKIE_NAME`` setting if you're
using the Django development version.)
(The name can be changed through the ``LANGUAGE_COOKIE_NAME`` setting.)

After setting the language choice, Django redirects the user, following this
algorithm:
Expand Down
12 changes: 6 additions & 6 deletions docs/topics/testing.txt
Expand Up @@ -186,12 +186,12 @@ test utility is to find all the test cases (that is, subclasses of
``unittest.TestCase``) in ``models.py`` and ``tests.py``, automatically build a
test suite out of those test cases, and run that suite.

In the Django development version, there is a second way to define the test
suite for a module: if you define a function called ``suite()`` in either
``models.py`` or ``tests.py``, the Django test runner will use that function
to construct the test suite for that module. This follows the `suggested
organization`_ for unit tests. See the Python documentation for more details on
how to construct a complex test suite.
There is a second way to define the test suite for a module: if you define a
function called ``suite()`` in either ``models.py`` or ``tests.py``, the
Django test runner will use that function to construct the test suite for that
module. This follows the `suggested organization`_ for unit tests. See the
Python documentation for more details on how to construct a complex test
suite.

For more details about ``unittest``, see the `standard library unittest
documentation`_.
Expand Down

0 comments on commit c0feb2f

Please sign in to comment.