summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorBaptiste Mispelon <bmispelon@gmail.com>2014-03-02 17:05:57 +0100
committerBaptiste Mispelon <bmispelon@gmail.com>2014-03-02 17:05:57 +0100
commitea4da8e63c314b4f7cbcb4dd06eef466c1e872ed (patch)
tree4ef3fb5ff00f1c7c80a6a44cf967b5c4bd2ca031 /docs
parenta08f906556c14357852bbc9c4c7d10c6558dafcf (diff)
Fixed some typos in the documentation.
Thanks to Rodolfo Carvalho and Piotr Kasprzyk for the patch.
Diffstat (limited to 'docs')
-rw-r--r--docs/glossary.txt2
-rw-r--r--docs/intro/tutorial05.txt2
-rw-r--r--docs/ref/checks.txt2
-rw-r--r--docs/ref/contrib/formtools/form-wizard.txt2
-rw-r--r--docs/ref/contrib/gis/commands.txt2
-rw-r--r--docs/ref/contrib/gis/geoquerysets.txt2
-rw-r--r--docs/ref/contrib/gis/measure.txt2
-rw-r--r--docs/ref/contrib/gis/testing.txt2
-rw-r--r--docs/ref/migration-operations.txt2
-rw-r--r--docs/topics/auth/customizing.txt2
10 files changed, 10 insertions, 10 deletions
diff --git a/docs/glossary.txt b/docs/glossary.txt
index 138b5d1cfc..0195b9d4c8 100644
--- a/docs/glossary.txt
+++ b/docs/glossary.txt
@@ -72,4 +72,4 @@ Glossary
See :doc:`/topics/templates`.
view
- A function responsible for rending a page.
+ A function responsible for rendering a page.
diff --git a/docs/intro/tutorial05.txt b/docs/intro/tutorial05.txt
index 90acfe62d3..a51eb3c484 100644
--- a/docs/intro/tutorial05.txt
+++ b/docs/intro/tutorial05.txt
@@ -362,7 +362,7 @@ With that ready, we can ask the client to do some work for us::
>>> response.status_code
404
>>> # on the other hand we should expect to find something at '/polls/'
- >>> # we'll use 'reverse()' rather than a harcoded URL
+ >>> # we'll use 'reverse()' rather than a hardcoded URL
>>> from django.core.urlresolvers import reverse
>>> response = client.get(reverse('polls:index'))
>>> response.status_code
diff --git a/docs/ref/checks.txt b/docs/ref/checks.txt
index 84082bc6d6..2e26f7feac 100644
--- a/docs/ref/checks.txt
+++ b/docs/ref/checks.txt
@@ -185,7 +185,7 @@ code snippet shows how you can implement this check::
self.min > self.max):
return [
checks.Error(
- 'min greated than max.',
+ 'min greater than max.',
hint='Decrease min or increase max.',
obj=self,
id='myapp.E001',
diff --git a/docs/ref/contrib/formtools/form-wizard.txt b/docs/ref/contrib/formtools/form-wizard.txt
index faa836ecd8..c8caed746a 100644
--- a/docs/ref/contrib/formtools/form-wizard.txt
+++ b/docs/ref/contrib/formtools/form-wizard.txt
@@ -319,7 +319,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 a1ca5d7841..8d1cc11130 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 b27781bdc8..0b1fee3bfe 100644
--- a/docs/ref/contrib/gis/geoquerysets.txt
+++ b/docs/ref/contrib/gis/geoquerysets.txt
@@ -1102,7 +1102,7 @@ Aggregate Methods
*Availability*: PostGIS
Returns a ``GEOMETRYCOLLECTION`` or a ``MULTI`` geometry object from the geometry
-column. This is analogous to a simplified version of the :meth:`GeoQuerySet.unionagg` method,
+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 cdd4314047..d601b413e9 100644
--- a/docs/ref/contrib/gis/testing.txt
+++ b/docs/ref/contrib/gis/testing.txt
@@ -131,7 +131,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::
diff --git a/docs/ref/migration-operations.txt b/docs/ref/migration-operations.txt
index cad46f2d01..ed01d6cbd2 100644
--- a/docs/ref/migration-operations.txt
+++ b/docs/ref/migration-operations.txt
@@ -221,7 +221,7 @@ SeparateDatabaseAndState
SeparateDatabaseAndState(database_operations=None, state_operations=None)
-A highly specialist operation that let you mix and match the database
+A highly specialized operation that let you mix and match the database
(schema-changing) and state (autodetector-powering) aspects of operations.
It accepts two list of operations, and when asked to apply state will use the
diff --git a/docs/topics/auth/customizing.txt b/docs/topics/auth/customizing.txt
index 4c14460caa..cc991cd951 100644
--- a/docs/topics/auth/customizing.txt
+++ b/docs/topics/auth/customizing.txt
@@ -5,7 +5,7 @@ Customizing authentication in Django
The authentication that comes with Django is good enough for most common cases,
but you may have needs not met by the out-of-the-box defaults. To customize
authentication to your projects needs involves understanding what points of the
-provided system are extendible or replaceable. This document provides details
+provided system are extensible or replaceable. This document provides details
about how the auth system can be customized.
:ref:`Authentication backends <authentication-backends>` provide an extensible