summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/design.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-03-17 10:39:17 -0700
committerChris McDonough <chrism@plope.com>2012-03-17 10:39:17 -0700
commitfca8f01565d99d841bed0dfb3c784042af693ab1 (patch)
tree76b5db7cca027e9bcc1dc81be111b8bfae90a2b6 /docs/tutorials/wiki2/design.rst
parent2c6f63a15ba4dff7aaddfa09a7066590c1a833ce (diff)
parentef501bb1618e12ec9f0a57ba5cf873616f7c440a (diff)
downloadpyramid-fca8f01565d99d841bed0dfb3c784042af693ab1.tar.gz
pyramid-fca8f01565d99d841bed0dfb3c784042af693ab1.tar.bz2
pyramid-fca8f01565d99d841bed0dfb3c784042af693ab1.zip
Merge pull request #496 from douglatornell/sql-tut-edits
Improve text of SQLAlchemy wiki tutorial.
Diffstat (limited to 'docs/tutorials/wiki2/design.rst')
-rw-r--r--docs/tutorials/wiki2/design.rst12
1 files changed, 7 insertions, 5 deletions
diff --git a/docs/tutorials/wiki2/design.rst b/docs/tutorials/wiki2/design.rst
index 36c4f19bc..75122bd11 100644
--- a/docs/tutorials/wiki2/design.rst
+++ b/docs/tutorials/wiki2/design.rst
@@ -4,7 +4,7 @@ Design
Following is a quick overview of our wiki application, to help
us understand the changes that we will be doing next in our
-default files generated by the paster scafffold.
+default files generated by the ``alchemy`` scaffold.
Overall
-------
@@ -34,9 +34,10 @@ be used as the wiki home page.
Views
-----
-There will be four views to handle the normal operations of
-viewing, editing and adding wiki pages. Two additional views
-will handle the login and logout tasks related to security.
+There will be four views to handle the normal operations of adding and
+editing wiki pages, and viewing pages and the wiki front page. Two
+additional views will handle the login and logout tasks related to
+security.
Security
--------
@@ -59,7 +60,8 @@ Security
| Allow | group:editors | Edit |
+----------+----------------+----------------+
-- Permission declarations for the views.
+- Permission declarations are added to the views to assert the
+ security policies as each request is handled.
Summary