diff options
| author | Chris McDonough <chrism@plope.com> | 2011-01-29 00:06:20 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-01-29 00:06:20 -0500 |
| commit | 7fb7518ff8d71650a926b6da9335156389449680 (patch) | |
| tree | fcfd8ae6c13e423af8887942e9e15f0f6ccff37f | |
| parent | d533b19d06ffa2e3e55dfdf7689dbd718ffeec7a (diff) | |
| download | pyramid-7fb7518ff8d71650a926b6da9335156389449680.tar.gz pyramid-7fb7518ff8d71650a926b6da9335156389449680.tar.bz2 pyramid-7fb7518ff8d71650a926b6da9335156389449680.zip | |
renderings
| -rw-r--r-- | pyramid/security.py | 2 | ||||
| -rw-r--r-- | 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``). """ |