summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos de la Guardia <cguardia@yahoo.com>2011-06-02 17:01:25 -0700
committerCarlos de la Guardia <cguardia@yahoo.com>2011-06-02 17:01:25 -0700
commit42e5130b4448326fe061631dbad8754c29015db6 (patch)
tree73daf5909a4a3b9e27994e4dabfab7c31559a015
parent1d10f9db57c23d949bd8dc24c3175ffc884519b8 (diff)
parent97d1c790743b73ccad7a3073004599c6ae2a7bea (diff)
downloadpyramid-42e5130b4448326fe061631dbad8754c29015db6.tar.gz
pyramid-42e5130b4448326fe061631dbad8754c29015db6.tar.bz2
pyramid-42e5130b4448326fe061631dbad8754c29015db6.zip
Merge pull request #203 from inneos/patch-1
Edited pyramid/settings.py via GitHub
-rw-r--r--pyramid/settings.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pyramid/settings.py b/pyramid/settings.py
index b1078f2ec..edea9ce99 100644
--- a/pyramid/settings.py
+++ b/pyramid/settings.py
@@ -78,7 +78,7 @@ def get_settings():
:func:`pyramid.router.make_app` API.
.. warning:: This method is deprecated as of Pyramid 1.0. Use
- ``pyramid.threadlocals.get_current_registry().settings`` instead or use
+ ``pyramid.threadlocal.get_current_registry().settings`` instead or use
the ``settings`` attribute of the registry available from the request
(``request.registry.settings``).
"""