diff options
| author | Chris McDonough <chrism@plope.com> | 2012-08-07 00:33:53 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-08-07 00:33:53 -0400 |
| commit | c3a9a10324b991a42040760a04c5fb3fc5c9c864 (patch) | |
| tree | 11787501669cee587f8b0a7c33024fb62d397e81 /docs/tutorials/wiki2/basiclayout.rst | |
| parent | 92b64cca2994774987cbce88cef89e9f71366185 (diff) | |
| parent | 735abf49f936cedc845907516a3922cdffa83665 (diff) | |
| download | pyramid-c3a9a10324b991a42040760a04c5fb3fc5c9c864.tar.gz pyramid-c3a9a10324b991a42040760a04c5fb3fc5c9c864.tar.bz2 pyramid-c3a9a10324b991a42040760a04c5fb3fc5c9c864.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/tutorials/wiki2/basiclayout.rst')
| -rw-r--r-- | docs/tutorials/wiki2/basiclayout.rst | 4 |
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. |