Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

Thanks to Rodolfo Carvalho and Piotr Kasprzyk
for the patch.

Partial backport of ea4da8e from master.
  • Loading branch information...
commit 4aaea2921d7c98dd98fc99596239f8863cb312cc 1 parent 5cda1d2
@bmispelon bmispelon authored
View
2  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.
View
2  docs/intro/tutorial05.txt
@@ -350,7 +350,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
View
2  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):
View
2  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>`.
View
4 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.
View
2  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. [#]_
View
2  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::
View
2  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
Please sign in to comment.
Something went wrong with that request. Please try again.