summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/authentication.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-02-28 01:25:29 -0800
committerSteve Piercy <web@stevepiercy.com>2016-02-28 01:25:29 -0800
commit8c76c75e8345aac1c447f33cc223d687b84c3697 (patch)
treed81ede6be6b3415240ce9bd60f5d0bc3d3d21c4b /docs/tutorials/wiki2/authentication.rst
parenta6db36c984bd69f8a6aba80ad6db435cd4b1b93c (diff)
parentf99052e0790b8706161e432da0172b45a805d308 (diff)
downloadpyramid-8c76c75e8345aac1c447f33cc223d687b84c3697.tar.gz
pyramid-8c76c75e8345aac1c447f33cc223d687b84c3697.tar.bz2
pyramid-8c76c75e8345aac1c447f33cc223d687b84c3697.zip
Merge pull request #2380 from stevepiercy/feature/alchemy-scaffold-update
wiki2 authorization (done)
Diffstat (limited to 'docs/tutorials/wiki2/authentication.rst')
-rw-r--r--docs/tutorials/wiki2/authentication.rst13
1 files changed, 7 insertions, 6 deletions
diff --git a/docs/tutorials/wiki2/authentication.rst b/docs/tutorials/wiki2/authentication.rst
index 115f7f689..8d9855460 100644
--- a/docs/tutorials/wiki2/authentication.rst
+++ b/docs/tutorials/wiki2/authentication.rst
@@ -288,14 +288,15 @@ following URLs, checking that the result is as expected:
- http://localhost:6543/FrontPage/edit_page invokes the edit view for the
``FrontPage`` object. It is executable by only the ``editor`` user. If a
different user (or the anonymous user) invokes it, then a login form will be
- displayed. Supplying the credentials with the username ``editor``, password
- ``editor`` will display the edit page form.
+ displayed. Supplying the credentials with the username ``editor`` and
+ password ``editor`` will display the edit page form.
- http://localhost:6543/add_page/SomePageName invokes the add view for a page.
- It is executable by the ``editor`` or ``basic`` user. If a different user (or
- the anonymous user) invokes it, then a login form will be displayed.
- Supplying the credentials with the username ``basic``, password ``basic``,
- will display the edit page form.
+ It is executable by either the ``editor`` or ``basic`` user. If a different
+ user (or the anonymous user) invokes it, then a login form will be displayed.
+ Supplying the credentials with either the username ``editor`` and password
+ ``editor``, or username ``basic`` and password ``basic``, will display the
+ edit page form.
- http://localhost:6543/SomePageName/edit_page is editable by the ``basic``
user if the page was created by that user in the previous step. If, instead,