Commit 4aaea292 authored by Baptiste Mispelon's avatar Baptiste Mispelon
Browse files

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

Thanks to Rodolfo Carvalho and Piotr Kasprzyk
for the patch.

Partial backport of ea4da8e6 from master.
parent 5cda1d27

docs/glossary.txt

+1 −1
Original line number Diff line number Diff line
@@ -72,4 +72,4 @@ Glossary 
        See :doc:`/topics/templates`.



    view

        A function responsible for rending a page.
 
        A function responsible for rendering a page.

docs/intro/tutorial05.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

docs/ref/contrib/formtools/form-wizard.txt

+1 −1
Original line number Diff line number Diff line
@@ -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):

docs/ref/contrib/gis/commands.txt

+1 −1
Original line number Diff line number Diff line
@@ -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>`.

docs/ref/contrib/gis/geoquerysets.txt

+2 −2
Original line number Diff line number Diff line
@@ -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.