diff options
| author | Marti Raudsepp <marti@juffo.org> | 2014-04-23 02:05:14 +0300 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-04-22 20:13:43 -0400 |
| commit | c5306d4af1e9430d2397e8d83b37fa3598a17e83 (patch) | |
| tree | 4bc6b1fd1b4112152fd299bfedf6b5dc7846cb49 /docs/ref | |
| parent | 49f5a2949311c6aaaac0005c4f6ab79cf96ee09d (diff) | |
[1.6.x] Various documentation typo/spelling fixes
Errors detected by Topy (https://github.com/intgr/topy), all changes
verified by hand.
Backport of 11d453bcadad3c9a5ae35882792d0f1e8e8e7818 from master
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/contrib/admin/actions.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/formtools/form-wizard.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/gdal.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/geos.txt | 2 | ||||
| -rw-r--r-- | docs/ref/databases.txt | 2 | ||||
| -rw-r--r-- | docs/ref/utils.txt | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/docs/ref/contrib/admin/actions.txt b/docs/ref/contrib/admin/actions.txt index 65d096921f..af7956ca2f 100644 --- a/docs/ref/contrib/admin/actions.txt +++ b/docs/ref/contrib/admin/actions.txt @@ -146,7 +146,7 @@ Handling errors in actions If there are foreseeable error conditions that may occur while running your action, you should gracefully inform the user of the problem. This means -handling exceptions and and using +handling exceptions and using :meth:`django.contrib.admin.ModelAdmin.message_user` to display a user friendly description of the problem in the response. diff --git a/docs/ref/contrib/formtools/form-wizard.txt b/docs/ref/contrib/formtools/form-wizard.txt index 9ec23449e3..92b947e155 100644 --- a/docs/ref/contrib/formtools/form-wizard.txt +++ b/docs/ref/contrib/formtools/form-wizard.txt @@ -106,7 +106,7 @@ respectively). in the :doc:`sessions documentation </topics/http/sessions>` on how to enable sessions. -We will use the :class:`SessionWizardView` in all examples but is is completely +We will use the :class:`SessionWizardView` in all examples but is completely fine to use the :class:`CookieWizardView` instead. As with your :class:`~django.forms.Form` classes, this :class:`WizardView` class can live anywhere in your codebase, but convention is to put it in :file:`views.py`. diff --git a/docs/ref/contrib/gis/gdal.txt b/docs/ref/contrib/gis/gdal.txt index 3f26606ae5..eaec155df5 100644 --- a/docs/ref/contrib/gis/gdal.txt +++ b/docs/ref/contrib/gis/gdal.txt @@ -739,7 +739,7 @@ systems and coordinate transformation:: .. attribute:: z Returns the Z coordinate of this point, or ``None`` if the - the point does not have a Z coordinate:: + point does not have a Z coordinate:: >>> OGRGeometry('POINT (1 2 3)').z 3.0 diff --git a/docs/ref/contrib/gis/geos.txt b/docs/ref/contrib/gis/geos.txt index 77291f2c1f..dd94338b34 100644 --- a/docs/ref/contrib/gis/geos.txt +++ b/docs/ref/contrib/gis/geos.txt @@ -872,7 +872,7 @@ Returns WKB of the geometry in hexadecimal. Example:: .. attribute:: WKBWriter.byteorder -This property may be be set to change the byte-order of the geometry +This property may be set to change the byte-order of the geometry representation. =============== ================================================= diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index 0822b05b24..40bb778aa9 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -766,7 +766,7 @@ Threaded option ---------------- If you plan to run Django in a multithreaded environment (e.g. Apache using the -the default MPM module on any modern operating system), then you **must** set +default MPM module on any modern operating system), then you **must** set the ``threaded`` option of your Oracle database configuration to True:: 'OPTIONS': { diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt index 107f6fd591..cc1199a42d 100644 --- a/docs/ref/utils.txt +++ b/docs/ref/utils.txt @@ -1026,7 +1026,7 @@ For a complete discussion on the usage of the following see the current point in time. Exactly what's returned depends on the value of :setting:`USE_TZ`: - * If :setting:`USE_TZ` is ``False``, this will be be a + * If :setting:`USE_TZ` is ``False``, this will be a :ref:`naive <naive_vs_aware_datetimes>` datetime (i.e. a datetime without an associated timezone) that represents the current time in the system's local timezone. |
