From b06175f5e7656f3e61750efee94930e79a9b1499 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 1 Nov 2009 19:45:22 +0000 Subject: - Fix various tutorials broken by 1.1a9 ```` directive changes. --- docs/tutorials/bfgwiki2/authorization.rst | 11 ++++++----- docs/tutorials/bfgwiki2/basiclayout.rst | 6 +++--- .../bfgwiki2/src/authorization/tutorial/configure.zcml | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'docs/tutorials') diff --git a/docs/tutorials/bfgwiki2/authorization.rst b/docs/tutorials/bfgwiki2/authorization.rst index d2a181281..ac5f98c8d 100644 --- a/docs/tutorials/bfgwiki2/authorization.rst +++ b/docs/tutorials/bfgwiki2/authorization.rst @@ -85,11 +85,12 @@ authorized. We'll also change ``configure.zcml`` to add a ``forbidden`` stanza which points at our login view. This configures our newly created login view to show up when :mod:`repoze.bfg` detects that a view invocation can not be authorized. Also, we'll add -``permission`` attributes with the value ``edit`` to the ``edit_page`` -and ``add_page`` routes. This indicates that the views which these -routes reference cannot be invoked without the authenticated user -possessing the ``edit`` permission with respect to the current -context. When you're done, your ``configure.zcml`` will look like so +``view_permission`` attributes with the value ``edit`` to the +``edit_page`` and ``add_page`` routes. This indicates that the views +which these routes reference cannot be invoked without the +authenticated user possessing the ``edit`` permission with respect to +the current context. When you're done, your ``configure.zcml`` will +look like so .. literalinclude:: src/authorization/tutorial/configure.zcml :linenos: diff --git a/docs/tutorials/bfgwiki2/basiclayout.rst b/docs/tutorials/bfgwiki2/basiclayout.rst index 1cdcd425e..8f28cce37 100644 --- a/docs/tutorials/bfgwiki2/basiclayout.rst +++ b/docs/tutorials/bfgwiki2/basiclayout.rst @@ -41,10 +41,10 @@ following: template) that is given a ``request`` object and which returns a response or a dictionary. You will use mostly ```` statements in a :term:`URL dispatch` based application to map URLs - to code. This ``route`` also names a ``renderer``, which is a + to code. This ``route`` also names a ``view_renderer``, which is a template which lives in the ``templates`` subdirectory of the - package. When the ``.views.my_view`` view returns a dictionary, - a "renderer" will use this template to create a response. + package. When the ``.views.my_view`` view returns a dictionary, a + "renderer" will use this template to create a response. #. *Lines 15-18*. Register a ```` directive that will match any URL hat starts with ``/static/``. This will serve up static diff --git a/docs/tutorials/bfgwiki2/src/authorization/tutorial/configure.zcml b/docs/tutorials/bfgwiki2/src/authorization/tutorial/configure.zcml index 12dbd7ae1..564cb7443 100644 --- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/configure.zcml +++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/configure.zcml @@ -55,7 +55,7 @@ + renderer="templates/login.pt"/>