diff options
| author | Chris McDonough <chrism@agendaless.com> | 2010-07-13 23:48:26 +0000 |
|---|---|---|
| committer | Chris McDonough <chrism@agendaless.com> | 2010-07-13 23:48:26 +0000 |
| commit | 465f18df135db19b6e7a9abd359c4652eebb2230 (patch) | |
| tree | 16c2daa20599cd392d2fc5f1e57f6c8426bdf4f5 | |
| parent | 0482bd06bcde5601ea2ab3b01b774e03f92160b7 (diff) | |
| download | pyramid-465f18df135db19b6e7a9abd359c4652eebb2230.tar.gz pyramid-465f18df135db19b6e7a9abd359c4652eebb2230.tar.bz2 pyramid-465f18df135db19b6e7a9abd359c4652eebb2230.zip | |
docs tweaks
| -rw-r--r-- | docs/narr/hooks.rst | 2 | ||||
| -rw-r--r-- | repoze/bfg/configuration.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst index 254e35e8e..77287c746 100644 --- a/docs/narr/hooks.rst +++ b/docs/narr/hooks.rst @@ -106,7 +106,7 @@ the :term:`authorization policy` in use, it invokes a :term:`forbidden view`. The default forbidden response has a 401 status code and is very plain, but the view which generates it can be overridden as necessary using either :term:`imperative configuration` or -:term:`ZCML`: +:term:`ZCML`. The :term:`forbidden view` callable is a view callable like any other. The :term:`view configuration` which causes it to be a "not found" diff --git a/repoze/bfg/configuration.py b/repoze/bfg/configuration.py index 3aa7a93fb..1e760a064 100644 --- a/repoze/bfg/configuration.py +++ b/repoze/bfg/configuration.py @@ -88,9 +88,9 @@ class Configurator(object): :term:`application registry`. The Configurator accepts a number of arguments: ``registry``, - ``package``, ``settings``, ``root_factory``, ``zcml_file``, + ``package``, ``settings``, ``root_factory``, ``authentication_policy``, ``authorization_policy``, ``renderers`` - and ``debug_logger``. + ``debug_logger`` and ``locale_negotiator``. If the ``registry`` argument is passed as a non-``None`` value, it must be an instance of the :class:`repoze.bfg.registry.Registry` |