summaryrefslogtreecommitdiff
path: root/docs/tutorials
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2014-11-17 20:20:15 -0600
committerMichael Merickel <michael@merickel.org>2014-11-17 20:20:15 -0600
commit3be89551889d87c5f7d86c18f2e92f03470ff4f9 (patch)
tree01be54a1ee57f59260cd31e4189ce968656013c9 /docs/tutorials
parent2b59a35c4b5ec0f7052aacce3ffa66ce74cbae56 (diff)
parent170404ecddd2837b682f4af26575f03ccf456841 (diff)
downloadpyramid-3be89551889d87c5f7d86c18f2e92f03470ff4f9.tar.gz
pyramid-3be89551889d87c5f7d86c18f2e92f03470ff4f9.tar.bz2
pyramid-3be89551889d87c5f7d86c18f2e92f03470ff4f9.zip
Merge pull request #1399 from Pylons/feature.security-docs-enhancements
security docs enhancements
Diffstat (limited to 'docs/tutorials')
-rw-r--r--docs/tutorials/wiki/design.rst4
-rw-r--r--docs/tutorials/wiki2/design.rst3
2 files changed, 4 insertions, 3 deletions
diff --git a/docs/tutorials/wiki/design.rst b/docs/tutorials/wiki/design.rst
index eb785dd1c..28380bd66 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 usernames to their
+- USERS, a dictionary mapping :term:`userids <userid>` to their
corresponding passwords.
-- GROUPS, a dictionary mapping usernames to a
+- GROUPS, a dictionary mapping :term:`userids <userid>` to a
list of groups to which they belong to.
- ``groupfinder``, an *authorization callback* that looks up
diff --git a/docs/tutorials/wiki2/design.rst b/docs/tutorials/wiki2/design.rst
index df2c83398..ff7413668 100644
--- a/docs/tutorials/wiki2/design.rst
+++ b/docs/tutorials/wiki2/design.rst
@@ -53,7 +53,8 @@ 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 corresponding passwords.
+- USERS, a dictionary mapping users names (the user's :term:`userids
+ <userid>`) to their corresponding passwords.
- GROUPS, a dictionary mapping user names to a list of groups they belong to.