summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/background.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2015-05-25 13:53:05 -0700
committerSteve Piercy <web@stevepiercy.com>2015-05-25 14:12:21 -0700
commit3e6b601d9bc557b5b698d5fd4d6eb20b151a424f (patch)
treeedc5abf3e2b9c02c470266edfbbe3aef40305cf5 /docs/tutorials/wiki2/background.rst
parent15c44e9405a1b0bf0194886fa1cc9f694d4d631b (diff)
downloadpyramid-3e6b601d9bc557b5b698d5fd4d6eb20b151a424f.tar.gz
pyramid-3e6b601d9bc557b5b698d5fd4d6eb20b151a424f.tar.bz2
pyramid-3e6b601d9bc557b5b698d5fd4d6eb20b151a424f.zip
cherry pick from 1.5-branch
Diffstat (limited to 'docs/tutorials/wiki2/background.rst')
-rw-r--r--docs/tutorials/wiki2/background.rst8
1 files changed, 5 insertions, 3 deletions
diff --git a/docs/tutorials/wiki2/background.rst b/docs/tutorials/wiki2/background.rst
index 1f9582903..b8afb8305 100644
--- a/docs/tutorials/wiki2/background.rst
+++ b/docs/tutorials/wiki2/background.rst
@@ -2,10 +2,12 @@
Background
==========
-This tutorial presents a :app:`Pyramid` application that uses technologies
-which will be familiar to someone with SQL database experience. It uses
+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
-URLs to code.
+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