Merge remote-tracking branch 'refs/remotes/Pylons/master'

1 files changed, 12 insertions, 7 deletions

diff --git a/docs/tutorials/wiki2/background.rst b/docs/tutorials/wiki2/background.rst
index 880b5b219..ee7dfe36f 100644
--- a/docs/tutorials/wiki2/background.rst
+++ b/docs/tutorials/wiki2/background.rst
@@ -1,17 +1,22 @@
+.. _wiki2_background:
+
 ==========
 Background
 ==========
 
-This tutorial presents a :app:`Pyramid` application that uses
-technologies which will be familiar to someone with :term:`Pylons`
-experience.  It uses :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.
+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.  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* he will need a Windows system of any kind.
+variant, etc.) *or* a Windows system of any kind.
+
+.. note::
 
-This tutorial is targeted at :app:`Pyramid` version 1.0.
+  This tutorial runs on both Python 2 and 3 without modification.
 
 Have fun!