summaryrefslogtreecommitdiff
path: root/docs/tutorials/bfgwiki2/basiclayout.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-06-18 22:33:34 +0000
committerChris McDonough <chrism@agendaless.com>2009-06-18 22:33:34 +0000
commitfba349892ccdf2b2e82f51fc42b4e556fa3db726 (patch)
tree928f5bd3eee8cbbb336d809fc802408bc7031773 /docs/tutorials/bfgwiki2/basiclayout.rst
parent70d0a179ce80c8ce0992157d3e7e5afa99fddcb1 (diff)
downloadpyramid-fba349892ccdf2b2e82f51fc42b4e556fa3db726.tar.gz
pyramid-fba349892ccdf2b2e82f51fc42b4e556fa3db726.tar.bz2
pyramid-fba349892ccdf2b2e82f51fc42b4e556fa3db726.zip
Rejigger tutorial in the face of request-only default views.
Diffstat (limited to 'docs/tutorials/bfgwiki2/basiclayout.rst')
-rw-r--r--docs/tutorials/bfgwiki2/basiclayout.rst14
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/tutorials/bfgwiki2/basiclayout.rst b/docs/tutorials/bfgwiki2/basiclayout.rst
index 303622c7e..8809bc503 100644
--- a/docs/tutorials/bfgwiki2/basiclayout.rst
+++ b/docs/tutorials/bfgwiki2/basiclayout.rst
@@ -36,8 +36,8 @@ XML namespace. Our sample ZCML file looks like the following:
attribute, it is the "default" route. The attribute named ``view``
with the value ``.views.my_view`` is the dotted name to a
*function* we write (generated by the ``bfg_routesalchemy``
- template) that is given a ``context`` and a ``request`` and returns
- a response. You will use mostly ``<route>`` statements in a
+ template) that is given a ``request`` object and which returns a
+ response. You will use mostly ``<route>`` statements in a
:term:`URL dispatch` based application to map URLs to code.
#. *Lines 14-17*. Register a ``<view>`` with a path that starts with
@@ -54,11 +54,11 @@ XML namespace. Our sample ZCML file looks like the following:
Content Models with ``models.py``
---------------------------------
-In the context of a SQLAlchemy-based application, a *model* object is
-an object composed by quering the SQL database which backs an
-application. SQLAlchemy is an "object relational mapper" (an ORM).
-The ``models.py`` file is where the ``bfg_zodb`` Paster template put
-the classes that implement our models.
+In a SQLAlchemy-based application, a *model* object is an object
+composed by quering the SQL database which backs an application.
+SQLAlchemy is an "object relational mapper" (an ORM). The
+``models.py`` file is where the ``bfg_routesalchemy`` Paster template
+put the classes that implement our models.
Here is the source for ``models.py``: