Fixed "the the" typos.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15536 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
d7c2dcd538
commit
6eacbfd411
|
@ -22,7 +22,7 @@ matter whether the version of Apache is prefork or worker.
|
||||||
|
|
||||||
.. note::
|
.. note::
|
||||||
|
|
||||||
The ``Alias`` and ``Directory`` configurations in the the examples
|
The ``Alias`` and ``Directory`` configurations in the examples
|
||||||
below use an example path to a system-wide installation folder of Django.
|
below use an example path to a system-wide installation folder of Django.
|
||||||
Substitute in an appropriate location, if necessary, as it may be
|
Substitute in an appropriate location, if necessary, as it may be
|
||||||
different than the path on your system.
|
different than the path on your system.
|
||||||
|
|
|
@ -14,7 +14,7 @@ GeoQuerySet API Reference
|
||||||
Spatial Lookups
|
Spatial Lookups
|
||||||
===============
|
===============
|
||||||
|
|
||||||
Just like when using the the :ref:`queryset-api`, interaction
|
Just like when using the :ref:`queryset-api`, interaction
|
||||||
with ``GeoQuerySet`` by :ref:`chaining filters <chaining-filters>`.
|
with ``GeoQuerySet`` by :ref:`chaining filters <chaining-filters>`.
|
||||||
Instead of the regular Django :ref:`field-lookups`, the
|
Instead of the regular Django :ref:`field-lookups`, the
|
||||||
spatial lookups in this section are available for :class:`GeometryField`.
|
spatial lookups in this section are available for :class:`GeometryField`.
|
||||||
|
@ -271,7 +271,7 @@ relate
|
||||||
|
|
||||||
*Availability*: PostGIS, Oracle, SpatiaLite
|
*Availability*: PostGIS, Oracle, SpatiaLite
|
||||||
|
|
||||||
Tests if the geometry field is spatially related to the the lookup geometry by
|
Tests if the geometry field is spatially related to the lookup geometry by
|
||||||
the values given in the given pattern. This lookup requires a tuple parameter,
|
the values given in the given pattern. This lookup requires a tuple parameter,
|
||||||
``(geom, pattern)``; the form of ``pattern`` will depend on the spatial backend:
|
``(geom, pattern)``; the form of ``pattern`` will depend on the spatial backend:
|
||||||
|
|
||||||
|
@ -762,7 +762,7 @@ Geometry Relationships
|
||||||
|
|
||||||
The following methods take no arguments, and attach geometry objects
|
The following methods take no arguments, and attach geometry objects
|
||||||
each element of the :class:`GeoQuerySet` that is the result of relationship
|
each element of the :class:`GeoQuerySet` that is the result of relationship
|
||||||
function evaluated on the the geometry field.
|
function evaluated on the geometry field.
|
||||||
|
|
||||||
``centroid``
|
``centroid``
|
||||||
~~~~~~~~~~~~
|
~~~~~~~~~~~~
|
||||||
|
@ -945,7 +945,7 @@ of the geometry field in each model converted to the requested output format.
|
||||||
|
|
||||||
.. versionadded:: 1.2
|
.. versionadded:: 1.2
|
||||||
|
|
||||||
Attaches a ``geohash`` attribute to every model the the queryset
|
Attaches a ``geohash`` attribute to every model the queryset
|
||||||
containing the `GeoHash`__ representation of the geometry.
|
containing the `GeoHash`__ representation of the geometry.
|
||||||
|
|
||||||
__ http://geohash.org/
|
__ http://geohash.org/
|
||||||
|
|
|
@ -81,7 +81,7 @@ SQLite GEOS, GDAL, PROJ.4, SpatiaLite 3.6.+ Requires
|
||||||
|
|
||||||
Geospatial Libraries
|
Geospatial Libraries
|
||||||
--------------------
|
--------------------
|
||||||
GeoDjango uses and/or provides interfaces for the the following open source
|
GeoDjango uses and/or provides interfaces for the following open source
|
||||||
geospatial libraries:
|
geospatial libraries:
|
||||||
|
|
||||||
======================== ==================================== ================================ ==========================
|
======================== ==================================== ================================ ==========================
|
||||||
|
@ -98,8 +98,8 @@ Program Description Required
|
||||||
.. admonition:: Install GDAL
|
.. admonition:: Install GDAL
|
||||||
|
|
||||||
While :ref:`gdalbuild` is technically not required, it is *recommended*.
|
While :ref:`gdalbuild` is technically not required, it is *recommended*.
|
||||||
Important features of GeoDjango (including the :ref:`ref-layermapping`,
|
Important features of GeoDjango (including the :ref:`ref-layermapping`,
|
||||||
geometry reprojection, and the geographic admin) depend on its
|
geometry reprojection, and the geographic admin) depend on its
|
||||||
functionality.
|
functionality.
|
||||||
|
|
||||||
.. note::
|
.. note::
|
||||||
|
@ -480,7 +480,7 @@ to look like the following::
|
||||||
|
|
||||||
.. note::
|
.. note::
|
||||||
|
|
||||||
The important thing here is to make sure you comment out the the
|
The important thing here is to make sure you comment out the
|
||||||
``define=SQLITE_OMIT_LOAD_EXTENSION`` flag and that the ``include_dirs``
|
``define=SQLITE_OMIT_LOAD_EXTENSION`` flag and that the ``include_dirs``
|
||||||
and ``library_dirs`` settings are uncommented and set to the appropriate
|
and ``library_dirs`` settings are uncommented and set to the appropriate
|
||||||
path if the SQLite header files and libraries are not in ``/usr/include``
|
path if the SQLite header files and libraries are not in ``/usr/include``
|
||||||
|
@ -810,7 +810,7 @@ __ http://www.kyngchaos.com/software/postgres
|
||||||
|
|
||||||
Use of these binaries requires Django 1.0.3 and above. If you are
|
Use of these binaries requires Django 1.0.3 and above. If you are
|
||||||
using a previous version of Django (like 1.0.2), then you will have
|
using a previous version of Django (like 1.0.2), then you will have
|
||||||
to add the the following in your settings::
|
to add the following in your settings::
|
||||||
|
|
||||||
GEOS_LIBRARY_PATH='/Library/Frameworks/GEOS.framework/GEOS'
|
GEOS_LIBRARY_PATH='/Library/Frameworks/GEOS.framework/GEOS'
|
||||||
GDAL_LIBRARY_PATH='/Library/Frameworks/GDAL.framework/GDAL'
|
GDAL_LIBRARY_PATH='/Library/Frameworks/GDAL.framework/GDAL'
|
||||||
|
@ -925,8 +925,8 @@ Ubuntu & Debian GNU/Linux
|
||||||
|
|
||||||
The PostGIS SQL files are not placed the PostgreSQL share directory in the
|
The PostGIS SQL files are not placed the PostgreSQL share directory in the
|
||||||
Debian and Ubuntu packages, and are located instead special directory
|
Debian and Ubuntu packages, and are located instead special directory
|
||||||
depending on the release. Thus, when :ref:`spatialdb_template` use the
|
depending on the release. Thus, when :ref:`spatialdb_template` use the
|
||||||
`create_template_postgis-debian.sh`_ script instead
|
`create_template_postgis-debian.sh`_ script instead
|
||||||
|
|
||||||
.. _ubuntu:
|
.. _ubuntu:
|
||||||
|
|
||||||
|
|
|
@ -321,7 +321,7 @@ may also use the following to populate your spatial database:
|
||||||
GDAL Interface
|
GDAL Interface
|
||||||
--------------
|
--------------
|
||||||
|
|
||||||
Earlier we used the the ``ogrinfo`` to explore the contents of the world borders
|
Earlier we used the ``ogrinfo`` to explore the contents of the world borders
|
||||||
shapefile. Included within GeoDjango is an interface to GDAL's powerful OGR
|
shapefile. Included within GeoDjango is an interface to GDAL's powerful OGR
|
||||||
library -- in other words, you'll be able explore all the vector data sources
|
library -- in other words, you'll be able explore all the vector data sources
|
||||||
that OGR supports via a Pythonic API.
|
that OGR supports via a Pythonic API.
|
||||||
|
|
|
@ -1305,7 +1305,7 @@ display options:
|
||||||
* ``reverse``
|
* ``reverse``
|
||||||
* ``conceal``
|
* ``conceal``
|
||||||
|
|
||||||
A color specification follows one of the the following patterns:
|
A color specification follows one of the following patterns:
|
||||||
|
|
||||||
* ``role=fg``
|
* ``role=fg``
|
||||||
* ``role=fg/bg``
|
* ``role=fg/bg``
|
||||||
|
|
|
@ -878,7 +878,7 @@ See also: ``{% include %}``.
|
||||||
.. versionchanged:: 1.3
|
.. versionchanged:: 1.3
|
||||||
|
|
||||||
In Django 1.5, the behavior of the :ttag:`ssi` template tag will
|
In Django 1.5, the behavior of the :ttag:`ssi` template tag will
|
||||||
change, with the the first argument being made into a context
|
change, with the first argument being made into a context
|
||||||
variable, rather than being a special case unquoted constant. This
|
variable, rather than being a special case unquoted constant. This
|
||||||
will allow the :ttag:`ssi` tag to use a context variable as the
|
will allow the :ttag:`ssi` tag to use a context variable as the
|
||||||
value of the page to be included.
|
value of the page to be included.
|
||||||
|
@ -1017,7 +1017,7 @@ projects?
|
||||||
.. versionchanged:: 1.3
|
.. versionchanged:: 1.3
|
||||||
|
|
||||||
In Django 1.5, the behavior of the :ttag:`url` template tag will
|
In Django 1.5, the behavior of the :ttag:`url` template tag will
|
||||||
change, with the the first argument being made into a context
|
change, with the first argument being made into a context
|
||||||
variable, rather than being a special case unquoted constant. This
|
variable, rather than being a special case unquoted constant. This
|
||||||
will allow the :ttag:`url` tag to use a context variable as the
|
will allow the :ttag:`url` tag to use a context variable as the
|
||||||
value of the URL name to be reversed.
|
value of the URL name to be reversed.
|
||||||
|
|
|
@ -352,7 +352,7 @@ are now included:
|
||||||
|
|
||||||
GeoDjango now supports the rich capabilities added
|
GeoDjango now supports the rich capabilities added
|
||||||
in the `PostGIS 1.5 release <http://postgis.refractions.net/documentation/manual-1.5/>`_.
|
in the `PostGIS 1.5 release <http://postgis.refractions.net/documentation/manual-1.5/>`_.
|
||||||
New features include suppport for the the :ref:`geography type <geography-type>`
|
New features include suppport for the :ref:`geography type <geography-type>`
|
||||||
and enabling of :ref:`distance queries <distance-queries>`
|
and enabling of :ref:`distance queries <distance-queries>`
|
||||||
with non-point geometries on geographic coordinate systems.
|
with non-point geometries on geographic coordinate systems.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue