Commit dd246a62 authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

Edited some docs and docstrings until [17685] 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17686 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 20c69c5e

django/contrib/auth/management/commands/changepassword.py

+1 −2
Original line number Diff line number Diff line
@@ -9,8 +9,7 @@ from django.db import DEFAULT_DB_ALIAS 
class Command(BaseCommand):

    option_list = BaseCommand.option_list + (

        make_option('--database', action='store', dest='database',

            default=DEFAULT_DB_ALIAS, help='Nominates a database to query for the user. '

                    'Defaults to the "default" database.'),

            default=DEFAULT_DB_ALIAS, help='Specifies the database to use. Default is "default".'),

    )

    help = "Change a user's password for django.contrib.auth."

django/contrib/auth/management/commands/createsuperuser.py

+1 −2
Original line number Diff line number Diff line
@@ -39,8 +39,7 @@ class Command(BaseCommand): 
                  'superusers created with --noinput will not be able to log '

                  'in until they\'re given a valid password.')),

        make_option('--database', action='store', dest='database',

            default=DEFAULT_DB_ALIAS, help='Nominates a database to save the user to. '

                    'Defaults to the "default" database.'),

            default=DEFAULT_DB_ALIAS, help='Specifies the database to use. Default is "default".'),

    )

    help = 'Used to create a superuser.'

docs/ref/django-admin.txt

+4 −4
Original line number Diff line number Diff line
@@ -1199,8 +1199,8 @@ change the password whose username matches the current user. 


.. versionadded:: 1.4



The ``--database`` option can be used to specify the database to query for the

user. If it is not supplied the ``default`` database will be used.

Use the ``--database`` option to specify the database to query for the user. If

it's not supplied, Django will use the ``default`` database.



Example usage::
@@ -1234,8 +1234,8 @@ it when running interactively. 


.. versionadded:: 1.4



The ``--database`` option can be used to specify the database into which the

superuser object will be saved.

Use the ``--database`` option to specify the database into which the superuser

object will be saved.



``django.contrib.gis``

----------------------

docs/ref/models/querysets.txt

+1 −1
Original line number Diff line number Diff line
@@ -1377,7 +1377,7 @@ This has a number of caveats though: 
    maximum is defined by the SQLITE_MAX_VARIABLE_NUMBER_ compilation option,

    which defaults to 999. For instance, if your model has 8 fields (including

    the primary key), you cannot create more than 999 // 8 = 124 instances at

    a time. If you exceed this limit, you will get an exception::

    a time. If you exceed this limit, you'll get an exception::



        django.db.utils.DatabaseError: too many SQL variables

docs/releases/1.4.txt

+3 −3
Original line number Diff line number Diff line
@@ -617,9 +617,9 @@ Django 1.4 also includes several smaller improvements worth noting: 


* A new :class:`django.test.SimpleTestCase` subclass of

  :class:`unittest.TestCase`

  that is comparatively lighter than :class:`django.test.TestCase` and

  company. It can be useful in testing scenarios where e.g. no database

  interaction is needed. See :ref:`testcase_hierarchy_diagram`.

  that's lighter than :class:`django.test.TestCase` and company. It can be

  useful in tests that don't need to hit a database. See

  :ref:`testcase_hierarchy_diagram`.



Backwards incompatible changes in 1.4

=====================================