summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorRamiro Morales <cramm0@gmail.com>2011-02-14 15:02:02 +0000
committerRamiro Morales <cramm0@gmail.com>2011-02-14 15:02:02 +0000
commitd7c2dcd5387e12828daf6fe4b852f2e894da79e8 (patch)
tree3549560555a262fcdd1138aa6924f8d456058753 /docs
parent72e4a6865d36f8885e7a35ca8de8fe6d1ec3ff18 (diff)
Fixed a couple of documentation typos.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15534 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/howto/custom-management-commands.txt4
-rw-r--r--docs/ref/contrib/admin/index.txt2
-rw-r--r--docs/ref/contrib/gis/admin.txt2
3 files changed, 4 insertions, 4 deletions
diff --git a/docs/howto/custom-management-commands.txt b/docs/howto/custom-management-commands.txt
index 1a8ba63a24..309e5c12ed 100644
--- a/docs/howto/custom-management-commands.txt
+++ b/docs/howto/custom-management-commands.txt
@@ -102,8 +102,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
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 32668e7b2c..f63d55bab0 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -1287,7 +1287,7 @@ on whichever model contains the actual reference to the
:class:`~django.db.models.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
+``raw_id_admin`` widget. However, it is also possible to replace these
widgets with inlines.
Suppose we have the following models::
diff --git a/docs/ref/contrib/gis/admin.txt b/docs/ref/contrib/gis/admin.txt
index 011bb6b6bf..4ec10003f6 100644
--- a/docs/ref/contrib/gis/admin.txt
+++ b/docs/ref/contrib/gis/admin.txt
@@ -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::