Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.2.X] Fixed "the the" typos.

Backport of r15536 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15537 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit fe21117cc3d5349aff6a1bb57ac768ef05967577 1 parent 7520dbd
@timgraham timgraham authored
View
22 docs/ref/contrib/gis/deployment.txt
@@ -6,15 +6,15 @@ Deploying GeoDjango
GeoDjango uses the GDAL geospatial library which is
not thread safe at this time. Thus, it is *highly* recommended
- to not use threading when deploying -- in other words, use a
+ to not use threading when deploying -- in other words, use a
an appropriate configuration of Apache or the prefork method
when using FastCGI through another Web server.
Apache
======
-In this section there are some example ``VirtualHost`` directives for
+In this section there are some example ``VirtualHost`` directives for
when deploying using either ``mod_python`` or ``mod_wsgi``. At this
-time, we recommend ``mod_wsgi``, as it is now officially recommended
+time, we recommend ``mod_wsgi``, as it is now officially recommended
way to deploy Django applications with Apache. Moreover, if
``mod_python`` is used, then a prefork version of Apache must also be
used. As long as ``mod_wsgi`` is configured correctly, it does not
@@ -22,8 +22,8 @@ matter whether the version of Apache is prefork or worker.
.. note::
- The ``Alias`` and ``Directory`` configurations in the the examples
- below use an example path to a system-wide installation folder of Django.
+ The ``Alias`` and ``Directory`` configurations in the examples
+ below use an example path to a system-wide installation folder of Django.
Substitute in an appropriate location, if necessary, as it may be
different than the path on your system.
@@ -36,7 +36,7 @@ Example::
WSGIDaemonProcess geodjango user=geo group=geo processes=5 threads=1
WSGIProcessGroup geodjango
WSGIScriptAlias / /home/geo/geodjango/world.wsgi
-
+
Alias /media/ "/usr/lib/python2.5/site-packages/django/contrib/admin/media/"
<Directory "/usr/lib/python2.5/site-packages/django/contrib/admin/media/">
Order allow,deny
@@ -44,13 +44,13 @@ Example::
Allow from all
IndexOptions FancyIndexing
</Directory>
-
+
</VirtualHost>
.. warning::
If the ``WSGIDaemonProcess`` attribute ``threads`` is not set to ``1``, then
- Apache may crash when running your GeoDjango application. Increase the
+ Apache may crash when running your GeoDjango application. Increase the
number of ``processes`` instead.
For more information, please consult Django's
@@ -62,7 +62,7 @@ For more information, please consult Django's
Example::
<VirtualHost *:80>
-
+
<Location "/">
SetHandler mod_python
PythonHandler django.core.handlers.modpython
@@ -70,12 +70,12 @@ Example::
PythonDebug On
PythonPath "['/var/www/apps'] + sys.path"
</Location>
-
+
Alias /media/ "/usr/lib/python2.5/site-packages/django/contrib/admin/media/"
<Location "/media">
SetHandler None
</Location>
-
+
</VirtualHost>
.. warning::
View
8 docs/ref/contrib/gis/geoquerysets.txt
@@ -14,7 +14,7 @@ GeoQuerySet API Reference
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>`.
Instead of the regular Django :ref:`field-lookups`, the
spatial lookups in this section are available for :class:`GeometryField`.
@@ -271,7 +271,7 @@ relate
*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,
``(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
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``
~~~~~~~~~~~~
@@ -947,7 +947,7 @@ of the geometry field in each model converted to the requested output format.
.. 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.
__ http://geohash.org/
View
11 docs/ref/contrib/gis/install.txt
@@ -81,7 +81,7 @@ SQLite GEOS, GDAL, PROJ.4, SpatiaLite 3.6.+ Requires
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:
======================== ==================================== ================================ ==========================
@@ -98,8 +98,9 @@ Program Description Required
.. admonition:: Install GDAL
While :ref:`gdalbuild` is technically not required, it is *recommended*.
- Some features of GeoDjango (including the :ref:`ref-layermapping` and the geographic
- admin) depend on its functionality.
+ Important features of GeoDjango (including the :ref:`ref-layermapping`,
+ geometry reprojection, and the geographic admin) depend on its
+ functionality.
.. note::
@@ -480,7 +481,7 @@ to look like the following::
.. 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``
and ``library_dirs`` settings are uncommented and set to the appropriate
path if the SQLite header files and libraries are not in ``/usr/include``
@@ -810,7 +811,7 @@ __ http://www.kyngchaos.com/software/postgres
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
- to add the the following in your settings::
+ to add the following in your settings::
GEOS_LIBRARY_PATH='/Library/Frameworks/GEOS.framework/GEOS'
GDAL_LIBRARY_PATH='/Library/Frameworks/GDAL.framework/GDAL'
View
2  docs/ref/contrib/gis/tutorial.txt
@@ -321,7 +321,7 @@ may also use the following to populate your spatial database:
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
library -- in other words, you'll be able explore all the vector data sources
that OGR supports via a Pythonic API.
View
2  docs/ref/django-admin.txt
@@ -1210,7 +1210,7 @@ display options:
* ``reverse``
* ``conceal``
-A color specification follows one of the the following patterns:
+A color specification follows one of the following patterns:
* ``role=fg``
* ``role=fg/bg``
View
2  docs/releases/1.2.txt
@@ -352,7 +352,7 @@ are now included:
GeoDjango now supports the rich capabilities added
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>`
with non-point geometries on geographic coordinate systems.
Please sign in to comment.
Something went wrong with that request. Please try again.