diff options
| author | Baptiste Mispelon <bmispelon@gmail.com> | 2013-11-06 10:47:07 +0100 |
|---|---|---|
| committer | Baptiste Mispelon <bmispelon@gmail.com> | 2013-11-06 10:47:07 +0100 |
| commit | 366bdc45661038c199ff7f268d045f6b7cb5c398 (patch) | |
| tree | 34526c0cb143d0a503f7e6bee568be8bc787dca9 /docs | |
| parent | 3c4832214ff78e704679d7c7410d3fb8da80df78 (diff) | |
Fixed typos in documentation.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/class-based-views/generic-date-based.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/commands.txt | 2 | ||||
| -rw-r--r-- | docs/ref/databases.txt | 2 | ||||
| -rw-r--r-- | docs/ref/models/fields.txt | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/docs/ref/class-based-views/generic-date-based.txt b/docs/ref/class-based-views/generic-date-based.txt index 427d8f6ceb..44856dce3f 100644 --- a/docs/ref/class-based-views/generic-date-based.txt +++ b/docs/ref/class-based-views/generic-date-based.txt @@ -611,7 +611,7 @@ DateDetailView .. note:: All of the generic views listed above have matching ``Base`` views that - only differ in that the they do not include the + only differ in that they do not include the :class:`~django.views.generic.detail.SingleObjectTemplateResponseMixin`: .. class:: BaseArchiveIndexView diff --git a/docs/ref/contrib/gis/commands.txt b/docs/ref/contrib/gis/commands.txt index 3bacb03bc1..2933f54720 100644 --- a/docs/ref/contrib/gis/commands.txt +++ b/docs/ref/contrib/gis/commands.txt @@ -66,7 +66,7 @@ of using ``ogrinspect`` :ref:`in the tutorial <ogrinspect-intro>`. .. django-admin-option:: --name-field <name_field> Generates a ``__unicode__`` routine (``__str__`` on Python 3) on the model - that will return the the given field name. + that will return the given field name. .. django-admin-option:: --no-imports diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index 38c93e60ee..d411553fbe 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -214,7 +214,7 @@ indexing and searching until MySQL 5.6.4. Since MySQL 5.5.5, the default storage engine is InnoDB_. This engine is fully transactional and supports foreign key references. It's probably the best -choice at this point. However, note that the the InnoDB autoincrement counter +choice at this point. However, note that the InnoDB autoincrement counter is lost on a MySQL restart because it does not remember the ``AUTO_INCREMENT`` value, instead recreating it as "max(id)+1". This may result in an inadvertent reuse of :class:`~django.db.models.AutoField` values. diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt index 9921322051..07886b78d6 100644 --- a/docs/ref/models/fields.txt +++ b/docs/ref/models/fields.txt @@ -1325,7 +1325,7 @@ related. This works exactly the same as it does for :class:`ForeignKey`, including all the options regarding :ref:`recursive <recursive-relationships>` and :ref:`lazy <lazy-relationships>` relationships. -If you do not specify the the :attr:`~ForeignKey.related_name` argument for +If you do not specify the :attr:`~ForeignKey.related_name` argument for the ``OneToOneField``, Django will use the lower-case name of the current model as default value. |