summaryrefslogtreecommitdiff
path: root/docs/tutorials
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-10-28 14:08:06 -0400
committerChris McDonough <chrism@plope.com>2013-10-28 14:08:06 -0400
commit0f424ae492c4b7f11d526149046fc6467a54e438 (patch)
tree072461e6aa562934077674b609fcc77205bef17b /docs/tutorials
parente5a0ca90d16ce78e05db71253720fa3082d8da2d (diff)
parent3c2f95e8049bbd45b144d454daa68005361828b2 (diff)
downloadpyramid-0f424ae492c4b7f11d526149046fc6467a54e438.tar.gz
pyramid-0f424ae492c4b7f11d526149046fc6467a54e438.tar.bz2
pyramid-0f424ae492c4b7f11d526149046fc6467a54e438.zip
Merge branch 'security-apis-on-request' of github.com:mgrbyte/pyramid into mgrbyte-security-apis-on-request
Diffstat (limited to 'docs/tutorials')
-rw-r--r--docs/tutorials/wiki/authorization.rst4
-rw-r--r--docs/tutorials/wiki2/authorization.rst4
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/tutorials/wiki/authorization.rst b/docs/tutorials/wiki/authorization.rst
index 460a852e0..2bd8c1f1c 100644
--- a/docs/tutorials/wiki/authorization.rst
+++ b/docs/tutorials/wiki/authorization.rst
@@ -207,8 +207,8 @@ need to be added.)
:meth:`~pyramid.view.forbidden_view_config` will be used
to customize the default 403 Forbidden page.
-:meth:`~pyramid.security.remember` and
-:meth:`~pyramid.security.forget` help to create and
+:meth:`~pyramid.request.Request.remember_userid` and
+:meth:`~pyramid.request.Request.forget_userid` help to create and
expire an auth ticket cookie.
Now add the ``login`` and ``logout`` views:
diff --git a/docs/tutorials/wiki2/authorization.rst b/docs/tutorials/wiki2/authorization.rst
index cf20db6d7..2b4263610 100644
--- a/docs/tutorials/wiki2/authorization.rst
+++ b/docs/tutorials/wiki2/authorization.rst
@@ -230,8 +230,8 @@ head of ``tutorial/tutorial/views.py``:
:meth:`~pyramid.view.forbidden_view_config` will be used
to customize the default 403 Forbidden page.
-:meth:`~pyramid.security.remember` and
-:meth:`~pyramid.security.forget` help to create and
+:meth:`~pyramid.request.Request.remember_userid` and
+:meth:`~pyramid.request.Request.forget_userid` help to create and
expire an auth ticket cookie.
Now add the ``login`` and ``logout`` views: