diff options
| -rw-r--r-- | pyramid/config.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pyramid/config.py b/pyramid/config.py index f3f8ff37b..93123c119 100644 --- a/pyramid/config.py +++ b/pyramid/config.py @@ -132,10 +132,10 @@ class Configurator(object): :term:`application registry`. The Configurator accepts a number of arguments: ``registry``, - ``package``, ``settings``, ``root_factory``, - ``authentication_policy``, ``authorization_policy``, ``renderers`` - ``debug_logger``, ``locale_negotiator``, ``request_factory``, and - ``renderer_globals_factory``. + ``package``, ``settings``, ``root_factory``, ``authentication_policy``, + ``authorization_policy``, ``renderers`` ``debug_logger``, + ``locale_negotiator``, ``request_factory``, ``renderer_globals_factory``, + ``default_permission``, ``session_factory``, and ``autocommit``. If the ``registry`` argument is passed as a non-``None`` value, it must be an instance of the :class:`pyramid.registry.Registry` |
