summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/background.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2016-02-29 13:02:13 -0600
committerMichael Merickel <michael@merickel.org>2016-02-29 13:02:13 -0600
commit565fa59e7eab1e71ec4c4c1ee5773f2ecbf7a07f (patch)
tree9f7098358c01622fcae8fbe8a318f6484e5d3c8b /docs/tutorials/wiki2/background.rst
parentcb98a90c3dcc40dc42813143a601ef631249f5f4 (diff)
parenta79bac6697fa312cd1ba0ac4e784bbc820c5e603 (diff)
downloadpyramid-565fa59e7eab1e71ec4c4c1ee5773f2ecbf7a07f.tar.gz
pyramid-565fa59e7eab1e71ec4c4c1ee5773f2ecbf7a07f.tar.bz2
pyramid-565fa59e7eab1e71ec4c4c1ee5773f2ecbf7a07f.zip
Merge pull request #2024 from Pylons/feature/alchemy-scaffold-update
alchemy scaffold updates
Diffstat (limited to 'docs/tutorials/wiki2/background.rst')
-rw-r--r--docs/tutorials/wiki2/background.rst4
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::