[1.6.x] Fixed some typos in the documentation.

Thanks to Rodolfo Carvalho and Piotr Kasprzyk
for the patch.

Partial backport of ea4da8e63c314b4f7cbcb4dd06eef466c1e872ed from master.

5 files changed, 6 insertions, 6 deletions

diff --git a/docs/ref/contrib/formtools/form-wizard.txt b/docs/ref/contrib/formtools/form-wizard.txt
index 6a1e328ba8..473b17886a 100644
--- a/docs/ref/contrib/formtools/form-wizard.txt
+++ b/docs/ref/contrib/formtools/form-wizard.txt
@@ -304,7 +304,7 @@ The ``urls.py`` file would contain something like::
 
 .. versionchanged:: 1.6
 
-The ``condiction_dict`` can be passed as attribute for the ``as_view()`
+The ``condition_dict`` can be passed as attribute for the ``as_view()`
 method or as a class attribute named ``condition_dict``::
 
     class OrderWizard(WizardView):
diff --git a/docs/ref/contrib/gis/commands.txt b/docs/ref/contrib/gis/commands.txt
index 3bacb03bc1..451cbc312a 100644
--- a/docs/ref/contrib/gis/commands.txt
+++ b/docs/ref/contrib/gis/commands.txt
@@ -19,7 +19,7 @@ ogrinspect <data_source> <model_name>
 
 .. django-admin:: ogrinspect
 
-The ``ogrinpsect`` management command will inspect the given OGR-compatible
+The ``ogrinspect`` management command will inspect the given OGR-compatible
 :class:`~django.contrib.gis.gdal.DataSource` (e.g., a shapefile) and will
 output a GeoDjango model with the given model name.  There's a detailed example
 of using ``ogrinspect`` :ref:`in the tutorial <ogrinspect-intro>`.
diff --git a/docs/ref/contrib/gis/geoquerysets.txt b/docs/ref/contrib/gis/geoquerysets.txt
index 5e51e4cbf3..01c5bd7edc 100644
--- a/docs/ref/contrib/gis/geoquerysets.txt
+++ b/docs/ref/contrib/gis/geoquerysets.txt
@@ -1106,8 +1106,8 @@ Aggregate Methods
 *Availability*: PostGIS
 
 Returns a ``GEOMETRYCOLLECTION`` or a ``MULTI`` geometry object from the geometry
-column.  This is analagous to a simplified version of the :meth:`GeoQuerySet.unionagg` method,
-except it can be several orders of magnitude faster than peforming a union because
+column. This is analogous to a simplified version of the :meth:`GeoQuerySet.unionagg` method,
+except it can be several orders of magnitude faster than performing a union because
 it simply rolls up geometries into a collection or multi object, not caring about
 dissolving boundaries.
 
diff --git a/docs/ref/contrib/gis/measure.txt b/docs/ref/contrib/gis/measure.txt
index 197f584729..c4f6fc6954 100644
--- a/docs/ref/contrib/gis/measure.txt
+++ b/docs/ref/contrib/gis/measure.txt
@@ -5,7 +5,7 @@ Measurement Objects
 ===================
 
 .. module:: django.contrib.gis.measure
-   :synopsis: GeoDjango's distance and area measurment objects.
+   :synopsis: GeoDjango's distance and area measurement objects.
 
 The :mod:`django.contrib.gis.measure` module contains objects that allow
 for convenient representation of distance and area units of measure. [#]_
diff --git a/docs/ref/contrib/gis/testing.txt b/docs/ref/contrib/gis/testing.txt
index 0e1a98d64d..c4bf327cce 100644
--- a/docs/ref/contrib/gis/testing.txt
+++ b/docs/ref/contrib/gis/testing.txt
@@ -122,7 +122,7 @@ Settings
 Only relevant when using a SpatiaLite version 2.3.
 
 By default, the GeoDjango test runner looks for the :ref:`file containing the
-SpatiaLite dababase-initialization SQL code <create_spatialite_db>` in the
+SpatiaLite database-initialization SQL code <create_spatialite_db>` in the
 same directory where it was invoked (by default the same directory where
 ``manage.py`` is located). To use a different location, add the following to
 your settings::