summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTshepang Lekhonkhobe <tshepang@gmail.com>2013-01-23 00:27:57 +0200
committerTshepang Lekhonkhobe <tshepang@gmail.com>2013-01-23 00:27:57 +0200
commit60270f462baeaa0b1818666776d6826dd6bbb7d3 (patch)
tree42eb61fd7b8f22b9ac73621d125c75bcbd6192f8
parent0bf0919151be46a759efaf92c697e5bce2a2e8f0 (diff)
downloadpyramid-60270f462baeaa0b1818666776d6826dd6bbb7d3.tar.gz
pyramid-60270f462baeaa0b1818666776d6826dd6bbb7d3.tar.bz2
pyramid-60270f462baeaa0b1818666776d6826dd6bbb7d3.zip
a more accurate note
-rw-r--r--pyramid/config/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 175d8f3a4..724bc7522 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -112,9 +112,9 @@ class Configurator(
otherwise be done. After its construction, the configurator may be used
to add further configuration to the registry.
- .. warning:: If a ``registry`` is passed to the Configurator
- constructor, all other constructor arguments except ``package``
- are ignored.
+ .. warning:: If ``registry`` is assigned the above-mentioned class
+ instance, all other constructor arguments are ignored,
+ with the exception of ``package``.
If the ``package`` argument is passed, it must be a reference to a Python
:term:`package` (e.g. ``sys.modules['thepackage']``) or a :term:`dotted