diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2015-10-20 23:19:18 -0600 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2015-10-20 23:19:18 -0600 |
| commit | 18e54fe9619fd8b2aa6006126fc1c2840e32f2c1 (patch) | |
| tree | ea26bbfd681ae5d821f2cde9ac5cbe2e80f5c714 /docs/tutorials/wiki2/index.rst | |
| parent | bf40a3920278b3e7a01ef5403196b35f45cfcb3c (diff) | |
| parent | d4221720b8409eafb65b301562be327af0196c7e (diff) | |
| download | pyramid-18e54fe9619fd8b2aa6006126fc1c2840e32f2c1.tar.gz pyramid-18e54fe9619fd8b2aa6006126fc1c2840e32f2c1.tar.bz2 pyramid-18e54fe9619fd8b2aa6006126fc1c2840e32f2c1.zip | |
Merge branch 'master' of github.com:Pylons/pyramid into feature/configurable-view-deriver
Diffstat (limited to 'docs/tutorials/wiki2/index.rst')
| -rw-r--r-- | docs/tutorials/wiki2/index.rst | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docs/tutorials/wiki2/index.rst b/docs/tutorials/wiki2/index.rst index 0a614cb23..0a3873dcd 100644 --- a/docs/tutorials/wiki2/index.rst +++ b/docs/tutorials/wiki2/index.rst @@ -3,7 +3,7 @@ SQLAlchemy + URL Dispatch Wiki Tutorial ======================================= -This tutorial introduces a :term:`SQLAlchemy` and :term:`url dispatch` -based +This tutorial introduces a :term:`SQLAlchemy` and :term:`url dispatch`-based :app:`Pyramid` application to a developer familiar with Python. When the tutorial is finished, the developer will have created a basic Wiki application with authentication. @@ -26,4 +26,3 @@ which corresponds to the same location if you have Pyramid sources. tests distributing - |