Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/feature/alchemy-scaffold-updat…
Browse files Browse the repository at this point in the history
…e' into feature/alchemy-scaffold-update
  • Loading branch information
stevepiercy committed Feb 29, 2016
2 parents 3e30040 + 20eac53 commit ae5cccc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docs/tutorials/wiki2/authentication.rst
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Create a new file ``tutorial/views/auth.py``, and add the following code to it:
:linenos:
:language: python

This code adds three new views to application:
This code adds three new views to the application:

- The ``login`` view renders a login form and processes the post from the
login form, checking credentials against our ``users`` table in the database.
Expand Down
4 changes: 2 additions & 2 deletions docs/tutorials/wiki2/authorization.rst
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ including the actual ``Page`` model in the ``page_factory``. The
``edit_page`` views. Similarly the ``NewPage`` will be the context for the
``add_page`` view.

Open the file ``views/default.py``.
Open the file ``tutorial/views/default.py``.

First, you can drop a few imports that are no longer necessary:

Expand Down Expand Up @@ -214,7 +214,7 @@ in) then an ``HTTPForbidden`` exception will be raised automatically. Thus
we're able to drop those exceptions and checks from the views themselves.
Rather we've defined them in terms of operations on a resource.

The final ``views/default.py`` should look like the following:
The final ``tutorial/views/default.py`` should look like the following:

.. literalinclude:: src/authorization/tutorial/views/default.py
:linenos:
Expand Down

0 comments on commit ae5cccc

Please sign in to comment.