Commit 7520dbd5 authored by Ramiro Morales's avatar Ramiro Morales
Browse files

[1.2.X] Fixed a couple of documentation typos.

Backport of [15534] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 7cfb2b63
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -95,8 +95,8 @@ default options such as :djadminopt:`--verbosity` and :djadminopt:`--traceback`.

    The :meth:`BaseCommand.execute` method sets the hardcoded ``en-us`` locale
    because the commands shipped with Django perform several tasks
    (for example, user-visible content and database population) that require
    a system-neutral string language (for which we use ``en-us``).
    (for example, user-facing content rendering and database population) that
    require a system-neutral string language (for which we use ``en-us``).

    If your custom management command uses another locale, you should manually
    activate and deactivate it in your :meth:`~BaseCommand.handle` or
+1 −1
Original line number Diff line number Diff line
@@ -1207,7 +1207,7 @@ on whichever model contains the actual reference to the ``ManyToManyField``.
Depending on your ``ModelAdmin`` definition, each many-to-many field in your
model will be represented by a standard HTML ``<select multiple>``, a
horizontal or vertical filter, or a ``raw_id_admin`` widget. However, it is
also possible to to replace these widgets with inlines.
also possible to replace these widgets with inlines.

Suppose we have the following models::

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ GeoDjango's admin site

   .. attribute:: modifiable

   Defaults to ``False``.  When set to to ``True``, disables editing of
   Defaults to ``False``.  When set to ``True``, disables editing of
   existing geometry fields in the admin.

   .. note::