summaryrefslogtreecommitdiff
path: root/docs/tutorials
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2015-06-23 15:10:23 -0400
committerChris McDonough <chrism@plope.com>2015-06-23 15:10:23 -0400
commitf3b0c71139da13c88a660ef6edbe4d37ecb9e508 (patch)
tree980843f9df248a84b0094ed9090edadd0a0e7dea /docs/tutorials
parent713bc5f2785636327f4cee40d958bcff83afa9c5 (diff)
parent24b249c5afe5e3d97e327046252a0b3e42152580 (diff)
downloadpyramid-f3b0c71139da13c88a660ef6edbe4d37ecb9e508.tar.gz
pyramid-f3b0c71139da13c88a660ef6edbe4d37ecb9e508.tar.bz2
pyramid-f3b0c71139da13c88a660ef6edbe4d37ecb9e508.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/tutorials')
-rw-r--r--docs/tutorials/wiki2/authorization.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/tutorials/wiki2/authorization.rst b/docs/tutorials/wiki2/authorization.rst
index d2ad7a9ca..1d810b05b 100644
--- a/docs/tutorials/wiki2/authorization.rst
+++ b/docs/tutorials/wiki2/authorization.rst
@@ -5,12 +5,12 @@ Adding authorization
====================
:app:`Pyramid` provides facilities for :term:`authentication` and
-::term:`authorization`. We'll make use of both features to provide security
-:to our application. Our application currently allows anyone with access to
-:the server to view, edit, and add pages to our wiki. We'll change that to
-:allow only people who are members of a *group* named ``group:editors`` to add
-:and edit wiki pages but we'll continue allowing anyone with access to the
-:server to view pages.
+:term:`authorization`. We'll make use of both features to provide security
+to our application. Our application currently allows anyone with access to
+the server to view, edit, and add pages to our wiki. We'll change that to
+allow only people who are members of a *group* named ``group:editors`` to add
+and edit wiki pages but we'll continue allowing anyone with access to the
+server to view pages.
We will also add a login page and a logout link on all the pages. The login
page will be shown when a user is denied access to any of the views that