Ticket #9477: remove_development_version_trunk.diff

File remove_development_version_trunk.diff, 12.3 KB (added by James Bennett, 16 years ago)

Patch for trunk

  • docs/topics/auth.txt

     
    320320used to perform a one-way hash of the password. Salt is a random string used
    321321to salt the raw password to create the hash. Note that the ``crypt`` method is
    322322only supported on platforms that have the standard Python ``crypt`` module
    323 available, and ``crypt`` support is only available in the Django development
    324 version.
     323available.
    325324
    326325For example::
    327326
     
    626625        def my_view(request):
    627626            # ...
    628627
    629     In the Django development version,
    630628    :func:`~django.contrib.auth.decorators.login_required` also takes an
    631629    optional ``redirect_field_name`` parameter. Example::
    632630
     
    687685          a query string, too.
    688686
    689687        * ``site_name``: The name of the current
    690           :class:`~django.contrib.sites.models.Site``, according to the
    691           :setting:`SITE_ID` setting. If you're using the Django development version
    692           and you don't have the site framework installed, this will be set to the
    693           value of ``request.META['SERVER_NAME']``. For more on sites, see
     688          :class:`~django.contrib.sites.models.Site``, according to
     689          the :setting:`SITE_ID` setting.  If you don't have the site
     690          framework installed, this will be set to the value of
     691          ``request.META['SERVER_NAME']``. For more on sites, see
    694692          :ref:`ref-contrib-sites`.
    695693
    696694    If you'd prefer not to call the template :file:`registration/login.html`,
  • docs/topics/cache.txt

     
    7272following modules:
    7373
    7474    * The fastest available option is a module called ``cmemcache``, available
    75       at http://gijsbert.org/cmemcache/ . (This module is only compatible with
    76       the Django development version. Django 0.96 is only compatible with the
    77       second option, below.)
     75      at http://gijsbert.org/cmemcache/.
    7876
    7977    * If you can't install ``cmemcache``, you can install ``python-memcached``,
    8078      available at ftp://ftp.tummy.com/pub/python-memcached/ . If that URL is
  • docs/topics/forms/modelforms.txt

     
    7777    ===============================  ========================================
    7878
    7979
    80 .. note::
    81     The ``FloatField`` form field and ``DecimalField`` model and form fields
    82     are new in the development version.
    83 
    8480As you might expect, the ``ForeignKey`` and ``ManyToManyField`` model field
    8581types are special cases:
    8682
  • docs/topics/testing.txt

     
    186186``unittest.TestCase``) in ``models.py`` and ``tests.py``, automatically build a
    187187test suite out of those test cases, and run that suite.
    188188
    189 In the Django development version, there is a second way to define the test
    190 suite for a module: if you define a function called ``suite()`` in either
    191 ``models.py`` or ``tests.py``, the Django test runner will use that function
    192 to construct the test suite for that module. This follows the `suggested
    193 organization`_ for unit tests. See the Python documentation for more details on
    194 how to construct a complex test suite.
     189There is also a second way to define the test suite for a module: if
     190you define a function called ``suite()`` in either ``models.py`` or
     191``tests.py``, the Django test runner will use that function to
     192construct the test suite for that module. This follows the `suggested
     193organization`_ for unit tests. See the Python documentation for more
     194details on how to construct a complex test suite.
    195195
    196196For more details about ``unittest``, see the `standard library unittest
    197197documentation`_.
  • docs/topics/i18n.txt

     
    804804parameter set in request. If session support is enabled, the view
    805805saves the language choice in the user's session. Otherwise, it saves the
    806806language choice in a cookie that is by default named ``django_language``.
    807 (The name can be changed through the ``LANGUAGE_COOKIE_NAME`` setting if you're
    808 using the Django development version.)
     807(The name can be changed through the ``LANGUAGE_COOKIE_NAME`` setting.)
    809808
    810809After setting the language choice, Django redirects the user, following this
    811810algorithm:
  • docs/faq/admin.txt

     
    9494like to make should be possible by editing the stylesheet. We've got a
    9595:ref:`guide to the CSS used in the admin <obsolete-admin-css>` to get you started.
    9696
    97 How do I create users without having to edit password hashes?
    98 -------------------------------------------------------------
    99 
    100 If you'd like to use the admin site to create users, upgrade to the Django
    101 development version, where this problem was fixed on Aug. 4, 2006.
    102 
    103 You can also use the Python API. See :ref:`creating users <topics-auth-creating-users>` for full info.
  • docs/ref/contrib/syndication.txt

     
    3636Initialization
    3737--------------
    3838
    39 If you're not using the latest Django development version, you'll need to make
    40 sure Django's sites framework is installed -- including its database table. (See
    41 the :mod:`sites framework documentation <django.contrib.sites>` for more
    42 information.) This has changed in the Django development version; the
    43 syndication feed framework no longer requires the sites framework.
    44 
    4539To activate syndication feeds on your Django site, add this line to your
    4640:ref:`URLconf <topics-http-urls>`::
    4741
     
    150144         * ``{{ obj }}`` -- The current object (one of whichever objects you
    151145           returned in :meth:`items()`).
    152146         
    153          * ``{{ site }}`` -- A :class:`django.contrib.sites.models.Site` object
    154            representing the current site. This is useful for ``{{ site.domain
    155            }}`` or ``{{ site.name }}``. Note that if you're using the latest
    156            Django development version and do *not* have the Django sites
     147         * ``{{ site }}`` -- A
     148           :class:`django.contrib.sites.models.Site` object
     149           representing the current site. This is useful for ``{{
     150           site.domain }}`` or ``{{ site.name }}``. Note that if
     151           you're using the latest do *not* have the Django sites
    157152           framework installed, this will be set to a
    158            :class:`django.contrib.sites.models.RequestSite` object. See the
    159            :ref:`RequestSite section of the sites framework documentation
    160            <requestsite-objects>` for more.
     153           :class:`django.contrib.sites.models.RequestSite`
     154           object. See the :ref:`RequestSite section of the sites
     155           framework documentation <requestsite-objects>` for more.
    161156
    162157      If you don't create a template for either the title or description, the
    163158      framework will use the template ``"{{ obj }}"`` by default -- that is, the
  • docs/ref/models/querysets.txt

     
    958958    SELECT ... WHERE id = 14;
    959959    SELECT ... WHERE id IS NULL;
    960960
    961 .. versionchanged:: 1.0
    962    The semantics of ``id__exact=None`` have
    963    changed in the development version. Previously, it was (intentionally)
    964    converted to ``WHERE id = NULL`` at the SQL level, which would never match
    965    anything. It has now been changed to behave the same as ``id__isnull=True``.
    966 
    967961.. admonition:: MySQL comparisons
    968962
    969963    In MySQL, a database table's "collation" setting determines whether
  • docs/ref/models/fields.txt

     
    413413
    414414A :class:`CharField` that checks that the value is a valid e-mail address.
    415415
    416 In Django 0.96, this doesn't accept :attr:`~CharField.max_length`; its
    417 :class:`~CharField.max_length` is automatically set to 75. In the Django
    418 development version, :class:`~CharField.max_length` is set to 75 by default, but
    419 you can specify it to override default behavior.
    420 
    421416``FileField``
    422417-------------
    423418
     
    577572
    578573The admin represents this as an ``<input type="text">`` (a single-line input).
    579574
    580 **NOTE:** The semantics of :class:`FloatField` have changed in the Django
    581 development version. See the `Django 0.96 documentation`_ for the old behavior.
    582 
    583 .. _Django 0.96 documentation: http://www.djangoproject.com/documentation/0.96/model-api/#floatfield
    584 
    585575``ImageField``
    586576--------------
    587577
  • docs/ref/forms/fields.txt

     
    315315      the field has ``required=True``.
    316316    * Error message keys: ``required``
    317317
    318 .. versionchanged:: 1.0
    319    The empty value for a ``CheckboxInput`` (and hence the standard ``BooleanField``)
    320    has changed to return ``False`` instead of ``None`` in the development version.
    321 
    322318.. note::
    323319
    324320    Since all ``Field`` subclasses have ``required=True`` by default, the
  • docs/ref/django-admin.txt

     
    5151
    5252.. django-admin-option:: --help
    5353
    54 In Django 0.96, run ``django-admin.py --help`` to display a help message that
    55 includes a terse list of all available subcommands and options.
    56 
    57 In the Django development version, run ``django-admin.py help`` to display a
    58 list of all available subcommands. Run ``django-admin.py help <subcommand>``
    59 to display a description of the given subcommand and a list of its available
     54Run ``django-admin.py help`` to display a list of all available
     55subcommands. Run ``django-admin.py help <subcommand>`` to display a
     56description of the given subcommand and a list of its available
    6057options.
    6158
    6259App names
     
    242239post-synchronization handlers will be re-executed, and the ``initial_data``
    243240fixture will be re-installed.
    244241
    245 The behavior of this command has changed in the Django development version.
    246 Previously, this command cleared *every* table in the database, including any
    247 table that Django didn't know about (i.e., tables that didn't have associated
    248 models and/or weren't in ``INSTALLED_APPS``). Now, the command only clears
    249 tables that are represented by Django models and are activated in
    250 ``INSTALLED_APPS``.
    251 
    252242.. django-admin-option:: --noinput
    253243
    254244    Use the ``--noinput`` option to suppress all user prompting, such as "Are
  • docs/ref/settings.txt

     
    151151
    152152Default: ``''`` (Empty string)
    153153
    154 The database backend to use. The build-in database backends are
     154The database backend to use. The built-in database backends are
    155155``'postgresql_psycopg2'``, ``'postgresql'``, ``'mysql'``, ``'sqlite3'``, and
    156156``'oracle'``.
    157157
    158 In the Django development version, you can use a database backend that doesn't
    159 ship with Django by setting ``DATABASE_ENGINE`` to a fully-qualified path (i.e.
    160 ``mypackage.backends.whatever``). Writing a whole new database backend from
    161 scratch is left as an exercise to the reader; see the other backends for
    162 examples.
     158You can also use a database backend that doesn't ship with Django by
     159setting ``DATABASE_ENGINE`` to a fully-qualified path (i.e.
     160``mypackage.backends.whatever``). Writing a whole new database backend
     161from scratch is left as an exercise to the reader; see the other
     162backends for examples.
    163163
    164164.. setting:: DATABASE_HOST
    165165
Back to Top