Merge branch 'master' of github.com:Pylons/pyramid

207 files changed, 7572 insertions, 295 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 5cfd5e70d..cb28d880b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,30 @@
-Next Release
-============
+Unreleased
+==========
+
+Bug Fixes
+---------
+
+- Fix the ``pcreate`` script so that when the target directory name ends with a 
+  slash it does not produce a non-working project directory structure.  
+  Previously saying ``pcreate -s starter /foo/bar/`` produced different output 
+  than  saying ``pcreate -s starter /foo/bar``.  The former did not work
+  properly.
+
+- Fix the ``principals_allowed_by_permission`` method of 
+  ``ACLAuthorizationPolicy`` so it anticipates a callable ``__acl__`` 
+  on resources.  Previously it did not try to call the ``__acl__``
+  if it was callable.
+
+Documentation
+-------------
+
+- Added a "Quick Tutorial" to go with the Quick Tour
+
+- Removed mention of ``pyramid_beaker`` from docs.  Beaker is no longer 
+  maintained.  Point people at ``pyramid_redis_sessions`` instead.
+
+1.5a2 (2013-09-22)
+==================
 
 Features
 --------
@@ -18,38 +43,126 @@ Bug Fixes
 Backwards Incompatibilities
 ---------------------------
 
-- Pyramid has dropped native support for the Mako and Chameleon renderers. To
-  re-add support for these renderers into existing projects there are 3 steps:
+- Pyramid no longer depends on or configures the Mako and Chameleon templating
+  system renderers by default.  Disincluding these templating systems by
+  default means that the Pyramid core has fewer dependencies and can run on
+  future platforms without immediate concern for the compatibility of its
+  templating add-ons.  It also makes maintenance slightly more effective, as
+  different people can maintain the templating system add-ons that they
+  understand and care about without needing commit access to the Pyramid core,
+  and it allows users who just don't want to see any packages they don't use
+  come along for the ride when they install Pyramid.
+
+  This means that upon upgrading to Pyramid 1.5a2+, projects that use either
+  of these templating systems will see a traceback that ends something like
+  this when their application attempts to render a Chameleon or Mako template::
+
+     ValueError: No such renderer factory .pt
+
+  Or::
+
+     ValueError: No such renderer factory .mako
+
+  Or::
+
+     ValueError: No such renderer factory .mak
+
+  Support for Mako templating has been moved into an add-on package named 
+  ``pyramid_mako``, and support for Chameleon templating has been moved into 
+  an add-on package named ``pyramid_chameleon``.  These packages are drop-in 
+  replacements for the old built-in support for these templating langauges. 
+  All you have to do is install them and make them active in your configuration
+  to register renderer factories for ``.pt`` and/or ``.mako`` (or ``.mak``) to
+  make your application work again.
+
+  To re-add support for Chameleon and/or Mako template renderers into your
+  existing projects, follow the below steps.
 
-  - Add `pyramid_mako` and/or `pyramid_chameleon` as dependencies by
-    adding them to the `install_requires` section of the package's `setup.py`::
+  If you depend on Mako templates:
+
+  * Make sure the ``pyramid_mako`` package is installed.  One way to do this
+    is by adding ``pyramid_mako`` to the ``install_requires`` section of your
+    package's ``setup.py`` file and afterwards rerunning ``setup.py develop``::
 
         setup(
             #...
             install_requires=[
                 'pyramid_mako',         # new dependency
-                'pyramid_chameleon',    # new dependency
                 'pyramid',
                 #...
             ],
         )
 
-  - Update instances of the ``pyramid.config.Configurator`` to include the
-    required addons::
+  * Within the portion of your application which instantiates a Pyramid 
+    ``pyramid.config.Configurator`` (often the ``main()`` function in 
+    your project's ``__init__.py`` file), tell Pyramid to include the 
+    ``pyramid_mako`` includeme::
 
-        config.include('pyramid_chameleon')
+        config = Configurator(.....)
         config.include('pyramid_mako')
 
-  - If any unit tests are invoking either ``pyramid.renderers.render()`` or
-    ``pyramid.renderers.render_to_response()`` with either Mako or Chameleon
-    templates then the ``pyramid.config.Configurator`` instance at the root of
-    the unit test should be also be updated to include the addons, as shown
-    above. For example::
+  If you depend on Chameleon templates:
 
-        config = pyramid.testing.setUp()
-        config.include('pyramid_mako')
+  * Make sure the ``pyramid_chameleon`` package is installed.  One way to do
+    this is by adding ``pyramid_chameleon`` to the ``install_requires`` section
+    of your package's ``setup.py`` file and afterwards rerunning 
+    ``setup.py develop``::
+
+        setup(
+            #...
+            install_requires=[
+                'pyramid_chameleon',         # new dependency
+                'pyramid',
+                #...
+            ],
+        )
+
+  * Within the portion of your application which instantiates a Pyramid 
+    ``~pyramid.config.Configurator`` (often the ``main()`` function in 
+    your project's ``__init__.py`` file), tell Pyramid to include the 
+    ``pyramid_chameleon`` includeme::
+
+        config = Configurator(.....)
+        config.include('pyramid_chameleon')
 
-        result = pyramid.renderers.render('mypkg:templates/home.mako', {})
+  Note that it's also fine to install these packages into *older* Pyramids for
+  forward compatibility purposes.  Even if you don't upgrade to Pyramid 1.5
+  immediately, performing the above steps in a Pyramid 1.4 installation is
+  perfectly fine, won't cause any difference, and will give you forward
+  compatibility when you eventually do upgrade to Pyramid 1.5.
+
+  With the removal of Mako and Chameleon support from the core, some
+  unit tests that use the ``pyramid.renderers.render*`` methods may begin to 
+  fail.  If any of your unit tests are invoking either 
+  ``pyramid.renderers.render()``  or ``pyramid.renderers.render_to_response()``
+  with either Mako or Chameleon templates then the 
+  ``pyramid.config.Configurator`` instance in effect during
+  the unit test should be also be updated to include the addons, as shown
+  above. For example::
+
+        class ATest(unittest.TestCase):
+            def setUp(self):
+                self.config = pyramid.testing.setUp()
+                self.config.include('pyramid_mako')
+
+            def test_it(self):
+                result = pyramid.renderers.render('mypkg:templates/home.mako', {})
+
+  Or::
+
+        class ATest(unittest.TestCase):
+            def setUp(self):
+                self.config = pyramid.testing.setUp()
+                self.config.include('pyramid_chameleon')
+
+            def test_it(self):
+                result = pyramid.renderers.render('mypkg:templates/home.pt', {})
+
+- If you're using the Pyramid debug toolbar, when you upgrade Pyramid to
+  1.5a2+, you'll also need to upgrade the ``pyramid_debugtoolbar`` package to 
+  at least version 1.0.8, as older toolbar versions are not compatible with 
+  Pyramid 1.5a2+ due to the removal of Mako support from the core.  It's 
+  fine to use this newer version of the toolbar code with older Pyramids too.
 
 - Removed the ``request.response_*`` varying attributes. These attributes
   have been deprecated since Pyramid 1.1, and as per the deprecation policy,
@@ -62,10 +175,6 @@ Backwards Incompatibilities
   only necessary when the renderer is generating a response; it was a bug
   when it was done as a side effect of calling ``pyramid.renderers.render()``.
 
-- The Mako and Chameleon renderers have been removed from Pyramid.  Their 
-  functionality has been moved to  the ``pyramid_mako`` and 
-  ``pyramid_chameleon`` distributions respectively.
-
 - Removed the ``bfg2pyramid`` fixer script.
 
 - The ``pyramid.events.NewResponse`` event is now sent **after** response 
@@ -82,7 +191,7 @@ Backwards Incompatibilities
   instead.
 
 - Removed the ability to pass the following arguments to
-  ``pyramid.config.Configurator.add_route``: `view``, ``view_context``.
+  ``pyramid.config.Configurator.add_route``: ``view``, ``view_context``.
   ``view_for``, ``view_permission``, ``view_renderer``, and ``view_attr``.
   Using these arguments had been deprecated since Pyramid 1.1.  Instead of
   passing view-related arguments to ``add_route``, use a separate call to
@@ -112,6 +221,13 @@ Backwards Incompatibilities
   Pyramid narrative documentation instead of providing renderer globals values
   to the configurator.
 
+Deprecations
+------------
+
+- The ``pyramid.config.Configurator.set_request_property`` method now issues
+  a deprecation warning when used.  It had been docs-deprecated in 1.4
+  but did not issue a deprecation warning when used.
+
 1.5a1 (2013-08-30)
 ==================
 
@@ -156,7 +272,7 @@ Features
   The above example will ensure that the view is called if the request method
   is not POST (at least if no other view is more specific).
 
-  The :class:`pyramid.config.not_` class can be used against any value that is
+  The ``pyramid.config.not_`` class can be used against any value that is
   a predicate value passed in any of these contexts:
 
   - ``pyramid.config.Configurator.add_view``
@@ -225,9 +341,7 @@ Features
   In the past, only the most specific type containing views would be checked
   and if no matching view could be found then a PredicateMismatch would be
   raised. Now predicate mismatches don't hide valid views registered on
-  super-types. Here's an example that now works:
-
-  .. code-block:: python
+  super-types. Here's an example that now works::
 
      class IResource(Interface):
 
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 1a5b975d7..bfe22e540 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -222,3 +222,5 @@ Contributors
 - Takahiro Fujiwara, 2013/08/28
 
 - Doug Hellmann, 2013/09/06
+
+- Karl O. Pinc, 2013/09/27
diff --git a/HACKING.txt b/HACKING.txt
index 684a42ee6..4ebb59160 100644
--- a/HACKING.txt
+++ b/HACKING.txt
@@ -21,10 +21,10 @@ checkout.
   (alternately, create a writeable fork on GitHub and check that out).
 
 Since pyramid is a framework and not an application, it can be
-convenient to work against a sample application, preferably in its
-own virtualenv. A quick way to achieve this is to (ab-)use ``tox``
-(http://codespeak.net/~hpk/tox/) with a custom configuration file that's part of
-the checkout::
+convenient to work against a sample application, preferably in its own
+virtualenv. A quick way to achieve this is to (ab-)use ``tox``
+(http://tox.readthedocs.org/en/latest/) with a custom configuration
+file that's part of the checkout::
 
   tox -c hacking-tox.ini
 
diff --git a/TODO.txt b/TODO.txt
index 2aa1dc487..62b8c39f4 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -38,8 +38,6 @@ Nice-to-Have
 
 - Add narrative docs for wsgiapp and wsgiapp2.
 
-- Flesh out "Paste" narrative docs chapter.
-
 - Basic WSGI documentation (pipeline / app / server).
 
 - Change docs about creating a venusian decorator to not use ZCA (use
@@ -118,9 +116,6 @@ Nice-to-Have
 Future
 ------
 
-- 1.5: Maybe? deprecate set_request_property in favor of pointing people at
-  add_request_method, schedule removal for 1.8?
-
 - 1.6: turn ``pyramid.settings.Settings`` into a function that returns the
   original dict (after ``__getattr__`` deprecation period, it was deprecated
   in 1.2).
@@ -130,6 +125,8 @@ Future
 - 1.7: Change ``pyramid.authentication.AuthTktAuthenticationPolicy`` default
   ``hashalg`` to ``sha512``.
 
+- 1.8 Remove set_request_property.
+
 Probably Bad Ideas
 ------------------
 
diff --git a/docs/_static/directory_structure_generic.png b/docs/_static/directory_structure_generic.png
new file mode 100644
index 000000000..c6d1a5b03
--- /dev/null
+++ b/docs/_static/directory_structure_generic.png
diff --git a/docs/_static/directory_structure_initial.png b/docs/_static/directory_structure_initial.png
new file mode 100644
index 000000000..000f1bb27
--- /dev/null
+++ b/docs/_static/directory_structure_initial.png
diff --git a/docs/_static/directory_structure_pyramid.png b/docs/_static/directory_structure_pyramid.png
new file mode 100644
index 000000000..74edd6533
--- /dev/null
+++ b/docs/_static/directory_structure_pyramid.png
diff --git a/docs/_themes b/docs/_themes
-Subproject 91cda806e6227e457963409fe380963d146b0e6
+Subproject 26732645619b372764097e5e8086f89871d90c0
diff --git a/docs/conf.py b/docs/conf.py
index a7a4a441a..3b6e75a17 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -73,9 +73,6 @@ intersphinx_mapping = {
         'http://docs.pylonsproject.org/projects/deform/en/latest',
     None),
     'sqla': ('http://docs.sqlalchemy.org/en/latest', None),
-    'beaker': (
-        'http://docs.pylonsproject.org/projects/pyramid_beaker/en/latest',
-        None),
     'who': ('http://docs.repoze.org/who/latest', None),
     'python': ('http://docs.python.org', None),
     'python3': ('http://docs.python.org/3', None),
@@ -92,6 +89,7 @@ intersphinx_mapping = {
          None),
 }
 
+
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
diff --git a/docs/designdefense.rst b/docs/designdefense.rst
index dbb02a4a5..bbce3e29c 100644
--- a/docs/designdefense.rst
+++ b/docs/designdefense.rst
@@ -764,7 +764,7 @@ content management system (CMS) may have basic functionality that needs to be
 extended for a particular deployment.  That CMS system may be deployed for
 many organizations at many places.  Some number of deployments of this CMS
 may be deployed centrally by a third party and managed as a group.  It's
-useful to be able to extend such a system for each deployment via preordained
+easier to be able to extend such a system for each deployment via preordained
 plugpoints than it is to continually keep each software branch of the system
 in sync with some upstream source: the upstream developers may change code in
 such a way that your changes to the same codebase conflict with theirs in
@@ -792,8 +792,8 @@ such a feature.
   main template and the CSS in a separate Python package which defines
   overrides.
 
-- If a deployment needs an application page to do something differently needs
-  it to expose more or different information, the deployer may override the
+- If a deployment needs an application page to do something differently, or
+  to expose more or different information, the deployer may override the
   view that renders the page within a separate Python package.
 
 - If a deployment needs an additional feature, the deployer may add a view to
@@ -810,7 +810,7 @@ won't regularly need to deal wth meaningless textual merge conflicts that
 trivial changes to upstream packages often entail when it comes time to
 update the upstream package, because if you extend an application externally,
 there just is no textual merge done.  Your modifications will also, for
-whatever its worth, be contained in one, canonical, well-defined place.
+whatever it's worth, be contained in one, canonical, well-defined place.
 
 Branching an application and continually merging in order to get new features
 and bugfixes is clearly useful.  You can do that with a :app:`Pyramid`
@@ -822,7 +822,7 @@ dismiss this feature in favor of branching and merging because applications
 written in their framework of choice aren't extensible out of the box in a
 comparably fundamental way.
 
-While :app:`Pyramid` application are fundamentally extensible even if you
+While :app:`Pyramid` applications are fundamentally extensible even if you
 don't write them with specific extensibility in mind, if you're moderately
 adventurous, you can also take it a step further.  If you learn more about
 the :term:`Zope Component Architecture`, you can optionally use it to expose
@@ -842,7 +842,7 @@ applications by :app:`Pyramid` are good or bad is mostly pointless. You
 needn't take advantage of the extensibility features provided by a particular
 :app:`Pyramid` application in order to affect a modification for a particular
 set of its deployments.  You can ignore the application's extensibility
-plugpoints entirely, and instead use version control branching and merging to
+plugpoints entirely, and use version control branching and merging to
 manage application deployment modifications instead, as if you were deploying
 an application written using any other web framework.
 
diff --git a/docs/index.rst b/docs/index.rst
index 2efe90cf7..78a00966d 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -44,10 +44,14 @@ up to speed right away.
    :hidden:
 
    quick_tour
+   quick_tutorial/index
 
 * :doc:`quick_tour` goes through the major features in Pyramid, covering
   a little about a lot.
 
+* :doc:`quick_tutorial/index` does the same, but in a tutorial format:
+  deeper treatment of each topic and with working code.
+
 * To see a minimal Pyramid web application, check out
   :ref:`firstapp_chapter`.
 
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index fb67b899b..e419a8b20 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -25,6 +25,10 @@ on :term:`PyPy` (1.9+).
 :app:`Pyramid` installation does not require the compilation of any C code, so
 you need only a Python interpreter that meets the requirements mentioned.
 
+Some :app:`Pyramid` dependencies may attempt to build C extensions for
+performance speedups. If a compiler or Python headers are unavailable the
+dependency will fall back to using pure Python instead.
+
 For Mac OS X Users
 ~~~~~~~~~~~~~~~~~~
 
@@ -285,13 +289,20 @@ Installing :app:`Pyramid` Into the Virtual Python Environment
 After you've got your virtualenv installed, you may install :app:`Pyramid`
 itself using the following commands:
 
-.. code-block:: text
-
-   $ $VENV/bin/easy_install pyramid
+.. parsed-literal::
+      
+   $ $VENV/bin/easy_install "pyramid==\ |release|\ "
 
 The ``easy_install`` command will take longer than the previous ones to
 complete, as it downloads and installs a number of dependencies.
 
+.. note::
+
+   If you see any warnings and/or errors related to failing to compile the C
+   extensions, in most cases you may safely ignore those errors. If you wish
+   to use the C extensions, please verify that you have a functioning compiler
+   and the Python header files installed.
+
 .. index::
    single: installing on Windows
 
@@ -357,9 +368,9 @@ You can use Pyramid on Windows under Python 2 or 3.
 #. Use ``easy_install`` to get :app:`Pyramid` and its direct dependencies
    installed:
 
-   .. code-block:: text
-
-      c:\env> %VENV%\Scripts\easy_install pyramid
+   .. parsed-literal::
+      
+      c:\\env> %VENV%\\Scripts\\easy_install "pyramid==\ |release|\ "
 
 What Gets Installed
 -------------------
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index f3050f805..4c19982d6 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -144,7 +144,7 @@ contains no space characters, so it's wise to *avoid* a path that contains
 i.e. ``My Documents``.  As a result, the author, when he uses Windows, just
 puts his projects in ``C:\projects``.
 
-.. warning:: 
+.. warning::
 
    You’ll need to avoid using ``pcreate`` to create a project with the same
    name as a Python standard library component. In particular, this means you
@@ -193,10 +193,10 @@ Elided output from a run of this command on UNIX is shown below:
    ...
    Finished processing dependencies for MyProject==0.0
 
-This will install a :term:`distribution` representing your project into the
-interpreter's library set so it can be found by ``import`` statements and by
-other console scripts such as ``pserve``, ``pshell``, ``proutes`` and
-``pviews``.
+This will install a :term:`distribution` representing your project
+into the virtual environment interpreter's library set so it can be
+found by ``import`` statements and by other console scripts such as
+``pserve``, ``pshell``, ``proutes`` and ``pviews``.
 
 .. index::
    single: running tests
@@ -971,12 +971,15 @@ named ``views`` instead of within a single ``views.py`` file, you might:
 - Create a ``views`` directory inside your ``myproject`` package directory
   (the same directory which holds ``views.py``).
 
-- *Move* the existing ``views.py`` file to a file inside the new ``views``
-  directory named, say, ``blog.py``.
+- Create a file within the new ``views`` directory named ``__init__.py``.  (It
+  can be empty.  This just tells Python that the ``views`` directory is a
+  *package*.)
 
-- Create a file within the new ``views`` directory named ``__init__.py`` (it
-  can be empty, this just tells Python that the ``views`` directory is a
-  *package*.
+- *Move* the existing ``views.py`` file to a file inside the new ``views``
+  directory named, say, ``blog.py``.  Because the ``templates`` directory
+  remains in the ``myproject`` package, the template :term:`asset
+  specification`s in ``blog.py`` must now be fully qualified with the
+  project's package name (``myproject:templates/blog.pt``).
 
 You can then continue to add view callable functions to the ``blog.py``
 module, but you can also add other ``.py`` files which contain view callable
@@ -1025,7 +1028,7 @@ server.  Waitress is a server that is suited for development and light
 production usage.  It's not the fastest nor the most featureful WSGI server.
 Instead, its main feature is that it works on all platforms that Pyramid
 needs to run on, making it a good choice as a default server from the
-perspective of Pyramid's developers.  
+perspective of Pyramid's developers.
 
 Any WSGI server is capable of running a :app:`Pyramid` application.  But we
 suggest you stick with the default server for development, and that you wait
diff --git a/docs/narr/renderers.rst b/docs/narr/renderers.rst
index e13e09af3..3059aef35 100644
--- a/docs/narr/renderers.rst
+++ b/docs/narr/renderers.rst
@@ -207,13 +207,7 @@ representing the JSON serialization of the return value:
 The return value needn't be a dictionary, but the return value must contain
 values serializable by the configured serializer (by default ``json.dumps``).
 
-.. note::
-
-   Extra arguments can be passed to the serializer by overriding the default
-   ``json`` renderer. See :class:`pyramid.renderers.JSON` and
-   :ref:`adding_and_overriding_renderers` for more information.
-
-You can configure a view to use the JSON renderer by naming ``json`` as the
+You can configure a view to use the JSON renderer by naming``json`` as the
 ``renderer`` argument of a view configuration, e.g. by using
 :meth:`~pyramid.config.Configurator.add_view`:
 
@@ -234,6 +228,18 @@ using the api of the ``request.response`` attribute.  See
 Serializing Custom Objects
 ++++++++++++++++++++++++++
 
+Some objects are not, by default, JSON-serializable (such as datetimes and 
+other arbitrary Python objects).  You can, however, register code that makes 
+non-serializable objects serializable in two ways:
+
+- By defining a ``__json__`` method on objects in your application.
+
+- For objects you don't "own", you can register JSON renderer that knows about 
+  an *adapter* for that kind of object.
+
+Using a Custom ``__json__`` Method
+**********************************
+
 Custom objects can be made easily JSON-serializable in Pyramid by defining a
 ``__json__`` method on the object's class. This method should return values
 natively JSON-serializable (such as ints, lists, dictionaries, strings, and
@@ -259,6 +265,9 @@ will be the active request object at render time.
    # the JSON value returned by ``objects`` will be:
    #    [{"x": 1}, {"x": 2}]
 
+Using the ``add_adapter`` Method of a Custom JSON Renderer
+**********************************************************
+
 If you aren't the author of the objects being serialized, it won't be
 possible (or at least not reasonable) to add a custom ``__json__`` method
 to their classes in order to influence serialization.  If the object passed
@@ -273,19 +282,21 @@ objects using the registered adapters. A short example follows:
 
    from pyramid.renderers import JSON
 
-   json_renderer = JSON()
-   def datetime_adapter(obj, request):
-       return obj.isoformat()
-   json_renderer.add_adapter(datetime.datetime, datetime_adapter)
-
-   # then during configuration ....
-   config = Configurator()
-   config.add_renderer('json', json_renderer)
-
-The adapter should accept two arguments: the object needing to be serialized
-and ``request``, which will be the current request object at render time.
-The adapter should raise a :exc:`TypeError` if it can't determine what to do
-with the object.
+   if __name__ == '__main__':
+       config = Configurator()
+       json_renderer = JSON()
+       def datetime_adapter(obj, request):
+           return obj.isoformat()
+       json_renderer.add_adapter(datetime.datetime, datetime_adapter)
+       config.add_renderer('json', json_renderer)
+
+The ``add_adapter`` method should accept two arguments: the *class* of the object that you want this adapter to run for (in the example above, 
+``datetime.datetime``), and the adapter itself.
+
+The adapter should be a callable.  It should accept two arguments: the object 
+needing to be serialized and ``request``, which will be the current request 
+object at render time. The adapter should raise a :exc:`TypeError` 
+if it can't determine what  to do with the object.
 
 See :class:`pyramid.renderers.JSON` and
 :ref:`adding_and_overriding_renderers` for more information.
diff --git a/docs/narr/sessions.rst b/docs/narr/sessions.rst
index 358977089..f8279b0a5 100644
--- a/docs/narr/sessions.rst
+++ b/docs/narr/sessions.rst
@@ -146,8 +146,6 @@ Some gotchas:
   you've changed sessioning data.
 
 .. index::
-   single: pyramid_beaker
-   single: Beaker
    single: pyramid_redis_sessions
    single: session factory (alternates)
 
@@ -156,20 +154,11 @@ Some gotchas:
 Using Alternate Session Factories
 ---------------------------------
 
-At the time of this writing, exactly two alternate session factories
-exist.
-
-The first is named ``pyramid_redis_sessions``.  It can be downloaded from PyPI.
+At the time of this writing, exactly one project-endorsed alternate session 
+factory exists named``pyramid_redis_sessions``.  It can be downloaded from PyPI.
 It uses Redis as a backend.  It is the recommended persistent session solution
 at the time of this writing.
 
-The second is named ``pyramid_beaker``. This is a session factory that uses the
-`Beaker <http://beaker.groovie.org/>`_ library as a backend.  Beaker has
-support for file-based sessions, database based sessions, and encrypted
-cookie-based sessions.  See `the pyramid_beaker documentation
-<http://docs.pylonsproject.org/projects/pyramid_beaker/en/latest/>`_ for more
-information about ``pyramid_beaker``.
-
 .. index::
    single: session factory (custom)
 
diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index 76cf1daac..7c76116f7 100644
--- a/docs/narr/viewconfig.rst
+++ b/docs/narr/viewconfig.rst
@@ -822,7 +822,7 @@ of this:
        def delete(self):
            return Response('delete')
 
-   if __name__ == '__main__':
+   def main(global_config, **settings):
        config = Configurator()
        config.add_route('rest', '/rest')
        config.add_view(
@@ -831,9 +831,10 @@ of this:
            RESTView, route_name='rest', attr='post', request_method='POST')
        config.add_view(
            RESTView, route_name='rest', attr='delete', request_method='DELETE')
+       return config.make_wsgi_app()
 
 To reduce the amount of repetition in the ``config.add_view`` statements, we
-can move the ``route_name='rest'`` argument to a ``@view_default`` class
+can move the ``route_name='rest'`` argument to a ``@view_defaults`` class
 decorator on the RESTView class:
 
 .. code-block:: python
@@ -857,12 +858,13 @@ decorator on the RESTView class:
        def delete(self):
            return Response('delete')
 
-   if __name__ == '__main__':
+   def main(global_config, **settings):
        config = Configurator()
        config.add_route('rest', '/rest')
        config.add_view(RESTView, attr='get', request_method='GET')
        config.add_view(RESTView, attr='post', request_method='POST')
        config.add_view(RESTView, attr='delete', request_method='DELETE')
+       return config.make_wsgi_app()
 
 :class:`pyramid.view.view_defaults` accepts the same set of arguments that
 :class:`pyramid.view.view_config` does, and they have the same meaning.  Each
diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index 4b23f7858..98584e608 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -4,73 +4,56 @@
 Quick Tour of Pyramid
 =====================
 
-Pyramid lets you start small and finish big. This *Quick Tour* guide
-walks you through many of Pyramid's key features. Let's put the
-emphasis on *start* by doing a quick tour through Pyramid, with
-snippets of code to illustrate major concepts.
+Pyramid lets you start small and finish big.  This *Quick Tour* of Pyramid is
+for those who want to evaluate Pyramid, whether you are new to Python
+web frameworks, or a pro in a hurry. For more detailed treatment of
+each topic, give the :ref:`quick_tutorial` a try.
 
-.. note::
-
-    We use Python 3 in our samples. Pyramid was one of the first
-    (October 2011) web frameworks to fully support Python 3. You can
-    use Python 3 as well for this guide, but you can also use Python 2.7.
-
-Python Setup
+Installation
 ============
 
-First thing's first: we need our Python environment in ship-shape.
-Pyramid encourages standard Python development practices (virtual
-environments, packaging tools, logging, etc.) so let's get our working
-area in place. For Python 3.3:
-
-.. code-block:: bash
-
-  $ pyvenv-3.3 env33
-  $ source env33/bin/activate
-  $ wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -O - | python
-
-If ``wget`` complains with a certificate error, run it with:
-
-.. code-block:: bash
-
-  $ wget --no-check-certificate
+Once you have a standard Python environment setup, getting started with
+Pyramid is a breeze. Unfortunately "standard" is not so simple in Python.
+For this Quick Tour, it means:
+`Python <http://www.python.org/download/releases/>`_, a
+`virtual environment <http://docs.python.org/dev/library/venv.html>`_
+(or `virtualenv for Python 2.7 <https://pypi.python.org/pypi/virtualenv>`_),
+and `setuptools <https://pypi.python.org/pypi/setuptools/>`_.
 
-In these steps above we first made a :term:`virtualenv` and then
-"activated"  it, which adjusted our path to look first in
-``env33/bin`` for commands (such as ``python``). We next downloaded
-Python's packaging support and installed it, giving us the
-``easy_install`` command-line script for adding new packages. Python
-2.7 users will need to use ``virtualenv`` instead of ``pyvenv`` to make
-their virtual environment.
+As an example, for Python 3.3+ on Linux:
 
-.. note::
+.. parsed-literal::
 
-   Why ``easy_install`` and not ``pip``? Pyramid encourages use of
-   namespace packages which, until recently, ``pip`` didn't permit.
-   Also, Pyramid has some optional C extensions for performance. With
-   ``easy_install``, Windows users can get these extensions without
-   needing a C compiler.
+  $ pyvenv env33
+  $ wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -O - | env33/bin/python
+  $ env33/bin/easy_install "pyramid==\ |release|\ "
 
-.. seealso:: See Also: Python 3's :mod:`venv module <python3:venv>`,
-   the ``setuptools`` `installation
-   instructions <https://pypi.python.org/pypi/setuptools/0.9.8#installation-instructions>`_,
-   `easy_install help <https://pypi.python.org/pypi/setuptools/0.9.8#using-setuptools-and-easyinstall>`_,
-   and Pyramid's :ref:`Before You Install <installing_chapter>`.
+For Windows:
 
-Pyramid Installation
-====================
+.. parsed-literal::
 
-We now have a standard starting point for Python. Getting Pyramid
-installed is easy:
+    # Use your browser to download:
+    #   https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py
+    c:\\> c:\\Python33\\python -m venv env33
+    c:\\> env33\\Scripts\\python ez_setup.py
+    c:\\> env33\\Scripts\\easy_install "pyramid==\ |release|\ "
 
-.. code-block:: bash
+Of course Pyramid runs fine on Python 2.6+, as do the examples in this
+*Quick Tour*. We're just showing Python 3 a little love (Pyramid had
+production support in October 2011.)
 
-  $ easy_install pyramid
+.. note::
 
-Our virtual environment now has the Pyramid software available to its
-Python.
+    Why ``easy_install`` and not ``pip``? Pyramid encourages use of namespace
+    packages which, until recently, ``pip`` didn't permit. Also, Pyramid has
+    some optional C extensions for performance. With ``easy_install``, Windows
+    users can get these extensions without needing a C compiler.
 
-.. seealso:: See Also: :ref:`installing_unix`
+.. seealso:: See Also:
+    :ref:`Quick Tutorial section on Requirements <qtut_requirements>`,
+    :ref:`installing_unix`,
+    :ref:`Before You Install <installing_chapter>`, and
+    :ref:`Installing Pyramid on a Windows System <installing_windows>`
 
 Hello World
 ===========
@@ -109,7 +92,9 @@ in Pyramid development. Building an application from loosely-coupled
 parts via :doc:`../narr/configuration` is a central idea in Pyramid,
 one that we will revisit regurlarly in this *Quick Tour*.
 
-.. seealso:: See Also: :ref:`firstapp_chapter` and
+.. seealso:: See Also:
+   :ref:`Quick Tutorial Hello World <qtut_hello_world>`,
+   :ref:`firstapp_chapter`, and
    :ref:`Single File Tasks tutorial <tutorials:single-file-tutorial>`
 
 Handling Web Requests and Responses
@@ -140,7 +125,10 @@ the name is included in the body of the response::
 
 Finally, we set the response's content type and return the Response.
 
-.. seealso:: See Also: :ref:`webob_chapter`
+.. seealso:: See Also:
+    :ref:`Quick Tutorial Request and Response <qtut_request_response>`
+    and
+    :ref:`webob_chapter`
 
 Views
 =====
@@ -190,7 +178,9 @@ configuration`, in which a Python :term:`decorator` is placed on the
 line above the view. Both approaches result in the same final
 configuration, thus usually, it is simply a matter of taste.
 
-.. seealso:: See Also: :doc:`../narr/views`,
+.. seealso:: See Also:
+   :ref:`Quick Tutorial Views <qtut_views>`,
+   :doc:`../narr/views`,
    :doc:`../narr/viewconfig`, and
    :ref:`debugging_view_configuration`
 
@@ -236,7 +226,9 @@ view:
 "replacement patterns" (the curly braces) in the route declaration.
 This information can then be used in your view.
 
-.. seealso:: See Also: :doc:`../narr/urldispatch`,
+.. seealso:: See Also:
+   :ref:`Quick Tutorial Routing <qtut_routing>`,
+   :doc:`../narr/urldispatch`,
    :ref:`debug_routematch_section`, and
    :doc:`../narr/router`
 
@@ -270,9 +262,11 @@ Since our view returned ``dict(name=request.matchdict['name'])``,
 we can use ``name`` as a variable in our template via
 ``${name}``.
 
-.. seealso:: See Also: :doc:`../narr/templates`,
-   :ref:`debugging_templates`, and
-   :ref:`available_template_system_bindings`
+.. seealso:: See Also:
+    :ref:`Quick Tutorial Templating <qtut_templating>`,
+    :doc:`../narr/templates`,
+    :ref:`debugging_templates`, and
+    :ref:`available_template_system_bindings`
 
 Templating With ``jinja2``
 ==========================
@@ -303,7 +297,7 @@ The only change in our view...point the renderer at the ``.jinja2`` file:
 Our Jinja2 template is very similar to our previous template:
 
 .. literalinclude:: quick_tour/jinja2/hello_world.jinja2
-    :language: jinja
+    :language: html
 
 Pyramid's templating add-ons register a new kind of renderer into your
 application. The renderer registration maps to different kinds of
@@ -311,9 +305,10 @@ filename extensions. In this case, changing the extension from ``.pt``
 to ``.jinja2`` passed the view response through the ``pyramid_jinja2``
 renderer.
 
-.. seealso:: See Also: `Jinja2 homepage <http://jinja.pocoo.org/>`_,
-   and
-   :ref:`pyramid_jinja2 Overview <jinja2:overview>`
+.. seealso:: See Also:
+    :ref:`Quick Tutorial Jinja2 <qtut_jinja2>`,
+    `Jinja2 homepage <http://jinja.pocoo.org/>`_, and
+    :ref:`pyramid_jinja2 Overview <jinja2:overview>`
 
 Static Assets
 =============
@@ -358,9 +353,11 @@ By using ``request.static_url`` to generate the full URL to the static
 assets, you both ensure you stay in sync with the configuration and
 gain refactoring flexibility later.
 
-.. seealso:: See Also: :doc:`../narr/assets`,
-   :ref:`preventing_http_caching`, and
-   :ref:`influencing_http_caching`
+.. seealso:: See Also:
+    :ref:`Quick Tutorial Static Assets <qtut_static_assets>`,
+    :doc:`../narr/assets`,
+    :ref:`preventing_http_caching`, and
+    :ref:`influencing_http_caching`
 
 Returning JSON
 ==============
@@ -377,9 +374,11 @@ This wires up a view that returns some data through the JSON
 :term:`renderer`, which calls Python's JSON support to serialize the data
 into JSON and set the appropriate HTTP headers.
 
-.. seealso:: See Also: :ref:`views_which_use_a_renderer`,
-   :ref:`json_renderer`, and
-   :ref:`adding_and_overriding_renderers`
+.. seealso:: See Also:
+    :ref:`Quick Tutorial JSON <qtut_json>`,
+    :ref:`views_which_use_a_renderer`,
+    :ref:`json_renderer`, and
+    :ref:`adding_and_overriding_renderers`
 
 View Classes
 ============
@@ -422,7 +421,20 @@ Only one route needed, stated in one place atop the view class. Also,
 the assignment of the ``name`` is done in the ``__init__``. Our
 templates can then use ``{{ view.name }}``.
 
-.. seealso:: See Also: :ref:`class_as_view`
+Pyramid view classes, combined with built-in and custom predicates,
+have much more to offer:
+
+- All the same view configuration parameters as function views
+
+- One route leading to multiple views, based on information in the
+  request or data such as ``request_param``, ``request_method``,
+  ``accept``, ``header``, ``xhr``, ``containment``, and
+  ``custom_predicates``
+
+.. seealso:: See Also:
+    :ref:`Quick Tutorial View Classes <qtut_view_classes>`,
+    :ref:`Quick Tutorial More View Classes <qtut_more_view_classes>`, and
+    :ref:`class_as_view`
 
 Quick Project Startup with Scaffolds
 ====================================
@@ -470,8 +482,10 @@ configuration. This includes a new way of running your application:
 
 Let's look at ``pserve`` and configuration in more depth.
 
-.. seealso:: See Also: :ref:`project_narr` and
-   :doc:`../narr/scaffolding`
+.. seealso:: See Also:
+    :ref:`Quick Tutorial Scaffolds <qtut_scaffolds>`,
+    :ref:`project_narr`, and
+    :doc:`../narr/scaffolding`
 
 Application Running with ``pserve``
 ===================================
@@ -499,7 +513,8 @@ Most of the work, though, comes from your project's wiring, as
 expressed in the configuration file you supply to ``pserve``. Let's
 take a look at this configuration file.
 
-.. seealso:: See Also: :ref:`what_is_this_pserve_thing`
+.. seealso:: See Also:
+    :ref:`what_is_this_pserve_thing`
 
 Configuration with ``.ini`` Files
 =================================
@@ -546,8 +561,10 @@ Additionally, the ``development.ini`` generated by this scaffold wired
 up Python's standard logging. We'll now see in the console, for example,
 a log on every request that comes in, as well traceback information.
 
-.. seealso:: See Also: :ref:`environment_chapter` and
-   :doc:`../narr/paste`
+.. seealso:: See Also:
+    :ref:`Quick Tutorial Application Configuration <qtut_ini>`,
+    :ref:`environment_chapter` and
+    :doc:`../narr/paste`
 
 
 Easier Development with ``debugtoolbar``
@@ -599,7 +616,10 @@ you want to disable this toolbar, no need to change code: you can
 remove it from ``pyramid.includes`` in the relevant ``.ini``
 configuration file.
 
-.. seealso:: See Also: :ref:`pyramid_debugtoolbar <toolbar:overview>`
+.. seealso:: See Also:
+    :ref:`Quick Tutorial
+    pyramid_debugtoolbar <qtut_debugtoolbar>` and
+    :ref:`pyramid_debugtoolbar <toolbar:overview>`
 
 Unit Tests and ``nose``
 =======================
@@ -650,7 +670,11 @@ Pyramid supplies helpers for test writing, which we use in the
 test setup and teardown. Our one test imports the view,
 makes a dummy request, and sees if the view returns what we expected.
 
-.. seealso:: See Also: :ref:`testing_chapter`
+.. seealso:: See Also:
+    :ref:`Quick Tutorial Unit Testing <qtut_unit_testing>`,
+    :ref:`Quick Tutorial Functional Testing <qtut_functional_testing>`,
+    and
+    :ref:`testing_chapter`
 
 Logging
 =======
@@ -693,7 +717,9 @@ visit ``http://localhost:6543`` your console will now show::
 
  2013-08-09 10:42:42,968 DEBUG [hello_world.views][MainThread] Some Message
 
-.. seealso:: See Also: :ref:`logging_chapter`
+.. seealso:: See Also:
+    :ref:`Quick Tutorial Logging <qtut_logging>` and
+    :ref:`logging_chapter`
 
 Sessions
 ========
@@ -740,9 +766,10 @@ Jinja2 template:
     :end-before: End Sphinx Include 1
 
 .. seealso:: See Also:
-   :ref:`sessions_chapter`, :ref:`flash_messages`,
-   :ref:`session_module`, and
-   :ref:`Beaker sessioning middleware <beaker:overview>`
+    :ref:`Quick Tutorial Sessions <qtut_sessions>`,
+    :ref:`sessions_chapter`, :ref:`flash_messages`,
+    :ref:`session_module`, and
+    :ref:`Beaker sessioning middleware <beaker:overview>`
 
 Databases
 =========
@@ -787,10 +814,12 @@ of the system, can then easily get at the data thanks to SQLAlchemy:
     :start-after: Start Sphinx Include
     :end-before: End Sphinx Include
 
-.. seealso:: See Also: `SQLAlchemy <http://www.sqlalchemy.org/>`_,
-   :ref:`making_a_console_script`,
-   :ref:`bfg_sql_wiki_tutorial`, and
-   :ref:`Application Transactions With pyramid_tm <tm:overview>`
+.. seealso:: See Also:
+    :ref:`Quick Tutorial Databases <qtut_databases>`,
+    `SQLAlchemy <http://www.sqlalchemy.org/>`_,
+    :ref:`making_a_console_script`,
+    :ref:`bfg_sql_wiki_tutorial`, and
+    :ref:`Application Transactions With pyramid_tm <tm:overview>`
 
 Forms
 =====
@@ -849,9 +878,10 @@ widgets using attractive CSS from Bootstrap and more powerful widgets
 from Chosen.
 
 .. seealso:: See Also:
-   :ref:`Deform <deform:overview>`,
-   :ref:`Colander <colander:overview>`, and
-   `deform_bootstrap <https://pypi.python.org/pypi/deform_bootstrap>`_
+    :ref:`Quick Tutorial Forms <qtut_forms>`,
+    :ref:`Deform <deform:overview>`,
+    :ref:`Colander <colander:overview>`, and
+    `deform_bootstrap <https://pypi.python.org/pypi/deform_bootstrap>`_
 
 Conclusion
 ==========
diff --git a/docs/quick_tour/jinja2/hello_world.jinja2 b/docs/quick_tour/jinja2/hello_world.jinja2
index e177744b5..7a902dd3a 100644
--- a/docs/quick_tour/jinja2/hello_world.jinja2
+++ b/docs/quick_tour/jinja2/hello_world.jinja2
@@ -1,4 +1,5 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html lang="en">
 <head>
     <title>Hello World</title>
 </head>
diff --git a/docs/quick_tutorial/authentication.rst b/docs/quick_tutorial/authentication.rst
new file mode 100644
index 000000000..8380a75ed
--- /dev/null
+++ b/docs/quick_tutorial/authentication.rst
@@ -0,0 +1,134 @@
+==============================
+20: Logins With Authentication
+==============================
+
+Login views that authenticate a username/password against a list of
+users.
+
+Background
+==========
+
+Most web applications have URLs that allow people to add/edit/delete
+content via a web browser. Time to add
+:ref:`security <security_chapter>`
+to the application. In this first step we introduce authentication.
+That is, logging in and logging out using Pyramid's rich facilities for
+pluggable user storages.
+
+In the next step we will introduce protection resources with
+authorization security statements.
+
+Objectives
+==========
+
+- Introduce the Pyramid concepts of authentication
+
+- Create login/logout views
+
+Steps
+=====
+
+#. We are going to use the view classes step as our starting point:
+
+   .. code-block:: bash
+
+    $ cd ..; cp -r view_classes authentication; cd authentication
+    $ $VENV/bin/python setup.py develop
+
+#. Put the security hash in the ``authentication/development.ini``
+   configuration file as ``tutorial.secret`` instead of putting it in
+   the code:
+
+   .. literalinclude:: authentication/development.ini
+    :language: ini
+    :linenos:
+
+#. Get authentication (and for now, authorization policies) and login
+   route into the :term:`configurator` in
+   ``authentication/tutorial/__init__.py``:
+
+   .. literalinclude:: authentication/tutorial/__init__.py
+    :linenos:
+
+#. Create a ``authentication/tutorial/security.py`` module that can find
+   our user information by providing an *authentication policy callback*:
+
+   .. literalinclude:: authentication/tutorial/security.py
+    :linenos:
+
+#. Update the views in ``authentication/tutorial/views.py``:
+
+   .. literalinclude:: authentication/tutorial/views.py
+    :linenos:
+
+#. Add a login template at ``authentication/tutorial/login.pt``:
+
+   .. literalinclude:: authentication/tutorial/login.pt
+    :language: html
+    :linenos:
+
+#. Provide a login/logout box in ``authentication/tutorial/home.pt``
+
+   .. literalinclude:: authentication/tutorial/home.pt
+    :language: html
+    :linenos:
+
+#. Run your Pyramid application with:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/pserve development.ini --reload
+
+#. Open http://localhost:6543/ in a browser.
+
+#. Click the "Log In" link.
+
+#. Submit the login form with the username ``editor`` and the password 
+   ``editor``.
+
+#. Note that the "Log In" link has changed to "Logout".
+
+#. Click the "Logout" link.
+
+Analysis
+========
+
+Unlike many web frameworks, Pyramid includes a built-in (but optional)
+security model for authentication and authorization. This security
+system is intended to be flexible and support many needs. In this
+security model, authentication (who are you) and authorization (what
+are you allowed to do) are not just pluggable, but de-coupled. To learn
+one step at a time, we provide a system that identifies users and lets
+them log out.
+
+In this example we chose to use the bundled
+:ref:`AuthTktAuthenticationPolicy <authentication_module>`
+policy. We enabled it in our configuration and provided a
+ticket-signing secret in our INI file.
+
+Our view class grew a login view. When you reached it via a GET,
+it returned a login form. When reached via POST, it processed the
+username and password against the "groupfinder" callable that we
+registered in the configuration.
+
+In our template, we fetched the ``logged_in`` value from the view
+class. We use this to calculate the logged-in user,
+if any. In the template we can then choose to show a login link to
+anonymous visitors or a logout link to logged-in users.
+
+Extra Credit
+============
+
+#. What is the difference between a user and a principal?
+
+#. Can I use a database behind my ``groupfinder`` to look up principals?
+
+#. Do I have to put a ``renderer`` in my ``@forbidden_view_config``
+   decorator?
+
+#. Once I am logged in, does any user-centric information get jammed
+   onto each request? Use ``import pdb; pdb.set_trace()`` to answer
+   this.
+
+.. seealso:: :ref:`security_chapter`,
+   :ref:`AuthTktAuthenticationPolicy <authentication_module>`
diff --git a/docs/quick_tutorial/authentication/development.ini b/docs/quick_tutorial/authentication/development.ini
new file mode 100644
index 000000000..5d4580ff5
--- /dev/null
+++ b/docs/quick_tutorial/authentication/development.ini
@@ -0,0 +1,42 @@
+[app:main]
+use = egg:tutorial
+pyramid.reload_templates = true
+pyramid.includes =
+    pyramid_debugtoolbar
+tutorial.secret = 98zd
+
+[server:main]
+use = egg:pyramid#wsgiref
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, tutorial
+
+[logger_tutorial]
+level = DEBUG
+handlers =
+qualname = tutorial
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
diff --git a/docs/quick_tutorial/authentication/setup.py b/docs/quick_tutorial/authentication/setup.py
new file mode 100644
index 000000000..2221b72e9
--- /dev/null
+++ b/docs/quick_tutorial/authentication/setup.py
@@ -0,0 +1,14 @@
+from setuptools import setup
+
+requires = [
+    'pyramid',
+    'pyramid_chameleon'
+]
+
+setup(name='tutorial',
+      install_requires=requires,
+      entry_points="""\
+      [paste.app_factory]
+      main = tutorial:main
+      """,
+)
\ No newline at end of file
diff --git a/docs/quick_tutorial/authentication/tutorial/__init__.py b/docs/quick_tutorial/authentication/tutorial/__init__.py
new file mode 100644
index 000000000..efc09e760
--- /dev/null
+++ b/docs/quick_tutorial/authentication/tutorial/__init__.py
@@ -0,0 +1,25 @@
+from pyramid.authentication import AuthTktAuthenticationPolicy
+from pyramid.authorization import ACLAuthorizationPolicy
+from pyramid.config import Configurator
+
+from .security import groupfinder
+
+
+def main(global_config, **settings):
+    config = Configurator(settings=settings)
+    config.include('pyramid_chameleon')
+
+    # Security policies
+    authn_policy = AuthTktAuthenticationPolicy(
+        settings['tutorial.secret'], callback=groupfinder,
+        hashalg='sha512')
+    authz_policy = ACLAuthorizationPolicy()
+    config.set_authentication_policy(authn_policy)
+    config.set_authorization_policy(authz_policy)
+
+    config.add_route('home', '/')
+    config.add_route('hello', '/howdy')
+    config.add_route('login', '/login')
+    config.add_route('logout', '/logout')
+    config.scan('.views')
+    return config.make_wsgi_app()
\ No newline at end of file
diff --git a/docs/quick_tutorial/authentication/tutorial/home.pt b/docs/quick_tutorial/authentication/tutorial/home.pt
new file mode 100644
index 000000000..6ecd0081b
--- /dev/null
+++ b/docs/quick_tutorial/authentication/tutorial/home.pt
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Quick Tour: ${name}</title>
+</head>
+<body>
+
+<div>
+    <a tal:condition="view.logged_in is None"
+            href="${request.application_url}/login">Log In</a>
+    <a tal:condition="view.logged_in is not None"
+            href="${request.application_url}/logout">Logout</a>
+</div>
+
+<h1>Hi ${name}</h1>
+<p>Visit <a href="${request.route_url('hello')}">hello</a></p>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/quick_tutorial/authentication/tutorial/login.pt b/docs/quick_tutorial/authentication/tutorial/login.pt
new file mode 100644
index 000000000..4451fc4f8
--- /dev/null
+++ b/docs/quick_tutorial/authentication/tutorial/login.pt
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Quick Tour: ${name}</title>
+</head>
+<body>
+<h1>Login</h1>
+<span tal:replace="message"/>
+
+<form action="${url}" method="post">
+    <input type="hidden" name="came_from"
+           value="${came_from}"/>
+    <label for="login">Username</label>
+    <input type="text" id="login"
+           name="login"
+           value="${login}"/><br/>
+    <label for="password">Password</label>
+    <input type="password" id="password"
+           name="password"
+           value="${password}"/><br/>
+    <input type="submit" name="form.submitted"
+           value="Log In"/>
+</form>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/quick_tutorial/authentication/tutorial/security.py b/docs/quick_tutorial/authentication/tutorial/security.py
new file mode 100644
index 000000000..ab90bab2c
--- /dev/null
+++ b/docs/quick_tutorial/authentication/tutorial/security.py
@@ -0,0 +1,8 @@
+USERS = {'editor': 'editor',
+         'viewer': 'viewer'}
+GROUPS = {'editor': ['group:editors']}
+
+
+def groupfinder(userid, request):
+    if userid in USERS:
+        return GROUPS.get(userid, [])
\ No newline at end of file
diff --git a/docs/quick_tutorial/authentication/tutorial/views.py b/docs/quick_tutorial/authentication/tutorial/views.py
new file mode 100644
index 000000000..3038b6d9b
--- /dev/null
+++ b/docs/quick_tutorial/authentication/tutorial/views.py
@@ -0,0 +1,64 @@
+from pyramid.httpexceptions import HTTPFound
+from pyramid.security import (
+    remember,
+    forget,
+    authenticated_userid
+    )
+from pyramid.view import (
+    view_config,
+    view_defaults
+    )
+
+from .security import USERS
+
+
+@view_defaults(renderer='home.pt')
+class TutorialViews:
+    def __init__(self, request):
+        self.request = request
+        self.logged_in = authenticated_userid(request)
+
+    @view_config(route_name='home')
+    def home(self):
+        return {'name': 'Home View'}
+
+    @view_config(route_name='hello')
+    def hello(self):
+        return {'name': 'Hello View'}
+
+    @view_config(route_name='login', renderer='login.pt')
+    def login(self):
+        request = self.request
+        login_url = request.route_url('login')
+        referrer = request.url
+        if referrer == login_url:
+            referrer = '/'  # never use login form itself as came_from
+        came_from = request.params.get('came_from', referrer)
+        message = ''
+        login = ''
+        password = ''
+        if 'form.submitted' in request.params:
+            login = request.params['login']
+            password = request.params['password']
+            if USERS.get(login) == password:
+                headers = remember(request, login)
+                return HTTPFound(location=came_from,
+                                 headers=headers)
+            message = 'Failed login'
+
+        return dict(
+            name='Login',
+            message=message,
+            url=request.application_url + '/login',
+            came_from=came_from,
+            login=login,
+            password=password,
+        )
+
+    @view_config(route_name='logout')
+    def logout(self):
+        request = self.request
+        headers = forget(request)
+        url = request.route_url('home')
+        return HTTPFound(location=url,
+                         headers=headers)
diff --git a/docs/quick_tutorial/authorization.rst b/docs/quick_tutorial/authorization.rst
new file mode 100644
index 000000000..6b10d3409
--- /dev/null
+++ b/docs/quick_tutorial/authorization.rst
@@ -0,0 +1,112 @@
+===========================================
+21: Protecting Resources With Authorization
+===========================================
+
+Assign security statements to resources describing the permissions
+required to perform an operation.
+
+Background
+==========
+
+Our application has URLs that allow people to add/edit/delete content
+via a web browser. Time to add security to the application. Let's
+protect our add/edit views to require a login (username of
+``editor`` and password of ``editor``.) We will allow the other views
+to continue working without a password.
+
+Objectives
+==========
+
+- Introduce the Pyramid concepts of authentication, authorization,
+  permissions, and access control lists (ACLs)
+
+- Make a :term:`root factory` that returns an instance of our
+  class for the top of the application
+
+- Assign security statements to our root resource
+
+- Add a permissions predicate on a view
+
+- Provide a :term:`Forbidden view` to handle visiting a URL without
+  adequate permissions
+
+Steps
+=====
+
+#. We are going to use the authentication step as our starting point:
+
+   .. code-block:: bash
+
+    $ cd ..; cp -r authentication authorization; cd authorization
+    $ $VENV/bin/python setup.py develop
+
+#. Start by changing ``authorization/tutorial/__init__.py`` to
+   specify a root factory to the :term:`configurator`:
+
+   .. literalinclude:: authorization/tutorial/__init__.py
+    :linenos:
+
+#. That means we need to implement
+   ``authorization/tutorial/resources.py``
+
+   .. literalinclude:: authorization/tutorial/resources.py
+    :linenos:
+
+#. Change ``authorization/tutorial/views.py`` to require the ``edit``
+   permission on the ``hello`` view and implement the forbidden view:
+
+   .. literalinclude:: authorization/tutorial/views.py
+    :linenos:
+
+#. Run your Pyramid application with:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/pserve development.ini --reload
+
+#. Open http://localhost:6543/ in a browser.
+
+#. If you are still logged in, click the "Log Out" link.
+
+#. Visit http://localhost:6543/howdy in a browser. You should be
+   asked to login.
+
+Analysis
+========
+
+This simple tutorial step can be boiled down to the following:
+
+- A view can require a *permission* (``edit``)
+
+- The context for our view (the ``Root``) has an access control list
+  (ACL)
+
+- This ACL says that the ``edit`` permission is available on ``Root``
+  to the ``group:editors`` *principal*
+
+- The registered ``groupfinder`` answers whether a particular user
+  (``editor``) has a particular group (``group:editors``)
+
+In summary: ``hello`` wants ``edit`` permission, ``Root`` says
+``group:editors`` has ``edit`` permission.
+
+Of course, this only applies on ``Root``. Some other part of the site
+(a.k.a. *context*) might have a different ACL.
+
+If you are not logged in and visit ``/hello``, you need to get
+shown the login screen. How does Pyramid know what is the login page to
+use? We explicitly told Pyramid that the ``login`` view should be used
+by decorating the view with ``@forbidden_view_config``.
+
+Extra Credit
+============
+
+#. Perhaps you would like experience of not having enough permissions
+   (forbidden) to be richer. How could you change this?
+
+#. Perhaps we want to store security statements in a database and
+   allow editing via a browser. How might this be done?
+
+#. What if we want different security statements on different kinds of
+   objects? Or on the same kinds of objects, but in different parts of a
+   URL hierarchy?
diff --git a/docs/quick_tutorial/authorization/development.ini b/docs/quick_tutorial/authorization/development.ini
new file mode 100644
index 000000000..5d4580ff5
--- /dev/null
+++ b/docs/quick_tutorial/authorization/development.ini
@@ -0,0 +1,42 @@
+[app:main]
+use = egg:tutorial
+pyramid.reload_templates = true
+pyramid.includes =
+    pyramid_debugtoolbar
+tutorial.secret = 98zd
+
+[server:main]
+use = egg:pyramid#wsgiref
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, tutorial
+
+[logger_tutorial]
+level = DEBUG
+handlers =
+qualname = tutorial
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
diff --git a/docs/quick_tutorial/authorization/setup.py b/docs/quick_tutorial/authorization/setup.py
new file mode 100644
index 000000000..2221b72e9
--- /dev/null
+++ b/docs/quick_tutorial/authorization/setup.py
@@ -0,0 +1,14 @@
+from setuptools import setup
+
+requires = [
+    'pyramid',
+    'pyramid_chameleon'
+]
+
+setup(name='tutorial',
+      install_requires=requires,
+      entry_points="""\
+      [paste.app_factory]
+      main = tutorial:main
+      """,
+)
\ No newline at end of file
diff --git a/docs/quick_tutorial/authorization/tutorial/__init__.py b/docs/quick_tutorial/authorization/tutorial/__init__.py
new file mode 100644
index 000000000..8f7ab8277
--- /dev/null
+++ b/docs/quick_tutorial/authorization/tutorial/__init__.py
@@ -0,0 +1,26 @@
+from pyramid.authentication import AuthTktAuthenticationPolicy
+from pyramid.authorization import ACLAuthorizationPolicy
+from pyramid.config import Configurator
+
+from .security import groupfinder
+
+
+def main(global_config, **settings):
+    config = Configurator(settings=settings,
+                          root_factory='.resources.Root')
+    config.include('pyramid_chameleon')
+
+    # Security policies
+    authn_policy = AuthTktAuthenticationPolicy(
+        settings['tutorial.secret'], callback=groupfinder,
+        hashalg='sha512')
+    authz_policy = ACLAuthorizationPolicy()
+    config.set_authentication_policy(authn_policy)
+    config.set_authorization_policy(authz_policy)
+
+    config.add_route('home', '/')
+    config.add_route('hello', '/howdy')
+    config.add_route('login', '/login')
+    config.add_route('logout', '/logout')
+    config.scan('.views')
+    return config.make_wsgi_app()
\ No newline at end of file
diff --git a/docs/quick_tutorial/authorization/tutorial/home.pt b/docs/quick_tutorial/authorization/tutorial/home.pt
new file mode 100644
index 000000000..6ecd0081b
--- /dev/null
+++ b/docs/quick_tutorial/authorization/tutorial/home.pt
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Quick Tour: ${name}</title>
+</head>
+<body>
+
+<div>
+    <a tal:condition="view.logged_in is None"
+            href="${request.application_url}/login">Log In</a>
+    <a tal:condition="view.logged_in is not None"
+            href="${request.application_url}/logout">Logout</a>
+</div>
+
+<h1>Hi ${name}</h1>
+<p>Visit <a href="${request.route_url('hello')}">hello</a></p>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/quick_tutorial/authorization/tutorial/login.pt b/docs/quick_tutorial/authorization/tutorial/login.pt
new file mode 100644
index 000000000..4451fc4f8
--- /dev/null
+++ b/docs/quick_tutorial/authorization/tutorial/login.pt
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Quick Tour: ${name}</title>
+</head>
+<body>
+<h1>Login</h1>
+<span tal:replace="message"/>
+
+<form action="${url}" method="post">
+    <input type="hidden" name="came_from"
+           value="${came_from}"/>
+    <label for="login">Username</label>
+    <input type="text" id="login"
+           name="login"
+           value="${login}"/><br/>
+    <label for="password">Password</label>
+    <input type="password" id="password"
+           name="password"
+           value="${password}"/><br/>
+    <input type="submit" name="form.submitted"
+           value="Log In"/>
+</form>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/quick_tutorial/authorization/tutorial/resources.py b/docs/quick_tutorial/authorization/tutorial/resources.py
new file mode 100644
index 000000000..0cb656f12
--- /dev/null
+++ b/docs/quick_tutorial/authorization/tutorial/resources.py
@@ -0,0 +1,9 @@
+from pyramid.security import Allow, Everyone
+
+
+class Root(object):
+    __acl__ = [(Allow, Everyone, 'view'),
+               (Allow, 'group:editors', 'edit')]
+
+    def __init__(self, request):
+        pass
\ No newline at end of file
diff --git a/docs/quick_tutorial/authorization/tutorial/security.py b/docs/quick_tutorial/authorization/tutorial/security.py
new file mode 100644
index 000000000..ab90bab2c
--- /dev/null
+++ b/docs/quick_tutorial/authorization/tutorial/security.py
@@ -0,0 +1,8 @@
+USERS = {'editor': 'editor',
+         'viewer': 'viewer'}
+GROUPS = {'editor': ['group:editors']}
+
+
+def groupfinder(userid, request):
+    if userid in USERS:
+        return GROUPS.get(userid, [])
\ No newline at end of file
diff --git a/docs/quick_tutorial/authorization/tutorial/views.py b/docs/quick_tutorial/authorization/tutorial/views.py
new file mode 100644
index 000000000..92c1946ba
--- /dev/null
+++ b/docs/quick_tutorial/authorization/tutorial/views.py
@@ -0,0 +1,66 @@
+from pyramid.httpexceptions import HTTPFound
+from pyramid.security import (
+    remember,
+    forget,
+    authenticated_userid
+    )
+from pyramid.view import (
+    view_config,
+    view_defaults,
+    forbidden_view_config
+    )
+
+from .security import USERS
+
+
+@view_defaults(renderer='home.pt')
+class TutorialViews:
+    def __init__(self, request):
+        self.request = request
+        self.logged_in = authenticated_userid(request)
+
+    @view_config(route_name='home')
+    def home(self):
+        return {'name': 'Home View'}
+
+    @view_config(route_name='hello', permission='edit')
+    def hello(self):
+        return {'name': 'Hello View'}
+
+    @view_config(route_name='login', renderer='login.pt')
+    @forbidden_view_config(renderer='login.pt')
+    def login(self):
+        request = self.request
+        login_url = request.route_url('login')
+        referrer = request.url
+        if referrer == login_url:
+            referrer = '/'  # never use login form itself as came_from
+        came_from = request.params.get('came_from', referrer)
+        message = ''
+        login = ''
+        password = ''
+        if 'form.submitted' in request.params:
+            login = request.params['login']
+            password = request.params['password']
+            if USERS.get(login) == password:
+                headers = remember(request, login)
+                return HTTPFound(location=came_from,
+                                 headers=headers)
+            message = 'Failed login'
+
+        return dict(
+            name='Login',
+            message=message,
+            url=request.application_url + '/login',
+            came_from=came_from,
+            login=login,
+            password=password,
+        )
+
+    @view_config(route_name='logout')
+    def logout(self):
+        request = self.request
+        headers = forget(request)
+        url = request.route_url('home')
+        return HTTPFound(location=url,
+                         headers=headers)
diff --git a/docs/quick_tutorial/conf.py b/docs/quick_tutorial/conf.py
new file mode 100644
index 000000000..47b8fae41
--- /dev/null
+++ b/docs/quick_tutorial/conf.py
@@ -0,0 +1,281 @@
+# -*- coding: utf-8 -*-
+#
+# Getting Started with Pyramid and REST documentation build configuration file, created by
+# sphinx-quickstart on Mon Aug 26 14:44:57 2013.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys, os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
+
+# -- General configuration -----------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = ['sphinx.ext.intersphinx']
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'Getting Started with Pyramid and REST'
+copyright = u'2013, Agendaless Consulting'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '1.0'
+# The full version, including alpha/beta/rc tags.
+release = '1.0'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ['_build']
+
+# The reST default role (used for this markup: `text`) to use for all documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+#keep_warnings = False
+
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+html_theme = 'default'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'GettingStartedwithPyramidandRESTdoc'
+
+
+# -- Options for LaTeX output --------------------------------------------------
+
+latex_elements = {
+    # The paper size ('letterpaper' or 'a4paper').
+    #'papersize': 'letterpaper',
+
+    # The font size ('10pt', '11pt' or '12pt').
+    #'pointsize': '10pt',
+
+    # Additional stuff for the LaTeX preamble.
+    #'preamble': '',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+    ('index', 'GettingStartedwithPyramidandREST.tex',
+     u'Getting Started with Pyramid and REST Documentation',
+     u'Agendaless Consulting', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output --------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    ('index', 'gettingstartedwithpyramidandrest',
+     u'Getting Started with Pyramid and REST Documentation',
+     [u'Agendaless Consulting'], 1)
+]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+
+# -- Options for Texinfo output ------------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    ('index', 'GettingStartedwithPyramidandREST',
+     u'Getting Started with Pyramid and REST Documentation',
+     u'Agendaless Consulting', 'GettingStartedwithPyramidandREST',
+     'One line description of project.',
+     'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
+
+# If true, do not generate a @detailmenu in the "Top" node's menu.
+#texinfo_no_detailmenu = False
+
+
+# Example configuration for intersphinx: refer to the Python standard library.
+intersphinx_mapping = {
+    'python': (
+        'http://docs.python.org/2',
+        None),
+    'sqla': (
+        'http://docs.sqlalchemy.org/en/latest',
+        None),
+    'pyramid': (
+        'http://docs.pylonsproject.org/projects/pyramid/en/latest/',
+        None),
+    'jinja2': (
+        'http://docs.pylonsproject.org/projects/pyramid_jinja2/en/latest/',
+        None),
+    'toolbar': (
+        'http://docs.pylonsproject.org/projects/pyramid_debugtoolbar/en/latest',
+        None),
+    'deform': (
+        'http://docs.pylonsproject.org/projects/deform/en/latest',
+        None),
+    'colander': (
+        'http://docs.pylonsproject.org/projects/colander/en/latest',
+        None),
+    'tutorials': (
+        'http://docs.pylonsproject.org/projects/pyramid_tutorials/en/latest/',
+        None),
+}
diff --git a/docs/quick_tutorial/databases.rst b/docs/quick_tutorial/databases.rst
new file mode 100644
index 000000000..93a02ffc7
--- /dev/null
+++ b/docs/quick_tutorial/databases.rst
@@ -0,0 +1,195 @@
+.. _qtut_databases:
+
+==============================
+19: Databases Using SQLAlchemy
+==============================
+
+Store/retrieve data using the SQLAlchemy ORM atop the SQLite database.
+
+Background
+==========
+
+Our Pyramid-based wiki application now needs database-backed storage of
+pages. This frequently means a SQL database. The Pyramid community
+strongly supports the
+:ref:`SQLAlchemy <sqla:index_toplevel>` project and its
+:ref:`object-relational mapper (ORM) <sqla:ormtutorial_toplevel>`
+as a convenient, Pythonic way to interface to databases.
+
+In this step we hook up SQLAlchemy to a SQLite database table,
+providing storage and retrieval for the wikipages in the previous step.
+
+.. note::
+
+    The ``alchemy`` scaffold is really helpful for getting a
+    SQLAlchemy project going, including generation of the console
+    script. Since we want to see all the decisions, we will forgo
+    convenience in this tutorial and wire it up ourselves.
+
+Objectives
+==========
+
+- Store pages in SQLite by using SQLAlchemy models
+
+- Use SQLAlchemy queries to list/add/view/edit pages
+
+- Provide a database-initialize command by writing a Pyramid *console
+  script* which can be run from the command line
+
+Steps
+=====
+
+.. warning::
+
+  Your Python might not have SQLite bundled. If not, install it into
+  your virtual environment with:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/easy_install sphinx pysqlite
+
+#. We are going to use the forms step as our starting point:
+
+   .. code-block:: bash
+
+    $ cd ..; cp -r forms databases; cd databases
+
+#. We need to add some dependencies in ``databases/setup.py`` as well
+   as an "entry point" for the command-line script:
+
+   .. literalinclude:: databases/setup.py
+    :linenos:
+
+   .. note::
+
+     We aren't yet doing ``python3.3 setup.py develop`` as we
+     are changing it later.
+
+#. Our configuration file at ``databases/development.ini`` wires
+   together some new pieces:
+
+   .. literalinclude:: databases/development.ini
+    :language: ini
+
+#. This engine configuration now needs to be read into the application
+   through changes in ``databases/tutorial/__init__.py``:
+
+   .. literalinclude:: databases/tutorial/__init__.py
+    :linenos:
+
+#. Make a command-line script at ``databases/tutorial/initialize_db.py``
+   to initialize the database:
+
+   .. literalinclude:: databases/tutorial/initialize_db.py
+
+#. Since ``setup.py`` changed, we now run it:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/python setup.py develop
+
+#. The script references some models in ``databases/tutorial/models.py``:
+
+   .. literalinclude:: databases/tutorial/models.py
+    :linenos:
+
+#. Let's run this console script, thus producing our database and table:
+
+   .. code-block:: bash
+
+    $ initialize_tutorial_db development.ini
+    2013-09-06 15:54:08,050 INFO  [sqlalchemy.engine.base.Engine][MainThread] PRAGMA table_info("wikipages")
+    2013-09-06 15:54:08,050 INFO  [sqlalchemy.engine.base.Engine][MainThread] ()
+    2013-09-06 15:54:08,051 INFO  [sqlalchemy.engine.base.Engine][MainThread]
+    CREATE TABLE wikipages (
+            uid INTEGER NOT NULL,
+            title TEXT,
+            body TEXT,
+            PRIMARY KEY (uid),
+            UNIQUE (title)
+    )
+
+#. With our data now driven by SQLAlchemy queries, we need to update
+   our ``databases/tutorial/views.py``:
+
+   .. literalinclude:: databases/tutorial/views.py
+
+#. Our tests in ``databases/tutorial/tests.py`` changed to include
+   SQLAlchemy bootstrapping:
+
+   .. literalinclude:: databases/tutorial/tests.py
+    :linenos:
+
+#. Run the tests in your package using ``nose``:
+
+    .. code-block:: bash
+
+        $ $VENV/bin/nosetests .
+        ..
+        -----------------------------------------------------------------
+        Ran 2 tests in 1.141s
+
+        OK
+
+#. Run your Pyramid application with:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/pserve development.ini --reload
+
+#. Open http://localhost:6543/ in a browser.
+
+Analysis
+========
+
+Let's start with the dependencies. We made the decision to use
+``SQLAlchemy`` to talk to our database. We also, though, installed
+``pyramid_tm`` and ``zope.sqlalchemy``. Why?
+
+Pyramid has a strong orientation towards support for ``transactions``.
+Specifically, you can install a transaction manager into your app
+application, either as middleware or a Pyramid "tween". Then,
+just before you return the response, all transaction-aware parts of
+your application are executed.
+
+This means Pyramid view code usually doesn't manage transactions. If
+your view code or a template generates an error, the transaction manager
+aborts the transaction. This is a very liberating way to write code.
+
+The ``pyramid_tm`` package provides a "tween" that is configured in the
+``development.ini`` configuration file. That installs it. We then need
+a package that makes SQLAlchemy and thus the RDBMS transaction manager
+integrate with the Pyramid transaction manager. That's what
+``zope.sqlalchemy`` does.
+
+Where do we point at the location on disk for the SQLite file? In the
+configuration file. This lets consumers of our package change the
+location in a safe (non-code) way. That is, in configuration. This
+configuration-oriented approach isn't required in Pyramid; you can
+still make such statements in your ``__init__.py`` or some companion
+module.
+
+The ``initialize_tutorial_db`` is a nice example of framework support.
+You point your setup at the location of some ``[console_scripts]`` and
+these get generated into your virtualenv's ``bin`` directory. Our
+console script follows the pattern of being fed a configuration file
+with all the bootstrapping. It then opens SQLAlchemy and creates the
+root of the wiki, which also makes the SQLite file. Note the
+``with transaction.manager`` part that puts the work in the scope of a
+transaction (as we aren't inside a web request where this is done
+automatically.)
+
+The ``models.py`` does a little bit extra work to hook up SQLAlchemy
+into the Pyramid transaction manager. It then declares the model for a
+``Page``.
+
+Our views have changes primarily around replacing our dummy
+dictionary-of-dictionaries data with proper database support: list the
+rows, add a row, edit a row, and delete a row.
+
+Extra Credit
+============
+
+#. Why all this code? Why can't I just type 2 lines and have magic ensue?
+
+#. Give a try at a button that deletes a wiki page.
diff --git a/docs/quick_tutorial/databases/development.ini b/docs/quick_tutorial/databases/development.ini
new file mode 100644
index 000000000..270da960f
--- /dev/null
+++ b/docs/quick_tutorial/databases/development.ini
@@ -0,0 +1,49 @@
+[app:main]
+use = egg:tutorial
+pyramid.reload_templates = true
+pyramid.includes =
+    pyramid_debugtoolbar
+    pyramid_tm
+
+sqlalchemy.url = sqlite:///%(here)s/sqltutorial.sqlite
+
+[server:main]
+use = egg:pyramid#wsgiref
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, tutorial, sqlalchemy
+
+[logger_tutorial]
+level = DEBUG
+handlers =
+qualname = tutorial
+
+[logger_sqlalchemy]
+level = INFO
+handlers =
+qualname = sqlalchemy.engine
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
diff --git a/docs/quick_tutorial/databases/setup.py b/docs/quick_tutorial/databases/setup.py
new file mode 100644
index 000000000..238358fe4
--- /dev/null
+++ b/docs/quick_tutorial/databases/setup.py
@@ -0,0 +1,20 @@
+from setuptools import setup
+
+requires = [
+    'pyramid',
+    'pyramid_chameleon',
+    'deform',
+    'sqlalchemy',
+    'pyramid_tm',
+    'zope.sqlalchemy'
+]
+
+setup(name='tutorial',
+      install_requires=requires,
+      entry_points="""\
+      [paste.app_factory]
+      main = tutorial:main
+      [console_scripts]
+      initialize_tutorial_db = tutorial.initialize_db:main
+      """,
+)
\ No newline at end of file
diff --git a/docs/quick_tutorial/databases/sqltutorial.sqlite b/docs/quick_tutorial/databases/sqltutorial.sqlite
new file mode 100644
index 000000000..b8bd856fd
--- /dev/null
+++ b/docs/quick_tutorial/databases/sqltutorial.sqlite
diff --git a/docs/quick_tutorial/databases/tutorial/__init__.py b/docs/quick_tutorial/databases/tutorial/__init__.py
new file mode 100644
index 000000000..74aa25740
--- /dev/null
+++ b/docs/quick_tutorial/databases/tutorial/__init__.py
@@ -0,0 +1,21 @@
+from pyramid.config import Configurator
+
+from sqlalchemy import engine_from_config
+
+from .models import DBSession, Base
+
+def main(global_config, **settings):
+    engine = engine_from_config(settings, 'sqlalchemy.')
+    DBSession.configure(bind=engine)
+    Base.metadata.bind = engine
+
+    config = Configurator(settings=settings,
+                          root_factory='tutorial.models.Root')
+    config.include('pyramid_chameleon')
+    config.add_route('wiki_view', '/')
+    config.add_route('wikipage_add', '/add')
+    config.add_route('wikipage_view', '/{uid}')
+    config.add_route('wikipage_edit', '/{uid}/edit')
+    config.add_static_view('deform_static', 'deform:static/')
+    config.scan('.views')
+    return config.make_wsgi_app()
\ No newline at end of file
diff --git a/docs/quick_tutorial/databases/tutorial/initialize_db.py b/docs/quick_tutorial/databases/tutorial/initialize_db.py
new file mode 100644
index 000000000..98be524a1
--- /dev/null
+++ b/docs/quick_tutorial/databases/tutorial/initialize_db.py
@@ -0,0 +1,37 @@
+import os
+import sys
+import transaction
+
+from sqlalchemy import engine_from_config
+
+from pyramid.paster import (
+    get_appsettings,
+    setup_logging,
+    )
+
+from .models import (
+    DBSession,
+    Page,
+    Base,
+    )
+
+
+def usage(argv):
+    cmd = os.path.basename(argv[0])
+    print('usage: %s <config_uri>\n'
+          '(example: "%s development.ini")' % (cmd, cmd))
+    sys.exit(1)
+
+
+def main(argv=sys.argv):
+    if len(argv) != 2:
+        usage(argv)
+    config_uri = argv[1]
+    setup_logging(config_uri)
+    settings = get_appsettings(config_uri)
+    engine = engine_from_config(settings, 'sqlalchemy.')
+    DBSession.configure(bind=engine)
+    Base.metadata.create_all(engine)
+    with transaction.manager:
+        model = Page(title='Root', body='<p>Root</p>')
+        DBSession.add(model)
diff --git a/docs/quick_tutorial/databases/tutorial/models.py b/docs/quick_tutorial/databases/tutorial/models.py
new file mode 100644
index 000000000..b27c38417
--- /dev/null
+++ b/docs/quick_tutorial/databases/tutorial/models.py
@@ -0,0 +1,35 @@
+from pyramid.security import Allow, Everyone
+
+from sqlalchemy import (
+    Column,
+    Integer,
+    Text,
+    )
+
+from sqlalchemy.ext.declarative import declarative_base
+
+from sqlalchemy.orm import (
+    scoped_session,
+    sessionmaker,
+    )
+
+from zope.sqlalchemy import ZopeTransactionExtension
+
+DBSession = scoped_session(
+    sessionmaker(extension=ZopeTransactionExtension()))
+Base = declarative_base()
+
+
+class Page(Base):
+    __tablename__ = 'wikipages'
+    uid = Column(Integer, primary_key=True)
+    title = Column(Text, unique=True)
+    body = Column(Text)
+
+
+class Root(object):
+    __acl__ = [(Allow, Everyone, 'view'),
+               (Allow, 'group:editors', 'edit')]
+
+    def __init__(self, request):
+        pass
\ No newline at end of file
diff --git a/docs/quick_tutorial/databases/tutorial/tests.py b/docs/quick_tutorial/databases/tutorial/tests.py
new file mode 100644
index 000000000..e18e70c8c
--- /dev/null
+++ b/docs/quick_tutorial/databases/tutorial/tests.py
@@ -0,0 +1,58 @@
+import unittest
+import transaction
+
+from pyramid import testing
+
+
+def _initTestingDB():
+    from sqlalchemy import create_engine
+    from .models import (
+        DBSession,
+        Page,
+        Base
+        )
+    engine = create_engine('sqlite://')
+    Base.metadata.create_all(engine)
+    DBSession.configure(bind=engine)
+    with transaction.manager:
+        model = Page(title='FrontPage', body='This is the front page')
+        DBSession.add(model)
+    return DBSession
+
+
+class WikiViewTests(unittest.TestCase):
+    def setUp(self):
+        self.session = _initTestingDB()
+        self.config = testing.setUp()
+
+    def tearDown(self):
+        self.session.remove()
+        testing.tearDown()
+
+    def test_wiki_view(self):
+        from tutorial.views import WikiViews
+
+        request = testing.DummyRequest()
+        inst = WikiViews(request)
+        response = inst.wiki_view()
+        self.assertEqual(response['title'], 'Wiki View')
+
+
+class WikiFunctionalTests(unittest.TestCase):
+    def setUp(self):
+        self.session = _initTestingDB()
+        self.config = testing.setUp()
+        from pyramid.paster import get_app
+        app = get_app('development.ini')
+        from webtest import TestApp
+        self.testapp = TestApp(app)
+
+    def tearDown(self):
+        self.session.remove()
+        testing.tearDown()
+
+    def test_it(self):
+        res = self.testapp.get('/', status=200)
+        self.assertIn(b'Wiki: View', res.body)
+        res = self.testapp.get('/add', status=200)
+        self.assertIn(b'Add/Edit', res.body)
diff --git a/docs/quick_tutorial/databases/tutorial/views.py b/docs/quick_tutorial/databases/tutorial/views.py
new file mode 100644
index 000000000..4608c6d43
--- /dev/null
+++ b/docs/quick_tutorial/databases/tutorial/views.py
@@ -0,0 +1,96 @@
+import colander
+import deform.widget
+
+from pyramid.httpexceptions import HTTPFound
+from pyramid.view import view_config
+
+from .models import DBSession, Page
+
+
+class WikiPage(colander.MappingSchema):
+    title = colander.SchemaNode(colander.String())
+    body = colander.SchemaNode(
+        colander.String(),
+        widget=deform.widget.RichTextWidget()
+    )
+
+
+class WikiViews(object):
+    def __init__(self, request):
+        self.request = request
+
+    @property
+    def wiki_form(self):
+        schema = WikiPage()
+        return deform.Form(schema, buttons=('submit',))
+
+    @property
+    def reqts(self):
+        return self.wiki_form.get_widget_resources()
+
+    @view_config(route_name='wiki_view', renderer='wiki_view.pt')
+    def wiki_view(self):
+        pages = DBSession.query(Page).order_by(Page.title)
+        return dict(title='Wiki View', pages=pages)
+
+    @view_config(route_name='wikipage_add',
+                 renderer='wikipage_addedit.pt')
+    def wikipage_add(self):
+        form = self.wiki_form.render()
+
+        if 'submit' in self.request.params:
+            controls = self.request.POST.items()
+            try:
+                appstruct = self.wiki_form.validate(controls)
+            except deform.ValidationFailure as e:
+                # Form is NOT valid
+                return dict(form=e.render())
+
+            # Add a new page to the database
+            new_title = appstruct['title']
+            new_body = appstruct['body']
+            DBSession.add(Page(title=new_title, body=new_body))
+
+            # Get the new ID and redirect
+            page = DBSession.query(Page).filter_by(title=new_title).one()
+            new_uid = page.uid
+
+            url = self.request.route_url('wikipage_view', uid=new_uid)
+            return HTTPFound(url)
+
+        return dict(form=form)
+
+
+    @view_config(route_name='wikipage_view', renderer='wikipage_view.pt')
+    def wikipage_view(self):
+        uid = int(self.request.matchdict['uid'])
+        page = DBSession.query(Page).filter_by(uid=uid).one()
+        return dict(page=page)
+
+
+    @view_config(route_name='wikipage_edit',
+                 renderer='wikipage_addedit.pt')
+    def wikipage_edit(self):
+        uid = int(self.request.matchdict['uid'])
+        page = DBSession.query(Page).filter_by(uid=uid).one()
+
+        wiki_form = self.wiki_form
+
+        if 'submit' in self.request.params:
+            controls = self.request.POST.items()
+            try:
+                appstruct = wiki_form.validate(controls)
+            except deform.ValidationFailure as e:
+                return dict(page=page, form=e.render())
+
+            # Change the content and redirect to the view
+            page.title = appstruct['title']
+            page.body = appstruct['body']
+            url = self.request.route_url('wikipage_view', uid=uid)
+            return HTTPFound(url)
+
+        form = self.wiki_form.render(dict(
+            uid=page.uid, title=page.title, body=page.body)
+        )
+
+        return dict(page=page, form=form)
diff --git a/docs/quick_tutorial/databases/tutorial/wiki_view.pt b/docs/quick_tutorial/databases/tutorial/wiki_view.pt
new file mode 100644
index 000000000..9e3afe495
--- /dev/null
+++ b/docs/quick_tutorial/databases/tutorial/wiki_view.pt
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Wiki: View</title>
+</head>
+<body>
+<h1>Wiki</h1>
+
+<a href="${request.route_url('wikipage_add')}">Add
+    WikiPage</a>
+<ul>
+    <li tal:repeat="page pages">
+        <a href="${request.route_url('wikipage_view', uid=page.uid)}">
+                ${page.title}
+        </a>
+    </li>
+</ul>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/quick_tutorial/databases/tutorial/wikipage_addedit.pt b/docs/quick_tutorial/databases/tutorial/wikipage_addedit.pt
new file mode 100644
index 000000000..d1fea0d7f
--- /dev/null
+++ b/docs/quick_tutorial/databases/tutorial/wikipage_addedit.pt
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>WikiPage: Add/Edit</title>
+    <tal:block tal:repeat="reqt view.reqts['css']">
+        <link rel="stylesheet" type="text/css"
+              href="${request.static_url('deform:static/' + reqt)}"/>
+    </tal:block>
+    <tal:block tal:repeat="reqt view.reqts['js']">
+        <script src="${request.static_url('deform:static/' + reqt)}"
+                type="text/javascript"></script>
+    </tal:block>
+</head>
+<body>
+<h1>Wiki</h1>
+
+<p>${structure: form}</p>
+<script type="text/javascript">
+    deform.load()
+</script>
+</body>
+</html>
diff --git a/docs/quick_tutorial/databases/tutorial/wikipage_view.pt b/docs/quick_tutorial/databases/tutorial/wikipage_view.pt
new file mode 100644
index 000000000..cb9ff526e
--- /dev/null
+++ b/docs/quick_tutorial/databases/tutorial/wikipage_view.pt
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>WikiPage: View</title>
+</head>
+<body>
+<a href="${request.route_url('wiki_view')}">
+    Up
+</a> |
+<a href="${request.route_url('wikipage_edit', uid=page.uid)}">
+    Edit
+</a>
+
+<h1>${page.title}</h1>
+<p>${structure: page.body}</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/quick_tutorial/debugtoolbar.rst b/docs/quick_tutorial/debugtoolbar.rst
new file mode 100644
index 000000000..d25588c49
--- /dev/null
+++ b/docs/quick_tutorial/debugtoolbar.rst
@@ -0,0 +1,89 @@
+.. _qtut_debugtoolbar:
+
+============================================
+04: Easier Development with ``debugtoolbar``
+============================================
+
+Error-handling and introspection using the ``pyramid_debugtoolbar``
+add-on.
+
+Background
+==========
+
+As we introduce the basics we also want to show how to be productive in
+development and debugging. For example, we just discussed template
+reloading and earlier we showed ``--reload`` for application reloading.
+
+``pyramid_debugtoolbar`` is a popular Pyramid add-on which makes
+several tools available in your browser. Adding it to your project
+illustrates several points about configuration.
+
+Objectives
+==========
+
+- Install and enable the toolbar to help during development
+
+- Explain Pyramid add-ons
+
+- Show how an add-on gets configured into your application
+
+Steps
+=====
+
+#. First we copy the results of the previous step, as well as install
+   the ``pyramid_debugtoolbar`` package:
+
+   .. code-block:: bash
+
+    $ cd ..; cp -r ini debugtoolbar; cd debugtoolbar
+    $ $VENV/bin/python setup.py develop
+    $ $VENV/bin/easy_install pyramid_debugtoolbar
+
+
+#. Our ``debugtoolbar/development.ini`` gets a configuration entry for
+   ``pyramid.includes``:
+
+   .. literalinclude:: debugtoolbar/development.ini
+    :language: ini
+    :linenos:
+
+#. Run the WSGI application with:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/pserve development.ini --reload
+
+#. Open http://localhost:6543/ in your browser. See the handy
+   toolbar on the right.
+
+Analysis
+========
+
+``pyramid_debugtoolbar`` is a full-fledged Python package,
+available on PyPI just like thousands of other Python packages. Thus we
+start by installing the ``pyramid_debugtoolbar`` package into our
+virtual environment using normal Python package installation commands.
+
+The ``pyramid_debugtoolbar`` Python package is also a Pyramid add-on,
+which means we need to include its add-on configuration into our web
+application. We could do this with imperative configuration in
+``tutorial/__init__.py`` by using ``config.include``. Pyramid also
+supports wiring in add-on configuration via our ``development.ini``
+using ``pyramid.includes``. We use this to load the configuration for
+the debugtoolbar.
+
+You'll now see an attractive (and collapsible) menu in the right of
+your browser, providing introspective access to debugging information.
+Even better, if your web application generates an error,
+you will see a nice traceback on the screen. When you want to disable
+this toolbar, no need to change code: you can remove it from
+``pyramid.includes`` in the relevant ``.ini`` configuration file (thus
+showing why configuration files are handy.)
+
+Note that the toolbar mutates the HTML generated by our app and uses jQuery to
+overlay itself.  If you are using the toolbar while you're developing and you
+start to experience otherwise inexplicable client-side weirdness, you can shut
+it off by commenting out the ``pyramid_debugtoolbar`` line in
+``pyramid.includes`` temporarily.
+
+.. seealso:: See Also: :ref:`pyramid_debugtoolbar <toolbar:overview>`
diff --git a/docs/quick_tutorial/debugtoolbar/development.ini b/docs/quick_tutorial/debugtoolbar/development.ini
new file mode 100644
index 000000000..470d92c57
--- /dev/null
+++ b/docs/quick_tutorial/debugtoolbar/development.ini
@@ -0,0 +1,40 @@
+[app:main]
+use = egg:tutorial
+pyramid.includes =
+    pyramid_debugtoolbar
+
+[server:main]
+use = egg:pyramid#wsgiref
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, tutorial
+
+[logger_tutorial]
+level = DEBUG
+handlers =
+qualname = tutorial
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
diff --git a/docs/quick_tutorial/debugtoolbar/setup.py b/docs/quick_tutorial/debugtoolbar/setup.py
new file mode 100644
index 000000000..9997984d3
--- /dev/null
+++ b/docs/quick_tutorial/debugtoolbar/setup.py
@@ -0,0 +1,13 @@
+from setuptools import setup
+
+requires = [
+    'pyramid',
+]
+
+setup(name='tutorial',
+      install_requires=requires,
+      entry_points="""\
+      [paste.app_factory]
+      main = tutorial:main
+      """,
+)
\ No newline at end of file
diff --git a/docs/quick_tutorial/debugtoolbar/tutorial/__init__.py b/docs/quick_tutorial/debugtoolbar/tutorial/__init__.py
new file mode 100644
index 000000000..2b4e84f30
--- /dev/null
+++ b/docs/quick_tutorial/debugtoolbar/tutorial/__init__.py
@@ -0,0 +1,13 @@
+from pyramid.config import Configurator
+from pyramid.response import Response
+
+
+def hello_world(request):
+    return Response('<body><h1>Hello World!</h1></body>')
+
+
+def main(global_config, **settings):
+    config = Configurator(settings=settings)
+    config.add_route('hello', '/')
+    config.add_view(hello_world, route_name='hello')
+    return config.make_wsgi_app()
\ No newline at end of file
diff --git a/docs/quick_tutorial/forms.rst b/docs/quick_tutorial/forms.rst
new file mode 100644
index 000000000..e8bc0c8b4
--- /dev/null
+++ b/docs/quick_tutorial/forms.rst
@@ -0,0 +1,148 @@
+.. _qtut_forms:
+
+====================================
+18: Forms and Validation With Deform
+====================================
+
+Schema-driven, autogenerated forms with validation.
+
+Background
+==========
+
+Modern web applications deal extensively with forms. Developers,
+though, have a wide range of philosophies about how frameworks should
+help them with their forms. As such, Pyramid doesn't directly bundle
+one particular form library. Instead, there are a variety of form
+libraries that are easy to use in Pyramid.
+
+:ref:`Deform <deform:overview>`
+is one such library. In this step, we introduce Deform for our
+forms and validation. This also gives us the
+:ref:`Colander <colander:overview>` for schemas and validation.
+
+Deform is getting a facelift, with styling from Twitter Bootstrap and
+advanced widgets from popular JavaScript projects. The work began in
+``deform_bootstrap`` and is being merged into an update to Deform.
+
+Objectives
+==========
+
+- Make a schema using Colander, the companion to Deform
+
+- Create a form with Deform and change our views to handle validation
+
+Steps
+=====
+
+#. First we copy the results of the ``view_classes`` step:
+
+   .. code-block:: bash
+
+    $ cd ..; cp -r view_classes forms; cd forms
+
+#. Let's edit ``forms/setup.py`` to declare a dependency on Deform
+   (which then pulls in Colander as a dependency:
+
+   .. literalinclude:: forms/setup.py
+    :linenos:
+
+#. We can now install our project in development mode:
+
+   .. code-block:: bash
+
+      $ $VENV/bin/python setup.py develop
+
+#. Register a static view in ``forms/tutorial/__init__.py`` for
+   Deform's CSS/JS etc. as well as our demo wikipage scenario's
+   views:
+
+   .. literalinclude:: forms/tutorial/__init__.py
+    :linenos:
+
+#. Implement the new views, as well as the form schemas and some
+   dummy data, in ``forms/tutorial/views.py``:
+
+   .. literalinclude:: forms/tutorial/views.py
+    :linenos:
+
+#. A template for the top of the "wiki" in
+   ``forms/tutorial/wiki_view.pt``:
+
+   .. literalinclude:: forms/tutorial/wiki_view.pt
+    :language: html
+    :linenos:
+
+#. Another template for adding/editing in
+   ``forms/tutorial/wikipage_addedit.pt``:
+
+   .. literalinclude:: forms/tutorial/wikipage_addedit.pt
+    :language: html
+    :linenos:
+
+#. Finally, a template at ``forms/tutorial/wikipage_view.pt``
+   for viewing a wiki page:
+
+   .. literalinclude:: forms/tutorial/wikipage_view.pt
+    :language: html
+    :linenos:
+
+#. Run your Pyramid application with:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/pserve development.ini --reload
+
+#. Open http://localhost:6543/ in a browser.
+
+
+Analysis
+========
+
+This step helps illustrate the utility of asset specifications for
+static assets. We have an outside package called Deform with static
+assets which need to be published. We don't have to know where on disk
+it is located. We point at the package, then the path inside the package.
+
+We just need to include a call to ``add_static_view`` to make that
+directory available at a URL. For Pyramid-specific pages,
+Pyramid provides a facility (``config.include()``) which even makes
+that unnecessary for consumers of a package. (Deform is not specific to
+Pyramid.)
+
+Our forms have rich widgets which need the static CSS and JS just
+mentioned. Deform has a :term:`resource registry` which allows widgets
+to specify which JS and CSS are needed. Our ``wikipage_addedit.pt``
+template shows how we iterated over that data to generate markup that
+includes the needed resources.
+
+Our add and edit views use a pattern called *self-posting forms*.
+Meaning, the same URL is used to ``GET`` the form as is used to
+``POST`` the form. The route, the view, and the template are the same
+whether you are walking up to it the first time or you clicked a button.
+
+Inside the view we do ``if 'submit' in self.request.params:`` to see if
+this form was a ``POST`` where the user clicked on a particular button
+``<input name="submit">``.
+
+The form controller then follows a typical pattern:
+
+- If you are doing a GET, skip over and just return the form
+
+- If you are doing a POST, validate the form contents
+
+- If the form is invalid, bail out by re-rendering the form with the
+  supplied ``POST`` data
+
+- If the validation succeeded, perform some action and issue a
+  redirect via ``HTTPFound``.
+
+We are, in essence, writing our own form controller. Other
+Pyramid-based systems, including ``pyramid_deform``, provide a
+form-centric view class which automates much of this branching and
+routing.
+
+Extra Credit
+============
+
+#. Give a try at a button that goes to a delete view for a
+   particular wiki page.
diff --git a/docs/quick_tutorial/forms/development.ini b/docs/quick_tutorial/forms/development.ini
new file mode 100644
index 000000000..62e0c5123
--- /dev/null
+++ b/docs/quick_tutorial/forms/development.ini
@@ -0,0 +1,41 @@
+[app:main]
+use = egg:tutorial
+pyramid.reload_templates = true
+pyramid.includes =
+    pyramid_debugtoolbar
+
+[server:main]
+use = egg:pyramid#wsgiref
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, tutorial
+
+[logger_tutorial]
+level = DEBUG
+handlers =
+qualname = tutorial
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
diff --git a/docs/quick_tutorial/forms/setup.py b/docs/quick_tutorial/forms/setup.py
new file mode 100644
index 000000000..361ade013
--- /dev/null
+++ b/docs/quick_tutorial/forms/setup.py
@@ -0,0 +1,15 @@
+from setuptools import setup
+
+requires = [
+    'pyramid',
+    'pyramid_chameleon',
+    'deform'
+]
+
+setup(name='tutorial',
+      install_requires=requires,
+      entry_points="""\
+      [paste.app_factory]
+      main = tutorial:main
+      """,
+)
\ No newline at end of file
diff --git a/docs/quick_tutorial/forms/tutorial/__init__.py b/docs/quick_tutorial/forms/tutorial/__init__.py
new file mode 100644
index 000000000..dff7457cf
--- /dev/null
+++ b/docs/quick_tutorial/forms/tutorial/__init__.py
@@ -0,0 +1,13 @@
+from pyramid.config import Configurator
+
+
+def main(global_config, **settings):
+    config = Configurator(settings=settings)
+    config.include('pyramid_chameleon')
+    config.add_route('wiki_view', '/')
+    config.add_route('wikipage_add', '/add')
+    config.add_route('wikipage_view', '/{uid}')
+    config.add_route('wikipage_edit', '/{uid}/edit')
+    config.add_static_view('deform_static', 'deform:static/')
+    config.scan('.views')
+    return config.make_wsgi_app()
diff --git a/docs/quick_tutorial/forms/tutorial/tests.py b/docs/quick_tutorial/forms/tutorial/tests.py
new file mode 100644
index 000000000..5a2c40904
--- /dev/null
+++ b/docs/quick_tutorial/forms/tutorial/tests.py
@@ -0,0 +1,36 @@
+import unittest
+
+from pyramid import testing
+
+
+class TutorialViewTests(unittest.TestCase):
+    def setUp(self):
+        self.config = testing.setUp()
+
+    def tearDown(self):
+        testing.tearDown()
+
+    def test_home(self):
+        from .views import WikiViews
+
+        request = testing.DummyRequest()
+        inst = WikiViews(request)
+        response = inst.wiki_view()
+        self.assertEqual(len(response['pages']), 3)
+
+
+class TutorialFunctionalTests(unittest.TestCase):
+    def setUp(self):
+        from tutorial import main
+
+        app = main({})
+        from webtest import TestApp
+
+        self.testapp = TestApp(app)
+
+    def tearDown(self):
+        testing.tearDown()
+
+    def test_home(self):
+        res = self.testapp.get('/', status=200)
+        self.assertIn(b'<title>Wiki: View</title>', res.body)
diff --git a/docs/quick_tutorial/forms/tutorial/views.py b/docs/quick_tutorial/forms/tutorial/views.py
new file mode 100644
index 000000000..004d2aba9
--- /dev/null
+++ b/docs/quick_tutorial/forms/tutorial/views.py
@@ -0,0 +1,96 @@
+import colander
+import deform.widget
+
+from pyramid.httpexceptions import HTTPFound
+from pyramid.view import view_config
+
+pages = {
+    '100': dict(uid='100', title='Page 100', body='<em>100</em>'),
+    '101': dict(uid='101', title='Page 101', body='<em>101</em>'),
+    '102': dict(uid='102', title='Page 102', body='<em>102</em>')
+}
+
+class WikiPage(colander.MappingSchema):
+    title = colander.SchemaNode(colander.String())
+    body = colander.SchemaNode(
+        colander.String(),
+        widget=deform.widget.RichTextWidget()
+    )
+
+
+class WikiViews(object):
+    def __init__(self, request):
+        self.request = request
+
+    @property
+    def wiki_form(self):
+        schema = WikiPage()
+        return deform.Form(schema, buttons=('submit',))
+
+    @property
+    def reqts(self):
+        return self.wiki_form.get_widget_resources()
+
+    @view_config(route_name='wiki_view', renderer='wiki_view.pt')
+    def wiki_view(self):
+        return dict(pages=pages.values())
+
+    @view_config(route_name='wikipage_add',
+                 renderer='wikipage_addedit.pt')
+    def wikipage_add(self):
+        form = self.wiki_form.render()
+
+        if 'submit' in self.request.params:
+            controls = self.request.POST.items()
+            try:
+                appstruct = self.wiki_form.validate(controls)
+            except deform.ValidationFailure as e:
+                # Form is NOT valid
+                return dict(form=e.render())
+
+            # Form is valid, make a new identifier and add to list
+            last_uid = int(sorted(pages.keys())[-1])
+            new_uid = str(last_uid + 1)
+            pages[new_uid] = dict(
+                uid=new_uid, title=appstruct['title'],
+                body=appstruct['body']
+            )
+
+            # Now visit new page
+            url = self.request.route_url('wikipage_view', uid=new_uid)
+            return HTTPFound(url)
+
+        return dict(form=form)
+
+    @view_config(route_name='wikipage_view', renderer='wikipage_view.pt')
+    def wikipage_view(self):
+        uid = self.request.matchdict['uid']
+        page = pages[uid]
+        return dict(page=page)
+
+    @view_config(route_name='wikipage_edit',
+                 renderer='wikipage_addedit.pt')
+    def wikipage_edit(self):
+        uid = self.request.matchdict['uid']
+        page = pages[uid]
+
+        wiki_form = self.wiki_form
+
+        if 'submit' in self.request.params:
+            controls = self.request.POST.items()
+            try:
+                appstruct = wiki_form.validate(controls)
+            except deform.ValidationFailure as e:
+                return dict(page=page, form=e.render())
+
+            # Change the content and redirect to the view
+            page['title'] = appstruct['title']
+            page['body'] = appstruct['body']
+
+            url = self.request.route_url('wikipage_view',
+                                         uid=page['uid'])
+            return HTTPFound(url)
+
+        form = wiki_form.render(page)
+
+        return dict(page=page, form=form)
\ No newline at end of file
diff --git a/docs/quick_tutorial/forms/tutorial/wiki_view.pt b/docs/quick_tutorial/forms/tutorial/wiki_view.pt
new file mode 100644
index 000000000..9e3afe495
--- /dev/null
+++ b/docs/quick_tutorial/forms/tutorial/wiki_view.pt
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Wiki: View</title>
+</head>
+<body>
+<h1>Wiki</h1>
+
+<a href="${request.route_url('wikipage_add')}">Add
+    WikiPage</a>
+<ul>
+    <li tal:repeat="page pages">
+        <a href="${request.route_url('wikipage_view', uid=page.uid)}">
+                ${page.title}
+        </a>
+    </li>
+</ul>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/quick_tutorial/forms/tutorial/wikipage_addedit.pt b/docs/quick_tutorial/forms/tutorial/wikipage_addedit.pt
new file mode 100644
index 000000000..d1fea0d7f
--- /dev/null
+++ b/docs/quick_tutorial/forms/tutorial/wikipage_addedit.pt
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>WikiPage: Add/Edit</title>
+    <tal:block tal:repeat="reqt view.reqts['css']">
+        <link rel="stylesheet" type="text/css"
+              href="${request.static_url('deform:static/' + reqt)}"/>
+    </tal:block>
+    <tal:block tal:repeat="reqt view.reqts['js']">
+        <script src="${request.static_url('deform:static/' + reqt)}"
+                type="text/javascript"></script>
+    </tal:block>
+</head>
+<body>
+<h1>Wiki</h1>
+
+<p>${structure: form}</p>
+<script type="text/javascript">
+    deform.load()
+</script>
+</body>
+</html>
diff --git a/docs/quick_tutorial/forms/tutorial/wikipage_view.pt b/docs/quick_tutorial/forms/tutorial/wikipage_view.pt
new file mode 100644
index 000000000..cb9ff526e
--- /dev/null
+++ b/docs/quick_tutorial/forms/tutorial/wikipage_view.pt
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>WikiPage: View</title>
+</head>
+<body>
+<a href="${request.route_url('wiki_view')}">
+    Up
+</a> |
+<a href="${request.route_url('wikipage_edit', uid=page.uid)}">
+    Edit
+</a>
+
+<h1>${page.title}</h1>
+<p>${structure: page.body}</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/quick_tutorial/functional_testing.rst b/docs/quick_tutorial/functional_testing.rst
new file mode 100644
index 000000000..205ddf5cb
--- /dev/null
+++ b/docs/quick_tutorial/functional_testing.rst
@@ -0,0 +1,70 @@
+.. _qtut_functional_testing:
+
+===================================
+06: Functional Testing with WebTest
+===================================
+
+Write end-to-end full-stack testing using ``webtest``.
+
+Background
+==========
+
+Unit tests are a common and popular approach to test-driven development
+(TDD.) In web applications, though, the templating and entire apparatus
+of a web site are important parts of the delivered quality. We'd like a
+way to test these.
+
+WebTest is a Python package that does functional testing. With WebTest
+you can write tests which simulate a full HTTP request against a WSGI
+application, then test the information in the response. For speed
+purposes, WebTest skips the setup/teardown of an actual HTTP server,
+providing tests that run fast enough to be part of TDD.
+
+Objectives
+==========
+
+- Write a test which checks the contents of the returned HTML
+
+Steps
+=====
+
+#. First we copy the results of the previous step, as well as install
+   the ``webtest`` package:
+
+   .. code-block:: bash
+
+    $ cd ..; cp -r unit_testing functional_testing; cd functional_testing
+    $ $VENV/bin/python setup.py develop
+    $ $VENV/bin/easy_install webtest
+
+#. Let's extend ``unit_testing/tutorial/tests.py`` to include a
+   functional test:
+
+   .. literalinclude:: functional_testing/tutorial/tests.py
+    :linenos:
+
+#. Now run the tests:
+
+   .. code-block:: bash
+
+
+    $ $VENV/bin/nosetests tutorial
+    .
+    ----------------------------------------------------------------------
+    Ran 2 tests in 0.141s
+
+    OK
+
+Analysis
+========
+
+We now have the end-to-end testing we were looking for. WebTest lets us
+simply extend our existing ``nose``-based test approach with functional
+tests that are reported in the same output. These new tests not only
+cover our templating, but they didn't dramatically increase the
+execution time of our tests.
+
+Extra Credit
+============
+
+#. Why do our functional tests use ``b''``?
\ No newline at end of file
diff --git a/docs/quick_tutorial/functional_testing/development.ini b/docs/quick_tutorial/functional_testing/development.ini
new file mode 100644
index 000000000..470d92c57
--- /dev/null
+++ b/docs/quick_tutorial/functional_testing/development.ini
@@ -0,0 +1,40 @@
+[app:main]
+use = egg:tutorial
+pyramid.includes =
+    pyramid_debugtoolbar
+
+[server:main]
+use = egg:pyramid#wsgiref
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, tutorial
+
+[logger_tutorial]
+level = DEBUG
+handlers =
+qualname = tutorial
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
diff --git a/docs/quick_tutorial/functional_testing/setup.py b/docs/quick_tutorial/functional_testing/setup.py
new file mode 100644
index 000000000..9997984d3
--- /dev/null
+++ b/docs/quick_tutorial/functional_testing/setup.py
@@ -0,0 +1,13 @@
+from setuptools import setup
+
+requires = [
+    'pyramid',
+]
+
+setup(name='tutorial',
+      install_requires=requires,
+      entry_points="""\
+      [paste.app_factory]
+      main = tutorial:main
+      """,
+)
\ No newline at end of file
diff --git a/docs/quick_tutorial/functional_testing/tutorial/__init__.py b/docs/quick_tutorial/functional_testing/tutorial/__init__.py
new file mode 100644
index 000000000..2b4e84f30
--- /dev/null
+++ b/docs/quick_tutorial/functional_testing/tutorial/__init__.py
@@ -0,0 +1,13 @@
+from pyramid.config import Configurator
+from pyramid.response import Response
+
+
+def hello_world(request):
+    return Response('<body><h1>Hello World!</h1></body>')
+
+
+def main(global_config, **settings):
+    config = Configurator(settings=settings)
+    config.add_route('hello', '/')
+    config.add_view(hello_world, route_name='hello')
+    return config.make_wsgi_app()
\ No newline at end of file
diff --git a/docs/quick_tutorial/functional_testing/tutorial/tests.py b/docs/quick_tutorial/functional_testing/tutorial/tests.py
new file mode 100644
index 000000000..4248acbe7
--- /dev/null
+++ b/docs/quick_tutorial/functional_testing/tutorial/tests.py
@@ -0,0 +1,31 @@
+import unittest
+
+from pyramid import testing
+
+
+class TutorialViewTests(unittest.TestCase):
+    def setUp(self):
+        self.config = testing.setUp()
+
+    def tearDown(self):
+        testing.tearDown()
+
+    def test_hello_world(self):
+        from tutorial import hello_world
+
+        request = testing.DummyRequest()
+        response = hello_world(request)
+        self.assertEqual(response.status_code, 200)
+
+
+class TutorialFunctionalTests(unittest.TestCase):
+    def setUp(self):
+        from tutorial import main
+        app = main({})
+        from webtest import TestApp
+
+        self.testapp = TestApp(app)
+
+    def test_hello_world(self):
+        res = self.testapp.get('/', status=200)
+        self.assertIn(b'<h1>Hello World!</h1>', res.body)
diff --git a/docs/quick_tutorial/hello_world.rst b/docs/quick_tutorial/hello_world.rst
new file mode 100644
index 000000000..c7a8eaf5e
--- /dev/null
+++ b/docs/quick_tutorial/hello_world.rst
@@ -0,0 +1,114 @@
+.. _qtut_hello_world:
+
+================================
+01: Single-File Web Applications
+================================
+
+What's the simplest way to get started in Pyramid? A single-file module.
+No Python packages, no ``setup.py``, no other machinery.
+
+Background
+==========
+
+Microframeworks are all the rage these days. "Microframework" is a
+marketing term, not a technical one.  They have a low mental overhead:
+they do so little, the only things you have to worry about are *your
+things*.
+
+Pyramid is special because it can act as a single-file module
+microframework. You can have a single Python file that can be executed
+directly by Python. But Pyramid also provides facilities to scale to
+the largest of applications.
+
+Python has a standard called :term:`WSGI` that defines how
+Python web applications plug into standard servers, getting passed
+incoming requests and returning responses. Most modern Python web
+frameworks obey an "MVC" (model-view-controller) application pattern,
+where the data in the model has a view that mediates interaction with
+outside systems.
+
+In this step we'll see a brief glimpse of WSGI servers, WSGI
+applications, requests, responses, and views.
+
+Objectives
+==========
+
+- Get a running Pyramid web application, as simply as possible
+
+- Use that as a well-understood base for adding each unit of complexity
+
+- Initial exposure to WSGI apps, requests, views, and responses
+
+Steps
+=====
+
+#. Make sure you have followed the steps in :doc:`requirements`.
+
+#. Starting from your workspace directory
+   (``~/projects/quick_tutorial``), create a directory for this step:
+
+   .. code-block:: bash
+
+    $ mkdir hello_world; cd hello_world
+
+#. Copy the following into ``hello_world/app.py``:
+
+   .. literalinclude:: hello_world/app.py
+    :linenos:
+
+#. Run the application:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/python app.py
+
+#. Open http://localhost:6543/ in your browser.
+
+Analysis
+========
+
+New to Python web programming? If so, some lines in module merit
+explanation:
+
+#. *Line 11*. The ``if __name__ == '__main__':`` is Python's way of
+   saying "Start here when running from the command line".
+
+#. *Lines 12-14*. Use Pyramid's :term:`configurator` to connect
+   :term:`view` code to a particular URL
+   :term:`route`.
+
+#. *Lines 6-7*. Implement the view code that generates the
+   :term:`response`.
+
+#. *Lines 15-17*. Publish a :term:`WSGI` app using an HTTP
+   server.
+
+As shown in this example, the :term:`configurator` plays a
+central role in Pyramid development. Building an application from
+loosely-coupled parts via :ref:`configuration_narr` is a
+central idea in Pyramid, one that we will revisit regularly in this
+*Quick Tour*.
+
+Extra Credit
+============
+
+#. Why do we do this:
+
+   .. code-block:: python
+
+      print ('Starting up server on http://localhost:6547')
+
+   ...instead of:
+
+   .. code-block:: python
+
+      print 'Starting up server on http://localhost:6547'
+
+#. What happens if you return a string of HTML? A sequence of integers?
+
+#. Put something invalid, such as ``print xyz``, in the view function.
+   Kill your ``python app.py`` with ``cntrl-c`` and restart,
+   then reload your browser. See the exception in the console?
+
+#. The ``GI`` in ``WSGI`` stands for "Gateway Interface". What web
+   standard is this modelled after?
\ No newline at end of file
diff --git a/docs/quick_tutorial/hello_world/app.py b/docs/quick_tutorial/hello_world/app.py
new file mode 100644
index 000000000..210075023
--- /dev/null
+++ b/docs/quick_tutorial/hello_world/app.py
@@ -0,0 +1,17 @@
+from wsgiref.simple_server import make_server
+from pyramid.config import Configurator
+from pyramid.response import Response
+
+
+def hello_world(request):
+    print ('Incoming request')
+    return Response('<body><h1>Hello World!</h1></body>')
+
+
+if __name__ == '__main__':
+    config = Configurator()
+    config.add_route('hello', '/')
+    config.add_view(hello_world, route_name='hello')
+    app = config.make_wsgi_app()
+    server = make_server('0.0.0.0', 6543, app)
+    server.serve_forever()
\ No newline at end of file
diff --git a/docs/quick_tutorial/index.rst b/docs/quick_tutorial/index.rst
new file mode 100644
index 000000000..9373fe38a
--- /dev/null
+++ b/docs/quick_tutorial/index.rst
@@ -0,0 +1,50 @@
+.. _quick_tutorial:
+
+==========================
+Quick Tutorial for Pyramid
+==========================
+
+Pyramid is a web framework for Python 2 and 3. This tutorial gives a
+Python 3/2-compatible, high-level tour of the major features.
+
+This hands-on tutorial covers "a little about a lot": practical
+introductions to the most common facilities. Fun, fast-paced, and most
+certainly not aimed at experts of the Pyramid web framework.
+
+Contents
+========
+
+.. toctree::
+    :maxdepth: 1
+
+    requirements
+    tutorial_approach
+    scaffolds
+    hello_world
+    package
+    ini
+    debugtoolbar
+    unit_testing
+    functional_testing
+    views
+    templating
+    view_classes
+    request_response
+    routing
+    jinja2
+    static_assets
+    json
+    more_view_classes
+    logging
+    sessions
+    forms
+    databases
+    authentication
+    authorization
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
diff --git a/docs/quick_tutorial/ini.rst b/docs/quick_tutorial/ini.rst
new file mode 100644
index 000000000..630b1faa5
--- /dev/null
+++ b/docs/quick_tutorial/ini.rst
@@ -0,0 +1,146 @@
+.. _qtut_ini:
+
+=================================================
+03: Application Configuration with ``.ini`` Files
+=================================================
+
+Use Pyramid's ``pserve`` command with a ``.ini`` configuration file for
+simpler, better application running.
+
+Background
+==========
+
+Pyramid has a first-class concept of
+:ref:`configuration <configuration_narr>` distinct from code.
+This approach is optional, but its presence makes it distinct from
+other Python web frameworks. It taps into Python's ``setuptools``
+library, which establishes conventions for how Python projects can be
+installed and provide "entry points". Pyramid uses an entry point to
+let a Pyramid application it where to find the WSGI app.
+
+Objectives
+==========
+
+- Modify our ``setup.py`` to have an entry point telling Pyramid the
+  location of the WSGI app
+
+- Create an application driven by a ``.ini`` file
+
+- Startup the application with Pyramid's ``pserve`` command
+
+- Move code into the package's ``__init__.py``
+
+Steps
+=====
+
+#. First we copy the results of the previous step:
+
+   .. code-block:: bash
+
+    $ cd ..; cp -r package ini; cd ini
+
+#. Our ``ini/setup.py`` needs a setuptools "entry point" in the
+   ``setup()`` function:
+
+   .. literalinclude:: ini/setup.py
+    :linenos:
+
+#. We can now install our project, thus generating (or re-generating) an
+    "egg" at ``ini/tutorial.egg-info``:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/python setup.py develop
+
+#. Let's make a file ``ini/development.ini`` for our configuration:
+
+   .. literalinclude:: ini/development.ini
+    :language: ini
+    :linenos:
+
+#. We can refactor our startup code from the previous step's ``app.py``
+   into ``ini/tutorial/__init__.py``:
+
+   .. literalinclude:: ini/tutorial/__init__.py
+    :linenos:
+
+#. Now that ``ini/tutorial/app.py`` isn't used, let's remove it:
+
+   .. code-block:: bash
+
+    $ rm tutorial/app.py
+
+#. Run your Pyramid application with:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/pserve development.ini --reload
+
+#. Open http://localhost:6543/.
+
+Analysis
+========
+
+Our ``development.ini`` file is read by ``pserve`` and serves to
+bootstrap our application. Processing then proceeds as described in
+the Pyramid chapter on
+:ref:`application startup <startup_chapter>`:
+
+- ``pserve`` looks for ``[app:main]`` and finds ``use = egg:tutorial``
+
+- The projects's ``setup.py`` has defined an "entry point" (lines 9-10)
+  for the project  "main" entry point of ``tutorial:main``
+
+- The ``tutorial`` package's ``__init__`` has a ``main`` function
+
+- This function is invoked, with the values from certain ``.ini``
+  sections passed in
+
+The ``.ini`` file is also used for two other functions:
+
+- *Choice of WSGI server*. ``[server:main]`` wires up the choice of WSGI
+  *server* for your WSGI *application*. In this case, we are using
+  ``wsgiref`` bundled in the Python library.
+
+- *Python logging*. Pyramid uses Python standard logging, which needs a
+  number of configuration values. The ``.ini`` serves this function.
+  This provides the console log output that you see on startup and each
+  request.
+
+- *Port number*. ``port = 6543`` tells ``wsgiref`` to listen on port
+  6543.
+
+We moved our startup code from ``app.py`` to the package's
+``tutorial/__init__.py``. This isn't necessary,
+but it is a common style in Pyramid to take the WSGI app bootstrapping
+out of your module's code and put it in the package's ``__init__.py``.
+
+The ``pserve`` application runner has a number of command-line arguments
+and options. We are using ``--reload`` which tells ``pserve`` to watch
+the filesystem for changes to relevant code (Python files, the INI file,
+etc.) and, when something changes, restart the application. Very handy
+during development.
+
+Extra Credit
+============
+
+#. If you don't like configuration and/or ``.ini`` files,
+   could you do this yourself in Python code?
+
+#. Can we have multiple ``.ini`` configuration files for a project? Why
+   might you want to do that?
+
+#. The entry point in ``setup.py`` didn't mention ``__init__.py`` when
+   it the ``main`` function. Why not?
+
+.. seealso::
+   :ref:`project_narr`,
+   :ref:`scaffolding_chapter`,
+   :ref:`what_is_this_pserve_thing`,
+   :ref:`environment_chapter`,
+   :ref:`paste_chapter`
+
+Extra Credit
+============
+
+#. What is the purpose of ``**settings``? What does the ``**`` signify?
diff --git a/docs/quick_tutorial/ini/development.ini b/docs/quick_tutorial/ini/development.ini
new file mode 100644
index 000000000..ca7d9bf81
--- /dev/null
+++ b/docs/quick_tutorial/ini/development.ini
@@ -0,0 +1,38 @@
+[app:main]
+use = egg:tutorial
+
+[server:main]
+use = egg:pyramid#wsgiref
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, tutorial
+
+[logger_tutorial]
+level = DEBUG
+handlers =
+qualname = tutorial
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
diff --git a/docs/quick_tutorial/ini/setup.py b/docs/quick_tutorial/ini/setup.py
new file mode 100644
index 000000000..9997984d3
--- /dev/null
+++ b/docs/quick_tutorial/ini/setup.py
@@ -0,0 +1,13 @@
+from setuptools import setup
+
+requires = [
+    'pyramid',
+]
+
+setup(name='tutorial',
+      install_requires=requires,
+      entry_points="""\
+      [paste.app_factory]
+      main = tutorial:main
+      """,
+)
\ No newline at end of file
diff --git a/docs/quick_tutorial/ini/tutorial/__init__.py b/docs/quick_tutorial/ini/tutorial/__init__.py
new file mode 100644
index 000000000..2b4e84f30
--- /dev/null
+++ b/docs/quick_tutorial/ini/tutorial/__init__.py
@@ -0,0 +1,13 @@
+from pyramid.config import Configurator
+from pyramid.response import Response
+
+
+def hello_world(request):
+    return Response('<body><h1>Hello World!</h1></body>')
+
+
+def main(global_config, **settings):
+    config = Configurator(settings=settings)
+    config.add_route('hello', '/')
+    config.add_view(hello_world, route_name='hello')
+    return config.make_wsgi_app()
\ No newline at end of file
diff --git a/docs/quick_tutorial/jinja2.rst b/docs/quick_tutorial/jinja2.rst
new file mode 100644
index 000000000..40d941098
--- /dev/null
+++ b/docs/quick_tutorial/jinja2.rst
@@ -0,0 +1,98 @@
+.. _qtut_jinja2:
+
+==============================
+12: Templating With ``jinja2``
+==============================
+
+We just said Pyramid doesn't prefer one templating language over
+another. Time to prove it. Jinja2 is a popular templating system,
+used in Flask and modelled after Django's templates. Let's add
+``pyramid_jinja2``, a Pyramid :term:`add-on` which enables Jinja2 as a
+:term:`renderer` in our Pyramid applications.
+
+Objectives
+==========
+
+- Show Pyramid's support for different templating systems
+
+- Learn about installing Pyramid add-ons
+
+Steps
+=====
+
+#. In this step let's start by installing the ``pyramid_jinja2``
+   add-on, the copying the ``view_class`` step's directory:
+
+   .. code-block:: bash
+
+    $ cd ..; cp -r view_classes jinja2; cd jinja2
+    $ $VENV/bin/python setup.py develop
+    $ $VENV/bin/easy_install pyramid_jinja2
+
+#. We need to add an item to ``pyramid.includes`` in
+   ``jinja2/development.ini``:
+
+   .. literalinclude:: jinja2/development.ini
+    :language: ini
+    :linenos:
+
+#. Our ``jinja2/tutorial/views.py`` simply changes its ``renderer``:
+
+   .. literalinclude:: jinja2/tutorial/views.py
+    :linenos:
+
+#. Add ``jinja2/tutorial/home.jinja2`` as a template:
+
+   .. literalinclude:: jinja2/tutorial/home.jinja2
+    :language: html
+
+#. Get the ``pyramid.includes`` into the functional test setup in
+   ``jinja2/tutorial/tests.py``:
+
+   .. literalinclude:: jinja2/tutorial/tests.py
+    :linenos:
+
+#. Now run the tests:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/nosetests tutorial
+
+#. Run your Pyramid application with:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/pserve development.ini --reload
+
+#. Open http://localhost:6543/ in your browser.
+
+Analysis
+========
+
+Getting a Pyramid add-on into Pyramid is simple. First you use normal
+Python package installation tools to install the add-on package into
+your Python. You then tell Pyramid's configurator to run the setup code
+in the add-on. In this case the setup code told Pyramid to make a new
+"renderer" available that looked for ``.jinja2`` file extensions.
+
+Our view code stayed largely the same. We simply changed the file
+extension on the renderer. For the template, the syntax for Chameleon
+and Jinja2's basic variable insertion is very similar.
+
+Our functional tests don't have ``development.ini`` so they needed the
+``pyramid.includes`` to be setup in the test setup.
+
+Extra Credit
+============
+
+#. Our project now depends on ``pyramid_jinja2``. We installed that
+   dependency manually. What is another way we could have made the
+   association?
+
+#. We used ``development.ini`` to get the :term:`configurator` to
+   load ``pyramid_jinja2``'s configuration. What is another way could
+   include it into the config?
+
+.. seealso:: `Jinja2 homepage <http://jinja.pocoo.org/>`_,
+   and
+   :ref:`pyramid_jinja2 Overview <jinja2:overview>`
diff --git a/docs/quick_tutorial/jinja2/development.ini b/docs/quick_tutorial/jinja2/development.ini
new file mode 100644
index 000000000..c096fa936
--- /dev/null
+++ b/docs/quick_tutorial/jinja2/development.ini
@@ -0,0 +1,42 @@
+[app:main]
+use = egg:tutorial
+pyramid.reload_templates = true
+pyramid.includes =
+    pyramid_debugtoolbar
+    pyramid_jinja2
+
+[server:main]
+use = egg:pyramid#wsgiref
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, tutorial
+
+[logger_tutorial]
+level = DEBUG
+handlers =
+qualname = tutorial
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
diff --git a/docs/quick_tutorial/jinja2/setup.py b/docs/quick_tutorial/jinja2/setup.py
new file mode 100644
index 000000000..9997984d3
--- /dev/null
+++ b/docs/quick_tutorial/jinja2/setup.py
@@ -0,0 +1,13 @@
+from setuptools import setup
+
+requires = [
+    'pyramid',
+]
+
+setup(name='tutorial',
+      install_requires=requires,
+      entry_points="""\
+      [paste.app_factory]
+      main = tutorial:main
+      """,
+)
\ No newline at end of file
diff --git a/docs/quick_tutorial/jinja2/tutorial/__init__.py b/docs/quick_tutorial/jinja2/tutorial/__init__.py
new file mode 100644
index 000000000..013d4538f
--- /dev/null
+++ b/docs/quick_tutorial/jinja2/tutorial/__init__.py
@@ -0,0 +1,9 @@
+from pyramid.config import Configurator
+
+
+def main(global_config, **settings):
+    config = Configurator(settings=settings)
+    config.add_route('home', '/')
+    config.add_route('hello', '/howdy')
+    config.scan('.views')
+    return config.make_wsgi_app()
\ No newline at end of file
diff --git a/docs/quick_tutorial/jinja2/tutorial/home.jinja2 b/docs/quick_tutorial/jinja2/tutorial/home.jinja2
new file mode 100644
index 000000000..975323169
--- /dev/null
+++ b/docs/quick_tutorial/jinja2/tutorial/home.jinja2
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Quick Tour: {{ name }}</title>
+</head>
+<body>
+<h1>Hi {{ name }}</h1>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/quick_tutorial/jinja2/tutorial/tests.py b/docs/quick_tutorial/jinja2/tutorial/tests.py
new file mode 100644
index 000000000..0b22946f3
--- /dev/null
+++ b/docs/quick_tutorial/jinja2/tutorial/tests.py
@@ -0,0 +1,50 @@
+import unittest
+
+from pyramid import testing
+
+
+class TutorialViewTests(unittest.TestCase):
+    def setUp(self):
+        self.config = testing.setUp()
+
+    def tearDown(self):
+        testing.tearDown()
+
+    def test_home(self):
+        from .views import TutorialViews
+
+        request = testing.DummyRequest()
+        inst = TutorialViews(request)
+        response = inst.home()
+        self.assertEqual('Home View', response['name'])
+
+    def test_hello(self):
+        from .views import TutorialViews
+
+        request = testing.DummyRequest()
+        inst = TutorialViews(request)
+        response = inst.hello()
+        self.assertEqual('Hello View', response['name'])
+
+
+class TutorialFunctionalTests(unittest.TestCase):
+    def setUp(self):
+        from tutorial import main
+
+        settings = {
+            'pyramid.includes': [
+                'pyramid_jinja2'
+            ]
+        }
+        app = main({}, **settings)
+        from webtest import TestApp
+
+        self.testapp = TestApp(app)
+
+    def test_home(self):
+        res = self.testapp.get('/', status=200)
+        self.assertIn(b'<h1>Hi Home View', res.body)
+
+    def test_hello(self):
+        res = self.testapp.get('/howdy', status=200)
+        self.assertIn(b'<h1>Hi Hello View', res.body)
diff --git a/docs/quick_tutorial/jinja2/tutorial/views.py b/docs/quick_tutorial/jinja2/tutorial/views.py
new file mode 100644
index 000000000..fa9ec5121
--- /dev/null
+++ b/docs/quick_tutorial/jinja2/tutorial/views.py
@@ -0,0 +1,18 @@
+from pyramid.view import (
+    view_config,
+    view_defaults
+    )
+
+
+@view_defaults(renderer='home.jinja2')
+class TutorialViews:
+    def __init__(self, request):
+        self.request = request
+
+    @view_config(route_name='home')
+    def home(self):
+        return {'name': 'Home View'}
+
+    @view_config(route_name='hello')
+    def hello(self):
+        return {'name': 'Hello View'}
diff --git a/docs/quick_tutorial/json.rst b/docs/quick_tutorial/json.rst
new file mode 100644
index 000000000..ece8a61c0
--- /dev/null
+++ b/docs/quick_tutorial/json.rst
@@ -0,0 +1,103 @@
+.. _qtut_json:
+
+========================================
+14: Ajax Development With JSON Renderers
+========================================
+
+Modern web apps are more than rendered HTML. Dynamic pages now use
+JavaScript to update the UI in the browser by requesting server data as
+JSON. Pyramid supports this with a *JSON renderer*.
+
+Background
+==========
+
+As we saw in :doc:`templating`, view declarations can specify a
+renderer. Output from the view is then run through the renderer,
+which generates and returns the ``Response``. We first used a Chameleon
+renderer, then a Jinja2 renderer.
+
+Renderers aren't limited, however, to templates that generate HTML.
+Pyramid supplies a JSON renderer which takes Python data,
+serializes it to JSON, and performs some other functions such as
+setting the content type. In fact, you can write your own renderer (or
+extend a built-in renderer) containing custom logic for your unique
+application.
+
+Steps
+=====
+
+#. First we copy the results of the ``view_classes`` step:
+
+   .. code-block:: bash
+
+    $ cd ..; cp -r view_classes json; cd json
+    $ $VENV/bin/python setup.py develop
+
+#. We add a new route for ``hello_json`` in
+   ``json/tutorial/__init__.py``:
+
+   .. literalinclude:: json/tutorial/__init__.py
+    :linenos:
+
+#. Rather than implement a new view, we will "stack" another decorator
+   on the ``hello`` view:
+
+   .. literalinclude:: json/tutorial/views.py
+    :linenos:
+
+#. We need a new functional test at the end of
+   ``json/tutorial/tests.py``:
+
+   .. literalinclude:: json/tutorial/tests.py
+    :linenos:
+
+#. Run the tests:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/nosetests tutorial
+
+#. Run your Pyramid application with:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/pserve development.ini --reload
+
+#. Open http://localhost:6543/howdy.json in your browser and you
+   will see the resulting JSON response.
+
+Analysis
+========
+
+Earlier we changed our view functions and methods to return Python
+data. This change to a data-oriented view layer made test writing
+easier, decoupling the templating from the view logic.
+
+Since Pyramid has a JSON renderer as well as the templating renderers,
+it is an easy step to return JSON. In this case we kept the exact same
+view and arranged to return a JSON encoding of the view data. We did
+this by:
+
+- Adding a route to map ``/howdy.json`` to a route name
+
+- Providing a ``@view_config`` that associated that route name with an
+  existing view
+
+- *overriding* the view defaults in the view config that mentions the 
+  ``hello_json`` route, so that when the route is matched, we use the JSON 
+  renderer rather than the ``home.pt`` template renderer that would otherwise 
+  be used.
+
+In fact, for pure Ajax-style web applications, we could re-use the existing
+route by using Pyramid's view predicates to match on the
+``Accepts:`` header sent by modern Ajax implementation.
+
+Pyramid's JSON renderer uses the base Python JSON encoder,
+thus inheriting its strengths and weaknesses. For example,
+Python can't natively JSON encode DateTime objects. There are a number
+of solutions for this in Pyramid, including extending the JSON renderer
+with a custom renderer.
+
+.. seealso:: :ref:`views_which_use_a_renderer`,
+   :ref:`json_renderer`, and
+   :ref:`adding_and_overriding_renderers`
diff --git a/docs/quick_tutorial/json/development.ini b/docs/quick_tutorial/json/development.ini
new file mode 100644
index 000000000..62e0c5123
--- /dev/null
+++ b/docs/quick_tutorial/json/development.ini
@@ -0,0 +1,41 @@
+[app:main]
+use = egg:tutorial
+pyramid.reload_templates = true
+pyramid.includes =
+    pyramid_debugtoolbar
+
+[server:main]
+use = egg:pyramid#wsgiref
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, tutorial
+
+[logger_tutorial]
+level = DEBUG
+handlers =
+qualname = tutorial
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
diff --git a/docs/quick_tutorial/json/setup.py b/docs/quick_tutorial/json/setup.py
new file mode 100644
index 000000000..2221b72e9
--- /dev/null
+++ b/docs/quick_tutorial/json/setup.py
@@ -0,0 +1,14 @@
+from setuptools import setup
+
+requires = [
+    'pyramid',
+    'pyramid_chameleon'
+]
+
+setup(name='tutorial',
+      install_requires=requires,
+      entry_points="""\
+      [paste.app_factory]
+      main = tutorial:main
+      """,
+)
\ No newline at end of file
diff --git a/docs/quick_tutorial/json/tutorial/__init__.py b/docs/quick_tutorial/json/tutorial/__init__.py
new file mode 100644
index 000000000..6652544c3
--- /dev/null
+++ b/docs/quick_tutorial/json/tutorial/__init__.py
@@ -0,0 +1,11 @@
+from pyramid.config import Configurator
+
+
+def main(global_config, **settings):
+    config = Configurator(settings=settings)
+    config.include('pyramid_chameleon')
+    config.add_route('home', '/')
+    config.add_route('hello', '/howdy')
+    config.add_route('hello_json', 'howdy.json')
+    config.scan('.views')
+    return config.make_wsgi_app()
\ No newline at end of file
diff --git a/docs/quick_tutorial/json/tutorial/home.pt b/docs/quick_tutorial/json/tutorial/home.pt
new file mode 100644
index 000000000..a0cc08e7a
--- /dev/null
+++ b/docs/quick_tutorial/json/tutorial/home.pt
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Quick Tour: ${name}</title>
+</head>
+<body>
+<h1>Hi ${name}</h1>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/quick_tutorial/json/tutorial/tests.py b/docs/quick_tutorial/json/tutorial/tests.py
new file mode 100644
index 000000000..c3cdacbdb
--- /dev/null
+++ b/docs/quick_tutorial/json/tutorial/tests.py
@@ -0,0 +1,50 @@
+import unittest
+
+from pyramid import testing
+
+
+class TutorialViewTests(unittest.TestCase):
+    def setUp(self):
+        self.config = testing.setUp()
+
+    def tearDown(self):
+        testing.tearDown()
+
+    def test_home(self):
+        from .views import TutorialViews
+
+        request = testing.DummyRequest()
+        inst = TutorialViews(request)
+        response = inst.home()
+        self.assertEqual('Home View', response['name'])
+
+    def test_hello(self):
+        from .views import TutorialViews
+
+        request = testing.DummyRequest()
+        inst = TutorialViews(request)
+        response = inst.hello()
+        self.assertEqual('Hello View', response['name'])
+
+
+class TutorialFunctionalTests(unittest.TestCase):
+    def setUp(self):
+        from tutorial import main
+        app = main({})
+        from webtest import TestApp
+
+        self.testapp = TestApp(app)
+
+    def test_home(self):
+        res = self.testapp.get('/', status=200)
+        self.assertIn(b'<h1>Hi Home View', res.body)
+
+    def test_hello(self):
+        res = self.testapp.get('/howdy', status=200)
+        self.assertIn(b'<h1>Hi Hello View', res.body)
+
+    def test_hello_json(self):
+        res = self.testapp.get('/howdy.json', status=200)
+        self.assertIn(b'{"name": "Hello View"}', res.body)
+        self.assertEqual(res.content_type, 'application/json')
+
diff --git a/docs/quick_tutorial/json/tutorial/views.py b/docs/quick_tutorial/json/tutorial/views.py
new file mode 100644
index 000000000..f15e55d1b
--- /dev/null
+++ b/docs/quick_tutorial/json/tutorial/views.py
@@ -0,0 +1,19 @@
+from pyramid.view import (
+    view_config,
+    view_defaults
+    )
+
+
+@view_defaults(renderer='home.pt')
+class TutorialViews:
+    def __init__(self, request):
+        self.request = request
+
+    @view_config(route_name='home')
+    def home(self):
+        return {'name': 'Home View'}
+
+    @view_config(route_name='hello')
+    @view_config(route_name='hello_json', renderer='json')
+    def hello(self):
+        return {'name': 'Hello View'}
diff --git a/docs/quick_tutorial/logging.rst b/docs/quick_tutorial/logging.rst
new file mode 100644
index 000000000..0167e5249
--- /dev/null
+++ b/docs/quick_tutorial/logging.rst
@@ -0,0 +1,79 @@
+.. _qtut_logging:
+
+============================================
+16: Collecting Application Info With Logging
+============================================
+
+Capture debugging and error output from your web applications using
+standard Python logging.
+
+Background
+==========
+
+It's important to know what is going on inside our web application.
+In development we might need to collect some output. In production,
+we might need to detect problems when other people use the site. We
+need *logging*.
+
+Fortunately Pyramid uses the normal Python approach to logging. The
+scaffold generated, in your ``development.ini``, a number of lines that
+configure the logging for you to some reasonable defaults. You then see
+messages sent by Pyramid (for example, when a new request comes in.)
+
+Objectives
+==========
+
+- Inspect the configuration setup used for logging
+
+- Add logging statements to your view code
+
+Steps
+=====
+
+#. First we copy the results of the ``view_classes`` step:
+
+   .. code-block:: bash
+
+    $ cd ..; cp -r view_classes logging; cd logging
+    $ $VENV/bin/python setup.py develop
+
+#. Extend ``logging/tutorial/views.py`` to log a message:
+
+   .. literalinclude:: logging/tutorial/views.py
+    :linenos:
+
+#. Make sure the tests still pass:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/nosetests tutorial
+
+#. Run your Pyramid application with:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/pserve development.ini --reload
+
+#. Open http://localhost:6543/ and http://localhost:6543/howdy
+   in your browser. Note, both in the console and in the debug
+   toolbar, the message that you logged.
+
+Analysis
+========
+
+Our ``development.ini`` configuration file wires up Python standard
+logging for our Pyramid application:
+
+.. literalinclude:: logging/development.ini
+    :language: ini
+
+In this, our ``tutorial`` Python package is setup as a logger
+and configured to log messages at a ``DEBUG`` or higher level. When you
+visit http://localhost:6543 your console will now show::
+
+ 2013-08-09 10:42:42,968 DEBUG [tutorial.views][MainThread] In home view
+
+Also, if you have configured your Pyramid application to use the
+``pyramid_debugtoolbar``, logging statements appear in one of its menus.
+
+.. seealso:: See Also: :ref:`logging_chapter`
diff --git a/docs/quick_tutorial/logging/development.ini b/docs/quick_tutorial/logging/development.ini
new file mode 100644
index 000000000..62e0c5123
--- /dev/null
+++ b/docs/quick_tutorial/logging/development.ini
@@ -0,0 +1,41 @@
+[app:main]
+use = egg:tutorial
+pyramid.reload_templates = true
+pyramid.includes =
+    pyramid_debugtoolbar
+
+[server:main]
+use = egg:pyramid#wsgiref
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, tutorial
+
+[logger_tutorial]
+level = DEBUG
+handlers =
+qualname = tutorial
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
diff --git a/docs/quick_tutorial/logging/setup.py b/docs/quick_tutorial/logging/setup.py
new file mode 100644
index 000000000..2221b72e9
--- /dev/null
+++ b/docs/quick_tutorial/logging/setup.py
@@ -0,0 +1,14 @@
+from setuptools import setup
+
+requires = [
+    'pyramid',
+    'pyramid_chameleon'
+]
+
+setup(name='tutorial',
+      install_requires=requires,
+      entry_points="""\
+      [paste.app_factory]
+      main = tutorial:main
+      """,
+)
\ No newline at end of file
diff --git a/docs/quick_tutorial/logging/tutorial/__init__.py b/docs/quick_tutorial/logging/tutorial/__init__.py
new file mode 100644
index 000000000..c3e1c9eef
--- /dev/null
+++ b/docs/quick_tutorial/logging/tutorial/__init__.py
@@ -0,0 +1,10 @@
+from pyramid.config import Configurator
+
+
+def main(global_config, **settings):
+    config = Configurator(settings=settings)
+    config.include('pyramid_chameleon')
+    config.add_route('home', '/')
+    config.add_route('hello', '/howdy')
+    config.scan('.views')
+    return config.make_wsgi_app()
\ No newline at end of file
diff --git a/docs/quick_tutorial/logging/tutorial/home.pt b/docs/quick_tutorial/logging/tutorial/home.pt
new file mode 100644
index 000000000..a0cc08e7a
--- /dev/null
+++ b/docs/quick_tutorial/logging/tutorial/home.pt
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Quick Tour: ${name}</title>
+</head>
+<body>
+<h1>Hi ${name}</h1>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/quick_tutorial/logging/tutorial/tests.py b/docs/quick_tutorial/logging/tutorial/tests.py
new file mode 100644
index 000000000..4381235ec
--- /dev/null
+++ b/docs/quick_tutorial/logging/tutorial/tests.py
@@ -0,0 +1,44 @@
+import unittest
+
+from pyramid import testing
+
+
+class TutorialViewTests(unittest.TestCase):
+    def setUp(self):
+        self.config = testing.setUp()
+
+    def tearDown(self):
+        testing.tearDown()
+
+    def test_home(self):
+        from .views import TutorialViews
+
+        request = testing.DummyRequest()
+        inst = TutorialViews(request)
+        response = inst.home()
+        self.assertEqual('Home View', response['name'])
+
+    def test_hello(self):
+        from .views import TutorialViews
+
+        request = testing.DummyRequest()
+        inst = TutorialViews(request)
+        response = inst.hello()
+        self.assertEqual('Hello View', response['name'])
+
+
+class TutorialFunctionalTests(unittest.TestCase):
+    def setUp(self):
+        from tutorial import main
+        app = main({})
+        from webtest import TestApp
+
+        self.testapp = TestApp(app)
+
+    def test_home(self):
+        res = self.testapp.get('/', status=200)
+        self.assertIn(b'<h1>Hi Home View', res.body)
+
+    def test_hello(self):
+        res = self.testapp.get('/howdy', status=200)
+        self.assertIn(b'<h1>Hi Hello View', res.body)
diff --git a/docs/quick_tutorial/logging/tutorial/views.py b/docs/quick_tutorial/logging/tutorial/views.py
new file mode 100644
index 000000000..63d95f405
--- /dev/null
+++ b/docs/quick_tutorial/logging/tutorial/views.py
@@ -0,0 +1,23 @@
+import logging
+log = logging.getLogger(__name__)
+
+from pyramid.view import (
+    view_config,
+    view_defaults
+    )
+
+
+@view_defaults(renderer='home.pt')
+class TutorialViews:
+    def __init__(self, request):
+        self.request = request
+
+    @view_config(route_name='home')
+    def home(self):
+        log.debug('In home view')
+        return {'name': 'Home View'}
+
+    @view_config(route_name='hello')
+    def hello(self):
+        log.debug('In hello view')
+        return {'name': 'Hello View'}
diff --git a/docs/quick_tutorial/more_view_classes.rst b/docs/quick_tutorial/more_view_classes.rst
new file mode 100644
index 000000000..2792869ac
--- /dev/null
+++ b/docs/quick_tutorial/more_view_classes.rst
@@ -0,0 +1,182 @@
+.. _qtut_more_view_classes:
+
+==========================
+15: More With View Classes
+==========================
+
+Group views into a class, sharing configuration, state, and logic.
+
+Background
+==========
+
+As part of its mission to help build more ambitious web applications,
+Pyramid provides many more features for views and view classes.
+
+The Pyramid documentation discusses views as a Python "callable". This
+callable can be a function, an object with an ``__call__``,
+or a Python class. In this last case, methods on the class can be
+decorated with ``@view_config`` to register the class methods with the
+:term:`configurator` as a view.
+
+So far our views have been simple, free-standing functions. Many times
+your views are related: different ways to look at or work on the same
+data or a REST API that handles multiple operations. Grouping these
+together as a
+:ref:`view class <class_as_view>` makes sense:
+
+- Group views
+
+- Centralize some repetitive defaults
+
+- Share some state and helpers
+
+Pyramid views have
+:ref:`view predicates <view_configuration_parameters>` that
+help determine which view is matched to a request. These predicates
+provide many axes of flexibility.
+
+The following shows a simple example with four operations operations:
+view a home page which leads to a form, save a change,
+and press the delete button.
+
+Objectives
+==========
+
+- Group related views into a view class
+
+- Centralize configuration with class-level ``@view_defaults``
+
+- Dispatch one route/URL to multiple views based on request data
+
+- Share stated and logic between views and templates via the view class
+
+Steps
+=====
+
+#. First we copy the results of the previous step:
+
+   .. code-block:: bash
+
+    $ cd ..; cp -r templating more_view_classes; cd more_view_classes
+    $ $VENV/bin/python setup.py develop
+
+#. Our route in ``more_view_classes/tutorial/__init__.py`` needs some
+   replacement patterns:
+
+   .. literalinclude:: more_view_classes/tutorial/__init__.py
+    :linenos:
+
+#. Our ``more_view_classes/tutorial/views.py`` now has a view class with
+   several views:
+
+   .. literalinclude:: more_view_classes/tutorial/views.py
+    :linenos:
+
+#. Our primary view needs a template at
+   ``more_view_classes/tutorial/home.pt``:
+
+   .. literalinclude:: more_view_classes/tutorial/home.pt
+    :language: html
+
+#. Ditto for our other view from the previous section at
+   ``more_view_classes/tutorial/hello.pt``:
+
+   .. literalinclude:: more_view_classes/tutorial/hello.pt
+    :language: html
+
+#. We have an edit view that also needs a template at
+   ``more_view_classes/tutorial/edit.pt``:
+
+   .. literalinclude:: more_view_classes/tutorial/edit.pt
+    :language: html
+
+#. And finally the delete view's template at
+   ``more_view_classes/tutorial/delete.pt``:
+
+   .. literalinclude:: more_view_classes/tutorial/delete.pt
+    :language: html
+
+#. Run your Pyramid application with:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/pserve development.ini --reload
+
+#. Open http://localhost:6543/howdy/jane/doe in your browser. Click
+   the ``Save`` and ``Delete`` buttons and watch the output in the
+   console window.
+
+Analysis
+========
+
+As you can see, the four views are logically grouped together.
+Specifically:
+
+- We have a ``home`` view available at http://localhost:6543/ with
+  a clickable link to the ``hello`` view.
+
+- The second view is returned when you go to ``/howdy/jane/doe``. This
+  URL is
+  mapped to the ``hello`` route that we centrally set using the optional
+  ``@view_defaults``.
+
+- The third view is returned when the form is submitted with a ``POST``
+  method. This rule is specified in the ``@view_config`` for that view.
+
+- The fourth view is returned when clicking on a button such
+  as ``<input type="submit" name="form.delete" value="Delete"/>``.
+
+In this step we show using the following information as criteria to
+decide which view to use:
+
+- Method of the HTTP request (``GET``, ``POST``, etc.)
+
+- Parameter information in the request (submitted form field names)
+
+We also centralize part of the view configuration to the class level
+with ``@view_defaults``, then in one view, override that default just
+for that one view. Finally, we put this commonality between views to
+work in the view class by sharing:
+
+- State assigned in ``TutorialViews.__init__``
+
+- A computed value
+
+These are then available both in the view methods but also in the
+templates (e.g. ``${view.view_name}`` and ``${view.full_name}``.
+
+As a note, we made a switch in our templates on how we generate URLs.
+We previously hardcode the URLs, such as::
+
+  <a href="/howdy/jane/doe">Howdy</a>
+
+In ``home.pt`` we switched to::
+
+  <a href="${request.route_url('hello', first='jane',
+        last='doe')}">form</a>
+
+Pyramid has rich facilities to help generate URLs in a flexible,
+non-error-prone fashion.
+
+Extra Credit
+============
+
+#. Why could our template do ``${view.full_name}`` and not have to do
+   ``${view.full_name()}``?
+
+#. The ``edit`` and ``delete`` views are both submitted to with
+   ``POST``. Why does the ``edit`` view configuration not catch the
+   the ``POST`` used by ``delete``?
+
+#. We used Python ``@property`` on ``full_name``. If we reference this
+   many times in a template or view code, it would re-compute this
+   every time. Does Pyramid provide something that will cache the initial
+   computation on a property?
+
+#. Can you associate more than one route with the same view?
+
+#. There is also a ``request.route_path`` API.  How does this differ from 
+   ``request.route_url``?
+
+.. seealso:: :ref:`class_as_view`, `Weird Stuff You Can Do With
+   URL Dispatch <http://www.plope.com/weird_pyramid_urldispatch>`_
diff --git a/docs/quick_tutorial/more_view_classes/development.ini b/docs/quick_tutorial/more_view_classes/development.ini
new file mode 100644
index 000000000..62e0c5123
--- /dev/null
+++ b/docs/quick_tutorial/more_view_classes/development.ini
@@ -0,0 +1,41 @@
+[app:main]
+use = egg:tutorial
+pyramid.reload_templates = true
+pyramid.includes =
+    pyramid_debugtoolbar
+
+[server:main]
+use = egg:pyramid#wsgiref
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, tutorial
+
+[logger_tutorial]
+level = DEBUG
+handlers =
+qualname = tutorial
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
diff --git a/docs/quick_tutorial/more_view_classes/setup.py b/docs/quick_tutorial/more_view_classes/setup.py
new file mode 100644
index 000000000..2221b72e9
--- /dev/null
+++ b/docs/quick_tutorial/more_view_classes/setup.py
@@ -0,0 +1,14 @@
+from setuptools import setup
+
+requires = [
+    'pyramid',
+    'pyramid_chameleon'
+]
+
+setup(name='tutorial',
+      install_requires=requires,
+      entry_points="""\
+      [paste.app_factory]
+      main = tutorial:main
+      """,
+)
\ No newline at end of file
diff --git a/docs/quick_tutorial/more_view_classes/tutorial/__init__.py b/docs/quick_tutorial/more_view_classes/tutorial/__init__.py
new file mode 100644
index 000000000..9c1bcec06
--- /dev/null
+++ b/docs/quick_tutorial/more_view_classes/tutorial/__init__.py
@@ -0,0 +1,10 @@
+from pyramid.config import Configurator
+
+
+def main(global_config, **settings):
+    config = Configurator(settings=settings)
+    config.include('pyramid_chameleon')
+    config.add_route('home', '/')
+    config.add_route('hello', '/howdy/{first}/{last}')
+    config.scan('.views')
+    return config.make_wsgi_app()
\ No newline at end of file
diff --git a/docs/quick_tutorial/more_view_classes/tutorial/delete.pt b/docs/quick_tutorial/more_view_classes/tutorial/delete.pt
new file mode 100644
index 000000000..67cc8bf09
--- /dev/null
+++ b/docs/quick_tutorial/more_view_classes/tutorial/delete.pt
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Quick Tour: ${page_title}</title>
+</head>
+<body>
+<h1>${view.view_name} - ${page_title}</h1>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/quick_tutorial/more_view_classes/tutorial/edit.pt b/docs/quick_tutorial/more_view_classes/tutorial/edit.pt
new file mode 100644
index 000000000..1bd204065
--- /dev/null
+++ b/docs/quick_tutorial/more_view_classes/tutorial/edit.pt
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Quick Tour: ${view.view_name} - ${page_title}</title>
+</head>
+<body>
+<h1>${view.view_name} - ${page_title}</h1>
+<p>You submitted <code>${new_name}</code></p>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/quick_tutorial/more_view_classes/tutorial/hello.pt b/docs/quick_tutorial/more_view_classes/tutorial/hello.pt
new file mode 100644
index 000000000..8a39aed09
--- /dev/null
+++ b/docs/quick_tutorial/more_view_classes/tutorial/hello.pt
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Quick Tour: ${view.view_name} - ${page_title}</title>
+</head>
+<body>
+<h1>${view.view_name} - ${page_title}</h1>
+<p>Welcome, ${view.full_name}</p>
+<form method="POST"
+      action="${request.current_route_url()}">
+    <input name="new_name"/>
+    <input type="submit" name="form.edit" value="Save"/>
+    <input type="submit" name="form.delete" value="Delete"/>
+</form>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/quick_tutorial/more_view_classes/tutorial/home.pt b/docs/quick_tutorial/more_view_classes/tutorial/home.pt
new file mode 100644
index 000000000..fa9016705
--- /dev/null
+++ b/docs/quick_tutorial/more_view_classes/tutorial/home.pt
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Quick Tour: ${view.view_name} - ${page_title}</title>
+</head>
+<body>
+<h1>${view.view_name} - ${page_title}</h1>
+
+<p>Go to the <a href="${request.route_url('hello', first='jane',
+        last='doe')}">form</a>.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/quick_tutorial/more_view_classes/tutorial/tests.py b/docs/quick_tutorial/more_view_classes/tutorial/tests.py
new file mode 100644
index 000000000..dca8d7f7b
--- /dev/null
+++ b/docs/quick_tutorial/more_view_classes/tutorial/tests.py
@@ -0,0 +1,31 @@
+import unittest
+
+from pyramid import testing
+
+
+class TutorialViewTests(unittest.TestCase):
+    def setUp(self):
+        self.config = testing.setUp()
+
+    def tearDown(self):
+        testing.tearDown()
+
+    def test_home(self):
+        from .views import TutorialViews
+
+        request = testing.DummyRequest()
+        inst = TutorialViews(request)
+        response = inst.home()
+        self.assertEqual('Home View', response['page_title'])
+
+class TutorialFunctionalTests(unittest.TestCase):
+    def setUp(self):
+        from tutorial import main
+        app = main({})
+        from webtest import TestApp
+
+        self.testapp = TestApp(app)
+
+    def test_home(self):
+        res = self.testapp.get('/', status=200)
+        self.assertIn(b'TutorialViews - Home View', res.body)
diff --git a/docs/quick_tutorial/more_view_classes/tutorial/views.py b/docs/quick_tutorial/more_view_classes/tutorial/views.py
new file mode 100644
index 000000000..fdba04ba8
--- /dev/null
+++ b/docs/quick_tutorial/more_view_classes/tutorial/views.py
@@ -0,0 +1,39 @@
+from pyramid.view import (
+    view_config,
+    view_defaults
+    )
+
+
+@view_defaults(route_name='hello')
+class TutorialViews:
+    def __init__(self, request):
+        self.request = request
+        self.view_name = 'TutorialViews'
+
+    @property
+    def full_name(self):
+        first = self.request.matchdict['first']
+        last = self.request.matchdict['last']
+        return first + ' ' + last
+
+    @view_config(route_name='home', renderer='home.pt')
+    def home(self):
+        return {'page_title': 'Home View'}
+
+
+    # Retrieving /howdy/first/last the first time
+    @view_config(renderer='hello.pt')
+    def hello(self):
+        return {'page_title': 'Hello View'}
+
+    # Posting to /home via the "Edit" submit button
+    @view_config(request_method='POST', renderer='edit.pt')
+    def edit(self):
+        new_name = self.request.params['new_name']
+        return {'page_title': 'Edit View', 'new_name': new_name}
+
+    # Posting to /home via the "Delete" submit button
+    @view_config(request_param='form.delete', renderer='delete.pt')
+    def delete(self):
+        print ('Deleted')
+        return {'page_title': 'Delete View'}
diff --git a/docs/quick_tutorial/package.rst b/docs/quick_tutorial/package.rst
new file mode 100644
index 000000000..90d022b29
--- /dev/null
+++ b/docs/quick_tutorial/package.rst
@@ -0,0 +1,112 @@
+============================================
+02: Python Packages for Pyramid Applications
+============================================
+
+Most modern Python development is done using Python packages, an approach
+Pyramid puts to good use. In this step we re-do "Hello World" as a
+minimum Python package inside a minimum Python project.
+
+Background
+==========
+
+Python developers can organize a collection of modules and files into a
+namespaced unit called a :ref:`package <python:tut-packages>`. If a
+directory is on ``sys.path`` and has a special file named
+``__init__.py``, it is treated as a Python package.
+
+Packages can be bundled up, made available for installation,
+and installed through a (muddled, but improving) toolchain oriented
+around a ``setup.py`` file for a
+`setuptools project <http://pythonhosted.org/setuptools/setuptools.html>`_.
+Explaining it all in this
+tutorial will induce madness. For this tutorial, this is all you need to
+know:
+
+- We will have a directory for each tutorial step as a
+  setuptools *project*
+
+- This project will contain a ``setup.py`` which injects the features
+  of the setuptool's project machinery into the directory
+
+- In this project we will make a ``tutorial`` subdirectory into a Python
+  *package* using an ``__init__.py`` Python module file
+
+- We will run ``python setup.py develop`` to install our project in
+  development mode
+
+In summary:
+
+- You'll do your development in a Python *package*
+
+- That package will be part of a setuptools *project*
+
+Objectives
+==========
+
+- Make a Python "package" directory with an ``__init__.py``
+
+- Get a minimum Python "project" in place by making a ``setup.py``
+
+- Install our ``tutorial`` project in development mode
+
+Steps
+=====
+
+#. Make an area for this tutorial step:
+
+   .. code-block:: bash
+
+    $ cd ..; mkdir package; cd package
+
+#. In ``package/setup.py``, enter the following:
+
+   .. literalinclude:: package/setup.py
+
+#. Make the new project installed for development then make a directory
+   for the actual code:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/python setup.py develop
+    $ mkdir tutorial
+
+#. Enter the following into ``package/tutorial/__init__.py``:
+
+   .. literalinclude:: package/tutorial/__init__.py
+
+#. Enter the following into ``package/tutorial/app.py``:
+
+   .. literalinclude:: package/tutorial/app.py
+
+#. Run the WSGI application with:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/python tutorial/app.py
+
+#. Open http://localhost:6543/ in your browser.
+
+Analysis
+========
+
+Python packages give us an organized unit of project development.
+Python projects, via ``setup.py``, gives us special features when
+our package is installed (in this case, in local development mode.)
+
+In this step we have a Python package called ``tutorial``. We use the
+same name in each step of the tutorial, to avoid unnecessary re-typing.
+
+Above this ``tutorial`` directory we have the files that handle the
+packaging of this, well, package. At the moment, all we need is a
+bare-bones ``ini/setup.py``.
+
+Everything else is the same about our application. We simply made a
+Python package with a ``setup.py`` and installed it in development mode.
+
+Note that the way we're running the app (``python tutorial/app.py``) is a bit
+of an odd duck.  We would never do this unless we were writing a tutorial that
+tries to capture how this stuff works a step at a time.  It's generally a bad
+idea to run a Python module inside a package directly as a script.
+
+.. seealso:: :ref:`Python Packages <python:tut-packages>`,
+   `setuptools Entry Points <http://pythonhosted.org/setuptools/pkg_resources.html#entry-points>`_
diff --git a/docs/quick_tutorial/package/setup.py b/docs/quick_tutorial/package/setup.py
new file mode 100644
index 000000000..bcfcfa684
--- /dev/null
+++ b/docs/quick_tutorial/package/setup.py
@@ -0,0 +1,9 @@
+from setuptools import setup
+
+requires = [
+    'pyramid',
+]
+
+setup(name='tutorial',
+      install_requires=requires,
+)
\ No newline at end of file
diff --git a/docs/quick_tutorial/package/tutorial/__init__.py b/docs/quick_tutorial/package/tutorial/__init__.py
new file mode 100644
index 000000000..d310fdde9
--- /dev/null
+++ b/docs/quick_tutorial/package/tutorial/__init__.py
@@ -0,0 +1 @@
+# package
\ No newline at end of file
diff --git a/docs/quick_tutorial/package/tutorial/app.py b/docs/quick_tutorial/package/tutorial/app.py
new file mode 100644
index 000000000..210075023
--- /dev/null
+++ b/docs/quick_tutorial/package/tutorial/app.py
@@ -0,0 +1,17 @@
+from wsgiref.simple_server import make_server
+from pyramid.config import Configurator
+from pyramid.response import Response
+
+
+def hello_world(request):
+    print ('Incoming request')
+    return Response('<body><h1>Hello World!</h1></body>')
+
+
+if __name__ == '__main__':
+    config = Configurator()
+    config.add_route('hello', '/')
+    config.add_view(hello_world, route_name='hello')
+    app = config.make_wsgi_app()
+    server = make_server('0.0.0.0', 6543, app)
+    server.serve_forever()
\ No newline at end of file
diff --git a/docs/quick_tutorial/request_response.rst b/docs/quick_tutorial/request_response.rst
new file mode 100644
index 000000000..504803804
--- /dev/null
+++ b/docs/quick_tutorial/request_response.rst
@@ -0,0 +1,103 @@
+.. _qtut_request_response:
+
+=======================================
+10: Handling Web Requests and Responses
+=======================================
+
+Web applications handle incoming requests and return outgoing responses.
+Pyramid makes working with requests and responses convenient and
+reliable.
+
+Objectives
+==========
+
+- Learn the background on Pyramid's choices for requests and responses
+
+- Grab data out of the request
+
+- Change information in the response headers
+
+Background
+==========
+
+Developing for the web means processing web requests. As this is a
+critical part of a web application, web developers need a robust,
+mature set of software for web requests and returning web
+responses.
+
+Pyramid has always fit nicely into the existing world of Python web
+development (virtual environments, packaging, scaffolding,
+first to embrace Python 3, etc.) For request handling, Pyramid turned
+to the well-regarded :term:`WebOb` Python library for request and
+response handling. In our example
+above, Pyramid hands ``hello_world`` a ``request`` that is
+:ref:`based on WebOb <webob_chapter>`.
+
+Steps
+=====
+
+#. First we copy the results of the ``view_classes`` step:
+
+   .. code-block:: bash
+
+    $ cd ..; cp -r view_classes request_response; cd request_response
+    $ $VENV/bin/python setup.py develop
+
+#. Simplify the routes in ``request_response/tutorial/__init__.py``:
+
+   .. literalinclude:: request_response/tutorial/__init__.py
+
+#. We only need one view in ``request_response/tutorial/views.py``:
+
+   .. literalinclude:: request_response/tutorial/views.py
+
+#. Update the tests in ``request_response/tutorial/tests.py``:
+
+   .. literalinclude:: request_response/tutorial/tests.py
+
+#. Now run the tests:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/nosetests tutorial
+
+#. Run your Pyramid application with:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/pserve development.ini --reload
+
+#. Open http://localhost:6543/ in your browser. You will be
+   redirected to http://localhost:6543/plain
+
+#. Open http://localhost:6543/plain?name=alice in your browser.
+
+Analysis
+========
+
+In this view class we have two routes and two views, with the first
+leading to the second by an HTTP redirect. Pyramid can
+:ref:`generate redirects <http_redirect>` by returning a
+special object from a view or raising a special exception.
+
+In this Pyramid view, we get the URL being visited from ``request.url``.
+Also, if you visited http://localhost:6543/plain?name=alice,
+the name is included in the body of the response::
+
+  URL http://localhost:6543/plain?name=alice with name: alice
+
+Finally, we set the response's content type and body, then return the
+Response.
+
+We updated the unit and functional tests to prove that our code
+does the redirection, but also handles sending and not sending
+``/plain?name``.
+
+Extra Credit
+============
+
+#. Could we also ``raise HTTPFound(location='/plain')`` instead of
+   returning it?  If so, what's the difference?
+
+.. seealso:: :ref:`webob_chapter`,
+   :ref:`generate redirects <http_redirect>`
diff --git a/docs/quick_tutorial/request_response/development.ini b/docs/quick_tutorial/request_response/development.ini
new file mode 100644
index 000000000..62e0c5123
--- /dev/null
+++ b/docs/quick_tutorial/request_response/development.ini
@@ -0,0 +1,41 @@
+[app:main]
+use = egg:tutorial
+pyramid.reload_templates = true
+pyramid.includes =
+    pyramid_debugtoolbar
+
+[server:main]
+use = egg:pyramid#wsgiref
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, tutorial
+
+[logger_tutorial]
+level = DEBUG
+handlers =
+qualname = tutorial
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
diff --git a/docs/quick_tutorial/request_response/setup.py b/docs/quick_tutorial/request_response/setup.py
new file mode 100644
index 000000000..9997984d3
--- /dev/null
+++ b/docs/quick_tutorial/request_response/setup.py
@@ -0,0 +1,13 @@
+from setuptools import setup
+
+requires = [
+    'pyramid',
+]
+
+setup(name='tutorial',
+      install_requires=requires,
+      entry_points="""\
+      [paste.app_factory]
+      main = tutorial:main
+      """,
+)
\ No newline at end of file
diff --git a/docs/quick_tutorial/request_response/tutorial/__init__.py b/docs/quick_tutorial/request_response/tutorial/__init__.py
new file mode 100644
index 000000000..77a172888
--- /dev/null
+++ b/docs/quick_tutorial/request_response/tutorial/__init__.py
@@ -0,0 +1,9 @@
+from pyramid.config import Configurator
+
+
+def main(global_config, **settings):
+    config = Configurator(settings=settings)
+    config.add_route('home', '/')
+    config.add_route('plain', '/plain')
+    config.scan('.views')
+    return config.make_wsgi_app()
\ No newline at end of file
diff --git a/docs/quick_tutorial/request_response/tutorial/tests.py b/docs/quick_tutorial/request_response/tutorial/tests.py
new file mode 100644
index 000000000..7486c2b2d
--- /dev/null
+++ b/docs/quick_tutorial/request_response/tutorial/tests.py
@@ -0,0 +1,54 @@
+import unittest
+
+from pyramid import testing
+
+
+class TutorialViewTests(unittest.TestCase):
+    def setUp(self):
+        self.config = testing.setUp()
+
+    def tearDown(self):
+        testing.tearDown()
+
+    def test_home(self):
+        from .views import TutorialViews
+
+        request = testing.DummyRequest()
+        inst = TutorialViews(request)
+        response = inst.home()
+        self.assertEqual(response.status, '302 Found')
+
+    def test_plain_without_name(self):
+        from .views import TutorialViews
+
+        request = testing.DummyRequest()
+        inst = TutorialViews(request)
+        response = inst.plain()
+        self.assertIn(b'No Name Provided', response.body)
+
+    def test_plain_with_name(self):
+        from .views import TutorialViews
+
+        request = testing.DummyRequest()
+        request.GET['name'] = 'Jane Doe'
+        inst = TutorialViews(request)
+        response = inst.plain()
+        self.assertIn(b'Jane Doe', response.body)
+
+
+class TutorialFunctionalTests(unittest.TestCase):
+    def setUp(self):
+        from tutorial import main
+
+        app = main({})
+        from webtest import TestApp
+
+        self.testapp = TestApp(app)
+
+    def test_plain_without_name(self):
+        res = self.testapp.get('/plain', status=200)
+        self.assertIn(b'No Name Provided', res.body)
+
+    def test_plain_with_name(self):
+        res = self.testapp.get('/plain?name=Jane%20Doe', status=200)
+        self.assertIn(b'Jane Doe', res.body)
diff --git a/docs/quick_tutorial/request_response/tutorial/views.py b/docs/quick_tutorial/request_response/tutorial/views.py
new file mode 100644
index 000000000..8c7ff5f37
--- /dev/null
+++ b/docs/quick_tutorial/request_response/tutorial/views.py
@@ -0,0 +1,22 @@
+from pyramid.httpexceptions import HTTPFound
+from pyramid.response import Response
+from pyramid.view import view_config
+
+
+class TutorialViews:
+    def __init__(self, request):
+        self.request = request
+
+    @view_config(route_name='home')
+    def home(self):
+        return HTTPFound(location='/plain')
+
+    @view_config(route_name='plain')
+    def plain(self):
+        name = self.request.params.get('name', 'No Name Provided')
+
+        body = 'URL %s with name: %s' % (self.request.url, name)
+        return Response(
+            content_type='text/plain',
+            body=body
+        )
diff --git a/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst
new file mode 100644
index 000000000..40e818807
--- /dev/null
+++ b/docs/quick_tutorial/requirements.rst
@@ -0,0 +1,250 @@
+.. _qtut_requirements:
+
+============
+Requirements
+============
+
+Let's get our tutorial environment setup. Most of the setup work is in
+standard Python development practices (install Python,
+make an isolated environment, and setup packaging tools.)
+
+.. note::
+
+  Pyramid encourages standard Python development practices with
+  packaging tools, virtual environments, logging, and so on.  There
+  are many variations, implementations, and opinions across the Python
+  community.  For consistency, ease of documentation maintenance,
+  and to minimize confusion, the Pyramid *documentation* has adopted
+  specific conventions.
+
+This *Quick Tutorial* is based on:
+
+* **Python 3.3**. Pyramid fully supports Python 3.2+ and Python 2.6+.
+  This tutorial uses **Python 3.3** but runs fine under Python 2.7.
+
+* **pyvenv**. We believe in virtual environments. For this tutorial,
+  we use Python 3.3's built-in solution, the ``pyvenv`` command.
+  For Python 2.7, you can install ``virtualenv``.
+
+* **setuptools and easy_install**. We use
+  `setuptools <https://pypi.python.org/pypi/setuptools/>`_
+  and its ``easy_install`` for package management.
+
+* **Workspaces, projects, and packages.** Our home directory
+  will contain a *tutorial workspace* with our Python virtual
+  environment(s) and *Python projects* (a directory with packaging
+  information and *Python packages* of working code.)
+
+* **Unix commands**. Commands in this tutorial use UNIX syntax and
+  paths.  Windows users should adjust commands accordingly.
+
+.. note::
+
+    Pyramid was one of the first web frameworks to fully support Python 3 in
+    October 2011.
+
+Steps
+=====
+
+#. :ref:`install-python-3.3-or-greater`
+#. :ref:`create-a-project-directory-structure`
+#. :ref:`set-an-environment-variable`
+#. :ref:`create-a-virtual-environment`
+#. :ref:`install-setuptools-(python-packaging-tools)`
+#. :ref:`install-pyramid`
+
+.. _install-python-3.3-or-greater:
+
+Install Python 3.3 or greater
+-----------------------------
+
+Download the latest standard Python 3.3+ release (not development
+release) from
+`python.org <http://www.python.org/download/releases/>`_.  On that page, you
+must click the latest version, then scroll down to the "Downloads" section
+for your operating system.
+
+Windows and Mac OS X users can download and run an installer.
+
+Windows users should also install the `Python for Windows extensions
+<http://sourceforge.net/projects/pywin32/files/pywin32/>`_. Carefully read the
+``README.txt`` file at the end of the list of builds, and follow its
+directions. Make sure you get the proper 32- or 64-bit build and Python
+version.
+
+Linux users can either use their package manager to install Python 3.3
+or may
+`build Python 3.3 from source
+<http://pyramid.readthedocs.org/en/master/narr/install.html#package-manager-
+method>`_.
+
+
+.. _create-a-project-directory-structure:
+
+Create a project directory structure
+------------------------------------
+
+We will arrive at a directory structure of
+``workspace->project->package``, with our workspace named
+``quick_tutorial``. The following diagram shows how this is structured
+and where our virtual environment will reside:
+
+.. figure:: ../_static/directory_structure_pyramid.png
+   :alt: Final directory structure
+
+   Final directory structure.
+
+For Linux, the commands to do so are as follows:
+
+.. code-block:: bash
+
+    # Mac and Linux
+    $ cd ~
+    $ mkdir -p projects/quick_tutorial
+    $ cd projects/quick_tutorial
+
+For Windows:
+
+.. code-block:: posh
+
+    # Windows
+    c:\> cd \
+    c:\> mkdir projects\quick_tutorial
+    c:\> cd projects\quick_tutorial
+
+In the above figure, your user home directory is represented by ``~``.  In
+your home directory, all of your projects are in the ``projects`` directory.
+This is a general convention not specific to Pyramid that many developers use.
+Windows users will do well to use ``c:\`` as the location for ``projects`` in
+order to avoid spaces in any of the path names.
+
+Next within ``projects`` is your workspace directory, here named
+``quick_tutorial``. A workspace is a common term used by integrated
+development environments (IDE) like PyCharm and PyDev that stores
+isolated Python environments (virtualenvs) and specific project files
+and repositories.
+
+
+.. _set-an-environment-variable:
+
+Set an Environment Variable
+---------------------------
+
+This tutorial will refer frequently to the location of the virtual
+environment. We set an environment variable to save typing later.
+
+.. code-block:: bash
+
+    # Mac and Linux
+    $ export VENV=~/projects/quick_tutorial/env33/
+
+    # Windows
+    # TODO: This command does not work
+    c:\> set VENV=c:\projects\quick_tutorial\env33
+
+
+.. _create-a-virtual-environment:
+
+Create a Virtual Environment
+----------------------------
+
+.. warning:: The current state of isolated Python environments using
+    ``pyvenv`` on Windows is suboptimal in comparison to Mac and Linux.  See
+    http://stackoverflow.com/q/15981111/95735 for a discussion of the issue
+    and `PEP 453 <http://www.python.org/dev/peps/pep-0453/>`_ for a proposed
+    resolution.
+
+``pyvenv`` is a tool to create isolated Python 3.3 environments, each
+with its own Python binary and independent set of installed Python
+packages in its site directories. Let's create one, using the location
+we just specified in the environment variable.
+
+.. code-block:: bash
+
+    # Mac and Linux
+    $ pyvenv $VENV
+
+    # Windows
+    c:\> c:\Python33\python -m venv %VENV%
+
+.. seealso:: See also Python 3's :mod:`venv module <python3:venv>`,
+   Python 2's `virtualenv <http://www.virtualenv.org/en/latest/>`_
+   package,
+   :ref:`Installing Pyramid on a Windows System <installing_windows>`
+
+
+.. _install-setuptools-(python-packaging-tools):
+
+Install ``setuptools`` (Python packaging tools)
+-----------------------------------------------
+
+The following command will download a script to install ``setuptools``, then
+pipe it to your environment's version of Python.
+
+.. code-block:: bash
+
+    # Mac and Linux
+    $ wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -O - | $VENV/bin/python
+
+    # Windows
+    # Use your browser to download:
+    #   https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.p
+    # ...into c:\projects\quick_tutorial\ez_setup.py
+    c:\> %VENV%\Scripts\python ez_setup.py
+
+If ``wget`` complains with a certificate error, then run this command instead:
+
+.. code-block:: bash
+
+    # Mac and Linux
+    $ wget --no-check-certificate https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -O - | $VENV/bin/python
+
+
+.. _install-pyramid:
+
+Install Pyramid
+---------------
+
+We have our Python standard prerequisites out of the way. The Pyramid
+part is pretty easy:
+
+.. parsed-literal::
+
+    # Mac and Linux
+    $ $VENV/bin/easy_install "pyramid==\ |release|\ "
+
+    # Windows
+    c:\\> %VENV%\\Scripts\\easy_install "pyramid==\ |release|\ "
+
+Our Python virtual environment now has the Pyramid software available.
+
+You can optionally install some of the extra Python packages used
+during this tutorial:
+
+.. code-block:: bash
+
+    # Mac and Linux
+    $ $VENV/bin/easy_install nose webtest deform sqlalchemy \
+       pyramid_chameleon pyramid_debugtoolbar waitress \
+       pyramid_jinja2 pyramid_tm zope.sqlalchemy pysqlite
+
+    # Windows
+    c:\> %VENV%\Scripts\easy_install nose webtest deform sqlalchemy pyramid_chameleon
+
+
+
+.. note::
+
+    Why ``easy_install`` and not ``pip``? Pyramid encourages use of namespace
+    packages which, until recently, ``pip`` didn't permit. Also, Pyramid has
+    some optional C extensions for performance. With ``easy_install``, Windows
+    users can get these extensions without needing a C compiler.
+
+.. seealso:: See Also: :ref:`installing_unix`. For instructions to set up your
+    Python environment for development using Windows or Python 2, see Pyramid's
+    :ref:`Before You Install <installing_chapter>`.
+
+    See also Python 3's :mod:`venv module <python3:venv>`, the `setuptools` `installation instructions
+    <https://pypi.python.org/pypi/setuptools/0.9.8#installation-instructions>`_,
+    and `easy_install help <https://pypi.python.org/pypi/setuptools/0.9.8#using-setuptools-and-easyinstall>`_.
+
diff --git a/docs/quick_tutorial/routing.rst b/docs/quick_tutorial/routing.rst
new file mode 100644
index 000000000..54dff5c39
--- /dev/null
+++ b/docs/quick_tutorial/routing.rst
@@ -0,0 +1,121 @@
+.. _qtut_routing:
+
+==========================================
+11: Dispatching URLs To Views With Routing
+==========================================
+
+Routing matches incoming URL patterns to view code. Pyramid's routing
+has a number of useful features.
+
+Background
+==========
+
+Writing web applications usually means sophisticated URL design. We
+just saw some Pyramid machinery for requests and views. Let's look at
+features that help in routing.
+
+Previously we saw the basics of routing URLs to views in
+
+- Your project's "setup" code registers a route name to be used when
+  matching part of the URL
+
+- Elsewhere, a view is configured to be called for that route name
+
+.. note::
+
+    Why do this twice? Other Python web frameworks let you create a
+    route and associate it with a view in one step. As
+    illustrated in :ref:`routes_need_ordering`, multiple routes might match the
+    same URL pattern. Rather than provide ways to help guess, Pyramid lets you
+    be explicit in ordering. Pyramid also gives facilities to avoid the
+    problem.  It's relatively easy to build a system that uses implicit route
+    ordering with Pyramid too.  See `The Groundhog series of screencasts 
+    <http://bfg.repoze.org/videos#groundhog1>`_ if you're interested in
+    doing so.
+
+Objectives
+==========
+
+- Define a route that extracts part of the URL into a Python dictionary
+
+- Use that dictionary data in a view
+
+Steps
+=====
+
+#. First we copy the results of the ``view_classes`` step:
+
+   .. code-block:: bash
+
+    $ cd ..; cp -r view_classes routing; cd routing
+    $ $VENV/bin/python setup.py develop
+
+#. Our ``routing/tutorial/__init__.py`` needs a route with a replacement
+   pattern:
+
+   .. literalinclude:: routing/tutorial/__init__.py
+    :linenos:
+
+#. We just need one view in ``routing/tutorial/views.py``:
+
+   .. literalinclude:: routing/tutorial/views.py
+    :linenos:
+
+#. We just need one view in ``routing/tutorial/home.pt``:
+
+   .. literalinclude:: routing/tutorial/home.pt
+    :language: html
+    :linenos:
+
+#. Update ``routing/tutorial/tests.py``:
+
+   .. literalinclude:: routing/tutorial/tests.py
+    :linenos:
+
+#. Now run the tests:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/nosetests tutorial
+
+#. Run your Pyramid application with:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/pserve development.ini --reload
+
+#. Open http://localhost:6543/howdy/amy/smith in your browser.
+
+Analysis
+========
+
+In ``__init__.py`` we see an important change in our route declaration:
+
+.. code-block:: python
+
+    config.add_route('hello', '/howdy/{first}/{last}')
+
+With this we tell the :term:`configurator` that our URL has
+a "replacement pattern".  With this, URLs such as ``/howdy/amy/smith``
+will assign ``amy`` to ``first`` and ``smith`` to ``last``. We can then
+use this data in our view:
+
+.. code-block:: python
+
+    self.request.matchdict['first']
+    self.request.matchdict['last']
+
+``request.matchdict`` contains values from the URL that match the
+"replacement patterns" (the curly braces) in the route declaration.
+This information can then be used anywhere in Pyramid that has access
+to the request.
+
+Extra Credit
+============
+
+#. What happens if you to go the URL
+   http://localhost:6543/howdy? Is this the result that you
+   expected?
+
+.. seealso:: `Weird Stuff You Can Do With URL
+   Dispatch <http://www.plope.com/weird_pyramid_urldispatch>`_
diff --git a/docs/quick_tutorial/routing/development.ini b/docs/quick_tutorial/routing/development.ini
new file mode 100644
index 000000000..62e0c5123
--- /dev/null
+++ b/docs/quick_tutorial/routing/development.ini
@@ -0,0 +1,41 @@
+[app:main]
+use = egg:tutorial
+pyramid.reload_templates = true
+pyramid.includes =
+    pyramid_debugtoolbar
+
+[server:main]
+use = egg:pyramid#wsgiref
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, tutorial
+
+[logger_tutorial]
+level = DEBUG
+handlers =
+qualname = tutorial
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
diff --git a/docs/quick_tutorial/routing/setup.py b/docs/quick_tutorial/routing/setup.py
new file mode 100644
index 000000000..2221b72e9
--- /dev/null
+++ b/docs/quick_tutorial/routing/setup.py
@@ -0,0 +1,14 @@
+from setuptools import setup
+
+requires = [
+    'pyramid',
+    'pyramid_chameleon'
+]
+
+setup(name='tutorial',
+      install_requires=requires,
+      entry_points="""\
+      [paste.app_factory]
+      main = tutorial:main
+      """,
+)
\ No newline at end of file
diff --git a/docs/quick_tutorial/routing/tutorial/__init__.py b/docs/quick_tutorial/routing/tutorial/__init__.py
new file mode 100644
index 000000000..4b2dac36d
--- /dev/null
+++ b/docs/quick_tutorial/routing/tutorial/__init__.py
@@ -0,0 +1,9 @@
+from pyramid.config import Configurator
+
+
+def main(global_config, **settings):
+    config = Configurator(settings=settings)
+    config.include('pyramid_chameleon')
+    config.add_route('home', '/howdy/{first}/{last}')
+    config.scan('.views')
+    return config.make_wsgi_app()
\ No newline at end of file
diff --git a/docs/quick_tutorial/routing/tutorial/home.pt b/docs/quick_tutorial/routing/tutorial/home.pt
new file mode 100644
index 000000000..f2b991059
--- /dev/null
+++ b/docs/quick_tutorial/routing/tutorial/home.pt
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Quick Tour: ${name}</title>
+</head>
+<body>
+<h1>${name}</h1>
+<p>First: ${first}, Last: ${last}</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/quick_tutorial/routing/tutorial/tests.py b/docs/quick_tutorial/routing/tutorial/tests.py
new file mode 100644
index 000000000..572f389fb
--- /dev/null
+++ b/docs/quick_tutorial/routing/tutorial/tests.py
@@ -0,0 +1,36 @@
+import unittest
+
+from pyramid import testing
+
+
+class TutorialViewTests(unittest.TestCase):
+    def setUp(self):
+        self.config = testing.setUp()
+
+    def tearDown(self):
+        testing.tearDown()
+
+    def test_home(self):
+        from .views import TutorialViews
+
+        request = testing.DummyRequest()
+        request.matchdict['first'] = 'First'
+        request.matchdict['last'] = 'Last'
+        inst = TutorialViews(request)
+        response = inst.home()
+        self.assertEqual(response['first'], 'First')
+        self.assertEqual(response['last'], 'Last')
+
+
+class TutorialFunctionalTests(unittest.TestCase):
+    def setUp(self):
+        from tutorial import main
+        app = main({})
+        from webtest import TestApp
+
+        self.testapp = TestApp(app)
+
+    def test_home(self):
+        res = self.testapp.get('/howdy/Jane/Doe', status=200)
+        self.assertIn(b'Jane', res.body)
+        self.assertIn(b'Doe', res.body)
diff --git a/docs/quick_tutorial/routing/tutorial/views.py b/docs/quick_tutorial/routing/tutorial/views.py
new file mode 100644
index 000000000..8a9211e92
--- /dev/null
+++ b/docs/quick_tutorial/routing/tutorial/views.py
@@ -0,0 +1,20 @@
+from pyramid.view import (
+    view_config,
+    view_defaults
+    )
+
+
+@view_defaults(renderer='home.pt')
+class TutorialViews:
+    def __init__(self, request):
+        self.request = request
+
+    @view_config(route_name='home')
+    def home(self):
+        first = self.request.matchdict['first']
+        last = self.request.matchdict['last']
+        return {
+            'name': 'Home View',
+            'first': first,
+            'last': last
+        }
diff --git a/docs/quick_tutorial/scaffolds.rst b/docs/quick_tutorial/scaffolds.rst
new file mode 100644
index 000000000..8ca2d27df
--- /dev/null
+++ b/docs/quick_tutorial/scaffolds.rst
@@ -0,0 +1,86 @@
+.. _qtut_scaffolds:
+
+=============================================
+Prelude: Quick Project Startup with Scaffolds
+=============================================
+
+To ease the process of getting started, Pyramid provides *scaffolds*
+that generate sample projects from templates in Pyramid and Pyramid
+add-ons.
+
+Background
+==========
+
+We're going to cover a lot in this tutorial, focusing on one topic at a
+time and writing everything from scratch. As a warmup, though,
+it sure would be nice to see some pixels on a screen.
+
+Like other web development frameworks, Pyramid provides a number of
+"scaffolds" that generate working Python, template, and CSS code for
+sample applications. In this step we'll use a built-in scaffold to let
+us preview a Pyramid application, before starting from scratch on Step 1.
+
+Objectives
+==========
+
+- Use Pyramid's ``pcreate`` command to list scaffolds and make a new
+  project
+
+- Start up a Pyramid application and visit it in a web browser
+
+Steps
+=====
+
+#. Pyramid's ``pcreate`` command can list the available scaffolds:
+
+    .. code-block:: bash
+
+        $ $VENV/bin/pcreate --list
+        Available scaffolds:
+          alchemy:                 Pyramid SQLAlchemy project using url dispatch
+          starter:                 Pyramid starter project
+          zodb:                    Pyramid ZODB project using traversal
+
+#. Tell ``pcreate`` to use the ``starter`` scaffold to make our project:
+
+    .. code-block:: bash
+
+        $ $VENV/bin/pcreate --scaffold starter scaffolds
+
+#. Use normal Python development to setup our project for development:
+
+    .. code-block:: bash
+
+        $ cd scaffolds
+        $ $VENV/bin/python setup.py develop
+
+#. Startup the application by pointing Pyramid's ``pserve`` command at
+   the project's (generated) configuration file:
+
+    .. code-block:: bash
+
+        $ $VENV/bin/pserve development.ini --reload
+
+   On startup, ``pserve`` logs some output:
+
+   .. code-block:: bash
+
+     Starting subprocess with file monitor
+     Starting server in PID 72213.
+     Starting HTTP server on http://0.0.0.0:6543
+
+#. Open http://localhost:6543/ in your browser.
+
+Analysis
+========
+
+Rather than starting from scratch, ``pcreate`` can make getting a
+Python project containing a Pyramid application a quick matter.
+Pyramid ships with a few scaffolds. But installing a Pyramid add-on can
+give you new scaffolds from that add-on.
+
+``pserve`` is Pyramid's application runner, separating operational
+details from your code. When you install Pyramid, a small command
+program called ``pserve`` is written to your ``bin`` directory. This
+program is an executable Python module. It is passed a configuration
+file (in this case, ``development.ini``.)
diff --git a/docs/quick_tutorial/scaffolds/CHANGES.txt b/docs/quick_tutorial/scaffolds/CHANGES.txt
new file mode 100644
index 000000000..35a34f332
--- /dev/null
+++ b/docs/quick_tutorial/scaffolds/CHANGES.txt
@@ -0,0 +1,4 @@
+0.0
+---
+
+-  Initial version
diff --git a/docs/quick_tutorial/scaffolds/MANIFEST.in b/docs/quick_tutorial/scaffolds/MANIFEST.in
new file mode 100644
index 000000000..91d3f763b
--- /dev/null
+++ b/docs/quick_tutorial/scaffolds/MANIFEST.in
@@ -0,0 +1,2 @@
+include *.txt *.ini *.cfg *.rst
+recursive-include scaffolds *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml
diff --git a/docs/quick_tutorial/scaffolds/README.txt b/docs/quick_tutorial/scaffolds/README.txt
new file mode 100644
index 000000000..7776dd2d5
--- /dev/null
+++ b/docs/quick_tutorial/scaffolds/README.txt
@@ -0,0 +1 @@
+scaffolds README
diff --git a/docs/quick_tutorial/scaffolds/development.ini b/docs/quick_tutorial/scaffolds/development.ini
new file mode 100644
index 000000000..b31d06194
--- /dev/null
+++ b/docs/quick_tutorial/scaffolds/development.ini
@@ -0,0 +1,60 @@
+###
+# app configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+###
+
+[app:main]
+use = egg:scaffolds
+
+pyramid.reload_templates = true
+pyramid.debug_authorization = false
+pyramid.debug_notfound = false
+pyramid.debug_routematch = false
+pyramid.default_locale_name = en
+pyramid.includes = 
+    pyramid_debugtoolbar
+
+# By default, the toolbar only appears for clients from IP addresses
+# '127.0.0.1' and '::1'.
+# debugtoolbar.hosts = 127.0.0.1 ::1
+
+###
+# wsgi server configuration
+###
+
+[server:main]
+use = egg:waitress#main
+host = 0.0.0.0
+port = 6543
+
+###
+# logging configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+###
+
+[loggers]
+keys = root, scaffolds
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[logger_scaffolds]
+level = DEBUG
+handlers =
+qualname = scaffolds
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
diff --git a/docs/quick_tutorial/scaffolds/production.ini b/docs/quick_tutorial/scaffolds/production.ini
new file mode 100644
index 000000000..1418e6bf6
--- /dev/null
+++ b/docs/quick_tutorial/scaffolds/production.ini
@@ -0,0 +1,54 @@
+###
+# app configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+###
+
+[app:main]
+use = egg:scaffolds
+
+pyramid.reload_templates = false
+pyramid.debug_authorization = false
+pyramid.debug_notfound = false
+pyramid.debug_routematch = false
+pyramid.default_locale_name = en
+
+###
+# wsgi server configuration
+###
+
+[server:main]
+use = egg:waitress#main
+host = 0.0.0.0
+port = 6543
+
+###
+# logging configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+###
+
+[loggers]
+keys = root, scaffolds
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+
+[logger_scaffolds]
+level = WARN
+handlers =
+qualname = scaffolds
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
diff --git a/docs/quick_tutorial/scaffolds/scaffolds/__init__.py b/docs/quick_tutorial/scaffolds/scaffolds/__init__.py
new file mode 100644
index 000000000..ad5ecbc6f
--- /dev/null
+++ b/docs/quick_tutorial/scaffolds/scaffolds/__init__.py
@@ -0,0 +1,12 @@
+from pyramid.config import Configurator
+
+
+def main(global_config, **settings):
+    """ This function returns a Pyramid WSGI application.
+    """
+    config = Configurator(settings=settings)
+    config.include('pyramid_chameleon')
+    config.add_static_view('static', 'static', cache_max_age=3600)
+    config.add_route('home', '/')
+    config.scan()
+    return config.make_wsgi_app()
diff --git a/docs/quick_tutorial/scaffolds/scaffolds/static/favicon.ico b/docs/quick_tutorial/scaffolds/scaffolds/static/favicon.ico
new file mode 100644
index 000000000..71f837c9e
--- /dev/null
+++ b/docs/quick_tutorial/scaffolds/scaffolds/static/favicon.ico
diff --git a/docs/quick_tutorial/scaffolds/scaffolds/static/footerbg.png b/docs/quick_tutorial/scaffolds/scaffolds/static/footerbg.png
new file mode 100644
index 000000000..1fbc873da
--- /dev/null
+++ b/docs/quick_tutorial/scaffolds/scaffolds/static/footerbg.png
diff --git a/docs/quick_tutorial/scaffolds/scaffolds/static/headerbg.png b/docs/quick_tutorial/scaffolds/scaffolds/static/headerbg.png
new file mode 100644
index 000000000..0596f2020
--- /dev/null
+++ b/docs/quick_tutorial/scaffolds/scaffolds/static/headerbg.png
diff --git a/docs/quick_tutorial/scaffolds/scaffolds/static/ie6.css b/docs/quick_tutorial/scaffolds/scaffolds/static/ie6.css
new file mode 100644
index 000000000..b7c8493d8
--- /dev/null
+++ b/docs/quick_tutorial/scaffolds/scaffolds/static/ie6.css
@@ -0,0 +1,8 @@
+* html img,
+* html .png{position:relative;behavior:expression((this.runtimeStyle.behavior="none")&&(this.pngSet?this.pngSet=true:(this.nodeName == "IMG" && this.src.toLowerCase().indexOf('.png')>-1?(this.runtimeStyle.backgroundImage = "none",
+this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.src + "',sizingMethod='image')",
+this.src = "static/transparent.gif"):(this.origBg = this.origBg? this.origBg :this.currentStyle.backgroundImage.toString().replace('url("','').replace('")',''),
+this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.origBg + "',sizingMethod='crop')",
+this.runtimeStyle.backgroundImage = "none")),this.pngSet=true)
+);}
+#wrap{display:table;height:100%}
diff --git a/docs/quick_tutorial/scaffolds/scaffolds/static/middlebg.png b/docs/quick_tutorial/scaffolds/scaffolds/static/middlebg.png
new file mode 100644
index 000000000..2369cfb7d
--- /dev/null
+++ b/docs/quick_tutorial/scaffolds/scaffolds/static/middlebg.png
diff --git a/docs/quick_tutorial/scaffolds/scaffolds/static/pylons.css b/docs/quick_tutorial/scaffolds/scaffolds/static/pylons.css
new file mode 100644
index 000000000..4b1c017cd
--- /dev/null
+++ b/docs/quick_tutorial/scaffolds/scaffolds/static/pylons.css
@@ -0,0 +1,372 @@
+html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td
+{
+  margin: 0;
+  padding: 0;
+  border: 0;
+  outline: 0;
+  font-size: 100%; /* 16px */
+  vertical-align: baseline;
+  background: transparent;
+}
+
+body
+{
+  line-height: 1;
+}
+
+ol, ul
+{
+  list-style: none;
+}
+
+blockquote, q
+{
+  quotes: none;
+}
+
+blockquote:before, blockquote:after, q:before, q:after
+{
+  content: '';
+  content: none;
+}
+
+:focus
+{
+  outline: 0;
+}
+
+ins
+{
+  text-decoration: none;
+}
+
+del
+{
+  text-decoration: line-through;
+}
+
+table
+{
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+sub
+{
+  vertical-align: sub;
+  font-size: smaller;
+  line-height: normal;
+}
+
+sup
+{
+  vertical-align: super;
+  font-size: smaller;
+  line-height: normal;
+}
+
+ul, menu, dir
+{
+  display: block;
+  list-style-type: disc;
+  margin: 1em 0;
+  padding-left: 40px;
+}
+
+ol
+{
+  display: block;
+  list-style-type: decimal-leading-zero;
+  margin: 1em 0;
+  padding-left: 40px;
+}
+
+li
+{
+  display: list-item;
+}
+
+ul ul, ul ol, ul dir, ul menu, ul dl, ol ul, ol ol, ol dir, ol menu, ol dl, dir ul, dir ol, dir dir, dir menu, dir dl, menu ul, menu ol, menu dir, menu menu, menu dl, dl ul, dl ol, dl dir, dl menu, dl dl
+{
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+ol ul, ul ul, menu ul, dir ul, ol menu, ul menu, menu menu, dir menu, ol dir, ul dir, menu dir, dir dir
+{
+  list-style-type: circle;
+}
+
+ol ol ul, ol ul ul, ol menu ul, ol dir ul, ol ol menu, ol ul menu, ol menu menu, ol dir menu, ol ol dir, ol ul dir, ol menu dir, ol dir dir, ul ol ul, ul ul ul, ul menu ul, ul dir ul, ul ol menu, ul ul menu, ul menu menu, ul dir menu, ul ol dir, ul ul dir, ul menu dir, ul dir dir, menu ol ul, menu ul ul, menu menu ul, menu dir ul, menu ol menu, menu ul menu, menu menu menu, menu dir menu, menu ol dir, menu ul dir, menu menu dir, menu dir dir, dir ol ul, dir ul ul, dir menu ul, dir dir ul, dir ol menu, dir ul menu, dir menu menu, dir dir menu, dir ol dir, dir ul dir, dir menu dir, dir dir dir
+{
+  list-style-type: square;
+}
+
+.hidden
+{
+  display: none;
+}
+
+p
+{
+  line-height: 1.5em;
+}
+
+h1
+{
+  font-size: 1.75em;
+  line-height: 1.7em;
+  font-family: helvetica, verdana;
+}
+
+h2
+{
+  font-size: 1.5em;
+  line-height: 1.7em;
+  font-family: helvetica, verdana;
+}
+
+h3
+{
+  font-size: 1.25em;
+  line-height: 1.7em;
+  font-family: helvetica, verdana;
+}
+
+h4
+{
+  font-size: 1em;
+  line-height: 1.7em;
+  font-family: helvetica, verdana;
+}
+
+html, body
+{
+  width: 100%;
+  height: 100%;
+}
+
+body
+{
+  margin: 0;
+  padding: 0;
+  background-color: #fff;
+  position: relative;
+  font: 16px/24px NobileRegular, "Lucida Grande", Lucida, Verdana, sans-serif;
+}
+
+a
+{
+  color: #1b61d6;
+  text-decoration: none;
+}
+
+a:hover
+{
+  color: #e88f00;
+  text-decoration: underline;
+}
+
+body h1, body h2, body h3, body h4, body h5, body h6
+{
+  font-family: NeutonRegular, "Lucida Grande", Lucida, Verdana, sans-serif;
+  font-weight: 400;
+  color: #373839;
+  font-style: normal;
+}
+
+#wrap
+{
+  min-height: 100%;
+}
+
+#header, #footer
+{
+  width: 100%;
+  color: #fff;
+  height: 40px;
+  position: absolute;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+  font-size: 12px;
+  vertical-align: middle;
+}
+
+#header
+{
+  background: #000;
+  top: 0;
+  font-size: 14px;
+}
+
+#footer
+{
+  bottom: 0;
+  background: #000 url(footerbg.png) repeat-x 0 top;
+  position: relative;
+  margin-top: -40px;
+  clear: both;
+}
+
+.header, .footer
+{
+  width: 750px;
+  margin-right: auto;
+  margin-left: auto;
+}
+
+.wrapper
+{
+  width: 100%;
+}
+
+#top, #top-small, #bottom
+{
+  width: 100%;
+}
+
+#top
+{
+  color: #000;
+  height: 230px;
+  background: #fff url(headerbg.png) repeat-x 0 top;
+  position: relative;
+}
+
+#top-small
+{
+  color: #000;
+  height: 60px;
+  background: #fff url(headerbg.png) repeat-x 0 top;
+  position: relative;
+}
+
+#bottom
+{
+  color: #222;
+  background-color: #fff;
+}
+
+.top, .top-small, .middle, .bottom
+{
+  width: 750px;
+  margin-right: auto;
+  margin-left: auto;
+}
+
+.top
+{
+  padding-top: 40px;
+}
+
+.top-small
+{
+  padding-top: 10px;
+}
+
+#middle
+{
+  width: 100%;
+  height: 100px;
+  background: url(middlebg.png) repeat-x;
+  border-top: 2px solid #fff;
+  border-bottom: 2px solid #b2b2b2;
+}
+
+.app-welcome
+{
+  margin-top: 25px;
+}
+
+.app-name
+{
+  color: #000;
+  font-weight: 700;
+}
+
+.bottom
+{
+  padding-top: 50px;
+}
+
+#left
+{
+  width: 350px;
+  float: left;
+  padding-right: 25px;
+}
+
+#right
+{
+  width: 350px;
+  float: right;
+  padding-left: 25px;
+}
+
+.align-left
+{
+  text-align: left;
+}
+
+.align-right
+{
+  text-align: right;
+}
+
+.align-center
+{
+  text-align: center;
+}
+
+ul.links
+{
+  margin: 0;
+  padding: 0;
+}
+
+ul.links li
+{
+  list-style-type: none;
+  font-size: 14px;
+}
+
+form
+{
+  border-style: none;
+}
+
+fieldset
+{
+  border-style: none;
+}
+
+input
+{
+  color: #222;
+  border: 1px solid #ccc;
+  font-family: sans-serif;
+  font-size: 12px;
+  line-height: 16px;
+}
+
+input[type=text], input[type=password]
+{
+  width: 205px;
+}
+
+input[type=submit]
+{
+  background-color: #ddd;
+  font-weight: 700;
+}
+
+/*Opera Fix*/
+body:before
+{
+  content: "";
+  height: 100%;
+  float: left;
+  width: 0;
+  margin-top: -32767px;
+}
diff --git a/pyramid/scaffolds/alchemy/+package+/static/pyramid-small.png b/docs/quick_tutorial/scaffolds/scaffolds/static/pyramid-small.png
index a5bc0ade7..a5bc0ade7 100644
--- a/pyramid/scaffolds/alchemy/+package+/static/pyramid-small.png
+++ b/docs/quick_tutorial/scaffolds/scaffolds/static/pyramid-small.png
diff --git a/docs/quick_tutorial/scaffolds/scaffolds/static/pyramid.png b/docs/quick_tutorial/scaffolds/scaffolds/static/pyramid.png
new file mode 100644
index 000000000..347e05549
--- /dev/null
+++ b/docs/quick_tutorial/scaffolds/scaffolds/static/pyramid.png
diff --git a/docs/quick_tutorial/scaffolds/scaffolds/static/transparent.gif b/docs/quick_tutorial/scaffolds/scaffolds/static/transparent.gif
new file mode 100644
index 000000000..0341802e5
--- /dev/null
+++ b/docs/quick_tutorial/scaffolds/scaffolds/static/transparent.gif
diff --git a/docs/quick_tutorial/scaffolds/scaffolds/templates/mytemplate.pt b/docs/quick_tutorial/scaffolds/scaffolds/templates/mytemplate.pt
new file mode 100644
index 000000000..b43a174e3
--- /dev/null
+++ b/docs/quick_tutorial/scaffolds/scaffolds/templates/mytemplate.pt
@@ -0,0 +1,73 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" xmlns:tal="http://xml.zope.org/namespaces/tal">
+<head>
+  <title>The Pyramid Web Framework</title>
+  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+  <meta name="keywords" content="python web application" />
+  <meta name="description" content="pyramid web application" />
+  <link rel="shortcut icon" href="${request.static_url('scaffolds:static/favicon.ico')}" />
+  <link rel="stylesheet" href="${request.static_url('scaffolds:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
+  <link rel="stylesheet" href="http://static.pylonsproject.org/fonts/nobile/stylesheet.css" media="screen" />
+  <link rel="stylesheet" href="http://static.pylonsproject.org/fonts/neuton/stylesheet.css" media="screen" />
+  <!--[if lte IE 6]>
+  <link rel="stylesheet" href="${request.static_url('scaffolds:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
+  <![endif]-->
+</head>
+<body>
+  <div id="wrap">
+    <div id="top">
+      <div class="top align-center">
+          <div><img src="${request.static_url('scaffolds:static/pyramid.png')}" width="750" height="169" alt="pyramid"/></div>
+      </div>
+    </div>
+    <div id="middle">
+      <div class="middle align-center">
+        <p class="app-welcome">
+          Welcome to <span class="app-name">${project}</span>, an application generated by<br/>
+          the Pyramid Web Framework.
+        </p>
+      </div>
+    </div>
+    <div id="bottom">
+      <div class="bottom">
+        <div id="left" class="align-right">
+          <h2>Search documentation</h2>
+          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/search.html">
+                <input type="text" id="q" name="q" value="" />
+                <input type="submit" id="x" value="Go" />
+            </form>
+        </div>
+        <div id="right" class="align-left">
+          <h2>Pyramid links</h2>
+          <ul class="links">
+            <li>
+              <a href="http://pylonsproject.org">Pylons Website</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/#narrative-documentation">Narrative Documentation</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/#reference-material">API Documentation</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/#tutorials">Tutorials</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/#detailed-change-history">Change History</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/#sample-applications">Sample Applications</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/en/1.4-branch/#support-and-development">Support and Development</a>
+            </li>
+            <li>
+              <a href="irc://irc.freenode.net#pyramid">IRC Channel</a>
+            </li>
+            </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+</body>
+</html>
diff --git a/docs/quick_tutorial/scaffolds/scaffolds/tests.py b/docs/quick_tutorial/scaffolds/scaffolds/tests.py
new file mode 100644
index 000000000..4f906ffa9
--- /dev/null
+++ b/docs/quick_tutorial/scaffolds/scaffolds/tests.py
@@ -0,0 +1,17 @@
+import unittest
+
+from pyramid import testing
+
+
+class ViewTests(unittest.TestCase):
+    def setUp(self):
+        self.config = testing.setUp()
+
+    def tearDown(self):
+        testing.tearDown()
+
+    def test_my_view(self):
+        from .views import my_view
+        request = testing.DummyRequest()
+        info = my_view(request)
+        self.assertEqual(info['project'], 'scaffolds')
diff --git a/docs/quick_tutorial/scaffolds/scaffolds/views.py b/docs/quick_tutorial/scaffolds/scaffolds/views.py
new file mode 100644
index 000000000..db90d8364
--- /dev/null
+++ b/docs/quick_tutorial/scaffolds/scaffolds/views.py
@@ -0,0 +1,6 @@
+from pyramid.view import view_config
+
+
+@view_config(route_name='home', renderer='templates/mytemplate.pt')
+def my_view(request):
+    return {'project': 'scaffolds'}
diff --git a/docs/quick_tutorial/scaffolds/setup.cfg b/docs/quick_tutorial/scaffolds/setup.cfg
new file mode 100644
index 000000000..c980261e3
--- /dev/null
+++ b/docs/quick_tutorial/scaffolds/setup.cfg
@@ -0,0 +1,27 @@
+[nosetests]
+match = ^test
+nocapture = 1
+cover-package = scaffolds
+with-coverage = 1
+cover-erase = 1
+
+[compile_catalog]
+directory = scaffolds/locale
+domain = scaffolds
+statistics = true
+
+[extract_messages]
+add_comments = TRANSLATORS:
+output_file = scaffolds/locale/scaffolds.pot
+width = 80
+
+[init_catalog]
+domain = scaffolds
+input_file = scaffolds/locale/scaffolds.pot
+output_dir = scaffolds/locale
+
+[update_catalog]
+domain = scaffolds
+input_file = scaffolds/locale/scaffolds.pot
+output_dir = scaffolds/locale
+previous = true
diff --git a/docs/quick_tutorial/scaffolds/setup.py b/docs/quick_tutorial/scaffolds/setup.py
new file mode 100644
index 000000000..ec95946a5
--- /dev/null
+++ b/docs/quick_tutorial/scaffolds/setup.py
@@ -0,0 +1,42 @@
+import os
+
+from setuptools import setup, find_packages
+
+here = os.path.abspath(os.path.dirname(__file__))
+with open(os.path.join(here, 'README.txt')) as f:
+    README = f.read()
+with open(os.path.join(here, 'CHANGES.txt')) as f:
+    CHANGES = f.read()
+
+requires = [
+    'pyramid',
+    'pyramid_chameleon',
+    'pyramid_debugtoolbar',
+    'waitress',
+    ]
+
+setup(name='scaffolds',
+      version='0.0',
+      description='scaffolds',
+      long_description=README + '\n\n' + CHANGES,
+      classifiers=[
+        "Programming Language :: Python",
+        "Framework :: Pyramid",
+        "Topic :: Internet :: WWW/HTTP",
+        "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
+        ],
+      author='',
+      author_email='',
+      url='',
+      keywords='web pyramid pylons',
+      packages=find_packages(),
+      include_package_data=True,
+      zip_safe=False,
+      install_requires=requires,
+      tests_require=requires,
+      test_suite="scaffolds",
+      entry_points="""\
+      [paste.app_factory]
+      main = scaffolds:main
+      """,
+      )
diff --git a/docs/quick_tutorial/sessions.rst b/docs/quick_tutorial/sessions.rst
new file mode 100644
index 000000000..ba26d0133
--- /dev/null
+++ b/docs/quick_tutorial/sessions.rst
@@ -0,0 +1,100 @@
+.. _qtut_sessions:
+
+=================================
+17: Transient Data Using Sessions
+=================================
+
+Store and retrieve non-permanent data in Pyramid sessions.
+
+Background
+==========
+
+When people use your web application, they frequently perform a task
+that requires semi-permanent data to be saved. For example, a shopping
+cart. This is called a :term:`session`.
+
+Pyramid has basic built-in support for sessions, with add-ons such as
+*dogpile.cache* (or your own custom sessioning engine) that provide
+richer session support. Let's take a look at the
+:ref:`built-in sessioning support <sessions_chapter>`.
+
+Objectives
+==========
+
+- Make a session factory using a built-in, simple Pyramid sessioning
+  system
+
+- Change our code to use a session
+
+Steps
+=====
+
+#. First we copy the results of the ``view_classes`` step:
+
+   .. code-block:: bash
+
+    $ cd ..; cp -r view_classes sessions; cd sessions
+    $ $VENV/bin/python setup.py develop
+
+#. Our ``sessions/tutorial/__init__.py`` needs a choice of session
+   factory to get registered with the :term:`configurator`:
+
+   .. literalinclude:: sessions/tutorial/__init__.py
+    :linenos:
+
+#. Our views in ``sessions/tutorial/views.py`` can now use
+   ``request.session``:
+
+   .. literalinclude:: sessions/tutorial/views.py
+    :linenos:
+
+#. The template at ``sessions/tutorial/home.pt`` can display the value:
+
+   .. literalinclude:: sessions/tutorial/home.pt
+    :language: html
+    :linenos:
+
+#. Make sure the tests still pass:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/nosetests tutorial
+
+#. Run your Pyramid application with:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/pserve development.ini --reload
+
+#. Open http://localhost:6543/ and http://localhost:6543/howdy
+   in your browser. As you reload and switch between those URLs, note
+   that the counter increases and is *not* specific to the URL.
+
+#. Restart the application and revisit the page. Note that counter
+   still increases from where it left off.
+
+Analysis
+========
+
+Pyramid's :term:`request` object now has a ``session`` attribute
+that we can use in our view code. It acts like a dictionary.
+
+Since all the views are using the same counter, we made the counter a
+Python property at the view class level. With this, each reload will
+increase the counter displayed in our template.
+
+In web development, "flash messages" are notes for the user that need
+to appear on a screen after a future web request. For example,
+when you add an item using a form ``POST``, the site usually issues a
+second HTTP Redirect web request to view the new item. You might want a
+message to appear after that second web request saying "Your item was
+added." You can't just return it in the web response for the POST,
+as it will be tossed out during the second web requests.
+
+Flash messages are a technique where messages can be stored between
+requests, using sessions, then removed when they finally get displayed.
+
+.. seealso::
+   :ref:`sessions_chapter`,
+   :ref:`flash_messages`, and
+   :ref:`session_module`.
diff --git a/docs/quick_tutorial/sessions/development.ini b/docs/quick_tutorial/sessions/development.ini
new file mode 100644
index 000000000..62e0c5123
--- /dev/null
+++ b/docs/quick_tutorial/sessions/development.ini
@@ -0,0 +1,41 @@
+[app:main]
+use = egg:tutorial
+pyramid.reload_templates = true
+pyramid.includes =
+    pyramid_debugtoolbar
+
+[server:main]
+use = egg:pyramid#wsgiref
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, tutorial
+
+[logger_tutorial]
+level = DEBUG
+handlers =
+qualname = tutorial
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
diff --git a/docs/quick_tutorial/sessions/setup.py b/docs/quick_tutorial/sessions/setup.py
new file mode 100644
index 000000000..2221b72e9
--- /dev/null
+++ b/docs/quick_tutorial/sessions/setup.py
@@ -0,0 +1,14 @@
+from setuptools import setup
+
+requires = [
+    'pyramid',
+    'pyramid_chameleon'
+]
+
+setup(name='tutorial',
+      install_requires=requires,
+      entry_points="""\
+      [paste.app_factory]
+      main = tutorial:main
+      """,
+)
\ No newline at end of file
diff --git a/docs/quick_tutorial/sessions/tutorial/__init__.py b/docs/quick_tutorial/sessions/tutorial/__init__.py
new file mode 100644
index 000000000..ecf57bb32
--- /dev/null
+++ b/docs/quick_tutorial/sessions/tutorial/__init__.py
@@ -0,0 +1,14 @@
+from pyramid.config import Configurator
+from pyramid.session import UnencryptedCookieSessionFactoryConfig
+
+
+def main(global_config, **settings):
+    my_session_factory = UnencryptedCookieSessionFactoryConfig(
+        'itsaseekreet')
+    config = Configurator(settings=settings,
+                          session_factory=my_session_factory)
+    config.include('pyramid_chameleon')
+    config.add_route('home', '/')
+    config.add_route('hello', '/howdy')
+    config.scan('.views')
+    return config.make_wsgi_app()
\ No newline at end of file
diff --git a/docs/quick_tutorial/sessions/tutorial/home.pt b/docs/quick_tutorial/sessions/tutorial/home.pt
new file mode 100644
index 000000000..0b27ba1d8
--- /dev/null
+++ b/docs/quick_tutorial/sessions/tutorial/home.pt
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Quick Tour: ${name}</title>
+</head>
+<body>
+<h1>Hi ${name}</h1>
+<p>Count: ${view.counter}</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/quick_tutorial/sessions/tutorial/tests.py b/docs/quick_tutorial/sessions/tutorial/tests.py
new file mode 100644
index 000000000..4381235ec
--- /dev/null
+++ b/docs/quick_tutorial/sessions/tutorial/tests.py
@@ -0,0 +1,44 @@
+import unittest
+
+from pyramid import testing
+
+
+class TutorialViewTests(unittest.TestCase):
+    def setUp(self):
+        self.config = testing.setUp()
+
+    def tearDown(self):
+        testing.tearDown()
+
+    def test_home(self):
+        from .views import TutorialViews
+
+        request = testing.DummyRequest()
+        inst = TutorialViews(request)
+        response = inst.home()
+        self.assertEqual('Home View', response['name'])
+
+    def test_hello(self):
+        from .views import TutorialViews
+
+        request = testing.DummyRequest()
+        inst = TutorialViews(request)
+        response = inst.hello()
+        self.assertEqual('Hello View', response['name'])
+
+
+class TutorialFunctionalTests(unittest.TestCase):
+    def setUp(self):
+        from tutorial import main
+        app = main({})
+        from webtest import TestApp
+
+        self.testapp = TestApp(app)
+
+    def test_home(self):
+        res = self.testapp.get('/', status=200)
+        self.assertIn(b'<h1>Hi Home View', res.body)
+
+    def test_hello(self):
+        res = self.testapp.get('/howdy', status=200)
+        self.assertIn(b'<h1>Hi Hello View', res.body)
diff --git a/docs/quick_tutorial/sessions/tutorial/views.py b/docs/quick_tutorial/sessions/tutorial/views.py
new file mode 100644
index 000000000..a4659d265
--- /dev/null
+++ b/docs/quick_tutorial/sessions/tutorial/views.py
@@ -0,0 +1,29 @@
+from pyramid.view import (
+    view_config,
+    view_defaults
+    )
+
+
+@view_defaults(renderer='home.pt')
+class TutorialViews:
+    def __init__(self, request):
+        self.request = request
+
+    @property
+    def counter(self):
+        session = self.request.session
+        if 'counter' in session:
+            session['counter'] += 1
+        else:
+            session['counter'] = 1
+
+        return session['counter']
+
+
+    @view_config(route_name='home')
+    def home(self):
+        return {'name': 'Home View'}
+
+    @view_config(route_name='hello')
+    def hello(self):
+        return {'name': 'Hello View'}
diff --git a/docs/quick_tutorial/static_assets.rst b/docs/quick_tutorial/static_assets.rst
new file mode 100644
index 000000000..19d33f00f
--- /dev/null
+++ b/docs/quick_tutorial/static_assets.rst
@@ -0,0 +1,91 @@
+.. _qtut_static_assets:
+
+==========================================
+13: CSS/JS/Images Files With Static Assets
+==========================================
+
+Of course the Web is more than just markup. You need static assets:
+CSS, JS, and images. Let's point our web app at a directory where
+Pyramid will serve some static assets.
+
+Objectives
+==========
+
+- Publish a directory of static assets at a URL
+
+- Use Pyramid to help generate URLs to files in that directory
+
+Steps
+=====
+
+#. First we copy the results of the ``view_classes`` step:
+
+   .. code-block:: bash
+
+    $ cd ..; cp -r view_classes static_assets; cd static_assets
+    $ $VENV/bin/python setup.py develop
+
+#. We add a call ``config.add_static_view in
+   ``static_assets/tutorial/__init__.py``:
+
+   .. literalinclude:: static_assets/tutorial/__init__.py
+    :linenos:
+
+#. We can add a CSS link in the ``<head>`` of our template at
+   ``static_assets/tutorial/home.pt``:
+
+   .. literalinclude:: static_assets/tutorial/home.pt
+    :language: html
+
+#. Add a CSS file at
+   ``static_assets/tutorial/static/app.css``:
+
+   .. literalinclude:: static_assets/tutorial/static/app.css
+    :language: css
+
+#. Make sure we haven't broken any existing code by running the tests:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/nosetests tutorial
+
+#. Run your Pyramid application with:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/pserve development.ini --reload
+
+#. Open http://localhost:6543/ in your browser and note the new font.
+
+Analysis
+========
+
+We changed our WSGI application to map requests under
+http://localhost:6543/static/ to files and directories inside a
+``static`` directory inside our ``tutorial`` package. This directory
+contained ``app.css``.
+
+We linked to the CSS in our template. We could have hard-coded this
+link to ``/static/app.css``. But what if the site is later moved under
+``/somesite/static/``? Or perhaps the web developer changes the
+arrangement on disk? Pyramid gives a helper that provides flexibility
+on URL generation:
+
+.. code-block:: html
+
+  ${request.static_url('tutorial:static/app.css')}
+
+This matches the ``path='tutorial:static'`` in our
+``config.add_static_view`` registration. By using ``request.static_url``
+to generate the full URL to the static assets, you both ensure you stay
+in sync with the configuration and gain refactoring flexibility later.
+
+Extra Credit
+============
+
+#. There is also a ``request.static_path`` API.  How does this differ from 
+   ``request.static_url``?
+
+.. seealso:: :ref:`assets_chapter`,
+   :ref:`preventing_http_caching`, and
+   :ref:`influencing_http_caching`
diff --git a/docs/quick_tutorial/static_assets/development.ini b/docs/quick_tutorial/static_assets/development.ini
new file mode 100644
index 000000000..62e0c5123
--- /dev/null
+++ b/docs/quick_tutorial/static_assets/development.ini
@@ -0,0 +1,41 @@
+[app:main]
+use = egg:tutorial
+pyramid.reload_templates = true
+pyramid.includes =
+    pyramid_debugtoolbar
+
+[server:main]
+use = egg:pyramid#wsgiref
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, tutorial
+
+[logger_tutorial]
+level = DEBUG
+handlers =
+qualname = tutorial
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
diff --git a/docs/quick_tutorial/static_assets/setup.py b/docs/quick_tutorial/static_assets/setup.py
new file mode 100644
index 000000000..2221b72e9
--- /dev/null
+++ b/docs/quick_tutorial/static_assets/setup.py
@@ -0,0 +1,14 @@
+from setuptools import setup
+
+requires = [
+    'pyramid',
+    'pyramid_chameleon'
+]
+
+setup(name='tutorial',
+      install_requires=requires,
+      entry_points="""\
+      [paste.app_factory]
+      main = tutorial:main
+      """,
+)
\ No newline at end of file
diff --git a/docs/quick_tutorial/static_assets/tutorial/__init__.py b/docs/quick_tutorial/static_assets/tutorial/__init__.py
new file mode 100644
index 000000000..e244c2997
--- /dev/null
+++ b/docs/quick_tutorial/static_assets/tutorial/__init__.py
@@ -0,0 +1,11 @@
+from pyramid.config import Configurator
+
+
+def main(global_config, **settings):
+    config = Configurator(settings=settings)
+    config.include('pyramid_chameleon')
+    config.add_route('home', '/')
+    config.add_route('hello', '/howdy')
+    config.add_static_view(name='static', path='tutorial:static')
+    config.scan('.views')
+    return config.make_wsgi_app()
\ No newline at end of file
diff --git a/docs/quick_tutorial/static_assets/tutorial/home.pt b/docs/quick_tutorial/static_assets/tutorial/home.pt
new file mode 100644
index 000000000..5d347f057
--- /dev/null
+++ b/docs/quick_tutorial/static_assets/tutorial/home.pt
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Quick Tour: ${name}</title>
+    <link rel="stylesheet"
+          href="${request.static_url('tutorial:static/app.css') }"/>
+</head>
+<body>
+<h1>Hi ${name}</h1>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/quick_tutorial/static_assets/tutorial/static/app.css b/docs/quick_tutorial/static_assets/tutorial/static/app.css
new file mode 100644
index 000000000..f8acf3164
--- /dev/null
+++ b/docs/quick_tutorial/static_assets/tutorial/static/app.css
@@ -0,0 +1,4 @@
+body {
+    margin: 2em;
+    font-family: sans-serif;
+}
\ No newline at end of file
diff --git a/docs/quick_tutorial/static_assets/tutorial/tests.py b/docs/quick_tutorial/static_assets/tutorial/tests.py
new file mode 100644
index 000000000..4381235ec
--- /dev/null
+++ b/docs/quick_tutorial/static_assets/tutorial/tests.py
@@ -0,0 +1,44 @@
+import unittest
+
+from pyramid import testing
+
+
+class TutorialViewTests(unittest.TestCase):
+    def setUp(self):
+        self.config = testing.setUp()
+
+    def tearDown(self):
+        testing.tearDown()
+
+    def test_home(self):
+        from .views import TutorialViews
+
+        request = testing.DummyRequest()
+        inst = TutorialViews(request)
+        response = inst.home()
+        self.assertEqual('Home View', response['name'])
+
+    def test_hello(self):
+        from .views import TutorialViews
+
+        request = testing.DummyRequest()
+        inst = TutorialViews(request)
+        response = inst.hello()
+        self.assertEqual('Hello View', response['name'])
+
+
+class TutorialFunctionalTests(unittest.TestCase):
+    def setUp(self):
+        from tutorial import main
+        app = main({})
+        from webtest import TestApp
+
+        self.testapp = TestApp(app)
+
+    def test_home(self):
+        res = self.testapp.get('/', status=200)
+        self.assertIn(b'<h1>Hi Home View', res.body)
+
+    def test_hello(self):
+        res = self.testapp.get('/howdy', status=200)
+        self.assertIn(b'<h1>Hi Hello View', res.body)
diff --git a/docs/quick_tutorial/static_assets/tutorial/views.py b/docs/quick_tutorial/static_assets/tutorial/views.py
new file mode 100644
index 000000000..a56c0adbf
--- /dev/null
+++ b/docs/quick_tutorial/static_assets/tutorial/views.py
@@ -0,0 +1,18 @@
+from pyramid.view import (
+    view_config,
+    view_defaults
+    )
+
+
+@view_defaults(renderer='home.pt')
+class TutorialViews:
+    def __init__(self, request):
+        self.request = request
+
+    @view_config(route_name='home')
+    def home(self):
+        return {'name': 'Home View'}
+
+    @view_config(route_name='hello')
+    def hello(self):
+        return {'name': 'Hello View'}
diff --git a/docs/quick_tutorial/templating.rst b/docs/quick_tutorial/templating.rst
new file mode 100644
index 000000000..d73067f48
--- /dev/null
+++ b/docs/quick_tutorial/templating.rst
@@ -0,0 +1,123 @@
+.. _qtut_templating:
+
+===================================
+08: HTML Generation With Templating
+===================================
+
+Most web frameworks don't embed HTML in programming code. Instead,
+they pass data into a templating system. In this step we look at the
+basics of using HTML templates in Pyramid.
+
+Background
+==========
+
+Ouch. We have been making our own ``Response`` and filling the response
+body with HTML. You usually won't embed an HTML string directly in
+Python, but instead, will use a templating language.
+
+Pyramid doesn't mandate a particular database system, form library,
+etc. It encourages replaceability. This applies equally to templating,
+which is fortunate: developers have strong views about template
+languages. As of Pyramid 1.5a2, Pyramid doesn't even bundle a template
+language!
+
+It does, however, have strong ties to Jinja2, Mako, and Chameleon. In
+this step we see how to add ``pyramid_chameleon`` to your project,
+then change your views to use templating.
+
+Objectives
+==========
+
+- Enable the ``pyramid_chameleon`` Pyramid add-on
+
+- Generate HTML from template files
+
+- Connect the templates as "renderers" for view code
+
+- Change the view code to simply return data
+
+Steps
+=====
+
+#. Let's begin by using the previous package as a starting point for a
+   new project:
+
+   .. code-block:: bash
+
+    $ cd ..; cp -r views templating; cd templating
+
+#. This step depends on ``pyramid_chameleon``, so add it as a dependency
+   in ``templating/setup.py``:
+
+   .. literalinclude:: templating/setup.py
+    :linenos:
+
+#. Now we can activate the development-mode distribution:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/python setup.py develop
+
+#. We need to connect ``pyramid_chameleon`` as a renderer by making a
+   call in the setup of ``templating/tutorial/__init__.py``:
+
+   .. literalinclude:: templating/tutorial/__init__.py
+    :linenos:
+
+#. Our ``templating/tutorial/views.py`` no longer has HTML in it:
+
+   .. literalinclude:: templating/tutorial/views.py
+    :linenos:
+
+#. Instead we have ``templating/tutorial/home.pt`` as a template:
+
+   .. literalinclude:: templating/tutorial/home.pt
+    :language: html
+
+#. For convenience, change ``templating/development.ini`` to reload
+   templates automatically with ``pyramid.reload_templates``:
+
+   .. literalinclude:: templating/development.ini
+    :language: ini
+
+#. Our unit tests in ``templating/tutorial/tests.py`` can focus on
+   data:
+
+   .. literalinclude:: templating/tutorial/tests.py
+    :linenos:
+
+#. Now run the tests:
+
+   .. code-block:: bash
+
+
+    $ $VENV/bin/nosetests tutorial
+    .
+    ----------------------------------------------------------------------
+    Ran 4 tests in 0.141s
+
+    OK
+
+#. Run your Pyramid application with:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/pserve development.ini --reload
+
+#. Open http://localhost:6543/ and http://localhost:6543/howdy
+   in your browser.
+
+Analysis
+========
+
+Ahh, that looks better. We have a view that is focused on Python code.
+Our ``@view_config`` decorator specifies a :term:`renderer` that points
+our template file. Our view then simply returns data which is then
+supplied to our template. Note that we used the same template for both
+views.
+
+Note the effect on testing. We can focus on having a data-oriented
+contract with our view code.
+
+.. seealso:: :ref:`templates_chapter`, :ref:`debugging_templates`, and
+   :ref:`available_template_system_bindings`.
diff --git a/docs/quick_tutorial/templating/development.ini b/docs/quick_tutorial/templating/development.ini
new file mode 100644
index 000000000..62e0c5123
--- /dev/null
+++ b/docs/quick_tutorial/templating/development.ini
@@ -0,0 +1,41 @@
+[app:main]
+use = egg:tutorial
+pyramid.reload_templates = true
+pyramid.includes =
+    pyramid_debugtoolbar
+
+[server:main]
+use = egg:pyramid#wsgiref
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, tutorial
+
+[logger_tutorial]
+level = DEBUG
+handlers =
+qualname = tutorial
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
diff --git a/docs/quick_tutorial/templating/setup.py b/docs/quick_tutorial/templating/setup.py
new file mode 100644
index 000000000..2221b72e9
--- /dev/null
+++ b/docs/quick_tutorial/templating/setup.py
@@ -0,0 +1,14 @@
+from setuptools import setup
+
+requires = [
+    'pyramid',
+    'pyramid_chameleon'
+]
+
+setup(name='tutorial',
+      install_requires=requires,
+      entry_points="""\
+      [paste.app_factory]
+      main = tutorial:main
+      """,
+)
\ No newline at end of file
diff --git a/docs/quick_tutorial/templating/tutorial/__init__.py b/docs/quick_tutorial/templating/tutorial/__init__.py
new file mode 100644
index 000000000..c3e1c9eef
--- /dev/null
+++ b/docs/quick_tutorial/templating/tutorial/__init__.py
@@ -0,0 +1,10 @@
+from pyramid.config import Configurator
+
+
+def main(global_config, **settings):
+    config = Configurator(settings=settings)
+    config.include('pyramid_chameleon')
+    config.add_route('home', '/')
+    config.add_route('hello', '/howdy')
+    config.scan('.views')
+    return config.make_wsgi_app()
\ No newline at end of file
diff --git a/docs/quick_tutorial/templating/tutorial/home.pt b/docs/quick_tutorial/templating/tutorial/home.pt
new file mode 100644
index 000000000..a0cc08e7a
--- /dev/null
+++ b/docs/quick_tutorial/templating/tutorial/home.pt
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Quick Tour: ${name}</title>
+</head>
+<body>
+<h1>Hi ${name}</h1>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/quick_tutorial/templating/tutorial/tests.py b/docs/quick_tutorial/templating/tutorial/tests.py
new file mode 100644
index 000000000..d06a62982
--- /dev/null
+++ b/docs/quick_tutorial/templating/tutorial/tests.py
@@ -0,0 +1,44 @@
+import unittest
+
+from pyramid import testing
+
+
+class TutorialViewTests(unittest.TestCase):
+    def setUp(self):
+        self.config = testing.setUp()
+
+    def tearDown(self):
+        testing.tearDown()
+
+    def test_home(self):
+        from .views import home
+
+        request = testing.DummyRequest()
+        response = home(request)
+        # Our view now returns data
+        self.assertEqual('Home View', response['name'])
+
+    def test_hello(self):
+        from .views import hello
+
+        request = testing.DummyRequest()
+        response = hello(request)
+        # Our view now returns data
+        self.assertEqual('Hello View', response['name'])
+
+
+class TutorialFunctionalTests(unittest.TestCase):
+    def setUp(self):
+        from tutorial import main
+        app = main({})
+        from webtest import TestApp
+
+        self.testapp = TestApp(app)
+
+    def test_home(self):
+        res = self.testapp.get('/', status=200)
+        self.assertIn(b'<h1>Hi Home View', res.body)
+
+    def test_hello(self):
+        res = self.testapp.get('/howdy', status=200)
+        self.assertIn(b'<h1>Hi Hello View', res.body)
diff --git a/docs/quick_tutorial/templating/tutorial/views.py b/docs/quick_tutorial/templating/tutorial/views.py
new file mode 100644
index 000000000..979d69c43
--- /dev/null
+++ b/docs/quick_tutorial/templating/tutorial/views.py
@@ -0,0 +1,13 @@
+from pyramid.view import view_config
+
+
+# First view, available at http://localhost:6543/
+@view_config(route_name='home', renderer='home.pt')
+def home(request):
+    return {'name': 'Home View'}
+
+
+# /howdy
+@view_config(route_name='hello', renderer='home.pt')
+def hello(request):
+    return {'name': 'Hello View'}
diff --git a/docs/quick_tutorial/tutorial_approach.rst b/docs/quick_tutorial/tutorial_approach.rst
new file mode 100644
index 000000000..52d768306
--- /dev/null
+++ b/docs/quick_tutorial/tutorial_approach.rst
@@ -0,0 +1,45 @@
+=================
+Tutorial Approach
+=================
+
+This tutorial uses conventions to keep the introduction focused and
+concise. Details, references, and deeper discussions are mentioned in
+"See Also" notes.
+
+.. seealso:: This is an example "See Also" note.
+
+This "Getting Started" tutorial is broken into independent steps,
+starting with the smallest possible "single file WSGI app" example.
+Each of these steps introduce a topic and a very small set of concepts
+via working code. The steps each correspond to a directory in this
+repo, where each step/topic/directory is a Python package.
+
+To successfully run each step::
+
+  $ cd request_response
+  $ $VENV/bin/python setup.py develop
+
+...and repeat for each step you would like to work on. In most cases we
+will start with the results of an earlier step.
+
+Directory Tree
+==============
+
+As we develop our tutorial our directory tree will resemble the
+structure below::
+
+  quicktutorial/
+    request_response/
+      development.ini
+      setup.py
+      tutorial/
+        __init__.py
+        home.pt
+        tests.py
+        views.py
+
+Each of the first-level directories (e.g. ``request_response``) is a
+*Python project* (except, as noted, the ``hello_world`` step.) The
+``tutorial`` directory is a *Python package*. At the end of each step,
+we copy a previous directory into a new directory to use as a starting
+point.
\ No newline at end of file
diff --git a/docs/quick_tutorial/unit_testing.rst b/docs/quick_tutorial/unit_testing.rst
new file mode 100644
index 000000000..73b33c588
--- /dev/null
+++ b/docs/quick_tutorial/unit_testing.rst
@@ -0,0 +1,119 @@
+.. _qtut_unit_testing:
+
+===========================
+05: Unit Tests and ``nose``
+===========================
+
+Provide unit testing for our project's Python code.
+
+Background
+==========
+
+As the mantra says, "Untested code is broken code." The Python
+community has had a long culture of writing test scripts which ensure
+that your code works correctly as you write it and maintain it in the
+future. Pyramid has always had a deep commitment to testing,
+with 100% test coverage from the earliest pre-releases.
+
+Python includes a
+:ref:`unit testing framework <python:unittest-minimal-example>` in its
+standard library. Over the years a number of Python projects, such as
+`nose <https://pypi.python.org/pypi/nose/>`_, have extended this
+framework with alternative test runners that provide more convenience
+and functionality. The Pyramid developers use ``nose``, which we'll thus
+use in this tutorial.
+
+Don't worry, this tutorial won't be pedantic about "test-driven
+development" (TDD.) We'll do just enough to ensure that, in each step,
+we haven't majorly broken the code. As you're writing your code you
+might find this more convenient than changing to your browser
+constantly and clicking reload.
+
+We'll also leave discussion of
+`coverage <https://pypi.python.org/pypi/coverage>`_ for another section.
+
+Objectives
+==========
+
+- Write unit tests that ensure the quality of our code
+
+- Install a Python package (``nose``) which helps in our testing
+
+Steps
+=====
+
+#. First we copy the results of the previous step, as well as install
+   the ``nose`` package:
+
+   .. code-block:: bash
+
+    $ cd ..; cp -r debugtoolbar unit_testing; cd unit_testing
+    $ $VENV/bin/python setup.py develop
+    $ $VENV/bin/easy_install nose
+
+#. Now we write a simple unit test in ``unit_testing/tutorial/tests.py``:
+
+   .. literalinclude:: unit_testing/tutorial/tests.py
+    :linenos:
+
+#. Now run the tests:
+
+   .. code-block:: bash
+
+
+    $ $VENV/bin/nosetests tutorial
+    .
+    ----------------------------------------------------------------------
+    Ran 1 test in 0.141s
+
+    OK
+
+Analysis
+========
+
+Our ``tests.py`` imports the Python standard unit testing framework. To
+make writing Pyramid-oriented tests more convenient, Pyramid supplies
+some ``pyramid.testing`` helpers which we use in the test setup and
+teardown. Our one test imports the view, makes a dummy request, and sees
+if the view returns what we expected.
+
+The ``tests.HelloWorldViewTests.test_hello_world`` test is a small
+example of a unit test. First, we import the view inside each test. Why
+not import at the top, like in normal Python code? Because imports can
+cause effects that break a test. We'd like our tests to be in *units*,
+hence the name *unit* testing. Each test should isolate itself to the
+correct degree.
+
+Our test then makes a fake incoming web request, then calls our Pyramid
+view. We test the HTTP status code on the response to make sure it
+matches our expectations.
+
+Note that our use of ``pyramid.testing.setUp()`` and
+``pyramid.testing.tearDown()`` aren't actually necessary here; they are only
+necessary when your test needs to make use of the ``config`` object (it's a
+Configurator) to add stuff to the configuration state before calling the view.
+
+Extra Credit
+============
+
+#. Change the test to assert that the response status code should be
+   ``404`` (meaning, not found.) Run ``nosetests`` again. Read the
+   error report and see if you can decipher what it is telling you.
+
+#. As a more realistic example, put the ``tests.py`` back as you found
+   it and put an error in your view, such as a reference to a
+   non-existing variable. Run the tests and see how this is more
+   convenient than reloading your browser and going back to your code.
+
+#. Finally, for the most realistic test, read about Pyramid ``Response``
+   objects and see how to change the response code. Run the tests and
+   see how testing confirms the "contract" that your code claims to
+   support.
+
+#. How could we add a unit test assertion to test the HTML value of the
+   response body?
+
+#. Why do we import the ``hello_world`` view function *inside* the
+   ``test_hello_world`` method instead of at the top of the module?
+
+.. seealso:: See Also: :ref:`testing_chapter`
diff --git a/docs/quick_tutorial/unit_testing/development.ini b/docs/quick_tutorial/unit_testing/development.ini
new file mode 100644
index 000000000..470d92c57
--- /dev/null
+++ b/docs/quick_tutorial/unit_testing/development.ini
@@ -0,0 +1,40 @@
+[app:main]
+use = egg:tutorial
+pyramid.includes =
+    pyramid_debugtoolbar
+
+[server:main]
+use = egg:pyramid#wsgiref
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, tutorial
+
+[logger_tutorial]
+level = DEBUG
+handlers =
+qualname = tutorial
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
diff --git a/docs/quick_tutorial/unit_testing/setup.py b/docs/quick_tutorial/unit_testing/setup.py
new file mode 100644
index 000000000..9997984d3
--- /dev/null
+++ b/docs/quick_tutorial/unit_testing/setup.py
@@ -0,0 +1,13 @@
+from setuptools import setup
+
+requires = [
+    'pyramid',
+]
+
+setup(name='tutorial',
+      install_requires=requires,
+      entry_points="""\
+      [paste.app_factory]
+      main = tutorial:main
+      """,
+)
\ No newline at end of file
diff --git a/docs/quick_tutorial/unit_testing/tutorial/__init__.py b/docs/quick_tutorial/unit_testing/tutorial/__init__.py
new file mode 100644
index 000000000..2b4e84f30
--- /dev/null
+++ b/docs/quick_tutorial/unit_testing/tutorial/__init__.py
@@ -0,0 +1,13 @@
+from pyramid.config import Configurator
+from pyramid.response import Response
+
+
+def hello_world(request):
+    return Response('<body><h1>Hello World!</h1></body>')
+
+
+def main(global_config, **settings):
+    config = Configurator(settings=settings)
+    config.add_route('hello', '/')
+    config.add_view(hello_world, route_name='hello')
+    return config.make_wsgi_app()
\ No newline at end of file
diff --git a/docs/quick_tutorial/unit_testing/tutorial/tests.py b/docs/quick_tutorial/unit_testing/tutorial/tests.py
new file mode 100644
index 000000000..66029b421
--- /dev/null
+++ b/docs/quick_tutorial/unit_testing/tutorial/tests.py
@@ -0,0 +1,18 @@
+import unittest
+
+from pyramid import testing
+
+
+class TutorialViewTests(unittest.TestCase):
+    def setUp(self):
+        self.config = testing.setUp()
+
+    def tearDown(self):
+        testing.tearDown()
+
+    def test_hello_world(self):
+        from tutorial import hello_world
+
+        request = testing.DummyRequest()
+        response = hello_world(request)
+        self.assertEqual(response.status_code, 200)
diff --git a/docs/quick_tutorial/view_classes.rst b/docs/quick_tutorial/view_classes.rst
new file mode 100644
index 000000000..58ab43e40
--- /dev/null
+++ b/docs/quick_tutorial/view_classes.rst
@@ -0,0 +1,98 @@
+.. _qtut_view_classes:
+
+======================================
+09: Organizing Views With View Classes
+======================================
+
+Change our view functions to be methods on a view class,
+then move some declarations to the class level.
+
+Background
+==========
+
+So far our views have been simple, free-standing functions. Many times
+your views are related: different ways to look at or work on the same
+data or a REST API that handles multiple operations. Grouping these
+together as a
+:ref:`view class <class_as_view>` makes sense:
+
+- Group views
+
+- Centralize some repetitive defaults
+
+- Share some state and helpers
+
+In this step we just do the absolute minimum to convert the existing
+views to a view class. In a later tutorial step we'll examine view
+classes in depth.
+
+Objectives
+==========
+
+- Group related views into a view class
+
+- Centralize configuration with class-level ``@view_defaults``
+
+Steps
+=====
+
+
+#. First we copy the results of the previous step:
+
+   .. code-block:: bash
+
+    $ cd ..; cp -r templating view_classes; cd view_classes
+    $ $VENV/bin/python setup.py develop
+
+#. Our ``view_classes/tutorial/views.py`` now has a view class with
+   our two views:
+
+   .. literalinclude:: view_classes/tutorial/views.py
+    :linenos:
+
+#. Our unit tests in ``view_classes/tutorial/tests.py`` don't run,
+   so let's modify the to import the view class and make an instance
+   before getting a response:
+
+   .. literalinclude:: view_classes/tutorial/tests.py
+    :linenos:
+
+#. Now run the tests:
+
+   .. code-block:: bash
+
+
+    $ $VENV/bin/nosetests tutorial
+    .
+    ----------------------------------------------------------------------
+    Ran 4 tests in 0.141s
+
+    OK
+
+#. Run your Pyramid application with:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/pserve development.ini --reload
+
+#. Open http://localhost:6543/ and http://localhost:6543/howdy
+   in your browser.
+
+Analysis
+========
+
+To ease the transition to view classes, we didn't introduce any new
+functionality. We simply changed the view functions to methods on a
+view class, then updated the tests.
+
+In our ``TutorialViews`` view class you can see that our two view
+classes are logically grouped together as methods on a common class.
+Since the two views shared the same template, we could move that to a
+``@view_defaults`` decorator on at the class level.
+
+The tests needed to change. Obviously we needed to import the view
+class. But you can also see the pattern in the tests of instantiating
+the view class with the dummy request first, then calling the view
+method being tested.
+
+.. seealso:: :ref:`class_as_view`
diff --git a/docs/quick_tutorial/view_classes/development.ini b/docs/quick_tutorial/view_classes/development.ini
new file mode 100644
index 000000000..62e0c5123
--- /dev/null
+++ b/docs/quick_tutorial/view_classes/development.ini
@@ -0,0 +1,41 @@
+[app:main]
+use = egg:tutorial
+pyramid.reload_templates = true
+pyramid.includes =
+    pyramid_debugtoolbar
+
+[server:main]
+use = egg:pyramid#wsgiref
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, tutorial
+
+[logger_tutorial]
+level = DEBUG
+handlers =
+qualname = tutorial
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
diff --git a/docs/quick_tutorial/view_classes/setup.py b/docs/quick_tutorial/view_classes/setup.py
new file mode 100644
index 000000000..2221b72e9
--- /dev/null
+++ b/docs/quick_tutorial/view_classes/setup.py
@@ -0,0 +1,14 @@
+from setuptools import setup
+
+requires = [
+    'pyramid',
+    'pyramid_chameleon'
+]
+
+setup(name='tutorial',
+      install_requires=requires,
+      entry_points="""\
+      [paste.app_factory]
+      main = tutorial:main
+      """,
+)
\ No newline at end of file
diff --git a/docs/quick_tutorial/view_classes/tutorial/__init__.py b/docs/quick_tutorial/view_classes/tutorial/__init__.py
new file mode 100644
index 000000000..c3e1c9eef
--- /dev/null
+++ b/docs/quick_tutorial/view_classes/tutorial/__init__.py
@@ -0,0 +1,10 @@
+from pyramid.config import Configurator
+
+
+def main(global_config, **settings):
+    config = Configurator(settings=settings)
+    config.include('pyramid_chameleon')
+    config.add_route('home', '/')
+    config.add_route('hello', '/howdy')
+    config.scan('.views')
+    return config.make_wsgi_app()
\ No newline at end of file
diff --git a/docs/quick_tutorial/view_classes/tutorial/home.pt b/docs/quick_tutorial/view_classes/tutorial/home.pt
new file mode 100644
index 000000000..a0cc08e7a
--- /dev/null
+++ b/docs/quick_tutorial/view_classes/tutorial/home.pt
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Quick Tour: ${name}</title>
+</head>
+<body>
+<h1>Hi ${name}</h1>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/quick_tutorial/view_classes/tutorial/tests.py b/docs/quick_tutorial/view_classes/tutorial/tests.py
new file mode 100644
index 000000000..4381235ec
--- /dev/null
+++ b/docs/quick_tutorial/view_classes/tutorial/tests.py
@@ -0,0 +1,44 @@
+import unittest
+
+from pyramid import testing
+
+
+class TutorialViewTests(unittest.TestCase):
+    def setUp(self):
+        self.config = testing.setUp()
+
+    def tearDown(self):
+        testing.tearDown()
+
+    def test_home(self):
+        from .views import TutorialViews
+
+        request = testing.DummyRequest()
+        inst = TutorialViews(request)
+        response = inst.home()
+        self.assertEqual('Home View', response['name'])
+
+    def test_hello(self):
+        from .views import TutorialViews
+
+        request = testing.DummyRequest()
+        inst = TutorialViews(request)
+        response = inst.hello()
+        self.assertEqual('Hello View', response['name'])
+
+
+class TutorialFunctionalTests(unittest.TestCase):
+    def setUp(self):
+        from tutorial import main
+        app = main({})
+        from webtest import TestApp
+
+        self.testapp = TestApp(app)
+
+    def test_home(self):
+        res = self.testapp.get('/', status=200)
+        self.assertIn(b'<h1>Hi Home View', res.body)
+
+    def test_hello(self):
+        res = self.testapp.get('/howdy', status=200)
+        self.assertIn(b'<h1>Hi Hello View', res.body)
diff --git a/docs/quick_tutorial/view_classes/tutorial/views.py b/docs/quick_tutorial/view_classes/tutorial/views.py
new file mode 100644
index 000000000..58db53c4a
--- /dev/null
+++ b/docs/quick_tutorial/view_classes/tutorial/views.py
@@ -0,0 +1,17 @@
+from pyramid.view import (
+    view_config,
+    view_defaults
+    )
+
+@view_defaults(renderer='home.pt')
+class TutorialViews:
+    def __init__(self, request):
+        self.request = request
+
+    @view_config(route_name='home')
+    def home(self):
+        return {'name': 'Home View'}
+
+    @view_config(route_name='hello')
+    def hello(self):
+        return {'name': 'Hello View'}
diff --git a/docs/quick_tutorial/views.rst b/docs/quick_tutorial/views.rst
new file mode 100644
index 000000000..15785e902
--- /dev/null
+++ b/docs/quick_tutorial/views.rst
@@ -0,0 +1,122 @@
+.. _qtut_views:
+
+=================================
+07: Basic Web Handling With Views
+=================================
+
+Organize a views module with decorators and multiple views.
+
+Background
+==========
+
+For the examples so far, the ``hello_world`` function is a "view". In
+Pyramid, views are the primary way to accept web requests and return
+responses.
+
+So far our examples place everything in one file:
+
+- The view function
+
+- Its registration with the configurator
+
+- The route to map it to a URL
+
+- The WSGI application launcher
+
+Let's move the views out to their own ``views.py`` module and change
+our startup code to scan that module, looking for decorators that setup
+the views. Let's also add a second view and update our tests.
+
+Objectives
+==========
+
+- Views in a module that is scanned by the configurator
+
+- Decorators that do declarative configuration
+
+Steps
+=====
+
+#. Let's begin by using the previous package as a starting point for a
+   new distribution, then making it active:
+
+   .. code-block:: bash
+
+    $ cd ..; cp -r function_testing views; cd views
+    $ $VENV/bin/python setup.py develop
+
+#. Our ``views/tutorial/__init__.py`` gets a lot shorter:
+
+   .. literalinclude:: views/tutorial/__init__.py
+    :linenos:
+
+#. Let's add a module ``views/tutorial/views.py`` that is focused on
+   handling requests and responses:
+
+   .. literalinclude:: views/tutorial/views.py
+    :linenos:
+
+#. Update the tests to cover the two new views:
+
+   .. literalinclude:: views/tutorial/tests.py
+    :linenos:
+
+#. Now run the tests:
+
+   .. code-block:: bash
+
+
+    $ $VENV/bin/nosetests tutorial
+    .
+    ----------------------------------------------------------------------
+    Ran 4 tests in 0.141s
+
+    OK
+
+#. Run your Pyramid application with:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/pserve development.ini --reload
+
+#. Open http://localhost:6543/ and http://localhost:6543/howdy
+   in your browser.
+
+Analysis
+========
+
+We added some more URLs, but we also removed the view code from the
+application startup code in ``tutorial/__init__.py``.
+Our views, and their view registrations (via decorators) are now in a
+module ``views.py`` which is scanned via ``config.scan('.views')``.
+
+We have 2 views, each leading to the other. If you start at
+http://localhost:6543/, you get a response with a link to the next
+view. The ``hello_view`` (available at the URL ``/howdy``) has a link
+back to the first view.
+
+This step also shows that the name appearing in the URL,
+the name of the "route" that maps a URL to a view,
+and the name of the view, can all be different. More on routes later.
+
+Earlier we saw ``config.add_view`` as one way to configure a view. This
+section introduces ``@view_config``. Pyramid's configuration supports
+:term:`imperative configuration`, such as the
+``config.add_view`` in the previous example. You can also use
+:term:`declarative configuration`, in which a Python
+:term:`python:decorator`
+is placed on the line above the view. Both approaches result in the
+same final configuration, thus usually, it is simply a matter of taste.
+
+Extra Credit
+============
+
+#. What does the dot in ``.views`` signify?
+
+#. Why might ``assertIn`` be a better choice in testing the text in
+   responses than ``assertEqual``?
+
+.. seealso:: :ref:`views_chapter`,
+   :ref:`view_config_chapter`, and
+   :ref:`debugging_view_configuration`
+
diff --git a/docs/quick_tutorial/views/development.ini b/docs/quick_tutorial/views/development.ini
new file mode 100644
index 000000000..470d92c57
--- /dev/null
+++ b/docs/quick_tutorial/views/development.ini
@@ -0,0 +1,40 @@
+[app:main]
+use = egg:tutorial
+pyramid.includes =
+    pyramid_debugtoolbar
+
+[server:main]
+use = egg:pyramid#wsgiref
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, tutorial
+
+[logger_tutorial]
+level = DEBUG
+handlers =
+qualname = tutorial
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
diff --git a/docs/quick_tutorial/views/setup.py b/docs/quick_tutorial/views/setup.py
new file mode 100644
index 000000000..9997984d3
--- /dev/null
+++ b/docs/quick_tutorial/views/setup.py
@@ -0,0 +1,13 @@
+from setuptools import setup
+
+requires = [
+    'pyramid',
+]
+
+setup(name='tutorial',
+      install_requires=requires,
+      entry_points="""\
+      [paste.app_factory]
+      main = tutorial:main
+      """,
+)
\ No newline at end of file
diff --git a/docs/quick_tutorial/views/tutorial/__init__.py b/docs/quick_tutorial/views/tutorial/__init__.py
new file mode 100644
index 000000000..013d4538f
--- /dev/null
+++ b/docs/quick_tutorial/views/tutorial/__init__.py
@@ -0,0 +1,9 @@
+from pyramid.config import Configurator
+
+
+def main(global_config, **settings):
+    config = Configurator(settings=settings)
+    config.add_route('home', '/')
+    config.add_route('hello', '/howdy')
+    config.scan('.views')
+    return config.make_wsgi_app()
\ No newline at end of file
diff --git a/docs/quick_tutorial/views/tutorial/tests.py b/docs/quick_tutorial/views/tutorial/tests.py
new file mode 100644
index 000000000..f1757757c
--- /dev/null
+++ b/docs/quick_tutorial/views/tutorial/tests.py
@@ -0,0 +1,44 @@
+import unittest
+
+from pyramid import testing
+
+
+class TutorialViewTests(unittest.TestCase):
+    def setUp(self):
+        self.config = testing.setUp()
+
+    def tearDown(self):
+        testing.tearDown()
+
+    def test_home(self):
+        from .views import home
+
+        request = testing.DummyRequest()
+        response = home(request)
+        self.assertEqual(response.status_code, 200)
+        self.assertIn(b'Visit', response.body)
+
+    def test_hello(self):
+        from .views import hello
+
+        request = testing.DummyRequest()
+        response = hello(request)
+        self.assertEqual(response.status_code, 200)
+        self.assertIn(b'Go back', response.body)
+
+
+class TutorialFunctionalTests(unittest.TestCase):
+    def setUp(self):
+        from tutorial import main
+        app = main({})
+        from webtest import TestApp
+
+        self.testapp = TestApp(app)
+
+    def test_home(self):
+        res = self.testapp.get('/', status=200)
+        self.assertIn(b'<body>Visit', res.body)
+
+    def test_hello(self):
+        res = self.testapp.get('/howdy', status=200)
+        self.assertIn(b'<body>Go back', res.body)
diff --git a/docs/quick_tutorial/views/tutorial/views.py b/docs/quick_tutorial/views/tutorial/views.py
new file mode 100644
index 000000000..6ff149d7b
--- /dev/null
+++ b/docs/quick_tutorial/views/tutorial/views.py
@@ -0,0 +1,14 @@
+from pyramid.response import Response
+from pyramid.view import view_config
+
+
+# First view, available at http://localhost:6543/
+@view_config(route_name='home')
+def home(request):
+    return Response('<body>Visit <a href="/howdy">hello</a></body>')
+
+
+# /howdy
+@view_config(route_name='hello')
+def hello(request):
+    return Response('<body>Go back <a href="/">home</a></body>')
diff --git a/docs/whatsnew-1.5.rst b/docs/whatsnew-1.5.rst
index 2a01f43bc..57f93cbff 100644
--- a/docs/whatsnew-1.5.rst
+++ b/docs/whatsnew-1.5.rst
@@ -7,6 +7,130 @@ incompatibilities between the two versions and deprecations added to
 :app:`Pyramid` 1.5, as well as software dependency changes and notable
 documentation additions.
 
+Major Backwards Incompatibilities
+---------------------------------
+
+- Pyramid no longer depends on or configures the Mako and Chameleon templating
+  system renderers by default.  Disincluding these templating systems by
+  default means that the Pyramid core has fewer dependencies and can run on
+  future platforms without immediate concern for the compatibility of its
+  templating add-ons.  It also makes maintenance slightly more effective, as
+  different people can maintain the templating system add-ons that they
+  understand and care about without needing commit access to the Pyramid core,
+  and it allows users who just don't want to see any packages they don't use
+  come along for the ride when they install Pyramid.
+
+  This means that upon upgrading to Pyramid 1.5a2+, projects that use either
+  of these templating systems will see a traceback that ends something like
+  this when their application attempts to render a Chameleon or Mako template::
+
+     ValueError: No such renderer factory .pt
+
+  Or::
+
+     ValueError: No such renderer factory .mako
+
+  Or::
+
+     ValueError: No such renderer factory .mak
+
+  Support for Mako templating has been moved into an add-on package named 
+  ``pyramid_mako``, and support for Chameleon templating has been moved into 
+  an add-on package named ``pyramid_chameleon``.  These packages are drop-in 
+  replacements for the old built-in support for these templating langauges. 
+  All you have to do is install them and make them active in your configuration
+  to register renderer factories for ``.pt`` and/or ``.mako`` (or ``.mak``) to
+  make your application work again.
+
+  To re-add support for Chameleon and/or Mako template renderers into your
+  existing projects, follow the below steps.
+
+  If you depend on Mako templates:
+
+  * Make sure the ``pyramid_mako`` package is installed.  One way to do this
+    is by adding ``pyramid_mako`` to the ``install_requires`` section of your
+    package's ``setup.py`` file and afterwards rerunning ``setup.py develop``::
+
+        setup(
+            #...
+            install_requires=[
+                'pyramid_mako',         # new dependency
+                'pyramid',
+                #...
+            ],
+        )
+
+  * Within the portion of your application which instantiates a Pyramid 
+    :class:`~pyramid.config.Configurator` (often the ``main()`` function in 
+    your project's ``__init__.py`` file), tell Pyramid to include the 
+    ``pyramid_mako`` includeme::
+
+        config = Configurator(.....)
+        config.include('pyramid_mako')
+
+  If you depend on Chameleon templates:
+
+  * Make sure the ``pyramid_chameleon`` package is installed.  One way to do
+    this is by adding ``pyramid_chameleon`` to the ``install_requires`` section
+    of your package's ``setup.py`` file and afterwards rerunning 
+    ``setup.py develop``::
+
+        setup(
+            #...
+            install_requires=[
+                'pyramid_chameleon',         # new dependency
+                'pyramid',
+                #...
+            ],
+        )
+
+  * Within the portion of your application which instantiates a Pyramid 
+    :class:`~pyramid.config.Configurator` (often the ``main()`` function in 
+    your project's ``__init__.py`` file), tell Pyramid to include the 
+    ``pyramid_chameleon`` includeme::
+
+        config = Configurator(.....)
+        config.include('pyramid_chameleon')
+
+  Note that it's also fine to install these packages into *older* Pyramids for
+  forward compatibility purposes.  Even if you don't upgrade to Pyramid 1.5
+  immediately, performing the above steps in a Pyramid 1.4 installation is
+  perfectly fine, won't cause any difference, and will give you forward
+  compatibility when you eventually do upgrade to Pyramid 1.5.
+
+  With the removal of Mako and Chameleon support from the core, some
+  unit tests that use the ``pyramid.renderers.render*`` methods may begin to 
+  fail.  If any of your unit tests are invoking either 
+  ``pyramid.renderers.render()``  or ``pyramid.renderers.render_to_response()``
+  with either Mako or Chameleon templates then the 
+  ``pyramid.config.Configurator`` instance in effect during
+  the unit test should be also be updated to include the addons, as shown
+  above. For example::
+
+        class ATest(unittest.TestCase):
+            def setUp(self):
+                self.config = pyramid.testing.setUp()
+                self.config.include('pyramid_mako')
+
+            def test_it(self):
+                result = pyramid.renderers.render('mypkg:templates/home.mako', {})
+
+  Or::
+
+        class ATest(unittest.TestCase):
+            def setUp(self):
+                self.config = pyramid.testing.setUp()
+                self.config.include('pyramid_chameleon')
+
+            def test_it(self):
+                result = pyramid.renderers.render('mypkg:templates/home.pt', {})
+
+- If you're using the Pyramid debug toolbar, when you upgrade Pyramid to
+  1.5a2+, you'll also need to upgrade the ``pyramid_debugtoolbar`` package to 
+  at least version 1.0.8, as older toolbar versions are not compatible with 
+  Pyramid 1.5a2+ due to the removal of Mako support from the core.  It's 
+  fine to use this newer version of the toolbar code with older Pyramids too.
+
 Feature Additions
 -----------------
 
@@ -181,8 +305,19 @@ The feature additions in Pyramid 1.5 follow.
 - The ``alchemy`` scaffold tests now provide better coverage.  See
   https://github.com/Pylons/pyramid/pull/1029
 
-Backwards Incompatibilities
----------------------------
+- Users can now provide dotted Python names to as the ``factory`` argument
+  the Configurator methods named 
+  :meth:`~pyramid.config.Configurator.add_view_predicate`, 
+  :meth:`~pyramid.config.Configurator.add_route_predicate` and 
+  :meth:`~pyramid.config.Configurator.add_subscriber_predicate`.  Instead of 
+  passing the predicate factory directly, you can pass a dotted name which 
+  refers to the factory.
+
+- :func:`pyramid.path.package_name` no longer thows an exception when resolving 
+  the package name for namespace packages that have no ``__file__`` attribute.
+
+Other Backwards Incompatibilities
+---------------------------------
 
 - Modified the :meth:`~pyramid.request.Reuqest.current_route_url` method. The
   method previously returned the URL without the query string by default, it
@@ -210,6 +345,65 @@ Backwards Incompatibilities
   attributes: ``virtual_path_tuple`` and ``physical_path_tuple``.  These should
   be the tuple form of the resource's path (physical and virtual).
 
+- Removed the ``request.response_*`` varying attributes (such
+  as``request.response_headers``) . These attributes had been deprecated
+  since Pyramid 1.1, and as per the deprecation policy, have now been removed.
+
+- ``request.response`` will no longer be mutated when using the 
+  :func:`pyramid.renderers.render` API.  Almost all renderers mutate the 
+  ``request.response`` response object (for example, the JSON renderer sets
+  ``request.response.content_type`` to ``application/json``), but this is
+  only necessary when the renderer is generating a response; it was a bug
+  when it was done as a side effect of calling 
+  :func:`pyramid.renderers.render`.
+
+- Removed the ``bfg2pyramid`` fixer script.
+
+- The :class:`pyramid.events.NewResponse` event is now sent **after** response 
+  callbacks are executed.  It previously executed before response callbacks
+  were executed.  Rationale: it's more useful to be able to inspect the response
+  after response callbacks have done their jobs instead of before.
+
+- Removed the class named ``pyramid.view.static`` that had been deprecated
+  since Pyramid 1.1.  Instead use :class:`pyramid.static.static_view` with the
+  ``use_subpath=True`` argument.
+
+- Removed the ``pyramid.view.is_response`` function that had been deprecated
+  since Pyramid 1.1.  Use the :meth:`pyramid.request.Request.is_response`
+  method instead.
+
+- Removed the ability to pass the following arguments to
+  :meth:`pyramid.config.Configurator.add_route`: ``view``, ``view_context``.
+  ``view_for``, ``view_permission``, ``view_renderer``, and ``view_attr``.
+  Using these arguments had been deprecated since Pyramid 1.1.  Instead of
+  passing view-related arguments to ``add_route``, use a separate call to
+  :meth:`pyramid.config.Configurator.add_view` to associate a view with a route
+  using its ``route_name`` argument.  Note that this impacts the
+  :meth:`pyramid.config.Configurator.add_static_view` function too, because
+  it delegates to``add_route``.
+
+- Removed the ability to influence and query a :class:`pyramid.request.Request`
+  object as if it were a dictionary.  Previously it was possible to use methods
+  like ``__getitem__``, ``get``, ``items``, and other dictlike methods to
+  access values in the WSGI environment.  This behavior had been deprecated
+  since Pyramid 1.1.  Use methods of ``request.environ`` (a real dictionary)
+  instead.
+
+- Removed ancient backwards compatibily hack in
+  ``pyramid.traversal.DefaultRootFactory`` which populated the ``__dict__`` of
+  the factory with the matchdict values for compatibility with BFG 0.9.
+
+- The ``renderer_globals_factory`` argument to the 
+  :class:`pyramid.config.Configurator` constructor and the 
+  coresponding argument to :meth:`~pyramid.config.Configurator.setup_registry` 
+  has been removed.  The ``set_renderer_globals_factory`` method of
+  :class:`~pyramid.config.Configurator` has also been removed.  The (internal)
+  ``pyramid.interfaces.IRendererGlobals`` interface was also removed.  These
+  arguments, methods and interfaces had been deprecated since 1.1.  Use a
+  ``BeforeRender`` event subscriber as documented in the "Hooks" chapter of the
+  Pyramid narrative documentation instead of providing renderer globals values
+  to the configurator.
+
 
 Deprecations
 ------------
@@ -219,6 +413,10 @@ Deprecations
   ``foo#defname.mak`` in the view configuration definition and return a dict
   only.
 
+- The :meth:`pyramid.config.Configurator.set_request_property` method now issues
+  a deprecation warning when used.  It had been docs-deprecated in 1.4
+  but did not issue a deprecation warning when used.
+
 Documentation Enhancements
 --------------------------
 
@@ -231,5 +429,5 @@ Documentation Enhancements
 Dependency Changes
 ------------------
 
-No dependency changes from Pyramid 1.4.X were made in Pyramid 1.5.
+- Pyramid no longer depends upon ``Mako`` or ``Chameleon``.
 
diff --git a/pyramid/authorization.py b/pyramid/authorization.py
index 1fd05e244..5e7baa19d 100644
--- a/pyramid/authorization.py
+++ b/pyramid/authorization.py
@@ -122,6 +122,9 @@ class ACLAuthorizationPolicy(object):
             allowed_here = set()
             denied_here = set()
             
+            if acl and callable(acl):
+                acl = acl()
+
             for ace_action, ace_principal, ace_permissions in acl:
                 if not is_nonstr_iter(ace_permissions):
                     ace_permissions = [ace_permissions]
diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 0c3a836df..19c47cbd9 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -4,7 +4,6 @@ import logging
 import operator
 import os
 import sys
-import warnings
 import venusian
 
 from webob.exc import WSGIHTTPException as WebobWSGIHTTPException
@@ -63,7 +62,6 @@ from pyramid.config.adapters import AdaptersConfiguratorMixin
 from pyramid.config.assets import AssetsConfiguratorMixin
 from pyramid.config.factories import FactoriesConfiguratorMixin
 from pyramid.config.i18n import I18NConfiguratorMixin
-from pyramid.config.rendering import DEFAULT_RENDERERS
 from pyramid.config.rendering import RenderingConfiguratorMixin
 from pyramid.config.routes import RoutesConfiguratorMixin
 from pyramid.config.security import SecurityConfiguratorMixin
@@ -335,7 +333,6 @@ class Configurator(
         self._fix_registry()
 
         self._set_settings(settings)
-        self._register_response_adapters()
 
         if isinstance(debug_logger, string_types):
             debug_logger = logging.getLogger(debug_logger)
@@ -345,9 +342,8 @@ class Configurator(
 
         registry.registerUtility(debug_logger, IDebugLogger)
 
-        for name, renderer in DEFAULT_RENDERERS:
-            self.add_renderer(name, renderer)
-
+        self.add_default_response_adapters()
+        self.add_default_renderers()
         self.add_default_view_predicates()
         self.add_default_route_predicates()
 
@@ -366,12 +362,12 @@ class Configurator(
 
         self.commit()
 
-        # self.commit() should not be called after this point because the
-        # following registrations should be treated as analogues of methods
-        # called by the user after configurator construction.  Rationale:
-        # user-supplied implementations should be preferred rather than
-        # add-on author implementations with the help of automatic conflict
-        # resolution.
+        # self.commit() should not be called within this method after this
+        # point because the following registrations should be treated as
+        # analogues of methods called by the user after configurator
+        # construction.  Rationale: user-supplied implementations should be
+        # preferred rather than add-on author implementations with the help of
+        # automatic conflict resolution.
 
         if authentication_policy and not authorization_policy:
             authorization_policy = ACLAuthorizationPolicy() # default
diff --git a/pyramid/config/adapters.py b/pyramid/config/adapters.py
index 0a74e76b4..f6a652e3d 100644
--- a/pyramid/config/adapters.py
+++ b/pyramid/config/adapters.py
@@ -1,3 +1,5 @@
+from webob import Response as WebobResponse
+
 from functools import update_wrapper
 
 from zope.interface import Interface
@@ -193,10 +195,9 @@ class AdaptersConfiguratorMixin(object):
         intr['type'] = type_or_iface
         self.action(discriminator, register, introspectables=(intr,))
 
-    def _register_response_adapters(self):
+    def add_default_response_adapters(self):
         # cope with WebOb response objects that aren't decorated with IResponse
-        from webob import Response as WebobResponse
-        self.registry.registerSelfAdapter((WebobResponse,), IResponse)
+        self.add_response_adapter(None, WebobResponse)
 
     @action_method
     def add_traverser(self, adapter, iface=None):
diff --git a/pyramid/config/factories.py b/pyramid/config/factories.py
index d30df3b74..774125821 100644
--- a/pyramid/config/factories.py
+++ b/pyramid/config/factories.py
@@ -1,3 +1,4 @@
+from zope.deprecation import deprecate
 from zope.interface import implementer
 
 from pyramid.interfaces import (
@@ -179,12 +180,15 @@ class FactoriesConfiguratorMixin(object):
                         introspectables=(intr,))
 
     @action_method
+    @deprecate('set_request_propery() is deprecated as of Pyramid 1.5; use '
+               'add_request_method() with the property=True argument instead')
     def set_request_property(self, callable, name=None, reify=False):
         """ Add a property to the request object.
 
-        .. deprecated:: 1.4
+        .. deprecated:: 1.5
            :meth:`pyramid.config.Configurator.add_request_method` should be
-           used instead.
+           used instead.  (This method was docs-deprecated in 1.4 and
+           issues a real deprecation warning in 1.5).
 
         .. versionadded:: 1.3
         """
diff --git a/pyramid/config/i18n.py b/pyramid/config/i18n.py
index f08cfb9a8..69af0f9bc 100644
--- a/pyramid/config/i18n.py
+++ b/pyramid/config/i18n.py
@@ -7,7 +7,6 @@ from pyramid.interfaces import (
     )
 
 from pyramid.exceptions import ConfigurationError
-from pyramid.i18n import get_localizer
 from pyramid.path import package_path
 from pyramid.util import action_method
 
diff --git a/pyramid/config/rendering.py b/pyramid/config/rendering.py
index 258c5a566..68671d08e 100644
--- a/pyramid/config/rendering.py
+++ b/pyramid/config/rendering.py
@@ -12,6 +12,10 @@ DEFAULT_RENDERERS = (
     )
 
 class RenderingConfiguratorMixin(object):
+    def add_default_renderers(self):
+        for name, renderer in DEFAULT_RENDERERS:
+            self.add_renderer(name, renderer)
+    
     @action_method
     def add_renderer(self, name, factory):
         """
diff --git a/pyramid/config/views.py b/pyramid/config/views.py
index 16deee987..233bbac12 100644
--- a/pyramid/config/views.py
+++ b/pyramid/config/views.py
@@ -1149,6 +1149,8 @@ class ViewsConfiguratorMixin(object):
                 attr, self.object_description(view))
         else:
             view_desc = self.object_description(view)
+
+        tmpl_intr = None
             
         view_intr = self.introspectable('views',
                                         discriminator,
@@ -1199,7 +1201,8 @@ class ViewsConfiguratorMixin(object):
                     renderer = renderers.RendererHelper(
                         name=None,
                         package=self.package,
-                        registry=self.registry)
+                        registry=self.registry
+                        )
 
             if permission is None:
                 # intent: will be None if no default permission is registered
@@ -1330,6 +1333,22 @@ class ViewsConfiguratorMixin(object):
                         multiview,
                         (IExceptionViewClassifier, request_iface, context),
                         IMultiView, name=name)
+            renderer_type = getattr(renderer, 'type', None) # gard against None
+            intrspc = self.introspector
+            if (
+                renderer_type is not None and
+                tmpl_intr is not None and
+                intrspc is not None and
+                intrspc.get('renderer factories', renderer_type) is not None
+                ):
+                # allow failure of registered template factories to be deferred
+                # until view execution, like other bad renderer factories; if
+                # we tried to relate this to an existing renderer factory
+                # without checking if it the factory actually existed, we'd end
+                # up with a KeyError at startup time, which is inconsistent
+                # with how other bad renderer registrations behave (they throw
+                # a ValueError at view execution time)
+                tmpl_intr.relate('renderer factories', renderer.type)
 
         if mapper:
             mapper_intr = self.introspectable(
@@ -1355,7 +1374,6 @@ class ViewsConfiguratorMixin(object):
             tmpl_intr['name'] = renderer.name
             tmpl_intr['type'] = renderer.type
             tmpl_intr['renderer'] = renderer
-            tmpl_intr.relate('renderer factories', renderer.type)
             introspectables.append(tmpl_intr)
         if permission is not None:
             # if a permission exists, register a permission introspectable
diff --git a/pyramid/events.py b/pyramid/events.py
index ca10e2893..5179ab08a 100644
--- a/pyramid/events.py
+++ b/pyramid/events.py
@@ -228,9 +228,9 @@ class BeforeRender(dict):
           # {'mykey': 'somevalue'} is returned from the view
           print(event.rendering_val['mykey'])
 
-    In other words, :attr:`rendering_val` is the (non-system) value returned by a
-    view or passed to ``render*`` as ``value``.  This feature is new in Pyramid
-    1.2.
+    In other words, :attr:`rendering_val` is the (non-system) value returned
+    by a view or passed to ``render*`` as ``value``.  This feature is new in
+    Pyramid 1.2.
 
     For a description of the values present in the renderer globals dictionary,
     see :ref:`renderer_system_values`.
diff --git a/pyramid/renderers.py b/pyramid/renderers.py
index d8542decc..e90d07b38 100644
--- a/pyramid/renderers.py
+++ b/pyramid/renderers.py
@@ -201,11 +201,17 @@ class JSON(object):
     adapters with the renderer.  See
     :ref:`json_serializing_custom_objects` for more information.
 
-    The default serializer uses ``json.JSONEncoder``. A different
-    serializer can be specified via the ``serializer`` argument.
-    Custom serializers should accept the object, a callback
-    ``default``, and any extra ``kw`` keyword arguments passed during
-    renderer construction.
+    .. note::
+
+        The default serializer uses ``json.JSONEncoder``. A different
+        serializer can be specified via the ``serializer`` argument.  Custom
+        serializers should accept the object, a callback ``default``, and any
+        extra ``kw`` keyword arguments passed during renderer construction.
+        This feature isn't widely used but it can be used to replace the
+        stock JSON serializer with, say, simplejson.  If all you want to
+        do, however, is serialize custom objects, you should use the method
+        explained in :ref:`json_serializing_custom_objects` instead
+        of replacing the serializer.
 
     .. versionadded:: 1.4
        Prior to this version, there was no public API for supplying options
diff --git a/pyramid/scaffolds/starter/+package+/static/pyramid-small.png b/pyramid/scaffolds/starter/+package+/static/pyramid-small.png
deleted file mode 100644
index a5bc0ade7..000000000
--- a/pyramid/scaffolds/starter/+package+/static/pyramid-small.png
+++ /dev/null
diff --git a/pyramid/scaffolds/tests.py b/pyramid/scaffolds/tests.py
index b90e494e9..d913d022a 100644
--- a/pyramid/scaffolds/tests.py
+++ b/pyramid/scaffolds/tests.py
@@ -9,22 +9,18 @@ import time
 try:
     import httplib
 except ImportError: # pragma: no cover
-    import http.client as httplib
-
-from pyramid.compat import PY3
+    import http.client as httplib #py3
 
 class TemplateTest(object):
     def make_venv(self, directory): # pragma: no cover
         import virtualenv
-        import sys
         from virtualenv import Logger
         logger = Logger([(Logger.level_for_integer(2), sys.stdout)])
         virtualenv.logger = logger
         virtualenv.create_environment(directory,
                                       site_packages=False,
                                       clear=False,
-                                      unzip_setuptools=True,
-                                      use_distribute=PY3)
+                                      unzip_setuptools=True)
     def install(self, tmpl_name): # pragma: no cover
         try:
             self.old_cwd = os.getcwd()
@@ -70,10 +66,7 @@ class TemplateTest(object):
             os.chdir(self.old_cwd)
 
 if __name__ == '__main__':     # pragma: no cover
-    templates = ['starter', 'alchemy',]
-
-    if sys.version_info >= (2, 6) and sys.version_info < (3, 0):
-        templates.append('zodb')
+    templates = ['starter', 'alchemy', 'zodb']
 
     for name in templates:
         test = TemplateTest()
diff --git a/pyramid/scaffolds/zodb/+package+/static/pyramid-small.png b/pyramid/scaffolds/zodb/+package+/static/pyramid-small.png
deleted file mode 100644
index a5bc0ade7..000000000
--- a/pyramid/scaffolds/zodb/+package+/static/pyramid-small.png
+++ /dev/null
diff --git a/pyramid/scripts/pcreate.py b/pyramid/scripts/pcreate.py
index ba4eb0856..5e2240856 100644
--- a/pyramid/scripts/pcreate.py
+++ b/pyramid/scripts/pcreate.py
@@ -77,8 +77,8 @@ class PCreateCommand(object):
     def render_scaffolds(self):
         options = self.options
         args = self.args
-        project_name = os.path.basename(args[0])
         output_dir = os.path.abspath(os.path.normpath(args[0]))
+        project_name = os.path.basename(os.path.split(output_dir)[1])
         pkg_name = _bad_chars_re.sub('', project_name.lower())
         safe_name = pkg_resources.safe_name(project_name)
         egg_name = pkg_resources.to_filename(safe_name)
diff --git a/pyramid/testing.py b/pyramid/testing.py
index 789047ab3..4590c55f8 100644
--- a/pyramid/testing.py
+++ b/pyramid/testing.py
@@ -450,18 +450,7 @@ def setUp(registry=None, request=None, hook_zca=True, autocommit=True,
         # someone may be passing us an esoteric "dummy" registry, and
         # the below won't succeed if it doesn't have a registerUtility
         # method.
-        from pyramid.config import DEFAULT_RENDERERS
-        for name, renderer in DEFAULT_RENDERERS:
-            # Cause the default renderers to be registered because
-            # in-the-wild test code relies on being able to call
-            # e.g. ``pyramid.chameleon_zpt.render_template``
-            # without registering a .pt renderer, expecting the "real"
-            # template to be rendered.  This is a holdover from when
-            # individual template system renderers weren't indirected
-            # by the ``pyramid.renderers`` machinery, and
-            # ``render_template`` and friends went behind the back of
-            # any existing renderer factory lookup system.
-            config.add_renderer(name, renderer)
+        config.add_default_renderers()
         config.add_default_view_predicates()
         config.add_default_route_predicates()
     config.commit()
diff --git a/pyramid/tests/test_authorization.py b/pyramid/tests/test_authorization.py
index 60b1b0c8d..05cd3b4f8 100644
--- a/pyramid/tests/test_authorization.py
+++ b/pyramid/tests/test_authorization.py
@@ -146,6 +146,19 @@ class TestACLAuthorizationPolicy(unittest.TestCase):
             policy.principals_allowed_by_permission(context, 'read'))
         self.assertEqual(result, ['chrism'])
 
+    def test_principals_allowed_by_permission_callable_acl(self):
+        from pyramid.security import Allow
+        from pyramid.security import DENY_ALL
+        context = DummyContext()
+        acl = lambda: [ (Allow, 'chrism', ('read', 'write')),
+                        DENY_ALL,
+                        (Allow, 'other', 'read') ]
+        context.__acl__ = acl
+        policy = self._makeOne()
+        result = sorted(
+            policy.principals_allowed_by_permission(context, 'read'))
+        self.assertEqual(result, ['chrism'])
+        
     def test_principals_allowed_by_permission_string_permission(self):
         from pyramid.security import Allow
         context = DummyContext()
diff --git a/pyramid/tests/test_config/test_factories.py b/pyramid/tests/test_config/test_factories.py
index e89fc077e..6e679397f 100644
--- a/pyramid/tests/test_config/test_factories.py
+++ b/pyramid/tests/test_config/test_factories.py
@@ -67,51 +67,6 @@ class TestFactoriesMixin(unittest.TestCase):
         self.assertEqual(config.registry.getUtility(ISessionFactory),
                          dummyfactory)
 
-    def test_set_request_property_with_callable(self):
-        from pyramid.interfaces import IRequestExtensions
-        config = self._makeOne(autocommit=True)
-        callable = lambda x: None
-        config.set_request_property(callable, name='foo')
-        exts = config.registry.getUtility(IRequestExtensions)
-        self.assertTrue('foo' in exts.descriptors)
-
-    def test_set_request_property_with_unnamed_callable(self):
-        from pyramid.interfaces import IRequestExtensions
-        config = self._makeOne(autocommit=True)
-        def foo(self): pass
-        config.set_request_property(foo, reify=True)
-        exts = config.registry.getUtility(IRequestExtensions)
-        self.assertTrue('foo' in exts.descriptors)
-
-    def test_set_request_property_with_property(self):
-        from pyramid.interfaces import IRequestExtensions
-        config = self._makeOne(autocommit=True)
-        callable = property(lambda x: None)
-        config.set_request_property(callable, name='foo')
-        exts = config.registry.getUtility(IRequestExtensions)
-        self.assertTrue('foo' in exts.descriptors)
-
-    def test_set_multiple_request_properties(self):
-        from pyramid.interfaces import IRequestExtensions
-        config = self._makeOne()
-        def foo(self): pass
-        bar = property(lambda x: None)
-        config.set_request_property(foo, reify=True)
-        config.set_request_property(bar, name='bar')
-        config.commit()
-        exts = config.registry.getUtility(IRequestExtensions)
-        self.assertTrue('foo' in exts.descriptors)
-        self.assertTrue('bar' in exts.descriptors)
-
-    def test_set_multiple_request_properties_conflict(self):
-        from pyramid.exceptions import ConfigurationConflictError
-        config = self._makeOne()
-        def foo(self): pass
-        bar = property(lambda x: None)
-        config.set_request_property(foo, name='bar', reify=True)
-        config.set_request_property(bar, name='bar')
-        self.assertRaises(ConfigurationConflictError, config.commit)
-
     def test_add_request_method_with_callable(self):
         from pyramid.interfaces import IRequestExtensions
         config = self._makeOne(autocommit=True)
@@ -157,3 +112,63 @@ class TestFactoriesMixin(unittest.TestCase):
         self.assertRaises(AttributeError, config.add_request_method)
 
 
+class TestDeprecatedFactoriesMixinMethods(unittest.TestCase):
+    def setUp(self):
+        from zope.deprecation import __show__
+        __show__.off()
+
+    def tearDown(self):
+        from zope.deprecation import __show__
+        __show__.on()
+        
+    def _makeOne(self, *arg, **kw):
+        from pyramid.config import Configurator
+        config = Configurator(*arg, **kw)
+        return config
+
+    def test_set_request_property_with_callable(self):
+        from pyramid.interfaces import IRequestExtensions
+        config = self._makeOne(autocommit=True)
+        callable = lambda x: None
+        config.set_request_property(callable, name='foo')
+        exts = config.registry.getUtility(IRequestExtensions)
+        self.assertTrue('foo' in exts.descriptors)
+
+    def test_set_request_property_with_unnamed_callable(self):
+        from pyramid.interfaces import IRequestExtensions
+        config = self._makeOne(autocommit=True)
+        def foo(self): pass
+        config.set_request_property(foo, reify=True)
+        exts = config.registry.getUtility(IRequestExtensions)
+        self.assertTrue('foo' in exts.descriptors)
+
+    def test_set_request_property_with_property(self):
+        from pyramid.interfaces import IRequestExtensions
+        config = self._makeOne(autocommit=True)
+        callable = property(lambda x: None)
+        config.set_request_property(callable, name='foo')
+        exts = config.registry.getUtility(IRequestExtensions)
+        self.assertTrue('foo' in exts.descriptors)
+
+    def test_set_multiple_request_properties(self):
+        from pyramid.interfaces import IRequestExtensions
+        config = self._makeOne()
+        def foo(self): pass
+        bar = property(lambda x: None)
+        config.set_request_property(foo, reify=True)
+        config.set_request_property(bar, name='bar')
+        config.commit()
+        exts = config.registry.getUtility(IRequestExtensions)
+        self.assertTrue('foo' in exts.descriptors)
+        self.assertTrue('bar' in exts.descriptors)
+
+    def test_set_multiple_request_properties_conflict(self):
+        from pyramid.exceptions import ConfigurationConflictError
+        config = self._makeOne()
+        def foo(self): pass
+        bar = property(lambda x: None)
+        config.set_request_property(foo, name='bar', reify=True)
+        config.set_request_property(bar, name='bar')
+        self.assertRaises(ConfigurationConflictError, config.commit)
+
+    
diff --git a/pyramid/tests/test_config/test_init.py b/pyramid/tests/test_config/test_init.py
index a0333b66d..d6dba17f6 100644
--- a/pyramid/tests/test_config/test_init.py
+++ b/pyramid/tests/test_config/test_init.py
@@ -227,6 +227,14 @@ class ConfiguratorTests(unittest.TestCase):
         config = self._makeOne(introspection=False)
         self.assertEqual(config.introspection, False)
 
+    def test_ctor_default_webob_response_adapter_registered(self):
+        from webob import Response as WebobResponse
+        response = WebobResponse()
+        from pyramid.interfaces import IResponse
+        config = self._makeOne(autocommit=True)
+        result = config.registry.queryAdapter(response, IResponse)
+        self.assertEqual(result, response)
+        
     def test_with_package_module(self):
         from pyramid.tests.test_config import test_init
         import pyramid.tests
diff --git a/pyramid/tests/test_config/test_rendering.py b/pyramid/tests/test_config/test_rendering.py
index 2c3730775..cede64d3a 100644
--- a/pyramid/tests/test_config/test_rendering.py
+++ b/pyramid/tests/test_config/test_rendering.py
@@ -6,6 +6,16 @@ class TestRenderingConfiguratorMixin(unittest.TestCase):
         config = Configurator(*arg, **kw)
         return config
 
+    def test_add_default_renderers(self):
+        from pyramid.config.rendering import DEFAULT_RENDERERS
+        from pyramid.interfaces import IRendererFactory
+        config = self._makeOne(autocommit=True)
+        config.add_default_renderers()
+        for name, impl in DEFAULT_RENDERERS:
+            self.assertTrue(
+                config.registry.queryUtility(IRendererFactory, name) is not None
+                )
+
     def test_add_renderer(self):
         from pyramid.interfaces import IRendererFactory
         config = self._makeOne(autocommit=True)
diff --git a/pyramid/tests/test_config/test_views.py b/pyramid/tests/test_config/test_views.py
index d9e0d17a6..be2865d30 100644
--- a/pyramid/tests/test_config/test_views.py
+++ b/pyramid/tests/test_config/test_views.py
@@ -109,6 +109,37 @@ class TestViewsConfigurationMixin(unittest.TestCase):
         view = self._getViewCallable(config)
         self.assertTrue(b'Hello!' in view(None, None).body)
 
+    def test_add_view_with_tmpl_renderer_factory_introspector_missing(self):
+        config = self._makeOne(autocommit=True)
+        config.introspection = False
+        config.introspector = None
+        config.add_view(renderer='dummy.pt')
+        view = self._getViewCallable(config)
+        self.assertRaises(ValueError, view, None, None)
+        
+    def test_add_view_with_tmpl_renderer_factory_no_renderer_factory(self):
+        config = self._makeOne(autocommit=True)
+        introspector = DummyIntrospector()
+        config.introspector = introspector
+        config.add_view(renderer='dummy.pt')
+        self.assertFalse(('renderer factories', '.pt') in
+                         introspector.related[-1])
+        view = self._getViewCallable(config)
+        self.assertRaises(ValueError, view, None, None)
+
+    def test_add_view_with_tmpl_renderer_factory_with_renderer_factory(self):
+        config = self._makeOne(autocommit=True)
+        introspector = DummyIntrospector(True)
+        config.introspector = introspector
+        def dummy_factory(helper):
+            return lambda val, system_vals: 'Hello!'
+        config.add_renderer('.pt', dummy_factory)
+        config.add_view(renderer='dummy.pt')
+        self.assertTrue(
+            ('renderer factories', '.pt') in introspector.related[-1])
+        view = self._getViewCallable(config)
+        self.assertTrue(b'Hello!' in view(None, None).body)
+        
     def test_add_view_wrapped_view_is_decorated(self):
         def view(request): # request-only wrapper
             """ """
@@ -3954,3 +3985,14 @@ class DummyPredicate(object):
 
     phash = text
 
+class DummyIntrospector(object):
+    def __init__(self, getval=None):
+        self.related = []
+        self.introspectables = []
+        self.getval = getval
+    def add(self, introspectable):
+        self.introspectables.append(introspectable)
+    def get(self, name, discrim):
+        return self.getval
+    def relate(self, a, b):
+        self.related.append((a, b))
diff --git a/pyramid/tests/test_scripts/test_pcreate.py b/pyramid/tests/test_scripts/test_pcreate.py
index 1406d3911..6516ac229 100644
--- a/pyramid/tests/test_scripts/test_pcreate.py
+++ b/pyramid/tests/test_scripts/test_pcreate.py
@@ -110,6 +110,21 @@ class TestPCreateCommand(unittest.TestCase):
             scaffold2.vars,
             {'project': 'Distro', 'egg': 'Distro', 'package': 'distro'})
 
+    def test_known_scaffold_with_path_as_project_target_rendered(self):
+        import os
+        cmd = self._makeOne('-s', 'dummy', '/tmp/foo/Distro/')
+        scaffold = DummyScaffold('dummy')
+        cmd.scaffolds = [scaffold]
+        result = cmd.run()
+        self.assertEqual(result, 0)
+        self.assertEqual(
+            scaffold.output_dir,
+            os.path.normpath(os.path.join(os.getcwd(), '/tmp/foo/Distro'))
+            )
+        self.assertEqual(
+            scaffold.vars,
+            {'project': 'Distro', 'egg': 'Distro', 'package': 'distro'})
+        
 class Test_main(unittest.TestCase):
     def _callFUT(self, argv):
         from pyramid.scripts.pcreate import main
diff --git a/pyramid/view.py b/pyramid/view.py
index edb4d688c..55ab38871 100644
--- a/pyramid/view.py
+++ b/pyramid/view.py
@@ -166,6 +166,9 @@ class view_config(object):
     See :ref:`mapping_views_using_a_decorator_section` for details about
     using :class:`pyramid.view.view_config`.
 
+    ATTENTION: ``view_config`` will work ONLY on module top level members
+    because of the limitation of ``venusian.Scanner.scan``.
+
     """
     venusian = venusian # for testing injection
     def __init__(self, **settings):
@@ -205,7 +208,7 @@ class view_defaults(view_config):
 
     See :ref:`view_defaults` for more information.
     """
-    
+
     def __call__(self, wrapped):
         wrapped.__view_defaults__ = self.__dict__.copy()
         return wrapped
@@ -305,7 +308,7 @@ class notfound_view_config(object):
 
         from pyramid.view import notfound_view_config
         from pyramid.response import Response
-          
+
         @notfound_view_config()
         def notfound(request):
             return Response('Not found, dude!', status='404 Not Found')
@@ -368,7 +371,7 @@ class forbidden_view_config(object):
 
         from pyramid.view import forbidden_view_config
         from pyramid.response import Response
-          
+
         @forbidden_view_config()
         def forbidden(request):
             return Response('You are not allowed', status='401 Unauthorized')
@@ -404,4 +407,4 @@ class forbidden_view_config(object):
 
         settings['_info'] = info.codeinfo # fbo "action_method"
         return wrapped
-    
+
diff --git a/setup.py b/setup.py
index 36f0b1303..2d49717b7 100644
--- a/setup.py
+++ b/setup.py
@@ -69,9 +69,8 @@ testing_extras = tests_require + [
     ]
 
 setup(name='pyramid',
-      version='1.5a1',
-      description=('The Pyramid Web Framework, a '
-                   'Pylons project'),
+      version='1.5a2',
+      description='The Pyramid Web Framework, a Pylons project',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
         "Intended Audience :: Developers",