diff options
| author | Ville Skyttä <ville.skytta@iki.fi> | 2019-04-14 10:44:56 +0300 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2019-04-18 09:33:53 +0200 |
| commit | 03db5fddfd0c76303ec83eb1cd91a6d2dc4441cb (patch) | |
| tree | e269b21b92c6b771ddc0f8e08fc7a1a6ad62643a /docs | |
| parent | 177fa08339c4908afbefbda5dceabe72641ec915 (diff) | |
Fixed typos in docs, comments, and exception messages.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/contrib/gis/gdal.txt | 12 | ||||
| -rw-r--r-- | docs/ref/models/lookups.txt | 2 | ||||
| -rw-r--r-- | docs/ref/models/querysets.txt | 3 | ||||
| -rw-r--r-- | docs/ref/templates/api.txt | 2 | ||||
| -rw-r--r-- | docs/releases/1.0-porting-guide.txt | 2 | ||||
| -rw-r--r-- | docs/releases/1.4.txt | 4 |
6 files changed, 13 insertions, 12 deletions
diff --git a/docs/ref/contrib/gis/gdal.txt b/docs/ref/contrib/gis/gdal.txt index c1860a204d..6dde659e2d 100644 --- a/docs/ref/contrib/gis/gdal.txt +++ b/docs/ref/contrib/gis/gdal.txt @@ -1172,9 +1172,9 @@ blue. The name of the GDAL driver used to handle the input file. For ``GDALRaster``\s created from a file, the driver type is detected automatically. The creation of rasters from - scratch is a in-memory raster by default (``'MEM'``), but can be altered as - needed. For instance, use ``GTiff`` for a ``GeoTiff`` file. For a list of file types, - see also the `GDAL Raster Formats`__ list. + scratch is an in-memory raster by default (``'MEM'``), but can be + altered as needed. For instance, use ``GTiff`` for a ``GeoTiff`` file. + For a list of file types, see also the `GDAL Raster Formats`__ list. __ https://www.gdal.org/formats_list.html @@ -1271,9 +1271,9 @@ blue. .. attribute:: scale - Pixel width and height used for georeferencing the raster, as a as a - point object with ``x`` and ``y`` members. See :attr:`geotransform` - for more information. + Pixel width and height used for georeferencing the raster, as a point + object with ``x`` and ``y`` members. See :attr:`geotransform` for more + information. >>> rst = GDALRaster({'width': 10, 'height': 20, 'srid': 4326}) >>> rst.scale diff --git a/docs/ref/models/lookups.txt b/docs/ref/models/lookups.txt index c0e97e9fe6..aae5ba96c4 100644 --- a/docs/ref/models/lookups.txt +++ b/docs/ref/models/lookups.txt @@ -132,7 +132,7 @@ following methods: prominent example is ``__year`` that transforms a ``DateField`` into a ``IntegerField``. - The notation to use a ``Transform`` in an lookup expression is + The notation to use a ``Transform`` in a lookup expression is ``<expression>__<transformation>`` (e.g. ``date__year``). This class follows the :ref:`Query Expression API <query-expression>`, which diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index 8485d436e1..6428576cbc 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -1737,7 +1737,8 @@ raised if ``select_for_update()`` is used in autocommit mode. Takes a raw SQL query, executes it, and returns a ``django.db.models.query.RawQuerySet`` instance. This ``RawQuerySet`` instance -can be iterated over just like an normal ``QuerySet`` to provide object instances. +can be iterated over just like a normal ``QuerySet`` to provide object +instances. See the :doc:`/topics/db/sql` for more information. diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt index 86ef097749..dbd8324ba2 100644 --- a/docs/ref/templates/api.txt +++ b/docs/ref/templates/api.txt @@ -628,7 +628,7 @@ below. Also, you can give :class:`RequestContext` a list of additional processors, using the optional, third positional argument, ``processors``. In this -example, the :class:`RequestContext` instance gets a ``ip_address`` variable:: +example, the :class:`RequestContext` instance gets an ``ip_address`` variable:: from django.http import HttpResponse from django.template import RequestContext, Template diff --git a/docs/releases/1.0-porting-guide.txt b/docs/releases/1.0-porting-guide.txt index 7f96f5e80f..8ea7945ad3 100644 --- a/docs/releases/1.0-porting-guide.txt +++ b/docs/releases/1.0-porting-guide.txt @@ -134,7 +134,7 @@ extensibility and customization in mind. Practically, this means you'll need to rewrite all of your ``class Admin`` declarations. You've already seen in `models`_ above how to replace your ``class -Admin`` with a ``admin.site.register()`` call in an ``admin.py`` file. Below are +Admin`` with an ``admin.site.register()`` call in an ``admin.py`` file. Below are some more details on how to rewrite that ``Admin`` declaration into the new syntax. diff --git a/docs/releases/1.4.txt b/docs/releases/1.4.txt index 8bf30b77e5..ccee3df153 100644 --- a/docs/releases/1.4.txt +++ b/docs/releases/1.4.txt @@ -699,7 +699,7 @@ are configured and your Web server serves those files correctly. The development server continues to serve the admin files just like before. Read the :doc:`static files howto </howto/static-files/index>` for more details. -If your ``ADMIN_MEDIA_PREFIX`` is set to an specific domain (e.g. +If your ``ADMIN_MEDIA_PREFIX`` is set to a specific domain (e.g. ``http://media.example.com/admin/``), make sure to also set your :setting:`STATIC_URL` setting to the correct URL -- for example, ``http://media.example.com/``. @@ -783,7 +783,7 @@ time you need to run Django 1.3 for the data to expire or become irrelevant. * Time period: Defined by :setting:`PASSWORD_RESET_TIMEOUT_DAYS`. -Form-related hashes: these have a are much shorter lifetime and are relevant +Form-related hashes: these have a much shorter lifetime and are relevant only for the short window where a user might fill in a form generated by the pre-upgrade Django instance and try to submit it to the upgraded Django instance: |
