diff --git a/AUTHORS b/AUTHORS index 6d1d479a11a..f45af4e4af3 100644 --- a/AUTHORS +++ b/AUTHORS @@ -172,6 +172,7 @@ answer newbie questions, and generally made Django that much better: eriks@win.tue.nl Tomáš Ehrlich Dirk Eschler + Bernhard Essl Dan Fairs Marc Fargas Szilveszter Farkas diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt index 3cd8279234f..8ba41aa7904 100644 --- a/docs/ref/contrib/admin/index.txt +++ b/docs/ref/contrib/admin/index.txt @@ -985,7 +985,7 @@ templates used by the :class:`ModelAdmin` views: .. versionadded:: 1.4 The ``get_ordering`` method takes a``request`` as parameter and - is expected to return a ``list`` or ``tuple`` for ordering similiar + is expected to return a ``list`` or ``tuple`` for ordering similar to the :attr:`ordering` attribute. For example:: class PersonAdmin(ModelAdmin): diff --git a/docs/ref/contrib/csrf.txt b/docs/ref/contrib/csrf.txt index a932a0e4810..dcac4377bbd 100644 --- a/docs/ref/contrib/csrf.txt +++ b/docs/ref/contrib/csrf.txt @@ -417,7 +417,7 @@ CSRF_COOKIE_DOMAIN Default: ``None`` The domain to be used when setting the CSRF cookie. This can be useful for -easily allowing cross-subdomain requests to be exluded from the normal cross +easily allowing cross-subdomain requests to be excluded from the normal cross site request forgery protection. It should be set to a string such as ``".lawrence.com"`` to allow a POST request from a form on one subdomain to be accepted by accepted by a view served from another subdomain. diff --git a/docs/ref/contrib/flatpages.txt b/docs/ref/contrib/flatpages.txt index bce9a2f2896..db063f91ad8 100644 --- a/docs/ref/contrib/flatpages.txt +++ b/docs/ref/contrib/flatpages.txt @@ -85,7 +85,7 @@ does all of the work. subsequently raise a 404. .. versionchanged:: 1.4 - Redirects by the middlware are permanent (301 status code) instead of + Redirects by the middleware are permanent (301 status code) instead of temporary (302) to match behavior of the :class:`~django.middleware.common.CommonMiddleware`. diff --git a/docs/ref/contrib/formtools/form-wizard.txt b/docs/ref/contrib/formtools/form-wizard.txt index aec18bfaf48..036c42cdd24 100644 --- a/docs/ref/contrib/formtools/form-wizard.txt +++ b/docs/ref/contrib/formtools/form-wizard.txt @@ -100,7 +100,7 @@ which preselects the wizard storage backend. in the :doc:`sessions documentation ` on how to enable sessions. -We will use the :class:`SessionWizardView` in all examples but is is completly +We will use the :class:`SessionWizardView` in all examples but is 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`. @@ -263,8 +263,8 @@ Advanced ``WizardView`` methods .. method:: WizardView.get_form_initial(step) Returns a dictionary which will be passed to the form for ``step`` as - ``initial``. If no initial data was provied while initializing the - form wizard, a empty dictionary should be returned. + ``initial``. If no initial data was provided while initializing the + form wizard, an empty dictionary should be returned. The default implementation:: @@ -283,8 +283,8 @@ Advanced ``WizardView`` methods .. method:: WizardView.get_form_instance(step) - Returns a object which will be passed to the form for ``step`` as - ``instance``. If no instance object was provied while initializing + Returns an object which will be passed to the form for ``step`` as + ``instance``. If no instance object was provided while initializing the form wizard, None be returned. The default implementation:: @@ -475,7 +475,7 @@ This storage will temporarilyy store the uploaded files for the wizard. The Please remember to take care of removing old files as the :class:`WizardView` won't remove any files, whether the wizard gets - finished corretly or not. + finished correctly or not. Conditionally view/skip specific steps ====================================== diff --git a/docs/ref/contrib/gis/deployment.txt b/docs/ref/contrib/gis/deployment.txt index 26faae4f2b5..14f803d54f8 100644 --- a/docs/ref/contrib/gis/deployment.txt +++ b/docs/ref/contrib/gis/deployment.txt @@ -6,8 +6,8 @@ Deploying GeoDjango GeoDjango uses the GDAL geospatial library which is not thread safe at this time. Thus, it is *highly* recommended - to not use threading when deploying -- in other words, use a - an appropriate configuration of Apache or the prefork method + to not use threading when deploying -- in other words, use an + appropriate configuration of Apache or the prefork method when using FastCGI through another Web server. Apache diff --git a/docs/ref/contrib/gis/gdal.txt b/docs/ref/contrib/gis/gdal.txt index d16b2875a23..77c7c076188 100644 --- a/docs/ref/contrib/gis/gdal.txt +++ b/docs/ref/contrib/gis/gdal.txt @@ -937,9 +937,9 @@ Coordinate System Objects 4326 >>> print srs['TOWGS84', 4] # the fourth value in this wkt 0 - >>> print srs['UNIT|AUTHORITY'] # For the units authority, have to use the pipe symbole. + >>> print srs['UNIT|AUTHORITY'] # For the units authority, have to use the pipe symbol. EPSG - >>> print srs['UNIT|AUTHORITY', 1] # The authority value for the untis + >>> print srs['UNIT|AUTHORITY', 1] # The authority value for the units 9122 .. method:: attr_value(target, index=0) diff --git a/docs/ref/contrib/gis/geoquerysets.txt b/docs/ref/contrib/gis/geoquerysets.txt index 80cebb2969b..15cac908c74 100644 --- a/docs/ref/contrib/gis/geoquerysets.txt +++ b/docs/ref/contrib/gis/geoquerysets.txt @@ -301,7 +301,7 @@ SpatiaLite SQL equivalent:: Oracle ~~~~~~ -Here the relation pattern is compreised at least one of the nine relation +Here the relation pattern is comprised at least one of the nine relation strings: ``TOUCH``, ``OVERLAPBDYDISJOINT``, ``OVERLAPBDYINTERSECT``, ``EQUAL``, ``INSIDE``, ``COVEREDBY``, ``CONTAINS``, ``COVERS``, ``ON``, and ``ANYINTERACT``. Multiple strings may be combined with the logical Boolean diff --git a/docs/ref/contrib/gis/install.txt b/docs/ref/contrib/gis/install.txt index 8cd5d0740a2..b0542774260 100644 --- a/docs/ref/contrib/gis/install.txt +++ b/docs/ref/contrib/gis/install.txt @@ -112,7 +112,7 @@ is required. .. note:: - On Linux platforms, it may be necessarry to run the ``ldconfig`` + On Linux platforms, it may be necessary to run the ``ldconfig`` command after installing each library. For example:: $ sudo make install @@ -1202,7 +1202,7 @@ executable with ``cmd.exe``, will set this up:: reg ADD "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v GDAL_DATA /t REG_EXPAND_SZ /f /d "%GDAL_DATA%" reg ADD "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v PROJ_LIB /t REG_EXPAND_SZ /f /d "%PROJ_LIB%" -For your convenience, these commands are available in the execuatble batch +For your convenience, these commands are available in the executable batch script, :download:`geodjango_setup.bat`. .. note:: diff --git a/docs/ref/contrib/localflavor.txt b/docs/ref/contrib/localflavor.txt index bd38adc6934..0f99f35b4dc 100644 --- a/docs/ref/contrib/localflavor.txt +++ b/docs/ref/contrib/localflavor.txt @@ -1363,5 +1363,5 @@ Uruguay (``uy``) .. class:: uy.forms.UYDepartamentSelect - A ``Select`` widget that uses a list of Uruguayan departaments as its + A ``Select`` widget that uses a list of Uruguayan departments as its choices. diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt index 66c05e508e0..11228f43200 100644 --- a/docs/ref/forms/fields.txt +++ b/docs/ref/forms/fields.txt @@ -938,8 +938,8 @@ representing a foreign key. A single argument is required: .. attribute:: ModelChoiceField.empty_label - By default the ```` widget used by ``ModelChoiceField`` will have an + empty choice at the top of the list. You can change the text of this label (which is ``"---------"`` by default) with the ``empty_label`` attribute, or you can disable the empty label entirely by setting ``empty_label`` to ``None``:: diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index c97f7896616..9d49147f66f 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -305,7 +305,7 @@ CSRF_COOKIE_DOMAIN Default: ``None`` The domain to be used when setting the CSRF cookie. This can be useful for -easily allowing cross-subdomain requests to be exluded from the normal cross +easily allowing cross-subdomain requests to be excluded from the normal cross site request forgery protection. It should be set to a string such as ``".lawrence.com"`` to allow a POST request from a form on one subdomain to be accepted by accepted by a view served from another subdomain. @@ -1997,7 +1997,7 @@ USE_THOUSAND_SEPARATOR Default: ``False`` -A boolean that specifies wheter to display numbers using a thousand separator. +A boolean that specifies whether to display numbers using a thousand separator. If this is set to ``True``, Django will use values from :setting:`THOUSAND_SEPARATOR` and :setting:`NUMBER_GROUPING` from current locale, to format the number. :setting:`USE_L10N` must be set to ``True``, diff --git a/docs/releases/1.2-alpha-1.txt b/docs/releases/1.2-alpha-1.txt index c24fd7a244c..1fc8c6e1a00 100644 --- a/docs/releases/1.2-alpha-1.txt +++ b/docs/releases/1.2-alpha-1.txt @@ -23,7 +23,7 @@ CSRF Protection --------------- There have been large changes to the way that CSRF protection works, detailed in -:doc:`the CSRF documentaton `. The following are the major +:doc:`the CSRF documentation `. The following are the major changes that developers must be aware of: * ``CsrfResponseMiddleware`` and ``CsrfMiddleware`` have been deprecated, and diff --git a/docs/releases/1.2.txt b/docs/releases/1.2.txt index 1f32f15f9da..f397a892d61 100644 --- a/docs/releases/1.2.txt +++ b/docs/releases/1.2.txt @@ -426,7 +426,7 @@ CSRF Protection --------------- We've made large changes to the way CSRF protection works, detailed in -:doc:`the CSRF documentaton `. Here are the major changes you +:doc:`the CSRF documentation `. Here are the major changes you should be aware of: * ``CsrfResponseMiddleware`` and ``CsrfMiddleware`` have been deprecated and diff --git a/docs/topics/forms/modelforms.txt b/docs/topics/forms/modelforms.txt index 3492f4ed76e..07c7b02c199 100644 --- a/docs/topics/forms/modelforms.txt +++ b/docs/topics/forms/modelforms.txt @@ -713,7 +713,7 @@ Overiding ``clean()`` on a ``model_formset`` Just like with ``ModelForms``, by default the ``clean()`` method of a ``model_formset`` will validate that none of the items in the formset violate the unique constraints on your model (either ``unique``, ``unique_together`` or -``unique_for_date|month|year``). If you want to overide the ``clean()`` method +``unique_for_date|month|year``). If you want to override the ``clean()`` method on a ``model_formset`` and maintain this validation, you must call the parent class's ``clean`` method::