Fixed #16621 -- Fixed lots of typos in the docs. Thanks, Bernhard Essl.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16615 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2011-08-13 11:58:19 +00:00
parent 1abafe696e
commit 566b3295fa
15 changed files with 25 additions and 24 deletions

View File

@ -172,6 +172,7 @@ answer newbie questions, and generally made Django that much better:
eriks@win.tue.nl eriks@win.tue.nl
Tomáš Ehrlich <tomas.ehrlich@gmail.com> Tomáš Ehrlich <tomas.ehrlich@gmail.com>
Dirk Eschler <dirk.eschler@gmx.net> Dirk Eschler <dirk.eschler@gmx.net>
Bernhard Essl <me@bernhardessl.com>
Dan Fairs <dan@fezconsulting.com> Dan Fairs <dan@fezconsulting.com>
Marc Fargas <telenieko@telenieko.com> Marc Fargas <telenieko@telenieko.com>
Szilveszter Farkas <szilveszter.farkas@gmail.com> Szilveszter Farkas <szilveszter.farkas@gmail.com>

View File

@ -985,7 +985,7 @@ templates used by the :class:`ModelAdmin` views:
.. versionadded:: 1.4 .. versionadded:: 1.4
The ``get_ordering`` method takes a``request`` as parameter and 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:: to the :attr:`ordering` attribute. For example::
class PersonAdmin(ModelAdmin): class PersonAdmin(ModelAdmin):

View File

@ -417,7 +417,7 @@ CSRF_COOKIE_DOMAIN
Default: ``None`` Default: ``None``
The domain to be used when setting the CSRF cookie. This can be useful for 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 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 ``".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. accepted by accepted by a view served from another subdomain.

View File

@ -85,7 +85,7 @@ does all of the work.
subsequently raise a 404. subsequently raise a 404.
.. versionchanged:: 1.4 .. 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 temporary (302) to match behavior of the
:class:`~django.middleware.common.CommonMiddleware`. :class:`~django.middleware.common.CommonMiddleware`.

View File

@ -100,7 +100,7 @@ which preselects the wizard storage backend.
in the :doc:`sessions documentation </topics/http/sessions>` on in the :doc:`sessions documentation </topics/http/sessions>` on
how to enable sessions. 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 fine to use the :class:`CookieWizardView` instead. As with your
:class:`~django.forms.Form` classes, this :class:`WizardView` class can live :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`. 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) .. method:: WizardView.get_form_initial(step)
Returns a dictionary which will be passed to the form for ``step`` as Returns a dictionary which will be passed to the form for ``step`` as
``initial``. If no initial data was provied while initializing the ``initial``. If no initial data was provided while initializing the
form wizard, a empty dictionary should be returned. form wizard, an empty dictionary should be returned.
The default implementation:: The default implementation::
@ -283,8 +283,8 @@ Advanced ``WizardView`` methods
.. method:: WizardView.get_form_instance(step) .. method:: WizardView.get_form_instance(step)
Returns a object which will be passed to the form for ``step`` as Returns an object which will be passed to the form for ``step`` as
``instance``. If no instance object was provied while initializing ``instance``. If no instance object was provided while initializing
the form wizard, None be returned. the form wizard, None be returned.
The default implementation:: 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 Please remember to take care of removing old files as the
:class:`WizardView` won't remove any files, whether the wizard gets :class:`WizardView` won't remove any files, whether the wizard gets
finished corretly or not. finished correctly or not.
Conditionally view/skip specific steps Conditionally view/skip specific steps
====================================== ======================================

View File

@ -6,8 +6,8 @@ Deploying GeoDjango
GeoDjango uses the GDAL geospatial library which is GeoDjango uses the GDAL geospatial library which is
not thread safe at this time. Thus, it is *highly* recommended not thread safe at this time. Thus, it is *highly* recommended
to not use threading when deploying -- in other words, use a to not use threading when deploying -- in other words, use an
an appropriate configuration of Apache or the prefork method appropriate configuration of Apache or the prefork method
when using FastCGI through another Web server. when using FastCGI through another Web server.
Apache Apache

View File

@ -937,9 +937,9 @@ Coordinate System Objects
4326 4326
>>> print srs['TOWGS84', 4] # the fourth value in this wkt >>> print srs['TOWGS84', 4] # the fourth value in this wkt
0 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 EPSG
>>> print srs['UNIT|AUTHORITY', 1] # The authority value for the untis >>> print srs['UNIT|AUTHORITY', 1] # The authority value for the units
9122 9122
.. method:: attr_value(target, index=0) .. method:: attr_value(target, index=0)

View File

@ -301,7 +301,7 @@ SpatiaLite SQL equivalent::
Oracle 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``, strings: ``TOUCH``, ``OVERLAPBDYDISJOINT``, ``OVERLAPBDYINTERSECT``,
``EQUAL``, ``INSIDE``, ``COVEREDBY``, ``CONTAINS``, ``COVERS``, ``ON``, and ``EQUAL``, ``INSIDE``, ``COVEREDBY``, ``CONTAINS``, ``COVERS``, ``ON``, and
``ANYINTERACT``. Multiple strings may be combined with the logical Boolean ``ANYINTERACT``. Multiple strings may be combined with the logical Boolean

View File

@ -112,7 +112,7 @@ is required.
.. note:: .. 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:: command after installing each library. For example::
$ sudo make install $ 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 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%" 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`. script, :download:`geodjango_setup.bat`.
.. note:: .. note::

View File

@ -1363,5 +1363,5 @@ Uruguay (``uy``)
.. class:: uy.forms.UYDepartamentSelect .. 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. choices.

View File

@ -938,8 +938,8 @@ representing a foreign key. A single argument is required:
.. attribute:: ModelChoiceField.empty_label .. attribute:: ModelChoiceField.empty_label
By default the ``<select>`` widget used by ``ModelChoiceField`` will have a By default the ``<select>`` widget used by ``ModelChoiceField`` will have an
an empty choice at the top of the list. You can change the text of this empty choice at the top of the list. You can change the text of this
label (which is ``"---------"`` by default) with the ``empty_label`` label (which is ``"---------"`` by default) with the ``empty_label``
attribute, or you can disable the empty label entirely by setting attribute, or you can disable the empty label entirely by setting
``empty_label`` to ``None``:: ``empty_label`` to ``None``::

View File

@ -305,7 +305,7 @@ CSRF_COOKIE_DOMAIN
Default: ``None`` Default: ``None``
The domain to be used when setting the CSRF cookie. This can be useful for 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 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 ``".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. accepted by accepted by a view served from another subdomain.
@ -1997,7 +1997,7 @@ USE_THOUSAND_SEPARATOR
Default: ``False`` 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 If this is set to ``True``, Django will use values from
:setting:`THOUSAND_SEPARATOR` and :setting:`NUMBER_GROUPING` from current :setting:`THOUSAND_SEPARATOR` and :setting:`NUMBER_GROUPING` from current
locale, to format the number. :setting:`USE_L10N` must be set to ``True``, locale, to format the number. :setting:`USE_L10N` must be set to ``True``,

View File

@ -23,7 +23,7 @@ CSRF Protection
--------------- ---------------
There have been large changes to the way that CSRF protection works, detailed in There have been large changes to the way that CSRF protection works, detailed in
:doc:`the CSRF documentaton </ref/contrib/csrf>`. The following are the major :doc:`the CSRF documentation </ref/contrib/csrf>`. The following are the major
changes that developers must be aware of: changes that developers must be aware of:
* ``CsrfResponseMiddleware`` and ``CsrfMiddleware`` have been deprecated, and * ``CsrfResponseMiddleware`` and ``CsrfMiddleware`` have been deprecated, and

View File

@ -426,7 +426,7 @@ CSRF Protection
--------------- ---------------
We've made large changes to the way CSRF protection works, detailed in We've made large changes to the way CSRF protection works, detailed in
:doc:`the CSRF documentaton </ref/contrib/csrf>`. Here are the major changes you :doc:`the CSRF documentation </ref/contrib/csrf>`. Here are the major changes you
should be aware of: should be aware of:
* ``CsrfResponseMiddleware`` and ``CsrfMiddleware`` have been deprecated and * ``CsrfResponseMiddleware`` and ``CsrfMiddleware`` have been deprecated and

View File

@ -713,7 +713,7 @@ Overiding ``clean()`` on a ``model_formset``
Just like with ``ModelForms``, by default the ``clean()`` method of a Just like with ``ModelForms``, by default the ``clean()`` method of a
``model_formset`` will validate that none of the items in the formset violate ``model_formset`` will validate that none of the items in the formset violate
the unique constraints on your model (either ``unique``, ``unique_together`` or 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 on a ``model_formset`` and maintain this validation, you must call the parent
class's ``clean`` method:: class's ``clean`` method::