summaryrefslogtreecommitdiff
path: root/docs/tutorials/bfgwiki
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-12-28 04:12:10 +0000
committerChris McDonough <chrism@agendaless.com>2009-12-28 04:12:10 +0000
commit125e9746a5da925243dabf67b2609b556bb9215a (patch)
tree2ef52dadcf40f840586293f8cf66e9a11d0f04b0 /docs/tutorials/bfgwiki
parent48ed96bf621128adf59b225f1c8e33af44bc0594 (diff)
downloadpyramid-125e9746a5da925243dabf67b2609b556bb9215a.tar.gz
pyramid-125e9746a5da925243dabf67b2609b556bb9215a.tar.bz2
pyramid-125e9746a5da925243dabf67b2609b556bb9215a.zip
Adjust for 7.5x9.25in output.
Diffstat (limited to 'docs/tutorials/bfgwiki')
-rw-r--r--docs/tutorials/bfgwiki/authorization.rst17
-rw-r--r--docs/tutorials/bfgwiki/basiclayout.rst8
-rw-r--r--docs/tutorials/bfgwiki/definingmodels.rst17
-rw-r--r--docs/tutorials/bfgwiki/definingviews.rst53
-rw-r--r--docs/tutorials/bfgwiki/distributing.rst112
-rw-r--r--docs/tutorials/bfgwiki/installation.rst11
-rw-r--r--docs/tutorials/bfgwiki/src/authorization/tutorial/templates/edit.pt6
-rw-r--r--docs/tutorials/bfgwiki/src/authorization/tutorial/templates/view.pt7
-rw-r--r--docs/tutorials/bfgwiki/src/views/tutorial/templates/edit.pt3
-rw-r--r--docs/tutorials/bfgwiki/src/views/tutorial/templates/view.pt3
-rw-r--r--docs/tutorials/bfgwiki/viewdecorators.rst40
11 files changed, 140 insertions, 137 deletions
diff --git a/docs/tutorials/bfgwiki/authorization.rst b/docs/tutorials/bfgwiki/authorization.rst
index cb0f8439e..52e7cc528 100644
--- a/docs/tutorials/bfgwiki/authorization.rst
+++ b/docs/tutorials/bfgwiki/authorization.rst
@@ -23,13 +23,12 @@ Changing ``configure.zcml``
~~~~~~~~~~~~~~~~~~~~~~~~~~~
We'll change our ``configure.zcml`` file to enable an
-:class:`repoze.bfg.authentication.AuthTktAuthenticationPolicy` and an
-:class:`repoze.bfg.authorization.ACLAuthorizationPolicy` to enable
-declarative security checking. We'll also add a ``forbidden`` stanza,
-which species a :term:`forbidden view`. This configures our login
-view to show up when :mod:`repoze.bfg` detects that a view invocation
-can not be authorized. When you're done, your ``configure.zcml`` will
-look like so:
+``AuthTktAuthenticationPolicy`` and an ``ACLAuthorizationPolicy`` to
+enable declarative security checking. We'll also add a ``forbidden``
+stanza, which species a :term:`forbidden view`. This configures our
+login view to show up when :mod:`repoze.bfg` detects that a view
+invocation can not be authorized. When you're done, your
+``configure.zcml`` will look like so:
.. literalinclude:: src/authorization/tutorial/configure.zcml
:linenos:
@@ -123,7 +122,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>
Giving Our Root Model Object an ACL
-----------------------------------
diff --git a/docs/tutorials/bfgwiki/basiclayout.rst b/docs/tutorials/bfgwiki/basiclayout.rst
index a0fa2b924..f0b7d963c 100644
--- a/docs/tutorials/bfgwiki/basiclayout.rst
+++ b/docs/tutorials/bfgwiki/basiclayout.rst
@@ -110,7 +110,7 @@ function within the file named ``run.py``:
(something like ``file:///path/to/Data.fs``).
#. *Line 14*. We create a "finder" object using the
- :class:`repoze.zodbconn.finder.PersistentApplicationFinder` helper
+ ``repoze.zodbconn.finder.PersistentApplicationFinder`` helper
class, passing it the ZODB URI and the "appmaker" we've imported
from ``models.py``.
@@ -121,9 +121,9 @@ function within the file named ``run.py``:
factory` and the settings keywords parsed by PasteDeploy. The root
factory is named ``get_root``.
-#. *Lines 18-20*. Begin configuration using the
- :meth:`repoze.bfg.configuration.Configurator.begin` method, load
- the ``configure.zcml`` file from our package using the
+#. *Lines 18-20*. Begin configuration using the ``begin`` method of
+ the :meth:`repoze.bfg.configuration.Configurator` class, load the
+ ``configure.zcml`` file from our package using the
:meth:`repoze.bfg.configuration.Configurator.load_zcml` method, and
end configuration using the
:meth:`repoze.bfg.configuration.Configurator.end` method.
diff --git a/docs/tutorials/bfgwiki/definingmodels.rst b/docs/tutorials/bfgwiki/definingmodels.rst
index 3c41e9dbe..ef5798362 100644
--- a/docs/tutorials/bfgwiki/definingmodels.rst
+++ b/docs/tutorials/bfgwiki/definingmodels.rst
@@ -71,11 +71,10 @@ Add an Appmaker
---------------
We're using a mini-framework callable named
-:class:`repoze.zodbconn.finder.PersistentApplicationFinder` in our
-application (see ``run.py``). A
-:class:`repoze.zodbconn.finder.PersistentApplicationFinder` accepts a
-ZODB URL as well as an "appmaker" callback. This callback typically
-lives in the ``models.py`` file.
+``repoze.zodbconn.finder.PersistentApplicationFinder`` in our
+application (see ``run.py``). A ``PersistentApplicationFinder``
+accepts a ZODB URL as well as an "appmaker" callback. This callback
+typically lives in the ``models.py`` file.
We want to change the appmaker function in our ``models.py`` file so
that our application root is a Wiki instance, and we'll also slot a
@@ -120,19 +119,19 @@ directory is the "tutorial" distribution directory:
On UNIX:
-.. code-block:: bash
+.. code-block:: text
$ ../bin/python setup.py test -q
On Windows:
-.. code-block:: bash
+.. code-block:: text
- c:\bigfntut\tutorial> ..\Scripts\python setup.py test -q
+ c:\bigfntut\tutorial> ..\Scripts\python setup.py test -q
The expected output is something like this:
-.. code-block:: bash
+.. code-block:: text
.....
----------------------------------------------------------------------
diff --git a/docs/tutorials/bfgwiki/definingviews.rst b/docs/tutorials/bfgwiki/definingviews.rst
index bd9c9928c..b8c1ef37b 100644
--- a/docs/tutorials/bfgwiki/definingviews.rst
+++ b/docs/tutorials/bfgwiki/definingviews.rst
@@ -271,26 +271,25 @@ directory is the "tutorial" distribution directory:
On UNIX:
-.. code-block:: bash
+.. code-block:: text
- $ ../bin/python setup.py test -q
+ $ ../bin/python setup.py test -q
On Windows:
-.. code-block:: bash
+.. code-block:: text
-
- c:\bigfntut\tutorial> ..\Scripts\python setup.py test -q
+ c:\bigfntut\tutorial> ..\Scripts\python setup.py test -q
The expected result looks something like:
-.. code-block:: bash
-
- .........
- ----------------------------------------------------------------------
- Ran 9 tests in 0.203s
+.. code-block:: text
- OK
+ .........
+ ----------------------------------------------------------------------
+ Ran 9 tests in 0.203s
+
+ OK
Mapping Views to URLs in ``configure.zcml``
===========================================
@@ -388,27 +387,25 @@ 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. This is because
- it's the *default view* (a view without a ``name``) for Page objects.
+- Visiting ``http://localhost:6543/FrontPage/`` in a browser invokes
+ the ``view_page`` view of the front page page object. This is
+ because it's the *default view* (a view without a ``name``) for Page
+ objects.
-- 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.
-- To generate an error, visit `http://localhost:6543/add_page
- <http://localhost:6543/add_page>`_ which will generate an
- ``IndexError`` for the expression ``request.subpath[0]``. You'll
- see an interactive traceback facility provided by evalerror.
+- To generate an error, visit ``http://localhost:6543/add_page`` which
+ will generate an ``IndexError`` for the expression
+ ``request.subpath[0]``. You'll see an interactive traceback
+ facility provided by evalerror.
diff --git a/docs/tutorials/bfgwiki/distributing.rst b/docs/tutorials/bfgwiki/distributing.rst
index eed08a286..06d126a64 100644
--- a/docs/tutorials/bfgwiki/distributing.rst
+++ b/docs/tutorials/bfgwiki/distributing.rst
@@ -10,13 +10,13 @@ package is a virtualenv representing a 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,60 +29,60 @@ 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 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 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/bfgwiki/installation.rst b/docs/tutorials/bfgwiki/installation.rst
index 90bd57e31..7955e7c9c 100644
--- a/docs/tutorials/bfgwiki/installation.rst
+++ b/docs/tutorials/bfgwiki/installation.rst
@@ -51,12 +51,12 @@ Preparation, UNIX
#. (Optional) Consider using ``source bin/activate`` to make your
shell environment wired to use the virtualenv.
-#. Use ``easy_install`` and point to the BFG "1.1" index to get
+#. Use ``easy_install`` and point to the BFG "1.2" index to get
:mod:`repoze.bfg` and its direct dependencies installed:
.. code-block:: bash
- $ bin/easy_install -i http://dist.repoze.org/bfg/1.1/simple repoze.bfg
+ $ bin/easy_install -i http://dist.repoze.org/bfg/1.2/simple repoze.bfg
#. Use ``easy_install`` to install ``docutils``, ``repoze.tm``,
``repoze.zodbconn``, ``repoze.who``, ``nose`` and ``coverage`` from
@@ -104,12 +104,13 @@ Preparation, Windows
#. (Optional) Consider using ``bin\activate.bat`` to make your shell
environment wired to use the virtualenv.
-#. Use ``easy_install`` and point to the BFG "1,1" index to get
+#. Use ``easy_install`` and point to the BFG "1.2" index to get
:mod:`repoze.bfg` and its direct dependencies installed:
.. code-block:: bat
- 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.2/simple \
+ repoze.bfg
#. Use ``easy_install`` to install ``docutils``, ``repoze.tm``,
``repoze.zodbconn``, ``repoze.who``, ``nose`` and ``coverage`` from
@@ -118,7 +119,7 @@ Preparation, Windows
.. code-block:: bat
c:\bigfntut> Scripts\easy_install -i http://dist.repoze.org/bfgsite/simple \
- docutils repoze.tm repoze.zodbconn repoze.who nose coverage
+ docutils repoze.tm repoze.zodbconn repoze.who nose coverage
.. _making_a_project:
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/edit.pt b/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/edit.pt
index d6b3ad466..abe068352 100644
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/edit.pt
+++ b/docs/tutorials/bfgwiki/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,8 @@
<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/bfgwiki/src/authorization/tutorial/templates/view.pt b/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/view.pt
index 3c5cc2a33..b6105b96f 100644
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/view.pt
+++ b/docs/tutorials/bfgwiki/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/bfgwiki/src/views/tutorial/templates/edit.pt b/docs/tutorials/bfgwiki/src/views/tutorial/templates/edit.pt
index 883ac8b52..fb4511624 100644
--- a/docs/tutorials/bfgwiki/src/views/tutorial/templates/edit.pt
+++ b/docs/tutorials/bfgwiki/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>
diff --git a/docs/tutorials/bfgwiki/src/views/tutorial/templates/view.pt b/docs/tutorials/bfgwiki/src/views/tutorial/templates/view.pt
index 5326e6454..34d097b28 100644
--- a/docs/tutorials/bfgwiki/src/views/tutorial/templates/view.pt
+++ b/docs/tutorials/bfgwiki/src/views/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>
diff --git a/docs/tutorials/bfgwiki/viewdecorators.rst b/docs/tutorials/bfgwiki/viewdecorators.rst
index 265adac4f..8cc220097 100644
--- a/docs/tutorials/bfgwiki/viewdecorators.rst
+++ b/docs/tutorials/bfgwiki/viewdecorators.rst
@@ -191,26 +191,26 @@ directory is the "tutorial" distribution directory:
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
Hopefully nothing will have changed. The expected result looks
something like:
-.. code-block:: bash
+.. code-block:: text
- .........
- ----------------------------------------------------------------------
- Ran 9 tests in 0.203s
-
- OK
+ .........
+ ----------------------------------------------------------------------
+ Ran 9 tests in 0.203s
+
+ OK
Viewing the Application in a Browser
====================================
@@ -219,22 +219,20 @@ Once we've set up the WSGI pipeline properly, we can finally examine
our application in a browser. We'll make sure that we didn't break
any views by trying each of them.
-- Visiting `http://localhost:6543/ <http://localhost:6543/>`_ in a
+- 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. This is because
- it's the *default view* (a view without a ``name``) for Page objects.
+- Visiting ``http://localhost:6543/FrontPage/`` in a browser invokes
+ the ``view_page`` view of the front page page object. This is
+ because it's the *default view* (a view without a ``name``) for Page
+ objects.
-- 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.