diff options
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/checks.txt | 4 | ||||
| -rw-r--r-- | docs/ref/class-based-views/mixins-multiple-object.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/admin/index.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/formtools/form-wizard.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/forms-api.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/gdal.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/geoquerysets.txt | 4 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/geos.txt | 6 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/layermapping.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/model-api.txt | 2 | ||||
| -rw-r--r-- | docs/ref/django-admin.txt | 2 | ||||
| -rw-r--r-- | docs/ref/exceptions.txt | 2 | ||||
| -rw-r--r-- | docs/ref/models/custom-lookups.txt | 4 | ||||
| -rw-r--r-- | docs/ref/settings.txt | 2 | ||||
| -rw-r--r-- | docs/ref/signals.txt | 2 |
15 files changed, 20 insertions, 20 deletions
diff --git a/docs/ref/checks.txt b/docs/ref/checks.txt index 0a10c753a3..84082bc6d6 100644 --- a/docs/ref/checks.txt +++ b/docs/ref/checks.txt @@ -150,7 +150,7 @@ piggyback on an existing registration. Fields, models, and model managers all implement a ``check()`` method that is already registered with the check framework. If you want to add extra checks, -you can extend the implemenation on the base class, perform any extra +you can extend the implementation on the base class, perform any extra checks you need, and append any messages to those generated by the base class. It's recommended the you delegate each check to a separate methods. @@ -195,7 +195,7 @@ code snippet shows how you can implement this check:: return [] If you wanted to add checks to a model manager, you would take the same -approach on your sublass of :class:`~django.db.models.Manager`. +approach on your subclass of :class:`~django.db.models.Manager`. If you want to add a check to a model class, the approach is *almost* the same: the only difference is that the check is a classmethod, not an instance method:: diff --git a/docs/ref/class-based-views/mixins-multiple-object.txt b/docs/ref/class-based-views/mixins-multiple-object.txt index 62dae9e094..160237f4e2 100644 --- a/docs/ref/class-based-views/mixins-multiple-object.txt +++ b/docs/ref/class-based-views/mixins-multiple-object.txt @@ -91,7 +91,7 @@ MultipleObjectMixin .. attribute:: page_kwarg A string specifying the name to use for the page parameter. - The view will expect this prameter to be available either as a query + The view will expect this parameter to be available either as a query string parameter (via ``request.GET``) or as a kwarg variable specified in the URLconf. Defaults to ``page``. diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt index b44d9d6f13..a7746e3deb 100644 --- a/docs/ref/contrib/admin/index.txt +++ b/docs/ref/contrib/admin/index.txt @@ -1693,7 +1693,7 @@ templates used by the :class:`ModelAdmin` views: ``response_change`` is called after the admin form is submitted and just after the object and all the related instances have been saved. You can override it to change the default - behavior after the object has been changedn. + behavior after the object has been changed. .. method:: ModelAdmin.response_delete(request, obj_display) diff --git a/docs/ref/contrib/formtools/form-wizard.txt b/docs/ref/contrib/formtools/form-wizard.txt index 5fc2a57294..faa836ecd8 100644 --- a/docs/ref/contrib/formtools/form-wizard.txt +++ b/docs/ref/contrib/formtools/form-wizard.txt @@ -726,7 +726,7 @@ sessions and browser cookies respectively). To use the named urls, you have to change the ``urls.py``. Below you will see an example of a contact wizard with two steps, step 1 with -"contactdata" as its name and step 2 with "leavemessage" as its name. +``"contactdata"`` as its name and step 2 with ``"leavemessage"`` as its name. Additionally you have to pass two more arguments to the :meth:`~WizardView.as_view` method: diff --git a/docs/ref/contrib/gis/forms-api.txt b/docs/ref/contrib/gis/forms-api.txt index a556fac1fc..c689f3df64 100644 --- a/docs/ref/contrib/gis/forms-api.txt +++ b/docs/ref/contrib/gis/forms-api.txt @@ -158,7 +158,7 @@ Widget classes ``OpenLayersWidget`` and :class:`OSMWidget` use the ``openlayers.js`` file hosted on the ``openlayers.org`` Web site. This works for basic usage - during development, but isn't appropropriate for a production deployment as + during development, but isn't appropriate for a production deployment as ``openlayers.org/api/`` has no guaranteed uptime and runs on a slow server. You are therefore advised to subclass these widgets in order to specify your own version of the ``openlayers.js`` file in the ``js`` property of diff --git a/docs/ref/contrib/gis/gdal.txt b/docs/ref/contrib/gis/gdal.txt index 528341036d..0dfcc520e6 100644 --- a/docs/ref/contrib/gis/gdal.txt +++ b/docs/ref/contrib/gis/gdal.txt @@ -7,7 +7,7 @@ GDAL API .. module:: django.contrib.gis.gdal :synopsis: GeoDjango's high-level interface to the GDAL library. -`GDAL`__ stands for **G**\ eospatial **D**\ ata **A**\ bstraction **L**\ ibrary, +`GDAL`__ stands for **Geospatial Data Abstraction Library**, and is a veritable "swiss army knife" of GIS data functionality. A subset of GDAL is the `OGR`__ Simple Features Library, which specializes in reading and writing vector geographic data in a variety of standard diff --git a/docs/ref/contrib/gis/geoquerysets.txt b/docs/ref/contrib/gis/geoquerysets.txt index 66afc3d377..5f1d3521eb 100644 --- a/docs/ref/contrib/gis/geoquerysets.txt +++ b/docs/ref/contrib/gis/geoquerysets.txt @@ -638,7 +638,7 @@ Oracle ``SDO_WITHIN_DISTANCE(poly, geom, 5)`` ======================= ``GeoQuerySet`` methods specify that a spatial operation be performed -on each patial operation on each geographic +on each spatial operation on each geographic field in the queryset and store its output in a new attribute on the model (which is generally the name of the ``GeoQuerySet`` method). @@ -1103,7 +1103,7 @@ Aggregate Methods 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 +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/geos.txt b/docs/ref/contrib/gis/geos.txt index 4a2a26b725..e316841f49 100644 --- a/docs/ref/contrib/gis/geos.txt +++ b/docs/ref/contrib/gis/geos.txt @@ -13,7 +13,7 @@ Background What is GEOS? ------------- -`GEOS`__ stands for **G**\ eometry **E**\ ngine - **O**\ pen **S**\ ource, +`GEOS`__ stands for **Geometry Engine - Open Source**, and is a C++ library, ported from the `Java Topology Suite`__. GEOS implements the OpenGIS `Simple Features for SQL`__ spatial predicate functions and spatial operators. GEOS, now an OSGeo project, was initially developed and @@ -500,7 +500,7 @@ This property returns the area of the Geometry. .. attribute:: GEOSGeometry.extent This property returns the extent of this geometry as a 4-tuple, -consisting of (xmin, ymin, xmax, ymax). +consisting of ``(xmin, ymin, xmax, ymax)``. .. method:: GEOSGeometry.clone() @@ -625,7 +625,7 @@ is returned instead. .. classmethod:: from_bbox(bbox) Returns a polygon object from the given bounding-box, a 4-tuple - comprising (xmin, ymin, xmax, ymax). + comprising ``(xmin, ymin, xmax, ymax)``. .. attribute:: num_interior_rings diff --git a/docs/ref/contrib/gis/layermapping.txt b/docs/ref/contrib/gis/layermapping.txt index e13f370652..8c28692f69 100644 --- a/docs/ref/contrib/gis/layermapping.txt +++ b/docs/ref/contrib/gis/layermapping.txt @@ -116,7 +116,7 @@ Keyword Arguments (defaults to 0) ``source_srs`` Use this to specify the source SRS manually (for - example, some shapefiles don't come with a '.prj' + example, some shapefiles don't come with a ``'.prj'`` file). An integer SRID, WKT or PROJ.4 strings, and :class:`django.contrib.gis.gdal.SpatialReference` objects are accepted. diff --git a/docs/ref/contrib/gis/model-api.txt b/docs/ref/contrib/gis/model-api.txt index a86092daed..2f4a27bc64 100644 --- a/docs/ref/contrib/gis/model-api.txt +++ b/docs/ref/contrib/gis/model-api.txt @@ -123,7 +123,7 @@ calculations. .. note:: - If you wish to peform arbitrary distance queries using non-point + If you wish to perform arbitrary distance queries using non-point geometries in WGS84, consider upgrading to PostGIS 1.5. For better performance, enable the :attr:`GeometryField.geography` keyword so that :ref:`geography database type <geography-type>` diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 93087698a0..e2b4daec44 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -1082,7 +1082,7 @@ which to generate the SQL. By default, the SQL created is for running the migration in the forwards direction. Pass ``--backwards`` to generate the SQL for -un-applying the migration instead. +unapplying the migration instead. sqlsequencereset <app_label app_label ...> ------------------------------------------ diff --git a/docs/ref/exceptions.txt b/docs/ref/exceptions.txt index c84dd87ed3..18b77fdd71 100644 --- a/docs/ref/exceptions.txt +++ b/docs/ref/exceptions.txt @@ -130,7 +130,7 @@ NON_FIELD_ERRORS ``ValidationError``\s that don't belong to a particular field in a form or model are classified as ``NON_FIELD_ERRORS``. This constant is used -as a key in dictonaries that otherwise map fields to their respective +as a key in dictionaries that otherwise map fields to their respective list of errors. .. currentmodule:: django.core.urlresolvers diff --git a/docs/ref/models/custom-lookups.txt b/docs/ref/models/custom-lookups.txt index 38608180f1..b800897712 100644 --- a/docs/ref/models/custom-lookups.txt +++ b/docs/ref/models/custom-lookups.txt @@ -233,8 +233,8 @@ to this API. execute the query. Calling expression.as_sql() directly is usually incorrect - instead - qn.compile(expression) should be used. The qn.compile() method will take - care of calling vendor-specific methods of the expression. + ``qn.compile(expression)`` should be used. The ``qn.compile()`` method will + take care of calling vendor-specific methods of the expression. .. method:: get_lookup(lookup_name) diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 1b70c4db8a..ebac2a8898 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1785,7 +1785,7 @@ See also :setting:`DATE_FORMAT` and :setting:`SHORT_DATE_FORMAT`. SIGNING_BACKEND --------------- -Default: 'django.core.signing.TimestampSigner' +Default: ``'django.core.signing.TimestampSigner'`` The backend used for signing cookies and other data. diff --git a/docs/ref/signals.txt b/docs/ref/signals.txt index 7ed732afc2..6f1b3029e5 100644 --- a/docs/ref/signals.txt +++ b/docs/ref/signals.txt @@ -611,7 +611,7 @@ request_finished .. data:: django.core.signals.request_finished :module: -Sent when Django finishes delvering an HTTP response to the client. +Sent when Django finishes delivering an HTTP response to the client. .. note:: |