Adjust for 7.5x9.25in output.

8 files changed, 156 insertions, 150 deletions

diff --git a/docs/tutorials/bfgwiki2/authorization.rst b/docs/tutorials/bfgwiki2/authorization.rst
index df93cb454..3f0aed342 100644
--- a/docs/tutorials/bfgwiki2/authorization.rst
+++ b/docs/tutorials/bfgwiki2/authorization.rst
@@ -182,7 +182,9 @@ class="main_content">`` div:
 .. code-block:: xml
    :linenos:
 
-   <span tal:condition="logged_in"><a href="${request.application_url}/logout">Logout</a></span>
+   <span tal:condition="logged_in">
+      <a href="${request.application_url}/logout">Logout</a>
+   </span>
 
 Viewing the Application in a Browser
 ------------------------------------
@@ -190,31 +192,27 @@ Viewing the Application in a Browser
 We can finally examine our application in a browser.  The views we'll
 try are as follows:
 
-- Visiting `http://localhost:6543/ <http://localhost:6543/>`_ in a
-  browser invokes the ``view_wiki`` view.  This always redirects to
-  the ``view_page`` view of the FrontPage page object.  It is
-  executable by any user.
+- Visiting ``http://localhost:6543/`` in a browser invokes the
+  ``view_wiki`` view.  This always redirects to the ``view_page`` view
+  of the FrontPage page object.  It is executable by any user.
 
-- Visiting `http://localhost:6543/FrontPage
-  <http://localhost:6543/FrontPage>`_ in a browser invokes the
-  ``view_page`` view of the FrontPage page object.
+- Visiting ``http://localhost:6543/FrontPage`` in a browser invokes
+  the ``view_page`` view of the FrontPage page object.
 
-- Visiting `http://localhost:6543/FrontPage/edit_page
-  <http://localhost:6543/FrontPage/edit_page>`_ in a browser invokes
-  the edit view for the FrontPage object.  It is executable by only
+- Visiting ``http://localhost:6543/FrontPage/edit_page`` in a browser
+  invokes the edit view for the FrontPage object.  It is executable by
+  only the ``editor`` user.  If a different user (or the anonymous
+  user) invokes it, a login form will be displayed.  Supplying the
+  credentials with the username ``editor``, password ``editor`` will
+  display the edit page form.
+
+- Visiting ``http://localhost:6543/add_page/SomePageName`` in a
+  browser invokes the add view for a page.  It is executable by only
   the ``editor`` user.  If a different user (or the anonymous user)
   invokes it, a login form will be displayed.  Supplying the
   credentials with the username ``editor``, password ``editor`` will
   display the edit page form.
 
-- Visiting `http://localhost:6543/add_page/SomePageName
-  <http://localhost:6543/add_page/SomePageName>`_ in a browser invokes
-  the add view for a page.  It is executable by only the ``editor``
-  user.  If a different user (or the anonymous user) invokes it, a
-  login form will be displayed.  Supplying the credentials with the
-  username ``editor``, password ``editor`` will display the edit page
-  form.
-
 Seeing Our Changes To ``views.py`` and our Templates
 ----------------------------------------------------
 
diff --git a/docs/tutorials/bfgwiki2/basiclayout.rst b/docs/tutorials/bfgwiki2/basiclayout.rst
index 67e488e9d..d882832d5 100644
--- a/docs/tutorials/bfgwiki2/basiclayout.rst
+++ b/docs/tutorials/bfgwiki2/basiclayout.rst
@@ -90,9 +90,9 @@ Here is the source for ``models.py``:
    class.
 
 #. *Line 33*.  We map our ``models_table`` table to our Models class
-    here.  This makes an association between the ``Model`` class and
-    the ``models`` table in the database, as far as SQLAlchemy is
-    concerned.
+   here.  This makes an association between the ``Model`` class and
+   the ``models`` table in the database, as far as SQLAlchemy is
+   concerned.
 
 #. *Lines 35-40*.  A function named ``populate`` which adds a single
    model instance into our SQL storage and commits a transaction.
diff --git a/docs/tutorials/bfgwiki2/definingviews.rst b/docs/tutorials/bfgwiki2/definingviews.rst
index 416b431be..79cc519ac 100644
--- a/docs/tutorials/bfgwiki2/definingviews.rst
+++ b/docs/tutorials/bfgwiki2/definingviews.rst
@@ -335,21 +335,18 @@ Viewing the Application in a Browser
 Once we've set up the WSGI pipeline properly, we can finally examine
 our application in a browser.  The views we'll try are as follows:
 
-- Visiting `http://localhost:6543/ <http://localhost:6543/>`_ in a
-  browser invokes the ``view_wiki`` view.  This always redirects to
-  the ``view_page`` view of the FrontPage page object.
+- Visiting ``http://localhost:6543`` in a browser invokes the
+  ``view_wiki`` view.  This always redirects to the ``view_page`` view
+  of the FrontPage page object.
 
-- Visiting `http://localhost:6543/FrontPage
-  <http://localhost:6543/FrontPage>`_ in a browser invokes the
-  ``view_page`` view of the front page page object.
+- Visiting ``http://localhost:6543/FrontPage`` in a browser invokes
+  the ``view_page`` view of the front page page object.
 
-- Visiting `http://localhost:6543/FrontPage/edit_page
-  <http://localhost:6543/FrontPage/edit_page>`_ in a browser invokes
-  the edit view for the front page object.
+- Visiting ``http://localhost:6543/FrontPage/edit_page`` in a browser
+  invokes the edit view for the front page object.
 
-- Visiting `http://localhost:6543/add_page/SomePageName
-  <http://localhost:6543/add_page/SomePageName>`_ in a browser invokes
-  the add view for a page.
+- Visiting ``http://localhost:6543/add_page/SomePageName`` in a
+  browser invokes the add view for a page.
 
 Try generating an error within the body of a view by adding code to
 the top of it that generates an exception (e.g. ``raise
@@ -370,14 +367,14 @@ module to look like this:
 
 We can then run the tests using something like:
 
-.. code-block:: bash
+.. code-block:: text
    :linenos:
 
-   $ python setup.py test -q
+    $ python setup.py test -q
 
 The expected output is something like:
 
-.. code-block:: bash
+.. code-block:: text
    :linenos:
 
    running test
diff --git a/docs/tutorials/bfgwiki2/distributing.rst b/docs/tutorials/bfgwiki2/distributing.rst
index e03060279..c21cc1417 100644
--- a/docs/tutorials/bfgwiki2/distributing.rst
+++ b/docs/tutorials/bfgwiki2/distributing.rst
@@ -10,13 +10,13 @@ package is a virtualenv representing a :mod:`repoze.bfg` environment.
 
 On UNIX:
 
-.. code-block:: bash
+.. code-block:: text
 
-  $ ../bin/python setup.py sdist
+   $ ../bin/python setup.py sdist
 
 On Windows:
 
-.. code-block:: bat
+.. code-block:: text
 
    c:\bigfntut> ..\Scripts\python setup.py sdist
 
@@ -29,61 +29,61 @@ On Windows:
 
 The output of such a command will be something like:
 
-.. code-block:: bash
+.. code-block:: text
 
-  running sdist
-  running egg_info
-  writing requirements to tutorial.egg-info/requires.txt
-  writing tutorial.egg-info/PKG-INFO
-  writing top-level names to tutorial.egg-info/top_level.txt
-  writing dependency_links to tutorial.egg-info/dependency_links.txt
-  writing entry points to tutorial.egg-info/entry_points.txt
-  writing manifest file 'tutorial.egg-info/SOURCES.txt'
-  warning: sdist: missing required meta-data: url
-  warning: sdist: missing meta-data: either (author and author_email) or (maintainer and maintainer_email) must be supplied
-  creating tutorial-0.1
-  creating tutorial-0.1/tutorial
-  creating tutorial-0.1/tutorial.egg-info
-  creating tutorial-0.1/tutorial/templates
-  creating tutorial-0.1/tutorial/templates/static
-  creating tutorial-0.1/tutorial/templates/static/images
-  making hard links in tutorial-0.1...
-  hard linking CHANGES.txt -> tutorial-0.1
-  hard linking README.txt -> tutorial-0.1
-  hard linking ez_setup.py -> tutorial-0.1
-  hard linking setup.cfg -> tutorial-0.1
-  hard linking setup.py -> tutorial-0.1
-  hard linking tutorial.ini -> tutorial-0.1
-  hard linking tutorial/__init__.py -> tutorial-0.1/tutorial
-  hard linking tutorial/configure.zcml -> tutorial-0.1/tutorial
-  hard linking tutorial/models.py -> tutorial-0.1/tutorial
-  hard linking tutorial/run.py -> tutorial-0.1/tutorial
-  hard linking tutorial/tests.py -> tutorial-0.1/tutorial
-  hard linking tutorial/views.py -> tutorial-0.1/tutorial
-  hard linking tutorial.egg-info/PKG-INFO -> tutorial-0.1/tutorial.egg-info
-  hard linking tutorial.egg-info/SOURCES.txt -> tutorial-0.1/tutorial.egg-info
-  hard linking tutorial.egg-info/dependency_links.txt -> tutorial-0.1/tutorial.egg-info
-  hard linking tutorial.egg-info/entry_points.txt -> tutorial-0.1/tutorial.egg-info
-  hard linking tutorial.egg-info/not-zip-safe -> tutorial-0.1/tutorial.egg-info
-  hard linking tutorial.egg-info/requires.txt -> tutorial-0.1/tutorial.egg-info
-  hard linking tutorial.egg-info/top_level.txt -> tutorial-0.1/tutorial.egg-info
-  hard linking tutorial/templates/edit.pt -> tutorial-0.1/tutorial/templates
-  hard linking tutorial/templates/mytemplate.pt -> tutorial-0.1/tutorial/templates
-  hard linking tutorial/templates/view.pt -> tutorial-0.1/tutorial/templates
-  hard linking tutorial/templates/static/default.css -> tutorial-0.1/tutorial/templates/static
-  hard linking tutorial/templates/static/style.css -> tutorial-0.1/tutorial/templates/static
-  hard linking tutorial/templates/static/templatelicense.txt -> tutorial-0.1/tutorial/templates/static
-  hard linking tutorial/templates/static/images/img01.gif -> tutorial-0.1/tutorial/templates/static/images
-  hard linking tutorial/templates/static/images/img02.gif -> tutorial-0.1/tutorial/templates/static/images
-  hard linking tutorial/templates/static/images/img03.gif -> tutorial-0.1/tutorial/templates/static/images
-  hard linking tutorial/templates/static/images/img04.gif -> tutorial-0.1/tutorial/templates/static/images
-  hard linking tutorial/templates/static/images/spacer.gif -> tutorial-0.1/tutorial/templates/static/images
-  copying setup.cfg -> tutorial-0.1
-  Writing tutorial-0.1/setup.cfg
-  creating dist
-  tar -cf dist/tutorial-0.1.tar tutorial-0.1
-  gzip -f9 dist/tutorial-0.1.tar
-  removing 'tutorial-0.1' (and everything under it)
+   running sdist
+   running egg_info
+   writing requirements to tutorial.egg-info/requires.txt
+   writing tutorial.egg-info/PKG-INFO
+   writing top-level names to tutorial.egg-info/top_level.txt
+   writing dependency_links to tutorial.egg-info/dependency_links.txt
+   writing entry points to tutorial.egg-info/entry_points.txt
+   writing manifest file 'tutorial.egg-info/SOURCES.txt'
+   warning: sdist: missing required meta-data: url
+   warning: sdist: missing meta-data: either (author and author_email) or (maintainer and maintainer_email) must be supplied
+   creating tutorial-0.1
+   creating tutorial-0.1/tutorial
+   creating tutorial-0.1/tutorial.egg-info
+   creating tutorial-0.1/tutorial/templates
+   creating tutorial-0.1/tutorial/templates/static
+   creating tutorial-0.1/tutorial/templates/static/images
+   making hard links in tutorial-0.1...
+   hard linking CHANGES.txt -> tutorial-0.1
+   hard linking README.txt -> tutorial-0.1
+   hard linking ez_setup.py -> tutorial-0.1
+   hard linking setup.cfg -> tutorial-0.1
+   hard linking setup.py -> tutorial-0.1
+   hard linking tutorial.ini -> tutorial-0.1
+   hard linking tutorial/__init__.py -> tutorial-0.1/tutorial
+   hard linking tutorial/configure.zcml -> tutorial-0.1/tutorial
+   hard linking tutorial/models.py -> tutorial-0.1/tutorial
+   hard linking tutorial/run.py -> tutorial-0.1/tutorial
+   hard linking tutorial/tests.py -> tutorial-0.1/tutorial
+   hard linking tutorial/views.py -> tutorial-0.1/tutorial
+   hard linking tutorial.egg-info/PKG-INFO -> tutorial-0.1/tutorial.egg-info
+   hard linking tutorial.egg-info/SOURCES.txt -> tutorial-0.1/tutorial.egg-info
+   hard linking tutorial.egg-info/dependency_links.txt -> tutorial-0.1/tutorial.egg-info
+   hard linking tutorial.egg-info/entry_points.txt -> tutorial-0.1/tutorial.egg-info
+   hard linking tutorial.egg-info/not-zip-safe -> tutorial-0.1/tutorial.egg-info
+   hard linking tutorial.egg-info/requires.txt -> tutorial-0.1/tutorial.egg-info
+   hard linking tutorial.egg-info/top_level.txt -> tutorial-0.1/tutorial.egg-info
+   hard linking tutorial/templates/edit.pt -> tutorial-0.1/tutorial/templates
+   hard linking tutorial/templates/mytemplate.pt -> tutorial-0.1/tutorial/templates
+   hard linking tutorial/templates/view.pt -> tutorial-0.1/tutorial/templates
+   hard linking tutorial/templates/static/default.css -> tutorial-0.1/tutorial/templates/static
+   hard linking tutorial/templates/static/style.css -> tutorial-0.1/tutorial/templates/static
+   hard linking tutorial/templates/static/templatelicense.txt -> tutorial-0.1/tutorial/templates/static
+   hard linking tutorial/templates/static/images/img01.gif -> tutorial-0.1/tutorial/templates/static/images
+   hard linking tutorial/templates/static/images/img02.gif -> tutorial-0.1/tutorial/templates/static/images
+   hard linking tutorial/templates/static/images/img03.gif -> tutorial-0.1/tutorial/templates/static/images
+   hard linking tutorial/templates/static/images/img04.gif -> tutorial-0.1/tutorial/templates/static/images
+   hard linking tutorial/templates/static/images/spacer.gif -> tutorial-0.1/tutorial/templates/static/images
+   copying setup.cfg -> tutorial-0.1
+   Writing tutorial-0.1/setup.cfg
+   creating dist
+   tar -cf dist/tutorial-0.1.tar tutorial-0.1
+   gzip -f9 dist/tutorial-0.1.tar
+   removing 'tutorial-0.1' (and everything under it)
 
 Note that this command creates a tarball in the "dist" subdirectory
 named ``tutorial-0.1.tar.gz``.  You can send this file to your friends
diff --git a/docs/tutorials/bfgwiki2/installation.rst b/docs/tutorials/bfgwiki2/installation.rst
index 22fc6b563..ad5443288 100644
--- a/docs/tutorials/bfgwiki2/installation.rst
+++ b/docs/tutorials/bfgwiki2/installation.rst
@@ -31,27 +31,27 @@ Preparation, UNIX
    <http://peak.telecommunity.com/dist/ez_setup.py>`_ and run it using
    the ``python`` interpreter of your Python 2.5 installation:
 
-   .. code-block:: bash
+   .. code-block:: text
 
-    $ /path/to/my/Python-2.5/bin/python ez_setup.py
+      $ /path/to/my/Python-2.5/bin/python ez_setup.py
 
 #. Use that Python's `bin/easy_install` to install `virtualenv`:
 
-   .. code-block:: bash
+   .. code-block:: text
 
-    $ /path/to/my/Python-2.5/bin/easy_install virtualenv
+      $ /path/to/my/Python-2.5/bin/easy_install virtualenv
 
 #. Use that Python's virtualenv to make a workspace:
 
-   .. code-block:: bash
+   .. code-block:: text
 
-     $ path/to/my/Python-25/bin/virtualenv --no-site-packages bigfntut
+      $ path/to/my/Python-25/bin/virtualenv --no-site-packages bigfntut
 
 #. Switch to the ``bigfntut`` directory:
 
-   .. code-block:: bash
+   .. code-block:: text
 
-     $ cd bigfntut
+      $ cd bigfntut
 
 #. (Optional) Consider using ``source bin/activate`` to make your
    shell environment wired to use the virtualenv.
@@ -59,15 +59,16 @@ Preparation, UNIX
 #. Use ``easy_install`` and point to the BFG "1.1" index to get
    :mod:`repoze.bfg` and its direct dependencies installed:
 
-   .. code-block:: bash
+   .. code-block:: text
 
-     $ bin/easy_install -i http://dist.repoze.org/bfg/1.1/simple repoze.bfg
+      $ bin/easy_install -i http://dist.repoze.org/bfg/1.1/simple repoze.bfg
 
 #. Use ``easy_install`` to install various packages from PyPI.
 
-   .. code-block:: bash
+   .. code-block:: text
 
-     $ bin/easy_install docutils nose coverage zope.sqlalchemy SQLAlchemy repoze.tm2
+      $ bin/easy_install docutils nose coverage zope.sqlalchemy SQLAlchemy \
+                repoze.tm2
 
 Preparation, Windows
 --------------------
@@ -81,27 +82,27 @@ Preparation, Windows
    the ``python`` interpreter of your Python 2.5 installation using a
    command prompt:
 
-   .. code-block:: bat
+   .. code-block:: text
 
-    c:\> c:\Python25\python ez_setup.py
+      c:\> c:\Python25\python ez_setup.py
 
 #. Use that Python's `bin/easy_install` to install `virtualenv`:
 
-   .. code-block:: bat
+   .. code-block:: text
 
-    c:\> c:\Python25\Scripts\easy_install virtualenv
+      c:\> c:\Python25\Scripts\easy_install virtualenv
 
 #. Use that Python's virtualenv to make a workspace:
 
-   .. code-block:: bat
+   .. code-block:: text
 
-     c:\> c:\Python25\Scripts\virtualenv --no-site-packages bigfntut
+      c:\> c:\Python25\Scripts\virtualenv --no-site-packages bigfntut
 
 #. Switch to the ``bigfntut`` directory:
 
-   .. code-block:: bat
+   .. code-block:: text
 
-     c:\> cd bigfntut
+      c:\> cd bigfntut
 
 #. (Optional) Consider using ``bin\activate.bat`` to make your shell
    environment wired to use the virtualenv.
@@ -109,15 +110,17 @@ Preparation, Windows
 #. Use ``easy_install`` and point to the BFG "1.1" index to get
    :mod:`repoze.bfg` and its direct dependencies installed:
 
-   .. code-block:: bat
+   .. code-block:: text
 
-     c:\bigfntut> Scripts/easy_install -i http://dist.repoze.org/bfg/1.1/simple repoze.bfg
+      c:\bigfntut> Scripts/easy_install -i http://dist.repoze.org/bfg/1.1/simple \
+                repoze.bfg
 
 #. Use ``easy_install`` to install various packages from PyPI.
 
-   .. code-block:: bat
+   .. code-block:: text
 
-     c:\bigfntut> Scripts\easy_install -i docutils nose coverage zope.sqlalchemy SQLAlchemy repoze.tm2
+      c:\bigfntut> Scripts\easy_install -i docutils nose coverage zope.sqlalchemy \
+                SQLAlchemy repoze.tm2
 
 
 .. _sql_making_a_project:
@@ -135,13 +138,13 @@ The below instructions assume your current working directory is the
 
 On UNIX:
 
-.. code-block:: bash
+.. code-block:: text
 
-  $ bin/paster create -t bfg_routesalchemy tutorial
+   $ bin/paster create -t bfg_routesalchemy tutorial
 
 On Windows:
 
-.. code-block:: bat
+.. code-block:: text
 
    c:\bigfntut> Scripts\paster create -t bfg_routesalchemy tutorial
 
@@ -162,17 +165,17 @@ directory you created in :ref:`sql_making_a_project`, and run the
 
 On UNIX:
 
-.. code-block:: bash
+.. code-block:: text
 
-  $ cd tutorial
-  $ ../bin/python setup.py develop
+   $ cd tutorial
+   $ ../bin/python setup.py develop
 
 On Windows:
 
-.. code-block:: bat
+.. code-block:: text
 
-  C:\bigfntut> cd tutorial
-  C:\bigfntut\tutorial> ..\Scripts\python setup.py develop
+   c:\bigfntut> cd tutorial
+   c:\bigfntut\tutorial> ..\Scripts\python setup.py develop
 
 .. _sql_running_tests:
 
@@ -184,15 +187,15 @@ the tests for the project.
 
 On UNIX:
 
-.. code-block:: bash
+.. code-block:: text
 
-  $ ../bin/python setup.py test -q
+   $ ../bin/python setup.py test -q
 
 On Windows:
 
-.. code-block:: bat
+.. code-block:: text
 
-  c:\bigfntut\tutorial> ..\Scripts\python setup.py test -q
+   c:\bigfntut\tutorial> ..\Scripts\python setup.py test -q
 
 Starting the Application
 ========================
@@ -201,15 +204,15 @@ Start the application.
 
 On UNIX:
 
-.. code-block:: bash
+.. code-block:: text
 
-  $ ../bin/paster serve tutorial.ini --reload
+   $ ../bin/paster serve tutorial.ini --reload
 
 On Windows:
 
-.. code-block:: bat
+.. code-block:: text
 
-  c:\bifgfntut\tutorial> ..\Scripts\paster serve tutorial.ini --reload
+   c:\bifgfntut\tutorial> ..\Scripts\paster serve tutorial.ini --reload
 
 Exposing Test Coverage Information
 ==================================
@@ -225,30 +228,31 @@ other packages into our ``virtualenv``: ``nose`` and ``coverage``:
 
 On UNIX:
 
-.. code-block:: bash
+.. code-block:: text
 
-  $ ../bin/easy_install nose coverage
+   $ ../bin/easy_install nose coverage
 
 On Windows:
 
-.. code-block:: bat
+.. code-block:: text
 
-  c:\bfgfntut\tutorial> ..\Scripts\easy_install nose coverage
+   c:\bfgfntut\tutorial> ..\Scripts\easy_install nose coverage
 
 Once ``nose`` and ``coverage`` are installed, we can actually run the
 coverage tests.
 
 On UNIX:
 
-.. code-block:: bash
+.. code-block:: text
 
-  $ ../bin/nosetests --cover-package=tutorial --cover-erase --with-coverage
+   $ ../bin/nosetests --cover-package=tutorial --cover-erase --with-coverage
 
 On Windows:
 
-.. code-block:: bat
+.. code-block:: text
 
-  c:\bigfntut\tutorial> ..\Scripts\nosetests --cover-package=tutorial --cover-erase --with-coverage
+   c:\bigfntut\tutorial> ..\Scripts\nosetests --cover-package=tutorial --cover-erase \
+         --with-coverage
 
 Looks like our package's ``models`` module doesn't quite have 100%
 test coverage.
@@ -256,8 +260,8 @@ test coverage.
 Visit the Application in a Browser
 ==================================
 
-In a browser, visit `http://localhost:6543/ <http://localhost:6543>`_.
-You will see the generated application's default page.
+In a browser, visit ``http://localhost:6543/``.  You will see the
+generated application's default page.
 
 Decisions the ``bfg_routesalchemy`` Template Has Made For You
 =============================================================
diff --git a/docs/tutorials/bfgwiki2/src/authorization/tutorial/templates/edit.pt b/docs/tutorials/bfgwiki2/src/authorization/tutorial/templates/edit.pt
index 5e56f1fd6..2482d8ca5 100644
--- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/templates/edit.pt
+++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/templates/edit.pt
@@ -6,7 +6,8 @@
 
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <title>bfg tutorial wiki (based on TurboGears 20-Minute Wiki) Editing: ${page.name}</title>
+    <title>bfg tutorial wiki (based on TurboGears 20-Minute Wiki) 
+           Editing: ${page.name}</title>
         <link rel="stylesheet" type="text/css"
           href="${request.application_url}/static/style.css" />
 </head>
@@ -17,7 +18,9 @@
   <div style="float:right; width: 10em;"> Viewing
     <span tal:replace="page.name">Page Name Goes Here</span> <br/>
     You can return to the <a href="${request.application_url}">FrontPage</a>.
-   <span tal:condition="logged_in"><a href="${request.application_url}/logout">Logout</a></span>
+   <span tal:condition="logged_in">
+      <a href="${request.application_url}/logout">Logout</a>
+   </span>
   </div>  
 
   <div>
diff --git a/docs/tutorials/bfgwiki2/src/authorization/tutorial/templates/view.pt b/docs/tutorials/bfgwiki2/src/authorization/tutorial/templates/view.pt
index 59c21d4eb..6c066f557 100644
--- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/templates/view.pt
+++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/templates/view.pt
@@ -6,7 +6,8 @@
 
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <title>${page.name} - bfg tutorial wiki (based on TurboGears 20-Minute Wiki)</title>
+    <title>${page.name} - bfg tutorial wiki 
+           (based on TurboGears 20-Minute Wiki)</title>
         <link rel="stylesheet" type="text/css"
           href="${request.application_url}/static/style.css" />
 </head>
@@ -17,7 +18,9 @@
 <div style="float:right; width: 10em;"> Viewing
 <span tal:replace="page.name">Page Name Goes Here</span> <br/>
 You can return to the <a href="${request.application_url}">FrontPage</a>.
-<span tal:condition="logged_in"><a href="${request.application_url}/logout">Logout</a></span>
+<span tal:condition="logged_in">
+  <a href="${request.application_url}/logout">Logout</a>
+</span>
 </div>
 
 <div tal:replace="structure content">Page text goes here.</div>
diff --git a/docs/tutorials/bfgwiki2/src/views/tutorial/templates/edit.pt b/docs/tutorials/bfgwiki2/src/views/tutorial/templates/edit.pt
index 3d9e960c2..6a98e3cfb 100644
--- a/docs/tutorials/bfgwiki2/src/views/tutorial/templates/edit.pt
+++ b/docs/tutorials/bfgwiki2/src/views/tutorial/templates/edit.pt
@@ -6,7 +6,8 @@
 
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <title>bfg tutorial wiki (based on TurboGears 20-Minute Wiki) Editing: ${page.name}</title>
+    <title>bfg tutorial wiki (based on TurboGears 20-Minute Wiki) 
+           Editing: ${page.name}</title>
         <link rel="stylesheet" type="text/css"
           href="${request.application_url}/static/style.css" />
 </head>