Commit 8385b31c authored by Simon Meers's avatar Simon Meers
Browse files

[1.3.X] Fixed #16014 -- numerous documentation typos -- thanks psmith.

Backport of r16220 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@16221 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent fc391631
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ The new custom command can be called using ``python manage.py closepoll
<poll_id>``.

The ``handle()`` method takes zero or more ``poll_ids`` and sets ``poll.opened``
to ``False`` for each one. If the user referenced any nonexistant polls, a
to ``False`` for each one. If the user referenced any nonexistent polls, a
:class:`CommandError` is raised. The ``poll.opened`` attribute does not exist
in the :doc:`tutorial</intro/tutorial01>` and was added to
``polls.models.Poll`` for this example.
+1 −1
Original line number Diff line number Diff line
@@ -829,7 +829,7 @@ Here's how you'd use this new version of the tag:
.. admonition:: Variable scope in context

    Any variable set in the context will only be available in the same ``block``
    of the template in which it was assigned. This behaviour is intentional;
    of the template in which it was assigned. This behavior is intentional;
    it provides a scope for variables so that they don't conflict with
    context in other blocks.

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ At this point, Django on Jython should behave nearly identically to Django
running on standard Python. However, are a few differences to keep in mind:

    * Remember to use the ``jython`` command instead of ``python``. The
      documentation uses ``python`` for consistancy, but if you're using Jython
      documentation uses ``python`` for consistency, but if you're using Jython
      you'll want to mentally replace ``python`` with ``jython`` every time it
      occurs.

+3 −3
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ A far better way is to use the value of the :setting:`STATIC_URL` setting
directly in your templates. This means that a switch of static files servers
only requires changing that single value. Much better!

``staticfiles`` inludes two built-in ways of getting at this setting in your
``staticfiles`` includes two built-in ways of getting at this setting in your
templates: a context processor and a template tag.

With a context processor
@@ -170,7 +170,7 @@ As a brief refresher, context processors add variables into the contexts of
every template. However, context processors require that you use
:class:`~django.template.RequestContext` when rendering templates. This happens
automatically if you're using a :doc:`generic view </ref/class-based-views>`,
but in views written by hand you'll need to explicitally use ``RequestContext``
but in views written by hand you'll need to explicitly use ``RequestContext``
To see how that works, and to read more details, check out
:ref:`subclassing-context-requestcontext`.

@@ -439,7 +439,7 @@ For example, if you've written an S3 storage backend in

Once that's done, all you have to do is run :djadmin:`collectstatic` and your
static files would be pushed through your storage package up to S3. If you
later needed to swich to a different storage provider, it could be as simple
later needed to switch to a different storage provider, it could be as simple
as changing your :setting:`STATICFILES_STORAGE` setting.

For details on how you'd write one of these backends,
+1 −1
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ to do:
    * Then, click the "Join this Team" button to become a member of this team.
      Every team has at least one coordinator who is responsible to review
      your membership request. You can of course also contact the team
      coordinator to clarify procedual problems and handle the actual
      coordinator to clarify procedural problems and handle the actual
      translation process.

    * Once you are a member of a team choose the translation resource you
Loading