From 250c0218d0bd7dab6ea7e16c7051af71394f2a63 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@agendaless.com>
Date: Mon, 26 Jul 2010 00:26:10 +0000
Subject: merge generic_rendering branch

---
 repoze/bfg/settings.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'repoze/bfg/settings.py')

diff --git a/repoze/bfg/settings.py b/repoze/bfg/settings.py
index ff292dc7c..5e1181809 100644
--- a/repoze/bfg/settings.py
+++ b/repoze/bfg/settings.py
@@ -71,6 +71,10 @@ def get_settings():
 
     .. note:: For backwards compatibility, dictionary keys can also be
        looked up as attributes of the settings object.
+
+    .. note:: the
+       :class:`repoze.bfg.configuration.Configurator.get_settings` method
+       performs the same duty.
     """
     reg = get_current_registry()
     return reg.queryUtility(ISettings)
-- 
cgit v1.2.3