summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/background.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-02-21 03:32:27 -0800
committerSteve Piercy <web@stevepiercy.com>2016-02-21 03:32:27 -0800
commite9e3ce262f70d8a041b65f19d56e233cd97771b7 (patch)
treef4cc8d08e64b912c9dc5f72b0797085035ab6e36 /docs/tutorials/wiki2/background.rst
parent5dc1c80046b7eb83fb7c51105bed0e73b2ab759c (diff)
parent25fed631357e23aaa4d54c2923e8c463cd41930e (diff)
downloadpyramid-e9e3ce262f70d8a041b65f19d56e233cd97771b7.tar.gz
pyramid-e9e3ce262f70d8a041b65f19d56e233cd97771b7.tar.bz2
pyramid-e9e3ce262f70d8a041b65f19d56e233cd97771b7.zip
Merge pull request #2357 from stevepiercy/feature/alchemy-scaffold-update
wiki2 docs update WIP
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::