summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki/design.rst
diff options
context:
space:
mode:
Diffstat (limited to 'docs/tutorials/wiki/design.rst')
-rw-r--r--docs/tutorials/wiki/design.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/tutorials/wiki/design.rst b/docs/tutorials/wiki/design.rst
index c94612fb1..eb785dd1c 100644
--- a/docs/tutorials/wiki/design.rst
+++ b/docs/tutorials/wiki/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 ``zodb`` scafffold.
+default files generated by the ``zodb`` scaffold.
Overall
-------
@@ -37,8 +37,8 @@ Views
-----
There will be three views to handle the normal operations of adding,
-editing and viewing wiki pages, plus one view for the wiki front page.
-Two templates will be used, one for viewing, and one for both for adding
+editing, and viewing wiki pages, plus one view for the wiki front page.
+Two templates will be used, one for viewing, and one for both adding
and editing wiki pages.
The default templating systems in :app:`Pyramid` are
@@ -53,11 +53,11 @@ Security
We'll eventually be adding security to our application. The components we'll
use to do this are below.
-- USERS, a dictionary mapping users names to their
+- USERS, a dictionary mapping usernames to their
corresponding passwords.
-- GROUPS, a dictionary mapping user names to a
- list of groups they belong to.
+- GROUPS, a dictionary mapping usernames to a
+ list of groups to which they belong to.
- ``groupfinder``, an *authorization callback* that looks up
USERS and GROUPS. It will be provided in a new