From 7fb7518ff8d71650a926b6da9335156389449680 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 29 Jan 2011 00:06:20 -0500 Subject: renderings --- pyramid/security.py | 2 +- pyramid/settings.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyramid/security.py b/pyramid/security.py index 51c0802d5..4da42a966 100644 --- a/pyramid/security.py +++ b/pyramid/security.py @@ -144,7 +144,7 @@ def remember(request, principal, **kw): implied by the data passed as ``principal`` and ``*kw`` using the current :term:`authentication policy`. Common usage might look like so within the body of a view function (``response`` is - assumed to be an :term:`WebOb` -style :term:`response` object + assumed to be a :term:`WebOb` -style :term:`response` object computed previously by the view code):: from pyramid.security import remember diff --git a/pyramid/settings.py b/pyramid/settings.py index e33a8e086..9d1bb6acb 100644 --- a/pyramid/settings.py +++ b/pyramid/settings.py @@ -85,7 +85,7 @@ def get_settings(): performs the same duty. .. warning:: This method is deprecated as of Pyramid 1.0. Use - ``pyramid.threadlocals.get_current_registry().settings`` instead or use ' + ``pyramid.threadlocals.get_current_registry().settings`` instead or use the ``settings`` attribute of the registry available from the request (``request.registry.settings``). """ -- cgit v1.2.3