diff options
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/migration-operations.txt | 2 | ||||
| -rw-r--r-- | docs/ref/utils.txt | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/docs/ref/contrib/admin/actions.txt b/docs/ref/contrib/admin/actions.txt index a892f41106..5757e2e39b 100644 --- a/docs/ref/contrib/admin/actions.txt +++ b/docs/ref/contrib/admin/actions.txt @@ -145,7 +145,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 7cb39b498d..81e7b38b88 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 158b6f3aad..4c3d8a1945 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 e316841f49..028b70e5d5 100644 --- a/docs/ref/contrib/gis/geos.txt +++ b/docs/ref/contrib/gis/geos.txt @@ -880,7 +880,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 a73c361876..35a63719a3 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -768,7 +768,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/migration-operations.txt b/docs/ref/migration-operations.txt index bbce6df861..2a5f46a93c 100644 --- a/docs/ref/migration-operations.txt +++ b/docs/ref/migration-operations.txt @@ -174,7 +174,7 @@ RunSQL RunSQL(sql, reverse_sql=None, state_operations=None, multiple=False) -Allows runnning of arbitrary SQL on the database - useful for more advanced +Allows running of arbitrary SQL on the database - useful for more advanced features of database backends that Django doesn't support directly, like partial indexes. diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt index a8bdc2cb16..dcd5a18208 100644 --- a/docs/ref/utils.txt +++ b/docs/ref/utils.txt @@ -1016,7 +1016,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. |