summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/background.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2015-06-05 14:06:02 -0400
committerChris McDonough <chrism@plope.com>2015-06-05 14:06:02 -0400
commitf3c67a4217504bc7f2862ec1616342240738efae (patch)
tree9e7452b3ffdc8d4f30739cfc9d898169d6719206 /docs/tutorials/wiki2/background.rst
parent7b4ed3088af03de473ad164c314062c283afce39 (diff)
parentc1dbb5092d486df5d7fbad8e52cd1dbcc2c834d9 (diff)
downloadpyramid-f3c67a4217504bc7f2862ec1616342240738efae.tar.gz
pyramid-f3c67a4217504bc7f2862ec1616342240738efae.tar.bz2
pyramid-f3c67a4217504bc7f2862ec1616342240738efae.zip
Merge branch 'master' of github.com:Pylons/pyramid
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