diff options
| author | Michael Merickel <michael@merickel.org> | 2016-03-21 23:34:26 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2016-03-21 23:34:26 -0500 |
| commit | 5238bb64abfebc085ca95df517535f61e27b7fc2 (patch) | |
| tree | c4eb14e487f561d4c12824b0b03656e24efccfd1 /docs/tutorials/wiki2/background.rst | |
| parent | 0b0f7e1a6d411bcc2af615da8e9dec7ea7519152 (diff) | |
| parent | 530bad618c33d65ad071b0280ce56eb265195805 (diff) | |
| download | pyramid-5238bb64abfebc085ca95df517535f61e27b7fc2.tar.gz pyramid-5238bb64abfebc085ca95df517535f61e27b7fc2.tar.bz2 pyramid-5238bb64abfebc085ca95df517535f61e27b7fc2.zip | |
Merge branch 'master' into feature/configurable-view-deriver
Diffstat (limited to 'docs/tutorials/wiki2/background.rst')
| -rw-r--r-- | docs/tutorials/wiki2/background.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/tutorials/wiki2/background.rst b/docs/tutorials/wiki2/background.rst index b8afb8305..2dac847d8 100644 --- a/docs/tutorials/wiki2/background.rst +++ b/docs/tutorials/wiki2/background.rst @@ -5,13 +5,13 @@ Background This version of the :app:`Pyramid` wiki tutorial presents a :app:`Pyramid` application that uses technologies which will be familiar to someone with SQL database experience. It uses -:term:`SQLAlchemy` as a persistence mechanism and :term:`url dispatch` to map +:term:`SQLAlchemy` as a persistence mechanism and :term:`URL dispatch` to map URLs to code. It can also be followed by people without any prior Python web framework experience. To code along with this tutorial, the developer will need a UNIX machine with development tools (Mac OS X with XCode, any Linux or BSD -variant, etc) *or* a Windows system of any kind. +variant, etc.) *or* a Windows system of any kind. .. note:: |