summaryrefslogtreecommitdiff
path: root/repoze
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-11-23 14:32:16 +0000
committerChris McDonough <chrism@agendaless.com>2009-11-23 14:32:16 +0000
commitb68f6c075311c69aea1f570fc1458f261ce87da4 (patch)
treeb5acb48a366a14b3980dbdba19a4ec31d3599d75 /repoze
parent4e2c2ddae01aef751b29cf7bb9f594d962fec7c6 (diff)
downloadpyramid-b68f6c075311c69aea1f570fc1458f261ce87da4.tar.gz
pyramid-b68f6c075311c69aea1f570fc1458f261ce87da4.tar.bz2
pyramid-b68f6c075311c69aea1f570fc1458f261ce87da4.zip
Flesh out configuration chapter.
Diffstat (limited to 'repoze')
-rw-r--r--repoze/bfg/configuration.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/repoze/bfg/configuration.py b/repoze/bfg/configuration.py
index 356630d8a..a3ce9b1e0 100644
--- a/repoze/bfg/configuration.py
+++ b/repoze/bfg/configuration.py
@@ -87,8 +87,9 @@ class Configurator(object):
used to add configuration to the registry. The overall state of a
registry is called the 'configuration state'.
- .. warning:: If a ``registry`` is passed to the Configurator, all
- other arguments are ignored.
+ .. warning:: If a ``registry`` is passed to the Configurator
+ constructor, all other constructor arguments except ``package``
+ are ignored.
If the ``package`` argument is passed, it must be a reference to a
Python package (e.g. ``sys.modules['thepackage']``). This value