summaryrefslogtreecommitdiff
path: root/docs/tutorials
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-01-01 21:05:48 -0500
committerChris McDonough <chrism@plope.com>2013-01-01 21:05:48 -0500
commit1a19bf74afc768db45c77604c2cd33cc26af34c1 (patch)
treece6cfba28f4ad75a89e34f51c3ba363e34e873a4 /docs/tutorials
parent96ab9f26990423f67045e5639a29579a1a76a71e (diff)
parente0062294430dd1d30d31b9f8c0a2e6e9060bcb76 (diff)
downloadpyramid-1a19bf74afc768db45c77604c2cd33cc26af34c1.tar.gz
pyramid-1a19bf74afc768db45c77604c2cd33cc26af34c1.tar.bz2
pyramid-1a19bf74afc768db45c77604c2cd33cc26af34c1.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/tutorials')
-rw-r--r--docs/tutorials/wiki/design.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/tutorials/wiki/design.rst b/docs/tutorials/wiki/design.rst
index c94612fb1..b44ccb10e 100644
--- a/docs/tutorials/wiki/design.rst
+++ b/docs/tutorials/wiki/design.rst
@@ -53,10 +53,10 @@ 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
+- GROUPS, a dictionary mapping usernames to a
list of groups they belong to.
- ``groupfinder``, an *authorization callback* that looks up