summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/api/configuration.rst2
-rw-r--r--docs/glossary.rst7
2 files changed, 8 insertions, 1 deletions
diff --git a/docs/api/configuration.rst b/docs/api/configuration.rst
index eeea605b2..e872a91b9 100644
--- a/docs/api/configuration.rst
+++ b/docs/api/configuration.rst
@@ -40,7 +40,7 @@
.. automethod:: override_resource(to_override, override_with)
- .. automethod:: scan(package)
+ .. automethod:: scan(package=None, categories=None)
.. automethod:: set_forbidden_view(view=None, attr=None, renderer=None, wrapper=None)
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 2915ff5f3..14bd4fc44 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -660,3 +660,10 @@ Glossary
"GAE") is a Python application hosting service offered by Google.
:mod:`repoze.bfg` runs on GAE.
+ Venusian
+ `Venusian <http://docs.repoze.org/venusian>`_ is a library which
+ allows framework authors to defer decorator actions. Instead of
+ taking actions when a function (or class) decorator is executed
+ at import time, the action usually taken by the decorator is
+ deferred until a separate "scan" phase. :mod:`repoze.bfg` relies
+ on Venusian to provide a basis for its :term:`scan` feature.