summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDaniel Haaker <d.haaker@gmail.com>2012-08-04 21:54:22 +0200
committerDaniel Haaker <d.haaker@gmail.com>2012-08-04 21:54:22 +0200
commit0f372cd870caf36dfea59319df2ca26a92a74dc9 (patch)
treeecf053148fc766629d4161da6b56bfed6860abad /docs
parent92b64cca2994774987cbce88cef89e9f71366185 (diff)
downloadpyramid-0f372cd870caf36dfea59319df2ca26a92a74dc9.tar.gz
pyramid-0f372cd870caf36dfea59319df2ca26a92a74dc9.tar.bz2
pyramid-0f372cd870caf36dfea59319df2ca26a92a74dc9.zip
fix two minor typos in docs
Diffstat (limited to 'docs')
-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.