diff --git a/docs/internals/committers.txt b/docs/internals/committers.txt index f9f9d2fd919..e2934a8db1c 100644 --- a/docs/internals/committers.txt +++ b/docs/internals/committers.txt @@ -321,7 +321,7 @@ Ramiro Morales Honza Král Honza first discovered Django in 2006 and started using it right away, - first for school and personal projects and later in his full time job. He + first for school and personal projects and later in his full-time job. He contributed various patches and fixes mostly to the newforms library, newforms admin and, through participation in the Google Summer of Code project, assisted in creating the :ref:`model validation @@ -520,11 +520,10 @@ Marc Tamlyn documentation at DjangoCon EU 2012, and also helped to develop `CCBV`_, an additional class based view reference tool. - Marc currently works at `Incuna Ltd`_, a digital healthcare agency in + Marc is currently a full-time parent, part-time developer, and lives in Oxford, UK. .. _CCBV: http://ccbv.co.uk/ -.. _Incuna Ltd: http://incuna.com/ Baptiste Mispelon Baptiste discovered Django around the 1.2 version and promptly switched away diff --git a/docs/internals/contributing/writing-documentation.txt b/docs/internals/contributing/writing-documentation.txt index f7a6fe6b971..9d6ddc3059b 100644 --- a/docs/internals/contributing/writing-documentation.txt +++ b/docs/internals/contributing/writing-documentation.txt @@ -192,7 +192,7 @@ Our policy for new features is: release, not the development version. Our preferred way for marking new features is by prefacing the features' -documentation with: "``.. versionadded:: X.Y``", followed by a a mandatory +documentation with: "``.. versionadded:: X.Y``", followed by a mandatory blank line and an optional content (indented). General improvements, or other changes to the APIs that should be emphasized diff --git a/docs/ref/contrib/admin/actions.txt b/docs/ref/contrib/admin/actions.txt index 65d096921f5..af7956ca2f1 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 9ec23449e33..92b947e1555 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 ` 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 3f26606ae59..eaec155df56 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 77291f2c1f1..dd94338b342 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 0822b05b24a..40bb778aa98 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 107f6fd5911..cc1199a42d7 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 ` datetime (i.e. a datetime without an associated timezone) that represents the current time in the system's local timezone. diff --git a/docs/releases/1.0-alpha-1.txt b/docs/releases/1.0-alpha-1.txt index 56ff5f8a4d9..0660f9e5f78 100644 --- a/docs/releases/1.0-alpha-1.txt +++ b/docs/releases/1.0-alpha-1.txt @@ -77,7 +77,7 @@ handlers have been refactored to allow finer-grained control over the uploading process as well as streaming uploads of large files. Along with these improvements and additions, we've made a number of -of backwards-incompatible changes to the framework, as features have been +backwards-incompatible changes to the framework, as features have been fleshed out and APIs have been finalized for the 1.0 release. A complete guide to these changes will be available as part of the final Django 1.0 release, and a comprehensive list of backwards-incompatible diff --git a/docs/releases/1.1.txt b/docs/releases/1.1.txt index ca8e1fff2a2..e2eb9d8ef63 100644 --- a/docs/releases/1.1.txt +++ b/docs/releases/1.1.txt @@ -50,7 +50,7 @@ Following this change, all platforms, regardless of word size, will generate a As a result of this change, you will not be able to use the ``reset`` management command on any table made by a 64-bit machine. This is because the -the new generated name will not match the historically generated name; as a +new generated name will not match the historically generated name; as a result, the SQL constructed by the reset command will be invalid. If you need to reset an application that was created with 64-bit constraints, diff --git a/docs/releases/1.2-alpha-1.txt b/docs/releases/1.2-alpha-1.txt index 8c905f6ef0b..0d08c979cee 100644 --- a/docs/releases/1.2-alpha-1.txt +++ b/docs/releases/1.2-alpha-1.txt @@ -520,7 +520,7 @@ Added ``readonly_fields`` to ``ModelAdmin`` :attr:`django.contrib.admin.ModelAdmin.readonly_fields` has been added to enable non-editable fields in add/change pages for models and inlines. Field -and calculated values can be displayed along side editable fields. +and calculated values can be displayed alongside editable fields. Customizable syntax highlighting -------------------------------- diff --git a/docs/releases/1.6.4.txt b/docs/releases/1.6.4.txt index 8a325c9141b..6bf0b6fef00 100644 --- a/docs/releases/1.6.4.txt +++ b/docs/releases/1.6.4.txt @@ -10,5 +10,5 @@ Bugfixes ======== * Added backwards compatibility support for the :mod:`django.contrib.messages` - cookie format of Django 1.4 and earlier to faciliate upgrading to 1.6 from + cookie format of Django 1.4 and earlier to facilitate upgrading to 1.6 from 1.4 (`#22426 `_). diff --git a/docs/topics/forms/index.txt b/docs/topics/forms/index.txt index 70ed4a9c3da..46bd2b7271f 100644 --- a/docs/topics/forms/index.txt +++ b/docs/topics/forms/index.txt @@ -96,6 +96,7 @@ The standard pattern for processing a form in a view looks like this: def contact(request): if request.method == 'POST': # If the form has been submitted... + # ContactForm was defined in the previous section form = ContactForm(request.POST) # A form bound to the POST data if form.is_valid(): # All validation rules pass # Process the data in form.cleaned_data diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt index 631925ddf34..4d7d477a8a1 100644 --- a/docs/topics/i18n/translation.txt +++ b/docs/topics/i18n/translation.txt @@ -124,7 +124,7 @@ specified with Python's standard named-string interpolation syntax. Example:: This technique lets language-specific translations reorder the placeholder text. For example, an English translation may be ``"Today is November 26."``, while a Spanish translation may be ``"Hoy es 26 de Noviembre."`` -- with the -the month and the day placeholders swapped. +month and the day placeholders swapped. For this reason, you should use named-string interpolation (e.g., ``%(day)s``) instead of positional interpolation (e.g., ``%s`` or ``%d``) whenever you diff --git a/docs/topics/testing/advanced.txt b/docs/topics/testing/advanced.txt index b7fced16888..be6ee03392c 100644 --- a/docs/topics/testing/advanced.txt +++ b/docs/topics/testing/advanced.txt @@ -52,7 +52,7 @@ The following is a simple unit test using the request factory:: # Create an instance of a GET request. request = self.factory.get('/customer/details') - # Recall that middleware are not suported. You can simulate a + # Recall that middleware are not supported. You can simulate a # logged-in user by setting request.user manually. request.user = self.user