summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-11-10 07:42:05 +0000
committerChris McDonough <chrism@agendaless.com>2009-11-10 07:42:05 +0000
commitfbbf671f4644f1db86390bc57bb7529da9b37027 (patch)
tree1d982fd6db45aaee565043683791d73b07ed29c7
parent3b2ad38748a3bfefb5cd67c7d024e70f34beb29f (diff)
downloadpyramid-fbbf671f4644f1db86390bc57bb7529da9b37027.tar.gz
pyramid-fbbf671f4644f1db86390bc57bb7529da9b37027.tar.bz2
pyramid-fbbf671f4644f1db86390bc57bb7529da9b37027.zip
Make the docs not lie about argument order.
-rw-r--r--docs/api/router.rst2
-rw-r--r--repoze/bfg/router.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/api/router.rst b/docs/api/router.rst
index 11e5b6b35..2bccb9e18 100644
--- a/docs/api/router.rst
+++ b/docs/api/router.rst
@@ -5,4 +5,4 @@
.. automodule:: repoze.bfg.router
-.. autofunction:: repoze.bfg.router.make_app(root_factory, package=None, filename='configure.zcml')
+.. autofunction:: repoze.bfg.router.make_app(root_factory, package=None, filename='configure.zcml', settings=None)
diff --git a/repoze/bfg/router.py b/repoze/bfg/router.py
index 34df3e46b..595c89298 100644
--- a/repoze/bfg/router.py
+++ b/repoze/bfg/router.py
@@ -138,8 +138,8 @@ class Router(object):
# make_registry and manager kw args for unit testing only
# note that ``options`` is a b/w compat alias for ``settings``
def make_app(root_factory, package=None, filename='configure.zcml',
- authentication_policy=None, authorization_policy=None,
settings=None, options=None,
+ authentication_policy=None, authorization_policy=None,
manager=manager, make_registry=make_registry):
""" Return a Router object, representing a fully configured
``repoze.bfg`` WSGI application.