diff options
| author | Chris McDonough <chrism@plope.com> | 2010-11-24 03:15:37 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-11-24 03:15:37 -0500 |
| commit | 36715bcdef36737671eef74dfee22d466d690a04 (patch) | |
| tree | 6f50a6bcdcbe5a20ed4df0a4ba894cedc00eb61d | |
| parent | e880a42099f1e3df1bd628058ba9e3a38a5ef0c8 (diff) | |
| parent | bc414e504a11e91da9e6aa3fdd7e3aea724104f9 (diff) | |
| download | pyramid-36715bcdef36737671eef74dfee22d466d690a04.tar.gz pyramid-36715bcdef36737671eef74dfee22d466d690a04.tar.bz2 pyramid-36715bcdef36737671eef74dfee22d466d690a04.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | pyramid/settings.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pyramid/settings.py b/pyramid/settings.py index 64b108421..928dd1915 100644 --- a/pyramid/settings.py +++ b/pyramid/settings.py @@ -88,7 +88,7 @@ def get_settings(): deprecated( 'get_settings', '(pyramid.settings.get_settings 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``)).') |