Update documentation after root factory changes.

6 files changed, 21 insertions, 9 deletions

diff --git a/docs/tutorials/bfgwiki/basiclayout.rst b/docs/tutorials/bfgwiki/basiclayout.rst
index 5df7f2487..59545e7cc 100644
--- a/docs/tutorials/bfgwiki/basiclayout.rst
+++ b/docs/tutorials/bfgwiki/basiclayout.rst
@@ -103,11 +103,13 @@ be in ``run.py`` and its ``app`` function:
    file's ``[app:main]`` section.  This will be a URI (something like
    ``file:///path/to/Data.fs``).
 
-#. Line *16*. We create a :term:`root factory` using the
-   ``PersistentApplicationFinder`` helper class, passing it the
-   ZODB URI and our appmaker.
+#. Line *16*. We create a "finder" object using the
+   ``PersistentApplicationFinder`` helper class, passing it the ZODB
+   URI and our appmaker.
 
-#. Line *17*.  We use the ``repoze.bfg.router.make_app`` to return a
+#. *Lines 17 - 18*.  We create a :term:`root factory` using the finder.
+
+#. Line *19*.  We use the ``repoze.bfg.router.make_app`` to return a
    :term:`WSGI` application.  The ``make_app`` function takes the root
    factory (``get_root``), the *package* representing our application,
    and the keywords parsed by PasteDeploy.
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/run.py b/docs/tutorials/bfgwiki/src/authorization/tutorial/run.py
index ebe114c6f..dbcd7b99a 100644
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/run.py
+++ b/docs/tutorials/bfgwiki/src/authorization/tutorial/run.py
@@ -13,6 +13,8 @@ def app(global_config, **kw):
     zodb_uri = kw.get('zodb_uri')
     if zodb_uri is None:
         raise ValueError("No 'zodb_uri' in application configuration.")
-    get_root = PersistentApplicationFinder(zodb_uri, appmaker)
+    finder = PersistentApplicationFinder(zodb_uri, appmaker)
+    def get_root(request):
+        return finder(request.environ)
     return make_app(get_root, tutorial, options=kw)
 
diff --git a/docs/tutorials/bfgwiki/src/basiclayout/tutorial/run.py b/docs/tutorials/bfgwiki/src/basiclayout/tutorial/run.py
index 89953e6de..8f021f18e 100644
--- a/docs/tutorials/bfgwiki/src/basiclayout/tutorial/run.py
+++ b/docs/tutorials/bfgwiki/src/basiclayout/tutorial/run.py
@@ -13,5 +13,7 @@ def app(global_config, **kw):
     if zodb_uri is None:
         raise ValueError("No 'zodb_uri' in application configuration.")
 
-    get_root = PersistentApplicationFinder(zodb_uri, appmaker)
+    finder = PersistentApplicationFinder(zodb_uri, appmaker)
+    def get_root(request):
+        return finder(request.environ)
     return make_app(get_root, tutorial, options=kw)
diff --git a/docs/tutorials/bfgwiki/src/models/tutorial/run.py b/docs/tutorials/bfgwiki/src/models/tutorial/run.py
index 89953e6de..8f021f18e 100644
--- a/docs/tutorials/bfgwiki/src/models/tutorial/run.py
+++ b/docs/tutorials/bfgwiki/src/models/tutorial/run.py
@@ -13,5 +13,7 @@ def app(global_config, **kw):
     if zodb_uri is None:
         raise ValueError("No 'zodb_uri' in application configuration.")
 
-    get_root = PersistentApplicationFinder(zodb_uri, appmaker)
+    finder = PersistentApplicationFinder(zodb_uri, appmaker)
+    def get_root(request):
+        return finder(request.environ)
     return make_app(get_root, tutorial, options=kw)
diff --git a/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/run.py b/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/run.py
index 89953e6de..8f021f18e 100644
--- a/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/run.py
+++ b/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/run.py
@@ -13,5 +13,7 @@ def app(global_config, **kw):
     if zodb_uri is None:
         raise ValueError("No 'zodb_uri' in application configuration.")
 
-    get_root = PersistentApplicationFinder(zodb_uri, appmaker)
+    finder = PersistentApplicationFinder(zodb_uri, appmaker)
+    def get_root(request):
+        return finder(request.environ)
     return make_app(get_root, tutorial, options=kw)
diff --git a/docs/tutorials/bfgwiki/src/views/tutorial/run.py b/docs/tutorials/bfgwiki/src/views/tutorial/run.py
index 89953e6de..8f021f18e 100644
--- a/docs/tutorials/bfgwiki/src/views/tutorial/run.py
+++ b/docs/tutorials/bfgwiki/src/views/tutorial/run.py
@@ -13,5 +13,7 @@ def app(global_config, **kw):
     if zodb_uri is None:
         raise ValueError("No 'zodb_uri' in application configuration.")
 
-    get_root = PersistentApplicationFinder(zodb_uri, appmaker)
+    finder = PersistentApplicationFinder(zodb_uri, appmaker)
+    def get_root(request):
+        return finder(request.environ)
     return make_app(get_root, tutorial, options=kw)