summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/basiclayout.rst
diff options
context:
space:
mode:
authorBlaise Laflamme <blaise@laflamme.org>2012-08-04 13:39:40 -0700
committerBlaise Laflamme <blaise@laflamme.org>2012-08-04 13:39:40 -0700
commit7b854e56c637a718d3482fb05d7f1e4d8890c111 (patch)
treeefac3980f7a960d58d434637d1135a0d2a1b3e3f /docs/tutorials/wiki2/basiclayout.rst
parent92b64cca2994774987cbce88cef89e9f71366185 (diff)
parent1d627da85d8b7603b28f276be482f9cb4ec79dae (diff)
downloadpyramid-7b854e56c637a718d3482fb05d7f1e4d8890c111.tar.gz
pyramid-7b854e56c637a718d3482fb05d7f1e4d8890c111.tar.bz2
pyramid-7b854e56c637a718d3482fb05d7f1e4d8890c111.zip
Merge pull request #651 from dhaaker/docfix
Minor edits wiki tutorial, thanks dhaaker
Diffstat (limited to 'docs/tutorials/wiki2/basiclayout.rst')
-rw-r--r--docs/tutorials/wiki2/basiclayout.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index 5f4ea671c..b3184c4fc 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -100,7 +100,7 @@ used when the URL is ``/``:
:language: py
Since this route has a ``pattern`` equalling ``/`` it is the route that will
-be matched when the URL ``/`` is visted, e.g. ``http://localhost:6543/``.
+be matched when the URL ``/`` is visited, e.g. ``http://localhost:6543/``.
``main`` next calls the ``scan`` method of the configurator, which will
recursively scan our ``tutorial`` package, looking for ``@view_config`` (and
@@ -190,7 +190,7 @@ Next we set up a SQLAlchemy "DBSession" object:
``scoped_session`` allows us to access our database connection globally.
``sessionmaker`` creates a database session object. We pass to
``sessionmaker`` the ``extension=ZopeTransactionExtension()`` extension
-option in order to allow the system to automatically manage datbase
+option in order to allow the system to automatically manage database
transactions. With ``ZopeTransactionExtension`` activated, our application
will automatically issue a transaction commit after every request unless an
exception is raised, in which case the transaction will be aborted.