diff options
Diffstat (limited to 'docs/tutorials/bfgwiki2')
| -rw-r--r-- | docs/tutorials/bfgwiki2/authorization.rst | 12 | ||||
| -rw-r--r-- | docs/tutorials/bfgwiki2/basiclayout.rst | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/docs/tutorials/bfgwiki2/authorization.rst b/docs/tutorials/bfgwiki2/authorization.rst index f701b4ef8..5257bbe5f 100644 --- a/docs/tutorials/bfgwiki2/authorization.rst +++ b/docs/tutorials/bfgwiki2/authorization.rst @@ -25,10 +25,10 @@ security declarations; when we begin to use a custom root factory to generate our contexts, we can begin to make use of the declarative security features of :mod:`repoze.bfg`. -Let's modify our ``run.py``, passing in a :term:`root factory` as the -first argument to ``repoze.bfg.router.make_app``. We'll point it at a -new class we create inside our ``models.py`` file. Add the following -statements to your ``models.py`` file: +Let's modify our ``run.py``, passing in a :term:`root factory` to our +:term:`Configurator` constructor. We'll point it at a new class we +create inside our ``models.py`` file. Add the following statements to +your ``models.py`` file: .. code-block:: python @@ -58,8 +58,8 @@ See :ref:`assigning_acls` for more information about what an :ref:`route_zcml_directive` for more info. We'll pass the ``RootFactory`` we created in the step above in as the -first argument to ``make_app``. When we're done, your application's -``run.py`` will look like this. +``root_factory`` argument to a :term:`Configurator`. When we're done, +your application's ``run.py`` will look like this. .. literalinclude:: src/authorization/tutorial/run.py :linenos: diff --git a/docs/tutorials/bfgwiki2/basiclayout.rst b/docs/tutorials/bfgwiki2/basiclayout.rst index 4cb37aa91..b8d0ddcc2 100644 --- a/docs/tutorials/bfgwiki2/basiclayout.rst +++ b/docs/tutorials/bfgwiki2/basiclayout.rst @@ -132,12 +132,12 @@ be in ``run.py`` and its ``app`` function: #. Line *25*. We initialize our SQL database using SQLAlchemy, passing it the db string. -#. Line *26*. We use the ``repoze.bfg.router.make_app`` to return a - :term:`WSGI` application. The ``make_app`` function's first - parameter is the "root factory", which is used by the - :mod:`repoze.bfg` :term:`traversal` mechanism. Since this is a URL - dispatch application, the root factory is ``None``. The second - argument is the *package* representing our application, and the - third argument, ``settings`` is passed as a keyword argument. It - contains a dictionary of settings parsed by PasteDeploy. +#. Line *26*. We construct a :term:`Configurator`. The first + argument provided to the configurator is the :term:`root factory`, + which is used by the :mod:`repoze.bfg` :term:`traversal` mechanism. + Since this is a URL dispatch application, the root factory is + ``None``. The second argument ``settings`` is passed as a keyword + argument. It contains a dictionary of settings parsed by + PasteDeploy. We then use the ``make_wsgi_app`` method of the + :term:`Configurator` to return a :term:`WSGI` application. |