diff options
| author | Tres Seaver <tseaver@palladion.com> | 2012-08-06 12:41:12 -0400 |
|---|---|---|
| committer | Tres Seaver <tseaver@palladion.com> | 2012-08-06 12:41:12 -0400 |
| commit | 871449e94c37b0e7bf2310bb21f2743954f52d91 (patch) | |
| tree | 4ba44340c3ff20d2e76171e3917122a2549121fe /docs/tutorials/wiki2/basiclayout.rst | |
| parent | 02ce7d6425bcd81590ae50fa298f50ea47422a47 (diff) | |
| parent | ae2fd21399de2eed6ff60f32c34e304ec017b4f4 (diff) | |
| download | pyramid-871449e94c37b0e7bf2310bb21f2743954f52d91.tar.gz pyramid-871449e94c37b0e7bf2310bb21f2743954f52d91.tar.bz2 pyramid-871449e94c37b0e7bf2310bb21f2743954f52d91.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. |