Commit 566b3295 authored by Jannis Leidel's avatar Jannis Leidel
Browse files

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
parent 1abafe69
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ answer newbie questions, and generally made Django that much better:
    eriks@win.tue.nl
    Tomáš Ehrlich <tomas.ehrlich@gmail.com>
    Dirk Eschler <dirk.eschler@gmx.net>
    Bernhard Essl <me@bernhardessl.com>
    Dan Fairs <dan@fezconsulting.com>
    Marc Fargas <telenieko@telenieko.com>
    Szilveszter Farkas <szilveszter.farkas@gmail.com>
+1 −1
Original line number Diff line number Diff line
@@ -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):
+1 −1
Original line number Diff line number Diff line
@@ -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.
+1 −1
Original line number Diff line number Diff line
@@ -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`.

+6 −6
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ which preselects the wizard storage backend.
    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 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
======================================
Loading