From 49fb779f52748df05c911263d1305cda3e86a5ec Mon Sep 17 00:00:00 2001
From: John Anderson <sontek@gmail.com>
Date: Mon, 5 Nov 2012 00:50:21 -0300
Subject: added the ability to pass options to get_app for use with string
 interpolation in the config

---
 pyramid/paster.py                           | 17 ++++++++---
 pyramid/scripts/__init__.py                 |  1 -
 pyramid/scripts/common.py                   | 15 ++++++++++
 pyramid/scripts/prequest.py                 |  5 +++-
 pyramid/scripts/proutes.py                  |  5 +++-
 pyramid/scripts/pserve.py                   | 46 ++++++++++++++---------------
 pyramid/scripts/pshell.py                   |  4 ++-
 pyramid/scripts/ptweens.py                  |  3 +-
 pyramid/scripts/pviews.py                   |  7 +++--
 pyramid/tests/test_paster.py                |  2 +-
 pyramid/tests/test_scripts/test_common.py   | 13 ++++++++
 pyramid/tests/test_scripts/test_prequest.py |  4 ++-
 pyramid/tests/test_scripts/test_proutes.py  | 19 ++++++++++++
 pyramid/tests/test_scripts/test_pserve.py   | 43 ++++++++++++++++++++++-----
 14 files changed, 140 insertions(+), 44 deletions(-)

diff --git a/pyramid/paster.py b/pyramid/paster.py
index b0e4d7933..b1a6d4c8b 100644
--- a/pyramid/paster.py
+++ b/pyramid/paster.py
@@ -9,17 +9,26 @@ from pyramid.compat import configparser
 from logging.config import fileConfig
 from pyramid.scripting import prepare
 
-def get_app(config_uri, name=None, loadapp=loadapp):
+def get_app(config_uri, name=None, options={}, loadapp=loadapp):
     """ Return the WSGI application named ``name`` in the PasteDeploy
     config file specified by ``config_uri``.
 
+    ``options`` are used as variable assignments like {'http_port': 8080}
+    and then use %(http_port)s in the config file.
+
     If the ``name`` is None, this will attempt to parse the name from
     the ``config_uri`` string expecting the format ``inifile#name``.
     If no name is found, the name will default to "main"."""
     path, section = _getpathsec(config_uri, name)
     config_name = 'config:%s' % path
     here_dir = os.getcwd()
-    app = loadapp(config_name, name=section, relative_to=here_dir)
+    if options:
+        kw = {'global_conf': options}
+    else:
+        kw = {}
+
+    app = loadapp(config_name, name=section, relative_to=here_dir, **kw)
+
     return app
 
 def get_appsettings(config_uri, name=None, appconfig=appconfig):
@@ -63,7 +72,7 @@ def _getpathsec(config_uri, name):
         section = name
     return path, section
 
-def bootstrap(config_uri, request=None):
+def bootstrap(config_uri, request=None, options={}):
     """ Load a WSGI application from the PasteDeploy config file specified
     by ``config_uri``. The environment will be configured as if it is
     currently serving ``request``, leaving a natural environment in place
@@ -106,7 +115,7 @@ def bootstrap(config_uri, request=None):
     See :ref:`writing_a_script` for more information about how to use this
     function.
     """
-    app = get_app(config_uri)
+    app = get_app(config_uri, options=options)
     env = prepare(request)
     env['app'] = app
     return env
diff --git a/pyramid/scripts/__init__.py b/pyramid/scripts/__init__.py
index ed88d78b4..5bb534f79 100644
--- a/pyramid/scripts/__init__.py
+++ b/pyramid/scripts/__init__.py
@@ -1,2 +1 @@
 # package
-
diff --git a/pyramid/scripts/common.py b/pyramid/scripts/common.py
index dfff26449..cbc172e9b 100644
--- a/pyramid/scripts/common.py
+++ b/pyramid/scripts/common.py
@@ -2,6 +2,21 @@ import os
 from pyramid.compat import configparser
 from logging.config import fileConfig
 
+def parse_vars(args):
+    """
+    Given variables like ``['a=b', 'c=d']`` turns it into ``{'a':
+    'b', 'c': 'd'}``
+    """
+    result = {}
+    for arg in args:
+        if '=' not in arg:
+            raise ValueError(
+                'Variable assignment %r invalid (no "=")'
+                % arg)
+        name, value = arg.split('=', 1)
+        result[name] = value
+    return result
+
 def logging_file_config(config_file, fileConfig=fileConfig,
                         configparser=configparser):
     """
diff --git a/pyramid/scripts/prequest.py b/pyramid/scripts/prequest.py
index 13406372a..da6b8cc14 100644
--- a/pyramid/scripts/prequest.py
+++ b/pyramid/scripts/prequest.py
@@ -5,6 +5,7 @@ import textwrap
 from pyramid.compat import url_unquote
 from pyramid.request import Request
 from pyramid.paster import get_app
+from pyramid.scripts.common import parse_vars
 
 def main(argv=sys.argv, quiet=False):
     command = PRequestCommand(argv, quiet)
@@ -101,7 +102,9 @@ class PRequestCommand(object):
                 name, value = item.split(':', 1)
                 headers[name] = value.strip()
 
-        app = self.get_app(app_spec, self.options.app_name)
+        app = self.get_app(app_spec, self.options.app_name,
+                options=parse_vars(self.args[2:]))
+
         request_method = (self.options.method or 'GET').upper()
 
         environ = {
diff --git a/pyramid/scripts/proutes.py b/pyramid/scripts/proutes.py
index f64107d2b..49e19deca 100644
--- a/pyramid/scripts/proutes.py
+++ b/pyramid/scripts/proutes.py
@@ -3,6 +3,7 @@ import sys
 import textwrap
 
 from pyramid.paster import bootstrap
+from pyramid.scripts.common import parse_vars
 
 def main(argv=sys.argv, quiet=False):
     command = PRoutesCommand(argv, quiet)
@@ -47,12 +48,14 @@ class PRoutesCommand(object):
         if not self.args:
             self.out('requires a config file argument')
             return 2
+
         from pyramid.interfaces import IRouteRequest
         from pyramid.interfaces import IViewClassifier
         from pyramid.interfaces import IView
         from zope.interface import Interface
         config_uri = self.args[0]
-        env = self.bootstrap[0](config_uri)
+
+        env = self.bootstrap[0](config_uri, options=parse_vars(self.args[1:]))
         registry = env['registry']
         mapper = self._get_mapper(registry)
         if mapper is not None:
diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py
index 9fbf0729a..44ee54dcd 100644
--- a/pyramid/scripts/pserve.py
+++ b/pyramid/scripts/pserve.py
@@ -22,12 +22,15 @@ import threading
 import time
 import traceback
 
-from paste.deploy import loadapp, loadserver
+from paste.deploy import loadserver
+from paste.deploy import loadapp
 
 from pyramid.compat import WIN
 
 from pyramid.paster import setup_logging
 
+from pyramid.scripts.common import parse_vars
+
 MAXFD = 1024
 
 if WIN and not hasattr(os, 'kill'): # pragma: no cover
@@ -160,6 +163,15 @@ class PServeCommand(object):
         if not self.quiet:
             print(msg)
 
+    def get_options(self):
+        if (len(self.args) > 1
+            and self.args[1] in self.possible_subcommands):
+            restvars = self.args[2:]
+        else:
+            restvars = self.args[1:]
+
+        return parse_vars(restvars)
+
     def run(self): # pragma: no cover
         if self.options.stop_daemon:
             return self.stop_daemon()
@@ -179,10 +191,8 @@ class PServeCommand(object):
         if (len(self.args) > 1
             and self.args[1] in self.possible_subcommands):
             cmd = self.args[1]
-            restvars = self.args[2:]
         else:
             cmd = None
-            restvars = self.args[1:]
 
         if self.options.reload:
             if os.environ.get(self._reloader_environ_key):
@@ -218,7 +228,9 @@ class PServeCommand(object):
             self.options.daemon = True
 
         app_name = self.options.app_name
-        vars = self.parse_vars(restvars)
+
+        vars = self.get_options()
+
         if not self._scheme_re.search(app_spec):
             app_spec = 'config:' + app_spec
         server_name = self.options.server_name
@@ -286,8 +298,9 @@ class PServeCommand(object):
 
         server = self.loadserver(server_spec, name=server_name,
                                  relative_to=base, global_conf=vars)
-        app = self.loadapp(app_spec, name=app_name,
-                           relative_to=base, global_conf=vars)
+
+        app = self.loadapp(app_spec, name=app_name, relative_to=base,
+                global_conf=vars)
 
         if self.verbose > 0:
             if hasattr(os, 'getpid'):
@@ -310,27 +323,12 @@ class PServeCommand(object):
 
         serve()
 
-    def loadserver(self, server_spec, name, relative_to, **kw):# pragma:no cover
-        return loadserver(
-            server_spec, name=name, relative_to=relative_to, **kw)
-
     def loadapp(self, app_spec, name, relative_to, **kw): # pragma: no cover
         return loadapp(app_spec, name=name, relative_to=relative_to, **kw)
 
-    def parse_vars(self, args):
-        """
-        Given variables like ``['a=b', 'c=d']`` turns it into ``{'a':
-        'b', 'c': 'd'}``
-        """
-        result = {}
-        for arg in args:
-            if '=' not in arg:
-                raise ValueError(
-                    'Variable assignment %r invalid (no "=")'
-                    % arg)
-            name, value = arg.split('=', 1)
-            result[name] = value
-        return result
+    def loadserver(self, server_spec, name, relative_to, **kw):# pragma:no cover
+        return loadserver(
+            server_spec, name=name, relative_to=relative_to, **kw)
 
     def quote_first_command_arg(self, arg): # pragma: no cover
         """
diff --git a/pyramid/scripts/pshell.py b/pyramid/scripts/pshell.py
index 7a21eaf98..f74402928 100644
--- a/pyramid/scripts/pshell.py
+++ b/pyramid/scripts/pshell.py
@@ -9,6 +9,8 @@ from pyramid.paster import bootstrap
 
 from pyramid.paster import setup_logging
 
+from pyramid.scripts.common import parse_vars
+
 def main(argv=sys.argv, quiet=False):
     command = PShellCommand(argv, quiet)
     return command.run()
@@ -87,7 +89,7 @@ class PShellCommand(object):
         self.pshell_file_config(config_file)
 
         # bootstrap the environ
-        env = self.bootstrap[0](config_uri)
+        env = self.bootstrap[0](config_uri, options=parse_vars(self.args[1:]))
 
         # remove the closer from the env
         closer = env.pop('closer')
diff --git a/pyramid/scripts/ptweens.py b/pyramid/scripts/ptweens.py
index d3e17db58..5fe2fa120 100644
--- a/pyramid/scripts/ptweens.py
+++ b/pyramid/scripts/ptweens.py
@@ -7,6 +7,7 @@ from pyramid.interfaces import ITweens
 from pyramid.tweens import MAIN
 from pyramid.tweens import INGRESS
 from pyramid.paster import bootstrap
+from pyramid.scripts.common import parse_vars
 
 def main(argv=sys.argv, quiet=False):
     command = PTweensCommand(argv, quiet)
@@ -62,7 +63,7 @@ class PTweensCommand(object):
             self.out('Requires a config file argument')
             return 2
         config_uri = self.args[0]
-        env = self.bootstrap[0](config_uri)
+        env = self.bootstrap[0](config_uri, options=parse_vars(self.args[1:]))
         registry = env['registry']
         tweens = self._get_tweens(registry)
         if tweens is not None:
diff --git a/pyramid/scripts/pviews.py b/pyramid/scripts/pviews.py
index a9db59dc1..1bb4f2227 100644
--- a/pyramid/scripts/pviews.py
+++ b/pyramid/scripts/pviews.py
@@ -4,6 +4,7 @@ import textwrap
 
 from pyramid.interfaces import IMultiView
 from pyramid.paster import bootstrap
+from pyramid.scripts.common import parse_vars
 
 def main(argv=sys.argv, quiet=False):
     command = PViewsCommand(argv, quiet)
@@ -230,10 +231,12 @@ class PViewsCommand(object):
         if len(self.args) < 2:
             self.out('Command requires a config file arg and a url arg')
             return 2
-        config_uri, url = self.args
+        config_uri = self.args[0]
+        url = self.args[1]
+
         if not url.startswith('/'):
             url = '/%s' % url
-        env = self.bootstrap[0](config_uri)
+        env = self.bootstrap[0](config_uri, options=parse_vars(self.args[2:]))
         registry = env['registry']
         view = self._find_view(url, registry)
         self.out('')
diff --git a/pyramid/tests/test_paster.py b/pyramid/tests/test_paster.py
index d94b46a9f..47643e972 100644
--- a/pyramid/tests/test_paster.py
+++ b/pyramid/tests/test_paster.py
@@ -4,7 +4,7 @@ import unittest
 class Test_get_app(unittest.TestCase):
     def _callFUT(self, config_file, section_name, loadapp):
         from pyramid.paster import get_app
-        return get_app(config_file, section_name, loadapp)
+        return get_app(config_file, section_name, loadapp=loadapp)
 
     def test_it(self):
         app = DummyApp()
diff --git a/pyramid/tests/test_scripts/test_common.py b/pyramid/tests/test_scripts/test_common.py
index c3c792ca4..13ab0ae6a 100644
--- a/pyramid/tests/test_scripts/test_common.py
+++ b/pyramid/tests/test_scripts/test_common.py
@@ -17,6 +17,19 @@ class Test_logging_file_config(unittest.TestCase):
     def fileConfig(self, config_file, dict):
         return config_file, dict
 
+class TestParseVars(unittest.TestCase):
+    def test_parse_vars_good(self):
+        from pyramid.scripts.common import parse_vars
+        vars = ['a=1', 'b=2']
+        result = parse_vars(vars)
+        self.assertEqual(result, {'a': '1', 'b': '2'})
+
+    def test_parse_vars_bad(self):
+        from pyramid.scripts.common import parse_vars
+        vars = ['a']
+        self.assertRaises(ValueError, parse_vars, vars)
+
+
 class DummyConfigParser(object):
     def read(self, x):
         pass
diff --git a/pyramid/tests/test_scripts/test_prequest.py b/pyramid/tests/test_scripts/test_prequest.py
index cf7af4218..76cb35881 100644
--- a/pyramid/tests/test_scripts/test_prequest.py
+++ b/pyramid/tests/test_scripts/test_prequest.py
@@ -13,9 +13,11 @@ class TestPRequestCommand(unittest.TestCase):
         cmd.out = self.out
         return cmd
 
-    def get_app(self, spec, app_name=None):
+    def get_app(self, spec, app_name=None, options={}):
         self._spec = spec
         self._app_name = app_name
+        self._options = options
+
         def helloworld(environ, start_request):
             self._environ = environ
             self._path_info = environ['PATH_INFO']
diff --git a/pyramid/tests/test_scripts/test_proutes.py b/pyramid/tests/test_scripts/test_proutes.py
index fad8c1895..0b95729a6 100644
--- a/pyramid/tests/test_scripts/test_proutes.py
+++ b/pyramid/tests/test_scripts/test_proutes.py
@@ -12,6 +12,25 @@ class TestPRoutesCommand(unittest.TestCase):
         cmd.args = ('/foo/bar/myapp.ini#myapp',)
         return cmd
 
+    def test_good_args(self):
+        cmd = self._getTargetClass()([])
+        cmd.bootstrap = (dummy.DummyBootstrap(),)
+        cmd.args = ('/foo/bar/myapp.ini#myapp', 'a=1')
+        route = dummy.DummyRoute('a', '/a')
+        mapper = dummy.DummyMapper(route)
+        cmd._get_mapper = lambda *arg: mapper
+        cmd.run()
+
+    def test_bad_args(self):
+        cmd = self._getTargetClass()([])
+        cmd.bootstrap = (dummy.DummyBootstrap(),)
+        cmd.args = ('/foo/bar/myapp.ini#myapp', 'a')
+        route = dummy.DummyRoute('a', '/a')
+        mapper = dummy.DummyMapper(route)
+        cmd._get_mapper = lambda *arg: mapper
+
+        self.assertRaises(ValueError, cmd.run)
+
     def test_no_routes(self):
         command = self._makeOne()
         mapper = dummy.DummyMapper()
diff --git a/pyramid/tests/test_scripts/test_pserve.py b/pyramid/tests/test_scripts/test_pserve.py
index d7b252d92..18ba3a779 100644
--- a/pyramid/tests/test_scripts/test_pserve.py
+++ b/pyramid/tests/test_scripts/test_pserve.py
@@ -22,6 +22,12 @@ class TestPServeCommand(unittest.TestCase):
     def out(self, msg):
         self.out_.write(msg)
 
+    def _get_server(*args, **kwargs):
+        def server(app):
+            return ''
+
+        return server
+
     def _getTargetClass(self):
         from pyramid.scripts.pserve import PServeCommand
         return PServeCommand
@@ -194,15 +200,38 @@ class TestPServeCommand(unittest.TestCase):
         self.assertEqual(self.out_.getvalue(), msg)
 
     def test_parse_vars_good(self):
-        vars = ['a=1', 'b=2']
-        inst = self._makeOne('development.ini')
-        result = inst.parse_vars(vars)
-        self.assertEqual(result, {'a': '1', 'b': '2'})
+        from pyramid.tests.test_scripts.dummy import DummyApp
+
+        inst = self._makeOne('development.ini', 'a=1', 'b=2')
+        inst.loadserver = self._get_server
+
+
+        app = DummyApp()
+
+        def get_app(*args, **kwargs):
+            app.global_conf = kwargs.get('global_conf', None)
+
+        inst.loadapp = get_app
+        inst.run()
+
+        self.assertEqual(app.global_conf, {'a': '1', 'b': '2'})
 
     def test_parse_vars_bad(self):
-        vars = ['a']
-        inst = self._makeOne('development.ini')
-        self.assertRaises(ValueError, inst.parse_vars, vars)
+        from pyramid.tests.test_scripts.dummy import DummyApp
+
+        inst = self._makeOne('development.ini', 'a')
+
+        inst.loadserver = self._get_server
+
+
+        app = DummyApp()
+
+        def get_app(*args, **kwargs):
+            app.global_conf = kwargs.get('global_conf', None)
+
+        inst.loadapp = get_app
+
+        self.assertRaises(ValueError, inst.run)
 
 class Test_read_pidfile(unittest.TestCase):
     def _callFUT(self, filename):
-- 
cgit v1.2.3


From bb20ecd8309ed2ce6fd0095fadc0d0bf5d0bf07d Mon Sep 17 00:00:00 2001
From: ericrasmussen <ericrasmussen@gmail.com>
Date: Mon, 5 Nov 2012 16:58:08 -0800
Subject: add transaction dependency to zodb scaffold

---
 pyramid/scaffolds/zodb/setup.py_tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyramid/scaffolds/zodb/setup.py_tmpl b/pyramid/scaffolds/zodb/setup.py_tmpl
index acdf095d5..df239f5a7 100644
--- a/pyramid/scaffolds/zodb/setup.py_tmpl
+++ b/pyramid/scaffolds/zodb/setup.py_tmpl
@@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 requires = [
     'pyramid',
     'pyramid_zodbconn',
+    'transaction',
     'pyramid_tm',
     'pyramid_debugtoolbar',
     'ZODB3',
-- 
cgit v1.2.3


From 60ed104358863c58166fe79bce06bec9d6b61c21 Mon Sep 17 00:00:00 2001
From: ericrasmussen <ericrasmussen@gmail.com>
Date: Mon, 5 Nov 2012 17:31:10 -0800
Subject: adding transaction module requirement to zodb wiki docs

---
 docs/tutorials/wiki/src/authorization/setup.py | 1 +
 docs/tutorials/wiki/src/basiclayout/setup.py   | 1 +
 docs/tutorials/wiki/src/models/setup.py        | 1 +
 docs/tutorials/wiki/src/tests/setup.py         | 1 +
 docs/tutorials/wiki/src/views/setup.py         | 1 +
 5 files changed, 5 insertions(+)

diff --git a/docs/tutorials/wiki/src/authorization/setup.py b/docs/tutorials/wiki/src/authorization/setup.py
index 31c51dbcf..d83f14400 100644
--- a/docs/tutorials/wiki/src/authorization/setup.py
+++ b/docs/tutorials/wiki/src/authorization/setup.py
@@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 requires = [
     'pyramid',
     'pyramid_zodbconn',
+    'transaction',
     'pyramid_tm',
     'pyramid_debugtoolbar',
     'ZODB3',
diff --git a/docs/tutorials/wiki/src/basiclayout/setup.py b/docs/tutorials/wiki/src/basiclayout/setup.py
index 43600e239..bd26f8efc 100644
--- a/docs/tutorials/wiki/src/basiclayout/setup.py
+++ b/docs/tutorials/wiki/src/basiclayout/setup.py
@@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 requires = [
     'pyramid',
     'pyramid_zodbconn',
+    'transaction',
     'pyramid_tm',
     'pyramid_debugtoolbar',
     'ZODB3',
diff --git a/docs/tutorials/wiki/src/models/setup.py b/docs/tutorials/wiki/src/models/setup.py
index 43600e239..bd26f8efc 100644
--- a/docs/tutorials/wiki/src/models/setup.py
+++ b/docs/tutorials/wiki/src/models/setup.py
@@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 requires = [
     'pyramid',
     'pyramid_zodbconn',
+    'transaction',
     'pyramid_tm',
     'pyramid_debugtoolbar',
     'ZODB3',
diff --git a/docs/tutorials/wiki/src/tests/setup.py b/docs/tutorials/wiki/src/tests/setup.py
index a7ad7317c..51c638638 100644
--- a/docs/tutorials/wiki/src/tests/setup.py
+++ b/docs/tutorials/wiki/src/tests/setup.py
@@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 requires = [
     'pyramid',
     'pyramid_zodbconn',
+    'transaction',
     'pyramid_tm',
     'pyramid_debugtoolbar',
     'ZODB3',
diff --git a/docs/tutorials/wiki/src/views/setup.py b/docs/tutorials/wiki/src/views/setup.py
index a6be89b2e..6f946582c 100644
--- a/docs/tutorials/wiki/src/views/setup.py
+++ b/docs/tutorials/wiki/src/views/setup.py
@@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 requires = [
     'pyramid',
     'pyramid_zodbconn',
+    'transaction',
     'pyramid_tm',
     'pyramid_debugtoolbar',
     'ZODB3',
-- 
cgit v1.2.3


From c495e90e8d197ff5d9242bd2368d7579d993bd51 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 14 Nov 2012 01:28:57 -0500
Subject: make an assertion in this test

---
 pyramid/tests/test_scripts/test_proutes.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pyramid/tests/test_scripts/test_proutes.py b/pyramid/tests/test_scripts/test_proutes.py
index 0b95729a6..25a3cd2e3 100644
--- a/pyramid/tests/test_scripts/test_proutes.py
+++ b/pyramid/tests/test_scripts/test_proutes.py
@@ -19,7 +19,10 @@ class TestPRoutesCommand(unittest.TestCase):
         route = dummy.DummyRoute('a', '/a')
         mapper = dummy.DummyMapper(route)
         cmd._get_mapper = lambda *arg: mapper
+        L = []
+        cmd.out = lambda msg: L.append(msg)
         cmd.run()
+        self.assertTrue('<unknown>' in ''.join(L))
 
     def test_bad_args(self):
         cmd = self._getTargetClass()([])
-- 
cgit v1.2.3


From e96817beccacd6e9cc7f6e0f13698ab891226dbc Mon Sep 17 00:00:00 2001
From: John Anderson <sontek@gmail.com>
Date: Wed, 14 Nov 2012 11:32:17 -0300
Subject: Don't use a global mutable and updated the doc string to include
 options

---
 pyramid/paster.py                           | 8 ++++++--
 pyramid/tests/test_scripts/test_prequest.py | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pyramid/paster.py b/pyramid/paster.py
index b1a6d4c8b..6dd7f9086 100644
--- a/pyramid/paster.py
+++ b/pyramid/paster.py
@@ -9,7 +9,7 @@ from pyramid.compat import configparser
 from logging.config import fileConfig
 from pyramid.scripting import prepare
 
-def get_app(config_uri, name=None, options={}, loadapp=loadapp):
+def get_app(config_uri, name=None, options=None, loadapp=loadapp):
     """ Return the WSGI application named ``name`` in the PasteDeploy
     config file specified by ``config_uri``.
 
@@ -72,7 +72,7 @@ def _getpathsec(config_uri, name):
         section = name
     return path, section
 
-def bootstrap(config_uri, request=None, options={}):
+def bootstrap(config_uri, request=None, options=None):
     """ Load a WSGI application from the PasteDeploy config file specified
     by ``config_uri``. The environment will be configured as if it is
     currently serving ``request``, leaving a natural environment in place
@@ -112,6 +112,10 @@ def bootstrap(config_uri, request=None, options={}):
     for you if none is provided. You can mutate the request's ``environ``
     later to setup a specific host/port/scheme/etc.
 
+    ``options`` Is passed to get_app for use as variable assignments like 
+    {'http_port': 8080} and then use %(http_port)s in the
+    config file.
+
     See :ref:`writing_a_script` for more information about how to use this
     function.
     """
diff --git a/pyramid/tests/test_scripts/test_prequest.py b/pyramid/tests/test_scripts/test_prequest.py
index 76cb35881..91d2b322a 100644
--- a/pyramid/tests/test_scripts/test_prequest.py
+++ b/pyramid/tests/test_scripts/test_prequest.py
@@ -13,10 +13,10 @@ class TestPRequestCommand(unittest.TestCase):
         cmd.out = self.out
         return cmd
 
-    def get_app(self, spec, app_name=None, options={}):
+    def get_app(self, spec, app_name=None, options=None):
         self._spec = spec
         self._app_name = app_name
-        self._options = options
+        self._options = options or {}
 
         def helloworld(environ, start_request):
             self._environ = environ
-- 
cgit v1.2.3


From edab820875af1670fc298bc174e824d7b2de8f81 Mon Sep 17 00:00:00 2001
From: John Anderson <sontek@gmail.com>
Date: Wed, 14 Nov 2012 11:34:19 -0300
Subject: Added myself to contributors

---
 CONTRIBUTORS.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index d03da3e62..85b520975 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -188,3 +188,5 @@ Contributors
 - Domen Kozar, 2012/09/11
 
 - David Gay, 2012/09/16
+
+- John Anderson, 2012/11/14
-- 
cgit v1.2.3


From 0ccdc23f6ec53548bb1f81f3b528f2a8be0a5467 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sun, 18 Nov 2012 21:47:32 -0500
Subject: - A failure when trying to locate the attribute ``__text__`` on route
 and view   predicates existed when the ``debug_routematch`` setting was true
 or when the   ``pviews`` command was used. See
 https://github.com/Pylons/pyramid/pull/727

Closes #727.
---
 CHANGES.txt                               | 10 ++++++++++
 pyramid/config/util.py                    |  8 ++++++--
 pyramid/router.py                         |  2 +-
 pyramid/scripts/pviews.py                 |  2 +-
 pyramid/tests/test_router.py              | 17 ++++++++++++++---
 pyramid/tests/test_scripts/test_pviews.py |  2 +-
 6 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9f5ce064f..f5c5c9449 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,13 @@
+Next release
+============
+
+Bug Fixes
+---------
+
+- A failure when trying to locate the attribute ``__text__`` on route and view
+  predicates existed when the ``debug_routematch`` setting was true or when the
+  ``pviews`` command was used. See https://github.com/Pylons/pyramid/pull/727
+
 1.4a4 (2012-11-14)
 ==================
 
diff --git a/pyramid/config/util.py b/pyramid/config/util.py
index c16755a75..a83e23798 100644
--- a/pyramid/config/util.py
+++ b/pyramid/config/util.py
@@ -42,8 +42,12 @@ class PredicateList(object):
         ##     weighs_more_than = self.last_added or FIRST
         ##     weighs_less_than = LAST
         self.last_added = name
-        self.sorter.add(name, factory, after=weighs_more_than,
-                        before=weighs_less_than)
+        self.sorter.add(
+            name,
+            factory,
+            after=weighs_more_than,
+            before=weighs_less_than,
+            )
 
     def make(self, config, **kw):
         # Given a configurator and a list of keywords, a predicate list is
diff --git a/pyramid/router.py b/pyramid/router.py
index 0c7f61071..9b6138ea9 100644
--- a/pyramid/router.py
+++ b/pyramid/router.py
@@ -103,7 +103,7 @@ class Router(object):
                             request.path_info,
                             route.pattern,
                             match,
-                            ', '.join([p.__text__ for p in route.predicates]))
+                            ', '.join([p.text() for p in route.predicates]))
                         )
                     logger and logger.debug(msg)
 
diff --git a/pyramid/scripts/pviews.py b/pyramid/scripts/pviews.py
index a9db59dc1..60aecb9bb 100644
--- a/pyramid/scripts/pviews.py
+++ b/pyramid/scripts/pviews.py
@@ -187,7 +187,7 @@ class PViewsCommand(object):
         self.out("%sroute pattern: %s" % (indent, route.pattern))
         self.out("%sroute path: %s" % (indent, route.path))
         self.out("%ssubpath: %s" % (indent, '/'.join(attrs['subpath'])))
-        predicates = ', '.join([p.__text__ for p in route.predicates])
+        predicates = ', '.join([p.text() for p in route.predicates])
         if predicates != '':
             self.out("%sroute predicates (%s)" % (indent, predicates))
 
diff --git a/pyramid/tests/test_router.py b/pyramid/tests/test_router.py
index 778b27473..65152ca05 100644
--- a/pyramid/tests/test_router.py
+++ b/pyramid/tests/test_router.py
@@ -24,7 +24,7 @@ class TestRouter(unittest.TestCase):
         if mapper is None:
             mapper = RoutesMapper()
             self.registry.registerUtility(mapper, IRoutesMapper)
-        mapper.connect(name, path, factory)
+        return mapper.connect(name, path, factory)
 
     def _registerLogger(self):
         from pyramid.interfaces import IDebugLogger
@@ -657,7 +657,8 @@ class TestRouter(unittest.TestCase):
         root = object()
         def factory(request):
             return root
-        self._connectRoute('foo', 'archives/:action/:article', factory)
+        route = self._connectRoute('foo', 'archives/:action/:article', factory)
+        route.predicates = [DummyPredicate()]
         context = DummyContext()
         self._registerTraverserFactory(context)
         response = DummyResponse()
@@ -686,7 +687,11 @@ class TestRouter(unittest.TestCase):
             "route matched for url http://localhost:8080"
             "/archives/action1/article1; "
             "route_name: 'foo', "
-            "path_info: "))
+            "path_info: ")
+            )
+        self.assertTrue(
+            "predicates: 'predicate'" in logger.messages[0]
+            )
 
     def test_call_route_match_miss_debug_routematch(self):
         from pyramid.httpexceptions import HTTPNotFound
@@ -1159,6 +1164,12 @@ class TestRouter(unittest.TestCase):
         start_response = DummyStartResponse()
         self.assertRaises(RuntimeError, router, environ, start_response)
 
+class DummyPredicate(object):
+    def __call__(self, info, request):
+        return True
+    def text(self):
+        return 'predicate'
+
 class DummyContext:
     pass
 
diff --git a/pyramid/tests/test_scripts/test_pviews.py b/pyramid/tests/test_scripts/test_pviews.py
index 6a919c31b..266d1ec90 100644
--- a/pyramid/tests/test_scripts/test_pviews.py
+++ b/pyramid/tests/test_scripts/test_pviews.py
@@ -379,7 +379,7 @@ class TestPViewsCommand(unittest.TestCase):
         L = []
         command.out = L.append
         def predicate(): pass
-        predicate.__text__ = "predicate = x"
+        predicate.text = lambda *arg: "predicate = x"
         route = dummy.DummyRoute('a', '/a', matchdict={}, predicate=predicate)
         view = dummy.DummyView(context='context', view_name='a',
                          matched_route=route, subpath='')
-- 
cgit v1.2.3


From c344e532e27ce078643ec3246002d2703ef85416 Mon Sep 17 00:00:00 2001
From: Patricio Paez <pp@pp.com.mx>
Date: Mon, 19 Nov 2012 21:03:46 -0600
Subject: Sync some SQL wiki tutorial files with the scaffold

- Files that are not referred to in a literalinclude
  in the tutorial docs

- setup.py appears in literalinclude, but no lines
  are added or removed so no impact.  Fixed docutils
  order in the requires list.
---
 docs/tutorials/wiki2/src/authorization/README.txt    | 13 +++++++++++++
 .../wiki2/src/authorization/development.ini          | 20 +++++++++++++++++---
 docs/tutorials/wiki2/src/authorization/setup.py      |  9 +++++----
 docs/tutorials/wiki2/src/basiclayout/README.txt      | 13 +++++++++++++
 docs/tutorials/wiki2/src/basiclayout/development.ini | 20 +++++++++++++++++---
 docs/tutorials/wiki2/src/basiclayout/production.ini  | 12 +++++++++---
 docs/tutorials/wiki2/src/basiclayout/setup.py        |  6 +++---
 .../src/basiclayout/tutorial/templates/mytemplate.pt |  2 +-
 docs/tutorials/wiki2/src/models/README.txt           | 13 +++++++++++++
 docs/tutorials/wiki2/src/models/development.ini      | 20 +++++++++++++++++---
 docs/tutorials/wiki2/src/models/setup.py             |  6 +++---
 docs/tutorials/wiki2/src/tests/README.txt            | 13 +++++++++++++
 docs/tutorials/wiki2/src/tests/development.ini       | 20 +++++++++++++++++---
 docs/tutorials/wiki2/src/tests/setup.py              |  7 ++++---
 docs/tutorials/wiki2/src/views/README.txt            | 13 +++++++++++++
 docs/tutorials/wiki2/src/views/development.ini       | 20 +++++++++++++++++---
 docs/tutorials/wiki2/src/views/setup.py              |  6 +++---
 17 files changed, 178 insertions(+), 35 deletions(-)

diff --git a/docs/tutorials/wiki2/src/authorization/README.txt b/docs/tutorials/wiki2/src/authorization/README.txt
index 6f851e9b7..141851285 100644
--- a/docs/tutorials/wiki2/src/authorization/README.txt
+++ b/docs/tutorials/wiki2/src/authorization/README.txt
@@ -1 +1,14 @@
 tutorial README
+==================
+
+Getting Started
+---------------
+
+- cd <directory containing this file>
+
+- $venv/bin/python setup.py develop
+
+- $venv/bin/initialize_tutorial_db development.ini
+
+- $venv/bin/pserve development.ini
+
diff --git a/docs/tutorials/wiki2/src/authorization/development.ini b/docs/tutorials/wiki2/src/authorization/development.ini
index eb2f878c5..a9d53b296 100644
--- a/docs/tutorials/wiki2/src/authorization/development.ini
+++ b/docs/tutorials/wiki2/src/authorization/development.ini
@@ -1,3 +1,8 @@
+###
+# app configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+###
+
 [app:main]
 use = egg:tutorial
 
@@ -12,12 +17,23 @@ pyramid.includes =
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
 
+# 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
 
-# Begin logging configuration
+###
+# logging configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+###
 
 [loggers]
 keys = root, tutorial, sqlalchemy
@@ -53,5 +69,3 @@ formatter = generic
 
 [formatter_generic]
 format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/tutorials/wiki2/src/authorization/setup.py b/docs/tutorials/wiki2/src/authorization/setup.py
index 2fd051927..d658cae93 100644
--- a/docs/tutorials/wiki2/src/authorization/setup.py
+++ b/docs/tutorials/wiki2/src/authorization/setup.py
@@ -13,8 +13,8 @@ requires = [
     'pyramid_tm',
     'pyramid_debugtoolbar',
     'zope.sqlalchemy',
-    'docutils',
     'waitress',
+    'docutils',
     ]
 
 setup(name='tutorial',
@@ -23,7 +23,7 @@ setup(name='tutorial',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
         "Programming Language :: Python",
-        "Framework :: Pylons",
+        "Framework :: Pyramid",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
         ],
@@ -35,11 +35,12 @@ setup(name='tutorial',
       include_package_data=True,
       zip_safe=False,
       test_suite='tutorial',
-      install_requires = requires,
-      entry_points = """\
+      install_requires=requires,
+      entry_points="""\
       [paste.app_factory]
       main = tutorial:main
       [console_scripts]
       initialize_tutorial_db = tutorial.scripts.initializedb:main
       """,
       )
+
diff --git a/docs/tutorials/wiki2/src/basiclayout/README.txt b/docs/tutorials/wiki2/src/basiclayout/README.txt
index 6f851e9b7..141851285 100644
--- a/docs/tutorials/wiki2/src/basiclayout/README.txt
+++ b/docs/tutorials/wiki2/src/basiclayout/README.txt
@@ -1 +1,14 @@
 tutorial README
+==================
+
+Getting Started
+---------------
+
+- cd <directory containing this file>
+
+- $venv/bin/python setup.py develop
+
+- $venv/bin/initialize_tutorial_db development.ini
+
+- $venv/bin/pserve development.ini
+
diff --git a/docs/tutorials/wiki2/src/basiclayout/development.ini b/docs/tutorials/wiki2/src/basiclayout/development.ini
index eb2f878c5..a9d53b296 100644
--- a/docs/tutorials/wiki2/src/basiclayout/development.ini
+++ b/docs/tutorials/wiki2/src/basiclayout/development.ini
@@ -1,3 +1,8 @@
+###
+# app configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+###
+
 [app:main]
 use = egg:tutorial
 
@@ -12,12 +17,23 @@ pyramid.includes =
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
 
+# 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
 
-# Begin logging configuration
+###
+# logging configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+###
 
 [loggers]
 keys = root, tutorial, sqlalchemy
@@ -53,5 +69,3 @@ formatter = generic
 
 [formatter_generic]
 format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/tutorials/wiki2/src/basiclayout/production.ini b/docs/tutorials/wiki2/src/basiclayout/production.ini
index 4684d2f7a..fa94c1b3e 100644
--- a/docs/tutorials/wiki2/src/basiclayout/production.ini
+++ b/docs/tutorials/wiki2/src/basiclayout/production.ini
@@ -1,3 +1,8 @@
+###
+# app configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+###
+
 [app:main]
 use = egg:tutorial
 
@@ -16,7 +21,10 @@ use = egg:waitress#main
 host = 0.0.0.0
 port = 6543
 
-# Begin logging configuration
+###
+# logging configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+###
 
 [loggers]
 keys = root, tutorial, sqlalchemy
@@ -52,5 +60,3 @@ formatter = generic
 
 [formatter_generic]
 format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/tutorials/wiki2/src/basiclayout/setup.py b/docs/tutorials/wiki2/src/basiclayout/setup.py
index 050de7299..1a1ad78aa 100644
--- a/docs/tutorials/wiki2/src/basiclayout/setup.py
+++ b/docs/tutorials/wiki2/src/basiclayout/setup.py
@@ -22,7 +22,7 @@ setup(name='tutorial',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
         "Programming Language :: Python",
-        "Framework :: Pylons",
+        "Framework :: Pyramid",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
         ],
@@ -34,8 +34,8 @@ setup(name='tutorial',
       include_package_data=True,
       zip_safe=False,
       test_suite='tutorial',
-      install_requires = requires,
-      entry_points = """\
+      install_requires=requires,
+      entry_points="""\
       [paste.app_factory]
       main = tutorial:main
       [console_scripts]
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt
index fbfa9870b..15ea6614f 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt
@@ -70,7 +70,7 @@
     </div>
   </div>
   <div id="footer">
-    <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
+    <div class="footer">&copy; Copyright 2008-2012, Agendaless Consulting.</div>
   </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki2/src/models/README.txt b/docs/tutorials/wiki2/src/models/README.txt
index 6f851e9b7..141851285 100644
--- a/docs/tutorials/wiki2/src/models/README.txt
+++ b/docs/tutorials/wiki2/src/models/README.txt
@@ -1 +1,14 @@
 tutorial README
+==================
+
+Getting Started
+---------------
+
+- cd <directory containing this file>
+
+- $venv/bin/python setup.py develop
+
+- $venv/bin/initialize_tutorial_db development.ini
+
+- $venv/bin/pserve development.ini
+
diff --git a/docs/tutorials/wiki2/src/models/development.ini b/docs/tutorials/wiki2/src/models/development.ini
index eb2f878c5..a9d53b296 100644
--- a/docs/tutorials/wiki2/src/models/development.ini
+++ b/docs/tutorials/wiki2/src/models/development.ini
@@ -1,3 +1,8 @@
+###
+# app configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+###
+
 [app:main]
 use = egg:tutorial
 
@@ -12,12 +17,23 @@ pyramid.includes =
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
 
+# 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
 
-# Begin logging configuration
+###
+# logging configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+###
 
 [loggers]
 keys = root, tutorial, sqlalchemy
@@ -53,5 +69,3 @@ formatter = generic
 
 [formatter_generic]
 format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/tutorials/wiki2/src/models/setup.py b/docs/tutorials/wiki2/src/models/setup.py
index 050de7299..1a1ad78aa 100644
--- a/docs/tutorials/wiki2/src/models/setup.py
+++ b/docs/tutorials/wiki2/src/models/setup.py
@@ -22,7 +22,7 @@ setup(name='tutorial',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
         "Programming Language :: Python",
-        "Framework :: Pylons",
+        "Framework :: Pyramid",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
         ],
@@ -34,8 +34,8 @@ setup(name='tutorial',
       include_package_data=True,
       zip_safe=False,
       test_suite='tutorial',
-      install_requires = requires,
-      entry_points = """\
+      install_requires=requires,
+      entry_points="""\
       [paste.app_factory]
       main = tutorial:main
       [console_scripts]
diff --git a/docs/tutorials/wiki2/src/tests/README.txt b/docs/tutorials/wiki2/src/tests/README.txt
index 6f851e9b7..141851285 100644
--- a/docs/tutorials/wiki2/src/tests/README.txt
+++ b/docs/tutorials/wiki2/src/tests/README.txt
@@ -1 +1,14 @@
 tutorial README
+==================
+
+Getting Started
+---------------
+
+- cd <directory containing this file>
+
+- $venv/bin/python setup.py develop
+
+- $venv/bin/initialize_tutorial_db development.ini
+
+- $venv/bin/pserve development.ini
+
diff --git a/docs/tutorials/wiki2/src/tests/development.ini b/docs/tutorials/wiki2/src/tests/development.ini
index eb2f878c5..a9d53b296 100644
--- a/docs/tutorials/wiki2/src/tests/development.ini
+++ b/docs/tutorials/wiki2/src/tests/development.ini
@@ -1,3 +1,8 @@
+###
+# app configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+###
+
 [app:main]
 use = egg:tutorial
 
@@ -12,12 +17,23 @@ pyramid.includes =
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
 
+# 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
 
-# Begin logging configuration
+###
+# logging configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+###
 
 [loggers]
 keys = root, tutorial, sqlalchemy
@@ -53,5 +69,3 @@ formatter = generic
 
 [formatter_generic]
 format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/tutorials/wiki2/src/tests/setup.py b/docs/tutorials/wiki2/src/tests/setup.py
index 0f58d8a18..8a619d27b 100644
--- a/docs/tutorials/wiki2/src/tests/setup.py
+++ b/docs/tutorials/wiki2/src/tests/setup.py
@@ -24,7 +24,7 @@ setup(name='tutorial',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
         "Programming Language :: Python",
-        "Framework :: Pylons",
+        "Framework :: Pyramid",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
         ],
@@ -36,11 +36,12 @@ setup(name='tutorial',
       include_package_data=True,
       zip_safe=False,
       test_suite='tutorial',
-      install_requires = requires,
-      entry_points = """\
+      install_requires=requires,
+      entry_points="""\
       [paste.app_factory]
       main = tutorial:main
       [console_scripts]
       initialize_tutorial_db = tutorial.scripts.initializedb:main
       """,
       )
+
diff --git a/docs/tutorials/wiki2/src/views/README.txt b/docs/tutorials/wiki2/src/views/README.txt
index 6f851e9b7..141851285 100644
--- a/docs/tutorials/wiki2/src/views/README.txt
+++ b/docs/tutorials/wiki2/src/views/README.txt
@@ -1 +1,14 @@
 tutorial README
+==================
+
+Getting Started
+---------------
+
+- cd <directory containing this file>
+
+- $venv/bin/python setup.py develop
+
+- $venv/bin/initialize_tutorial_db development.ini
+
+- $venv/bin/pserve development.ini
+
diff --git a/docs/tutorials/wiki2/src/views/development.ini b/docs/tutorials/wiki2/src/views/development.ini
index eb2f878c5..a9d53b296 100644
--- a/docs/tutorials/wiki2/src/views/development.ini
+++ b/docs/tutorials/wiki2/src/views/development.ini
@@ -1,3 +1,8 @@
+###
+# app configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+###
+
 [app:main]
 use = egg:tutorial
 
@@ -12,12 +17,23 @@ pyramid.includes =
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
 
+# 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
 
-# Begin logging configuration
+###
+# logging configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+###
 
 [loggers]
 keys = root, tutorial, sqlalchemy
@@ -53,5 +69,3 @@ formatter = generic
 
 [formatter_generic]
 format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/tutorials/wiki2/src/views/setup.py b/docs/tutorials/wiki2/src/views/setup.py
index 34b578e21..d658cae93 100644
--- a/docs/tutorials/wiki2/src/views/setup.py
+++ b/docs/tutorials/wiki2/src/views/setup.py
@@ -23,7 +23,7 @@ setup(name='tutorial',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
         "Programming Language :: Python",
-        "Framework :: Pylons",
+        "Framework :: Pyramid",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
         ],
@@ -35,8 +35,8 @@ setup(name='tutorial',
       include_package_data=True,
       zip_safe=False,
       test_suite='tutorial',
-      install_requires = requires,
-      entry_points = """\
+      install_requires=requires,
+      entry_points="""\
       [paste.app_factory]
       main = tutorial:main
       [console_scripts]
-- 
cgit v1.2.3


From 6234f4a25a59658ccc66fe3d2b1c248ba96f5344 Mon Sep 17 00:00:00 2001
From: Patricio Paez <pp@pp.com.mx>
Date: Mon, 19 Nov 2012 22:35:36 -0600
Subject: Sync some ZODB wiki tutorial files with the scaffold

- Files that are not referred to in a literalinclude
  in the tutorial docs

- setup.py and development.ini appear in a literalinclude
  but no lines are emphasized and there is no impact.
---
 .../wiki/src/authorization/development.ini         | 26 +++++++++++++++++--
 .../wiki/src/authorization/production.ini          | 17 +++++++++---
 docs/tutorials/wiki/src/authorization/setup.py     |  7 +++--
 .../authorization/tutorial/templates/mytemplate.pt |  6 ++---
 .../tutorials/wiki/src/basiclayout/development.ini | 30 ++++++++++++++++++----
 docs/tutorials/wiki/src/basiclayout/production.ini | 17 +++++++++---
 docs/tutorials/wiki/src/basiclayout/setup.py       |  2 +-
 .../basiclayout/tutorial/templates/mytemplate.pt   |  4 +--
 docs/tutorials/wiki/src/models/development.ini     | 28 +++++++++++++++++---
 docs/tutorials/wiki/src/models/production.ini      | 17 +++++++++---
 docs/tutorials/wiki/src/models/setup.py            |  2 +-
 .../src/models/tutorial/templates/mytemplate.pt    |  6 ++---
 docs/tutorials/wiki/src/tests/development.ini      | 26 +++++++++++++++++--
 docs/tutorials/wiki/src/tests/production.ini       | 17 +++++++++---
 docs/tutorials/wiki/src/tests/setup.py             |  7 +++--
 .../src/tests/tutorial/templates/mytemplate.pt     |  6 ++---
 docs/tutorials/wiki/src/views/development.ini      | 28 +++++++++++++++++---
 docs/tutorials/wiki/src/views/production.ini       | 17 +++++++++---
 docs/tutorials/wiki/src/views/setup.py             |  8 +++---
 .../src/views/tutorial/templates/mytemplate.pt     |  6 ++---
 20 files changed, 218 insertions(+), 59 deletions(-)

diff --git a/docs/tutorials/wiki/src/authorization/development.ini b/docs/tutorials/wiki/src/authorization/development.ini
index 996caa741..c504ec82f 100644
--- a/docs/tutorials/wiki/src/authorization/development.ini
+++ b/docs/tutorials/wiki/src/authorization/development.ini
@@ -1,5 +1,11 @@
+###
+# app configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+###
+
 [app:main]
 use = egg:tutorial
+
 pyramid.reload_templates = true
 pyramid.debug_authorization = false
 pyramid.debug_notfound = false
@@ -13,15 +19,26 @@ pyramid.includes =
 tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
+# 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
 
-# Begin logging configuration
+###
+# logging configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+###
 
 [loggers]
-keys = root
+keys = root, tutorial
 
 [handlers]
 keys = console
@@ -33,6 +50,11 @@ keys = generic
 level = INFO
 handlers = console
 
+[logger_tutorial]
+level = DEBUG
+handlers =
+qualname = tutorial
+
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
diff --git a/docs/tutorials/wiki/src/authorization/production.ini b/docs/tutorials/wiki/src/authorization/production.ini
index ca8107802..d9bf27c42 100644
--- a/docs/tutorials/wiki/src/authorization/production.ini
+++ b/docs/tutorials/wiki/src/authorization/production.ini
@@ -1,5 +1,11 @@
+###
+# app configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+###
+
 [app:main]
 use = egg:tutorial
+
 pyramid.reload_templates = false
 pyramid.debug_authorization = false
 pyramid.debug_notfound = false
@@ -12,12 +18,19 @@ pyramid.includes =
 tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
+###
+# wsgi server configuration
+###
+
 [server:main]
 use = egg:waitress#main
 host = 0.0.0.0
 port = 6543
 
-# Begin logging configuration
+###
+# logging configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+###
 
 [loggers]
 keys = root, tutorial
@@ -45,5 +58,3 @@ formatter = generic
 
 [formatter_generic]
 format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/tutorials/wiki/src/authorization/setup.py b/docs/tutorials/wiki/src/authorization/setup.py
index 31c51dbcf..ac8cdf2d5 100644
--- a/docs/tutorials/wiki/src/authorization/setup.py
+++ b/docs/tutorials/wiki/src/authorization/setup.py
@@ -21,9 +21,8 @@ setup(name='tutorial',
       description='tutorial',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
-        "Intended Audience :: Developers",
-        "Framework :: Pylons",
         "Programming Language :: Python",
+        "Framework :: Pyramid",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
         ],
@@ -34,8 +33,8 @@ setup(name='tutorial',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
-      install_requires=requires,
-      tests_require=requires,
+      install_requires = requires,
+      tests_require= requires,
       test_suite="tutorial",
       entry_points = """\
       [paste.app_factory]
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
index 3597c679b..84824f605 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
@@ -6,9 +6,9 @@
   <meta name="keywords" content="python web application" />
   <meta name="description" content="pyramid web application" />
   <link rel="shortcut icon" href="/static/favicon.ico" />
+  <link rel="stylesheet" href="/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" />
-  <link rel="stylesheet" href="/static/pylons.css" type="text/css" media="screen" charset="utf-8" />
   <!--[if lte IE 6]>
   <link rel="stylesheet" href="/static/ie6.css" type="text/css" media="screen" charset="utf-8" />
   <![endif]-->
@@ -41,7 +41,7 @@
           <h2>Pyramid links</h2>
           <ul class="links">
             <li>
-              <a href="http://pylonsproject.org">Pylons Website</a>
+              <a href="http://pylonsproject.org/">Pylons Website</a>
             </li>
             <li>
               <a href="http://docs.pylonsproject.org/projects/pyramid/current/#narrative-documentation">Narrative Documentation</a>
@@ -70,7 +70,7 @@
     </div>
   </div>
   <div id="footer">
-    <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
+    <div class="footer">&copy; Copyright 2008-2012, Agendaless Consulting.</div>
   </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/basiclayout/development.ini b/docs/tutorials/wiki/src/basiclayout/development.ini
index f637ebaa6..72bd22e54 100644
--- a/docs/tutorials/wiki/src/basiclayout/development.ini
+++ b/docs/tutorials/wiki/src/basiclayout/development.ini
@@ -1,5 +1,11 @@
+###
+# app configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+###
+
 [app:main]
 use = egg:tutorial
+
 pyramid.reload_templates = true
 pyramid.debug_authorization = false
 pyramid.debug_notfound = false
@@ -13,15 +19,26 @@ pyramid.includes =
 tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
+# 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
 
-# Begin logging configuration
+###
+# logging configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+###
 
 [loggers]
-keys = root
+keys = root, tutorial
 
 [handlers]
 keys = console
@@ -33,6 +50,11 @@ keys = generic
 level = INFO
 handlers = console
 
+[logger_tutorial]
+level = DEBUG
+handlers =
+qualname = tutorial
+
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
@@ -40,6 +62,4 @@ level = NOTSET
 formatter = generic
 
 [formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s
-
-# End logging configuration
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
diff --git a/docs/tutorials/wiki/src/basiclayout/production.ini b/docs/tutorials/wiki/src/basiclayout/production.ini
index ca8107802..d9bf27c42 100644
--- a/docs/tutorials/wiki/src/basiclayout/production.ini
+++ b/docs/tutorials/wiki/src/basiclayout/production.ini
@@ -1,5 +1,11 @@
+###
+# app configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+###
+
 [app:main]
 use = egg:tutorial
+
 pyramid.reload_templates = false
 pyramid.debug_authorization = false
 pyramid.debug_notfound = false
@@ -12,12 +18,19 @@ pyramid.includes =
 tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
+###
+# wsgi server configuration
+###
+
 [server:main]
 use = egg:waitress#main
 host = 0.0.0.0
 port = 6543
 
-# Begin logging configuration
+###
+# logging configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+###
 
 [loggers]
 keys = root, tutorial
@@ -45,5 +58,3 @@ formatter = generic
 
 [formatter_generic]
 format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/tutorials/wiki/src/basiclayout/setup.py b/docs/tutorials/wiki/src/basiclayout/setup.py
index 43600e239..c4a9067b6 100644
--- a/docs/tutorials/wiki/src/basiclayout/setup.py
+++ b/docs/tutorials/wiki/src/basiclayout/setup.py
@@ -21,7 +21,7 @@ setup(name='tutorial',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
         "Programming Language :: Python",
-        "Framework :: Pylons",
+        "Framework :: Pyramid",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
         ],
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
index 557e071ed..84824f605 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
@@ -6,9 +6,9 @@
   <meta name="keywords" content="python web application" />
   <meta name="description" content="pyramid web application" />
   <link rel="shortcut icon" href="/static/favicon.ico" />
+  <link rel="stylesheet" href="/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" />
-  <link rel="stylesheet" href="/static/pylons.css" type="text/css" media="screen" charset="utf-8" />
   <!--[if lte IE 6]>
   <link rel="stylesheet" href="/static/ie6.css" type="text/css" media="screen" charset="utf-8" />
   <![endif]-->
@@ -70,7 +70,7 @@
     </div>
   </div>
   <div id="footer">
-    <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
+    <div class="footer">&copy; Copyright 2008-2012, Agendaless Consulting.</div>
   </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/models/development.ini b/docs/tutorials/wiki/src/models/development.ini
index 996caa741..72bd22e54 100644
--- a/docs/tutorials/wiki/src/models/development.ini
+++ b/docs/tutorials/wiki/src/models/development.ini
@@ -1,5 +1,11 @@
+###
+# app configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+###
+
 [app:main]
 use = egg:tutorial
+
 pyramid.reload_templates = true
 pyramid.debug_authorization = false
 pyramid.debug_notfound = false
@@ -13,15 +19,26 @@ pyramid.includes =
 tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
+# 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
 
-# Begin logging configuration
+###
+# logging configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+###
 
 [loggers]
-keys = root
+keys = root, tutorial
 
 [handlers]
 keys = console
@@ -33,6 +50,11 @@ keys = generic
 level = INFO
 handlers = console
 
+[logger_tutorial]
+level = DEBUG
+handlers =
+qualname = tutorial
+
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
@@ -41,5 +63,3 @@ formatter = generic
 
 [formatter_generic]
 format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/tutorials/wiki/src/models/production.ini b/docs/tutorials/wiki/src/models/production.ini
index ca8107802..d9bf27c42 100644
--- a/docs/tutorials/wiki/src/models/production.ini
+++ b/docs/tutorials/wiki/src/models/production.ini
@@ -1,5 +1,11 @@
+###
+# app configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+###
+
 [app:main]
 use = egg:tutorial
+
 pyramid.reload_templates = false
 pyramid.debug_authorization = false
 pyramid.debug_notfound = false
@@ -12,12 +18,19 @@ pyramid.includes =
 tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
+###
+# wsgi server configuration
+###
+
 [server:main]
 use = egg:waitress#main
 host = 0.0.0.0
 port = 6543
 
-# Begin logging configuration
+###
+# logging configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+###
 
 [loggers]
 keys = root, tutorial
@@ -45,5 +58,3 @@ formatter = generic
 
 [formatter_generic]
 format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/tutorials/wiki/src/models/setup.py b/docs/tutorials/wiki/src/models/setup.py
index 43600e239..c4a9067b6 100644
--- a/docs/tutorials/wiki/src/models/setup.py
+++ b/docs/tutorials/wiki/src/models/setup.py
@@ -21,7 +21,7 @@ setup(name='tutorial',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
         "Programming Language :: Python",
-        "Framework :: Pylons",
+        "Framework :: Pyramid",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
         ],
diff --git a/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
index 3597c679b..84824f605 100644
--- a/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
@@ -6,9 +6,9 @@
   <meta name="keywords" content="python web application" />
   <meta name="description" content="pyramid web application" />
   <link rel="shortcut icon" href="/static/favicon.ico" />
+  <link rel="stylesheet" href="/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" />
-  <link rel="stylesheet" href="/static/pylons.css" type="text/css" media="screen" charset="utf-8" />
   <!--[if lte IE 6]>
   <link rel="stylesheet" href="/static/ie6.css" type="text/css" media="screen" charset="utf-8" />
   <![endif]-->
@@ -41,7 +41,7 @@
           <h2>Pyramid links</h2>
           <ul class="links">
             <li>
-              <a href="http://pylonsproject.org">Pylons Website</a>
+              <a href="http://pylonsproject.org/">Pylons Website</a>
             </li>
             <li>
               <a href="http://docs.pylonsproject.org/projects/pyramid/current/#narrative-documentation">Narrative Documentation</a>
@@ -70,7 +70,7 @@
     </div>
   </div>
   <div id="footer">
-    <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
+    <div class="footer">&copy; Copyright 2008-2012, Agendaless Consulting.</div>
   </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/tests/development.ini b/docs/tutorials/wiki/src/tests/development.ini
index 996caa741..c504ec82f 100644
--- a/docs/tutorials/wiki/src/tests/development.ini
+++ b/docs/tutorials/wiki/src/tests/development.ini
@@ -1,5 +1,11 @@
+###
+# app configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+###
+
 [app:main]
 use = egg:tutorial
+
 pyramid.reload_templates = true
 pyramid.debug_authorization = false
 pyramid.debug_notfound = false
@@ -13,15 +19,26 @@ pyramid.includes =
 tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
+# 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
 
-# Begin logging configuration
+###
+# logging configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+###
 
 [loggers]
-keys = root
+keys = root, tutorial
 
 [handlers]
 keys = console
@@ -33,6 +50,11 @@ keys = generic
 level = INFO
 handlers = console
 
+[logger_tutorial]
+level = DEBUG
+handlers =
+qualname = tutorial
+
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
diff --git a/docs/tutorials/wiki/src/tests/production.ini b/docs/tutorials/wiki/src/tests/production.ini
index ca8107802..d9bf27c42 100644
--- a/docs/tutorials/wiki/src/tests/production.ini
+++ b/docs/tutorials/wiki/src/tests/production.ini
@@ -1,5 +1,11 @@
+###
+# app configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+###
+
 [app:main]
 use = egg:tutorial
+
 pyramid.reload_templates = false
 pyramid.debug_authorization = false
 pyramid.debug_notfound = false
@@ -12,12 +18,19 @@ pyramid.includes =
 tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
+###
+# wsgi server configuration
+###
+
 [server:main]
 use = egg:waitress#main
 host = 0.0.0.0
 port = 6543
 
-# Begin logging configuration
+###
+# logging configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+###
 
 [loggers]
 keys = root, tutorial
@@ -45,5 +58,3 @@ formatter = generic
 
 [formatter_generic]
 format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/tutorials/wiki/src/tests/setup.py b/docs/tutorials/wiki/src/tests/setup.py
index a7ad7317c..b7e0a8935 100644
--- a/docs/tutorials/wiki/src/tests/setup.py
+++ b/docs/tutorials/wiki/src/tests/setup.py
@@ -22,9 +22,8 @@ setup(name='tutorial',
       description='tutorial',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
-        "Intended Audience :: Developers",
-        "Framework :: Pylons",
         "Programming Language :: Python",
+        "Framework :: Pyramid",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
         ],
@@ -35,8 +34,8 @@ setup(name='tutorial',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
-      install_requires=requires,
-      tests_require=requires,
+      install_requires = requires,
+      tests_require= requires,
       test_suite="tutorial",
       entry_points = """\
       [paste.app_factory]
diff --git a/docs/tutorials/wiki/src/tests/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/tests/tutorial/templates/mytemplate.pt
index 3597c679b..84824f605 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/tests/tutorial/templates/mytemplate.pt
@@ -6,9 +6,9 @@
   <meta name="keywords" content="python web application" />
   <meta name="description" content="pyramid web application" />
   <link rel="shortcut icon" href="/static/favicon.ico" />
+  <link rel="stylesheet" href="/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" />
-  <link rel="stylesheet" href="/static/pylons.css" type="text/css" media="screen" charset="utf-8" />
   <!--[if lte IE 6]>
   <link rel="stylesheet" href="/static/ie6.css" type="text/css" media="screen" charset="utf-8" />
   <![endif]-->
@@ -41,7 +41,7 @@
           <h2>Pyramid links</h2>
           <ul class="links">
             <li>
-              <a href="http://pylonsproject.org">Pylons Website</a>
+              <a href="http://pylonsproject.org/">Pylons Website</a>
             </li>
             <li>
               <a href="http://docs.pylonsproject.org/projects/pyramid/current/#narrative-documentation">Narrative Documentation</a>
@@ -70,7 +70,7 @@
     </div>
   </div>
   <div id="footer">
-    <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
+    <div class="footer">&copy; Copyright 2008-2012, Agendaless Consulting.</div>
   </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/views/development.ini b/docs/tutorials/wiki/src/views/development.ini
index f637ebaa6..c504ec82f 100644
--- a/docs/tutorials/wiki/src/views/development.ini
+++ b/docs/tutorials/wiki/src/views/development.ini
@@ -1,5 +1,11 @@
+###
+# app configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+###
+
 [app:main]
 use = egg:tutorial
+
 pyramid.reload_templates = true
 pyramid.debug_authorization = false
 pyramid.debug_notfound = false
@@ -13,15 +19,26 @@ pyramid.includes =
 tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
+# 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
 
-# Begin logging configuration
+###
+# logging configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+###
 
 [loggers]
-keys = root
+keys = root, tutorial
 
 [handlers]
 keys = console
@@ -33,6 +50,11 @@ keys = generic
 level = INFO
 handlers = console
 
+[logger_tutorial]
+level = DEBUG
+handlers =
+qualname = tutorial
+
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
@@ -40,6 +62,6 @@ level = NOTSET
 formatter = generic
 
 [formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
 
 # End logging configuration
diff --git a/docs/tutorials/wiki/src/views/production.ini b/docs/tutorials/wiki/src/views/production.ini
index ca8107802..d9bf27c42 100644
--- a/docs/tutorials/wiki/src/views/production.ini
+++ b/docs/tutorials/wiki/src/views/production.ini
@@ -1,5 +1,11 @@
+###
+# app configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+###
+
 [app:main]
 use = egg:tutorial
+
 pyramid.reload_templates = false
 pyramid.debug_authorization = false
 pyramid.debug_notfound = false
@@ -12,12 +18,19 @@ pyramid.includes =
 tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
+###
+# wsgi server configuration
+###
+
 [server:main]
 use = egg:waitress#main
 host = 0.0.0.0
 port = 6543
 
-# Begin logging configuration
+###
+# logging configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+###
 
 [loggers]
 keys = root, tutorial
@@ -45,5 +58,3 @@ formatter = generic
 
 [formatter_generic]
 format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/tutorials/wiki/src/views/setup.py b/docs/tutorials/wiki/src/views/setup.py
index a6be89b2e..ac8cdf2d5 100644
--- a/docs/tutorials/wiki/src/views/setup.py
+++ b/docs/tutorials/wiki/src/views/setup.py
@@ -21,9 +21,8 @@ setup(name='tutorial',
       description='tutorial',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
-        "Intended Audience :: Developers",
-        "Framework :: Pylons",
         "Programming Language :: Python",
+        "Framework :: Pyramid",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
         ],
@@ -34,11 +33,12 @@ setup(name='tutorial',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
-      install_requires=requires,
-      tests_require=requires,
+      install_requires = requires,
+      tests_require= requires,
       test_suite="tutorial",
       entry_points = """\
       [paste.app_factory]
       main = tutorial:main
       """,
       )
+
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt
index 3597c679b..84824f605 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt
@@ -6,9 +6,9 @@
   <meta name="keywords" content="python web application" />
   <meta name="description" content="pyramid web application" />
   <link rel="shortcut icon" href="/static/favicon.ico" />
+  <link rel="stylesheet" href="/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" />
-  <link rel="stylesheet" href="/static/pylons.css" type="text/css" media="screen" charset="utf-8" />
   <!--[if lte IE 6]>
   <link rel="stylesheet" href="/static/ie6.css" type="text/css" media="screen" charset="utf-8" />
   <![endif]-->
@@ -41,7 +41,7 @@
           <h2>Pyramid links</h2>
           <ul class="links">
             <li>
-              <a href="http://pylonsproject.org">Pylons Website</a>
+              <a href="http://pylonsproject.org/">Pylons Website</a>
             </li>
             <li>
               <a href="http://docs.pylonsproject.org/projects/pyramid/current/#narrative-documentation">Narrative Documentation</a>
@@ -70,7 +70,7 @@
     </div>
   </div>
   <div id="footer">
-    <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
+    <div class="footer">&copy; Copyright 2008-2012, Agendaless Consulting.</div>
   </div>
 </body>
 </html>
-- 
cgit v1.2.3


From 71cd93bd78015285db9aaadaa63a5ac9042f6843 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 20 Nov 2012 18:36:56 -0500
Subject: - Small microspeed enhancement which anticipates that a  
 ``pyramid.response.Response`` object is likely to be returned from a view.  
 Some code is shortcut if the class of the object returned by a view is this  
 class.  A similar microoptimization was done to  
 ``pyramid.request.Request.is_response``.

---
 CHANGES.txt                             |  9 ++++
 pyramid/config/views.py                 | 78 +++++++++++++++++++--------------
 pyramid/request.py                      |  2 +
 pyramid/tests/test_config/test_views.py | 23 ++++++++++
 pyramid/tests/test_request.py           |  7 +++
 5 files changed, 85 insertions(+), 34 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f5c5c9449..22abf63d9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,15 @@
 Next release
 ============
 
+Features
+--------
+
+- Small microspeed enhancement which anticipates that a
+  ``pyramid.response.Response`` object is likely to be returned from a view.
+  Some code is shortcut if the class of the object returned by a view is this
+  class.  A similar microoptimization was done to
+  ``pyramid.request.Request.is_response``.
+
 Bug Fixes
 ---------
 
diff --git a/pyramid/config/views.py b/pyramid/config/views.py
index 745b6f810..4e5af480d 100644
--- a/pyramid/config/views.py
+++ b/pyramid/config/views.py
@@ -59,6 +59,8 @@ from pyramid.registry import (
     Deferred,
     )
 
+from pyramid.response import Response
+
 from pyramid.security import NO_PERMISSION_REQUIRED
 from pyramid.static import static_view
 from pyramid.threadlocal import get_current_registry
@@ -341,25 +343,28 @@ class ViewDeriver(object):
         def rendered_view(context, request):
             renderer = view_renderer
             result = view(context, request)
-            registry = self.registry
-            # this must adapt, it can't do a simple interface check
-            # (avoid trying to render webob responses)
-            response = registry.queryAdapterOrSelf(result, IResponse)
-            if response is None:
-                attrs = getattr(request, '__dict__', {})
-                if 'override_renderer' in attrs:
-                    # renderer overridden by newrequest event or other
-                    renderer_name = attrs.pop('override_renderer')
-                    renderer = renderers.RendererHelper(
-                        name=renderer_name,
-                        package=self.kw.get('package'),
-                        registry = registry)
-                if '__view__' in attrs:
-                    view_inst = attrs.pop('__view__')
-                else:
-                    view_inst = getattr(view, '__original_view__', view)
-                response = renderer.render_view(request, result, view_inst,
-                                                context)
+            if result.__class__ is Response: # potential common case
+                response = result
+            else:
+                registry = self.registry
+                # this must adapt, it can't do a simple interface check
+                # (avoid trying to render webob responses)
+                response = registry.queryAdapterOrSelf(result, IResponse)
+                if response is None:
+                    attrs = getattr(request, '__dict__', {})
+                    if 'override_renderer' in attrs:
+                        # renderer overridden by newrequest event or other
+                        renderer_name = attrs.pop('override_renderer')
+                        renderer = renderers.RendererHelper(
+                            name=renderer_name,
+                            package=self.kw.get('package'),
+                            registry = registry)
+                    if '__view__' in attrs:
+                        view_inst = attrs.pop('__view__')
+                    else:
+                        view_inst = getattr(view, '__original_view__', view)
+                    response = renderer.render_view(request, result, view_inst,
+                                                    context)
             return response
 
         return rendered_view
@@ -368,21 +373,26 @@ class ViewDeriver(object):
         registry = self.registry
         def viewresult_to_response(context, request):
             result = view(context, request)
-            response = registry.queryAdapterOrSelf(result, IResponse)
-            if response is None:
-                if result is None:
-                    append = (' You may have forgotten to return a value from '
-                              'the view callable.')
-                elif isinstance(result, dict):
-                    append = (' You may have forgotten to define a renderer in '
-                              'the view configuration.')
-                else:
-                    append = ''
-                msg = ('Could not convert return value of the view callable %s '
-                      'into a response object. '
-                      'The value returned was %r.' + append)
-                    
-                raise ValueError(msg % (view_description(view), result))
+            if result.__class__ is Response: # common case
+                response = result
+            else:
+                response = registry.queryAdapterOrSelf(result, IResponse)
+                if response is None:
+                    if result is None:
+                        append = (' You may have forgotten to return a value '
+                                  'from the view callable.')
+                    elif isinstance(result, dict):
+                        append = (' You may have forgotten to define a '
+                                  'renderer in the view configuration.')
+                    else:
+                        append = ''
+
+                    msg = ('Could not convert return value of the view '
+                           'callable %s into a response object. '
+                           'The value returned was %r.' + append)
+
+                    raise ValueError(msg % (view_description(view), result))
+
             return response
 
         return viewresult_to_response
diff --git a/pyramid/request.py b/pyramid/request.py
index 9e275c2c0..27ab337de 100644
--- a/pyramid/request.py
+++ b/pyramid/request.py
@@ -372,6 +372,8 @@ class Request(BaseRequest, DeprecatedRequestMethodsMixin, URLMethodsMixin,
     def is_response(self, ob):
         """ Return ``True`` if the object passed as ``ob`` is a valid
         response object, ``False`` otherwise."""
+        if ob.__class__ is Response:
+            return True
         registry = self.registry
         adapted = registry.queryAdapterOrSelf(ob, IResponse)
         if adapted is None:
diff --git a/pyramid/tests/test_config/test_views.py b/pyramid/tests/test_config/test_views.py
index 8324eb2b9..bb4c5d519 100644
--- a/pyramid/tests/test_config/test_views.py
+++ b/pyramid/tests/test_config/test_views.py
@@ -2483,6 +2483,29 @@ class TestViewDeriver(unittest.TestCase):
         else: # pragma: no cover
             raise AssertionError
 
+    def test_function_returns_true_Response_no_renderer(self):
+        from pyramid.response import Response
+        r = Response('Hello')
+        def view(request):
+            return r
+        deriver = self._makeOne()
+        result = deriver(view)
+        self.assertFalse(result is view)
+        response = result(None, None)
+        self.assertEqual(response, r)
+
+    def test_function_returns_true_Response_with_renderer(self):
+        from pyramid.response import Response
+        r = Response('Hello')
+        def view(request):
+            return r
+        renderer = object()
+        deriver = self._makeOne(renderer=renderer)
+        result = deriver(view)
+        self.assertFalse(result is view)
+        response = result(None, None)
+        self.assertEqual(response, r)
+
     def test_requestonly_default_method_returns_non_adaptable(self):
         request = DummyRequest()
         class AView(object):
diff --git a/pyramid/tests/test_request.py b/pyramid/tests/test_request.py
index 945e36a7f..565c6377e 100644
--- a/pyramid/tests/test_request.py
+++ b/pyramid/tests/test_request.py
@@ -230,6 +230,13 @@ class TestRequest(unittest.TestCase):
         request.registry = self.config.registry
         self.assertEqual(request.is_response('abc'), False)
 
+    def test_is_response_true_ob_is_pyramid_response(self):
+        from pyramid.response import Response
+        r = Response('hello')
+        request = self._makeOne()
+        request.registry = self.config.registry
+        self.assertEqual(request.is_response(r), True)
+
     def test_is_response_false_adapter_is_not_self(self):
         from pyramid.interfaces import IResponse
         request = self._makeOne()
-- 
cgit v1.2.3


From 9a8a2133e49b42594e27bd1b8a08e8bf88a117e6 Mon Sep 17 00:00:00 2001
From: Patricio Paez <pp@pp.com.mx>
Date: Tue, 20 Nov 2012 18:48:45 -0600
Subject: More sync on ZODB wiki tutorial

- literalinclude should refer to the file
  in the corresponding section

- Remove extra lines
---
 docs/tutorials/wiki/basiclayout.rst                   | 2 +-
 docs/tutorials/wiki/src/authorization/development.ini | 2 --
 docs/tutorials/wiki/src/tests/development.ini         | 2 --
 docs/tutorials/wiki/src/views/development.ini         | 2 --
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst
index f6050f391..033dcb28c 100644
--- a/docs/tutorials/wiki/basiclayout.rst
+++ b/docs/tutorials/wiki/basiclayout.rst
@@ -165,7 +165,7 @@ Configuration in ``development.ini``
 The ``development.ini`` (in the tutorial :term:`project` directory, as
 opposed to the tutorial :term:`package` directory) looks like this:
 
-.. literalinclude:: src/views/development.ini
+.. literalinclude:: src/basiclayout/development.ini
    :language: ini
 
 Note the existence of an ``[app:main]`` section which specifies our WSGI
diff --git a/docs/tutorials/wiki/src/authorization/development.ini b/docs/tutorials/wiki/src/authorization/development.ini
index c504ec82f..72bd22e54 100644
--- a/docs/tutorials/wiki/src/authorization/development.ini
+++ b/docs/tutorials/wiki/src/authorization/development.ini
@@ -63,5 +63,3 @@ formatter = generic
 
 [formatter_generic]
 format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/tutorials/wiki/src/tests/development.ini b/docs/tutorials/wiki/src/tests/development.ini
index c504ec82f..72bd22e54 100644
--- a/docs/tutorials/wiki/src/tests/development.ini
+++ b/docs/tutorials/wiki/src/tests/development.ini
@@ -63,5 +63,3 @@ formatter = generic
 
 [formatter_generic]
 format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/docs/tutorials/wiki/src/views/development.ini b/docs/tutorials/wiki/src/views/development.ini
index c504ec82f..72bd22e54 100644
--- a/docs/tutorials/wiki/src/views/development.ini
+++ b/docs/tutorials/wiki/src/views/development.ini
@@ -63,5 +63,3 @@ formatter = generic
 
 [formatter_generic]
 format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
-- 
cgit v1.2.3


From 5fbaf7be1b82247e21fa7d3b98d76e7d92ac522c Mon Sep 17 00:00:00 2001
From: Patricio Paez <pp@pp.com.mx>
Date: Tue, 20 Nov 2012 19:46:10 -0600
Subject: Sync views.py on SQL wiki tutorial with the scaffold

- Explain the added lines in the Basic Layout chapter.

- The user is told to remove the added lines in the
  Defining Views chapter, there was no need to fix
  any emphasized lines.

- Sync the file in the other sections even if it is not
  shown, for consistency.
---
 docs/tutorials/wiki2/basiclayout.rst               |  6 ++++++
 .../wiki2/src/basiclayout/tutorial/views.py        | 25 +++++++++++++++++++++-
 docs/tutorials/wiki2/src/models/tutorial/views.py  | 25 +++++++++++++++++++++-
 docs/tutorials/wiki2/src/tests/tutorial/views.py   | 13 +++++------
 4 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index dbd130c36..4f73dc914 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -171,6 +171,12 @@ application.  Without being processed by ``scan``, the decorator effectively
 does nothing.  ``@view_config`` is inert without being detected via a
 :term:`scan`.
 
+The sample ``my_view()`` created by the scaffold uses a ``try:`` and ``except:``
+clause, to detect if there is a problem accessing the project database and
+provide an alternate error response.  That response will include the text
+shown at the end of the file, which will be displayed in the browser to
+inform the user about possible actions to take to solve the problem.
+
 Content Models with ``models.py``
 ---------------------------------
 
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/views.py b/docs/tutorials/wiki2/src/basiclayout/tutorial/views.py
index 3e6abf2c2..daf21bb7b 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/views.py
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/views.py
@@ -1,5 +1,8 @@
+from pyramid.response import Response
 from pyramid.view import view_config
 
+from sqlalchemy.exc import DBAPIError
+
 from .models import (
     DBSession,
     MyModel,
@@ -7,5 +10,25 @@ from .models import (
 
 @view_config(route_name='home', renderer='templates/mytemplate.pt')
 def my_view(request):
-    one = DBSession.query(MyModel).filter(MyModel.name=='one').first()
+    try:
+        one = DBSession.query(MyModel).filter(MyModel.name=='one').first()
+    except DBAPIError:
+        return Response(conn_err_msg, content_type='text/plain', status_int=500)
     return {'one':one, 'project':'tutorial'}
+
+conn_err_msg = """\
+Pyramid is having a problem using your SQL database.  The problem
+might be caused by one of the following things:
+
+1.  You may need to run the "initialize_tutorial_db" script
+    to initialize your database tables.  Check your virtual 
+    environment's "bin" directory for this script and try to run it.
+
+2.  Your database server may not be running.  Check that the
+    database server referred to by the "sqlalchemy.url" setting in
+    your "development.ini" file is running.
+
+After you fix the problem, please restart the Pyramid application to
+try it again.
+"""
+
diff --git a/docs/tutorials/wiki2/src/models/tutorial/views.py b/docs/tutorials/wiki2/src/models/tutorial/views.py
index 3e6abf2c2..daf21bb7b 100644
--- a/docs/tutorials/wiki2/src/models/tutorial/views.py
+++ b/docs/tutorials/wiki2/src/models/tutorial/views.py
@@ -1,5 +1,8 @@
+from pyramid.response import Response
 from pyramid.view import view_config
 
+from sqlalchemy.exc import DBAPIError
+
 from .models import (
     DBSession,
     MyModel,
@@ -7,5 +10,25 @@ from .models import (
 
 @view_config(route_name='home', renderer='templates/mytemplate.pt')
 def my_view(request):
-    one = DBSession.query(MyModel).filter(MyModel.name=='one').first()
+    try:
+        one = DBSession.query(MyModel).filter(MyModel.name=='one').first()
+    except DBAPIError:
+        return Response(conn_err_msg, content_type='text/plain', status_int=500)
     return {'one':one, 'project':'tutorial'}
+
+conn_err_msg = """\
+Pyramid is having a problem using your SQL database.  The problem
+might be caused by one of the following things:
+
+1.  You may need to run the "initialize_tutorial_db" script
+    to initialize your database tables.  Check your virtual 
+    environment's "bin" directory for this script and try to run it.
+
+2.  Your database server may not be running.  Check that the
+    database server referred to by the "sqlalchemy.url" setting in
+    your "development.ini" file is running.
+
+After you fix the problem, please restart the Pyramid application to
+try it again.
+"""
+
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/views.py b/docs/tutorials/wiki2/src/tests/tutorial/views.py
index 42ac0eb7f..0d085b0e2 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/views.py
+++ b/docs/tutorials/wiki2/src/tests/tutorial/views.py
@@ -37,14 +37,13 @@ def view_wiki(request):
              permission='view')
 def view_page(request):
     pagename = request.matchdict['pagename']
-    session = DBSession()
-    page = session.query(Page).filter_by(name=pagename).first()
+    page = DBSession.query(Page).filter_by(name=pagename).first()
     if page is None:
         return HTTPNotFound('No such page')
 
     def check(match):
         word = match.group(1)
-        exists = session.query(Page).filter_by(name=word).all()
+        exists = DBSession.query(Page).filter_by(name=word).all()
         if exists:
             view_url = request.route_url('view_page', pagename=word)
             return '<a href="%s">%s</a>' % (view_url, word)
@@ -63,10 +62,9 @@ def view_page(request):
 def add_page(request):
     pagename = request.matchdict['pagename']
     if 'form.submitted' in request.params:
-        session = DBSession()
         body = request.params['body']
         page = Page(pagename, body)
-        session.add(page)
+        DBSession.add(page)
         return HTTPFound(location = request.route_url('view_page',
                                                       pagename=pagename))
     save_url = request.route_url('add_page', pagename=pagename)
@@ -78,11 +76,10 @@ def add_page(request):
              permission='edit')
 def edit_page(request):
     pagename = request.matchdict['pagename']
-    session = DBSession()
-    page = session.query(Page).filter_by(name=pagename).one()
+    page = DBSession.query(Page).filter_by(name=pagename).one()
     if 'form.submitted' in request.params:
         page.data = request.params['body']
-        session.add(page)
+        DBSession.add(page)
         return HTTPFound(location = request.route_url('view_page',
                                                       pagename=pagename))
     return dict(
-- 
cgit v1.2.3


From b5e4443dd28f3d4ed6e767e06d658838575d159e Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 20 Nov 2012 22:02:06 -0500
Subject: garden

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 22abf63d9..51266d15f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -17,6 +17,12 @@ Bug Fixes
   predicates existed when the ``debug_routematch`` setting was true or when the
   ``pviews`` command was used. See https://github.com/Pylons/pyramid/pull/727
 
+Documentation
+-------------
+
+- Sync up tutorial source files with the files that are rendered by the
+  scaffold that each uses.
+
 1.4a4 (2012-11-14)
 ==================
 
-- 
cgit v1.2.3


From 8f4fcc47c9405f20cfed3a40931f12534b3b7193 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 20 Nov 2012 22:47:50 -0500
Subject: coverage

---
 docs/api/paster.rst                       |  2 +-
 pyramid/paster.py                         |  5 +++--
 pyramid/scripts/pserve.py                 |  1 +
 pyramid/tests/test_paster.py              | 35 +++++++++++++++++++++++++------
 pyramid/tests/test_scripts/test_pserve.py | 24 ++++++++++-----------
 5 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/docs/api/paster.rst b/docs/api/paster.rst
index 3f7a1c364..bde128e05 100644
--- a/docs/api/paster.rst
+++ b/docs/api/paster.rst
@@ -7,7 +7,7 @@
 
     .. autofunction:: bootstrap
 
-    .. autofunction:: get_app(config_uri, name=None)
+    .. autofunction:: get_app(config_uri, name=None, options=None)
 
     .. autofunction:: get_appsettings(config_uri, name=None)
 
diff --git a/pyramid/paster.py b/pyramid/paster.py
index 6dd7f9086..ce07d1fe0 100644
--- a/pyramid/paster.py
+++ b/pyramid/paster.py
@@ -13,8 +13,9 @@ def get_app(config_uri, name=None, options=None, loadapp=loadapp):
     """ Return the WSGI application named ``name`` in the PasteDeploy
     config file specified by ``config_uri``.
 
-    ``options`` are used as variable assignments like {'http_port': 8080}
-    and then use %(http_port)s in the config file.
+    ``options``, if passed, should be a dictionary used as variable assignments
+    like ``{'http_port': 8080}``.  This is useful if e.g. ``%(http_port)s`` is
+    used in the config file.
 
     If the ``name`` is None, this will attempt to parse the name from
     the ``config_uri`` string expecting the format ``inifile#name``.
diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py
index 44ee54dcd..6c7e1d654 100644
--- a/pyramid/scripts/pserve.py
+++ b/pyramid/scripts/pserve.py
@@ -188,6 +188,7 @@ class PServeCommand(object):
             self.out('You must give a config file')
             return 2
         app_spec = self.args[0]
+
         if (len(self.args) > 1
             and self.args[1] in self.possible_subcommands):
             cmd = self.args[1]
diff --git a/pyramid/tests/test_paster.py b/pyramid/tests/test_paster.py
index 47643e972..b72e0e6b6 100644
--- a/pyramid/tests/test_paster.py
+++ b/pyramid/tests/test_paster.py
@@ -2,14 +2,16 @@ import os
 import unittest
 
 class Test_get_app(unittest.TestCase):
-    def _callFUT(self, config_file, section_name, loadapp):
+    def _callFUT(self, config_file, section_name, options=None, loadapp=None):
         from pyramid.paster import get_app
-        return get_app(config_file, section_name, loadapp=loadapp)
+        return get_app(
+            config_file, section_name, options=options, loadapp=loadapp
+            )
 
     def test_it(self):
         app = DummyApp()
         loadapp = DummyLoadWSGI(app)
-        result = self._callFUT('/foo/bar/myapp.ini', 'myapp', loadapp)
+        result = self._callFUT('/foo/bar/myapp.ini', 'myapp', loadapp=loadapp)
         self.assertEqual(loadapp.config_name, 'config:/foo/bar/myapp.ini')
         self.assertEqual(loadapp.section_name, 'myapp')
         self.assertEqual(loadapp.relative_to, os.getcwd())
@@ -18,7 +20,9 @@ class Test_get_app(unittest.TestCase):
     def test_it_with_hash(self):
         app = DummyApp()
         loadapp = DummyLoadWSGI(app)
-        result = self._callFUT('/foo/bar/myapp.ini#myapp', None, loadapp)
+        result = self._callFUT(
+            '/foo/bar/myapp.ini#myapp', None, loadapp=loadapp
+            )
         self.assertEqual(loadapp.config_name, 'config:/foo/bar/myapp.ini')
         self.assertEqual(loadapp.section_name, 'myapp')
         self.assertEqual(loadapp.relative_to, os.getcwd())
@@ -27,12 +31,30 @@ class Test_get_app(unittest.TestCase):
     def test_it_with_hash_and_name_override(self):
         app = DummyApp()
         loadapp = DummyLoadWSGI(app)
-        result = self._callFUT('/foo/bar/myapp.ini#myapp', 'yourapp', loadapp)
+        result = self._callFUT(
+            '/foo/bar/myapp.ini#myapp', 'yourapp', loadapp=loadapp
+            )
         self.assertEqual(loadapp.config_name, 'config:/foo/bar/myapp.ini')
         self.assertEqual(loadapp.section_name, 'yourapp')
         self.assertEqual(loadapp.relative_to, os.getcwd())
         self.assertEqual(result, app)
 
+    def test_it_with_options(self):
+        app = DummyApp()
+        loadapp = DummyLoadWSGI(app)
+        options = {'a':1}
+        result = self._callFUT(
+            '/foo/bar/myapp.ini#myapp',
+            'yourapp',
+            loadapp=loadapp,
+            options=options,
+            )
+        self.assertEqual(loadapp.config_name, 'config:/foo/bar/myapp.ini')
+        self.assertEqual(loadapp.section_name, 'yourapp')
+        self.assertEqual(loadapp.relative_to, os.getcwd())
+        self.assertEqual(loadapp.kw, {'global_conf':options})
+        self.assertEqual(result, app)
+
 class Test_get_appsettings(unittest.TestCase):
     def _callFUT(self, config_file, section_name, appconfig):
         from pyramid.paster import get_appsettings
@@ -132,10 +154,11 @@ class DummyLoadWSGI:
     def __init__(self, result):
         self.result = result
 
-    def __call__(self, config_name, name=None, relative_to=None):
+    def __call__(self, config_name, name=None, relative_to=None, **kw):
         self.config_name = config_name
         self.section_name = name
         self.relative_to = relative_to
+        self.kw = kw
         return self.result
 
 class DummyApp:
diff --git a/pyramid/tests/test_scripts/test_pserve.py b/pyramid/tests/test_scripts/test_pserve.py
index 18ba3a779..6e4b0f17d 100644
--- a/pyramid/tests/test_scripts/test_pserve.py
+++ b/pyramid/tests/test_scripts/test_pserve.py
@@ -199,6 +199,18 @@ class TestPServeCommand(unittest.TestCase):
         msg = 'PID in %s is not valid (deleting)' % fn
         self.assertEqual(self.out_.getvalue(), msg)
 
+    def test_get_options_with_command(self):
+        inst = self._makeOne()
+        inst.args = ['foo', 'stop', 'a=1', 'b=2']
+        result = inst.get_options()
+        self.assertEqual(result, {'a': '1', 'b': '2'})
+
+    def test_get_options_no_command(self):
+        inst = self._makeOne()
+        inst.args = ['foo', 'a=1', 'b=2']
+        result = inst.get_options()
+        self.assertEqual(result, {'a': '1', 'b': '2'})
+
     def test_parse_vars_good(self):
         from pyramid.tests.test_scripts.dummy import DummyApp
 
@@ -217,20 +229,8 @@ class TestPServeCommand(unittest.TestCase):
         self.assertEqual(app.global_conf, {'a': '1', 'b': '2'})
 
     def test_parse_vars_bad(self):
-        from pyramid.tests.test_scripts.dummy import DummyApp
-
         inst = self._makeOne('development.ini', 'a')
-
         inst.loadserver = self._get_server
-
-
-        app = DummyApp()
-
-        def get_app(*args, **kwargs):
-            app.global_conf = kwargs.get('global_conf', None)
-
-        inst.loadapp = get_app
-
         self.assertRaises(ValueError, inst.run)
 
 class Test_read_pidfile(unittest.TestCase):
-- 
cgit v1.2.3


From 9132f65d8cfcd197ff8bc33e6190556b77becc96 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 20 Nov 2012 22:49:33 -0500
Subject: garden

---
 CHANGES.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 51266d15f..b41a29a68 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,11 @@ Features
   class.  A similar microoptimization was done to
   ``pyramid.request.Request.is_response``.
 
+- Make it possible to use variable arguments on ``p*`` commands (``pserve``,
+  ``pshell``, ``pviews``, etc) in the form ``a=1 b=2`` so you can fill in
+  values in parameterized ``.ini`` file, e.g. ``pshell etc/development.ini
+  http_port=8080``.
+
 Bug Fixes
 ---------
 
-- 
cgit v1.2.3


From 6ba0fc746b15262a018cd271efc14089a71d8297 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 20 Nov 2012 22:49:47 -0500
Subject: garden

---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b41a29a68..5344cb7d1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,7 +13,7 @@ Features
 - Make it possible to use variable arguments on ``p*`` commands (``pserve``,
   ``pshell``, ``pviews``, etc) in the form ``a=1 b=2`` so you can fill in
   values in parameterized ``.ini`` file, e.g. ``pshell etc/development.ini
-  http_port=8080``.
+  http_port=8080``.  See https://github.com/Pylons/pyramid/pull/714
 
 Bug Fixes
 ---------
-- 
cgit v1.2.3


From bc527250b318332e275ecb1f547498e36993c680 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 20 Nov 2012 23:01:37 -0500
Subject: garden

---
 TODO.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/TODO.txt b/TODO.txt
index 46edd8c6b..7a3561494 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -4,6 +4,9 @@ Pyramid TODOs
 Nice-to-Have
 ------------
 
+- config.set_registry_attr with conflict detection... make sure the attr is
+  added before a commit, but register an action so a conflict can be detected.
+
 - Provide the presumed renderer name to the called view as an attribute of
   the request.
 
@@ -175,6 +178,3 @@ Probably Bad Ideas
 
 - _fix_registry should dictify the registry being fixed.
 
-- config.set_registry_attr (with conflict detection)... bad idea because it
-  won't take effect until after a commit and folks will be confused by that.
-
-- 
cgit v1.2.3


From 4e5e5574e8a195ac292ce6afb403dc8b0c57b021 Mon Sep 17 00:00:00 2001
From: ericrasmussen <ericrasmussen@gmail.com>
Date: Mon, 5 Nov 2012 16:58:08 -0800
Subject: add transaction dependency to zodb scaffold

---
 pyramid/scaffolds/zodb/setup.py_tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyramid/scaffolds/zodb/setup.py_tmpl b/pyramid/scaffolds/zodb/setup.py_tmpl
index acdf095d5..df239f5a7 100644
--- a/pyramid/scaffolds/zodb/setup.py_tmpl
+++ b/pyramid/scaffolds/zodb/setup.py_tmpl
@@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 requires = [
     'pyramid',
     'pyramid_zodbconn',
+    'transaction',
     'pyramid_tm',
     'pyramid_debugtoolbar',
     'ZODB3',
-- 
cgit v1.2.3


From 5b60d09d196caf2d56e80e5b3b3fd9eeddf18e10 Mon Sep 17 00:00:00 2001
From: ericrasmussen <ericrasmussen@gmail.com>
Date: Mon, 5 Nov 2012 17:31:10 -0800
Subject: adding transaction module requirement to zodb wiki docs

---
 docs/tutorials/wiki/src/authorization/setup.py | 1 +
 docs/tutorials/wiki/src/basiclayout/setup.py   | 1 +
 docs/tutorials/wiki/src/models/setup.py        | 1 +
 docs/tutorials/wiki/src/tests/setup.py         | 1 +
 docs/tutorials/wiki/src/views/setup.py         | 1 +
 5 files changed, 5 insertions(+)

diff --git a/docs/tutorials/wiki/src/authorization/setup.py b/docs/tutorials/wiki/src/authorization/setup.py
index ac8cdf2d5..1d2d690fc 100644
--- a/docs/tutorials/wiki/src/authorization/setup.py
+++ b/docs/tutorials/wiki/src/authorization/setup.py
@@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 requires = [
     'pyramid',
     'pyramid_zodbconn',
+    'transaction',
     'pyramid_tm',
     'pyramid_debugtoolbar',
     'ZODB3',
diff --git a/docs/tutorials/wiki/src/basiclayout/setup.py b/docs/tutorials/wiki/src/basiclayout/setup.py
index c4a9067b6..647c3a638 100644
--- a/docs/tutorials/wiki/src/basiclayout/setup.py
+++ b/docs/tutorials/wiki/src/basiclayout/setup.py
@@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 requires = [
     'pyramid',
     'pyramid_zodbconn',
+    'transaction',
     'pyramid_tm',
     'pyramid_debugtoolbar',
     'ZODB3',
diff --git a/docs/tutorials/wiki/src/models/setup.py b/docs/tutorials/wiki/src/models/setup.py
index c4a9067b6..647c3a638 100644
--- a/docs/tutorials/wiki/src/models/setup.py
+++ b/docs/tutorials/wiki/src/models/setup.py
@@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 requires = [
     'pyramid',
     'pyramid_zodbconn',
+    'transaction',
     'pyramid_tm',
     'pyramid_debugtoolbar',
     'ZODB3',
diff --git a/docs/tutorials/wiki/src/tests/setup.py b/docs/tutorials/wiki/src/tests/setup.py
index b7e0a8935..a665611bd 100644
--- a/docs/tutorials/wiki/src/tests/setup.py
+++ b/docs/tutorials/wiki/src/tests/setup.py
@@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 requires = [
     'pyramid',
     'pyramid_zodbconn',
+    'transaction',
     'pyramid_tm',
     'pyramid_debugtoolbar',
     'ZODB3',
diff --git a/docs/tutorials/wiki/src/views/setup.py b/docs/tutorials/wiki/src/views/setup.py
index ac8cdf2d5..1d2d690fc 100644
--- a/docs/tutorials/wiki/src/views/setup.py
+++ b/docs/tutorials/wiki/src/views/setup.py
@@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 requires = [
     'pyramid',
     'pyramid_zodbconn',
+    'transaction',
     'pyramid_tm',
     'pyramid_debugtoolbar',
     'ZODB3',
-- 
cgit v1.2.3


From 28fc3d575107a95a977a049eb38f55c6c422813a Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 21 Nov 2012 06:26:40 -0500
Subject: - In order to normalize the relationship between event subscribers
 and   subscriber predicates, we now allow both subscribers and subscriber  
 predicates to accept only a single ``event`` argument even if they've been  
 subscribed for notifications that involve multiple interfaces.  Subscribers  
 and subscriber predicates that accept only one argument will receive the  
 first object passed to ``notify``; this is typically (but not always) the  
 event object.  The other objects involved in the subscription lookup will be 
  discarded.

  For instance, if an event is sent by code like this::

     registry.notify(event, context)

  In the past, in order to catch such an event, you were obligated to write and
  register an event subscriber that mentioned both the event and the context in
  its argument list::

     @subscriber([SomeEvent, SomeContextType])
     def subscriber(event, context):
         pass

  With the event-only feature you can now write an event subscriber that
  accepts only ``event`` even if it subscribes to multiple interfaces::

     @subscriber([SomeEvent, SomeContextType])
     def subscriber(event):
         # this will work!

  Note, however, that if the event object is not the first object in the call
  to ``notify``, you'll run into trouble.  For example, if notify is called
  with the context argument first::

     registry.notify(context, event)

  You won't be able to take advantage of the feature.  It will "work", but the
  object received by your event handler won't be the event object, it will be
  the context object, which won't be very useful::

     @subscriber([SomeContextType, SomeEvent])
     def subscriber(event):
         # bzzt! you'll be getting the context here as ``event``, and it'll
         # be useless

  Existing multiple-argument subscribers continue to work without issue, so you
  should continue use those if your system notifies using multiple interfaces
  and the first interface is not the event interface.  For example::

     @subscriber([SomeContextType, SomeEvent])
     def subscriber(context, event):
         # this will still work!

  The event-only feature makes it possible to use a subscriber predicate that
  accepts only a request argument within both multiple-interface subscriber
  registrations and single-interface subscriber registrations.  In the past, if
  you had a subscriber predicate like this::

    class RequestPathStartsWith(object):
        def __init__(self, val, config):
            self.val = val

        def text(self):
            return 'path_startswith = %s' % (self.val,)

        phash = text

        def __call__(self, event):
            return event.request.path.startswith(self.val)

  If you attempted to use the above predicate to condition a subscription that
  involved multiple interfaces, it would not work.  You had to change it to
  accept the same arguments as the subscription itself.  For example, you might
  have had to change its ``__call__`` method like so, adding a ``context``
  argument::

        def __call__(self, event, context):
            return event.request.path.startswith(self.val)

  With the event-only feature, you needn't make the change.  Instead, you can
  write all predicates so they only accept ``event`` in their ``__call__`` and
  they'll be useful across all registrations for subscriptions that use an
  event as their first argument, even ones which accept more than just
  ``event``.  However, the same caveat applies to predicates as to
  subscriptions: if you're subscribing to a multi-interface event, and the
  first interface is not the event interface, the predicate won't work
  properly.  In such a case, you'll need to match the predicate ``__call__``
  argument ordering and composition to the ordering of the interfaces.  For
  example::

        def __call__(self, context, event):
            return event.request.path.startswith(self.val)

  tl;dr: 1) Always use the event as the first argument to a multi-interface
  subscription and 2) Use only ``event`` in your subscriber and subscriber
  predicate parameter lists, no matter how many interfaces the subscriber is
  notified with, as long as the event object is the first argument passed to
  ``registry.notify``.  This will result in the maximum amount of reusability
  of subscriber predicates.
---
 CHANGES.txt                                |  98 +++++++++++++++
 pyramid/config/adapters.py                 |  78 +++++++++---
 pyramid/config/util.py                     |  50 ++++++++
 pyramid/config/views.py                    |  46 +------
 pyramid/tests/test_config/test_adapters.py |   9 ++
 pyramid/tests/test_config/test_util.py     | 186 ++++++++++++++++++++++++++++
 pyramid/tests/test_config/test_views.py    | 190 ++---------------------------
 7 files changed, 416 insertions(+), 241 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5344cb7d1..a625af3f9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,6 +15,104 @@ Features
   values in parameterized ``.ini`` file, e.g. ``pshell etc/development.ini
   http_port=8080``.  See https://github.com/Pylons/pyramid/pull/714
 
+- In order to normalize the relationship between event subscribers and
+  subscriber predicates, we now allow both subscribers and subscriber
+  predicates to accept only a single ``event`` argument even if they've been
+  subscribed for notifications that involve multiple interfaces.  Subscribers
+  and subscriber predicates that accept only one argument will receive the
+  first object passed to ``notify``; this is typically (but not always) the
+  event object.  The other objects involved in the subscription lookup will be
+  discarded.
+
+  For instance, if an event is sent by code like this::
+
+     registry.notify(event, context)
+
+  In the past, in order to catch such an event, you were obligated to write and
+  register an event subscriber that mentioned both the event and the context in
+  its argument list::
+
+     @subscriber([SomeEvent, SomeContextType])
+     def subscriber(event, context):
+         pass
+
+  With the event-only feature you can now write an event subscriber that
+  accepts only ``event`` even if it subscribes to multiple interfaces::
+
+     @subscriber([SomeEvent, SomeContextType])
+     def subscriber(event):
+         # this will work!
+
+  Note, however, that if the event object is not the first object in the call
+  to ``notify``, you'll run into trouble.  For example, if notify is called
+  with the context argument first::
+
+     registry.notify(context, event)
+
+  You won't be able to take advantage of the feature.  It will "work", but the
+  object received by your event handler won't be the event object, it will be
+  the context object, which won't be very useful::
+
+     @subscriber([SomeContextType, SomeEvent])
+     def subscriber(event):
+         # bzzt! you'll be getting the context here as ``event``, and it'll 
+         # be useless
+
+  Existing multiple-argument subscribers continue to work without issue, so you
+  should continue use those if your system notifies using multiple interfaces
+  and the first interface is not the event interface.  For example::
+
+     @subscriber([SomeContextType, SomeEvent])
+     def subscriber(context, event):
+         # this will still work!
+
+  The event-only feature makes it possible to use a subscriber predicate that
+  accepts only a request argument within both multiple-interface subscriber
+  registrations and single-interface subscriber registrations.  In the past, if
+  you had a subscriber predicate like this::
+
+    class RequestPathStartsWith(object):
+        def __init__(self, val, config):
+            self.val = val
+
+        def text(self):
+            return 'path_startswith = %s' % (self.val,)
+
+        phash = text
+
+        def __call__(self, event):
+            return event.request.path.startswith(self.val)
+
+  If you attempted to use the above predicate to condition a subscription that
+  involved multiple interfaces, it would not work.  You had to change it to
+  accept the same arguments as the subscription itself.  For example, you might
+  have had to change its ``__call__`` method like so, adding a ``context``
+  argument::
+
+        def __call__(self, event, context):
+            return event.request.path.startswith(self.val)
+
+  With the event-only feature, you needn't make the change.  Instead, you can
+  write all predicates so they only accept ``event`` in their ``__call__`` and
+  they'll be useful across all registrations for subscriptions that use an
+  event as their first argument, even ones which accept more than just
+  ``event``.  However, the same caveat applies to predicates as to
+  subscriptions: if you're subscribing to a multi-interface event, and the
+  first interface is not the event interface, the predicate won't work
+  properly.  In such a case, you'll need to match the predicate ``__call__``
+  argument ordering and composition to the ordering of the interfaces.  For
+  example::
+
+        def __call__(self, context, event):
+            return event.request.path.startswith(self.val)
+
+  tl;dr: 1) Always use the event as the first argument to a multi-interface
+  subscription and 2) Use only ``event`` in your subscriber and subscriber
+  predicate parameter lists, no matter how many interfaces the subscriber is
+  notified with, as long as the event object is the first argument passed to
+  ``registry.notify``.  This will result in the maximum amount of reusability
+  of subscriber predicates.
+
 Bug Fixes
 ---------
 
diff --git a/pyramid/config/adapters.py b/pyramid/config/adapters.py
index 12c4de660..dad60660a 100644
--- a/pyramid/config/adapters.py
+++ b/pyramid/config/adapters.py
@@ -10,6 +10,7 @@ from pyramid.interfaces import (
 
 from pyramid.config.util import (
     action_method,
+    takes_one_arg,
     )
 
 
@@ -51,8 +52,22 @@ class AdaptersConfiguratorMixin(object):
         def register():
             predlist = self.get_predlist('subscriber')
             order, preds, phash = predlist.make(self, **predicates)
-            intr.update({'phash':phash, 'order':order, 'predicates':preds})
-            derived_subscriber = self._derive_subscriber(subscriber, preds)
+
+            derived_predicates = [ self._derive_predicate(p) for p in preds ]
+            derived_subscriber = self._derive_subscriber(
+                subscriber,
+                derived_predicates,
+                )
+
+            intr.update(
+                {'phash':phash,
+                 'order':order,
+                 'predicates':preds,
+                 'derived_predicates':derived_predicates,
+                 'derived_subscriber':derived_subscriber,
+                 }
+                )
+
             self.registry.registerHandler(derived_subscriber, iface)
             
         intr = self.introspectable(
@@ -68,25 +83,54 @@ class AdaptersConfiguratorMixin(object):
         self.action(None, register, introspectables=(intr,))
         return subscriber
 
+    def _derive_predicate(self, predicate):
+        derived_predicate = predicate
+
+        if eventonly(predicate):
+            def derived_predicate(*arg):
+                return predicate(arg[0])
+            # seems pointless to try to fix __doc__, __module__, etc as
+            # predicate will invariably be an instance
+
+        return derived_predicate
+
     def _derive_subscriber(self, subscriber, predicates):
+        derived_subscriber = subscriber
+
+        if eventonly(subscriber):
+            def derived_subscriber(*arg):
+                return subscriber(arg[0])
+            if hasattr(subscriber, '__name__'):
+                update_wrapper(derived_subscriber, subscriber)
+
         if not predicates:
-            return subscriber
+            return derived_subscriber
+
         def subscriber_wrapper(*arg):
-            # We need to accept *arg and pass it along because zope
-            # subscribers are designed poorly.  Notification will always call
-            # an associated subscriber with all of the objects involved in
-            # the subscription lookup, despite the fact that the event sender
-            # always has the option to attach those objects to the event
-            # object itself (and usually does). It would be much saner if the
-            # registry just used extra args passed to notify to do the lookup
-            # but only called event subscribers with the actual event object,
-            # or if we had been smart enough early on to always wrap
-            # subscribers in something that threw away the extra args, but
-            # c'est la vie.
+            # We need to accept *arg and pass it along because zope subscribers
+            # are designed awkwardly.  Notification via
+            # registry.adapter.subscribers will always call an associated
+            # subscriber with all of the objects involved in the subscription
+            # lookup, despite the fact that the event sender always has the
+            # option to attach those objects to the event object itself, and
+            # almost always does.
+            #
+            # The "eventonly" jazz sprinkled in this function and related
+            # functions allows users to define subscribers and predicates which
+            # accept only an event argument without needing to accept the rest
+            # of the adaptation arguments.  Had I been smart enough early on to
+            # use .subscriptions to find the subscriber functions in order to
+            # call them manually with a single "event" argument instead of
+            # relying on .subscribers to both find and call them implicitly
+            # with all args, the eventonly hack would not have been required.
+            # At this point, though, using .subscriptions and manual execution
+            # is not possible without badly breaking backwards compatibility.
             if all((predicate(*arg) for predicate in predicates)):
-                return subscriber(*arg)
+                return derived_subscriber(*arg)
+
         if hasattr(subscriber, '__name__'):
             update_wrapper(subscriber_wrapper, subscriber)
+
         return subscriber_wrapper
         
     @action_method
@@ -266,7 +310,7 @@ class AdaptersConfiguratorMixin(object):
             if resource_iface is None:
                 resource_iface = Interface
             self.registry.registerAdapter(
-                adapter, 
+                adapter,
                 (resource_iface, Interface),
                 IResourceURL,
                 )
@@ -281,3 +325,5 @@ class AdaptersConfiguratorMixin(object):
         intr['resource_iface'] = resource_iface
         self.action(discriminator, register, introspectables=(intr,))
 
+def eventonly(callee):
+    return takes_one_arg(callee, argname='event')
diff --git a/pyramid/config/util.py b/pyramid/config/util.py
index a83e23798..af0dd1641 100644
--- a/pyramid/config/util.py
+++ b/pyramid/config/util.py
@@ -1,10 +1,12 @@
 from hashlib import md5
+import inspect
 
 from pyramid.compat import (
     bytes_,
     is_nonstr_iter,
     )
 
+from pyramid.compat import im_func
 from pyramid.exceptions import ConfigurationError
 from pyramid.registry import predvalseq
 
@@ -110,3 +112,51 @@ class PredicateList(object):
         order = (MAX_ORDER - score) / (len(preds) + 1)
         return order, preds, phash.hexdigest()
 
+def takes_one_arg(callee, attr=None, argname=None):
+    ismethod = False
+    if attr is None:
+        attr = '__call__'
+    if inspect.isroutine(callee):
+        fn = callee
+    elif inspect.isclass(callee):
+        try:
+            fn = callee.__init__
+        except AttributeError:
+            return False
+        ismethod = hasattr(fn, '__call__')
+    else:
+        try:
+            fn = getattr(callee, attr)
+        except AttributeError:
+            return False
+
+    try:
+        argspec = inspect.getargspec(fn)
+    except TypeError:
+        return False
+
+    args = argspec[0]
+
+    if hasattr(fn, im_func) or ismethod:
+        # it's an instance method (or unbound method on py2)
+        if not args:
+            return False
+        args = args[1:]
+
+    if not args:
+        return False
+
+    if len(args) == 1:
+        return True
+
+    if argname:
+
+        defaults = argspec[3]
+        if defaults is None:
+            defaults = ()
+
+        if args[0] == argname:
+            if len(args) - len(defaults) == 1:
+                return True
+
+    return False
diff --git a/pyramid/config/views.py b/pyramid/config/views.py
index 4e5af480d..d1b69566b 100644
--- a/pyramid/config/views.py
+++ b/pyramid/config/views.py
@@ -81,6 +81,7 @@ import pyramid.config.predicates
 from pyramid.config.util import (
     DEFAULT_PHASH,
     MAX_ORDER,
+    takes_one_arg,
     )
 
 urljoin = urlparse.urljoin
@@ -503,50 +504,7 @@ class DefaultViewMapper(object):
         return _attr_view
 
 def requestonly(view, attr=None):
-    ismethod = False
-    if attr is None:
-        attr = '__call__'
-    if inspect.isroutine(view):
-        fn = view
-    elif inspect.isclass(view):
-        try:
-            fn = view.__init__
-        except AttributeError:
-            return False
-        ismethod = hasattr(fn, '__call__')
-    else:
-        try:
-            fn = getattr(view, attr)
-        except AttributeError:
-            return False
-
-    try:
-        argspec = inspect.getargspec(fn)
-    except TypeError:
-        return False
-
-    args = argspec[0]
-
-    if hasattr(fn, im_func) or ismethod:
-        # it's an instance method (or unbound method on py2)
-        if not args:
-            return False
-        args = args[1:]
-    if not args:
-        return False
-
-    if len(args) == 1:
-        return True
-
-    defaults = argspec[3]
-    if defaults is None:
-        defaults = ()
-
-    if args[0] == 'request':
-        if len(args) - len(defaults) == 1:
-            return True
-
-    return False
+    return takes_one_arg(view, attr=attr, argname='request')
 
 @implementer(IMultiView)
 class MultiView(object):
diff --git a/pyramid/tests/test_config/test_adapters.py b/pyramid/tests/test_config/test_adapters.py
index d47e012dc..4cbb1bf80 100644
--- a/pyramid/tests/test_config/test_adapters.py
+++ b/pyramid/tests/test_config/test_adapters.py
@@ -331,6 +331,15 @@ class AdaptersConfiguratorMixinTests(unittest.TestCase):
         self.assertEqual(intr['adapter'], DummyResourceURL)
         self.assertEqual(intr['resource_iface'], DummyIface)
 
+class Test_eventonly(unittest.TestCase):
+    def _callFUT(self, callee):
+        from pyramid.config.adapters import eventonly
+        return eventonly(callee)
+
+    def test_defaults(self):
+        def acallable(event, a=1, b=2): pass
+        self.assertTrue(self._callFUT(acallable))
+
 class DummyTraverser(object):
     def __init__(self, root):
         self.root = root
diff --git a/pyramid/tests/test_config/test_util.py b/pyramid/tests/test_config/test_util.py
index b32f9c6ef..a984acfd0 100644
--- a/pyramid/tests/test_config/test_util.py
+++ b/pyramid/tests/test_config/test_util.py
@@ -365,6 +365,192 @@ class TestPredicateList(unittest.TestCase):
         from pyramid.exceptions import ConfigurationError
         self.assertRaises(ConfigurationError, self._callFUT, unknown=1)
         
+class Test_takes_one_arg(unittest.TestCase):
+    def _callFUT(self, view, attr=None, argname=None):
+        from pyramid.config.util import takes_one_arg
+        return takes_one_arg(view, attr=attr, argname=argname)
+
+    def test_requestonly_newstyle_class_no_init(self):
+        class foo(object):
+            """ """
+        self.assertFalse(self._callFUT(foo))
+
+    def test_requestonly_newstyle_class_init_toomanyargs(self):
+        class foo(object):
+            def __init__(self, context, request):
+                """ """
+        self.assertFalse(self._callFUT(foo))
+
+    def test_requestonly_newstyle_class_init_onearg_named_request(self):
+        class foo(object):
+            def __init__(self, request):
+                """ """
+        self.assertTrue(self._callFUT(foo))
+
+    def test_newstyle_class_init_onearg_named_somethingelse(self):
+        class foo(object):
+            def __init__(self, req):
+                """ """
+        self.assertTrue(self._callFUT(foo))
+
+    def test_newstyle_class_init_defaultargs_firstname_not_request(self):
+        class foo(object):
+            def __init__(self, context, request=None):
+                """ """
+        self.assertFalse(self._callFUT(foo))
+
+    def test_newstyle_class_init_defaultargs_firstname_request(self):
+        class foo(object):
+            def __init__(self, request, foo=1, bar=2):
+                """ """
+        self.assertTrue(self._callFUT(foo, argname='request'))
+
+    def test_newstyle_class_init_firstname_request_with_secondname(self):
+        class foo(object):
+            def __init__(self, request, two):
+                """ """
+        self.assertFalse(self._callFUT(foo))
+
+    def test_newstyle_class_init_noargs(self):
+        class foo(object):
+            def __init__():
+                """ """
+        self.assertFalse(self._callFUT(foo))
+
+    def test_oldstyle_class_no_init(self):
+        class foo:
+            """ """
+        self.assertFalse(self._callFUT(foo))
+
+    def test_oldstyle_class_init_toomanyargs(self):
+        class foo:
+            def __init__(self, context, request):
+                """ """
+        self.assertFalse(self._callFUT(foo))
+
+    def test_oldstyle_class_init_onearg_named_request(self):
+        class foo:
+            def __init__(self, request):
+                """ """
+        self.assertTrue(self._callFUT(foo))
+
+    def test_oldstyle_class_init_onearg_named_somethingelse(self):
+        class foo:
+            def __init__(self, req):
+                """ """
+        self.assertTrue(self._callFUT(foo))
+
+    def test_oldstyle_class_init_defaultargs_firstname_not_request(self):
+        class foo:
+            def __init__(self, context, request=None):
+                """ """
+        self.assertFalse(self._callFUT(foo))
+
+    def test_oldstyle_class_init_defaultargs_firstname_request(self):
+        class foo:
+            def __init__(self, request, foo=1, bar=2):
+                """ """
+        self.assertTrue(self._callFUT(foo, argname='request'), True)
+
+    def test_oldstyle_class_init_noargs(self):
+        class foo:
+            def __init__():
+                """ """
+        self.assertFalse(self._callFUT(foo))
+
+    def test_function_toomanyargs(self):
+        def foo(context, request):
+            """ """
+        self.assertFalse(self._callFUT(foo))
+
+    def test_function_with_attr_false(self):
+        def bar(context, request):
+            """ """
+        def foo(context, request):
+            """ """
+        foo.bar = bar
+        self.assertFalse(self._callFUT(foo, 'bar'))
+
+    def test_function_with_attr_true(self):
+        def bar(context, request):
+            """ """
+        def foo(request):
+            """ """
+        foo.bar = bar
+        self.assertTrue(self._callFUT(foo, 'bar'))
+
+    def test_function_onearg_named_request(self):
+        def foo(request):
+            """ """
+        self.assertTrue(self._callFUT(foo))
+
+    def test_function_onearg_named_somethingelse(self):
+        def foo(req):
+            """ """
+        self.assertTrue(self._callFUT(foo))
+
+    def test_function_defaultargs_firstname_not_request(self):
+        def foo(context, request=None):
+            """ """
+        self.assertFalse(self._callFUT(foo))
+
+    def test_function_defaultargs_firstname_request(self):
+        def foo(request, foo=1, bar=2):
+            """ """
+        self.assertTrue(self._callFUT(foo, argname='request'))
+
+    def test_function_noargs(self):
+        def foo():
+            """ """
+        self.assertFalse(self._callFUT(foo))
+
+    def test_instance_toomanyargs(self):
+        class Foo:
+            def __call__(self, context, request):
+                """ """
+        foo = Foo()
+        self.assertFalse(self._callFUT(foo))
+
+    def test_instance_defaultargs_onearg_named_request(self):
+        class Foo:
+            def __call__(self, request):
+                """ """
+        foo = Foo()
+        self.assertTrue(self._callFUT(foo))
+
+    def test_instance_defaultargs_onearg_named_somethingelse(self):
+        class Foo:
+            def __call__(self, req):
+                """ """
+        foo = Foo()
+        self.assertTrue(self._callFUT(foo))
+
+    def test_instance_defaultargs_firstname_not_request(self):
+        class Foo:
+            def __call__(self, context, request=None):
+                """ """
+        foo = Foo()
+        self.assertFalse(self._callFUT(foo))
+
+    def test_instance_defaultargs_firstname_request(self):
+        class Foo:
+            def __call__(self, request, foo=1, bar=2):
+                """ """
+        foo = Foo()
+        self.assertTrue(self._callFUT(foo, argname='request'), True)
+
+    def test_instance_nocall(self):
+        class Foo: pass
+        foo = Foo()
+        self.assertFalse(self._callFUT(foo))
+    
+    def test_method_onearg_named_request(self):
+        class Foo:
+            def method(self, request):
+                """ """
+        foo = Foo()
+        self.assertTrue(self._callFUT(foo.method))
+
 
 class DummyCustomPredicate(object):
     def __init__(self):
diff --git a/pyramid/tests/test_config/test_views.py b/pyramid/tests/test_config/test_views.py
index bb4c5d519..4cebdce8a 100644
--- a/pyramid/tests/test_config/test_views.py
+++ b/pyramid/tests/test_config/test_views.py
@@ -1896,192 +1896,20 @@ class TestViewsConfigurationMixin(unittest.TestCase):
         from pyramid.tests import test_config
         self.assertEqual(result, test_config)
 
-
 class Test_requestonly(unittest.TestCase):
     def _callFUT(self, view, attr=None):
         from pyramid.config.views import requestonly
-        return requestonly(view, attr)
-
-    def test_requestonly_newstyle_class_no_init(self):
-        class foo(object):
-            """ """
-        self.assertFalse(self._callFUT(foo))
-
-    def test_requestonly_newstyle_class_init_toomanyargs(self):
-        class foo(object):
-            def __init__(self, context, request):
-                """ """
-        self.assertFalse(self._callFUT(foo))
-
-    def test_requestonly_newstyle_class_init_onearg_named_request(self):
-        class foo(object):
-            def __init__(self, request):
-                """ """
-        self.assertTrue(self._callFUT(foo))
-
-    def test_newstyle_class_init_onearg_named_somethingelse(self):
-        class foo(object):
-            def __init__(self, req):
-                """ """
-        self.assertTrue(self._callFUT(foo))
-
-    def test_newstyle_class_init_defaultargs_firstname_not_request(self):
-        class foo(object):
-            def __init__(self, context, request=None):
-                """ """
-        self.assertFalse(self._callFUT(foo))
-
-    def test_newstyle_class_init_defaultargs_firstname_request(self):
-        class foo(object):
-            def __init__(self, request, foo=1, bar=2):
-                """ """
-        self.assertTrue(self._callFUT(foo))
-
-    def test_newstyle_class_init_firstname_request_with_secondname(self):
-        class foo(object):
-            def __init__(self, request, two):
-                """ """
-        self.assertFalse(self._callFUT(foo))
-
-    def test_newstyle_class_init_noargs(self):
-        class foo(object):
-            def __init__():
-                """ """
-        self.assertFalse(self._callFUT(foo))
-
-    def test_oldstyle_class_no_init(self):
-        class foo:
-            """ """
-        self.assertFalse(self._callFUT(foo))
-
-    def test_oldstyle_class_init_toomanyargs(self):
-        class foo:
-            def __init__(self, context, request):
-                """ """
-        self.assertFalse(self._callFUT(foo))
-
-    def test_oldstyle_class_init_onearg_named_request(self):
-        class foo:
-            def __init__(self, request):
-                """ """
-        self.assertTrue(self._callFUT(foo))
-
-    def test_oldstyle_class_init_onearg_named_somethingelse(self):
-        class foo:
-            def __init__(self, req):
-                """ """
-        self.assertTrue(self._callFUT(foo))
-
-    def test_oldstyle_class_init_defaultargs_firstname_not_request(self):
-        class foo:
-            def __init__(self, context, request=None):
-                """ """
-        self.assertFalse(self._callFUT(foo))
-
-    def test_oldstyle_class_init_defaultargs_firstname_request(self):
-        class foo:
-            def __init__(self, request, foo=1, bar=2):
-                """ """
-        self.assertTrue(self._callFUT(foo), True)
-
-    def test_oldstyle_class_init_noargs(self):
-        class foo:
-            def __init__():
-                """ """
-        self.assertFalse(self._callFUT(foo))
-
-    def test_function_toomanyargs(self):
-        def foo(context, request):
-            """ """
-        self.assertFalse(self._callFUT(foo))
-
-    def test_function_with_attr_false(self):
-        def bar(context, request):
-            """ """
-        def foo(context, request):
-            """ """
-        foo.bar = bar
-        self.assertFalse(self._callFUT(foo, 'bar'))
-
-    def test_function_with_attr_true(self):
-        def bar(context, request):
-            """ """
-        def foo(request):
-            """ """
-        foo.bar = bar
-        self.assertTrue(self._callFUT(foo, 'bar'))
-
-    def test_function_onearg_named_request(self):
-        def foo(request):
-            """ """
-        self.assertTrue(self._callFUT(foo))
-
-    def test_function_onearg_named_somethingelse(self):
-        def foo(req):
-            """ """
-        self.assertTrue(self._callFUT(foo))
-
-    def test_function_defaultargs_firstname_not_request(self):
-        def foo(context, request=None):
-            """ """
-        self.assertFalse(self._callFUT(foo))
-
-    def test_function_defaultargs_firstname_request(self):
-        def foo(request, foo=1, bar=2):
-            """ """
-        self.assertTrue(self._callFUT(foo))
-
-    def test_function_noargs(self):
-        def foo():
-            """ """
-        self.assertFalse(self._callFUT(foo))
-
-    def test_instance_toomanyargs(self):
-        class Foo:
-            def __call__(self, context, request):
-                """ """
-        foo = Foo()
-        self.assertFalse(self._callFUT(foo))
+        return requestonly(view, attr=attr)
 
-    def test_instance_defaultargs_onearg_named_request(self):
-        class Foo:
-            def __call__(self, request):
-                """ """
-        foo = Foo()
-        self.assertTrue(self._callFUT(foo))
-
-    def test_instance_defaultargs_onearg_named_somethingelse(self):
-        class Foo:
-            def __call__(self, req):
-                """ """
-        foo = Foo()
-        self.assertTrue(self._callFUT(foo))
-
-    def test_instance_defaultargs_firstname_not_request(self):
-        class Foo:
-            def __call__(self, context, request=None):
-                """ """
-        foo = Foo()
-        self.assertFalse(self._callFUT(foo))
-
-    def test_instance_defaultargs_firstname_request(self):
-        class Foo:
-            def __call__(self, request, foo=1, bar=2):
-                """ """
-        foo = Foo()
-        self.assertTrue(self._callFUT(foo), True)
+    def test_defaults(self):
+        def aview(request, a=1, b=2): pass
+        self.assertTrue(self._callFUT(aview))
 
-    def test_instance_nocall(self):
-        class Foo: pass
-        foo = Foo()
-        self.assertFalse(self._callFUT(foo))
-    
-    def test_method_onearg_named_request(self):
-        class Foo:
-            def method(self, request):
-                """ """
-        foo = Foo()
-        self.assertTrue(self._callFUT(foo.method))
+    def test_otherattr(self):
+        class AView(object):
+            def __init__(self, request, a=1, b=2): pass
+            def bleh(self): pass
+        self.assertTrue(self._callFUT(AView, 'bleh'))
 
 class Test_isexception(unittest.TestCase):
     def _callFUT(self, ob):
-- 
cgit v1.2.3


From f700d374e903a501bc32a4b10774e87c74edc4d8 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 21 Nov 2012 07:01:00 -0500
Subject: garden

---
 CHANGES.txt | 172 ++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 110 insertions(+), 62 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a625af3f9..4e3e45a79 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,16 +15,10 @@ Features
   values in parameterized ``.ini`` file, e.g. ``pshell etc/development.ini
   http_port=8080``.  See https://github.com/Pylons/pyramid/pull/714
 
-- In order to normalize the relationship between event subscribers and
-  subscriber predicates, we now allow both subscribers and subscriber
-  predicates to accept only a single ``event`` argument even if they've been
-  subscribed for notifications that involve multiple interfaces.  Subscribers
-  and subscriber predicates that accept only one argument will receive the
-  first object passed to ``notify``; this is typically (but not always) the
-  event object.  The other objects involved in the subscription lookup will be
-  discarded.
-
-  For instance, if an event is sent by code like this::
+- A somewhat advanced and obscure feature of Pyramid event handlers is their
+  ability to handle "multi-interface" notifications.  These notifications have
+  traditionally presented multiple objects to the subscriber callable.  For
+  instance, if an event was sent by code like this::
 
      registry.notify(event, context)
 
@@ -33,28 +27,101 @@ Features
   its argument list::
 
      @subscriber([SomeEvent, SomeContextType])
-     def subscriber(event, context):
+     def asubscriber(event, context):
+         pass
+
+  In many subscriber callables registered this way, it was common for the logic
+  in the subscriber callable to completely ignore the second and following
+  arguments (e.g. ``context`` in the above example might be ignored), because
+  they usually existed as attributes of the event anyway.  You could usually
+  get the same value by doing ``event.context`` or similar in most cases.
+
+  The fact that you needed to put an extra argument which you usually ignored
+  in the subscriber callable body was only a minor annoyance until we added
+  "subscriber predicates" in a prior 1.4 alpha release.  Subscriber predicates
+  are used to narrow the set of circumstances under which a subscriber will be
+  executed.  Once those were added, the annoyance was escalated, because
+  subscriber predicates needed to accept the same argument list and arity as
+  the subscriber callables that they were configured against.  So, for example,
+  if you had these two subscriber registrations in your code::
+
+     @subscriber([SomeEvent, SomeContextType])
+     def asubscriber(event, context):
+         pass
+
+     @subscriber(SomeOtherEvent)
+     def asubscriber(event):
+         pass
+ 
+  And you wanted to use a subscriber predicate::
+
+     @subscriber([SomeEvent, SomeContextType], mypredicate=True)
+     def asubscriber(event, context):
          pass
 
-  With the event-only feature you can now write an event subscriber that
-  accepts only ``event`` even if it subscribes to multiple interfaces::
+     @subscriber(SomeOtherEvent, mypredicate=True)
+     def asubscriber(event):
+         pass
+
+  If you had previously written your ``mypredicate`` subscriber predicate that
+  accepted in such a way that it accepted only one argument in its
+  ``__call__``, you could not use it against a subscription which named more
+  than one interface in its subscriber interface list.  Similarly, if you had
+  written a subscriber predicate that accepted two arguments, you couldn't use
+  it against a registration that named only a single interface type.  For
+  example, if you created this predicate::
+
+    class MyPredicate(object):
+        # portions elided...
+        def __call__(self, event):
+            return self.val == event.context.foo
+
+  It would not work against a multi-interface-registered subscription.
+
+  To hack around this limitation, you needed to design a ``mypredicate``
+  predicate to expect to receive in its ``__call__`` either a single ``event``
+  argument (a SomeOtherEvent object) *or* a pair of arguments (a SomeEvent
+  object and a SomeContextType object), presumably by doing something like
+  this::
+
+    class MyPredicate(object):
+        # portions elided...
+        def __call__(self, event, context=None):
+            return self.val == event.context.foo
+
+  This was confusing and bad.
+
+  In order to allow people to ignore unused arguments to subscriber callables
+  and to normalize the relationship between event subscribers and subscriber
+  predicates, we now allow both subscribers and subscriber predicates to accept
+  only a single ``event`` argument even if they've been subscribed for
+  notifications that involve multiple interfaces.  Subscribers and subscriber
+  predicates that accept only one argument will receive the first object passed
+  to ``notify``; this is typically (but not always) the event object.  The
+  other objects involved in the subscription lookup will be discarded.  You can
+  now write an event subscriber that accepts only ``event`` even if it
+  subscribes to multiple interfaces::
 
      @subscriber([SomeEvent, SomeContextType])
-     def subscriber(event):
+     def asubscriber(event):
          # this will work!
 
-  Note, however, that if the event object is not the first object in the call
-  to ``notify``, you'll run into trouble.  For example, if notify is called
-  with the context argument first::
+  This prevents you from needing to match the subscriber callable parameters to
+  the subscription type unnecessarily, especially when you don't make use of
+  any argument in your subscribers except for the event object itself.
+
+  Note, however, that if the event object is not the first
+  object in the call to ``notify``, you'll run into trouble.  For example, if
+  notify is called with the context argument first::
 
      registry.notify(context, event)
 
-  You won't be able to take advantage of the feature.  It will "work", but the
-  object received by your event handler won't be the event object, it will be
-  the context object, which won't be very useful::
+  You won't be able to take advantage of the event-only feature.  It will
+  "work", but the object received by your event handler won't be the event
+  object, it will be the context object, which won't be very useful::
 
      @subscriber([SomeContextType, SomeEvent])
-     def subscriber(event):
+     def asubscriber(event):
          # bzzt! you'll be getting the context here as ``event``, and it'll 
          # be useless
 
@@ -63,55 +130,36 @@ Features
   and the first interface is not the event interface.  For example::
 
      @subscriber([SomeContextType, SomeEvent])
-     def subscriber(context, event):
+     def asubscriber(context, event):
          # this will still work!
 
   The event-only feature makes it possible to use a subscriber predicate that
   accepts only a request argument within both multiple-interface subscriber
-  registrations and single-interface subscriber registrations.  In the past, if
-  you had a subscriber predicate like this::
-
-    class RequestPathStartsWith(object):
-        def __init__(self, val, config):
-            self.val = val
-
-        def text(self):
-            return 'path_startswith = %s' % (self.val,)
-
-        phash = text
-
-        def __call__(self, event):
-            return event.request.path.startswith(self.val)
-
-  If you attempted to use the above predicate to condition a subscription that
-  involved multiple interfaces, it would not work.  You had to change it to
-  accept the same arguments as the subscription itself.  For example, you might
-  have had to change its ``__call__`` method like so, adding a ``context``
-  argument::
-
-        def __call__(self, event, context):
-            return event.request.path.startswith(self.val)
-
-  With the event-only feature, you needn't make the change.  Instead, you can
-  write all predicates so they only accept ``event`` in their ``__call__`` and
-  they'll be useful across all registrations for subscriptions that use an
-  event as their first argument, even ones which accept more than just
-  ``event``.  However, the same caveat applies to predicates as to
-  subscriptions: if you're subscribing to a multi-interface event, and the
-  first interface is not the event interface, the predicate won't work
-  properly.  In such a case, you'll need to match the predicate ``__call__``
-  argument ordering and composition to the ordering of the interfaces.  For
-  example::
+  registrations and single-interface subscriber registrations.  You needn't
+  make slightly different variations of predicates depending on the
+  subscription type arguments.  Instead, just write all your subscriber
+  predicates so they only accept ``event`` in their ``__call__`` and they'll be
+  useful across all registrations for subscriptions that use an event as their
+  first argument, even ones which accept more than just ``event``.
+
+  However, the same caveat applies to predicates as to subscriber callables: if
+  you're subscribing to a multi-interface event, and the first interface is not
+  the event interface, the predicate won't work properly.  In such a case,
+  you'll need to match the predicate ``__call__`` argument ordering and
+  composition to the ordering of the interfaces.  For example, if the
+  registration for the subscription uses ``[SomeContext, SomeEvent]``, you'll
+  need to reflect that in the ordering of the parameters of the predicate's
+  ``__call__`` method::
 
         def __call__(self, context, event):
             return event.request.path.startswith(self.val)
 
-  tl;dr: 1) Always use the event as the first argument to a multi-interface
-  subscription and 2) Use only ``event`` in your subscriber and subscriber
-  predicate parameter lists, no matter how many interfaces the subscriber is
-  notified with, as long as the event object is the first argument passed to
-  ``registry.notify``.  This will result in the maximum amount of reusability
-  of subscriber predicates.
+  tl;dr: 1) When using multi-interface subscriptions, always use the event type
+  as the first subscription registration argument and 2) When 1 is true, use
+  only ``event`` in your subscriber and subscriber predicate parameter lists,
+  no matter how many interfaces the subscriber is notified with.  This
+  combination will result in the maximum amount of reusability of subscriber
+  predicates and the least amount of thought on your part.  Drink responsibly.
 
 Bug Fixes
 ---------
-- 
cgit v1.2.3


From a3810e706bce12c0195737c2713362795613e2ae Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 21 Nov 2012 07:05:04 -0500
Subject: garden

---
 CHANGES.txt | 48 ++++++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4e3e45a79..01fd60161 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -34,16 +34,16 @@ Features
   in the subscriber callable to completely ignore the second and following
   arguments (e.g. ``context`` in the above example might be ignored), because
   they usually existed as attributes of the event anyway.  You could usually
-  get the same value by doing ``event.context`` or similar in most cases.
+  get the same value by doing ``event.context`` or similar.
 
   The fact that you needed to put an extra argument which you usually ignored
   in the subscriber callable body was only a minor annoyance until we added
-  "subscriber predicates" in a prior 1.4 alpha release.  Subscriber predicates
-  are used to narrow the set of circumstances under which a subscriber will be
-  executed.  Once those were added, the annoyance was escalated, because
-  subscriber predicates needed to accept the same argument list and arity as
-  the subscriber callables that they were configured against.  So, for example,
-  if you had these two subscriber registrations in your code::
+  "subscriber predicates", used to narrow the set of circumstances under which
+  a subscriber will be executed, in a prior 1.4 alpha release.  Once those were
+  added, the annoyance was escalated, because subscriber predicates needed to
+  accept the same argument list and arity as the subscriber callables that they
+  were configured against.  So, for example, if you had these two subscriber
+  registrations in your code::
 
      @subscriber([SomeEvent, SomeContextType])
      def asubscriber(event, context):
@@ -56,33 +56,37 @@ Features
   And you wanted to use a subscriber predicate::
 
      @subscriber([SomeEvent, SomeContextType], mypredicate=True)
-     def asubscriber(event, context):
+     def asubscriber1(event, context):
          pass
 
      @subscriber(SomeOtherEvent, mypredicate=True)
-     def asubscriber(event):
+     def asubscriber2(event):
          pass
 
-  If you had previously written your ``mypredicate`` subscriber predicate that
-  accepted in such a way that it accepted only one argument in its
-  ``__call__``, you could not use it against a subscription which named more
-  than one interface in its subscriber interface list.  Similarly, if you had
-  written a subscriber predicate that accepted two arguments, you couldn't use
-  it against a registration that named only a single interface type.  For
-  example, if you created this predicate::
+  If an existing ``mypredicate`` subscriber predicate had been written in such
+  a way that it accepted only one argument in its ``__call__``, you could not
+  use it against a subscription which named more than one interface in its
+  subscriber interface list.  Similarly, if you had written a subscriber
+  predicate that accepted two arguments, you couldn't use it against a
+  registration that named only a single interface type.
+
+  For example, if you created this predicate::
 
     class MyPredicate(object):
         # portions elided...
         def __call__(self, event):
             return self.val == event.context.foo
 
-  It would not work against a multi-interface-registered subscription.
+  It would not work against a multi-interface-registered subscription, so in
+  the above example, when you attempted to use it against ``asubscriber1``, it
+  would fail at runtime with a TypeError, claiming something was attempting to
+  call it with too many arguments.
 
-  To hack around this limitation, you needed to design a ``mypredicate``
-  predicate to expect to receive in its ``__call__`` either a single ``event``
-  argument (a SomeOtherEvent object) *or* a pair of arguments (a SomeEvent
-  object and a SomeContextType object), presumably by doing something like
-  this::
+  To hack around this limitation, you were obligated to design the
+  ``mypredicate`` predicate to expect to receive in its ``__call__`` either a
+  single ``event`` argument (a SomeOtherEvent object) *or* a pair of arguments
+  (a SomeEvent object and a SomeContextType object), presumably by doing
+  something like this::
 
     class MyPredicate(object):
         # portions elided...
-- 
cgit v1.2.3


From d91dc7bd96bdc8638c52e4b0685612237cf13578 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 21 Nov 2012 07:27:40 -0500
Subject: add an integration test for the eventonly behavior

---
 pyramid/tests/test_integration.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pyramid/tests/test_integration.py b/pyramid/tests/test_integration.py
index 9a8f842aa..bb33c5c27 100644
--- a/pyramid/tests/test_integration.py
+++ b/pyramid/tests/test_integration.py
@@ -174,6 +174,18 @@ class TestStaticAppBase(IntegrationBase):
     def test_oob_slash(self):
         self.testapp.get('/%2F/test_integration.py', status=404)
 
+class TestEventOnlySubscribers(IntegrationBase, unittest.TestCase):
+    package = 'pyramid.tests.pkgs.eventonly'
+
+    def test_sendfoo(self):
+        res = self.testapp.get('/sendfoo', status=200)
+        self.assertEqual(sorted(res.body.split()), ['foo', 'fooyup'])
+
+    def test_sendfoobar(self):
+        res = self.testapp.get('/sendfoobar', status=200)
+        self.assertEqual(sorted(res.body.split()),
+                         ['foobar', 'foobar2', 'foobaryup', 'foobaryup2'])
+
 class TestStaticAppUsingAbsPath(TestStaticAppBase, unittest.TestCase):
     package = 'pyramid.tests.pkgs.static_abspath'
 
-- 
cgit v1.2.3


From f55f9b704fb493327151e8641ae3cd5377eed0c6 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 21 Nov 2012 07:35:03 -0500
Subject: fix for py3

---
 pyramid/tests/test_integration.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyramid/tests/test_integration.py b/pyramid/tests/test_integration.py
index bb33c5c27..bf3960b2d 100644
--- a/pyramid/tests/test_integration.py
+++ b/pyramid/tests/test_integration.py
@@ -179,12 +179,12 @@ class TestEventOnlySubscribers(IntegrationBase, unittest.TestCase):
 
     def test_sendfoo(self):
         res = self.testapp.get('/sendfoo', status=200)
-        self.assertEqual(sorted(res.body.split()), ['foo', 'fooyup'])
+        self.assertEqual(sorted(res.body.split()), [b'foo', b'fooyup'])
 
     def test_sendfoobar(self):
         res = self.testapp.get('/sendfoobar', status=200)
         self.assertEqual(sorted(res.body.split()),
-                         ['foobar', 'foobar2', 'foobaryup', 'foobaryup2'])
+                         [b'foobar', b'foobar2', b'foobaryup', b'foobaryup2'])
 
 class TestStaticAppUsingAbsPath(TestStaticAppBase, unittest.TestCase):
     package = 'pyramid.tests.pkgs.static_abspath'
-- 
cgit v1.2.3


From 9e5c8aab88c426d8e3e9b611690234edd5861021 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 21 Nov 2012 07:48:22 -0500
Subject: missed adding this file

---
 pyramid/tests/pkgs/eventonly/__init__.py | 64 ++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 pyramid/tests/pkgs/eventonly/__init__.py

diff --git a/pyramid/tests/pkgs/eventonly/__init__.py b/pyramid/tests/pkgs/eventonly/__init__.py
new file mode 100644
index 000000000..7ae93ada6
--- /dev/null
+++ b/pyramid/tests/pkgs/eventonly/__init__.py
@@ -0,0 +1,64 @@
+from pyramid.view import view_config
+from pyramid.events import subscriber
+
+class Yup(object):
+    def __init__(self, val, config):
+        self.val = val
+
+    def text(self):
+        return 'path_startswith = %s' % (self.val,)
+
+    phash = text
+
+    def __call__(self, event):
+        return getattr(event.response, 'yup', False)
+
+class Foo(object):
+    def __init__(self, response):
+        self.response = response
+
+class Bar(object):
+    pass
+
+@subscriber(Foo)
+def foo(event):
+    event.response.text += 'foo '
+
+@subscriber(Foo, yup=True)
+def fooyup(event):
+    event.response.text += 'fooyup '
+    
+@subscriber([Foo, Bar])
+def foobar(event):
+    event.response.text += 'foobar '
+
+@subscriber([Foo, Bar])
+def foobar2(event, context):
+    event.response.text += 'foobar2 '
+
+@subscriber([Foo, Bar], yup=True)
+def foobaryup(event):
+    event.response.text += 'foobaryup '
+
+@subscriber([Foo, Bar], yup=True)
+def foobaryup2(event, context):
+    event.response.text += 'foobaryup2 '
+
+@view_config(name='sendfoo')
+def sendfoo(request):
+    response = request.response
+    response.yup = True
+    request.registry.notify(Foo(response))
+    return response
+
+@view_config(name='sendfoobar')
+def sendfoobar(request):
+    response = request.response
+    response.yup = True
+    request.registry.notify(Foo(response), Bar())
+    return response
+
+def includeme(config):
+    config.add_subscriber_predicate('yup', Yup)
+    config.scan('pyramid.tests.pkgs.eventonly')
+    
-- 
cgit v1.2.3


From 4df5975a690d1f0921efb84f48f544211b4f869d Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 21 Nov 2012 22:56:25 -0500
Subject: document new introspectable attrs

---
 docs/narr/introspector.rst | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/narr/introspector.rst b/docs/narr/introspector.rst
index b88f3f0c8..bd81fb56a 100644
--- a/docs/narr/introspector.rst
+++ b/docs/narr/introspector.rst
@@ -130,6 +130,23 @@ introspectables in categories not described here.
     A sequence of interfaces (or classes) that are subscribed to (the
     resolution of the ``ifaces`` argument passed to ``add_subscriber``).
 
+  ``derived_subscriber``
+
+    A wrapper around the subscriber used internally by the system so it can
+    call it with more than one argument if your original subscriber accepts
+    only one.
+
+  ``predicates``
+
+    The predicate objects created as the result of passing predicate arguments
+    to ``add_susbcriber``
+
+  ``derived_predicates``
+
+    Wrappers around the predicate objects created as the result of passing
+    predicate arguments to ``add_susbcriber`` (to be used when predicates take
+    only one value but must be passed more than one).
+
 ``response adapters``
 
   Each introspectable in the ``response adapters`` category represents a call
-- 
cgit v1.2.3


From 50fdf828b212b03dbf048543007ea20108eb3a8a Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 21 Nov 2012 23:13:43 -0500
Subject: prep for release

---
 docs/whatsnew-1.4.rst | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/whatsnew-1.4.rst b/docs/whatsnew-1.4.rst
index 5da28bb03..34fda5f37 100644
--- a/docs/whatsnew-1.4.rst
+++ b/docs/whatsnew-1.4.rst
@@ -225,6 +225,23 @@ Minor Feature Additions
   as it doesn't make sense to assert that a nonexistent view is
   execution-permitted. See https://github.com/Pylons/pyramid/issues/299.
 
+- Small microspeed enhancement which anticipates that a
+  :class:`pyramid.response.Response` object is likely to be returned from a 
+  view.  Some code is shortcut if the class of the object returned by a view is 
+  this class.  A similar microoptimization was done to
+  :func:`pyramid.request.Request.is_response`.
+
+- Make it possible to use variable arguments on all ``p*`` commands
+  (``pserve``, ``pshell``, ``pviews``, etc) in the form ``a=1 b=2`` so you can
+  fill in values in parameterized ``.ini`` file, e.g. ``pshell
+  etc/development.ini http_port=8080``.
+
+- In order to allow people to ignore unused arguments to subscriber callables
+  and to normalize the relationship between event subscribers and subscriber
+  predicates, we now allow both subscribers and subscriber predicates to accept
+  only a single ``event`` argument even if they've been subscribed for
+  notifications that involve multiple interfaces.
+
 Backwards Incompatibilities
 ---------------------------
 
-- 
cgit v1.2.3


From 1608b26c9d3967d258613f038ff8b5f258a4a698 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 21 Nov 2012 23:19:43 -0500
Subject: prep for 1.4b1

---
 CHANGES.txt  | 4 ++--
 docs/conf.py | 2 +-
 setup.py     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 01fd60161..841d2ebec 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.4b1 (2012-11-21)
+==================
 
 Features
 --------
diff --git a/docs/conf.py b/docs/conf.py
index 5e17de18a..3dc09d95d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -81,7 +81,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.4a4'
+version = '1.4b1'
 
 # The full version, including alpha/beta/rc tags.
 release = version
diff --git a/setup.py b/setup.py
index 2356e76ac..55da3378d 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ testing_extras = tests_require + [
     ]
 
 setup(name='pyramid',
-      version='1.4a4',
+      version='1.4b1',
       description=('The Pyramid web application development framework, a '
                    'Pylons project'),
       long_description=README + '\n\n' +  CHANGES,
-- 
cgit v1.2.3


From 5acf4b4809e88dfeb3882f5033622a9517763d02 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Thu, 22 Nov 2012 00:39:19 -0500
Subject: appeasement

---
 docs/narr/install.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index e8482a289..32f331550 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -243,6 +243,17 @@ Once you've got setuptools or distribute installed, you should install the
 :term:`virtualenv` package.  To install the :term:`virtualenv` package into
 your setuptools-enabled Python interpreter, use the ``easy_install`` command.
 
+.. warning::
+
+   Even though Python 3.3 and better comes with ``pyvenv`` out of the box,
+   which is similar to ``virtualenv``, we suggest using ``virtualenv`` instead.
+   ``virtualenv`` works on well Python 3.3.  This isn't a recommendation made
+   for technical reasons, it's one made because it's not possible for the
+   authors of this guide to explain setup using multiple virtual environment
+   systems.  ``pyenv`` will work fine.  However, if you use ``pyvenv`` instead,
+   you'll need to understand how to install software such as ``distribute``
+   into the virtual environment manually, which this guide does not cover.
+
 .. code-block:: text
 
    $ easy_install virtualenv
-- 
cgit v1.2.3


From 5d9c28f4e7f1fd3eba75e5bb51aebcbb56440df8 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Thu, 22 Nov 2012 00:40:47 -0500
Subject: more appeasement

---
 docs/narr/install.rst | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index 32f331550..663f0df6c 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -248,11 +248,14 @@ your setuptools-enabled Python interpreter, use the ``easy_install`` command.
    Even though Python 3.3 and better comes with ``pyvenv`` out of the box,
    which is similar to ``virtualenv``, we suggest using ``virtualenv`` instead.
    ``virtualenv`` works on well Python 3.3.  This isn't a recommendation made
-   for technical reasons, it's one made because it's not possible for the
+   for technical reasons, it's one made because it's not feasible for the
    authors of this guide to explain setup using multiple virtual environment
-   systems.  ``pyenv`` will work fine.  However, if you use ``pyvenv`` instead,
-   you'll need to understand how to install software such as ``distribute``
-   into the virtual environment manually, which this guide does not cover.
+   systems.  We are aiming to not need to make the installation documentation
+   Turing-complete.
+
+   ``pyenv`` will work fine.  However, if you use ``pyvenv`` instead, you'll
+   need to understand how to install software such as ``distribute`` into the
+   virtual environment manually, which this guide does not cover.
 
 .. code-block:: text
 
-- 
cgit v1.2.3


From 02d18abdc79a727b1e148dc8718a9c15fe613be0 Mon Sep 17 00:00:00 2001
From: Patricio Paez <pp@pp.com.mx>
Date: Thu, 22 Nov 2012 06:51:25 -0600
Subject: Sync the tutorial docs for the transaction dependency

---
 docs/tutorials/wiki/tests.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorials/wiki/tests.rst b/docs/tutorials/wiki/tests.rst
index ebb4d93dc..46d009d0f 100644
--- a/docs/tutorials/wiki/tests.rst
+++ b/docs/tutorials/wiki/tests.rst
@@ -62,7 +62,7 @@ Change the ``requires`` list in ``setup.py`` to include ``WebTest``.
 .. literalinclude:: src/tests/setup.py
    :linenos:
    :language: python
-   :lines: 9-18
+   :lines: 9-19
 
 After we've added a dependency on WebTest in ``setup.py``, we need to rerun
 ``setup.py develop`` to get WebTest installed into our virtualenv.  Assuming
-- 
cgit v1.2.3


From fb30e2cb79490f9dcafaea3d5ce2c0af140eae71 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Thu, 22 Nov 2012 13:28:41 -0500
Subject: typos

---
 docs/narr/install.rst | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index 663f0df6c..882e76f11 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -253,9 +253,10 @@ your setuptools-enabled Python interpreter, use the ``easy_install`` command.
    systems.  We are aiming to not need to make the installation documentation
    Turing-complete.
 
-   ``pyenv`` will work fine.  However, if you use ``pyvenv`` instead, you'll
-   need to understand how to install software such as ``distribute`` into the
-   virtual environment manually, which this guide does not cover.
+   ``pyvenv`` will work fine.  However, if you use ``pyvenv`` instead of
+   ``virtualenv``, you'll need to understand how to install software such as
+   ``distribute`` into the virtual environment manually, which this guide does
+   not cover.
 
 .. code-block:: text
 
-- 
cgit v1.2.3


From 0f2bbe521970aac9bf41f5ab9069256dac9f9cc5 Mon Sep 17 00:00:00 2001
From: Paul Winkler <paul@bitly.com>
Date: Thu, 29 Nov 2012 13:15:26 -0500
Subject: Fix broken link to contributor docs

---
 docs/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.rst b/docs/index.rst
index faf8258c1..406cc9b03 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -200,7 +200,7 @@ To check out the trunk via ``git``, use this command:
 
 To find out how to become a contributor to :app:`Pyramid`, please see the
 `contributor's section of the documentation
-<http://docs.pylonsproject.org/index.html#contributing>`_.
+<http://docs.pylonsproject.org/en/latest/#contributing>`_.
 
 Index and Glossary
 ==================
-- 
cgit v1.2.3


From 877eebdbd3ca4f9c7ab1b30bf16b76be64ed5dbc Mon Sep 17 00:00:00 2001
From: Gael Pasgrimaud <gael@gawel.org>
Date: Mon, 26 Dec 2011 21:33:52 +0100
Subject: make scaffolds pep8 compliant

Conflicts:
	pyramid/scaffolds/alchemy/+package+/views.py_tmpl
	pyramid/scaffolds/alchemy/setup.py_tmpl

Solved the two conflicts
---
 pyramid/scaffolds/alchemy/+package+/__init__.py             | 2 +-
 pyramid/scaffolds/alchemy/+package+/models.py               | 2 +-
 pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py | 4 +++-
 pyramid/scaffolds/alchemy/+package+/tests.py_tmpl           | 1 +
 pyramid/scaffolds/alchemy/+package+/views.py_tmpl           | 5 +++--
 pyramid/scaffolds/alchemy/setup.py_tmpl                     | 3 +--
 pyramid/scaffolds/starter/+package+/__init__.py             | 1 +
 pyramid/scaffolds/starter/+package+/tests.py_tmpl           | 1 +
 pyramid/scaffolds/starter/+package+/views.py_tmpl           | 3 ++-
 pyramid/scaffolds/starter/setup.py_tmpl                     | 5 ++---
 pyramid/scaffolds/zodb/+package+/__init__.py                | 2 ++
 pyramid/scaffolds/zodb/+package+/models.py                  | 2 ++
 pyramid/scaffolds/zodb/+package+/tests.py_tmpl              | 1 +
 pyramid/scaffolds/zodb/+package+/views.py_tmpl              | 3 ++-
 pyramid/scaffolds/zodb/setup.py_tmpl                        | 9 ++++-----
 15 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/pyramid/scaffolds/alchemy/+package+/__init__.py b/pyramid/scaffolds/alchemy/+package+/__init__.py
index e39f619ed..aac7c5e69 100644
--- a/pyramid/scaffolds/alchemy/+package+/__init__.py
+++ b/pyramid/scaffolds/alchemy/+package+/__init__.py
@@ -6,6 +6,7 @@ from .models import (
     Base,
     )
 
+
 def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
     """
@@ -17,4 +18,3 @@ def main(global_config, **settings):
     config.add_route('home', '/')
     config.scan()
     return config.make_wsgi_app()
-
diff --git a/pyramid/scaffolds/alchemy/+package+/models.py b/pyramid/scaffolds/alchemy/+package+/models.py
index b6ac15429..aeeb9df64 100644
--- a/pyramid/scaffolds/alchemy/+package+/models.py
+++ b/pyramid/scaffolds/alchemy/+package+/models.py
@@ -16,6 +16,7 @@ from zope.sqlalchemy import ZopeTransactionExtension
 DBSession = scoped_session(sessionmaker(extension=ZopeTransactionExtension()))
 Base = declarative_base()
 
+
 class MyModel(Base):
     __tablename__ = 'models'
     id = Column(Integer, primary_key=True)
@@ -25,4 +26,3 @@ class MyModel(Base):
     def __init__(self, name, value):
         self.name = name
         self.value = value
-
diff --git a/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py b/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py
index 0e828465f..66feb3008 100644
--- a/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py
+++ b/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py
@@ -15,12 +15,14 @@ from ..models import (
     Base,
     )
 
+
 def usage(argv):
     cmd = os.path.basename(argv[0])
     print('usage: %s <config_uri>\n'
-          '(example: "%s development.ini")' % (cmd, cmd)) 
+          '(example: "%s development.ini")' % (cmd, cmd))
     sys.exit(1)
 
+
 def main(argv=sys.argv):
     if len(argv) != 2:
         usage(argv)
diff --git a/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl b/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
index 729b337cb..a26cd9eeb 100644
--- a/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
@@ -5,6 +5,7 @@ from pyramid import testing
 
 from .models import DBSession
 
+
 class TestMyView(unittest.TestCase):
     def setUp(self):
         self.config = testing.setUp()
diff --git a/pyramid/scaffolds/alchemy/+package+/views.py_tmpl b/pyramid/scaffolds/alchemy/+package+/views.py_tmpl
index 9ecda9110..be0b45b0d 100644
--- a/pyramid/scaffolds/alchemy/+package+/views.py_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/views.py_tmpl
@@ -8,13 +8,14 @@ from .models import (
     MyModel,
     )
 
+
 @view_config(route_name='home', renderer='templates/mytemplate.pt')
 def my_view(request):
     try:
-        one = DBSession.query(MyModel).filter(MyModel.name=='one').first()
+        one = DBSession.query(MyModel).filter(MyModel.name == 'one').first()
     except DBAPIError:
         return Response(conn_err_msg, content_type='text/plain', status_int=500)
-    return {'one':one, 'project':'{{project}}'}
+    return {'one': one, 'project': '{{project}}'}
 
 conn_err_msg = """\
 Pyramid is having a problem using your SQL database.  The problem
diff --git a/pyramid/scaffolds/alchemy/setup.py_tmpl b/pyramid/scaffolds/alchemy/setup.py_tmpl
index 2d8ed028f..b8c4c6ef1 100644
--- a/pyramid/scaffolds/alchemy/setup.py_tmpl
+++ b/pyramid/scaffolds/alchemy/setup.py_tmpl
@@ -19,7 +19,7 @@ requires = [
 setup(name='{{project}}',
       version='0.0',
       description='{{project}}',
-      long_description=README + '\n\n' +  CHANGES,
+      long_description=README + '\n\n' + CHANGES,
       classifiers=[
         "Programming Language :: Python",
         "Framework :: Pyramid",
@@ -42,4 +42,3 @@ setup(name='{{project}}',
       initialize_{{project}}_db = {{package}}.scripts.initializedb:main
       """,
       )
-
diff --git a/pyramid/scaffolds/starter/+package+/__init__.py b/pyramid/scaffolds/starter/+package+/__init__.py
index 31b02cf02..6c512f52f 100644
--- a/pyramid/scaffolds/starter/+package+/__init__.py
+++ b/pyramid/scaffolds/starter/+package+/__init__.py
@@ -1,5 +1,6 @@
 from pyramid.config import Configurator
 
+
 def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
     """
diff --git a/pyramid/scaffolds/starter/+package+/tests.py_tmpl b/pyramid/scaffolds/starter/+package+/tests.py_tmpl
index 401260efb..94912a850 100644
--- a/pyramid/scaffolds/starter/+package+/tests.py_tmpl
+++ b/pyramid/scaffolds/starter/+package+/tests.py_tmpl
@@ -2,6 +2,7 @@ import unittest
 
 from pyramid import testing
 
+
 class ViewTests(unittest.TestCase):
     def setUp(self):
         self.config = testing.setUp()
diff --git a/pyramid/scaffolds/starter/+package+/views.py_tmpl b/pyramid/scaffolds/starter/+package+/views.py_tmpl
index 7a0d2f386..ad9af7292 100644
--- a/pyramid/scaffolds/starter/+package+/views.py_tmpl
+++ b/pyramid/scaffolds/starter/+package+/views.py_tmpl
@@ -1,5 +1,6 @@
 from pyramid.view import view_config
 
+
 @view_config(route_name='home', renderer='templates/mytemplate.pt')
 def my_view(request):
-    return {'project':'{{project}}'}
+    return {'project': '{{project}}'}
diff --git a/pyramid/scaffolds/starter/setup.py_tmpl b/pyramid/scaffolds/starter/setup.py_tmpl
index 58c0a79fc..db00ed2e6 100644
--- a/pyramid/scaffolds/starter/setup.py_tmpl
+++ b/pyramid/scaffolds/starter/setup.py_tmpl
@@ -15,7 +15,7 @@ requires = [
 setup(name='{{project}}',
       version='0.0',
       description='{{project}}',
-      long_description=README + '\n\n' +  CHANGES,
+      long_description=README + '\n\n' + CHANGES,
       classifiers=[
         "Programming Language :: Python",
         "Framework :: Pyramid",
@@ -32,9 +32,8 @@ setup(name='{{project}}',
       install_requires=requires,
       tests_require=requires,
       test_suite="{{package}}",
-      entry_points = """\
+      entry_points="""\
       [paste.app_factory]
       main = {{package}}:main
       """,
       )
-
diff --git a/pyramid/scaffolds/zodb/+package+/__init__.py b/pyramid/scaffolds/zodb/+package+/__init__.py
index b63933fc5..c3bb87a62 100644
--- a/pyramid/scaffolds/zodb/+package+/__init__.py
+++ b/pyramid/scaffolds/zodb/+package+/__init__.py
@@ -2,10 +2,12 @@ from pyramid.config import Configurator
 from pyramid_zodbconn import get_connection
 from .models import appmaker
 
+
 def root_factory(request):
     conn = get_connection(request)
     return appmaker(conn.root())
 
+
 def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
     """
diff --git a/pyramid/scaffolds/zodb/+package+/models.py b/pyramid/scaffolds/zodb/+package+/models.py
index 8dd0f5a49..a94b36ef4 100644
--- a/pyramid/scaffolds/zodb/+package+/models.py
+++ b/pyramid/scaffolds/zodb/+package+/models.py
@@ -1,8 +1,10 @@
 from persistent.mapping import PersistentMapping
 
+
 class MyModel(PersistentMapping):
     __parent__ = __name__ = None
 
+
 def appmaker(zodb_root):
     if not 'app_root' in zodb_root:
         app_root = MyModel()
diff --git a/pyramid/scaffolds/zodb/+package+/tests.py_tmpl b/pyramid/scaffolds/zodb/+package+/tests.py_tmpl
index 401260efb..94912a850 100644
--- a/pyramid/scaffolds/zodb/+package+/tests.py_tmpl
+++ b/pyramid/scaffolds/zodb/+package+/tests.py_tmpl
@@ -2,6 +2,7 @@ import unittest
 
 from pyramid import testing
 
+
 class ViewTests(unittest.TestCase):
     def setUp(self):
         self.config = testing.setUp()
diff --git a/pyramid/scaffolds/zodb/+package+/views.py_tmpl b/pyramid/scaffolds/zodb/+package+/views.py_tmpl
index 083798095..1e8a9b65a 100644
--- a/pyramid/scaffolds/zodb/+package+/views.py_tmpl
+++ b/pyramid/scaffolds/zodb/+package+/views.py_tmpl
@@ -1,6 +1,7 @@
 from pyramid.view import view_config
 from .models import MyModel
 
+
 @view_config(context=MyModel, renderer='templates/mytemplate.pt')
 def my_view(request):
-    return {'project':'{{project}}'}
+    return {'project': '{{project}}'}
diff --git a/pyramid/scaffolds/zodb/setup.py_tmpl b/pyramid/scaffolds/zodb/setup.py_tmpl
index df239f5a7..b8610d004 100644
--- a/pyramid/scaffolds/zodb/setup.py_tmpl
+++ b/pyramid/scaffolds/zodb/setup.py_tmpl
@@ -19,7 +19,7 @@ requires = [
 setup(name='{{project}}',
       version='0.0',
       description='{{project}}',
-      long_description=README + '\n\n' +  CHANGES,
+      long_description=README + '\n\n' + CHANGES,
       classifiers=[
         "Programming Language :: Python",
         "Framework :: Pyramid",
@@ -33,12 +33,11 @@ setup(name='{{project}}',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
-      install_requires = requires,
-      tests_require= requires,
+      install_requires=requires,
+      tests_require=requires,
       test_suite="{{package}}",
-      entry_points = """\
+      entry_points="""\
       [paste.app_factory]
       main = {{package}}:main
       """,
       )
-
-- 
cgit v1.2.3


From d85569e38ba88029864b7908dbee3f948b103712 Mon Sep 17 00:00:00 2001
From: Patricio Paez <pp@pp.com.mx>
Date: Thu, 29 Nov 2012 22:10:38 -0600
Subject: Sync MyProject files with the starter scaffold

- Line numbers are mentioned only in the
  Creating a Pyramid Project chapter; those
  that are affected were updated.
---
 docs/narr/MyProject/myproject/__init__.py |  1 +
 docs/narr/MyProject/myproject/tests.py    |  1 +
 docs/narr/MyProject/myproject/views.py    |  3 ++-
 docs/narr/MyProject/setup.py              |  6 +++---
 docs/narr/project.rst                     | 14 +++++++-------
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/docs/narr/MyProject/myproject/__init__.py b/docs/narr/MyProject/myproject/__init__.py
index 31b02cf02..6c512f52f 100644
--- a/docs/narr/MyProject/myproject/__init__.py
+++ b/docs/narr/MyProject/myproject/__init__.py
@@ -1,5 +1,6 @@
 from pyramid.config import Configurator
 
+
 def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
     """
diff --git a/docs/narr/MyProject/myproject/tests.py b/docs/narr/MyProject/myproject/tests.py
index d8b764041..64dcab1d5 100644
--- a/docs/narr/MyProject/myproject/tests.py
+++ b/docs/narr/MyProject/myproject/tests.py
@@ -2,6 +2,7 @@ import unittest
 
 from pyramid import testing
 
+
 class ViewTests(unittest.TestCase):
     def setUp(self):
         self.config = testing.setUp()
diff --git a/docs/narr/MyProject/myproject/views.py b/docs/narr/MyProject/myproject/views.py
index f571a5976..c383c5716 100644
--- a/docs/narr/MyProject/myproject/views.py
+++ b/docs/narr/MyProject/myproject/views.py
@@ -1,5 +1,6 @@
 from pyramid.view import view_config
 
+
 @view_config(route_name='home', renderer='templates/mytemplate.pt')
 def my_view(request):
-    return {'project':'MyProject'}
+    return {'project': 'MyProject'}
diff --git a/docs/narr/MyProject/setup.py b/docs/narr/MyProject/setup.py
index b119a954b..f24b6984e 100644
--- a/docs/narr/MyProject/setup.py
+++ b/docs/narr/MyProject/setup.py
@@ -15,10 +15,10 @@ requires = [
 setup(name='MyProject',
       version='0.0',
       description='MyProject',
-      long_description=README + '\n\n' +  CHANGES,
+      long_description=README + '\n\n' + CHANGES,
       classifiers=[
         "Programming Language :: Python",
-        "Framework :: Pylons",
+        "Framework :: Pyramid",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
         ],
@@ -32,7 +32,7 @@ setup(name='MyProject',
       install_requires=requires,
       tests_require=requires,
       test_suite="myproject",
-      entry_points = """\
+      entry_points="""\
       [paste.app_factory]
       main = myproject:main
       """,
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index b08948e43..fb62f4bd2 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -829,25 +829,25 @@ also informs Python that the directory which contains it is a *package*.
 #. Line 1 imports the :term:`Configurator` class from :mod:`pyramid.config`
    that we use later.
 
-#. Lines 3-10 define a function named ``main`` that returns a :app:`Pyramid`
+#. Lines 4-11 define a function named ``main`` that returns a :app:`Pyramid`
    WSGI application.  This function is meant to be called by the
    :term:`PasteDeploy` framework as a result of running ``pserve``.
 
    Within this function, application configuration is performed.
 
-   Line 6 creates an instance of a :term:`Configurator`.
+   Line 7 creates an instance of a :term:`Configurator`.
 
-   Line 7 registers a static view, which will serve up the files from the
+   Line 8 registers a static view, which will serve up the files from the
    ``myproject:static`` :term:`asset specification` (the ``static``
    directory of the ``myproject`` package).
 
-   Line 8 adds a :term:`route` to the configuration.  This route is later
+   Line 9 adds a :term:`route` to the configuration.  This route is later
    used by a view in the ``views`` module.
 
-   Line 9 calls ``config.scan()``, which picks up view registrations declared
+   Line 10 calls ``config.scan()``, which picks up view registrations declared
    elsewhere in the package (in this case, in the ``views.py`` module).
 
-   Line 10 returns a :term:`WSGI` application to the caller of the function
+   Line 11 returns a :term:`WSGI` application to the caller of the function
    (Pyramid's pserve).
 
 .. index::
@@ -865,7 +865,7 @@ and which returns a :term:`response`.
    :language: python
    :linenos:
 
-Lines 3-5 define and register a :term:`view callable` named ``my_view``.  The
+Lines 4-6 define and register a :term:`view callable` named ``my_view``.  The
 function named ``my_view`` is decorated with a ``view_config`` decorator
 (which is processed by the ``config.scan()`` line in our ``__init__.py``).
 The view_config decorator asserts that this view be found when a
-- 
cgit v1.2.3


From b9b2ee39c251dd68a12e717e1f6d9d02a29efe9a Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marca@surveymonkey.com>
Date: Fri, 30 Nov 2012 09:27:09 -0800
Subject: A bunch of minor tweaks to the wiki2 tutorial in docs/tutorials/wiki2

---
 docs/tutorials/wiki2/basiclayout.rst    | 22 ++++++++++++----------
 docs/tutorials/wiki2/definingmodels.rst |  8 ++++----
 docs/tutorials/wiki2/definingviews.rst  | 32 ++++++++++++++++----------------
 docs/tutorials/wiki2/design.rst         |  2 +-
 docs/tutorials/wiki2/installation.rst   | 10 +++++-----
 5 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index 4f73dc914..ed98da183 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -45,7 +45,7 @@ When you invoke the ``pserve development.ini`` command, the ``main`` function
 above is executed.  It accepts some settings and returns a :term:`WSGI`
 application.  (See :ref:`startup_chapter` for more about ``pserve``.)
 
-The main function first creates a SQLAlchemy database engine using
+The main function first creates a :term:`SQLAlchemy` database engine using
 ``engine_from_config`` from the ``sqlalchemy.`` prefixed settings in the
 ``development.ini`` file's ``[app:main]`` section.  This will be a URI
 (something like ``sqlite://``):
@@ -62,7 +62,7 @@ engine:
       :lines: 13
       :language: py
 
-``main`` subsequently initializes our SQLAlchemy declarative Base object,
+``main`` subsequently initializes our SQLAlchemy declarative ``Base`` object,
 assigning the engine we created to the ``bind`` attribute of it's
 ``metadata`` object.  This allows table definitions done imperatively
 (instead of declaratively, via a class statement) to work.  We won't use any
@@ -94,9 +94,9 @@ two arguments: ``static`` (the name), and ``static`` (the path):
       :language: py
 
 This registers a static resource view which will match any URL that starts
-with the prefix ``/static`` (by virtue of the first argument to add_static
-view).  This will serve up static resources for us from within the ``static``
-directory of our ``tutorial`` package, in this case, via
+with the prefix ``/static`` (by virtue of the first argument to
+``add_static_view``).  This will serve up static resources for us from within
+the ``static`` directory of our ``tutorial`` package, in this case, via
 ``http://localhost:6543/static/`` and below (by virtue of the second argument
 to add_static_view).  With this declaration, we're saying that any URL that
 starts with ``/static`` should go to the static view; any remainder of its
@@ -114,8 +114,9 @@ used when the URL is ``/``:
 Since this route has a ``pattern`` equalling ``/`` it is the route that will
 be matched when the URL ``/`` is visited, e.g. ``http://localhost:6543/``.
 
-``main`` next calls the ``scan`` method of the configurator, which will
-recursively scan our ``tutorial`` package, looking for ``@view_config`` (and
+``main`` next calls the ``scan`` method of the configurator
+(:meth:`pyramid.config.Configurator.scan`), which will recursively scan our
+``tutorial`` package, looking for ``@view_config`` (and
 other special) decorators.  When it finds a ``@view_config`` decorator, a
 view configuration will be registered, which will allow one of our
 application URLs to be mapped to some code.
@@ -197,7 +198,7 @@ Let's examine this in detail. First, we need some imports to support later code:
       :linenos:
       :language: py
 
-Next we set up a SQLAlchemy "DBSession" object:
+Next we set up a SQLAlchemy ``DBSession`` object:
 
    .. literalinclude:: src/basiclayout/tutorial/models.py
       :lines: 16
@@ -230,8 +231,9 @@ To give a simple example of a  model class, we define one named ``MyModel``:
       :linenos:
       :language: py
 
-Our example model has an ``__init__`` that takes a two arguments (``name``,
-and ``value``).  It stores these values as ``self.name`` and ``self.value``
+Our example model has an ``__init__`` method that takes a two arguments
+(``name``, and ``value``).  It stores these values as ``self.name`` and
+``self.value``
 within the ``__init__`` function itself.  The ``MyModel`` class also has a
 ``__tablename__`` attribute.  This informs SQLAlchemy which table to use to
 store the data representing instances of this class.
diff --git a/docs/tutorials/wiki2/definingmodels.rst b/docs/tutorials/wiki2/definingmodels.rst
index 1653faf4a..2e6c74c99 100644
--- a/docs/tutorials/wiki2/definingmodels.rst
+++ b/docs/tutorials/wiki2/definingmodels.rst
@@ -2,7 +2,7 @@
 Defining the Domain Model
 =========================
 
-The first change we'll make to our stock pcreate-generated application will
+The first change we'll make to our stock ``pcreate``-generated application will
 be to define a :term:`domain model` constructor representing a wiki page.
 We'll do this inside our ``models.py`` file.
 
@@ -15,7 +15,7 @@ Making Edits to ``models.py``
 
 .. note::
 
-  There is nothing automagically special about the filename ``models.py``.  A
+  There is nothing special about the filename ``models.py``.  A
   project may have many models throughout its codebase in arbitrarily-named
   files.  Files implementing models often have ``model`` in their filenames
   (or they may live in a Python subpackage of your application package named
@@ -46,8 +46,8 @@ this class inherits from an instance of
 
 As you can see, our ``Page`` class has a class level attribute
 ``__tablename__`` which equals the string ``'pages'``.  This means that
-SQLAlchemy will store our wiki data in a SQL table named ``pages``.  Our Page
-class will also have class-level attributes named ``id``, ``name`` and
+SQLAlchemy will store our wiki data in a SQL table named ``pages``.  Our
+``Page`` class will also have class-level attributes named ``id``, ``name`` and
 ``data`` (all instances of :class:`sqlalchemy.Column`).  These will map to
 columns in the ``pages`` table.  The ``id`` attribute will be the primary key
 in the table.  The ``name`` attribute will be a text attribute, each value of
diff --git a/docs/tutorials/wiki2/definingviews.rst b/docs/tutorials/wiki2/definingviews.rst
index a54996e3c..c23ca947d 100644
--- a/docs/tutorials/wiki2/definingviews.rst
+++ b/docs/tutorials/wiki2/definingviews.rst
@@ -26,7 +26,7 @@ Declaring Dependencies in Our ``setup.py`` File
 The view code in our application will depend on a package which is not a
 dependency of the original "tutorial" application.  The original "tutorial"
 application was generated by the ``pcreate`` command; it doesn't know
-about our custom application requirements.  
+about our custom application requirements.
 
 We need to add a dependency on the ``docutils`` package to our ``tutorial``
 package's ``setup.py`` file by assigning this dependency to the ``requires`` parameter in ``setup()``.
@@ -123,14 +123,14 @@ the :class:`pyramid.interfaces.IResponse` interface like
 
 It uses the :meth:`pyramid.request.Request.route_url` API to construct a 
 URL to the ``FrontPage`` page (e.g. ``http://localhost:6543/FrontPage``), which 
-is used as the "location" of the HTTPFound response, forming an HTTP redirect.
+is used as the "location" of the ``HTTPFound`` response, forming an HTTP redirect.
 
 The ``view_page`` view function
 -------------------------------
 
 ``view_page()`` is used to display a single page of our
 wiki.  It renders the :term:`ReStructuredText` body of a page (stored as
-the ``data`` attribute of a Page object) as HTML.  Then it substitutes an
+the ``data`` attribute of a ``Page`` model object) as HTML.  Then it substitutes an
 HTML anchor for each *WikiWord* reference in the rendered HTML using a
 compiled regular expression.
 
@@ -139,7 +139,7 @@ compiled regular expression.
    :linenos:
    :language: python
 
-The curried ``check()`` function is used as the first argument to
+The ``check()`` function is used as the first argument to
 ``wikiwords.sub``, indicating that it should be called to provide a value for
 each WikiWord match found in the content.  If the wiki already contains a
 page with the matched WikiWord name, ``check()`` generates a view
@@ -181,6 +181,13 @@ the page we'd like to add.  If our add view is invoked via,
 e.g. ``http://localhost:6543/add_page/SomeName``, the value for
 ``'pagename'`` in the ``matchdict`` will be ``'SomeName'``.
 
+If the view execution *is* a result of a form submission (i.e. the expression
+``'form.submitted' in request.params`` is ``True``), we scrape the page body
+from the form data, create a Page object with this page body and the name
+taken from ``matchdict['pagename']``, and save it into the database using
+``DBSession.add``.  We then redirect back to the ``view_page`` view for the
+newly created page.
+
 If the view execution is *not* a result of a form submission (i.e. the
 expression ``'form.submitted' in request.params`` is ``False``), the view
 callable renders a template.  To do so, it generates a "save url" which the
@@ -191,13 +198,6 @@ in order to satisfy the edit form's desire to have *some* page object
 exposed as ``page``. :app:`Pyramid` will render the template associated
 with this view to a response.
 
-If the view execution *is* a result of a form submission (i.e. the expression
-``'form.submitted' in request.params`` is ``True``), we scrape the page body
-from the form data, create a Page object with this page body and the name
-taken from ``matchdict['pagename']``, and save it into the database using
-``DBSession.add``.  We then redirect back to the ``view_page`` view for the
-newly created page.
-
 The ``edit_page`` view function
 -------------------------------
 
@@ -212,17 +212,17 @@ matching the name of the page the user wants to edit.
    :linenos:
    :language: python
 
-If the view execution is *not* a result of a form submission (i.e. the
-expression ``'form.submitted' in request.params`` is ``False``), the view
-simply renders the edit form, passing the page object and a ``save_url``
-which will be used as the action of the generated form.
-
 If the view execution *is* a result of a form submission (i.e. the expression
 ``'form.submitted' in request.params`` is ``True``), the view grabs the
 ``body`` element of the request parameters and sets it as the ``data``
 attribute of the page object.  It then redirects to the ``view_page`` view
 of the wiki page.
 
+If the view execution is *not* a result of a form submission (i.e. the
+expression ``'form.submitted' in request.params`` is ``False``), the view
+simply renders the edit form, passing the page object and a ``save_url``
+which will be used as the action of the generated form.
+
 Adding Templates
 ================
 
diff --git a/docs/tutorials/wiki2/design.rst b/docs/tutorials/wiki2/design.rst
index 6e41e00aa..c56d7fecf 100644
--- a/docs/tutorials/wiki2/design.rst
+++ b/docs/tutorials/wiki2/design.rst
@@ -9,7 +9,7 @@ tutorial.
 Overall
 -------
 
-We choose to use ``reStructuredText`` markup in the wiki text.  Translation
+We choose to use :term:`reStructuredText` markup in the wiki text.  Translation
 from reStructuredText to HTML is provided by the widely used ``docutils``
 Python module.  We will add this module in the dependency list on the project
 ``setup.py`` file.
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index 6589a1557..4ab02a13a 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -2,7 +2,7 @@
 Installation
 ============
 
-This tutorial assumes that Python and virtualenv are already installed
+This tutorial assumes that Python and :term:`virtualenv` are already installed
 and working in your system. If you need help setting this up, you should
 refer to the chapters on :ref:`installing_chapter`.
 
@@ -98,9 +98,9 @@ Installing the Project in "Development Mode"
 
 In order to do development on the project easily, you must "register"
 the project as a development egg in your workspace using the
-``setup.py develop`` command.  In order to do so, cd to the "tutorial"
+``setup.py develop`` command.  In order to do so, cd to the `tutorial`
 directory you created in :ref:`sql_making_a_project`, and run the
-"setup.py develop" command using virtualenv Python interpreter.
+``setup.py develop`` command using the virtualenv Python interpreter.
 
 On UNIX:
 
@@ -158,8 +158,8 @@ test`` does but provides additional "coverage" information, exposing
 which lines of your project are "covered" (or not covered) by the
 tests.
 
-To get this functionality working, we'll need to install a couple of
-other packages into our ``virtualenv``: ``nose`` and ``coverage``:
+To get this functionality working, we'll need to install the ``nose`` and
+``coverage`` packages into our ``virtualenv``:
 
 On UNIX:
 
-- 
cgit v1.2.3


From 9223b3cbff80328431e3711eba2a317bb206286e Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marca@surveymonkey.com>
Date: Fri, 30 Nov 2012 09:44:25 -0800
Subject: tutorials/wiki2/definingviews.rst: Change example error page from
 http://localhost:6543/add_page to http://localhost:6543/foobar/edit_page

For me, the former generates "404 Not Found" (probably because it
doesn't match a route) while the latter gives
"sqlalchemy.orm.exc.NoResultFound" and the nice traceback from Werkzeug.
---
 docs/tutorials/wiki2/definingviews.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorials/wiki2/definingviews.rst b/docs/tutorials/wiki2/definingviews.rst
index c23ca947d..538b94216 100644
--- a/docs/tutorials/wiki2/definingviews.rst
+++ b/docs/tutorials/wiki2/definingviews.rst
@@ -366,7 +366,7 @@ each of the following URLs, check that the result is as expected:
 - ``http://localhost:6543/add_page/SomePageName`` in a
   browser invokes the add view for a page.
 
-- To generate an error, visit ``http://localhost:6543/add_page`` which
+- To generate an error, visit ``http://localhost:6543/foobars/edit_page`` which
   will generate a ``NoResultFound: No row was found for one()`` error.
   You'll see an interactive traceback facility provided 
   by :term:`pyramid_debugtoolbar`.
-- 
cgit v1.2.3


From 6d1eeedcd341a0468a2567f3034dde4d6dbcc6bd Mon Sep 17 00:00:00 2001
From: Patricio Paez <pp@pp.com.mx>
Date: Sat, 1 Dec 2012 17:04:33 -0600
Subject: Sync ZODB tutorial source files with the scaffold

---
 docs/tutorials/wiki/src/authorization/setup.py     |  9 ++++----
 .../wiki/src/authorization/tutorial/__init__.py    |  3 ++-
 .../wiki/src/authorization/tutorial/tests.py       |  9 ++++----
 .../wiki/src/authorization/tutorial/views.py       | 10 ++++----
 docs/tutorials/wiki/src/basiclayout/setup.py       |  9 ++++----
 .../wiki/src/basiclayout/tutorial/__init__.py      |  2 ++
 .../wiki/src/basiclayout/tutorial/models.py        |  2 ++
 .../wiki/src/basiclayout/tutorial/tests.py         |  1 -
 .../wiki/src/basiclayout/tutorial/views.py         |  3 ++-
 docs/tutorials/wiki/src/models/setup.py            |  9 ++++----
 .../tutorials/wiki/src/models/tutorial/__init__.py |  5 ++--
 docs/tutorials/wiki/src/models/tutorial/views.py   |  6 +++--
 docs/tutorials/wiki/src/tests/setup.py             |  9 ++++----
 docs/tutorials/wiki/src/tests/tutorial/__init__.py |  3 ++-
 docs/tutorials/wiki/src/tests/tutorial/tests.py    |  1 +
 docs/tutorials/wiki/src/tests/tutorial/views.py    | 10 ++++----
 docs/tutorials/wiki/src/views/setup.py             |  9 ++++----
 docs/tutorials/wiki/src/views/tutorial/__init__.py |  8 ++++---
 docs/tutorials/wiki/src/views/tutorial/tests.py    | 27 +++++++++++-----------
 docs/tutorials/wiki/src/views/tutorial/views.py    |  4 ++--
 20 files changed, 74 insertions(+), 65 deletions(-)

diff --git a/docs/tutorials/wiki/src/authorization/setup.py b/docs/tutorials/wiki/src/authorization/setup.py
index 1d2d690fc..3164fd724 100644
--- a/docs/tutorials/wiki/src/authorization/setup.py
+++ b/docs/tutorials/wiki/src/authorization/setup.py
@@ -20,7 +20,7 @@ requires = [
 setup(name='tutorial',
       version='0.0',
       description='tutorial',
-      long_description=README + '\n\n' +  CHANGES,
+      long_description=README + '\n\n' + CHANGES,
       classifiers=[
         "Programming Language :: Python",
         "Framework :: Pyramid",
@@ -34,12 +34,11 @@ setup(name='tutorial',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
-      install_requires = requires,
-      tests_require= requires,
+      install_requires=requires,
+      tests_require=requires,
       test_suite="tutorial",
-      entry_points = """\
+      entry_points="""\
       [paste.app_factory]
       main = tutorial:main
       """,
       )
-
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/__init__.py b/docs/tutorials/wiki/src/authorization/tutorial/__init__.py
index b42e01d03..8ea8f8fa3 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/__init__.py
@@ -11,8 +11,9 @@ def root_factory(request):
     conn = get_connection(request)
     return appmaker(conn.root())
 
+
 def main(global_config, **settings):
-    """ This function returns a WSGI application.
+    """ This function returns a Pyramid WSGI application.
     """
     authn_policy = AuthTktAuthenticationPolicy(
         'sosecret', callback=groupfinder, hashalg='sha512')
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/tests.py b/docs/tutorials/wiki/src/authorization/tutorial/tests.py
index 77e7cce29..0b9046d47 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/tests.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/tests.py
@@ -30,6 +30,7 @@ class WikiModelTests(unittest.TestCase):
         self.assertEqual(wiki.__name__, None)
 
 class AppmakerTests(unittest.TestCase):
+
     def _callFUT(self, zodb_root):
         from .models import appmaker
         return appmaker(zodb_root)
@@ -63,7 +64,7 @@ class ViewPageTests(unittest.TestCase):
         info = self._callFUT(context, request)
         self.assertEqual(info['page'], context)
         self.assertEqual(
-            info['content'], 
+            info['content'],
             '<div class="document">\n'
             '<p>Hello <a href="http://example.com/add_page/CruelWorld">'
             'CruelWorld</a> '
@@ -85,9 +86,9 @@ class AddPageTests(unittest.TestCase):
         request.subpath = ['AnotherPage']
         info = self._callFUT(context, request)
         self.assertEqual(info['page'].data,'')
-        self.assertEqual(info['save_url'],
-                         request.resource_url(
-                             context, 'add_page', 'AnotherPage'))
+        self.assertEqual(
+            info['save_url'],
+            request.resource_url(context, 'add_page', 'AnotherPage'))
 
     def test_it_submitted(self):
         context = testing.DummyResource()
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/views.py b/docs/tutorials/wiki/src/authorization/tutorial/views.py
index 50485d279..77956b1e3 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/views.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/views.py
@@ -64,8 +64,8 @@ def add_page(context, request):
     page.__name__ = pagename
     page.__parent__ = context
 
-    return dict(page = page, save_url = save_url,
-                logged_in = authenticated_userid(request))
+    return dict(page=page, save_url=save_url,
+                logged_in=authenticated_userid(request))
 
 @view_config(name='edit_page', context='.models.Page',
              renderer='templates/edit.pt',
@@ -75,9 +75,9 @@ def edit_page(context, request):
         context.data = request.params['body']
         return HTTPFound(location = request.resource_url(context))
 
-    return dict(page = context,
-                save_url = request.resource_url(context, 'edit_page'),
-                logged_in = authenticated_userid(request))
+    return dict(page=context,
+                save_url=request.resource_url(context, 'edit_page'),
+                logged_in=authenticated_userid(request))
 
 @view_config(context='.models.Wiki', name='login',
              renderer='templates/login.pt')
diff --git a/docs/tutorials/wiki/src/basiclayout/setup.py b/docs/tutorials/wiki/src/basiclayout/setup.py
index 647c3a638..4998be902 100644
--- a/docs/tutorials/wiki/src/basiclayout/setup.py
+++ b/docs/tutorials/wiki/src/basiclayout/setup.py
@@ -19,7 +19,7 @@ requires = [
 setup(name='tutorial',
       version='0.0',
       description='tutorial',
-      long_description=README + '\n\n' +  CHANGES,
+      long_description=README + '\n\n' + CHANGES,
       classifiers=[
         "Programming Language :: Python",
         "Framework :: Pyramid",
@@ -33,12 +33,11 @@ setup(name='tutorial',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
-      install_requires = requires,
-      tests_require= requires,
+      install_requires=requires,
+      tests_require=requires,
       test_suite="tutorial",
-      entry_points = """\
+      entry_points="""\
       [paste.app_factory]
       main = tutorial:main
       """,
       )
-
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py b/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py
index b63933fc5..c3bb87a62 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py
@@ -2,10 +2,12 @@ from pyramid.config import Configurator
 from pyramid_zodbconn import get_connection
 from .models import appmaker
 
+
 def root_factory(request):
     conn = get_connection(request)
     return appmaker(conn.root())
 
+
 def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
     """
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/models.py b/docs/tutorials/wiki/src/basiclayout/tutorial/models.py
index 8dd0f5a49..a94b36ef4 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/models.py
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/models.py
@@ -1,8 +1,10 @@
 from persistent.mapping import PersistentMapping
 
+
 class MyModel(PersistentMapping):
     __parent__ = __name__ = None
 
+
 def appmaker(zodb_root):
     if not 'app_root' in zodb_root:
         app_root = MyModel()
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/tests.py b/docs/tutorials/wiki/src/basiclayout/tutorial/tests.py
index 8d2374be1..7f6523c66 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/tests.py
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/tests.py
@@ -14,4 +14,3 @@ class ViewTests(unittest.TestCase):
         request = testing.DummyRequest()
         info = my_view(request)
         self.assertEqual(info['project'], 'tutorial')
-
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/views.py b/docs/tutorials/wiki/src/basiclayout/tutorial/views.py
index 4265b6bf7..628ce15ed 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/views.py
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/views.py
@@ -1,6 +1,7 @@
 from pyramid.view import view_config
 from .models import MyModel
 
+
 @view_config(context=MyModel, renderer='templates/mytemplate.pt')
 def my_view(request):
-    return {'project':'tutorial'}
+    return {'project': 'tutorial'}
diff --git a/docs/tutorials/wiki/src/models/setup.py b/docs/tutorials/wiki/src/models/setup.py
index 647c3a638..4998be902 100644
--- a/docs/tutorials/wiki/src/models/setup.py
+++ b/docs/tutorials/wiki/src/models/setup.py
@@ -19,7 +19,7 @@ requires = [
 setup(name='tutorial',
       version='0.0',
       description='tutorial',
-      long_description=README + '\n\n' +  CHANGES,
+      long_description=README + '\n\n' + CHANGES,
       classifiers=[
         "Programming Language :: Python",
         "Framework :: Pyramid",
@@ -33,12 +33,11 @@ setup(name='tutorial',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
-      install_requires = requires,
-      tests_require= requires,
+      install_requires=requires,
+      tests_require=requires,
       test_suite="tutorial",
-      entry_points = """\
+      entry_points="""\
       [paste.app_factory]
       main = tutorial:main
       """,
       )
-
diff --git a/docs/tutorials/wiki/src/models/tutorial/__init__.py b/docs/tutorials/wiki/src/models/tutorial/__init__.py
index c59f36e7b..c3bb87a62 100644
--- a/docs/tutorials/wiki/src/models/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/models/tutorial/__init__.py
@@ -2,15 +2,16 @@ from pyramid.config import Configurator
 from pyramid_zodbconn import get_connection
 from .models import appmaker
 
+
 def root_factory(request):
     conn = get_connection(request)
     return appmaker(conn.root())
 
+
 def main(global_config, **settings):
-    """ This function returns a WSGI application.
+    """ This function returns a Pyramid WSGI application.
     """
     config = Configurator(root_factory=root_factory, settings=settings)
     config.add_static_view('static', 'static', cache_max_age=3600)
     config.scan()
     return config.make_wsgi_app()
-
diff --git a/docs/tutorials/wiki/src/models/tutorial/views.py b/docs/tutorials/wiki/src/models/tutorial/views.py
index 7c1f1d228..628ce15ed 100644
--- a/docs/tutorials/wiki/src/models/tutorial/views.py
+++ b/docs/tutorials/wiki/src/models/tutorial/views.py
@@ -1,5 +1,7 @@
 from pyramid.view import view_config
+from .models import MyModel
 
-@view_config(renderer='templates/mytemplate.pt')
+
+@view_config(context=MyModel, renderer='templates/mytemplate.pt')
 def my_view(request):
-    return {'project':'tutorial'}
+    return {'project': 'tutorial'}
diff --git a/docs/tutorials/wiki/src/tests/setup.py b/docs/tutorials/wiki/src/tests/setup.py
index a665611bd..702d34c4c 100644
--- a/docs/tutorials/wiki/src/tests/setup.py
+++ b/docs/tutorials/wiki/src/tests/setup.py
@@ -21,7 +21,7 @@ requires = [
 setup(name='tutorial',
       version='0.0',
       description='tutorial',
-      long_description=README + '\n\n' +  CHANGES,
+      long_description=README + '\n\n' + CHANGES,
       classifiers=[
         "Programming Language :: Python",
         "Framework :: Pyramid",
@@ -35,12 +35,11 @@ setup(name='tutorial',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
-      install_requires = requires,
-      tests_require= requires,
+      install_requires=requires,
+      tests_require=requires,
       test_suite="tutorial",
-      entry_points = """\
+      entry_points="""\
       [paste.app_factory]
       main = tutorial:main
       """,
       )
-
diff --git a/docs/tutorials/wiki/src/tests/tutorial/__init__.py b/docs/tutorials/wiki/src/tests/tutorial/__init__.py
index b42e01d03..8ea8f8fa3 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/tests/tutorial/__init__.py
@@ -11,8 +11,9 @@ def root_factory(request):
     conn = get_connection(request)
     return appmaker(conn.root())
 
+
 def main(global_config, **settings):
-    """ This function returns a WSGI application.
+    """ This function returns a Pyramid WSGI application.
     """
     authn_policy = AuthTktAuthenticationPolicy(
         'sosecret', callback=groupfinder, hashalg='sha512')
diff --git a/docs/tutorials/wiki/src/tests/tutorial/tests.py b/docs/tutorials/wiki/src/tests/tutorial/tests.py
index 81f7a1882..ff7ca4f33 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/tests.py
+++ b/docs/tutorials/wiki/src/tests/tutorial/tests.py
@@ -30,6 +30,7 @@ class WikiModelTests(unittest.TestCase):
         self.assertEqual(wiki.__name__, None)
 
 class AppmakerTests(unittest.TestCase):
+
     def _callFUT(self, zodb_root):
         from .models import appmaker
         return appmaker(zodb_root)
diff --git a/docs/tutorials/wiki/src/tests/tutorial/views.py b/docs/tutorials/wiki/src/tests/tutorial/views.py
index 50485d279..77956b1e3 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/views.py
+++ b/docs/tutorials/wiki/src/tests/tutorial/views.py
@@ -64,8 +64,8 @@ def add_page(context, request):
     page.__name__ = pagename
     page.__parent__ = context
 
-    return dict(page = page, save_url = save_url,
-                logged_in = authenticated_userid(request))
+    return dict(page=page, save_url=save_url,
+                logged_in=authenticated_userid(request))
 
 @view_config(name='edit_page', context='.models.Page',
              renderer='templates/edit.pt',
@@ -75,9 +75,9 @@ def edit_page(context, request):
         context.data = request.params['body']
         return HTTPFound(location = request.resource_url(context))
 
-    return dict(page = context,
-                save_url = request.resource_url(context, 'edit_page'),
-                logged_in = authenticated_userid(request))
+    return dict(page=context,
+                save_url=request.resource_url(context, 'edit_page'),
+                logged_in=authenticated_userid(request))
 
 @view_config(context='.models.Wiki', name='login',
              renderer='templates/login.pt')
diff --git a/docs/tutorials/wiki/src/views/setup.py b/docs/tutorials/wiki/src/views/setup.py
index 1d2d690fc..3164fd724 100644
--- a/docs/tutorials/wiki/src/views/setup.py
+++ b/docs/tutorials/wiki/src/views/setup.py
@@ -20,7 +20,7 @@ requires = [
 setup(name='tutorial',
       version='0.0',
       description='tutorial',
-      long_description=README + '\n\n' +  CHANGES,
+      long_description=README + '\n\n' + CHANGES,
       classifiers=[
         "Programming Language :: Python",
         "Framework :: Pyramid",
@@ -34,12 +34,11 @@ setup(name='tutorial',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
-      install_requires = requires,
-      tests_require= requires,
+      install_requires=requires,
+      tests_require=requires,
       test_suite="tutorial",
-      entry_points = """\
+      entry_points="""\
       [paste.app_factory]
       main = tutorial:main
       """,
       )
-
diff --git a/docs/tutorials/wiki/src/views/tutorial/__init__.py b/docs/tutorials/wiki/src/views/tutorial/__init__.py
index 957a0b705..c3bb87a62 100644
--- a/docs/tutorials/wiki/src/views/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/views/tutorial/__init__.py
@@ -1,15 +1,17 @@
 from pyramid.config import Configurator
 from pyramid_zodbconn import get_connection
-from tutorial.models import appmaker
+from .models import appmaker
+
 
 def root_factory(request):
     conn = get_connection(request)
     return appmaker(conn.root())
 
+
 def main(global_config, **settings):
-    """ This function returns a WSGI application.
+    """ This function returns a Pyramid WSGI application.
     """
     config = Configurator(root_factory=root_factory, settings=settings)
     config.add_static_view('static', 'static', cache_max_age=3600)
-    config.scan('tutorial')
+    config.scan()
     return config.make_wsgi_app()
diff --git a/docs/tutorials/wiki/src/views/tutorial/tests.py b/docs/tutorials/wiki/src/views/tutorial/tests.py
index 9eac2a432..663c9f405 100644
--- a/docs/tutorials/wiki/src/views/tutorial/tests.py
+++ b/docs/tutorials/wiki/src/views/tutorial/tests.py
@@ -5,7 +5,7 @@ from pyramid import testing
 class PageModelTests(unittest.TestCase):
 
     def _getTargetClass(self):
-        from tutorial.models import Page
+        from .models import Page
         return Page
 
     def _makeOne(self, data=u'some data'):
@@ -14,11 +14,11 @@ class PageModelTests(unittest.TestCase):
     def test_constructor(self):
         instance = self._makeOne()
         self.assertEqual(instance.data, u'some data')
-        
+
 class WikiModelTests(unittest.TestCase):
 
     def _getTargetClass(self):
-        from tutorial.models import Wiki
+        from .models import Wiki
         return Wiki
 
     def _makeOne(self):
@@ -30,8 +30,9 @@ class WikiModelTests(unittest.TestCase):
         self.assertEqual(wiki.__name__, None)
 
 class AppmakerTests(unittest.TestCase):
+
     def _callFUT(self, zodb_root):
-        from tutorial.models import appmaker
+        from .models import appmaker
         return appmaker(zodb_root)
 
     def test_it(self):
@@ -42,7 +43,7 @@ class AppmakerTests(unittest.TestCase):
 
 class ViewWikiTests(unittest.TestCase):
     def test_it(self):
-        from tutorial.views import view_wiki
+        from .views import view_wiki
         context = testing.DummyResource()
         request = testing.DummyRequest()
         response = view_wiki(context, request)
@@ -50,7 +51,7 @@ class ViewWikiTests(unittest.TestCase):
 
 class ViewPageTests(unittest.TestCase):
     def _callFUT(self, context, request):
-        from tutorial.views import view_page
+        from .views import view_page
         return view_page(context, request)
 
     def test_it(self):
@@ -63,7 +64,7 @@ class ViewPageTests(unittest.TestCase):
         info = self._callFUT(context, request)
         self.assertEqual(info['page'], context)
         self.assertEqual(
-            info['content'], 
+            info['content'],
             '<div class="document">\n'
             '<p>Hello <a href="http://example.com/add_page/CruelWorld">'
             'CruelWorld</a> '
@@ -72,11 +73,11 @@ class ViewPageTests(unittest.TestCase):
             '</p>\n</div>\n')
         self.assertEqual(info['edit_url'],
                          'http://example.com/thepage/edit_page')
-        
-    
+
+
 class AddPageTests(unittest.TestCase):
     def _callFUT(self, context, request):
-        from tutorial.views import add_page
+        from .views import add_page
         return add_page(context, request)
 
     def test_it_notsubmitted(self):
@@ -88,7 +89,7 @@ class AddPageTests(unittest.TestCase):
         self.assertEqual(
             info['save_url'],
             request.resource_url(context, 'add_page', 'AnotherPage'))
-        
+
     def test_it_submitted(self):
         context = testing.DummyResource()
         request = testing.DummyRequest({'form.submitted':True,
@@ -102,7 +103,7 @@ class AddPageTests(unittest.TestCase):
 
 class EditPageTests(unittest.TestCase):
     def _callFUT(self, context, request):
-        from tutorial.views import edit_page
+        from .views import edit_page
         return edit_page(context, request)
 
     def test_it_notsubmitted(self):
@@ -112,7 +113,7 @@ class EditPageTests(unittest.TestCase):
         self.assertEqual(info['page'], context)
         self.assertEqual(info['save_url'],
                          request.resource_url(context, 'edit_page'))
-        
+
     def test_it_submitted(self):
         context = testing.DummyResource()
         request = testing.DummyRequest({'form.submitted':True,
diff --git a/docs/tutorials/wiki/src/views/tutorial/views.py b/docs/tutorials/wiki/src/views/tutorial/views.py
index b0c15297f..61517c31d 100644
--- a/docs/tutorials/wiki/src/views/tutorial/views.py
+++ b/docs/tutorials/wiki/src/views/tutorial/views.py
@@ -56,5 +56,5 @@ def edit_page(context, request):
         context.data = request.params['body']
         return HTTPFound(location = request.resource_url(context))
 
-    return dict(page = context,
-                save_url = request.resource_url(context, 'edit_page'))
+    return dict(page=context,
+                save_url=request.resource_url(context, 'edit_page'))
-- 
cgit v1.2.3


From b0b299feddcb25f29e6eb133865956fcd5bc0d6b Mon Sep 17 00:00:00 2001
From: Patricio Paez <pp@pp.com.mx>
Date: Sat, 1 Dec 2012 17:59:44 -0600
Subject: Update line references

- In the Basic Layout and Authorization chapters
  of the ZODB wiki tutorial
---
 docs/tutorials/wiki/authorization.rst |  6 +++---
 docs/tutorials/wiki/basiclayout.rst   | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/tutorials/wiki/authorization.rst b/docs/tutorials/wiki/authorization.rst
index 24249945a..e90dfe12d 100644
--- a/docs/tutorials/wiki/authorization.rst
+++ b/docs/tutorials/wiki/authorization.rst
@@ -127,7 +127,7 @@ add these import statements:
 Now add those policies to the configuration:
 
 .. literalinclude:: src/authorization/tutorial/__init__.py
-   :lines: 17-22
+   :lines: 18-23
    :linenos:
    :emphasize-lines: 1-3,5-6
    :language: python
@@ -213,7 +213,7 @@ expire an auth ticket cookie.
 Now add the ``login`` and ``logout`` views:
 
 .. literalinclude:: src/authorization/tutorial/views.py
-   :lines: 87-120
+   :lines: 82-120
    :linenos:
    :language: python
 
@@ -306,7 +306,7 @@ when we're done:
 
 .. literalinclude:: src/authorization/tutorial/__init__.py
    :linenos:
-   :emphasize-lines: 4-5,8,17-19,21-22
+   :emphasize-lines: 4-5,8,18-20,22-23
    :language: python
 
 (Only the highlighted lines need to be added.)
diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst
index 033dcb28c..12cf86a91 100644
--- a/docs/tutorials/wiki/basiclayout.rst
+++ b/docs/tutorials/wiki/basiclayout.rst
@@ -31,13 +31,13 @@ point happens to be the ``main`` function within the file named
 
 #. *Lines 1-3*.  Perform some dependency imports.
 
-#. *Lines 5-7*  Define a root factory for our Pyramid application.
+#. *Lines 6-8*  Define a root factory for our Pyramid application.
 
-#. *Line 12*.  We construct a :term:`Configurator` with a :term:`root
+#. *Line 14*.  We construct a :term:`Configurator` with a :term:`root
    factory` and the settings keywords parsed by :term:`PasteDeploy`.  The root
    factory is named ``root_factory``.
 
-#. *Line 13*.  Register a 'static view' which answers requests which start
+#. *Line 15*.  Register a 'static view' which answers requests which start
    with with URL path ``/static`` using the
    :meth:`pyramid.config.Configurator.add_static_view method`.  This
    statement registers a view that will serve up static assets, such as CSS
@@ -50,7 +50,7 @@ point happens to be the ``main`` function within the file named
    package.  The scaffold could have alternately used an *absolute* asset
    specification as the path (``tutorial:static``) but it does not.
 
-#. *Line 14*.  Perform a :term:`scan`.  A scan will find :term:`configuration
+#. *Line 16*.  Perform a :term:`scan`.  A scan will find :term:`configuration
    decoration`, such as view configuration decorators (e.g. ``@view_config``)
    in the source code of the ``tutorial`` package and will take actions based
    on these decorators.  We don't pass any arguments to
@@ -59,7 +59,7 @@ point happens to be the ``main`` function within the file named
    The scaffold could have equivalently said ``config.scan('tutorial')`` but
    it chose to omit the package name argument.
 
-#. *Line 15*.  Use the
+#. *Line 17*.  Use the
    :meth:`pyramid.config.Configurator.make_wsgi_app` method
    to return a :term:`WSGI` application.
 
@@ -81,7 +81,7 @@ Here is the source for ``models.py``:
       :linenos:
       :language: py
 
-#. *Lines 3-4*.  The ``MyModel`` :term:`resource` class is implemented here.
+#. *Lines 4-5*.  The ``MyModel`` :term:`resource` class is implemented here.
    Instances of this class will be capable of being persisted in :term:`ZODB`
    because the class inherits from the
    :class:`persistent.mapping.PersistentMapping` class.  The ``__parent__``
@@ -89,7 +89,7 @@ Here is the source for ``models.py``:
    By default, have these as ``None`` indicating that this is the
    :term:`root` object.
 
-#. *Lines 6-12*.  ``appmaker`` is used to return the *application
+#. *Lines 8-14*.  ``appmaker`` is used to return the *application
    root* object.  It is called on *every request* to the
    :app:`Pyramid` application.  It also performs bootstrapping by
    *creating* an application root (inside the ZODB root object) if one
@@ -118,7 +118,7 @@ Let's try to understand the components in this module:
 
 #. *Lines 1-2*. Perform some dependency imports.
 
-#. *Line 4*.  Use the :func:`pyramid.view.view_config` :term:`configuration
+#. *Line 5*.  Use the :func:`pyramid.view.view_config` :term:`configuration
    decoration` to perform a :term:`view configuration` registration.  This
    view configuration registration will be activated when the application is
    started.  It will be activated by virtue of it being found as the result
@@ -148,7 +148,7 @@ Let's try to understand the components in this module:
    ``my_view`` function which it decorates represents the "default" view
    callable used when the context is of the type ``MyModel``.
 
-#. *Lines 5-6*.  We define a :term:`view callable` named ``my_view``, which
+#. *Lines 6-7*.  We define a :term:`view callable` named ``my_view``, which
    we decorated in the step above.  This view callable is a *function* we
    write generated by the ``zodb`` scaffold that is given a
    ``request`` and which returns a dictionary.  The ``mytemplate.pt``
-- 
cgit v1.2.3


From c47b8caa24857c1c35fd0ddf72a237c70b63f5cd Mon Sep 17 00:00:00 2001
From: Patricio Paez <pp@pp.com.mx>
Date: Sat, 1 Dec 2012 19:23:34 -0600
Subject: Sync setup.py in SQL wiki tutorial

---
 docs/tutorials/wiki2/src/authorization/setup.py | 3 +--
 docs/tutorials/wiki2/src/basiclayout/setup.py   | 3 +--
 docs/tutorials/wiki2/src/models/setup.py        | 3 +--
 docs/tutorials/wiki2/src/tests/setup.py         | 3 +--
 docs/tutorials/wiki2/src/views/setup.py         | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/docs/tutorials/wiki2/src/authorization/setup.py b/docs/tutorials/wiki2/src/authorization/setup.py
index d658cae93..36668dd33 100644
--- a/docs/tutorials/wiki2/src/authorization/setup.py
+++ b/docs/tutorials/wiki2/src/authorization/setup.py
@@ -20,7 +20,7 @@ requires = [
 setup(name='tutorial',
       version='0.0',
       description='tutorial',
-      long_description=README + '\n\n' +  CHANGES,
+      long_description=README + '\n\n' + CHANGES,
       classifiers=[
         "Programming Language :: Python",
         "Framework :: Pyramid",
@@ -43,4 +43,3 @@ setup(name='tutorial',
       initialize_tutorial_db = tutorial.scripts.initializedb:main
       """,
       )
-
diff --git a/docs/tutorials/wiki2/src/basiclayout/setup.py b/docs/tutorials/wiki2/src/basiclayout/setup.py
index 1a1ad78aa..a09bf756a 100644
--- a/docs/tutorials/wiki2/src/basiclayout/setup.py
+++ b/docs/tutorials/wiki2/src/basiclayout/setup.py
@@ -19,7 +19,7 @@ requires = [
 setup(name='tutorial',
       version='0.0',
       description='tutorial',
-      long_description=README + '\n\n' +  CHANGES,
+      long_description=README + '\n\n' + CHANGES,
       classifiers=[
         "Programming Language :: Python",
         "Framework :: Pyramid",
@@ -42,4 +42,3 @@ setup(name='tutorial',
       initialize_tutorial_db = tutorial.scripts.initializedb:main
       """,
       )
-
diff --git a/docs/tutorials/wiki2/src/models/setup.py b/docs/tutorials/wiki2/src/models/setup.py
index 1a1ad78aa..a09bf756a 100644
--- a/docs/tutorials/wiki2/src/models/setup.py
+++ b/docs/tutorials/wiki2/src/models/setup.py
@@ -19,7 +19,7 @@ requires = [
 setup(name='tutorial',
       version='0.0',
       description='tutorial',
-      long_description=README + '\n\n' +  CHANGES,
+      long_description=README + '\n\n' + CHANGES,
       classifiers=[
         "Programming Language :: Python",
         "Framework :: Pyramid",
@@ -42,4 +42,3 @@ setup(name='tutorial',
       initialize_tutorial_db = tutorial.scripts.initializedb:main
       """,
       )
-
diff --git a/docs/tutorials/wiki2/src/tests/setup.py b/docs/tutorials/wiki2/src/tests/setup.py
index 8a619d27b..3c2961fcc 100644
--- a/docs/tutorials/wiki2/src/tests/setup.py
+++ b/docs/tutorials/wiki2/src/tests/setup.py
@@ -21,7 +21,7 @@ requires = [
 setup(name='tutorial',
       version='0.0',
       description='tutorial',
-      long_description=README + '\n\n' +  CHANGES,
+      long_description=README + '\n\n' + CHANGES,
       classifiers=[
         "Programming Language :: Python",
         "Framework :: Pyramid",
@@ -44,4 +44,3 @@ setup(name='tutorial',
       initialize_tutorial_db = tutorial.scripts.initializedb:main
       """,
       )
-
diff --git a/docs/tutorials/wiki2/src/views/setup.py b/docs/tutorials/wiki2/src/views/setup.py
index d658cae93..36668dd33 100644
--- a/docs/tutorials/wiki2/src/views/setup.py
+++ b/docs/tutorials/wiki2/src/views/setup.py
@@ -20,7 +20,7 @@ requires = [
 setup(name='tutorial',
       version='0.0',
       description='tutorial',
-      long_description=README + '\n\n' +  CHANGES,
+      long_description=README + '\n\n' + CHANGES,
       classifiers=[
         "Programming Language :: Python",
         "Framework :: Pyramid",
@@ -43,4 +43,3 @@ setup(name='tutorial',
       initialize_tutorial_db = tutorial.scripts.initializedb:main
       """,
       )
-
-- 
cgit v1.2.3


From fa4f48ee9ef697cbdff9337da0cdf12d761402fb Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sat, 1 Dec 2012 20:31:05 -0500
Subject: unused import

---
 pyramid/config/views.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pyramid/config/views.py b/pyramid/config/views.py
index d1b69566b..2a93ffbec 100644
--- a/pyramid/config/views.py
+++ b/pyramid/config/views.py
@@ -37,7 +37,6 @@ from pyramid import renderers
 from pyramid.compat import (
     string_types,
     urlparse,
-    im_func,
     url_quote,
     WIN,
     is_bound_method,
-- 
cgit v1.2.3


From e90fa43a8051dfc8799596e17b72fd3d3def6516 Mon Sep 17 00:00:00 2001
From: Patricio Paez <pp@pp.com.mx>
Date: Sat, 1 Dec 2012 19:43:02 -0600
Subject: Sync __init__.py in SQL wiki tutorial

- Update lines and emphasized-lines

- No line numbers if only a single line
---
 docs/tutorials/wiki2/authorization.rst                  |  8 ++++----
 docs/tutorials/wiki2/basiclayout.rst                    | 17 ++++++++---------
 docs/tutorials/wiki2/definingviews.rst                  |  2 +-
 .../wiki2/src/authorization/tutorial/__init__.py        |  2 +-
 .../wiki2/src/basiclayout/tutorial/__init__.py          |  2 +-
 docs/tutorials/wiki2/src/models/tutorial/__init__.py    |  2 +-
 docs/tutorials/wiki2/src/tests/tutorial/__init__.py     |  2 +-
 docs/tutorials/wiki2/src/views/tutorial/__init__.py     |  1 +
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/tutorials/wiki2/authorization.rst b/docs/tutorials/wiki2/authorization.rst
index 1ddf8c82d..ffaf1e35e 100644
--- a/docs/tutorials/wiki2/authorization.rst
+++ b/docs/tutorials/wiki2/authorization.rst
@@ -112,7 +112,7 @@ parameter to our :term:`Configurator` constructor, that points to
 the class we created above:
 
 .. literalinclude:: src/authorization/tutorial/__init__.py
-   :lines: 23-24
+   :lines: 24-25
    :linenos:
    :emphasize-lines: 2
    :language: python
@@ -144,7 +144,7 @@ add these import statements:
 Now add those policies to the configuration:
 
 .. literalinclude:: src/authorization/tutorial/__init__.py
-   :lines: 20-26
+   :lines: 21-27
    :linenos:
    :emphasize-lines: 1-3,6-7
    :language: python
@@ -206,7 +206,7 @@ Go back to ``tutorial/tutorial/__init__.py`` and add these two
 routes:
 
 .. literalinclude:: src/authorization/tutorial/__init__.py
-   :lines: 29-30
+   :lines: 30-31
    :linenos:
    :language: python
 
@@ -333,7 +333,7 @@ when we're done:
 
 .. literalinclude:: src/authorization/tutorial/__init__.py
    :linenos:
-   :emphasize-lines: 2-3,7,23-24,20-26,29-30
+   :emphasize-lines: 2-3,7,21-23,25-27,30-31
    :language: python
 
 (Only the highlighted lines need to be added.)
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index 4f73dc914..7b9c44bb1 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -51,15 +51,14 @@ The main function first creates a SQLAlchemy database engine using
 (something like ``sqlite://``):
 
    .. literalinclude:: src/basiclayout/tutorial/__init__.py
-      :lines: 12
-      :linenos:
+      :lines: 13
       :language: py
 
 ``main`` then initializes our SQLAlchemy session object, passing it the
 engine:
 
    .. literalinclude:: src/basiclayout/tutorial/__init__.py
-      :lines: 13
+      :lines: 14
       :language: py
 
 ``main`` subsequently initializes our SQLAlchemy declarative Base object,
@@ -71,13 +70,13 @@ forgotten about this tutorial, you won't be left scratching your head when it
 doesn't work.
 
    .. literalinclude:: src/basiclayout/tutorial/__init__.py
-      :lines: 14
+      :lines: 15
       :language: py
 
 The next step of ``main`` is to construct a :term:`Configurator` object:
 
    .. literalinclude:: src/basiclayout/tutorial/__init__.py
-      :lines: 15
+      :lines: 16
       :language: py
 
 ``settings`` is passed to the Configurator as a keyword argument with the
@@ -90,7 +89,7 @@ deployment-related values such as ``pyramid.reload_templates``,
 two arguments: ``static`` (the name), and ``static`` (the path):
 
    .. literalinclude:: src/basiclayout/tutorial/__init__.py
-      :lines: 16
+      :lines: 17
       :language: py
 
 This registers a static resource view which will match any URL that starts
@@ -108,7 +107,7 @@ via the :meth:`pyramid.config.Configurator.add_route` method that will be
 used when the URL is ``/``:
 
    .. literalinclude:: src/basiclayout/tutorial/__init__.py
-      :lines: 17
+      :lines: 18
       :language: py
 
 Since this route has a ``pattern`` equalling ``/`` it is the route that will
@@ -121,7 +120,7 @@ view configuration will be registered, which will allow one of our
 application URLs to be mapped to some code.
 
    .. literalinclude:: src/basiclayout/tutorial/__init__.py
-      :lines: 18
+      :lines: 19
       :language: py
 
 Finally, ``main`` is finished configuring things, so it uses the
@@ -129,7 +128,7 @@ Finally, ``main`` is finished configuring things, so it uses the
 :term:`WSGI` application:
 
    .. literalinclude:: src/basiclayout/tutorial/__init__.py
-      :lines: 19
+      :lines: 20
       :language: py
 
 View Declarations via ``views.py``
diff --git a/docs/tutorials/wiki2/definingviews.rst b/docs/tutorials/wiki2/definingviews.rst
index a54996e3c..d6a31edbb 100644
--- a/docs/tutorials/wiki2/definingviews.rst
+++ b/docs/tutorials/wiki2/definingviews.rst
@@ -342,7 +342,7 @@ something like:
 .. literalinclude:: src/views/tutorial/__init__.py
    :linenos:
    :language: python
-   :emphasize-lines: 17-20
+   :emphasize-lines: 18-21
 
 (The highlighted lines are the ones that need to be added or edited.)
 
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py b/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py
index 76071173a..d08e55bf9 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py
@@ -11,6 +11,7 @@ from .models import (
     Base,
     )
 
+
 def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
     """
@@ -33,4 +34,3 @@ def main(global_config, **settings):
     config.add_route('edit_page', '/{pagename}/edit_page')
     config.scan()
     return config.make_wsgi_app()
-
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py b/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py
index e39f619ed..aac7c5e69 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py
@@ -6,6 +6,7 @@ from .models import (
     Base,
     )
 
+
 def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
     """
@@ -17,4 +18,3 @@ def main(global_config, **settings):
     config.add_route('home', '/')
     config.scan()
     return config.make_wsgi_app()
-
diff --git a/docs/tutorials/wiki2/src/models/tutorial/__init__.py b/docs/tutorials/wiki2/src/models/tutorial/__init__.py
index e39f619ed..aac7c5e69 100644
--- a/docs/tutorials/wiki2/src/models/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/models/tutorial/__init__.py
@@ -6,6 +6,7 @@ from .models import (
     Base,
     )
 
+
 def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
     """
@@ -17,4 +18,3 @@ def main(global_config, **settings):
     config.add_route('home', '/')
     config.scan()
     return config.make_wsgi_app()
-
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/__init__.py b/docs/tutorials/wiki2/src/tests/tutorial/__init__.py
index 76071173a..d08e55bf9 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/tests/tutorial/__init__.py
@@ -11,6 +11,7 @@ from .models import (
     Base,
     )
 
+
 def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
     """
@@ -33,4 +34,3 @@ def main(global_config, **settings):
     config.add_route('edit_page', '/{pagename}/edit_page')
     config.scan()
     return config.make_wsgi_app()
-
diff --git a/docs/tutorials/wiki2/src/views/tutorial/__init__.py b/docs/tutorials/wiki2/src/views/tutorial/__init__.py
index 810e92f75..c95bfdbf8 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/views/tutorial/__init__.py
@@ -6,6 +6,7 @@ from .models import (
     Base,
     )
 
+
 def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
     """
-- 
cgit v1.2.3


From 479178179df2e3554d81d8c42d7ff46b75901c62 Mon Sep 17 00:00:00 2001
From: Patricio Paez <pp@pp.com.mx>
Date: Sat, 1 Dec 2012 22:30:50 -0600
Subject: Sync models.py in SQL wiki tutorial

- Update lines and emphasized-lines

- No line numbers if only a single line
---
 docs/tutorials/wiki2/authorization.rst                    | 4 ++--
 docs/tutorials/wiki2/basiclayout.rst                      | 1 -
 docs/tutorials/wiki2/definingmodels.rst                   | 2 +-
 docs/tutorials/wiki2/src/authorization/tutorial/models.py | 1 +
 docs/tutorials/wiki2/src/basiclayout/tutorial/models.py   | 2 +-
 docs/tutorials/wiki2/src/models/tutorial/models.py        | 2 +-
 docs/tutorials/wiki2/src/tests/tutorial/models.py         | 1 +
 docs/tutorials/wiki2/src/views/tutorial/models.py         | 2 +-
 8 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/docs/tutorials/wiki2/authorization.rst b/docs/tutorials/wiki2/authorization.rst
index ffaf1e35e..d98fb87e4 100644
--- a/docs/tutorials/wiki2/authorization.rst
+++ b/docs/tutorials/wiki2/authorization.rst
@@ -86,7 +86,7 @@ statement at the head:
 Add the following class definition:
 
 .. literalinclude:: src/authorization/tutorial/models.py
-   :lines: 35-39
+   :lines: 36-40
    :linenos:
    :language: python
 
@@ -343,7 +343,7 @@ when we're done:
 
 .. literalinclude:: src/authorization/tutorial/models.py
    :linenos:
-   :emphasize-lines: 1-4,35-39
+   :emphasize-lines: 1-4,36-40
    :language: python
 
 (Only the highlighted lines need to be added.)
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index 7b9c44bb1..934bfb52a 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -200,7 +200,6 @@ Next we set up a SQLAlchemy "DBSession" object:
 
    .. literalinclude:: src/basiclayout/tutorial/models.py
       :lines: 16
-      :linenos:
       :language: py
 
 ``scoped_session`` and ``sessionmaker`` are standard SQLAlchemy helpers.
diff --git a/docs/tutorials/wiki2/definingmodels.rst b/docs/tutorials/wiki2/definingmodels.rst
index 1653faf4a..936abbeb6 100644
--- a/docs/tutorials/wiki2/definingmodels.rst
+++ b/docs/tutorials/wiki2/definingmodels.rst
@@ -27,7 +27,7 @@ following:
 .. literalinclude:: src/models/tutorial/models.py
    :linenos:
    :language: py
-   :emphasize-lines: 19-21,24,26,28
+   :emphasize-lines: 20-22,25,27,29
 
 (The highlighted lines are the ones that need to be changed.)
 
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/models.py b/docs/tutorials/wiki2/src/authorization/tutorial/models.py
index c3bdcbea5..91e5a0019 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/models.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/models.py
@@ -21,6 +21,7 @@ from zope.sqlalchemy import ZopeTransactionExtension
 DBSession = scoped_session(sessionmaker(extension=ZopeTransactionExtension()))
 Base = declarative_base()
 
+
 class Page(Base):
     """ The SQLAlchemy declarative model class for a Page object. """
     __tablename__ = 'pages'
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/models.py b/docs/tutorials/wiki2/src/basiclayout/tutorial/models.py
index b6ac15429..aeeb9df64 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/models.py
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/models.py
@@ -16,6 +16,7 @@ from zope.sqlalchemy import ZopeTransactionExtension
 DBSession = scoped_session(sessionmaker(extension=ZopeTransactionExtension()))
 Base = declarative_base()
 
+
 class MyModel(Base):
     __tablename__ = 'models'
     id = Column(Integer, primary_key=True)
@@ -25,4 +26,3 @@ class MyModel(Base):
     def __init__(self, name, value):
         self.name = name
         self.value = value
-
diff --git a/docs/tutorials/wiki2/src/models/tutorial/models.py b/docs/tutorials/wiki2/src/models/tutorial/models.py
index 499396c5b..9a078d757 100644
--- a/docs/tutorials/wiki2/src/models/tutorial/models.py
+++ b/docs/tutorials/wiki2/src/models/tutorial/models.py
@@ -16,6 +16,7 @@ from zope.sqlalchemy import ZopeTransactionExtension
 DBSession = scoped_session(sessionmaker(extension=ZopeTransactionExtension()))
 Base = declarative_base()
 
+
 class Page(Base):
     """ The SQLAlchemy declarative model class for a Page object. """
     __tablename__ = 'pages'
@@ -26,4 +27,3 @@ class Page(Base):
     def __init__(self, name, data):
         self.name = name
         self.data = data
-
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/models.py b/docs/tutorials/wiki2/src/tests/tutorial/models.py
index c3bdcbea5..91e5a0019 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/models.py
+++ b/docs/tutorials/wiki2/src/tests/tutorial/models.py
@@ -21,6 +21,7 @@ from zope.sqlalchemy import ZopeTransactionExtension
 DBSession = scoped_session(sessionmaker(extension=ZopeTransactionExtension()))
 Base = declarative_base()
 
+
 class Page(Base):
     """ The SQLAlchemy declarative model class for a Page object. """
     __tablename__ = 'pages'
diff --git a/docs/tutorials/wiki2/src/views/tutorial/models.py b/docs/tutorials/wiki2/src/views/tutorial/models.py
index 499396c5b..9a078d757 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/models.py
+++ b/docs/tutorials/wiki2/src/views/tutorial/models.py
@@ -16,6 +16,7 @@ from zope.sqlalchemy import ZopeTransactionExtension
 DBSession = scoped_session(sessionmaker(extension=ZopeTransactionExtension()))
 Base = declarative_base()
 
+
 class Page(Base):
     """ The SQLAlchemy declarative model class for a Page object. """
     __tablename__ = 'pages'
@@ -26,4 +27,3 @@ class Page(Base):
     def __init__(self, name, data):
         self.name = name
         self.data = data
-
-- 
cgit v1.2.3


From 412c4b09deb3a53f3c9ee39423b527709ea13097 Mon Sep 17 00:00:00 2001
From: Patricio Paez <pp@pp.com.mx>
Date: Sun, 2 Dec 2012 17:29:20 -0600
Subject: Sync initializedb.py in SQL wiki tutorial

---
 docs/tutorials/wiki2/definingmodels.rst                               | 2 +-
 .../wiki2/src/authorization/tutorial/scripts/initializedb.py          | 4 +++-
 docs/tutorials/wiki2/src/basiclayout/tutorial/scripts/initializedb.py | 4 +++-
 docs/tutorials/wiki2/src/models/tutorial/scripts/initializedb.py      | 4 +++-
 docs/tutorials/wiki2/src/tests/tutorial/scripts/initializedb.py       | 4 +++-
 docs/tutorials/wiki2/src/views/tutorial/scripts/initializedb.py       | 4 +++-
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/docs/tutorials/wiki2/definingmodels.rst b/docs/tutorials/wiki2/definingmodels.rst
index 936abbeb6..e46e9fde0 100644
--- a/docs/tutorials/wiki2/definingmodels.rst
+++ b/docs/tutorials/wiki2/definingmodels.rst
@@ -73,7 +73,7 @@ following:
 .. literalinclude:: src/models/tutorial/scripts/initializedb.py
    :linenos:
    :language: python
-   :emphasize-lines: 14,34
+   :emphasize-lines: 14,36
 
 (Only the highlighted lines need to be changed.)
 
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/scripts/initializedb.py b/docs/tutorials/wiki2/src/authorization/tutorial/scripts/initializedb.py
index 03188e8ad..092e359ce 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/scripts/initializedb.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/scripts/initializedb.py
@@ -15,12 +15,14 @@ from ..models import (
     Base,
     )
 
+
 def usage(argv):
     cmd = os.path.basename(argv[0])
     print('usage: %s <config_uri>\n'
-          '(example: "%s development.ini")' % (cmd, cmd)) 
+          '(example: "%s development.ini")' % (cmd, cmd))
     sys.exit(1)
 
+
 def main(argv=sys.argv):
     if len(argv) != 2:
         usage(argv)
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/scripts/initializedb.py b/docs/tutorials/wiki2/src/basiclayout/tutorial/scripts/initializedb.py
index 0e828465f..66feb3008 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/scripts/initializedb.py
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/scripts/initializedb.py
@@ -15,12 +15,14 @@ from ..models import (
     Base,
     )
 
+
 def usage(argv):
     cmd = os.path.basename(argv[0])
     print('usage: %s <config_uri>\n'
-          '(example: "%s development.ini")' % (cmd, cmd)) 
+          '(example: "%s development.ini")' % (cmd, cmd))
     sys.exit(1)
 
+
 def main(argv=sys.argv):
     if len(argv) != 2:
         usage(argv)
diff --git a/docs/tutorials/wiki2/src/models/tutorial/scripts/initializedb.py b/docs/tutorials/wiki2/src/models/tutorial/scripts/initializedb.py
index 03188e8ad..092e359ce 100644
--- a/docs/tutorials/wiki2/src/models/tutorial/scripts/initializedb.py
+++ b/docs/tutorials/wiki2/src/models/tutorial/scripts/initializedb.py
@@ -15,12 +15,14 @@ from ..models import (
     Base,
     )
 
+
 def usage(argv):
     cmd = os.path.basename(argv[0])
     print('usage: %s <config_uri>\n'
-          '(example: "%s development.ini")' % (cmd, cmd)) 
+          '(example: "%s development.ini")' % (cmd, cmd))
     sys.exit(1)
 
+
 def main(argv=sys.argv):
     if len(argv) != 2:
         usage(argv)
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/scripts/initializedb.py b/docs/tutorials/wiki2/src/tests/tutorial/scripts/initializedb.py
index 03188e8ad..092e359ce 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/scripts/initializedb.py
+++ b/docs/tutorials/wiki2/src/tests/tutorial/scripts/initializedb.py
@@ -15,12 +15,14 @@ from ..models import (
     Base,
     )
 
+
 def usage(argv):
     cmd = os.path.basename(argv[0])
     print('usage: %s <config_uri>\n'
-          '(example: "%s development.ini")' % (cmd, cmd)) 
+          '(example: "%s development.ini")' % (cmd, cmd))
     sys.exit(1)
 
+
 def main(argv=sys.argv):
     if len(argv) != 2:
         usage(argv)
diff --git a/docs/tutorials/wiki2/src/views/tutorial/scripts/initializedb.py b/docs/tutorials/wiki2/src/views/tutorial/scripts/initializedb.py
index 03188e8ad..092e359ce 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/scripts/initializedb.py
+++ b/docs/tutorials/wiki2/src/views/tutorial/scripts/initializedb.py
@@ -15,12 +15,14 @@ from ..models import (
     Base,
     )
 
+
 def usage(argv):
     cmd = os.path.basename(argv[0])
     print('usage: %s <config_uri>\n'
-          '(example: "%s development.ini")' % (cmd, cmd)) 
+          '(example: "%s development.ini")' % (cmd, cmd))
     sys.exit(1)
 
+
 def main(argv=sys.argv):
     if len(argv) != 2:
         usage(argv)
-- 
cgit v1.2.3


From 95a0b80ed0eefae151d00043f85d94534a256b89 Mon Sep 17 00:00:00 2001
From: Patricio Paez <pp@pp.com.mx>
Date: Sun, 2 Dec 2012 18:10:33 -0600
Subject: Sync tests.py and views.py in SQL wiki tutorial

- No line references to update
---
 docs/tutorials/wiki2/src/authorization/tutorial/tests.py | 1 +
 docs/tutorials/wiki2/src/basiclayout/tutorial/tests.py   | 1 +
 docs/tutorials/wiki2/src/basiclayout/tutorial/views.py   | 5 +++--
 docs/tutorials/wiki2/src/models/tutorial/tests.py        | 1 +
 docs/tutorials/wiki2/src/models/tutorial/views.py        | 5 +++--
 docs/tutorials/wiki2/src/tests/tutorial/tests.py         | 8 ++++++++
 docs/tutorials/wiki2/src/views/tutorial/tests.py         | 1 +
 7 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/tests.py b/docs/tutorials/wiki2/src/authorization/tutorial/tests.py
index 31d2dc6d5..5dcee127b 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/tests.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/tests.py
@@ -1,5 +1,6 @@
 import unittest
 import transaction
+
 from pyramid import testing
 
 def _initTestingDB():
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/tests.py b/docs/tutorials/wiki2/src/basiclayout/tutorial/tests.py
index 653d061e4..57a775e0a 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/tests.py
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/tests.py
@@ -5,6 +5,7 @@ from pyramid import testing
 
 from .models import DBSession
 
+
 class TestMyView(unittest.TestCase):
     def setUp(self):
         self.config = testing.setUp()
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/views.py b/docs/tutorials/wiki2/src/basiclayout/tutorial/views.py
index daf21bb7b..4cfcae4af 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/views.py
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/views.py
@@ -8,13 +8,14 @@ from .models import (
     MyModel,
     )
 
+
 @view_config(route_name='home', renderer='templates/mytemplate.pt')
 def my_view(request):
     try:
-        one = DBSession.query(MyModel).filter(MyModel.name=='one').first()
+        one = DBSession.query(MyModel).filter(MyModel.name == 'one').first()
     except DBAPIError:
         return Response(conn_err_msg, content_type='text/plain', status_int=500)
-    return {'one':one, 'project':'tutorial'}
+    return {'one': one, 'project': 'tutorial'}
 
 conn_err_msg = """\
 Pyramid is having a problem using your SQL database.  The problem
diff --git a/docs/tutorials/wiki2/src/models/tutorial/tests.py b/docs/tutorials/wiki2/src/models/tutorial/tests.py
index 653d061e4..57a775e0a 100644
--- a/docs/tutorials/wiki2/src/models/tutorial/tests.py
+++ b/docs/tutorials/wiki2/src/models/tutorial/tests.py
@@ -5,6 +5,7 @@ from pyramid import testing
 
 from .models import DBSession
 
+
 class TestMyView(unittest.TestCase):
     def setUp(self):
         self.config = testing.setUp()
diff --git a/docs/tutorials/wiki2/src/models/tutorial/views.py b/docs/tutorials/wiki2/src/models/tutorial/views.py
index daf21bb7b..4cfcae4af 100644
--- a/docs/tutorials/wiki2/src/models/tutorial/views.py
+++ b/docs/tutorials/wiki2/src/models/tutorial/views.py
@@ -8,13 +8,14 @@ from .models import (
     MyModel,
     )
 
+
 @view_config(route_name='home', renderer='templates/mytemplate.pt')
 def my_view(request):
     try:
-        one = DBSession.query(MyModel).filter(MyModel.name=='one').first()
+        one = DBSession.query(MyModel).filter(MyModel.name == 'one').first()
     except DBAPIError:
         return Response(conn_err_msg, content_type='text/plain', status_int=500)
-    return {'one':one, 'project':'tutorial'}
+    return {'one': one, 'project': 'tutorial'}
 
 conn_err_msg = """\
 Pyramid is having a problem using your SQL database.  The problem
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/tests.py b/docs/tutorials/wiki2/src/tests/tutorial/tests.py
index 659862a09..3e96d0a82 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/tests.py
+++ b/docs/tutorials/wiki2/src/tests/tutorial/tests.py
@@ -1,7 +1,9 @@
 import unittest
 import transaction
+
 from pyramid import testing
 
+
 def _initTestingDB():
     from sqlalchemy import create_engine
     from tutorial.models import (
@@ -17,6 +19,7 @@ def _initTestingDB():
         DBSession.add(model)
     return DBSession
 
+
 def _registerRoutes(config):
     config.add_route('view_page', '{pagename}')
     config.add_route('edit_page', '{pagename}/edit_page')
@@ -43,6 +46,7 @@ class PageModelTests(unittest.TestCase):
         self.assertEqual(instance.name, 'SomeName')
         self.assertEqual(instance.data, 'some data')
 
+
 class ViewWikiTests(unittest.TestCase):
     def setUp(self):
         self.config = testing.setUp()
@@ -60,6 +64,7 @@ class ViewWikiTests(unittest.TestCase):
         response = self._callFUT(request)
         self.assertEqual(response.location, 'http://example.com/FrontPage')
 
+
 class ViewPageTests(unittest.TestCase):
     def setUp(self):
         self.session = _initTestingDB()
@@ -93,6 +98,7 @@ class ViewPageTests(unittest.TestCase):
         self.assertEqual(info['edit_url'],
             'http://example.com/IDoExist/edit_page')
 
+
 class AddPageTests(unittest.TestCase):
     def setUp(self):
         self.session = _initTestingDB()
@@ -125,6 +131,7 @@ class AddPageTests(unittest.TestCase):
         page = self.session.query(Page).filter_by(name='AnotherPage').one()
         self.assertEqual(page.data, 'Hello yo!')
 
+
 class EditPageTests(unittest.TestCase):
     def setUp(self):
         self.session = _initTestingDB()
@@ -162,6 +169,7 @@ class EditPageTests(unittest.TestCase):
         self.assertEqual(response.location, 'http://example.com/abc')
         self.assertEqual(page.data, 'Hello yo!')
 
+
 class FunctionalTests(unittest.TestCase):
 
     viewer_login = '/login?login=viewer&password=viewer' \
diff --git a/docs/tutorials/wiki2/src/views/tutorial/tests.py b/docs/tutorials/wiki2/src/views/tutorial/tests.py
index 31d2dc6d5..5dcee127b 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/tests.py
+++ b/docs/tutorials/wiki2/src/views/tutorial/tests.py
@@ -1,5 +1,6 @@
 import unittest
 import transaction
+
 from pyramid import testing
 
 def _initTestingDB():
-- 
cgit v1.2.3


From ed14191bb41a891be258fc66e671bea8a25f7db1 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Thu, 6 Dec 2012 15:13:49 -0600
Subject: _depth argument to view_config is now relative to view_config

This hides an implementation detail that view_config is at least 1 level away
from user code.
---
 CHANGES.txt                | 12 ++++++++++++
 pyramid/tests/test_view.py |  2 +-
 pyramid/view.py            | 18 ++++++++++--------
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 841d2ebec..1f2b1fc30 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,15 @@
+next release
+============
+
+Backwards Incompatibilities
+---------------------------
+
+- Modified the ``_depth`` argument to ``pyramid.view.view_config`` to accept
+  a value relative to the invocation of ``view_config`` itself. Thus, when it
+  was previously expecting a value of ``1`` or greater, to reflect that
+  the caller of ``view_config`` is 1 stack frame away from ``venusian.attach``,
+  this implementation detail is now hidden.
+
 1.4b1 (2012-11-21)
 ==================
 
diff --git a/pyramid/tests/test_view.py b/pyramid/tests/test_view.py
index a78b0cbab..a0d476662 100644
--- a/pyramid/tests/test_view.py
+++ b/pyramid/tests/test_view.py
@@ -541,7 +541,7 @@ class TestViewConfigDecorator(unittest.TestCase):
         self.assertEqual(config.pkg, pyramid.tests)
 
     def test_call_withdepth(self):
-        decorator = self._makeOne(_depth=2)
+        decorator = self._makeOne(_depth=1)
         venusian = DummyVenusian()
         decorator.venusian = venusian
         def foo(): pass
diff --git a/pyramid/view.py b/pyramid/view.py
index 1a66c9e9c..e1e03bd93 100644
--- a/pyramid/view.py
+++ b/pyramid/view.py
@@ -178,14 +178,16 @@ class view_config(object):
     out, its default will be the equivalent ``add_view`` default.
 
     An additional keyword argument named ``_depth`` is provided for people who
-    wish to reuse this class from another decorator.  It will be passed in to
-    the :term:`venusian` ``attach`` function as the depth of the callstack when
-    Venusian checks if the decorator is being used in a class or module
-    context.  It's not often used, but it can be useful in this circumstance.
-    See the ``attach`` function in Venusian for more information.
+    wish to reuse this class from another decorator.  The default value is
+    ``0`` and should be specified relative to the ``view_config`` invocation.
+    It will be passed in to the :term:`venusian` ``attach`` function as the
+    depth of the callstack when Venusian checks if the decorator is being used
+    in a class or module context.  It's not often used, but it can be useful
+    in this circumstance.  See the ``attach`` function in Venusian for more
+    information.
 
     See :ref:`mapping_views_using_a_decorator_section` for details about
-    using :class:`view_config`.
+    using :class:`pyramid.view.view_config`.
 
     """
     venusian = venusian # for testing injection
@@ -197,14 +199,14 @@ class view_config(object):
 
     def __call__(self, wrapped):
         settings = self.__dict__.copy()
-        depth = settings.pop('_depth', 1)
+        depth = settings.pop('_depth', 0)
 
         def callback(context, name, ob):
             config = context.config.with_package(info.module)
             config.add_view(view=ob, **settings)
 
         info = self.venusian.attach(wrapped, callback, category='pyramid',
-                                    depth=depth)
+                                    depth=depth + 1)
 
         if info.scope == 'class':
             # if the decorator was attached to a method in a class, or
-- 
cgit v1.2.3


From 3467d67092d34d870cee3129e8d6737cfe53c0a5 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Thu, 6 Dec 2012 22:56:48 -0500
Subject: note custom_predicates deprecation

---
 pyramid/config/views.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pyramid/config/views.py b/pyramid/config/views.py
index 2a93ffbec..e4217f2f3 100644
--- a/pyramid/config/views.py
+++ b/pyramid/config/views.py
@@ -1024,14 +1024,16 @@ class ViewsConfiguratorMixin(object):
 
         custom_predicates
 
-          This value should be a sequence of references to custom
-          predicate callables.  Use custom predicates when no set of
-          predefined predicates do what you need.  Custom predicates
-          can be combined with predefined predicates as necessary.
-          Each custom predicate callable should accept two arguments:
-          ``context`` and ``request`` and should return either
-          ``True`` or ``False`` after doing arbitrary evaluation of
-          the context and/or the request.  
+          This value should be a sequence of references to custom predicate
+          callables.  Use custom predicates when no set of predefined
+          predicates do what you need.  Custom predicates can be combined with
+          predefined predicates as necessary.  Each custom predicate callable
+          should accept two arguments: ``context`` and ``request`` and should
+          return either ``True`` or ``False`` after doing arbitrary evaluation
+          of the context and/or the request.  The ``predicates`` argument to
+          this method and the ability to register third-party view predicates
+          via :meth:`pyramid.config.Configurator.add_view_predicate` obsoletes
+          this argument, but it is kept around for backwards compatibility.
 
         predicates
 
-- 
cgit v1.2.3


From 0920ac24a70df517afcf823b73ea58a1985fd44e Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Thu, 6 Dec 2012 23:12:32 -0500
Subject: make _backframes work like _depth (but still leave undocumented)

---
 pyramid/util.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pyramid/util.py b/pyramid/util.py
index ca7f5951c..a8f750a46 100644
--- a/pyramid/util.py
+++ b/pyramid/util.py
@@ -471,8 +471,9 @@ def viewdefaults(wrapped):
         view = self.maybe_dotted(view)
         if inspect.isclass(view):
             defaults = getattr(view, '__view_defaults__', {}).copy()
+        if not '_backframes' in kw:
+            kw['_backframes'] = 1 # for action_method
         defaults.update(kw)
-        defaults['_backframes'] = 3 # for action_method
         return wrapped(self, *arg, **defaults)
     return functools.wraps(wrapped)(wrapper)
 
@@ -498,7 +499,7 @@ def action_method(wrapped):
             self._ainfo = []
         info = kw.pop('_info', None)
         # backframes for outer decorators to actionmethods
-        backframes = kw.pop('_backframes', 2)
+        backframes = kw.pop('_backframes', 0) + 2
         if is_nonstr_iter(info) and len(info) == 4:
             # _info permitted as extract_stack tuple
             info = ActionInfo(*info)
-- 
cgit v1.2.3


From a078e197d04400d2430206fe31e3398c761b20a3 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Thu, 6 Dec 2012 23:14:14 -0500
Subject: add changenote

---
 CHANGES.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1f2b1fc30..9d3a017ab 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,10 @@ Backwards Incompatibilities
   the caller of ``view_config`` is 1 stack frame away from ``venusian.attach``,
   this implementation detail is now hidden.
 
+- Modified the ``_backframes`` argument to ``pyramid.util.action_method`` in a
+  similar way to the changes described to ``_depth`` above.  This argument
+  remains undocumented, but might be used in the wild by some insane person.
+
 1.4b1 (2012-11-21)
 ==================
 
-- 
cgit v1.2.3


From a7e0e601df4e093ebd2fdd7b53bd0bbb9e8d7ce5 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Mon, 10 Dec 2012 15:46:57 -0500
Subject: prep for 1.4b2

---
 CHANGES.txt  | 11 +++++++++--
 docs/conf.py |  2 +-
 setup.py     |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9d3a017ab..e7c6e2b24 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,12 @@
-next release
-============
+1.4b2 (2012-12-10)
+==================
+
+Docs
+----
+
+- Scaffolding is now PEP-8 compliant (at least for a brief shining moment).
+
+- Tutorial improvements.
 
 Backwards Incompatibilities
 ---------------------------
diff --git a/docs/conf.py b/docs/conf.py
index 3dc09d95d..63f3a2790 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -81,7 +81,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.4b1'
+version = '1.4b2'
 
 # The full version, including alpha/beta/rc tags.
 release = version
diff --git a/setup.py b/setup.py
index 55da3378d..2183fcbb1 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ testing_extras = tests_require + [
     ]
 
 setup(name='pyramid',
-      version='1.4b1',
+      version='1.4b2',
       description=('The Pyramid web application development framework, a '
                    'Pylons project'),
       long_description=README + '\n\n' +  CHANGES,
-- 
cgit v1.2.3


From e609e19d028b1d714439188812ca3c9811e0a508 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Mon, 10 Dec 2012 21:42:18 -0500
Subject: prep for 1.4b3

---
 CHANGES.txt  | 6 ++++++
 docs/conf.py | 2 +-
 setup.py     | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index e7c6e2b24..1191347e6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,9 @@
+1.4b3 (2012-12-10)
+==================
+
+- Packaging release only, no code changes.  1.4b2 was a brownbag release due to
+  missing directories in the tarball.
+
 1.4b2 (2012-12-10)
 ==================
 
diff --git a/docs/conf.py b/docs/conf.py
index 63f3a2790..0034f4286 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -81,7 +81,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.4b2'
+version = '1.4b3'
 
 # The full version, including alpha/beta/rc tags.
 release = version
diff --git a/setup.py b/setup.py
index 2183fcbb1..9deded88a 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ testing_extras = tests_require + [
     ]
 
 setup(name='pyramid',
-      version='1.4b2',
+      version='1.4b3',
       description=('The Pyramid web application development framework, a '
                    'Pylons project'),
       long_description=README + '\n\n' +  CHANGES,
-- 
cgit v1.2.3


From 6d0328aa397b24189230c6938adcdde307dfba76 Mon Sep 17 00:00:00 2001
From: Patricio Paez <pp@pp.com.mx>
Date: Thu, 13 Dec 2012 06:59:34 -0600
Subject: Make ZODB tutorial functional tests pass

- Synchronize with the changes in
  pyramid_zodbdbconn in commit
  64b0c468d4ae320d720d03d0cbc8e9a0b0e42f1f
---
 docs/tutorials/wiki/src/tests/tutorial/tests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorials/wiki/src/tests/tutorial/tests.py b/docs/tutorials/wiki/src/tests/tutorial/tests.py
index ff7ca4f33..c435a4519 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/tests.py
+++ b/docs/tutorials/wiki/src/tests/tutorial/tests.py
@@ -143,7 +143,7 @@ class FunctionalTests(unittest.TestCase):
                      'pyramid.includes': ['pyramid_zodbconn', 'pyramid_tm'] }
 
         app = main({}, **settings)
-        self.db = app.registry.zodb_database
+        self.db = app.registry._zodb_databases['']
         from webtest import TestApp
         self.testapp = TestApp(app)
 
-- 
cgit v1.2.3


From 2a98712048133353392b9e725a24499acd48d605 Mon Sep 17 00:00:00 2001
From: Patricio Paez <pp@pp.com.mx>
Date: Thu, 13 Dec 2012 07:08:23 -0600
Subject: Improvements to the ZODB tutorial Tests chapter

- Standardize with the SQL tutorial
---
 docs/tutorials/wiki/tests.rst | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/tutorials/wiki/tests.rst b/docs/tutorials/wiki/tests.rst
index 46d009d0f..7a019dd04 100644
--- a/docs/tutorials/wiki/tests.rst
+++ b/docs/tutorials/wiki/tests.rst
@@ -17,8 +17,8 @@ We write tests for the model classes and the appmaker.  Changing
 ``tests.py``, we'll write a separate test class for each model class, and
 we'll write a test class for the ``appmaker``.
 
-To do so, we'll retain the ``tutorial.tests.ViewTests`` class provided as a
-result of the ``zodb`` project generator.  We'll add three test
+To do so, we'll retain the ``tutorial.tests.ViewTests`` class that was
+generated as part of the ``zodb`` scaffold.  We'll add three test
 classes: one for the ``Page`` model named ``PageModelTests``, one for the
 ``Wiki`` model named ``WikiModelTests``, and one for the appmaker named
 ``AppmakerTests``.
@@ -51,8 +51,8 @@ below:
    :linenos:
    :language: python
 
-Run the Tests
-=============
+Running the Tests
+=================
 
 We can run these tests by using ``setup.py test`` in the same way we did in
 :ref:`running_tests`.  However, first we must edit our ``setup.py`` to
@@ -63,6 +63,7 @@ Change the ``requires`` list in ``setup.py`` to include ``WebTest``.
    :linenos:
    :language: python
    :lines: 9-19
+   :emphasize-lines: 10
 
 After we've added a dependency on WebTest in ``setup.py``, we need to rerun
 ``setup.py develop`` to get WebTest installed into our virtualenv.  Assuming
-- 
cgit v1.2.3


From 758fa23e2cce36d72d6f0f14370c628aaeeb64d0 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 18 Dec 2012 02:39:34 -0500
Subject: garden

---
 CHANGES.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1191347e6..364dacf73 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,11 @@
+Next release
+============
+
+Docs
+----
+
+- Fix functional tests in the ZODB tutorial
+
 1.4b3 (2012-12-10)
 ==================
 
-- 
cgit v1.2.3


From 96ab9f26990423f67045e5639a29579a1a76a71e Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 18 Dec 2012 03:00:29 -0500
Subject: prep for 1.4

---
 CHANGES.txt  | 4 ++--
 docs/conf.py | 2 +-
 setup.py     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 364dacf73..cfa49fb1a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.4 (2012-12-18)
+================
 
 Docs
 ----
diff --git a/docs/conf.py b/docs/conf.py
index 0034f4286..abb8bdd2e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -81,7 +81,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.4b3'
+version = '1.4'
 
 # The full version, including alpha/beta/rc tags.
 release = version
diff --git a/setup.py b/setup.py
index 9deded88a..66c6aa5fa 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ testing_extras = tests_require + [
     ]
 
 setup(name='pyramid',
-      version='1.4b3',
+      version='1.4',
       description=('The Pyramid web application development framework, a '
                    'Pylons project'),
       long_description=README + '\n\n' +  CHANGES,
-- 
cgit v1.2.3


From 76aa5150d5ba25386817d06e0777c8891c7ef3a1 Mon Sep 17 00:00:00 2001
From: Reinout van Rees <reinout@vanrees.org>
Date: Sat, 22 Dec 2012 21:19:49 +0100
Subject: Typo pakage => package

---
 docs/narr/urldispatch.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index ecf3d026a..480b0e0cc 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -86,7 +86,7 @@ setup code.  However, the above :term:`scan` execution
 ``config.scan('mypackage')`` will pick up all :term:`configuration
 decoration`, including any objects decorated with the
 :class:`pyramid.view.view_config` decorator in the ``mypackage`` Python
-pakage.  For example, if you have a ``views.py`` in your package, a scan will
+package.  For example, if you have a ``views.py`` in your package, a scan will
 pick up any of its configuration decorators, so we can add one there that
 that references ``myroute`` as a ``route_name`` parameter:
 
-- 
cgit v1.2.3


From 10bf7ee0e6eba03e693a15c68048c7568dbba3ec Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Sat, 29 Dec 2012 07:43:35 +0200
Subject: typo

---
 docs/narr/firstapp.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/narr/firstapp.rst b/docs/narr/firstapp.rst
index ccaa6e9e2..0b85d68d3 100644
--- a/docs/narr/firstapp.rst
+++ b/docs/narr/firstapp.rst
@@ -228,7 +228,7 @@ listens only on the ``127.0.0.1`` interface, which is problematic if you're
 running the server on a remote system and you wish to access it with a web
 browser from a local system.  We also specify a TCP port number to listen on,
 which is 8080, passing it as the second argument.  The final argument is the
-``app`` object (a :term:`router`), which is the the application we wish to
+``app`` object (a :term:`router`), which is the application we wish to
 serve.  Finally, we call the server's ``serve_forever`` method, which starts
 the main loop in which it will wait for requests from the outside world.
 
-- 
cgit v1.2.3


From e91085ec75ddbeb793bec305eb693dad03c34518 Mon Sep 17 00:00:00 2001
From: Steve Johnson <steve@steveasleep.com>
Date: Mon, 31 Dec 2012 10:28:16 -0800
Subject: Mention ZopeTxnExt and pyramid_tm in tutorial

If this page is found via web search while trying to configure
SQLAlchemy from scratch without a scaffold, it is helpful to
mention pyramid_tm as a requirement somewhere. Otherwise, a
hapless user such as your humble author might spend lots of
time wondering why his sessions aren't getting committed after
his requests despite his best efforts to properly configure
SQLAlchemy and ZopeTransactionExtension.
---
 docs/tutorials/wiki2/installation.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index 4ab02a13a..05b6a2a42 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -303,6 +303,9 @@ the following assumptions:
 
 - you are willing to use :term:`url dispatch` to map URLs to code.
 
+- you want to use ``ZopeTransactionExtension`` and ``pyramid_tm`` to scope
+  sessions to requests
+
 .. note::
 
    :app:`Pyramid` supports any persistent storage mechanism (e.g. object
-- 
cgit v1.2.3


From f71723d2499ac2db1a82b8f74198b72b9012ab52 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Tue, 1 Jan 2013 00:48:38 +0200
Subject: typo

---
 docs/narr/viewconfig.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index 6373a8d26..799de768f 100644
--- a/docs/narr/viewconfig.rst
+++ b/docs/narr/viewconfig.rst
@@ -986,7 +986,7 @@ there's a ``should_cache`` GET or POST variable:
 Note that the ``http_cache`` machinery will overwrite or add to caching
 headers you set within the view itself unless you use ``prevent_auto``.
 
-You can also turn of the effect of ``http_cache`` entirely for the duration
+You can also turn off the effect of ``http_cache`` entirely for the duration
 of a Pyramid application lifetime.  To do so, set the
 ``PYRAMID_PREVENT_HTTP_CACHE`` environment variable or the
 ``pyramid.prevent_http_cache`` configuration value setting to a true value.
-- 
cgit v1.2.3


From 57a98dc3801415a25e4a7be841b7fba358214c2d Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Tue, 1 Jan 2013 16:39:20 +0200
Subject: "usernames" is a more correct term

---
 docs/tutorials/wiki/design.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/tutorials/wiki/design.rst b/docs/tutorials/wiki/design.rst
index c94612fb1..b44ccb10e 100644
--- a/docs/tutorials/wiki/design.rst
+++ b/docs/tutorials/wiki/design.rst
@@ -53,10 +53,10 @@ Security
 We'll eventually be adding security to our application.  The components we'll
 use to do this are below.
 
-- USERS, a dictionary mapping users names to their
+- USERS, a dictionary mapping usernames to their
   corresponding passwords.
 
-- GROUPS, a dictionary mapping user names to a 
+- GROUPS, a dictionary mapping usernames to a
   list of groups they belong to.
 
 - ``groupfinder``, an *authorization callback* that looks up
-- 
cgit v1.2.3


From d30b6cb1e4070c7d5af0ebc702b390080d10e306 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Tue, 1 Jan 2013 17:57:53 +0200
Subject: give virtualenv directory a more generic name, "venv"

pros:

* Installation instructions uses the same name
* The old name assumes user would be using Python 2.6
---
 docs/make_book | 2 +-
 docs/make_epub | 2 +-
 docs/make_pdf  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/make_book b/docs/make_book
index 22883ac4a..94e249441 100755
--- a/docs/make_book
+++ b/docs/make_book
@@ -1,4 +1,4 @@
 #!/bin/sh
-make clean latex SPHINXBUILD=../env26/bin/sphinx-build BOOK=1
+make clean latex SPHINXBUILD=../env/bin/sphinx-build BOOK=1
 cd _build/latex && make all-pdf
 
diff --git a/docs/make_epub b/docs/make_epub
index 868749e3b..cf9263451 100755
--- a/docs/make_epub
+++ b/docs/make_epub
@@ -1,2 +1,2 @@
 #!/bin/sh
-make clean epub SPHINXBUILD=../env26/bin/sphinx-build
+make clean epub SPHINXBUILD=../env/bin/sphinx-build
diff --git a/docs/make_pdf b/docs/make_pdf
index 558feb857..6c9863bc9 100755
--- a/docs/make_pdf
+++ b/docs/make_pdf
@@ -1,4 +1,4 @@
 #!/bin/sh
-make clean latex SPHINXBUILD=../env26/bin/sphinx-build
+make clean latex SPHINXBUILD=../env/bin/sphinx-build
 cd _build/latex && make all-pdf
 
-- 
cgit v1.2.3


From e0062294430dd1d30d31b9f8c0a2e6e9060bcb76 Mon Sep 17 00:00:00 2001
From: Paul Everitt <paul@agendaless.com>
Date: Tue, 1 Jan 2013 11:49:52 -0500
Subject: Small fix for RST misfire.

---
 docs/api/registry.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/api/registry.rst b/docs/api/registry.rst
index 1d5d52248..4c1af2678 100644
--- a/docs/api/registry.rst
+++ b/docs/api/registry.rst
@@ -14,12 +14,12 @@
      accessed as ``request.registry.settings`` or
      ``config.registry.settings`` in a typical Pyramid application.
 
-    .. attribute:: introspector
+   .. attribute:: introspector
 
      When a registry is set up (or created) by a :term:`Configurator`, the
      registry will be decorated with an instance named ``introspector``
      implementing the :class:`pyramid.interfaces.IIntrospector` interface.
-     See also :attr:`pyramid.config.Configurator.introspector``.
+     See also :attr:`pyramid.config.Configurator.introspector`.
 
      When a registry is created "by hand", however, this attribute will not
      exist until set up by a configurator.
-- 
cgit v1.2.3


From b27d66f81274625446c301c2675638b36b5e16b3 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Tue, 1 Jan 2013 20:12:47 +0200
Subject: fix #746: explain why a dev package is installed

---
 docs/narr/install.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index 882e76f11..c9cdb745a 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -52,6 +52,10 @@ command:
 
    $ sudo apt-get install python2.7-dev
 
+This command will install both the Python interpreter and its header files.
+Note that these headers are required by some dependencies you will use
+in this docomentation, not by Pyramid itself.
+
 Once these steps are performed, the Python interpreter will usually be
 invokable via ``python2.7`` from a shell prompt.
 
-- 
cgit v1.2.3


From 78bacaa69f63fe2bc6980d7d40fc0523d5af9199 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Tue, 1 Jan 2013 21:52:33 +0200
Subject: typos

---
 docs/narr/install.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index 882e76f11..09c37c7f2 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -167,10 +167,10 @@ installed:
    Python 2.7.3 (default, Aug  1 2012, 05:14:39) 
    [GCC 4.6.3] on linux2
    Type "help", "copyright", "credits" or "license" for more information.
-   >>> import setutptools
+   >>> import setuptools
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
-   ImportError: No module named setutptools
+   ImportError: No module named setuptools
    >>>
 
 If ``import setuptools`` raises an :exc:`ImportError` as it does above, you
-- 
cgit v1.2.3


From 78bba61a7a53949529c1b7444fd6611e116b725d Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Tue, 1 Jan 2013 23:34:09 +0200
Subject: improve wording regarding pyvenv

---
 docs/narr/install.rst | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index 882e76f11..8a8513348 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -245,18 +245,19 @@ your setuptools-enabled Python interpreter, use the ``easy_install`` command.
 
 .. warning::
 
-   Even though Python 3.3 and better comes with ``pyvenv`` out of the box,
-   which is similar to ``virtualenv``, we suggest using ``virtualenv`` instead.
-   ``virtualenv`` works on well Python 3.3.  This isn't a recommendation made
-   for technical reasons, it's one made because it's not feasible for the
+   Python 3.3 includes ``pyvenv`` out of the box, which provides similar
+   functionality to ``virtualenv``.
+   We however suggest using ``virtualenv`` instead,
+   which works well with Python 3.3.
+   This isn't a recommendation made for technical reasons;
+   it's made because it's not feasible for the
    authors of this guide to explain setup using multiple virtual environment
    systems.  We are aiming to not need to make the installation documentation
    Turing-complete.
 
-   ``pyvenv`` will work fine.  However, if you use ``pyvenv`` instead of
-   ``virtualenv``, you'll need to understand how to install software such as
-   ``distribute`` into the virtual environment manually, which this guide does
-   not cover.
+   If you insist on using ``pyvenv``, you'll need to understand how to install
+   software such as``distribute`` into the virtual environment manually,
+   which this guide does not cover.
 
 .. code-block:: text
 
-- 
cgit v1.2.3


From 08c2217e7f831379016e1ddee0b5d51eeca53878 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Tue, 1 Jan 2013 23:56:02 +0200
Subject: eliminate repeated "the" words

---
 BFG_HISTORY.txt                     | 6 +++---
 CHANGES.txt                         | 2 +-
 docs/api/request.rst                | 2 +-
 docs/designdefense.rst              | 2 +-
 docs/narr/assets.rst                | 2 +-
 docs/narr/commandline.rst           | 2 +-
 docs/narr/hybrid.rst                | 2 +-
 docs/narr/renderers.rst             | 2 +-
 docs/tutorials/wiki/basiclayout.rst | 2 +-
 pyramid/httpexceptions.py           | 4 ++--
 pyramid/path.py                     | 2 +-
 11 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/BFG_HISTORY.txt b/BFG_HISTORY.txt
index 9096d6464..6de3f3776 100644
--- a/BFG_HISTORY.txt
+++ b/BFG_HISTORY.txt
@@ -1381,7 +1381,7 @@ Internal
   lookup, because the registration will always be made with a specific
   request interface, but registration may not be made with a specific
   context interface.  In general, when creating multiadapters, you
-  want to order the requires interfaces so that the the elements which
+  want to order the requires interfaces so that the elements which
   are more likely to be registered using specific interfaces are
   ordered before those which are less likely.
 
@@ -1860,7 +1860,7 @@ Backwards Incompatibilities
 Bug Fixes
 ---------
 
-- The the long description of this package (as shown on PyPI) was not
+- The long description of this package (as shown on PyPI) was not
   valid reStructuredText, and so was not renderable.
 
 - Trying to use an HTTP method name string such as ``GET`` as a
@@ -2920,7 +2920,7 @@ Deprecations
 - The import of ``repoze.bfg.security.Unauthorized`` is deprecated in
   favor of ``repoze.bfg.exceptions.Forbidden``.  The old location
   still functions but emits a deprecation warning.  The rename from
-  ``Unauthorized`` to ``Forbidden`` brings parity to the the name of
+  ``Unauthorized`` to ``Forbidden`` brings parity to the name of
   the exception and the system view it invokes when raised.
 
 Backwards Incompatibilities
diff --git a/CHANGES.txt b/CHANGES.txt
index cfa49fb1a..1f6ae742c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -536,7 +536,7 @@ Features
 - An ``add_permission`` directive method was added to the Configurator.  This
   directive registers a free-standing permission introspectable into the
   Pyramid introspection system.  Frameworks built atop Pyramid can thus use
-  the the ``permissions`` introspectable category data to build a
+  the ``permissions`` introspectable category data to build a
   comprehensive list of permissions supported by a running system.  Before
   this method was added, permissions were already registered in this
   introspectable category as a side effect of naming them in an ``add_view``
diff --git a/docs/api/request.rst b/docs/api/request.rst
index 3a1439874..e4034c635 100644
--- a/docs/api/request.rst
+++ b/docs/api/request.rst
@@ -251,7 +251,7 @@
       Assigning to one is still supported but will cause a deprecation
       warning to be emitted, and eventually the feature will be removed.  For
       new code, instead of assigning ``response_*`` attributes to the
-      request, use API of the the :attr:`pyramid.request.Request.response`
+      request, use API of the :attr:`pyramid.request.Request.response`
       object (exposed to view code as ``request.response``) to influence
       rendered response behavior.
 
diff --git a/docs/designdefense.rst b/docs/designdefense.rst
index b468ddac6..96e1001e6 100644
--- a/docs/designdefense.rst
+++ b/docs/designdefense.rst
@@ -873,7 +873,7 @@ means:
 
 #) When I use the security proxy machinery, I can have a view that
    conditionally displays certain HTML elements (like form fields) or
-   prevents certain attributes from being modified depending on the the
+   prevents certain attributes from being modified depending on the
    permissions that the accessing user possesses with respect to a context
    object.
 
diff --git a/docs/narr/assets.rst b/docs/narr/assets.rst
index e8e915297..7b620548d 100644
--- a/docs/narr/assets.rst
+++ b/docs/narr/assets.rst
@@ -252,7 +252,7 @@ static assets that live *outside* the :app:`Pyramid` application.  This will
 happen when the :meth:`~pyramid.config.Configurator.add_static_view` API
 associated with the path fed to :meth:`~pyramid.request.Request.static_url`
 is a *URL* instead of a view name.  For example, the ``name`` argument may be
-``http://example.com`` while the the ``path`` given may be
+``http://example.com`` while the ``path`` given may be
 ``mypackage:images``:
 
 .. code-block:: python
diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst
index 3bdf8c5cd..8d6b9d984 100644
--- a/docs/narr/commandline.rst
+++ b/docs/narr/commandline.rst
@@ -758,7 +758,7 @@ we'll pretend you have a distribution with a package in it named
 
 This script uses the Python ``optparse`` module to allow us to make sense out
 of extra arguments passed to the script.  It uses the
-:func:`pyramid.paster.bootstrap` function to get information about the the
+:func:`pyramid.paster.bootstrap` function to get information about the
 application defined by a config file, and prints the deployment settings
 defined in that config file.
 
diff --git a/docs/narr/hybrid.rst b/docs/narr/hybrid.rst
index ab1bf20bb..1773a6b8c 100644
--- a/docs/narr/hybrid.rst
+++ b/docs/narr/hybrid.rst
@@ -477,7 +477,7 @@ Registering a Default View for a Route That Has a ``view`` Attribute
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. warning:: As of :app:`Pyramid` 1.1 this section is slated to be removed in
-   a later documentation release because the the ability to add views
+   a later documentation release because the ability to add views
    directly to the :term:`route configuration` by passing a ``view`` argument
    to ``add_route`` has been deprecated.
 
diff --git a/docs/narr/renderers.rst b/docs/narr/renderers.rst
index 1158d2225..9017156a6 100644
--- a/docs/narr/renderers.rst
+++ b/docs/narr/renderers.rst
@@ -366,7 +366,7 @@ For example (Javascript):
                  '&callback=?';
    jqhxr = $.getJSON(api_url);
 
-The string ``callback=?`` above in the the ``url`` param to the JQuery
+The string ``callback=?`` above in the ``url`` param to the JQuery
 ``getAjax`` function indicates to jQuery that the query should be made as
 a JSONP request; the ``callback`` parameter will be automatically filled
 in for you and used.
diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst
index 12cf86a91..a7d8f1439 100644
--- a/docs/tutorials/wiki/basiclayout.rst
+++ b/docs/tutorials/wiki/basiclayout.rst
@@ -44,7 +44,7 @@ point happens to be the ``main`` function within the file named
    and image files, for us, in this case, at
    ``http://localhost:6543/static/`` and below.  The first argument is the
    "name" ``static``, which indicates that the URL path prefix of the view
-   will be ``/static``.  the The second argument of this tag is the "path",
+   will be ``/static``.  The second argument of this tag is the "path",
    which is a relative :term:`asset specification`, so it finds the resources
    it should serve within the ``static`` directory inside the ``tutorial``
    package.  The scaffold could have alternately used an *absolute* asset
diff --git a/pyramid/httpexceptions.py b/pyramid/httpexceptions.py
index c82d6900c..64afc346a 100644
--- a/pyramid/httpexceptions.py
+++ b/pyramid/httpexceptions.py
@@ -378,7 +378,7 @@ class HTTPResetContent(HTTPOk):
     """
     subclass of :class:`~HTTPOk`
 
-    This indicates that the the server has fulfilled the request and
+    This indicates that the server has fulfilled the request and
     the user agent SHOULD reset the document view which caused the
     request to be sent.
     
@@ -754,7 +754,7 @@ class HTTPLengthRequired(HTTPClientError):
     """
     subclass of :class:`~HTTPClientError`
 
-    This indicates that the the server refuses to accept the request
+    This indicates that the server refuses to accept the request
     without a defined Content-Length.
     
     code: 411, title: Length Required
diff --git a/pyramid/path.py b/pyramid/path.py
index d1c3b6d31..e9c63a365 100644
--- a/pyramid/path.py
+++ b/pyramid/path.py
@@ -175,7 +175,7 @@ class AssetResolver(Resolver):
 
         If ``spec`` is a *relative* asset specification (an asset
         specification without a ``:`` in it, e.g. ``templates/foo.pt``), the
-        ``package`` argument of the constructor is used as the the package
+        ``package`` argument of the constructor is used as the package
         portion of the asset spec.  For example:
 
         .. code-block:: python
-- 
cgit v1.2.3


From 043ccddb909327106264d10ed5d413760a51770d Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Wed, 2 Jan 2013 02:22:52 +0200
Subject: eliminate other repeated words

---
 BFG_HISTORY.txt                        | 4 ++--
 CHANGES.txt                            | 2 +-
 docs/api/registry.rst                  | 2 +-
 docs/glossary.rst                      | 6 +++---
 docs/narr/extconfig.rst                | 2 +-
 docs/narr/hooks.rst                    | 2 +-
 docs/narr/i18n.rst                     | 2 +-
 docs/narr/introspector.rst             | 2 +-
 docs/narr/renderers.rst                | 2 +-
 docs/narr/subrequest.rst               | 2 +-
 docs/narr/templates.rst                | 2 +-
 docs/narr/urldispatch.rst              | 4 ++--
 docs/narr/views.rst                    | 2 +-
 docs/tutorials/wiki/basiclayout.rst    | 2 +-
 docs/tutorials/wiki/definingmodels.rst | 2 +-
 docs/tutorials/wiki/definingviews.rst  | 2 +-
 docs/tutorials/wiki2/definingviews.rst | 4 ++--
 pyramid/config/__init__.py             | 2 +-
 pyramid/config/routes.py               | 2 +-
 pyramid/interfaces.py                  | 4 ++--
 pyramid/scripts/pserve.py              | 2 +-
 pyramid/traversal.py                   | 2 +-
 pyramid/url.py                         | 2 +-
 pyramid/util.py                        | 2 +-
 24 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/BFG_HISTORY.txt b/BFG_HISTORY.txt
index 6de3f3776..10d926c70 100644
--- a/BFG_HISTORY.txt
+++ b/BFG_HISTORY.txt
@@ -387,7 +387,7 @@ Features
 Bug Fixes
 ---------
 
-- The route pattern registered internally for a a local "static view"
+- The route pattern registered internally for a local "static view"
   (either via the ``static`` ZCML directive or via the
   ``add_static_view`` method of the configurator) was incorrect.  It
   was regsistered for e.g. ``static*traverse``, while it should have
@@ -688,7 +688,7 @@ Features
   A similar combining of routing and traversal is available when a
   route is matched which contains a ``*traverse`` remainder marker in
   its path.  The ``traverse`` argument allows you to associate route
-  patterns with an arbitrary traversal path without using a a
+  patterns with an arbitrary traversal path without using a
   ``*traverse`` remainder marker; instead you can use other match
   information.
 
diff --git a/CHANGES.txt b/CHANGES.txt
index 1f6ae742c..adf448945 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -332,7 +332,7 @@ Bug Fixes
 
 - When registering a view configuration that named a Chameleon ZPT renderer
   with a macro name in it (e.g. ``renderer='some/template#somemacro.pt``) as
-  well as a view configuration without a macro name it it that pointed to the
+  well as a view configuration without a macro name in it that pointed to the
   same template (e.g. ``renderer='some/template.pt'``), internal caching could
   confuse the two, and your code might have rendered one instead of the
   other.
diff --git a/docs/api/registry.rst b/docs/api/registry.rst
index 4c1af2678..a7879d3d5 100644
--- a/docs/api/registry.rst
+++ b/docs/api/registry.rst
@@ -33,7 +33,7 @@
 
    The default implementation of the interface
    :class:`pyramid.interfaces.IIntrospectable` used by framework exenders.
-   An instance of this class is is created when
+   An instance of this class is created when
    :attr:`pyramid.config.Configurator.introspectable` is called.
 
    This class is new as of :app:`Pyramid` 1.3.
diff --git a/docs/glossary.rst b/docs/glossary.rst
index adcf36f7c..6620552f1 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -486,8 +486,8 @@ Glossary
      is in use.
 
    physical root
-     The object returned by the application :term:`root factory`.  Unlike the
-     the :term:`virtual root` of a request, it is not impacted by
+     The object returned by the application :term:`root factory`.
+     Unlike the :term:`virtual root` of a request, it is not impacted by
      :ref:`vhosting_chapter`: it will always be the actual object returned by
      the root factory, never a subobject.
 
@@ -840,7 +840,7 @@ Glossary
       information.
 
    Mako
-     `Mako <http://www.makotemplates.org/>`_ is a template language language
+     `Mako <http://www.makotemplates.org/>`_ is a template language
      which refines the familiar ideas of componentized layout and inheritance
      using Python with Python scoping and calling semantics.
 
diff --git a/docs/narr/extconfig.rst b/docs/narr/extconfig.rst
index 5e7fe2753..875bc9006 100644
--- a/docs/narr/extconfig.rst
+++ b/docs/narr/extconfig.rst
@@ -289,7 +289,7 @@ The ``title`` is a human-consumable string that can be used by introspection
 system frontends to show a friendly summary of this introspectable.
 
 The ``type_name`` is a value that can be used to subtype this introspectable
-within its category for for sorting and presentation purposes.  It can be any
+within its category for sorting and presentation purposes.  It can be any
 value.
 
 An introspectable is also dictionary-like.  It can contain any set of
diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst
index ea75e5fe4..b5efc0df1 100644
--- a/docs/narr/hooks.rst
+++ b/docs/narr/hooks.rst
@@ -1082,7 +1082,7 @@ entirely by the relative ordering of calls to
 :meth:`pyramid.config.Configurator.add_tween`.  However, the caller of
 add_tween can provide an optional hint that can influence the implicit tween
 chain ordering by supplying ``under`` or ``over`` (or both) arguments to
-:meth:`~pyramid.config.Configurator.add_tween`.  These hints are only used
+:meth:`~pyramid.config.Configurator.add_tween`.  These hints are only
 used when an explicit tween ordering is not used. See
 :ref:`explicit_tween_ordering` for a description of how to set an explicit
 tween ordering.
diff --git a/docs/narr/i18n.rst b/docs/narr/i18n.rst
index e261f9a11..511464322 100644
--- a/docs/narr/i18n.rst
+++ b/docs/narr/i18n.rst
@@ -301,7 +301,7 @@ You need to add a few boilerplate lines to your application's ``setup.py``
 file in order to properly generate :term:`gettext` files from your
 application.
 
-.. note:: See :ref:`project_narr` to learn about about the
+.. note:: See :ref:`project_narr` to learn about the
   composition of an application's ``setup.py`` file.
 
 In particular, add the ``Babel`` and ``lingua`` distributions to the
diff --git a/docs/narr/introspector.rst b/docs/narr/introspector.rst
index bd81fb56a..7784e8960 100644
--- a/docs/narr/introspector.rst
+++ b/docs/narr/introspector.rst
@@ -496,7 +496,7 @@ introspectables in categories not described here.
 ``translation directories``
 
   Each introspectable in the ``asset overrides`` category represents an
-  individual element in a ``specs`` argument passed to to
+  individual element in a ``specs`` argument passed to
   :meth:`pyramid.config.Configurator.add_translation_dirs`; each will have
   the following data.
 
diff --git a/docs/narr/renderers.rst b/docs/narr/renderers.rst
index 9017156a6..ecf625251 100644
--- a/docs/narr/renderers.rst
+++ b/docs/narr/renderers.rst
@@ -264,7 +264,7 @@ will be the active request object at render time.
    #    [{"x": 1}, {"x": 2}]
 
 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
+possible (or at least not reasonable) to add a custom ``__json__`` method
 to their classes in order to influence serialization.  If the object passed
 to the renderer is not a serializable type, and has no ``__json__`` method,
 usually a :exc:`TypeError` will be raised during serialization.  You can
diff --git a/docs/narr/subrequest.rst b/docs/narr/subrequest.rst
index 89551ab35..b5bc5ec48 100644
--- a/docs/narr/subrequest.rst
+++ b/docs/narr/subrequest.rst
@@ -142,7 +142,7 @@ generated.  We can change this behavior; how to do so is described below in
 our discussion of the ``use_tweens`` argument.
 
 The :meth:`pyramid.request.Request.invoke_subrequest` API accepts two
-arguments: a positional argument ``request`` that must be provided, and and
+arguments: a positional argument ``request`` that must be provided, and
 ``use_tweens`` keyword argument that is optional; it defaults to ``False``.
 
 The ``request`` object passed to the API must be an object that implements
diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst
index ba72ebfbf..1cec26fbc 100644
--- a/docs/narr/templates.rst
+++ b/docs/narr/templates.rst
@@ -109,7 +109,7 @@ supply the renderer with more correct system values (see
 to compose proper system values is present in the request.  If your
 template relies on the name ``request`` or ``context``, or if you've
 configured special :term:`renderer globals`, make sure to pass
-``request`` as a keyword argument in every call to to a
+``request`` as a keyword argument in every call to a
 ``pyramid.renderers.render_*`` function.
 
 Every view must return a :term:`response` object, except for views
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index 480b0e0cc..46f908b7c 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -87,7 +87,7 @@ setup code.  However, the above :term:`scan` execution
 decoration`, including any objects decorated with the
 :class:`pyramid.view.view_config` decorator in the ``mypackage`` Python
 package.  For example, if you have a ``views.py`` in your package, a scan will
-pick up any of its configuration decorators, so we can add one there that
+pick up any of its configuration decorators, so we can add one there
 that references ``myroute`` as a ``route_name`` parameter:
 
 .. code-block:: python
@@ -860,7 +860,7 @@ exactly the same job:
    request into a ``GET``, losing any ``POST`` data in the original
    request.
 
-See :ref:`view_module` and :ref:`changing_the_notfound_view` for for a more
+See :ref:`view_module` and :ref:`changing_the_notfound_view` for a more
 general description of how to configure a view and/or a not found view.
 
 .. index::
diff --git a/docs/narr/views.rst b/docs/narr/views.rst
index 07d018127..4f30bb7fa 100644
--- a/docs/narr/views.rst
+++ b/docs/narr/views.rst
@@ -180,7 +180,7 @@ All classes documented in the :mod:`pyramid.httpexceptions` module documented
 as inheriting from the :class:`pyramid.httpexceptions.HTTPException` are
 :term:`http exception` objects.  Instances of an HTTP exception object may
 either be *returned* or *raised* from within view code.  In either case
-(return or raise) the instance will be used as as the view's response.
+(return or raise) the instance will be used as the view's response.
 
 For example, the :class:`pyramid.httpexceptions.HTTPUnauthorized` exception
 can be raised.  This will cause a response to be generated with a ``401
diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst
index a7d8f1439..da381ad7b 100644
--- a/docs/tutorials/wiki/basiclayout.rst
+++ b/docs/tutorials/wiki/basiclayout.rst
@@ -38,7 +38,7 @@ point happens to be the ``main`` function within the file named
    factory is named ``root_factory``.
 
 #. *Line 15*.  Register a 'static view' which answers requests which start
-   with with URL path ``/static`` using the
+   with URL path ``/static`` using the
    :meth:`pyramid.config.Configurator.add_static_view method`.  This
    statement registers a view that will serve up static assets, such as CSS
    and image files, for us, in this case, at
diff --git a/docs/tutorials/wiki/definingmodels.rst b/docs/tutorials/wiki/definingmodels.rst
index 1a5d38b10..2cbe691fa 100644
--- a/docs/tutorials/wiki/definingmodels.rst
+++ b/docs/tutorials/wiki/definingmodels.rst
@@ -63,7 +63,7 @@ contain the :term:`ReStructuredText` body representing the wiki page content.
 Note that ``Page`` objects don't have an initial ``__name__`` or
 ``__parent__`` attribute.  All objects in a traversal graph must have a
 ``__name__`` and a ``__parent__`` attribute.  We don't specify these here
-because both ``__name__`` and ``__parent__`` will be set by by a :term:`view`
+because both ``__name__`` and ``__parent__`` will be set by a :term:`view`
 function when a Page is added to our Wiki mapping.
 
 As a last step, we want to change the ``appmaker`` function in our
diff --git a/docs/tutorials/wiki/definingviews.rst b/docs/tutorials/wiki/definingviews.rst
index 529603546..27f55da13 100644
--- a/docs/tutorials/wiki/definingviews.rst
+++ b/docs/tutorials/wiki/definingviews.rst
@@ -115,7 +115,7 @@ The curried function named ``check`` is used as the first argument to
 each WikiWord match found in the content.  If the wiki (our page's
 ``__parent__``) already contains a page with the matched WikiWord name, the
 ``check`` function generates a view link to be used as the substitution value
-and returns it.  If the wiki does not already contain a page with with the
+and returns it.  If the wiki does not already contain a page with the
 matched WikiWord name, the function generates an "add" link as the
 substitution value and returns it.
 
diff --git a/docs/tutorials/wiki2/definingviews.rst b/docs/tutorials/wiki2/definingviews.rst
index 6b8689b5b..8714927c3 100644
--- a/docs/tutorials/wiki2/definingviews.rst
+++ b/docs/tutorials/wiki2/definingviews.rst
@@ -144,7 +144,7 @@ The ``check()`` function is used as the first argument to
 each WikiWord match found in the content.  If the wiki already contains a
 page with the matched WikiWord name, ``check()`` generates a view
 link to be used as the substitution value and returns it.  If the wiki does
-not already contain a page with with the matched WikiWord name, ``check()``
+not already contain a page with the matched WikiWord name, ``check()``
 generates an "add" link as the substitution value and returns it.
 
 As a result, the ``content`` variable is now a fully formed bit of HTML
@@ -358,7 +358,7 @@ each of the following URLs, check that the result is as expected:
   of the FrontPage page object.
 
 - ``http://localhost:6543/FrontPage`` in a browser invokes
-  the ``view_page`` view of the front page page object.
+  the ``view_page`` view of the front page object.
 
 - ``http://localhost:6543/FrontPage/edit_page`` in a browser
   invokes the edit view for the front page object.
diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 40edaa324..40c487704 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -244,7 +244,7 @@ class Configurator(
     prepended to their pattern. This parameter is new in Pyramid 1.2.
 
     If ``introspection`` is passed, it must be a boolean value.  If it's
-    ``True``, introspection values during actions will be kept for for use
+    ``True``, introspection values during actions will be kept for use
     for tools like the debug toolbar.  If it's ``False``, introspection
     values provided by registrations will be ignored.  By default, it is
     ``True``.  This parameter is new as of Pyramid 1.3.
diff --git a/pyramid/config/routes.py b/pyramid/config/routes.py
index 7c61d5912..e06d0fecd 100644
--- a/pyramid/config/routes.py
+++ b/pyramid/config/routes.py
@@ -109,7 +109,7 @@ class RoutesConfiguratorMixin(object):
           remainder marker in its pattern (see
           :ref:`using_traverse_in_a_route_pattern`).  The ``traverse``
           argument to add_route allows you to associate route patterns
-          with an arbitrary traversal path without using a a
+          with an arbitrary traversal path without using a
           ``*traverse`` remainder marker; instead you can use other
           match information.
 
diff --git a/pyramid/interfaces.py b/pyramid/interfaces.py
index 042b4487b..b176d49fb 100644
--- a/pyramid/interfaces.py
+++ b/pyramid/interfaces.py
@@ -974,7 +974,7 @@ class IIntrospector(Interface):
         indirectly by :meth:`pyramid.interfaces.IIntrospector.register`"""
 
     def relate(*pairs):
-        """ Given any number of of ``(category_name, discriminator)`` pairs
+        """ Given any number of ``(category_name, discriminator)`` pairs
         passed as positional arguments, relate the associated introspectables
         to each other. The introspectable related to each pair must have
         already been added via ``.add`` or ``.add_intr``; a :exc:`KeyError`
@@ -986,7 +986,7 @@ class IIntrospector(Interface):
         """
 
     def unrelate(*pairs):
-        """ Given any number of of ``(category_name, discriminator)`` pairs
+        """ Given any number of ``(category_name, discriminator)`` pairs
         passed as positional arguments, unrelate the associated introspectables
         from each other. The introspectable related to each pair must have
         already been added via ``.add`` or ``.add_intr``; a :exc:`KeyError`
diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py
index 6c7e1d654..b840fbdb9 100644
--- a/pyramid/scripts/pserve.py
+++ b/pyramid/scripts/pserve.py
@@ -753,7 +753,7 @@ class Monitor(object): # pragma: no cover
     this).  
 
     Use the ``watch_file(filename)`` function to cause a reload/restart for
-    other other non-Python files (e.g., configuration files).  If you have
+    other non-Python files (e.g., configuration files).  If you have
     a dynamic set of files that grows over time you can use something like::
 
         def watch_config_files():
diff --git a/pyramid/traversal.py b/pyramid/traversal.py
index 6832ce69a..ed49d8743 100644
--- a/pyramid/traversal.py
+++ b/pyramid/traversal.py
@@ -414,7 +414,7 @@ def virtual_root(resource, request):
     'virtual root path': the :func:`pyramid.traversal.find_resource`
     API will be used to find the virtual root resource using this path;
     if the resource is found, it will be returned.  If the
-    ``HTTP_X_VHM_ROOT`` key is is not present in the WSGI environment,
+    ``HTTP_X_VHM_ROOT`` key is not present in the WSGI environment,
     the physical :term:`root` of the resource tree will be returned instead.
 
     Virtual roots are not useful at all in applications that use
diff --git a/pyramid/url.py b/pyramid/url.py
index 52e172d3f..8fb5e49ab 100644
--- a/pyramid/url.py
+++ b/pyramid/url.py
@@ -194,7 +194,7 @@ class URLMethodsMixin(object):
         names are ignored.
 
         If the route object which matches the ``route_name`` argument has
-        a :term:`pregenerator`, the ``*elements`` and ``**kw`` arguments
+        a :term:`pregenerator`, the ``*elements`` and ``**kw``
         arguments passed to this function might be augmented or changed.
         """
         try:
diff --git a/pyramid/util.py b/pyramid/util.py
index a8f750a46..56049af87 100644
--- a/pyramid/util.py
+++ b/pyramid/util.py
@@ -71,7 +71,7 @@ class InstancePropertyMixin(object):
 
         ``attrs`` is a sequence of 2-tuples *or* a data structure with
         an ``.items()`` method which returns a sequence of 2-tuples
-        (presumably a dictionary). It will be used used to add several
+        (presumably a dictionary). It will be used to add several
         properties to the instance in a manner that is more efficient
         than simply calling ``set_property`` repeatedly.
         """
-- 
cgit v1.2.3


From 638ce950df1c8c8393c44a578270480f86dd060c Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 1 Jan 2013 21:11:38 -0500
Subject: fix rationale and typo

---
 docs/narr/install.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index c9cdb745a..a1c7b0d64 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -52,9 +52,9 @@ command:
 
    $ sudo apt-get install python2.7-dev
 
-This command will install both the Python interpreter and its header files.
-Note that these headers are required by some dependencies you will use
-in this docomentation, not by Pyramid itself.
+This command will install both the Python interpreter and its development
+header files.  Note that the headers are required by some (optional) C
+extensions in software depended upon by Pyramid, not by Pyramid itself.
 
 Once these steps are performed, the Python interpreter will usually be
 invokable via ``python2.7`` from a shell prompt.
-- 
cgit v1.2.3


From 00d83a42a4499a1a94d9019b740cc477270960cf Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 1 Jan 2013 21:23:12 -0500
Subject: reflow, typo

---
 docs/narr/install.rst | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index 8947a891f..6db0d88f5 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -250,17 +250,15 @@ your setuptools-enabled Python interpreter, use the ``easy_install`` command.
 .. warning::
 
    Python 3.3 includes ``pyvenv`` out of the box, which provides similar
-   functionality to ``virtualenv``.
-   We however suggest using ``virtualenv`` instead,
-   which works well with Python 3.3.
-   This isn't a recommendation made for technical reasons;
-   it's made because it's not feasible for the
-   authors of this guide to explain setup using multiple virtual environment
-   systems.  We are aiming to not need to make the installation documentation
+   functionality to ``virtualenv``.  We however suggest using ``virtualenv``
+   instead, which works well with Python 3.3.  This isn't a recommendation made
+   for technical reasons; it's made because it's not feasible for the authors
+   of this guide to explain setup using multiple virtual environment systems.
+   We are aiming to not need to make the installation documentation
    Turing-complete.
 
    If you insist on using ``pyvenv``, you'll need to understand how to install
-   software such as``distribute`` into the virtual environment manually,
+   software such as ``distribute`` into the virtual environment manually,
    which this guide does not cover.
 
 .. code-block:: text
-- 
cgit v1.2.3


From fdc6975c2c1c2824dbbab543ddc62fc9e3d1655a Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Wed, 2 Jan 2013 22:27:50 +0200
Subject: Reduce duplicated installation instructions from the tutorials

* This also removes the mention of running 'source bin/activate' (see #759).
---
 docs/tutorials/wiki/installation.rst  | 93 ++---------------------------------
 docs/tutorials/wiki2/installation.rst | 35 ++-----------
 2 files changed, 9 insertions(+), 119 deletions(-)

diff --git a/docs/tutorials/wiki/installation.rst b/docs/tutorials/wiki/installation.rst
index 868c99dee..488ab1883 100644
--- a/docs/tutorials/wiki/installation.rst
+++ b/docs/tutorials/wiki/installation.rst
@@ -2,52 +2,15 @@
 Installation
 ============
 
-For the most part, the installation process for this tutorial
-duplicates the steps described in :ref:`installing_chapter` and
-:ref:`project_narr`, however it also explains how to install
-additional libraries for tutorial purposes.
-
 Preparation
-========================
+===========
 
-Please take the following steps to prepare for the tutorial.  The
-steps to prepare for the tutorial are slightly different depending on
-whether you're using UNIX or Windows.
+Follow the steps in :ref:`installing_chapter`, but name the virtualenv
+directory ``pyramidtut``.
 
 Preparation, UNIX
 -----------------
 
-#. If you don't already have a Python 2.6 interpreter installed on
-   your system, obtain, install, or find `Python 2.6
-   <http://python.org/download/releases/2.6.6/>`_ for your system.
-
-#. Make sure the Python development headers are installed on your system.  If
-   you've installed Python from source, these will already be installed.  If
-   you're using a system Python, you may have to install a ``python-dev``
-   package (e.g. ``apt-get python-dev``).  The headers are not required for
-   Pyramid itself, just for dependencies of the tutorial.
-
-#. Install the latest `setuptools` into the Python you
-   obtained/installed/found in the step above: download `ez_setup.py
-   <http://peak.telecommunity.com/dist/ez_setup.py>`_ and run it using
-   the ``python`` interpreter of your Python 2.6 installation:
-
-   .. code-block:: text
-
-    $ /path/to/my/Python-2.6/bin/python ez_setup.py
-
-#. Use that Python's `bin/easy_install` to install `virtualenv`:
-
-   .. code-block:: text
-
-    $ /path/to/my/Python-2.6/bin/easy_install virtualenv
-
-#. Use that Python's virtualenv to make a workspace:
-
-   .. code-block:: text
-
-     $ path/to/my/Python-2.6/bin/virtualenv --no-site-packages \
-               pyramidtut
 
 #. Switch to the ``pyramidtut`` directory:
 
@@ -55,18 +18,7 @@ Preparation, UNIX
 
      $ cd pyramidtut
 
-#. (Optional) Consider using ``source bin/activate`` to make your
-   shell environment wired to use the virtualenv.
-
-#. Use ``easy_install`` to get :app:`Pyramid` and its direct
-   dependencies installed:
-
-   .. code-block:: text
-
-     $ bin/easy_install pyramid
-
-#. Use ``easy_install`` to install ``docutils``, ``pyramid_tm``,
-   ``pyramid_zodbconn``, ``pyramid_debugtoolbar``, ``nose`` and ``coverage``:
+#. Install tutorial dependencies:
 
    .. code-block:: text
 
@@ -76,30 +28,6 @@ Preparation, UNIX
 Preparation, Windows
 --------------------
 
-#. Install, or find `Python 2.6
-   <http://python.org/download/releases/2.6.6/>`_ for your system.
-
-#. Install the latest `setuptools` into the Python you
-   obtained/installed/found in the step above: download `ez_setup.py
-   <http://peak.telecommunity.com/dist/ez_setup.py>`_ and run it using
-   the ``python`` interpreter of your Python 2.6 installation using a
-   command prompt:
-
-   .. code-block:: text
-
-    c:\> c:\Python26\python ez_setup.py
-
-#. Use that Python's `bin/easy_install` to install `virtualenv`:
-
-   .. code-block:: text
-
-    c:\> c:\Python26\Scripts\easy_install virtualenv
-
-#. Use that Python's virtualenv to make a workspace:
-
-   .. code-block:: text
-
-     c:\> c:\Python26\Scripts\virtualenv --no-site-packages pyramidtut
 
 #. Switch to the ``pyramidtut`` directory:
 
@@ -107,18 +35,7 @@ Preparation, Windows
 
      c:\> cd pyramidtut
 
-#. (Optional) Consider using ``bin\activate.bat`` to make your shell
-   environment wired to use the virtualenv.
-
-#. Use ``easy_install`` to get :app:`Pyramid` and its direct
-   dependencies installed:
-
-   .. code-block:: text
-
-     c:\pyramidtut> Scripts\easy_install pyramid
-
-#. Use ``easy_install`` to install ``docutils``, ``pyramid_tm``,
-   ``pyramid_zodbconn``, ``pyramid_debugtoolbar``, ``nose`` and ``coverage``:
+#. Install tutorial dependencies:
 
    .. code-block:: text
 
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index 05b6a2a42..572bffcab 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -2,30 +2,22 @@
 Installation
 ============
 
-This tutorial assumes that Python and :term:`virtualenv` are already installed
-and working in your system. If you need help setting this up, you should
-refer to the chapters on :ref:`installing_chapter`.
-
 Preparation
 ===========
 
-Please take the following steps to prepare for the tutorial.  The
-steps are slightly different depending on whether you're using UNIX or
-Windows.
+Follow the steps in :ref:`installing_chapter`, but name the virtualenv
+directory ``pyramidtut``.
 
 Preparation, UNIX
 -----------------
 
 #. Install SQLite3 and its development packages if you don't already
    have them installed.  Usually this is via your system's package
-   manager.  For example, on a Debian Linux system, do ``sudo apt-get
-   install libsqlite3-dev``.
-
-#. Use your Python's virtualenv to make a workspace:
+   manager.  On a Debian system, this would be:
 
    .. code-block:: text
 
-      $ path/to/my/Python-2.6/bin/virtualenv --no-site-packages pyramidtut
+      $ sudo apt-get install libsqlite3-dev
 
 #. Switch to the ``pyramidtut`` directory:
 
@@ -33,35 +25,16 @@ Preparation, UNIX
 
       $ cd pyramidtut
 
-#. Use ``easy_install`` to get :app:`Pyramid` and its direct
-   dependencies installed:
-
-   .. code-block:: text
-
-      $ bin/easy_install pyramid
 
 Preparation, Windows
 --------------------
 
-#. Use your Python's virtualenv to make a workspace:
-
-   .. code-block:: text
-
-      c:\> c:\Python26\Scripts\virtualenv --no-site-packages pyramidtut
-
 #. Switch to the ``pyramidtut`` directory:
 
    .. code-block:: text
 
       c:\> cd pyramidtut
 
-#. Use ``easy_install`` to get :app:`Pyramid` and its direct
-   dependencies installed:
-
-   .. code-block:: text
-
-      c:\pyramidtut> Scripts\easy_install pyramid
-
 .. _sql_making_a_project:
 
 Making a Project
-- 
cgit v1.2.3


From f65e191ed7da0ff97638879cf854c0b1cb505aaa Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Wed, 2 Jan 2013 23:09:40 +0200
Subject: typos

---
 docs/glossary.rst                     | 2 +-
 docs/narr/introduction.rst            | 2 +-
 docs/tutorials/wiki2/basiclayout.rst  | 2 +-
 docs/tutorials/wiki2/installation.rst | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/glossary.rst b/docs/glossary.rst
index 6620552f1..5b165db0a 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -921,7 +921,7 @@ Glossary
 
    PyPy
      PyPy is an "alternative implementation of the Python
-     language":http://pypy.org/
+     language": http://pypy.org/
 
    tween
      A bit of code that sits between the Pyramid router's main request
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index b35c61720..956d7a177 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -101,7 +101,7 @@ frameworks for small and large applications is just false; a well-designed
 framework should be able to be good at both.  Pyramid strives to be that kind
 of framework.
 
-To this end, Pyramid provides a set of features, that, combined, are unique
+To this end, Pyramid provides a set of features that, combined, are unique
 amongst Python web frameworks.  Lots of other frameworks contain some
 combination of these features; Pyramid of course actually stole many of them
 from those other frameworks.  But Pyramid is the only one that has all of
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index 763deaa32..e8874784c 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -97,7 +97,7 @@ with the prefix ``/static`` (by virtue of the first argument to
 ``add_static_view``).  This will serve up static resources for us from within
 the ``static`` directory of our ``tutorial`` package, in this case, via
 ``http://localhost:6543/static/`` and below (by virtue of the second argument
-to add_static_view).  With this declaration, we're saying that any URL that
+to ``add_static_view``).  With this declaration, we're saying that any URL that
 starts with ``/static`` should go to the static view; any remainder of its
 path (e.g. the ``/foo`` in ``/static/foo``) will be used to compose a path to
 a static file resource, such as a CSS file.
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index 572bffcab..1e47e18c3 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -159,7 +159,7 @@ On Windows:
 
 .. code-block:: text
 
-   c:\pyramidtut\tutorial> ..\Scripts\nosetests --cover-package=tutorial ^
+   c:\pyramidtut\tutorial> ..\Scripts\nosetests --cover-package=tutorial \
          --cover-erase --with-coverage
 
 If successful, you will see output something like this::
-- 
cgit v1.2.3


From 7673b06209888e2837a135d0c51f6918b94cb70b Mon Sep 17 00:00:00 2001
From: "Lorenzo M. Catucci" <lorenzo@sancho.ccd.uniroma2.it>
Date: Fri, 4 Jan 2013 15:42:34 +0100
Subject: Fix pdf document generation

by making sphinx aware about the images referenced in the latex preamble.
---
 docs/conf.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/conf.py b/docs/conf.py
index abb8bdd2e..3dc72d8ae 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -235,6 +235,8 @@ latex_paper_size = 'letter'
 # The font size ('10pt', '11pt' or '12pt').
 latex_font_size = '10pt'
 
+latex_additional_files = ['_static/latex-note.png', '_static/latex-warning.png']
+
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, document class [howto/manual]).
 latex_documents = [
-- 
cgit v1.2.3


From d695783b9adfe7c57c639e120c55c233c2979bc0 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Sat, 5 Jan 2013 01:02:38 +0200
Subject: typo

---
 docs/tutorials/wiki2/definingmodels.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorials/wiki2/definingmodels.rst b/docs/tutorials/wiki2/definingmodels.rst
index 2148582f1..d42ed0814 100644
--- a/docs/tutorials/wiki2/definingmodels.rst
+++ b/docs/tutorials/wiki2/definingmodels.rst
@@ -31,7 +31,7 @@ following:
 
 (The highlighted lines are the ones that need to be changed.)
 
-The first thing we've done is to do is remove the stock ``MyModel`` class
+The first thing we've done is remove the stock ``MyModel`` class
 from the generated ``models.py`` file.  The ``MyModel`` class is only a
 sample and we're not going to use it.
 
-- 
cgit v1.2.3


From af1a96331c8de1e4ccc7eebba6f21974d21ebed6 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Sat, 5 Jan 2013 01:40:32 +0200
Subject: Reduce duplicated content in wiki2 tutorial

---
 docs/tutorials/wiki2/definingmodels.rst | 22 ++++++----------------
 docs/tutorials/wiki2/installation.rst   |  6 ++++++
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/docs/tutorials/wiki2/definingmodels.rst b/docs/tutorials/wiki2/definingmodels.rst
index 2148582f1..cfa80aa42 100644
--- a/docs/tutorials/wiki2/definingmodels.rst
+++ b/docs/tutorials/wiki2/definingmodels.rst
@@ -77,25 +77,15 @@ following:
 
 (Only the highlighted lines need to be changed.)
 
-Reinitializing the Database
----------------------------
+Installing the Project and re-initializing the Database
+-------------------------------------------------------
+
+Redo the steps in :ref:`installing_project_in_dev_mode`.
 
 Because our model has changed, in order to reinitialize the database, we need
 to rerun the ``initialize_tutorial_db`` command to pick up the changes you've made
-to both the models.py file and to the initializedb.py file.  From the root of the
-``tutorial`` project, directory execute the following commands.
-
-On UNIX:
-
-.. code-block:: text
-
-   $ ../bin/initialize_tutorial_db development.ini
-
-On Windows:
-
-.. code-block:: text
-
-   c:\pyramidtut\tutorial> ..\Scripts\initialize_tutorial_db development.ini
+to both the models.py file and to the initializedb.py file.
+See :ref:`initialize_db_wiki2` for instructions.
 
 Success will look something like this::
 
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index 572bffcab..d4d5c0cce 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -66,6 +66,9 @@ On Windows:
    startup problems, try putting both the virtualenv and the project
    into directories that do not contain spaces in their paths.
 
+
+.. _installing_project_in_dev_mode:
+
 Installing the Project in "Development Mode"
 ============================================
 
@@ -181,6 +184,9 @@ If successful, you will see output something like this::
 
 Looks like our package doesn't quite have 100% test coverage.
 
+
+.. _initialize_db_wiki2:
+
 Initializing the Database
 =========================
 
-- 
cgit v1.2.3


From fe197640038f0aa18a8d453e820df9e1b2d1bee7 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Sat, 5 Jan 2013 15:18:36 +0200
Subject: typo

---
 docs/tutorials/wiki2/authorization.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorials/wiki2/authorization.rst b/docs/tutorials/wiki2/authorization.rst
index d98fb87e4..cfbc8ca75 100644
--- a/docs/tutorials/wiki2/authorization.rst
+++ b/docs/tutorials/wiki2/authorization.rst
@@ -14,7 +14,7 @@ anyone with access to the server to view pages.
 
 We will also add a login page and a logout link on all the
 pages.  The login page will be shown when a user is denied
-access to any of the views that require a permission, instead of
+access to any of the views that require permission, instead of
 a default "403 Forbidden" page.
 
 We will implement the access control with the following steps:
-- 
cgit v1.2.3


From 064080f2496ef09eb79a0c370eb0db9dfd5c459c Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Sat, 5 Jan 2013 19:28:09 +0200
Subject: sentence too long; also fix grammar, and add markup

---
 docs/tutorials/wiki2/authorization.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/tutorials/wiki2/authorization.rst b/docs/tutorials/wiki2/authorization.rst
index d98fb87e4..933c37f94 100644
--- a/docs/tutorials/wiki2/authorization.rst
+++ b/docs/tutorials/wiki2/authorization.rst
@@ -62,7 +62,7 @@ returns one of these values:
 - If the userid *does not* exist in the system, it will
   return ``None``.
 
-For example, ``groupfinder('editor', request )`` returns ['group:editor'],
+For example, ``groupfinder('editor', request )`` returns ``['group:editor']``,
 ``groupfinder('viewer', request)`` returns [], and ``groupfinder('admin', request)``
 returns ``None``.  We will use ``groupfinder()`` as an :term:`authentication policy`
 "callback" that will provide the :term:`principal` or principals
@@ -151,10 +151,10 @@ Now add those policies to the configuration:
 
 (Only the highlighted lines need to be added.)
 
-We are enabling an ``AuthTktAuthenticationPolicy``, it is based in an
-auth ticket that may be included in the request, and an
-``ACLAuthorizationPolicy`` that uses an ACL to determine the allow or deny
-outcome for a view.
+We are enabling an ``AuthTktAuthenticationPolicy``, which is based in an
+auth ticket that may be included in the request.
+We are also enabling an ``ACLAuthorizationPolicy``, which uses an ACL to
+determine the *allow* or *deny* outcome for a view.
 
 Note that the :class:`pyramid.authentication.AuthTktAuthenticationPolicy`
 constructor accepts two arguments: ``secret`` and ``callback``.  ``secret`` is
-- 
cgit v1.2.3


From 97895f871d1e2bd168e4bfb29d61472a44d3b0e9 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Sat, 5 Jan 2013 20:14:25 +0200
Subject: no need to display the entire path

---
 docs/tutorials/wiki2/authorization.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorials/wiki2/authorization.rst b/docs/tutorials/wiki2/authorization.rst
index d98fb87e4..ff269ef6b 100644
--- a/docs/tutorials/wiki2/authorization.rst
+++ b/docs/tutorials/wiki2/authorization.rst
@@ -156,7 +156,7 @@ auth ticket that may be included in the request, and an
 ``ACLAuthorizationPolicy`` that uses an ACL to determine the allow or deny
 outcome for a view.
 
-Note that the :class:`pyramid.authentication.AuthTktAuthenticationPolicy`
+Note that the :class:`~pyramid.authentication.AuthTktAuthenticationPolicy`
 constructor accepts two arguments: ``secret`` and ``callback``.  ``secret`` is
 a string representing an encryption key used by the "authentication ticket"
 machinery represented by this policy: it is required.  The ``callback`` is the
-- 
cgit v1.2.3


From 09f43d3ba25ba2189a1b9abf6978e14690034d16 Mon Sep 17 00:00:00 2001
From: Goodwill Coding <goodwillcoding@webhippo.net>
Date: Sat, 5 Jan 2013 10:23:35 -0800
Subject: fix up sphinx config: - make sure the versioning in title, uid is
 done automatically - automatically generate copyright years - excluded
 additional .js files that were stopping epub from generating   correctly -
 also adjust the remake script to use env not env27

---
 docs/conf.py | 31 ++++++++++++++++++-------------
 docs/remake  |  2 +-
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 3dc72d8ae..048b7ce78 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -26,6 +26,7 @@ from sphinx.writers.latex import LaTeXTranslator
 from docutils import nodes
 from docutils import utils
 
+
 def raw(*arg):
     raise nodes.SkipNode
 TextTranslator.visit_raw = raw
@@ -97,7 +98,7 @@ 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 = ['_themes/README.rst',]
+exclude_patterns = ['_themes/README.rst', ]
 
 # List of directories, relative to source directories, that shouldn't be searched
 # for source files.
@@ -129,14 +130,12 @@ if book:
 # -----------------------
 
 # Add and use Pylons theme
-if 'sphinx-build' in ' '.join(sys.argv): # protect against dumb importers
+if 'sphinx-build' in ' '.join(sys.argv):  # protect against dumb importers
     from subprocess import call, Popen, PIPE
 
     p = Popen('which git', shell=True, stdout=PIPE)
-
     cwd = os.getcwd()
     _themes = os.path.join(cwd, '_themes')
-    p = Popen('which git', shell=True, stdout=PIPE)
     git = p.stdout.read().strip()
     if not os.listdir(_themes):
         call([git, 'submodule', '--init'])
@@ -373,10 +372,10 @@ _PREAMBLE = r"""
 
 latex_elements = {
     'preamble': _PREAMBLE,
-    'wrapperclass':'book',
-    'date':'',
-    'releasename':'Version',
-    'title':r'The Pyramid Web Application \newline Development Framework',
+    'wrapperclass': 'book',
+    'date': '',
+    'releasename': 'Version',
+    'title': r'The Pyramid Web Application \newline Development Framework',
 #    'pointsize':'12pt', # uncomment for 12pt version
 }
 
@@ -392,6 +391,7 @@ latex_elements = {
 #paragraph     4
 #subparagraph  5
 
+
 def frontmatter(name, arguments, options, content, lineno,
                 content_offset, block_text, state, state_machine):
     return [nodes.raw(
@@ -409,6 +409,7 @@ def frontmatter(name, arguments, options, content, lineno,
 """,
         format='latex')]
 
+
 def mainmatter(name, arguments, options, content, lineno,
                content_offset, block_text, state, state_machine):
     return [nodes.raw(
@@ -428,11 +429,13 @@ def mainmatter(name, arguments, options, content, lineno,
 """,
         format='latex')]
 
+
 def backmatter(name, arguments, options, content, lineno,
               content_offset, block_text, state, state_machine):
     return [nodes.raw('', '\\backmatter\n\\setcounter{secnumdepth}{-1}\n',
                       format='latex')]
 
+
 def app_role(role, rawtext, text, lineno, inliner, options={}, content=[]):
     """custom role for :app: marker, does nothing in particular except allow
     :app:`Pyramid` to work (for later search and replace)."""
@@ -450,6 +453,7 @@ def setup(app):
     app.add_directive('backmatter', backmatter, 1, (0, 0, 0))
     app.connect('autodoc-process-signature', resig)
 
+
 def resig(app, what, name, obj, options, signature, return_annotation):
     """ Allow for preservation of ``@action_method`` decorated methods
     in configurator """
@@ -476,10 +480,11 @@ def resig(app, what, name, obj, options, signature, return_annotation):
 # -- Options for Epub output ---------------------------------------------------
 
 # Bibliographic Dublin Core info.
-epub_title = 'The Pyramid Web Application Development Framework, Version 1.4'
+epub_title = 'The Pyramid Web Application Development Framework, Version %s' \
+             % release
 epub_author = 'Chris McDonough'
 epub_publisher = 'Agendaless Consulting'
-epub_copyright = '2008-2011'
+epub_copyright = '2008-%d' % datetime.datetime.now().year
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.
@@ -493,8 +498,8 @@ epub_scheme = 'ISBN'
 epub_identifier = '0615445675'
 
 # A unique identification for the text.
-epub_uid = 'The Pyramid Web Application Development Framework, Version 1.4'
-
+epub_uid = 'The Pyramid Web Application Development Framework, Version %s' \
+           % release
 # HTML files that should be inserted before the pages created by sphinx.
 # The format is a list of tuples containing the path and title.
 #epub_pre_files = []
@@ -506,7 +511,7 @@ epub_uid = 'The Pyramid Web Application Development Framework, Version 1.4'
 # A list of files that should not be packed into the epub file.
 epub_exclude_files = ['_static/opensearch.xml', '_static/doctools.js',
     '_static/jquery.js', '_static/searchtools.js', '_static/underscore.js',
-    '_static/basic.css', 'search.html']
+    '_static/basic.css', 'search.html', '_static/websupport.js']
 
 
 # The depth of the table of contents in toc.ncx.
diff --git a/docs/remake b/docs/remake
index eb818289f..6552716c8 100755
--- a/docs/remake
+++ b/docs/remake
@@ -1 +1 @@
-make clean html SPHINXBUILD=../env27/bin/sphinx-build
+make clean html SPHINXBUILD=../env/bin/sphinx-build
-- 
cgit v1.2.3


From 998b3970c98baa0c591507f94e6ec32b65969045 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Sat, 5 Jan 2013 20:38:25 +0200
Subject: remove info that should be obvious to the reader

---
 docs/tutorials/wiki2/authorization.rst | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/tutorials/wiki2/authorization.rst b/docs/tutorials/wiki2/authorization.rst
index d98fb87e4..03a06e304 100644
--- a/docs/tutorials/wiki2/authorization.rst
+++ b/docs/tutorials/wiki2/authorization.rst
@@ -303,9 +303,8 @@ like this:
 
 (Only the highlighted line needs to be added.)
 
-:meth:`~pyramid.security.authenticated_userid()` will return None
-if the user is not authenticated, or some user id it the user
-is authenticated.
+The :meth:`~pyramid.security.authenticated_userid` method will return None
+if the user is not authenticated.
 
 Add a "Logout" link when logged in
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-- 
cgit v1.2.3


From 73ea91b1e3859e412252a8d3263389147a05223e Mon Sep 17 00:00:00 2001
From: Reed O'Brien <reed@koansys.com>
Date: Sun, 6 Jan 2013 13:24:50 -0500
Subject: fix import typo in docs

---
 docs/narr/viewconfig.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index 799de768f..f00dae451 100644
--- a/docs/narr/viewconfig.rst
+++ b/docs/narr/viewconfig.rst
@@ -834,7 +834,7 @@ decorator on the RESTView class:
 .. code-block:: python
    :linenos:
 
-   from pyramid.view import view_config
+   from pyramid.view import view_defaults
    from pyramid.response import Response
    from pyramid.config import Configurator
 
-- 
cgit v1.2.3


From 168e94f0693600b122619222dd5cf2053b1d96ae Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Sun, 6 Jan 2013 20:25:07 +0200
Subject: I have tested this on Python 3, and it works without modification

---
 docs/tutorials/wiki2/background.rst | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/tutorials/wiki2/background.rst b/docs/tutorials/wiki2/background.rst
index 9933adc27..1f9582903 100644
--- a/docs/tutorials/wiki2/background.rst
+++ b/docs/tutorials/wiki2/background.rst
@@ -11,9 +11,8 @@ To code along with this tutorial, the developer will need a UNIX
 machine with development tools (Mac OS X with XCode, any Linux or BSD
 variant, etc) *or* a Windows system of any kind.
 
-.. warning::
+.. note::
 
-  This tutorial has been written for Python 2.  It is unlikely to work
-  without modification under Python 3.
+  This tutorial runs on both Python 2 and 3 without modification.
 
 Have fun!
-- 
cgit v1.2.3


From b9b3b122b7eaee02467f2ff042e7b5ee65062b92 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Sun, 6 Jan 2013 21:19:00 +0200
Subject: grammar

---
 pyramid/testing.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyramid/testing.py b/pyramid/testing.py
index cecf13469..c4e83714d 100644
--- a/pyramid/testing.py
+++ b/pyramid/testing.py
@@ -476,7 +476,7 @@ def setUp(registry=None, request=None, hook_zca=True, autocommit=True,
     return config
 
 def tearDown(unhook_zca=True):
-    """Undo the effects :func:`pyramid.testing.setUp`.  Use this
+    """Undo the effects of :func:`pyramid.testing.setUp`.  Use this
     function in the ``tearDown`` method of a unit test that uses
     :func:`pyramid.testing.setUp` in its ``setUp`` method.
 
-- 
cgit v1.2.3


From 1c65db8c7176ce2b2bf2c85de3721164deb27b6c Mon Sep 17 00:00:00 2001
From: Mike Naberezny <mike@naberezny.com>
Date: Sun, 6 Jan 2013 15:25:35 -0800
Subject: Clarify "TL".  Fixes #777

---
 docs/designdefense.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/designdefense.rst b/docs/designdefense.rst
index 96e1001e6..dec33bd1a 100644
--- a/docs/designdefense.rst
+++ b/docs/designdefense.rst
@@ -1536,7 +1536,7 @@ comments take into account what we've discussed in the
 .. code-block:: python
    :linenos:
 
-   from pyramid.response import Response         # explicit response, no TL
+   from pyramid.response import Response # explicit response, no thread local
    from wsgiref.simple_server import make_server # explicitly WSGI
 
    def hello_world(request):  # accepts a request; no request thread local reqd
-- 
cgit v1.2.3


From de5d2a88ef64a3f59222be1bd369ce226bbc0171 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Mon, 7 Jan 2013 01:37:30 +0200
Subject: redundant statement: the links preceeding the statement target the
 info referred to

---
 docs/api/path.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/api/path.rst b/docs/api/path.rst
index d46c35d8e..814fc47d5 100644
--- a/docs/api/path.rst
+++ b/docs/api/path.rst
@@ -9,8 +9,7 @@
 
        A constant used by the constructor of
        :class:`pyramid.path.DottedNameResolver` and
-       :class:`pyramid.path.AssetResolver` (see their docstrings for more
-       info).
+       :class:`pyramid.path.AssetResolver`.
 
     .. autoclass:: DottedNameResolver
        :members:
-- 
cgit v1.2.3


From a03b29ccc094537fa0d80b2545a9d16fc94566cb Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Tue, 8 Jan 2013 00:50:24 +0200
Subject: typos

---
 docs/narr/introduction.rst | 2 +-
 docs/narr/upgrading.rst    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index b35c61720..187b81702 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -475,7 +475,7 @@ per route.  For example, you can create a route with the pattern ``/items``
 and when the route is matched, you can shuffle off the request to one view if
 the request method is GET, another view if the request method is POST, etc.
 A system known as "view predicates" allows for this.  Request method matching
-is the very most basic thing you can do with a view predicate.  You can also
+is the most basic thing you can do with a view predicate.  You can also
 associate views with other request parameters such as the elements in the
 query string, the Accept header, whether the request is an XHR request or
 not, and lots of other things.  This feature allows you to keep your
diff --git a/docs/narr/upgrading.rst b/docs/narr/upgrading.rst
index 839f59c35..20487b448 100644
--- a/docs/narr/upgrading.rst
+++ b/docs/narr/upgrading.rst
@@ -206,7 +206,7 @@ information.
 Upgrading to the Very Latest Pyramid Release
 --------------------------------------------
 
-When you upgrade your application to the very most recent Pyramid release,
+When you upgrade your application to the most recent Pyramid release,
 it's advisable to upgrade step-wise through each most recent minor release,
 beginning with the one that you know your application currently runs under,
 and ending on the most recent release.  For example, if your application is
-- 
cgit v1.2.3


From 812f65b895269f0c6b015af0276eef86b0b9b518 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Tue, 8 Jan 2013 23:14:20 +0200
Subject: the sample apps do not run on Py3k

---
 docs/index.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/index.rst b/docs/index.rst
index 406cc9b03..0d6113c15 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -138,6 +138,11 @@ Design Documents
 Sample Applications
 ===================
 
+.. note::
+
+   These applications run only on Python 2.x, and so do some of their
+   dependencies.
+
 `cluegun <https://github.com/Pylons/cluegun>`_ is a simple pastebin
 application based on Rocky Burt's `ClueBin
 <http://pypi.python.org/pypi/ClueBin/0.2.3>`_.  It demonstrates form
-- 
cgit v1.2.3


From 22ed77d69b0f2348983be0c4e8758a44cf160671 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Wed, 9 Jan 2013 02:30:47 +0200
Subject: take advantage of the -c option of Python

---
 docs/narr/install.rst | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index ff89553ae..a78c1b2bd 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -150,32 +150,21 @@ To set up a virtualenv in which to install :app:`Pyramid`, first ensure that
 ``import setuptools`` within the Python interpreter you'd like to run
 :app:`Pyramid` under.
 
-Here's the output you'll expect if setuptools or distribute is already
-installed:
+The following command will not display anything if setuptools or distribute is
+already installed:
 
 .. code-block:: text
 
-   [chrism@thinko docs]$ python2.7
-   Python 2.7.3 (default, Aug  1 2012, 05:14:39) 
-   [GCC 4.6.3] on linux2
-   Type "help", "copyright", "credits" or "license" for more information.
-   >>> import setuptools
-   >>> 
+   $ python2.7 -c 'import setuptools'
 
-Here's the output you can expect if setuptools or distribute is not already
-installed:
+Running the same command will yield the following output if setuptools or
+distribute is not yet installed:
 
 .. code-block:: text
 
-   [chrism@thinko docs]$ python2.7
-   Python 2.7.3 (default, Aug  1 2012, 05:14:39) 
-   [GCC 4.6.3] on linux2
-   Type "help", "copyright", "credits" or "license" for more information.
-   >>> import setuptools
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
    ImportError: No module named setuptools
-   >>>
 
 If ``import setuptools`` raises an :exc:`ImportError` as it does above, you
 will need to install setuptools or distribute manually.  Note that above
-- 
cgit v1.2.3


From 2e54b81ff69fc39d42783fffe98a4bb81d28ac97 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Fri, 11 Jan 2013 19:02:30 +0200
Subject: add missing commas

---
 docs/designdefense.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/designdefense.rst b/docs/designdefense.rst
index 96e1001e6..6ff686a95 100644
--- a/docs/designdefense.rst
+++ b/docs/designdefense.rst
@@ -38,7 +38,7 @@ forking is also a Zope derivative.
 
 Implementations of these features were *required* to allow the :app:`Pyramid`
 authors to build the bread-and-butter CMS-type systems for customers in the
-way they were accustomed to building them.  No other system save Zope itself
+way they were accustomed to building them.  No other system, save for Zope itself,
 had such features.  And Zope itself was beginning to show signs of its age.
 We were becoming hampered by consequences of its early design mistakes.
 Zope's lack of documentation was also difficult to work around: it was hard
@@ -55,7 +55,7 @@ existing frameworks had good, and sometimes very compelling ideas.  In
 particular, :term:`URL dispatch` is a more direct mechanism to map URLs to
 code.
 
-So although we couldn't find a framework save for Zope that fit our needs,
+So, although we couldn't find a framework, save for Zope, that fit our needs,
 and while we incorporated a lot of Zope ideas into BFG, we also emulated the
 features we found compelling in other frameworks (such as :term:`url
 dispatch`).  After the initial public release of BFG, as time went on,
-- 
cgit v1.2.3


From b98e70e340f84652b44c888472724a23bae5f007 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Sat, 12 Jan 2013 01:55:27 +0200
Subject: grammar

---
 HACKING.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/HACKING.txt b/HACKING.txt
index 87d1422dc..64c8f461a 100644
--- a/HACKING.txt
+++ b/HACKING.txt
@@ -94,7 +94,7 @@ Running Tests
 --------------
 
 - To run tests for Pyramid on a single Python version, run ``python setup.py
-  test`` against the using the Python interpreter from virtualenv into which
+  test`` against the Python interpreter from virtualenv into which
   you've ``setup.py develop``-ed Pyramid.
 
 - To run the full set of Pyramid tests on all platforms, install ``tox``
-- 
cgit v1.2.3


From 3604e6edbf7f9aac375ca3b2a9914c5665a0cf8d Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Sat, 12 Jan 2013 09:51:08 +0200
Subject: Pyramid copyright is from 2008

52d4fbc mistakenly removed '2008' in '2008-<current year>'
---
 docs/conf.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 048b7ce78..6eb76af9d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -76,7 +76,8 @@ master_doc = 'index'
 
 # General substitutions.
 project = 'The Pyramid Web Application Development Framework'
-copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year
+thisyear = datetime.datetime.now().year
+copyright = '2008-%s, Agendaless Consulting' % thisyear
 
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.
@@ -484,7 +485,7 @@ epub_title = 'The Pyramid Web Application Development Framework, Version %s' \
              % release
 epub_author = 'Chris McDonough'
 epub_publisher = 'Agendaless Consulting'
-epub_copyright = '2008-%d' % datetime.datetime.now().year
+epub_copyright = '2008-%d' % thisyear
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.
-- 
cgit v1.2.3


From 8109ae8ef7e04135a4724963951983ee260293a7 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Sun, 13 Jan 2013 22:45:36 +0200
Subject: typo; should be 'titled', but would be redundant

---
 docs/narr/advconfig.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst
index ad22a82c9..7caea28b8 100644
--- a/docs/narr/advconfig.rst
+++ b/docs/narr/advconfig.rst
@@ -417,7 +417,7 @@ added in configuration execution order.
 More Information
 ----------------
 
-For more information, see the article entitled `"A Whirlwind Rour of Advanced
+For more information, see the article `"A Whirlwind Tour of Advanced
 Configuration Tactics"
 <http://docs.pylonsproject.org/projects/pyramid_cookbook/en/latest/configuration/whirlwind_tour.html>`_
 in the Pyramid Cookbook.
-- 
cgit v1.2.3


From b00f1e46f100d8a23041a1bb7a7b37b026170fe3 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 14 Jan 2013 08:50:51 -0500
Subject: Punctuate.

---
 docs/narr/advconfig.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst
index 7caea28b8..ba43f3ea6 100644
--- a/docs/narr/advconfig.rst
+++ b/docs/narr/advconfig.rst
@@ -417,7 +417,7 @@ added in configuration execution order.
 More Information
 ----------------
 
-For more information, see the article `"A Whirlwind Tour of Advanced
+For more information, see the article,`"A Whirlwind Tour of Advanced
 Configuration Tactics"
-<http://docs.pylonsproject.org/projects/pyramid_cookbook/en/latest/configuration/whirlwind_tour.html>`_
+<http://docs.pylonsproject.org/projects/pyramid_cookbook/en/latest/configuration/whirlwind_tour.html>`_,
 in the Pyramid Cookbook.
-- 
cgit v1.2.3


From bbd3abb8b925fd4cbde3194abc07736f0f30fb91 Mon Sep 17 00:00:00 2001
From: Ronan Amicel <ronan.amicel@gmail.com>
Date: Mon, 14 Jan 2013 17:00:38 +0100
Subject: Update pyramid/view.py

Fix example function name in forbidden_view_config docstring
---
 pyramid/view.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyramid/view.py b/pyramid/view.py
index e1e03bd93..40d7c19b9 100644
--- a/pyramid/view.py
+++ b/pyramid/view.py
@@ -394,7 +394,7 @@ class forbidden_view_config(object):
         from pyramid.response import Response
           
         @forbidden_view_config()
-        def notfound(request):
+        def forbidden(request):
             return Response('You are not allowed', status='401 Unauthorized')
 
     All arguments passed to this function have the same meaning as
-- 
cgit v1.2.3


From f7c1737a4b5f870d600b526f986791b13ac58574 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Mon, 14 Jan 2013 23:34:55 +0200
Subject: typo

---
 pyramid/config/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 40c487704..6f078934b 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -631,7 +631,7 @@ class Configurator(
         self.action_state = ActionState() # old actions have been processed
 
     def include(self, callable, route_prefix=None):
-        """Include a configuration callables, to support imperative
+        """Include a configuration callable, to support imperative
         application extensibility.
 
         .. warning:: In versions of :app:`Pyramid` prior to 1.2, this
-- 
cgit v1.2.3


From 026ac8ab8f69269efa638cd2d7a3314fcd144144 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Mon, 14 Jan 2013 23:50:38 +0200
Subject: grammar

---
 pyramid/config/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 40c487704..9a3562f94 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -668,7 +668,7 @@ class Configurator(
            def includeme(config):
                config.add_view(my_view)
 
-        You might cause it be included within your Pyramid application like
+        You might cause it to be included within your Pyramid application like
         so:
 
         .. code-block:: python
-- 
cgit v1.2.3


From 2e95acb8b64694f0e99f553413cb2ddc123efd6f Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Mon, 14 Jan 2013 23:46:21 +0200
Subject: improve flow

---
 pyramid/config/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 40c487704..b8fa1d16d 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -640,8 +640,8 @@ class Configurator(
 
         A configuration callable should be a callable that accepts a single
         argument named ``config``, which will be an instance of a
-        :term:`Configurator`  (be warned that it will not be the same
-        configurator instance on which you call this method, however).  The
+        :term:`Configurator`.  However, be warned that it will not be the same
+        configurator instance on which you call this method.  The
         code which runs as the result of calling the callable should invoke
         methods on the configurator passed to it which add configuration
         state.  The return value of a callable will be ignored.
@@ -701,7 +701,7 @@ class Configurator(
         to :meth:`pyramid.config.Configurator.add_route` within the included
         callable will have their pattern prefixed with the value of
         ``route_prefix``. This can be used to help mount a set of routes at a
-        different location than the included callable's author intended while
+        different location than the included callable's author intended, while
         still maintaining the same route names.  For example:
 
         .. code-block:: python
-- 
cgit v1.2.3


From fa1ac6744f1e2308190ba84dd60d573b4fa25fb3 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Tue, 15 Jan 2013 00:56:42 +0200
Subject: another grammar fix

---
 docs/api/config.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/config.rst b/docs/api/config.rst
index 5d2bce23e..e6a67830e 100644
--- a/docs/api/config.rst
+++ b/docs/api/config.rst
@@ -130,7 +130,7 @@
 .. attribute:: global_registries
 
    The set of registries that have been created for :app:`Pyramid`
-   applications, one per each call to
+   applications, one for each call to
    :meth:`pyramid.config.Configurator.make_wsgi_app` in the current
    process. The object itself supports iteration and has a ``last`` property
    containing the last registry loaded.
-- 
cgit v1.2.3


From 024fd80060652a9d99c57abd55e940652c6dbb47 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Tue, 15 Jan 2013 01:18:30 +0200
Subject: yet another grammar fix

---
 pyramid/exceptions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyramid/exceptions.py b/pyramid/exceptions.py
index 1c8f99f62..dab958282 100644
--- a/pyramid/exceptions.py
+++ b/pyramid/exceptions.py
@@ -21,7 +21,7 @@ class URLDecodeError(UnicodeDecodeError):
     """
     This exception is raised when :app:`Pyramid` cannot
     successfully decode a URL or a URL path segment.  This exception
-    it behaves just like the Python builtin
+    behaves just like the Python builtin
     :exc:`UnicodeDecodeError`. It is a subclass of the builtin
     :exc:`UnicodeDecodeError` exception only for identity purposes,
     mostly so an exception view can be registered when a URL cannot be
-- 
cgit v1.2.3


From 8a3872de6761eed9d372f1363ebb01ac313d4543 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Tue, 15 Jan 2013 08:26:55 +0200
Subject: fix #788

---
 HACKING.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/HACKING.txt b/HACKING.txt
index 64c8f461a..32381cc6c 100644
--- a/HACKING.txt
+++ b/HACKING.txt
@@ -88,7 +88,7 @@ Coding Style
   mandatory.
 
 - Please do not remove trailing whitespace.  Configure your editor to reduce
-  diff noise.
+  diff noise. See https://github.com/Pylons/pyramid/issues/788 for more.
 
 Running Tests
 --------------
-- 
cgit v1.2.3


From 8e5b2d196a1d7825ecd59a39709ef0dbd2c134e1 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Wed, 16 Jan 2013 00:39:52 +0200
Subject: improve flow

---
 docs/narr/firstapp.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/narr/firstapp.rst b/docs/narr/firstapp.rst
index 0b85d68d3..9aea50185 100644
--- a/docs/narr/firstapp.rst
+++ b/docs/narr/firstapp.rst
@@ -200,7 +200,7 @@ and various other configuration settings have been performed).  The
 be used by any WSGI server to present an application to a requestor.
 :term:`WSGI` is a protocol that allows servers to talk to Python
 applications.  We don't discuss :term:`WSGI` in any depth within this book,
-however, you can learn more about it by visiting `wsgi.org
+but you can learn more about it by visiting `wsgi.org
 <http://wsgi.org>`_.
 
 The :app:`Pyramid` application object, in particular, is an instance of a
-- 
cgit v1.2.3


From 362d8b0548410e7ab3e28d0d420342121496a1d2 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Wed, 16 Jan 2013 00:44:45 +0200
Subject: improve flow

---
 docs/narr/firstapp.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/narr/firstapp.rst b/docs/narr/firstapp.rst
index 0b85d68d3..45cb917f7 100644
--- a/docs/narr/firstapp.rst
+++ b/docs/narr/firstapp.rst
@@ -194,8 +194,8 @@ WSGI Application Creation
 After configuring views and ending configuration, the script creates a WSGI
 *application* via the :meth:`pyramid.config.Configurator.make_wsgi_app`
 method.  A call to ``make_wsgi_app`` implies that all configuration is
-finished (meaning all method calls to the configurator which set up views,
-and various other configuration settings have been performed).  The
+finished (meaning all method calls to the configurator, which sets up views
+and various other configuration settings, have been performed).  The
 ``make_wsgi_app`` method returns a :term:`WSGI` application object that can
 be used by any WSGI server to present an application to a requestor.
 :term:`WSGI` is a protocol that allows servers to talk to Python
-- 
cgit v1.2.3


From b9a6b35ec0e828f8377ddb80479690ff60495f45 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Wed, 16 Jan 2013 00:58:47 +0200
Subject: add missing comma

---
 pyramid/interfaces.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyramid/interfaces.py b/pyramid/interfaces.py
index b176d49fb..54bce6fd2 100644
--- a/pyramid/interfaces.py
+++ b/pyramid/interfaces.py
@@ -460,7 +460,7 @@ class IAuthorizationPolicy(Interface):
 class IMultiDict(IDict): # docs-only interface
     """
     An ordered dictionary that can have multiple values for each key. A
-    multidict adds the methods ``getall``, ``getone``, ``mixed``, ``extend``
+    multidict adds the methods ``getall``, ``getone``, ``mixed``, ``extend``,
     ``add``, and ``dict_of_lists`` to the normal dictionary interface.  A
     multidict data structure is used as ``request.POST``, ``request.GET``,
     and ``request.params`` within an :app:`Pyramid` application.
-- 
cgit v1.2.3


From 7e10cd0fd38bdeeba988e6ecf1b6179a0086559c Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Thu, 17 Jan 2013 22:06:50 +0200
Subject: miscellaneous doc improvements

* the word "system" can be misleading, so use a clearer choice of words
* reduce repetition
* mention Debian, since it is similar to Ubuntu, and is major enough
* it is now "Ubuntu", not "Ubuntu Linux"
---
 docs/narr/install.rst | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index a78c1b2bd..6653243d5 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -40,13 +40,11 @@ UNIX system that has development tools.
 Package Manager Method
 ++++++++++++++++++++++
 
-You can use your system's "package manager" to install Python. Every
-system's package manager is slightly different, but the "flavor" of
+You can use your system's "package manager" to install Python.
+Each package manager is slightly different, but the "flavor" of
 them is usually the same.
 
-For example, on an Ubuntu Linux system, to use the system package
-manager to install a Python 2.7 interpreter, use the following
-command:
+For example, on a Debian or Ubuntu system, use the following command:
 
 .. code-block:: text
 
-- 
cgit v1.2.3


From b31e5c9c46f4d87177b114f50328a8b0b39908be Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Thu, 17 Jan 2013 22:30:25 +0200
Subject: fix #747

---
 docs/narr/install.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index a78c1b2bd..19c144156 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -70,7 +70,8 @@ Python interpreter to develop your software.  The authors of
 :app:`Pyramid` tend not to use the system Python for development
 purposes; always a self-compiled one.  Compiling Python is usually
 easy, and often the "system" Python is compiled with options that
-aren't optimal for web development.
+aren't optimal for web development. For an explanation, see
+https://github.com/Pylons/pyramid/issues/747.
 
 To compile software on your UNIX system, typically you need
 development tools.  Often these can be installed via the package
-- 
cgit v1.2.3


From e241c7e479b411a7f465b0a3d86021301702f8af Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Fri, 18 Jan 2013 23:58:04 +0200
Subject: make example links clickable, for convenience

---
 docs/index.rst            | 2 +-
 docs/narr/firstapp.rst    | 2 +-
 docs/narr/urldispatch.rst | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index 0d6113c15..d4b7ed492 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -14,7 +14,7 @@ Here is one of the simplest :app:`Pyramid` applications you can make:
 .. literalinclude:: narr/helloworld.py
 
 After you install :app:`Pyramid` and run this application, when you visit
-``http://localhost:8080/hello/world`` in a browser, you will see the text
+`<http://localhost:8080/hello/world>`_ in a browser, you will see the text
 ``Hello, world!``
 
 See :ref:`firstapp_chapter` for a full explanation of how this application
diff --git a/docs/narr/firstapp.rst b/docs/narr/firstapp.rst
index 0b85d68d3..50aa02692 100644
--- a/docs/narr/firstapp.rst
+++ b/docs/narr/firstapp.rst
@@ -40,7 +40,7 @@ On Windows:
 This command will not return and nothing will be printed to the console.
 When port 8080 is visited by a browser on the URL ``/hello/world``, the
 server will simply serve up the text "Hello world!".  If your application is
-running on your local system, using ``http://localhost:8080/hello/world``
+running on your local system, using `<http://localhost:8080/hello/world>`_
 in a browser will show this result.
 
 Each time you visit a URL served by the application in a browser, a logging
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index 46f908b7c..ec97bf3b2 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -38,7 +38,7 @@ application.  A route has a *name*, which acts as an identifier to be used
 for URL generation.  The name also allows developers to associate a view
 configuration with the route.  A route also has a *pattern*, meant to match
 against the ``PATH_INFO`` portion of a URL (the portion following the scheme
-and port, e.g. ``/foo/bar`` in the URL ``http://localhost:8080/foo/bar``). It
+and port, e.g. ``/foo/bar`` in the URL `<http://localhost:8080/foo/bar>`_). It
 also optionally has a ``factory`` and a set of :term:`route predicate`
 attributes.
 
-- 
cgit v1.2.3


From 29492930e2b04a854371160ddae568ca76536f04 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Sat, 19 Jan 2013 11:01:56 +0200
Subject: missing comma

---
 docs/glossary.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/glossary.rst b/docs/glossary.rst
index 5b165db0a..0036d045b 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -689,7 +689,7 @@ Glossary
      non-C based Python implementations.
 
    View Lookup
-     The act of finding and invoking the "best" :term:`view callable`
+     The act of finding and invoking the "best" :term:`view callable`,
      given a :term:`request` and a :term:`context` resource.
 
    Resource Location
-- 
cgit v1.2.3


From ff9edd2492f931f6e9d51ee3f04bbb400d0d98ca Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Sat, 19 Jan 2013 17:19:45 +0200
Subject: user newer API in the example

---
 pyramid/authentication.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pyramid/authentication.py b/pyramid/authentication.py
index 08d283acc..4f6ed2c1d 100644
--- a/pyramid/authentication.py
+++ b/pyramid/authentication.py
@@ -1075,12 +1075,11 @@ class BasicAuthAuthenticationPolicy(CallbackAuthenticationPolicy):
     register a view that will send a Basic Auth challenge to the user whenever
     there is an attempt to call a view which results in a Forbidden response::
 
-        from pyramid.httpexceptions import HTTPForbidden
         from pyramid.httpexceptions import HTTPUnauthorized
         from pyramid.security import forget
-        from pyramid.view import view_config
+        from pyramid.view import forbidden_view_config
 
-        @view_config(context=HTTPForbidden)
+        @forbidden_view_config()
         def basic_challenge(request):
             response = HTTPUnauthorized()
             response.headers.update(forget(request))
-- 
cgit v1.2.3


From 445eb8708fa48209947377f6de609799dd843ad6 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Sun, 20 Jan 2013 17:10:40 +0200
Subject: point to the sources of the wiki tutorials in just one location; fix
 #763

* This avoids having to update the link multiple times.
* Also, mention their location, in case user has Pyramid checkout.
---
 docs/tutorials/wiki/authorization.rst   | 3 ---
 docs/tutorials/wiki/basiclayout.rst     | 3 ---
 docs/tutorials/wiki/definingmodels.rst  | 3 ---
 docs/tutorials/wiki/definingviews.rst   | 3 ---
 docs/tutorials/wiki/index.rst           | 5 +++--
 docs/tutorials/wiki/tests.rst           | 3 ---
 docs/tutorials/wiki2/authorization.rst  | 3 ---
 docs/tutorials/wiki2/basiclayout.rst    | 3 ---
 docs/tutorials/wiki2/definingmodels.rst | 3 ---
 docs/tutorials/wiki2/definingviews.rst  | 3 ---
 docs/tutorials/wiki2/index.rst          | 6 +++---
 docs/tutorials/wiki2/tests.rst          | 3 ---
 12 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/docs/tutorials/wiki/authorization.rst b/docs/tutorials/wiki/authorization.rst
index e90dfe12d..7c8ba99bf 100644
--- a/docs/tutorials/wiki/authorization.rst
+++ b/docs/tutorials/wiki/authorization.rst
@@ -32,9 +32,6 @@ Then we will add the login and logout feature:
 * Add a "Logout" link to be shown when logged in and viewing or editing a page
   (``view.pt``, ``edit.pt``).
 
-The source code for this tutorial stage can be browsed at
-`http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki/src/authorization/
-<http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki/src/authorization/>`_.
 
 Access Control
 --------------
diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst
index da381ad7b..aab22408b 100644
--- a/docs/tutorials/wiki/basiclayout.rst
+++ b/docs/tutorials/wiki/basiclayout.rst
@@ -6,9 +6,6 @@ The starter files generated by the ``zodb`` scaffold are basic, but
 they provide a good orientation for the high-level patterns common to most
 :term:`traversal` -based :app:`Pyramid` (and :term:`ZODB` based) projects.
 
-The source code for this tutorial stage can be browsed via
-`http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki/src/basiclayout/
-<http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki/src/basiclayout/>`_.
 
 Application Configuration with ``__init__.py``
 ------------------------------------------------
diff --git a/docs/tutorials/wiki/definingmodels.rst b/docs/tutorials/wiki/definingmodels.rst
index 2cbe691fa..1d2710975 100644
--- a/docs/tutorials/wiki/definingmodels.rst
+++ b/docs/tutorials/wiki/definingmodels.rst
@@ -14,9 +14,6 @@ constructors". Both our Page and Wiki constructors will be class objects.  A
 single instance of the "Wiki" class will serve as a container for "Page"
 objects, which will be instances of the "Page" class.
 
-The source code for this tutorial stage can be browsed via
-`http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki/src/models/
-<http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki/src/models/>`_.
 
 Delete the Database
 -------------------
diff --git a/docs/tutorials/wiki/definingviews.rst b/docs/tutorials/wiki/definingviews.rst
index 27f55da13..efcc7bf21 100644
--- a/docs/tutorials/wiki/definingviews.rst
+++ b/docs/tutorials/wiki/definingviews.rst
@@ -28,9 +28,6 @@ assumed to return a :term:`response` object.
 We're going to define several :term:`view callable` functions, then wire them
 into :app:`Pyramid` using some :term:`view configuration`.
 
-The source code for this tutorial stage can be browsed via
-`http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki/src/views/
-<http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki/src/views/>`_.
 
 Declaring Dependencies in Our ``setup.py`` File
 ===============================================
diff --git a/docs/tutorials/wiki/index.rst b/docs/tutorials/wiki/index.rst
index c918f8765..981d135c7 100644
--- a/docs/tutorials/wiki/index.rst
+++ b/docs/tutorials/wiki/index.rst
@@ -10,8 +10,9 @@ tutorial, the developer will have created a basic Wiki application with
 authentication.
 
 For cut and paste purposes, the source code for all stages of this
-tutorial can be browsed at `https://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki/src
-<https://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki/src>`_.
+tutorial can be browsed on GitHub at `docs/tutorials/wiki/src
+<https://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki/src>`_,
+which corresponds to the same location if you have Pyramid sources.
 
 .. toctree::
    :maxdepth: 2
diff --git a/docs/tutorials/wiki/tests.rst b/docs/tutorials/wiki/tests.rst
index 7a019dd04..49bc780e8 100644
--- a/docs/tutorials/wiki/tests.rst
+++ b/docs/tutorials/wiki/tests.rst
@@ -6,9 +6,6 @@ We will now add tests for the models and the views and a few functional
 tests in the ``tests.py``.  Tests ensure that an application works, and
 that it continues to work after some changes are made in the future.
 
-The source code for this tutorial stage can be browsed via
-`http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki/src/tests/
-<http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki/src/tests/>`_.
 
 Test the Models
 ===============
diff --git a/docs/tutorials/wiki2/authorization.rst b/docs/tutorials/wiki2/authorization.rst
index 321f1f9c4..5ede26920 100644
--- a/docs/tutorials/wiki2/authorization.rst
+++ b/docs/tutorials/wiki2/authorization.rst
@@ -36,9 +36,6 @@ Then we will add the login and logout feature:
 * Add a "Logout" link to be shown when logged in and viewing or editing a page
   (``view.pt``, ``edit.pt``).
 
-The source code for this tutorial stage can be browsed at
-`http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki2/src/authorization/
-<http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki2/src/authorization/>`_.
 
 Access Control
 --------------
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index e8874784c..68be4ee7c 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -6,9 +6,6 @@ The starter files generated by the ``alchemy`` scaffold are very basic, but
 they provide a good orientation for the high-level patterns common to most
 :term:`url dispatch` -based :app:`Pyramid` projects.
 
-The source code for this tutorial stage can be browsed at
-`http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki2/src/basiclayout/
-<http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki2/src/basiclayout/>`_.
 
 Application Configuration with ``__init__.py``
 ----------------------------------------------
diff --git a/docs/tutorials/wiki2/definingmodels.rst b/docs/tutorials/wiki2/definingmodels.rst
index dca6238dd..bd1cb00d7 100644
--- a/docs/tutorials/wiki2/definingmodels.rst
+++ b/docs/tutorials/wiki2/definingmodels.rst
@@ -6,9 +6,6 @@ The first change we'll make to our stock ``pcreate``-generated application will
 be to define a :term:`domain model` constructor representing a wiki page.
 We'll do this inside our ``models.py`` file.
 
-The source code for this tutorial stage can be browsed at
-`http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki2/src/models/
-<http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki2/src/models/>`_.
 
 Making Edits to ``models.py``
 -----------------------------
diff --git a/docs/tutorials/wiki2/definingviews.rst b/docs/tutorials/wiki2/definingviews.rst
index 8714927c3..e83a88198 100644
--- a/docs/tutorials/wiki2/definingviews.rst
+++ b/docs/tutorials/wiki2/definingviews.rst
@@ -16,9 +16,6 @@ instance, if a call to :meth:`pyramid.config.Configurator.add_route` in
 have a ``'one'`` key with the value ``'foo'`` and a ``'two'`` key with the
 value ``'bar'``.
 
-The source code for this tutorial stage can be browsed at
-`http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki2/src/views/
-<http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki2/src/views/>`_.
 
 Declaring Dependencies in Our ``setup.py`` File
 ===============================================
diff --git a/docs/tutorials/wiki2/index.rst b/docs/tutorials/wiki2/index.rst
index bbc2fb96e..0a614cb23 100644
--- a/docs/tutorials/wiki2/index.rst
+++ b/docs/tutorials/wiki2/index.rst
@@ -9,9 +9,9 @@ tutorial is finished, the developer will have created a basic Wiki
 application with authentication.
 
 For cut and paste purposes, the source code for all stages of this
-tutorial can be browsed at
-`https://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki2/src
-<https://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki2/src>`_.
+tutorial can be browsed on GitHub at `docs/tutorials/wiki2/src
+<https://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki2/src>`_,
+which corresponds to the same location if you have Pyramid sources.
 
 .. toctree::
    :maxdepth: 2
diff --git a/docs/tutorials/wiki2/tests.rst b/docs/tutorials/wiki2/tests.rst
index 6a7cbf62d..83df86b27 100644
--- a/docs/tutorials/wiki2/tests.rst
+++ b/docs/tutorials/wiki2/tests.rst
@@ -6,9 +6,6 @@ We will now add tests for the models and the views and a few functional
 tests in the ``tests.py``.  Tests ensure that an application works, and
 that it continues to work after changes are made in the future.
 
-The source code for this tutorial stage can be browsed at
-`http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki2/src/tests/
-<http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki2/src/tests/>`_.
 
 
 Testing the Models
-- 
cgit v1.2.3


From 1e7d75e55428127865cd8bf18576fd71bdf7e5ee Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Mon, 21 Jan 2013 00:03:25 +0200
Subject: fix typos

---
 docs/narr/renderers.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/narr/renderers.rst b/docs/narr/renderers.rst
index ecf625251..5379a4a99 100644
--- a/docs/narr/renderers.rst
+++ b/docs/narr/renderers.rst
@@ -823,8 +823,8 @@ sets an ``override_renderer`` attribute on the request itself, which is the
 .. code-block:: python
    :linenos:
 
-   from pyramid.event import subscriber
-   from pyramid.event import NewRequest
+   from pyramid.events import subscriber
+   from pyramid.events import NewRequest
 
    @subscriber(NewRequest)
    def set_xmlrpc_params(event):
-- 
cgit v1.2.3


From c1b83b4ef365986e831530f62b3c1045aa524a07 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Mon, 21 Jan 2013 02:02:22 -0800
Subject: etc. is an abbreviation

---
 docs/tutorials/wiki/background.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorials/wiki/background.rst b/docs/tutorials/wiki/background.rst
index ac337abd5..6bbd5026e 100644
--- a/docs/tutorials/wiki/background.rst
+++ b/docs/tutorials/wiki/background.rst
@@ -11,7 +11,7 @@ Python web framework experience.
 
 To code along with this tutorial, the developer will need a UNIX
 machine with development tools (Mac OS X with XCode, any Linux or BSD
-variant, etc) *or* a Windows system of any kind.
+variant, etc.) *or* a Windows system of any kind.
 
 .. warning::
 
-- 
cgit v1.2.3


From 3ead59ea06ee933f4729f6b021d886be53f655be Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Mon, 21 Jan 2013 02:21:18 -0800
Subject: minor grammar, spelling

---
 docs/tutorials/wiki/design.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/tutorials/wiki/design.rst b/docs/tutorials/wiki/design.rst
index b44ccb10e..eb785dd1c 100644
--- a/docs/tutorials/wiki/design.rst
+++ b/docs/tutorials/wiki/design.rst
@@ -4,7 +4,7 @@ Design
 
 Following is a quick overview of our wiki application, to help
 us understand the changes that we will be doing next in our
-default files generated by the ``zodb`` scafffold.
+default files generated by the ``zodb`` scaffold.
 
 Overall
 -------
@@ -37,8 +37,8 @@ Views
 -----
 
 There will be three views to handle the normal operations of adding,
-editing and viewing wiki pages, plus one view for the wiki front page.
-Two templates will be used, one for viewing, and one for both for adding
+editing, and viewing wiki pages, plus one view for the wiki front page.
+Two templates will be used, one for viewing, and one for both adding
 and editing wiki pages.
 
 The default templating systems in :app:`Pyramid` are
@@ -57,7 +57,7 @@ use to do this are below.
   corresponding passwords.
 
 - GROUPS, a dictionary mapping usernames to a
-  list of groups they belong to.
+  list of groups to which they belong to.
 
 - ``groupfinder``, an *authorization callback* that looks up
   USERS and GROUPS.  It will be provided in a new
-- 
cgit v1.2.3


From e266bc346f161087037647084c92c4ad26de2739 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Mon, 21 Jan 2013 04:05:24 -0800
Subject: Grammar: either "e.g.", or "etc.", but not both in the same phrase.

---
 docs/tutorials/wiki/installation.rst | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/docs/tutorials/wiki/installation.rst b/docs/tutorials/wiki/installation.rst
index 488ab1883..b545cdba0 100644
--- a/docs/tutorials/wiki/installation.rst
+++ b/docs/tutorials/wiki/installation.rst
@@ -193,8 +193,7 @@ assumptions:
 
 .. note::
 
-   :app:`Pyramid` supports any persistent storage mechanism (e.g. a SQL
-   database or filesystem files, etc).  :app:`Pyramid` also supports an
-   additional mechanism to map URLs to code (:term:`URL dispatch`).  However,
-   for the purposes of this tutorial, we'll only be using traversal and ZODB.
-
+   :app:`Pyramid` supports any persistent storage mechanism (e.g., a SQL
+   database or filesystem files).  :app:`Pyramid` also supports an additional
+   mechanism to map URLs to code (:term:`URL dispatch`).  However, for the
+   purposes of this tutorial, we'll only be using traversal and ZODB.
-- 
cgit v1.2.3


From 2b126ef15ee7d8457592faea02f837cf2a6062d4 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Tue, 22 Jan 2013 07:51:49 +0200
Subject: consistency fixes

---
 docs/narr/renderers.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/narr/renderers.rst b/docs/narr/renderers.rst
index 5379a4a99..794e3cffa 100644
--- a/docs/narr/renderers.rst
+++ b/docs/narr/renderers.rst
@@ -73,13 +73,13 @@ which renders view return values to a :term:`JSON` response serialization.
 
 Other built-in renderers include renderers which use the :term:`Chameleon`
 templating language to render a dictionary to a response.  Additional
-renderers can be added by developers to the system as necessary (see
-:ref:`adding_and_overriding_renderers`).
+renderers can be added by developers to the system as necessary.
+See :ref:`adding_and_overriding_renderers`.
 
 Views which use a renderer and return a non-Response value can vary non-body
 response attributes (such as headers and the HTTP status code) by attaching a
-property to the ``request.response`` attribute See
-:ref:`request_response_attr`.
+property to the ``request.response`` attribute.
+See :ref:`request_response_attr`.
 
 If the :term:`view callable` associated with a :term:`view configuration`
 returns a Response object directly, any renderer associated with the view
-- 
cgit v1.2.3


From 14ffa6c187e30c2756adc548f90c8ab6de34534c Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Tue, 22 Jan 2013 08:07:31 +0200
Subject: typo

---
 docs/tutorials/wiki/basiclayout.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst
index aab22408b..756a4b3b5 100644
--- a/docs/tutorials/wiki/basiclayout.rst
+++ b/docs/tutorials/wiki/basiclayout.rst
@@ -165,7 +165,7 @@ opposed to the tutorial :term:`package` directory) looks like this:
 .. literalinclude:: src/basiclayout/development.ini
    :language: ini
 
-Note the existence of an ``[app:main]`` section which specifies our WSGI
+Note the existence of a ``[app:main]`` section which specifies our WSGI
 application.  Our ZODB database settings are specified as the
 ``zodbconn.uri`` setting within this section.  This value, and the other
 values within this section are passed as ``**settings`` to the ``main``
-- 
cgit v1.2.3


From 49d8235ccca2055ca368f751037136175f80d015 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Tue, 22 Jan 2013 00:06:20 -0800
Subject: More grammar clean up.

---
 docs/tutorials/wiki/basiclayout.rst | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst
index aab22408b..03abedbd8 100644
--- a/docs/tutorials/wiki/basiclayout.rst
+++ b/docs/tutorials/wiki/basiclayout.rst
@@ -4,7 +4,7 @@ Basic Layout
 
 The starter files generated by the ``zodb`` scaffold are basic, but
 they provide a good orientation for the high-level patterns common to most
-:term:`traversal` -based :app:`Pyramid` (and :term:`ZODB` based) projects.
+:term:`traversal` -based :app:`Pyramid` (and :term:`ZODB` -based) projects.
 
 
 Application Configuration with ``__init__.py``
@@ -12,8 +12,8 @@ Application Configuration with ``__init__.py``
 
 A directory on disk can be turned into a Python :term:`package` by containing
 an ``__init__.py`` file.  Even if empty, this marks a directory as a Python
-package.  Our application uses ``__init__.py`` as both a package marker, as
-well as to contain application configuration code.
+package.  Our application uses ``__init__.py`` both as a package marker and
+to contain application configuration code.
 
 When you run the application using the ``pserve`` command using the
 ``development.ini`` generated config file, the application configuration
@@ -28,14 +28,14 @@ point happens to be the ``main`` function within the file named
 
 #. *Lines 1-3*.  Perform some dependency imports.
 
-#. *Lines 6-8*  Define a root factory for our Pyramid application.
+#. *Lines 6-8*.  Define a root factory for our Pyramid application.
 
 #. *Line 14*.  We construct a :term:`Configurator` with a :term:`root
    factory` and the settings keywords parsed by :term:`PasteDeploy`.  The root
    factory is named ``root_factory``.
 
-#. *Line 15*.  Register a 'static view' which answers requests which start
-   with URL path ``/static`` using the
+#. *Line 15*.  Register a "static view" which answers requests whose URL path
+   start with ``/static`` using the
    :meth:`pyramid.config.Configurator.add_static_view method`.  This
    statement registers a view that will serve up static assets, such as CSS
    and image files, for us, in this case, at
@@ -44,16 +44,16 @@ point happens to be the ``main`` function within the file named
    will be ``/static``.  The second argument of this tag is the "path",
    which is a relative :term:`asset specification`, so it finds the resources
    it should serve within the ``static`` directory inside the ``tutorial``
-   package.  The scaffold could have alternately used an *absolute* asset
-   specification as the path (``tutorial:static``) but it does not.
+   package.  Alternatively the scaffold could have used an *absolute* asset
+   specification as the path (``tutorial:static``).
 
 #. *Line 16*.  Perform a :term:`scan`.  A scan will find :term:`configuration
-   decoration`, such as view configuration decorators (e.g. ``@view_config``)
+   decoration`, such as view configuration decorators (e.g., ``@view_config``)
    in the source code of the ``tutorial`` package and will take actions based
    on these decorators.  We don't pass any arguments to
    :meth:`~pyramid.config.Configurator.scan`, which implies that the scan
    should take place in the current package (in this case, ``tutorial``).
-   The scaffold could have equivalently said ``config.scan('tutorial')`` but
+   The scaffold could have equivalently said ``config.scan('tutorial')``, but
    it chose to omit the package name argument.
 
 #. *Line 17*.  Use the
@@ -70,7 +70,7 @@ tree represents the site structure, but it *also* represents the
 :term:`domain model` of the application, because each resource is a node
 stored persistently in a :term:`ZODB` database.  The ``models.py`` file is
 where the ``zodb`` scaffold put the classes that implement our
-resource objects, each of which happens also to be a domain model object.
+resource objects, each of which also happens to be a domain model object.
 
 Here is the source for ``models.py``:
 
@@ -79,7 +79,7 @@ Here is the source for ``models.py``:
       :language: py
 
 #. *Lines 4-5*.  The ``MyModel`` :term:`resource` class is implemented here.
-   Instances of this class will be capable of being persisted in :term:`ZODB`
+   Instances of this class are capable of being persisted in :term:`ZODB`
    because the class inherits from the
    :class:`persistent.mapping.PersistentMapping` class.  The ``__parent__``
    and ``__name__`` are important parts of the :term:`traversal` protocol.
@@ -137,7 +137,7 @@ Let's try to understand the components in this module:
    indeed if you look in the ``templates`` directory of this package, you'll
    see a ``mytemplate.pt`` template file, which renders the default home page
    of the generated project.  This asset specification is *relative* (to the
-   view.py's current package).  We could have alternately an used the
+   view.py's current package).  Alternatively we could have used the
    absolute asset specification ``tutorial:templates/mytemplate.pt``, but
    chose to use the relative version.
 
-- 
cgit v1.2.3


From f1134866e8ca96e1309dca930bd5345233748659 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Tue, 22 Jan 2013 00:16:17 -0800
Subject: More grammar clean up.

---
 docs/tutorials/wiki/definingmodels.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/tutorials/wiki/definingmodels.rst b/docs/tutorials/wiki/definingmodels.rst
index 1d2710975..49372179f 100644
--- a/docs/tutorials/wiki/definingmodels.rst
+++ b/docs/tutorials/wiki/definingmodels.rst
@@ -33,7 +33,7 @@ Edit ``models.py``
 .. note::
 
   There is nothing automagically special about the filename ``models.py``.  A
-  project may have many models throughout its codebase in arbitrarily-named
+  project may have many models throughout its codebase in arbitrarily named
   files.  Files implementing models often have ``model`` in their filenames,
   or they may live in a Python subpackage of your application package named
   ``models``, but this is only by convention.
@@ -56,7 +56,7 @@ of the root model is also always ``None``.
 Then we'll add a ``Page`` class.  This class should inherit from the
 :class:`persistent.Persistent` class.  We'll also give it an ``__init__``
 method that accepts a single parameter named ``data``.  This parameter will
-contain the :term:`ReStructuredText` body representing the wiki page content.
+contain the :term:`reStructuredText` body representing the wiki page content.
 Note that ``Page`` objects don't have an initial ``__name__`` or
 ``__parent__`` attribute.  All objects in a traversal graph must have a
 ``__name__`` and a ``__parent__`` attribute.  We don't specify these here
-- 
cgit v1.2.3


From 8db6a62012ea707c5785fbfb565bd80aca685f04 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Tue, 22 Jan 2013 23:24:22 +0200
Subject: rm redundant info; this is just a repeat of what is already displayed

---
 pyramid/config/__init__.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 90bd89116..6a957901e 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -104,13 +104,6 @@ class Configurator(
     A Configurator is used to configure a :app:`Pyramid`
     :term:`application registry`.
 
-    The Configurator accepts a number of arguments: ``registry``,
-    ``package``, ``settings``, ``root_factory``, ``authentication_policy``,
-    ``authorization_policy``, ``renderers``, ``debug_logger``,
-    ``locale_negotiator``, ``request_factory``, ``renderer_globals_factory``,
-    ``default_permission``, ``session_factory``, ``default_view_mapper``,
-    ``autocommit``, ``exceptionresponse_view`` and ``route_prefix``.
-
     If the ``registry`` argument is passed as a non-``None`` value, it must
     be an instance of the :class:`pyramid.registry.Registry` class
     representing the registry to configure.  If ``registry`` is ``None``, the
-- 
cgit v1.2.3


From 0bf0919151be46a759efaf92c697e5bce2a2e8f0 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Tue, 22 Jan 2013 23:48:45 +0200
Subject: use simpler language

---
 pyramid/config/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 6a957901e..175d8f3a4 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -104,7 +104,7 @@ class Configurator(
     A Configurator is used to configure a :app:`Pyramid`
     :term:`application registry`.
 
-    If the ``registry`` argument is passed as a non-``None`` value, it must
+    If the ``registry`` argument is not ``None``, it must
     be an instance of the :class:`pyramid.registry.Registry` class
     representing the registry to configure.  If ``registry`` is ``None``, the
     configurator will create a :class:`pyramid.registry.Registry` instance
-- 
cgit v1.2.3


From 60270f462baeaa0b1818666776d6826dd6bbb7d3 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Wed, 23 Jan 2013 00:27:57 +0200
Subject: a more accurate note

---
 pyramid/config/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 175d8f3a4..724bc7522 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -112,9 +112,9 @@ class Configurator(
     otherwise be done.  After its construction, the configurator may be used
     to add further configuration to the registry.
 
-    .. warning:: If a ``registry`` is passed to the Configurator
-       constructor, all other constructor arguments except ``package``
-       are ignored.
+    .. warning:: If ``registry`` is assigned the above-mentioned class
+       instance, all other constructor arguments are ignored,
+       with the exception of ``package``.
 
     If the ``package`` argument is passed, it must be a reference to a Python
     :term:`package` (e.g. ``sys.modules['thepackage']``) or a :term:`dotted
-- 
cgit v1.2.3


From e5a9f85ee306cfdf3de5edf66303f46240fa5fbe Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Wed, 23 Jan 2013 00:41:05 +0200
Subject: consistency fix

---
 pyramid/config/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 724bc7522..5bc03c4cc 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -152,7 +152,7 @@ class Configurator(
     configured into this application (each tuple representing a set of
     positional values that should be passed to
     :meth:`pyramid.config.Configurator.add_renderer`).  If
-    it is not passed, a default set of renderer factories is used.
+    it is ``None``, a default set of renderer factories is used.
 
     If ``debug_logger`` is not passed, a default debug logger that logs to a
     logger will be used (the logger name will be the package name of the
-- 
cgit v1.2.3


From 5c351ac6cec6dfc4c1b5e92963bf910055db19ef Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Wed, 23 Jan 2013 00:41:32 +0200
Subject: add missing comma

---
 pyramid/config/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 5bc03c4cc..7252ed14e 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -211,7 +211,7 @@ class Configurator(
     :meth:`pyramid.config.Configurator.commit` is called.  When
     :meth:`pyramid.config.Configurator.commit` is called, the actions implied
     by the called methods will be checked for configuration conflicts unless
-    ``autocommit`` is ``True``.  If a conflict is detected a
+    ``autocommit`` is ``True``.  If a conflict is detected, a
     ``ConfigurationConflictError`` will be raised.  Calling
     :meth:`pyramid.config.Configurator.make_wsgi_app` always implies a final
     commit.
-- 
cgit v1.2.3


From d0e6521791110753e3d68f94b90d4bd1a1b0bc9c Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Wed, 23 Jan 2013 00:43:13 +0200
Subject: formatting fix

---
 pyramid/config/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 7252ed14e..9ce374b69 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -219,7 +219,7 @@ class Configurator(
     If ``default_view_mapper`` is passed, it will be used as the default
     :term:`view mapper` factory for view configurations that don't otherwise
     specify one (see :class:`pyramid.interfaces.IViewMapperFactory`).  If a
-    default_view_mapper is not passed, a superdefault view mapper will be
+    ``default_view_mapper`` is not passed, a superdefault view mapper will be
     used.
 
     If ``exceptionresponse_view`` is passed, it must be a :term:`view
-- 
cgit v1.2.3


From a3f67c1b06e5aba8f1e712a196660354ad17893c Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Wed, 23 Jan 2013 00:45:09 +0200
Subject: remove extraneous 'a'

---
 pyramid/config/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 9ce374b69..1beb80294 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -218,7 +218,7 @@ class Configurator(
 
     If ``default_view_mapper`` is passed, it will be used as the default
     :term:`view mapper` factory for view configurations that don't otherwise
-    specify one (see :class:`pyramid.interfaces.IViewMapperFactory`).  If a
+    specify one (see :class:`pyramid.interfaces.IViewMapperFactory`).  If
     ``default_view_mapper`` is not passed, a superdefault view mapper will be
     used.
 
-- 
cgit v1.2.3


From 0b23b34cf7f759d7f2895696b8ec07c3a4d1e80a Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Wed, 23 Jan 2013 01:43:48 +0200
Subject: pyramid.config: take advantage of some Sphinx directives

* versionadded
* versionchanged
* deprecated
---
 docs/api/config.rst         |  8 ++------
 pyramid/config/__init__.py  | 36 ++++++++++++++++++++++++------------
 pyramid/config/adapters.py  | 11 ++++-------
 pyramid/config/rendering.py |  8 +++-----
 pyramid/config/routes.py    | 28 ++++++++++++++--------------
 pyramid/config/testing.py   | 14 ++++++--------
 pyramid/config/tweens.py    |  2 +-
 pyramid/config/views.py     | 27 +++++++++++----------------
 8 files changed, 65 insertions(+), 69 deletions(-)

diff --git a/docs/api/config.rst b/docs/api/config.rst
index e6a67830e..39d504348 100644
--- a/docs/api/config.rst
+++ b/docs/api/config.rst
@@ -108,9 +108,7 @@
         :class:`pyramid.registry.Introspectable` class (used during
         directives to provide introspection to actions).
 
-        .. note::
-
-           This attribute is new as of :app:`Pyramid` 1.3.
+        .. versionadded:: 1.3
 
      .. attribute:: introspector
 
@@ -118,9 +116,7 @@
         instance implementing the :class:`pyramid.interfaces.IIntrospector`
         interface.
 
-        .. note::
-
-           This attribute is new as of :app:`Pyramid` 1.3.
+        .. versionadded:: 1.3
 
      .. attribute:: registry
 
diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 1beb80294..769da4cc5 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -175,10 +175,9 @@ class Configurator(
     same.  See :ref:`adding_renderer_globals`.  By default, it is ``None``,
     which means use no renderer globals factory.
 
-    .. warning::
-
-       as of Pyramid 1.1, ``renderer_globals_factory`` is deprecated.  Instead,
-       use a BeforeRender event subscriber as per :ref:`beforerender_event`.
+    .. deprecated:: 1.1
+       Use a BeforeRender event subscriber as per :ref:`beforerender_event`
+       in place of ``renderer_globals_factory``.
 
     If ``default_permission`` is passed, it should be a
     :term:`permission` string to be used as the default permission for
@@ -229,18 +228,26 @@ class Configurator(
     be registered, and all raised exception responses will be bubbled up to
     Pyramid's caller.  By
     default, the ``pyramid.httpexceptions.default_exceptionresponse_view``
-    function is used as the ``exceptionresponse_view``.  This argument is new
-    in Pyramid 1.1.
+    function is used as the ``exceptionresponse_view``.
 
     If ``route_prefix`` is passed, all routes added with
     :meth:`pyramid.config.Configurator.add_route` will have the specified path
-    prepended to their pattern. This parameter is new in Pyramid 1.2.
+    prepended to their pattern.
 
     If ``introspection`` is passed, it must be a boolean value.  If it's
     ``True``, introspection values during actions will be kept for use
     for tools like the debug toolbar.  If it's ``False``, introspection
     values provided by registrations will be ignored.  By default, it is
-    ``True``.  This parameter is new as of Pyramid 1.3.
+    ``True``.
+
+    .. versionadded:: 1.1
+       The ``exceptionresponse_view`` argument.
+
+    .. versionadded:: 1.2
+       The ``route_prefix`` argument.
+
+    .. versionadded:: 1.3
+       The ``introspection`` argument.
     """
     manager = manager # for testing injection
     venusian = venusian # for testing injection
@@ -714,7 +721,9 @@ class Configurator(
         because the ``route_prefix`` argument will be prepended to the
         pattern.
 
-        The ``route_prefix`` parameter is new as of Pyramid 1.2.
+        .. versionadded:: 1.2
+           The ``route_prefix`` parameter.
+
         """
         # """ <-- emacs
 
@@ -912,8 +921,6 @@ class Configurator(
         and scanned.  See the :term:`Venusian` documentation for more
         information about the ``ignore`` argument.
 
-        .. note:: the ``ignore`` argument is new in Pyramid 1.3.
-        
         To perform a ``scan``, Pyramid creates a Venusian ``Scanner`` object.
         The ``kw`` argument represents a set of keyword arguments to pass to
         the Venusian ``Scanner`` object's constructor.  See the
@@ -925,7 +932,12 @@ class Configurator(
         may require additional arguments.  Providing this argument is not
         often necessary; it's an advanced usage.
 
-        .. note:: the ``**kw`` argument is new in Pyramid 1.1
+        .. versionadded:: 1.1
+           The ``**kw`` argument.
+
+        .. versionadded:: 1.3
+           The ``ignore`` argument.
+
         """
         package = self.maybe_dotted(package)
         if package is None: # pragma: no cover
diff --git a/pyramid/config/adapters.py b/pyramid/config/adapters.py
index dad60660a..3ce0680af 100644
--- a/pyramid/config/adapters.py
+++ b/pyramid/config/adapters.py
@@ -38,9 +38,8 @@ class AdaptersConfiguratorMixin(object):
         :meth:`pyramid.config.Configurator.add_subscriber_predicate` before it
         can be used.  See :ref:`subscriber_predicates` for more information.
 
-        .. note::
-
-           THe ``**predicates`` argument is new as of Pyramid 1.4.
+        .. versionadded:: 1.4
+           The ``**predicates`` argument.
         """
         dotted = self.maybe_dotted
         subscriber, iface = dotted(subscriber), dotted(iface)
@@ -274,6 +273,8 @@ class AdaptersConfiguratorMixin(object):
     @action_method
     def add_resource_url_adapter(self, adapter, resource_iface=None):
         """
+        .. versionadded:: 1.3
+
         When you add a traverser as described in
         :ref:`changing_the_traverser`, it's convenient to continue to use the
         :meth:`pyramid.request.Request.resource_url` API.  However, since the
@@ -299,10 +300,6 @@ class AdaptersConfiguratorMixin(object):
         ``None``, the url adapter will be used for every type of resource.
 
         See :ref:`changing_resource_url` for more information.
-
-        .. note::
-
-           This API is new in Pyramid 1.3.
         """
         adapter = self.maybe_dotted(adapter)
         resource_iface = self.maybe_dotted(resource_iface)
diff --git a/pyramid/config/rendering.py b/pyramid/config/rendering.py
index 4f33b23d9..356bf033e 100644
--- a/pyramid/config/rendering.py
+++ b/pyramid/config/rendering.py
@@ -73,11 +73,9 @@ class RenderingConfiguratorMixin(object):
         dictionary, and therefore will be made available to the code
         which uses the renderer.
 
-        .. warning::
-
-           This method is deprecated as of Pyramid 1.1.  Use a BeforeRender
-           event subscriber as documented in the :ref:`hooks_chapter` chapter
-           instead.
+        .. deprecated:: 1.1
+           Use a BeforeRender event subscriber as documented in the
+           :ref:`hooks_chapter` chapter instead.
 
         .. note::
 
diff --git a/pyramid/config/routes.py b/pyramid/config/routes.py
index e06d0fecd..7a7bbae1a 100644
--- a/pyramid/config/routes.py
+++ b/pyramid/config/routes.py
@@ -142,7 +142,7 @@ class RoutesConfiguratorMixin(object):
           request; it will only be useful for URL generation.  By default,
           ``static`` is ``False``.  See :ref:`static_route_narr`.
 
-          .. note:: New in :app:`Pyramid` 1.1.
+          .. versionadded:: 1.1
 
         Predicate Arguments
 
@@ -180,9 +180,9 @@ class RoutesConfiguratorMixin(object):
           will match if the request has *any* request method.  If this
           predicate returns ``False``, route matching continues.
 
-          .. note:: The ability to pass a tuple of items as
-                   ``request_method`` is new as of Pyramid 1.2.  Previous
-                   versions allowed only a string.
+          .. versionchanged:: 1.2
+             The ability to pass a tuple of items as ``request_method``.
+             Previous versions allowed only a string.
 
         path_info
 
@@ -276,8 +276,10 @@ class RoutesConfiguratorMixin(object):
           :meth:`pyramid.config.Configurator.add_view_predicate`.  More than
           one key/value pair can be used at the same time.  See
           :ref:`view_and_route_predicates` for more information about
-          third-party predicates.  This argument is new as of Pyramid 1.4.
-          
+          third-party predicates.
+
+          .. versionadded:: 1.4
+
         View-Related Arguments
 
         .. warning::
@@ -291,7 +293,7 @@ class RoutesConfiguratorMixin(object):
 
         view
 
-          .. warning:: Deprecated as of :app:`Pyramid` 1.1.
+          .. deprecated:: 1.1
 
           A Python object or :term:`dotted Python name` to the same
           object that will be used as a view callable when this route
@@ -299,7 +301,7 @@ class RoutesConfiguratorMixin(object):
 
         view_context
 
-          .. warning:: Deprecated as of :app:`Pyramid` 1.1.
+          .. deprecated:: 1.1
 
           A class or an :term:`interface` or :term:`dotted Python
           name` to the same object which the :term:`context` of the
@@ -315,7 +317,7 @@ class RoutesConfiguratorMixin(object):
 
         view_permission
 
-          .. warning:: Deprecated as of :app:`Pyramid` 1.1.
+          .. deprecated:: 1.1
 
           The permission name required to invoke the view associated
           with this route.  e.g. ``edit``. (see
@@ -329,7 +331,7 @@ class RoutesConfiguratorMixin(object):
 
         view_renderer
 
-          .. warning:: Deprecated as of :app:`Pyramid` 1.1.
+          .. deprecated:: 1.1
 
           This is either a single string term (e.g. ``json``) or a
           string implying a path or :term:`asset specification`
@@ -353,7 +355,7 @@ class RoutesConfiguratorMixin(object):
 
         view_attr
 
-          .. warning:: Deprecated as of :app:`Pyramid` 1.1.
+          .. deprecated:: 1.1
 
           The view machinery defaults to using the ``__call__`` method
           of the view callable (or the function itself, if the view
@@ -491,9 +493,7 @@ class RoutesConfiguratorMixin(object):
 
         See :ref:`view_and_route_predicates` for more information.
 
-        .. note::
-
-           This method is new as of Pyramid 1.4.
+        .. versionadded:: 1.4
         """
         self._add_predicate(
             'route',
diff --git a/pyramid/config/testing.py b/pyramid/config/testing.py
index 7141a5049..2ab85b1f5 100644
--- a/pyramid/config/testing.py
+++ b/pyramid/config/testing.py
@@ -37,19 +37,11 @@ class TestingConfiguratorMixin(object):
         not provided (or it is provided, and is ``None``), the default value
         ``[]`` (the empty list) will be returned by ``remember``.
 
-        .. note::
-
-           ``remember_result`` is new as of Pyramid 1.4.
-
         ``forget_result``, if provided, should be the result returned by
         the ``forget`` method of the faux authentication policy.  If it is
         not provided (or it is provided, and is ``None``), the default value
         ``[]`` (the empty list) will be returned by ``forget``.
 
-        .. note::
-
-           ``forget_result`` is new as of Pyramid 1.4.
-
         The behavior of the registered :term:`authentication policy`
         depends on the values provided for the ``userid`` and
         ``groupids`` argument.  The authentication policy will return
@@ -64,6 +56,12 @@ class TestingConfiguratorMixin(object):
         :func:`pyramid.security.authenticated_userid`,
         :func:`pyramid.security.effective_principals`, and
         :func:`pyramid.security.principals_allowed_by_permission`.
+
+        .. versionadded:: 1.4
+           The ``remember_result`` argument.
+
+        .. versionadded:: 1.4
+           The ``forget_result`` argument.
         """
         from pyramid.testing import DummySecurityPolicy
         policy = DummySecurityPolicy(
diff --git a/pyramid/config/tweens.py b/pyramid/config/tweens.py
index 1bc6dc95c..cd14c9ff6 100644
--- a/pyramid/config/tweens.py
+++ b/pyramid/config/tweens.py
@@ -24,7 +24,7 @@ from pyramid.config.util import (
 class TweensConfiguratorMixin(object):
     def add_tween(self, tween_factory, under=None, over=None):
         """
-        .. note:: This feature is new as of Pyramid 1.2.
+        .. versionadded:: 1.2
 
         Add a 'tween factory'.  A :term:`tween` (a contraction of 'between')
         is a bit of code that sits between the Pyramid router's main request
diff --git a/pyramid/config/views.py b/pyramid/config/views.py
index e4217f2f3..de96363de 100644
--- a/pyramid/config/views.py
+++ b/pyramid/config/views.py
@@ -710,7 +710,7 @@ class ViewsConfiguratorMixin(object):
 
         http_cache
 
-          .. note:: This feature is new as of Pyramid 1.1.
+          .. versionadded:: 1.1
 
           When you supply an ``http_cache`` value to a view configuration,
           the ``Expires`` and ``Cache-Control`` headers of a response
@@ -877,9 +877,9 @@ class ViewsConfiguratorMixin(object):
           supplied value.  Note that use of ``GET`` also implies that the
           view will respond to ``HEAD`` as of Pyramid 1.4.
 
-          .. note:: The ability to pass a tuple of items as
-                   ``request_method`` is new as of Pyramid 1.2.  Previous
-                   versions allowed only a string.
+          .. versionchanged:: 1.2
+             The ability to pass a tuple of items as ``request_method`` is
+             new as of Pyramid 1.2.  Previous versions allowed only a string.
 
         request_param
 
@@ -897,7 +897,7 @@ class ViewsConfiguratorMixin(object):
 
         match_param
 
-          .. note:: This feature is new as of :app:`Pyramid` 1.2.
+          .. versionadded:: 1.2
 
           This value can be a string of the format "key=value" or a tuple
           containing one or more of these strings.
@@ -1354,7 +1354,10 @@ class ViewsConfiguratorMixin(object):
     @action_method
     def add_view_predicate(self, name, factory, weighs_more_than=None,
                            weighs_less_than=None):
-        """ Adds a view predicate factory.  The associated view predicate can
+        """
+        .. versionadded:: 1.4
+
+        Adds a view predicate factory.  The associated view predicate can
         later be named as a keyword argument to
         :meth:`pyramid.config.Configurator.add_view` in the
         ``predicates`` anonyous keyword argument dictionary.
@@ -1366,10 +1369,6 @@ class ViewsConfiguratorMixin(object):
         ``factory`` should be a :term:`predicate factory`.
 
         See :ref:`view_and_route_predicates` for more information.
-
-        .. note::
-
-           This method is new as of Pyramid 1.4.
         """
         self._add_predicate(
             'view',
@@ -1557,9 +1556,7 @@ class ViewsConfiguratorMixin(object):
         ``for_``, or ``http_cache`` keyword arguments.  These argument values
         make no sense in the context of a forbidden view.
 
-        .. note::
-
-           This method is new as of Pyramid 1.3.
+        .. versionadded:: 1.3
         """
         for arg in ('name', 'permission', 'context', 'for_', 'http_cache'):
             if arg in predicates:
@@ -1646,9 +1643,7 @@ class ViewsConfiguratorMixin(object):
         Pyramid will return the result of the view callable provided as
         ``view``, as normal.
 
-        .. note::
-
-           This method is new as of Pyramid 1.3.
+        .. versionadded:: 1.3
         """
         for arg in ('name', 'permission', 'context', 'for_', 'http_cache'):
             if arg in predicates:
-- 
cgit v1.2.3


From 3778e8fc2ff2f26d768c8bf6ea2563349a83acc2 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Wed, 23 Jan 2013 21:27:14 +0200
Subject: improve paragraph

inspired by https://github.com/Pylons/pyramid/pull/815#discussion_r2737923
---
 pyramid/config/__init__.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 769da4cc5..d662c7d3a 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -147,12 +147,12 @@ class Configurator(
        authorization policy is supplied without also supplying an
        authentication policy (authorization requires authentication).
 
-    If ``renderers`` is passed, it should be a list of tuples
-    representing a set of :term:`renderer` factories which should be
-    configured into this application (each tuple representing a set of
+    If ``renderers`` is ``None`` (the default), a default set of
+    :term:`renderer` factories is used. Else, it should be a list of
+    tuples representing a set of renderer factories which should be
+    configured into this application, and each tuple representing a set of
     positional values that should be passed to
-    :meth:`pyramid.config.Configurator.add_renderer`).  If
-    it is ``None``, a default set of renderer factories is used.
+    :meth:`pyramid.config.Configurator.add_renderer`.
 
     If ``debug_logger`` is not passed, a default debug logger that logs to a
     logger will be used (the logger name will be the package name of the
-- 
cgit v1.2.3


From b515ddcf759ebe267b9ee74a1d5af72da8639ae0 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Wed, 23 Jan 2013 21:56:28 +0200
Subject: displaying line numbers for 1-line snippets is overkill

---
 docs/narr/renderers.rst | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/docs/narr/renderers.rst b/docs/narr/renderers.rst
index 794e3cffa..5391a6669 100644
--- a/docs/narr/renderers.rst
+++ b/docs/narr/renderers.rst
@@ -63,7 +63,6 @@ the ``renderer`` attribute.  For example, this call to
 with a view callable:
 
 .. code-block:: python
-   :linenos:
 
    config.add_view('myproject.views.my_view', renderer='json')
 
@@ -166,7 +165,6 @@ The body of the response returned by such a view will be a string
 representing the ``str()`` serialization of the return value:
 
 .. code-block:: python
-   :linenos:
 
    {'content': 'Hello!'}
 
@@ -204,7 +202,6 @@ The body of the response returned by such a view will be a string
 representing the JSON serialization of the return value:
 
 .. code-block:: python
-   :linenos:
 
    '{"content": "Hello!"}'
 
@@ -619,7 +616,6 @@ For example, to add a renderer which renders views which have a
 ``renderer`` attribute that is a path that ends in ``.jinja2``:
 
 .. code-block:: python
-   :linenos:
 
    config.add_renderer('.jinja2', 'mypackage.MyJinja2Renderer')
 
@@ -725,10 +721,8 @@ Here's an example of the registration of a more complicated renderer
 factory, which expects to be passed a filesystem path:
 
 .. code-block:: python
-   :linenos:
 
-   config.add_renderer(name='.jinja2',
-                       factory='my.package.MyJinja2Renderer')
+   config.add_renderer(name='.jinja2', factory='my.package.MyJinja2Renderer')
 
 Adding the above code to your application startup will allow you to use the
 ``my.package.MyJinja2Renderer`` renderer factory implementation in view
@@ -769,7 +763,6 @@ extension for the same kinds of templates.  For example, to associate the
 :meth:`pyramid.config.Configurator.add_renderer` method:
 
 .. code-block:: python
-   :linenos:
 
    config.add_renderer('.zpt', 'pyramid.chameleon_zpt.renderer_factory')
 
@@ -781,7 +774,6 @@ rendered via a Chameleon ZPT page template renderer, use a variation on the
 following in your application's startup code:
 
 .. code-block:: python
-   :linenos:
 
    config.add_renderer('.pt', 'mypackage.pt_renderer')
 
@@ -794,7 +786,6 @@ ones which do not possess a ``renderer`` attribute), pass ``None`` as
 the ``name`` attribute to the renderer tag:
 
 .. code-block:: python
-   :linenos:
 
    config.add_renderer(None, 'mypackage.json_renderer_factory')
 
-- 
cgit v1.2.3


From 5ed0d3df82787f95338a0dffa8c6a56efb28c6ee Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Wed, 23 Jan 2013 21:59:46 +0200
Subject: use 'versionadded' Sphinx directive

---
 docs/narr/renderers.rst | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/docs/narr/renderers.rst b/docs/narr/renderers.rst
index 5391a6669..deb0f6ee8 100644
--- a/docs/narr/renderers.rst
+++ b/docs/narr/renderers.rst
@@ -291,9 +291,8 @@ with the object.
 See :class:`pyramid.renderers.JSON` and
 :ref:`adding_and_overriding_renderers` for more information.
 
-.. note::
-
-   Serializing custom objects is a feature new in Pyramid 1.4.
+.. versionadded:: 1.4
+   Serializing custom objects.
 
 .. index::
    pair: renderer; JSONP
@@ -303,9 +302,7 @@ See :class:`pyramid.renderers.JSON` and
 JSONP Renderer
 ~~~~~~~~~~~~~~
 
-.. note::
-
-   This feature is new in Pyramid 1.1.
+.. versionadded:: 1.1
 
 :class:`pyramid.renderers.JSONP` is a `JSONP
 <http://en.wikipedia.org/wiki/JSONP>`_ renderer factory helper which
-- 
cgit v1.2.3


From 2947141248946db191843c5bc1629c60e7ad8f3a Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Wed, 23 Jan 2013 22:00:10 +0200
Subject: user 'deprecated' Sphinx directive

---
 docs/narr/renderers.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/narr/renderers.rst b/docs/narr/renderers.rst
index deb0f6ee8..b7d3479dc 100644
--- a/docs/narr/renderers.rst
+++ b/docs/narr/renderers.rst
@@ -565,7 +565,8 @@ in :ref:`request_module`.  For more information on the API of
 Deprecated Mechanism to Vary Attributes of Rendered Responses
 -------------------------------------------------------------
 
-.. warning:: This section describes behavior deprecated in Pyramid 1.1.
+.. deprecated:: 1.1
+   The behavior described in this entire section.
 
 In previous releases of Pyramid (1.0 and before), the ``request.response``
 attribute did not exist.  Instead, Pyramid required users to set special
-- 
cgit v1.2.3


From 531a2ad34ab0a806513681cddd5d99e50a31c4c6 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Wed, 23 Jan 2013 22:01:56 +0200
Subject: provide a link to the class; lineno for a 1-liner is overkill

---
 docs/narr/renderers.rst | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/docs/narr/renderers.rst b/docs/narr/renderers.rst
index b7d3479dc..863932e83 100644
--- a/docs/narr/renderers.rst
+++ b/docs/narr/renderers.rst
@@ -683,12 +683,10 @@ There are essentially two different kinds of renderer factories:
    :term:`package`.
 
 Here's an example of the registration of a simple renderer factory via
-:meth:`~pyramid.config.Configurator.add_renderer`:
+:meth:`~pyramid.config.Configurator.add_renderer`, where ``config``
+is an instance of :meth:`pyramid.config.Configurator`:
 
 .. code-block:: python
-   :linenos:
-
-   # config is an instance of pyramid.config.Configurator
 
    config.add_renderer(name='amf', factory='my.package.MyAMFRenderer')
 
-- 
cgit v1.2.3


From e74345205792070d85739ad447f68f1276d3e074 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Fri, 25 Jan 2013 01:12:30 +0200
Subject: typo

---
 pyramid/renderers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyramid/renderers.py b/pyramid/renderers.py
index 6839d72f5..98c84451d 100644
--- a/pyramid/renderers.py
+++ b/pyramid/renderers.py
@@ -70,7 +70,7 @@ def render(renderer_name, value, request=None, package=None):
     top-level system names, such as ``request``, ``context``,
     ``renderer_name``, and ``view``.  See :ref:`renderer_system_values` for
     the full list.  If :term:`renderer globals` have been specified, these
-    will also be used to agument the value.
+    will also be used to augment the value.
 
     Supply a ``request`` parameter in order to provide the renderer
     with the most correct 'system' values (``request`` and ``context``
-- 
cgit v1.2.3


From 00cee701066fc558d0becfa3bade7ce282600d6e Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Fri, 25 Jan 2013 01:15:10 +0200
Subject: be a little more concise

---
 pyramid/renderers.py | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/pyramid/renderers.py b/pyramid/renderers.py
index 98c84451d..6310b7fee 100644
--- a/pyramid/renderers.py
+++ b/pyramid/renderers.py
@@ -43,23 +43,23 @@ from pyramid.threadlocal import get_current_registry
 # API
 
 def render(renderer_name, value, request=None, package=None):
-    """ Using the renderer specified as ``renderer_name`` (a template
-    or a static renderer) render the value (or set of values) present
+    """ Using the renderer ``renderer_name`` (a template
+    or a static renderer), render the value (or set of values) present
     in ``value``. Return the result of the renderer's ``__call__``
     method (usually a string or Unicode).
 
-    If the renderer name refers to a file on disk (such as when the
-    renderer is a template), it's usually best to supply the name as a
+    If the ``renderer_name`` refers to a file on disk, such as when the
+    renderer is a template, it's usually best to supply the name as an
     :term:`asset specification`
     (e.g. ``packagename:path/to/template.pt``).
 
     You may supply a relative asset spec as ``renderer_name``.  If
     the ``package`` argument is supplied, a relative renderer path
     will be converted to an absolute asset specification by
-    combining the package supplied as ``package`` with the relative
-    asset specification supplied as ``renderer_name``.  If you do
-    not supply a ``package`` (or ``package`` is ``None``) the package
-    name of the *caller* of this function will be used as the package.
+    combining the package ``package`` with the relative
+    asset specification ``renderer_name``.  If ``package``
+    is ``None`` (the default), the package name of the *caller* of
+    this function will be used as the package.
 
     The ``value`` provided will be supplied as the input to the
     renderer.  Usually, for template renderings, this should be a
@@ -88,8 +88,8 @@ def render(renderer_name, value, request=None, package=None):
     return helper.render(value, None, request=request)
 
 def render_to_response(renderer_name, value, request=None, package=None):
-    """ Using the renderer specified as ``renderer_name`` (a template
-    or a static renderer) render the value (or set of values) using
+    """ Using the renderer ``renderer_name`` (a template
+    or a static renderer), render the value (or set of values) using
     the result of the renderer's ``__call__`` method (usually a string
     or Unicode) as the response body.
 
@@ -100,8 +100,8 @@ def render_to_response(renderer_name, value, request=None, package=None):
     You may supply a relative asset spec as ``renderer_name``.  If
     the ``package`` argument is supplied, a relative renderer name
     will be converted to an absolute asset specification by
-    combining the package supplied as ``package`` with the relative
-    asset specification supplied as ``renderer_name``.  If you do
+    combining the package ``package`` with the relative
+    asset specification ``renderer_name``.  If you do
     not supply a ``package`` (or ``package`` is ``None``) the package
     name of the *caller* of this function will be used as the package.
 
@@ -134,16 +134,15 @@ def render_to_response(renderer_name, value, request=None, package=None):
     return helper.render_to_response(value, None, request=request)
 
 def get_renderer(renderer_name, package=None):
-    """ Return the renderer object for the renderer named as
-    ``renderer_name``.
+    """ Return the renderer object for the renderer ``renderer_name``.
 
     You may supply a relative asset spec as ``renderer_name``.  If
     the ``package`` argument is supplied, a relative renderer name
     will be converted to an absolute asset specification by
-    combining the package supplied as ``package`` with the relative
-    asset specification supplied as ``renderer_name``.  If you do
-    not supply a ``package`` (or ``package`` is ``None``) the package
-    name of the *caller* of this function will be used as the package.
+    combining the package ``package`` with the relative
+    asset specification ``renderer_name``.  If ``package`` is ``None``
+    (the default), the package name of the *caller* of this function
+    will be used as the package.
     """
     if package is None:
         package = caller_package()
-- 
cgit v1.2.3


From d633c8e8508b8d77c9bec506d60bc4b908c06ce6 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Fri, 25 Jan 2013 08:21:44 +0200
Subject: replace 'note' with 'versionadded'

---
 pyramid/path.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyramid/path.py b/pyramid/path.py
index e9c63a365..8d05a8ba2 100644
--- a/pyramid/path.py
+++ b/pyramid/path.py
@@ -114,7 +114,7 @@ class AssetResolver(Resolver):
     """ A class used to resolve an :term:`asset specification` to an
     :term:`asset descriptor`.
 
-    .. note:: This API is new as of Pyramid 1.3.
+    .. versionadded:: 1.3
 
     The constructor accepts a single argument named ``package`` which may be
     any of:
@@ -209,7 +209,7 @@ class DottedNameResolver(Resolver):
     """ A class used to resolve a :term:`dotted Python name` to a package or
     module object.
 
-    .. note:: This API is new as of Pyramid 1.3.
+    .. versionadded:: 1.3
 
     The constructor accepts a single argument named ``package`` which may be
     any of:
-- 
cgit v1.2.3


From eb81eb14ccad662c90d77890947630ccf115f8f7 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Fri, 25 Jan 2013 08:30:54 +0200
Subject: make path API docs a bit more concise

---
 pyramid/path.py | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/pyramid/path.py b/pyramid/path.py
index 8d05a8ba2..57eccdb19 100644
--- a/pyramid/path.py
+++ b/pyramid/path.py
@@ -133,20 +133,19 @@ class AssetResolver(Resolver):
     to the :meth:`~pyramid.path.AssetResolver.resolve` method.  An asset
     specification without a colon in it is treated as relative.
 
-    If the value ``None`` is supplied as the ``package``, the resolver will
+    If ``package`` is ``None``, the resolver will
     only be able to resolve fully qualified (not relative) asset
     specifications.  Any attempt to resolve a relative asset specification
-    when the ``package`` is ``None`` will result in an :exc:`ValueError`
-    exception.
+    will result in an :exc:`ValueError` exception.
 
-    If the value :attr:`pyramid.path.CALLER_PACKAGE` is supplied as the
-    ``package``, the resolver will treat relative asset specifications as
+    If ``package`` is :attr:`pyramid.path.CALLER_PACKAGE`,
+    the resolver will treat relative asset specifications as
     relative to the caller of the :meth:`~pyramid.path.AssetResolver.resolve`
     method.
 
-    If a *module* or *module name* (as opposed to a package or package name)
-    is supplied as ``package``, its containing package is computed and this
-    package used to derive the package name (all names are resolved relative
+    If ``package`` is a *module* or *module name* (as opposed to a package or
+    package name), its containing package is computed and this
+    package is used to derive the package name (all names are resolved relative
     to packages, never to modules).  For example, if the ``package`` argument
     to this type was passed the string ``xml.dom.expatbuilder``, and
     ``template.pt`` is supplied to the
@@ -154,8 +153,8 @@ class AssetResolver(Resolver):
     asset spec would be ``xml.minidom:template.pt``, because
     ``xml.dom.expatbuilder`` is a module object, not a package object.
 
-    If a *package* or *package name* (as opposed to a module or module name)
-    is supplied as ``package``, this package will be used to compute relative
+    If ``package`` is a *package* or *package name* (as opposed to a module or
+    module name), this package will be used to compute relative
     asset specifications.  For example, if the ``package`` argument to this
     type was passed the string ``xml.dom``, and ``template.pt`` is supplied
     to the :meth:`~pyramid.path.AssetResolver.resolve` method, the resulting
@@ -229,18 +228,17 @@ class DottedNameResolver(Resolver):
     which has a ``.`` (dot) or ``:`` (colon) as its first character is
     treated as relative.
 
-    If the value ``None`` is supplied as the ``package``, the resolver will
-    only be able to resolve fully qualified (not relative) names.  Any
-    attempt to resolve a relative name when the ``package`` is ``None`` will
-    result in an :exc:`ValueError` exception.
+    If ``package`` is ``None``, the resolver will only be able to resolve
+    fully qualified (not relative) names.  Any attempt to resolve a
+    relative name will result in an :exc:`ValueError` exception.
 
-    If the value :attr:`pyramid.path.CALLER_PACKAGE` is supplied as the
-    ``package``, the resolver will treat relative dotted names as relative to
+    If ``package`` is :attr:`pyramid.path.CALLER_PACKAGE`,
+    the resolver will treat relative dotted names as relative to
     the caller of the :meth:`~pyramid.path.DottedNameResolver.resolve`
     method.
 
-    If a *module* or *module name* (as opposed to a package or package name)
-    is supplied as ``package``, its containing package is computed and this
+    If ``package`` is a *module* or *module name* (as opposed to a package or
+    package name), its containing package is computed and this
     package used to derive the package name (all names are resolved relative
     to packages, never to modules).  For example, if the ``package`` argument
     to this type was passed the string ``xml.dom.expatbuilder``, and
@@ -249,8 +247,8 @@ class DottedNameResolver(Resolver):
     import would be for ``xml.minidom``, because ``xml.dom.expatbuilder`` is
     a module object, not a package object.
 
-    If a *package* or *package name* (as opposed to a module or module name)
-    is supplied as ``package``, this package will be used to relative compute
+    If ``package`` is a *package* or *package name* (as opposed to a module or
+    module name), this package will be used to relative compute
     dotted names.  For example, if the ``package`` argument to this type was
     passed the string ``xml.dom``, and ``.minidom`` is supplied to the
     :meth:`~pyramid.path.DottedNameResolver.resolve` method, the resulting
-- 
cgit v1.2.3


From 05e928bd9755614b0edbac0ab3b6d6b7fbbd0f17 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Sun, 27 Jan 2013 11:08:26 +0200
Subject: make use of 'versionadded' and 'deprecated' directives in
 pyramid.view

---
 pyramid/view.py | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/pyramid/view.py b/pyramid/view.py
index 40d7c19b9..8e3292274 100644
--- a/pyramid/view.py
+++ b/pyramid/view.py
@@ -29,9 +29,11 @@ _marker = object()
 class static(static_view):
     """ Backwards compatibility alias for
     :class:`pyramid.static.static_view`; it overrides that class' constructor
-    to pass ``use_subpath=True`` by default.  This class is deprecated as of
-    :app:`Pyramid` 1.1.  Use :class:`pyramid.static.static_view` instead
-    (probably with a ``use_subpath=True`` argument).
+    to pass ``use_subpath=True`` by default.
+
+    .. deprecated:: 1.1
+       use :class:`pyramid.static.static_view` instead
+       (probably with a ``use_subpath=True`` argument)
     """
     def __init__(self, root_dir, cache_max_age=3600, package_name=None):
         if package_name is None:
@@ -312,6 +314,7 @@ See also :ref:`changing_the_notfound_view`.
 
 class notfound_view_config(object):
     """
+    .. versionadded:: 1.3
 
     An analogue of :class:`pyramid.view.view_config` which registers a
     :term:`not found view`.
@@ -346,9 +349,6 @@ class notfound_view_config(object):
 
     See :ref:`changing_the_notfound_view` for detailed usage information.
 
-    .. note::
-
-       This class is new as of Pyramid 1.3.
     """
 
     venusian = venusian
@@ -377,6 +377,7 @@ class notfound_view_config(object):
 
 class forbidden_view_config(object):
     """
+    .. versionadded:: 1.3
 
     An analogue of :class:`pyramid.view.view_config` which registers a
     :term:`forbidden view`.
@@ -403,9 +404,6 @@ class forbidden_view_config(object):
 
     See :ref:`changing_the_forbidden_view` for detailed usage information.
 
-    .. note::
-
-       This class is new as of Pyramid 1.3.
     """
 
     venusian = venusian
@@ -436,11 +434,8 @@ def is_response(ob):
     """ Return ``True`` if ``ob`` implements the interface implied by
     :ref:`the_response`. ``False`` if not.
 
-    .. warning::
-
-       This function is deprecated as of :app:`Pyramid` 1.1.  New
-       code should not use it.  Instead, new code should use the
-       :func:`pyramid.request.Request.is_response` method."""
+    .. deprecated:: 1.1
+       use :func:`pyramid.request.Request.is_response` instead"""
     if ( hasattr(ob, 'app_iter') and hasattr(ob, 'headerlist') and
          hasattr(ob, 'status') ):
         return True
-- 
cgit v1.2.3


From 3c5dc535334269eab0769f8421555733ca34ecf2 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Sun, 27 Jan 2013 11:09:41 +0200
Subject: capitalize

---
 pyramid/view.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyramid/view.py b/pyramid/view.py
index 8e3292274..f315b5495 100644
--- a/pyramid/view.py
+++ b/pyramid/view.py
@@ -317,7 +317,7 @@ class notfound_view_config(object):
     .. versionadded:: 1.3
 
     An analogue of :class:`pyramid.view.view_config` which registers a
-    :term:`not found view`.
+    :term:`Not Found View`.
 
     The notfound_view_config constructor accepts most of the same arguments
     as the constructor of :class:`pyramid.view.view_config`.  It can be used
-- 
cgit v1.2.3


From e450cad6ad7e1f75610827e96e56b18b44869626 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Sun, 27 Jan 2013 11:09:58 +0200
Subject: add missing markup

---
 pyramid/view.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyramid/view.py b/pyramid/view.py
index f315b5495..b88c2ea85 100644
--- a/pyramid/view.py
+++ b/pyramid/view.py
@@ -319,7 +319,7 @@ class notfound_view_config(object):
     An analogue of :class:`pyramid.view.view_config` which registers a
     :term:`Not Found View`.
 
-    The notfound_view_config constructor accepts most of the same arguments
+    The ``notfound_view_config`` constructor accepts most of the same arguments
     as the constructor of :class:`pyramid.view.view_config`.  It can be used
     in the same places, and behaves in largely the same way, except it always
     registers a not found exception view instead of a 'normal' view.
-- 
cgit v1.2.3


From 56aa52c7175bc110b9505b0142eec4308f49c0d8 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Sun, 27 Jan 2013 20:18:34 +0200
Subject: capitalize

---
 pyramid/session.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyramid/session.py b/pyramid/session.py
index a5e6a8d3a..f8075f942 100644
--- a/pyramid/session.py
+++ b/pyramid/session.py
@@ -163,7 +163,7 @@ def UnencryptedCookieSessionFactoryConfig(
       while rendering a view.  Default: ``True``.
 
     ``signed_serialize``
-      A callable which takes more or less arbitrary python data structure and
+      A callable which takes more or less arbitrary Python data structure and
       a secret and returns a signed serialization in bytes.
       Default: ``signed_serialize`` (using pickle).
 
-- 
cgit v1.2.3


From 63ce17101695073a9e330af7099b908a48be40a5 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Sun, 27 Jan 2013 20:19:14 +0200
Subject: avoid needless repetition

These are already stated on the function definition.
---
 pyramid/session.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pyramid/session.py b/pyramid/session.py
index f8075f942..7db8c8e0e 100644
--- a/pyramid/session.py
+++ b/pyramid/session.py
@@ -140,27 +140,27 @@ def UnencryptedCookieSessionFactoryConfig(
       A number of seconds of inactivity before a session times out.
 
     ``cookie_name``
-      The name of the cookie used for sessioning.  Default: ``session``.
+      The name of the cookie used for sessioning.
 
     ``cookie_max_age``
       The maximum age of the cookie used for sessioning (in seconds).
       Default: ``None`` (browser scope).
 
     ``cookie_path``
-      The path used for the session cookie.  Default: ``/``.
+      The path used for the session cookie.
 
     ``cookie_domain``
       The domain used for the session cookie.  Default: ``None`` (no domain).
 
     ``cookie_secure``
-      The 'secure' flag of the session cookie.  Default: ``False``.
+      The 'secure' flag of the session cookie.
 
     ``cookie_httponly``
-      The 'httpOnly' flag of the session cookie.  Default: ``False``.
+      The 'httpOnly' flag of the session cookie.
 
     ``cookie_on_exception``
       If ``True``, set a session cookie even if an exception occurs
-      while rendering a view.  Default: ``True``.
+      while rendering a view.
 
     ``signed_serialize``
       A callable which takes more or less arbitrary Python data structure and
-- 
cgit v1.2.3


From fdcd1beef58e106b556f6586f4a95e02d6aec1f4 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Mon, 28 Jan 2013 08:27:05 +0200
Subject: use a more correct directive

---
 docs/narr/environment.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/narr/environment.rst b/docs/narr/environment.rst
index 8206e0bcb..def5e12a4 100644
--- a/docs/narr/environment.rst
+++ b/docs/narr/environment.rst
@@ -504,12 +504,13 @@ default, this is ``false``.
 Mako Preprocessor
 ~~~~~~~~~~~~~~~~~
 
+.. versionadded:: 1.1
+
 A callable (or a :term:`dotted Python name` which names a callable) which is
 called to preprocess the source before the template is called.  The callable
 will be passed the full template source before it is parsed. The return
 result of the callable will be used as the template source code.
 
-.. note:: This feature is new in Pyramid 1.1.
 
 +-----------------------------+
 | Config File Setting Name    |
-- 
cgit v1.2.3


From 1c0e0e94b6665ba715236be82cbd2b12b6a0a79f Mon Sep 17 00:00:00 2001
From: Calvin Hendryx-Parker <calvin@sixfeetup.com>
Date: Mon, 28 Jan 2013 17:08:21 -0500
Subject: Update docs/narr/extending.rst

Fixed grammatical typo
---
 docs/narr/extending.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/narr/extending.rst b/docs/narr/extending.rst
index c464203f0..dd9281c73 100644
--- a/docs/narr/extending.rst
+++ b/docs/narr/extending.rst
@@ -84,7 +84,7 @@ function in your application's ``__init__.py``.  For example, rather than:
        config.add_view('myapp.views.view1', name='view1')
        config.add_view('myapp.views.view2', name='view2')
 
-You should do move the calls to ``add_view`` outside of the (non-reusable)
+You should move the calls to ``add_view`` outside of the (non-reusable)
 ``if __name__ == '__main__'`` block, and into a reusable function:
 
 .. code-block:: python
-- 
cgit v1.2.3


From 0a9a29e9391e9b8639de61473bbe4865a6b0551e Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Tue, 29 Jan 2013 00:16:29 +0200
Subject: pluralize

---
 docs/narr/sessions.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/narr/sessions.rst b/docs/narr/sessions.rst
index f7da7838e..fa4affd8a 100644
--- a/docs/narr/sessions.rst
+++ b/docs/narr/sessions.rst
@@ -29,7 +29,7 @@ during your :app:`Pyramid` configuration.
 A very basic, insecure sample session factory implementation is
 provided in the :app:`Pyramid` core.  It uses a cookie to store
 session information.  This implementation has the following
-limitation:
+limitations:
 
 - The session information in the cookies used by this implementation
   is *not* encrypted, so it can be viewed by anyone with access to the
-- 
cgit v1.2.3


From 479447a1ebc231096155290f918f563b884a3432 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Tue, 29 Jan 2013 01:03:37 +0200
Subject: replace 'note' with the more correct 'versionadded' directive

---
 docs/narr/urldispatch.rst | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index ec97bf3b2..749a2d49a 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -758,11 +758,8 @@ other non-``name`` and non-``pattern`` arguments to
 exception to this rule is use of the ``pregenerator`` argument, which is not
 ignored when ``static`` is ``True``.
 
-.. note::
-
-   the ``static`` argument to
-   :meth:`~pyramid.config.Configurator.add_route` is new as of :app:`Pyramid`
-   1.1.
+.. versionadded:: 1.1
+   the ``static`` argument to :meth:`~pyramid.config.Configurator.add_route`
 
 .. index::
    single: redirecting to slash-appended routes
@@ -906,7 +903,7 @@ routes configured in your application; for more information, see
 Using a Route Prefix to Compose Applications
 --------------------------------------------
 
-.. note:: This feature is new as of :app:`Pyramid` 1.2.
+.. versionadded:: 1.2
 
 The :meth:`pyramid.config.Configurator.include` method allows configuration
 statements to be included from separate files.  See
-- 
cgit v1.2.3


From 23c8985a661b9e2b11b76750893724dc747ffc1c Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Tue, 29 Jan 2013 01:23:02 +0200
Subject: replace 'note' with the more correct 'versionadded' directive

---
 docs/api/request.rst | 4 +---
 pyramid/url.py       | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/docs/api/request.rst b/docs/api/request.rst
index e4034c635..9f1f71b31 100644
--- a/docs/api/request.rst
+++ b/docs/api/request.rst
@@ -163,9 +163,7 @@
 
    .. method:: invoke_subrequest(request, use_tweens=False)
 
-      .. warning:: 
-
-         This API was added in Pyramid 1.4a1.
+      .. versionadded:: 1.4a1
 
       Obtain a response object from the Pyramid application based on
       information in the ``request`` object provided.  The ``request`` object
diff --git a/pyramid/url.py b/pyramid/url.py
index 8fb5e49ab..84b58ac45 100644
--- a/pyramid/url.py
+++ b/pyramid/url.py
@@ -390,9 +390,8 @@ class URLMethodsMixin(object):
         pass ``app_url=''`.  Passing ``app_url=''` when the resource path is
         ``/baz/bar`` will return ``/baz/bar``.
 
-        .. note::
-
-           ``app_url`` is new as of Pyramid 1.3.
+        .. versionadded:: 1.3
+           ``app_url``
 
         If ``app_url`` is passed and any of ``scheme``, ``port``, or ``host``
         are also passed, ``app_url`` will take precedence and the values
-- 
cgit v1.2.3


From 40dbf42a2df1783c3d803adf950380c21512bb91 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Wed, 30 Jan 2013 00:41:23 +0200
Subject: use the more appropriate directives

---
 docs/api/registry.rst      | 17 +++++++----------
 docs/designdefense.rst     |  2 +-
 docs/narr/commandline.rst  |  3 ++-
 docs/narr/extconfig.rst    |  4 +---
 docs/narr/hooks.rst        | 19 ++++++++-----------
 docs/narr/templates.rst    |  8 ++------
 docs/narr/viewconfig.rst   |  8 +++-----
 docs/narr/views.rst        |  4 ++--
 docs/narr/webob.rst        |  2 +-
 pyramid/config/adapters.py |  5 ++---
 pyramid/config/views.py    |  7 ++++---
 pyramid/renderers.py       | 14 ++++++--------
 12 files changed, 39 insertions(+), 54 deletions(-)

diff --git a/docs/api/registry.rst b/docs/api/registry.rst
index a7879d3d5..db348495c 100644
--- a/docs/api/registry.rst
+++ b/docs/api/registry.rst
@@ -16,6 +16,8 @@
 
    .. attribute:: introspector
 
+     .. versionadded:: 1.3
+
      When a registry is set up (or created) by a :term:`Configurator`, the
      registry will be decorated with an instance named ``introspector``
      implementing the :class:`pyramid.interfaces.IIntrospector` interface.
@@ -27,28 +29,23 @@
      This attribute is often accessed as ``request.registry.introspector`` in
      a typical Pyramid application.
 
-     This attribute is new as of :app:`Pyramid` 1.3.
-
 .. class:: Introspectable
 
+   .. versionadded:: 1.3
+
    The default implementation of the interface
    :class:`pyramid.interfaces.IIntrospectable` used by framework exenders.
    An instance of this class is created when
    :attr:`pyramid.config.Configurator.introspectable` is called.
 
-   This class is new as of :app:`Pyramid` 1.3.
-
 .. autoclass:: Deferred
 
-   This class is new as of :app:`Pyramid` 1.4.
+   .. versionadded:: 1.4
 
 .. autofunction:: undefer
 
-   This function is new as of :app:`Pyramid` 1.4.
+   .. versionadded:: 1.4
 
 .. autoclass:: predvalseq
 
-   This class is new as of :app:`Pyramid` 1.4.
-
-
-
+   .. versionadded:: 1.4
diff --git a/docs/designdefense.rst b/docs/designdefense.rst
index f51ef10a9..69a921498 100644
--- a/docs/designdefense.rst
+++ b/docs/designdefense.rst
@@ -919,7 +919,7 @@ creating a more Zope3-like environment without much effort.
 Pyramid Uses its Own HTTP Exception Class Hierarchy Rather Than ``webob.exc``
 -----------------------------------------------------------------------------
 
-.. note:: This defense is new as of Pyramid 1.1.
+.. versionadded:: 1.1
 
 The HTTP exception classes defined in :mod:`pyramid.httpexceptions` are very
 much like the ones defined in ``webob.exc``
diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst
index 8d6b9d984..8e360216d 100644
--- a/docs/narr/commandline.rst
+++ b/docs/narr/commandline.rst
@@ -504,7 +504,8 @@ environment much like the environment produced when a particular
 using the :func:`pyramid.paster.bootstrap` command in the body of your
 script.
 
-.. note:: This feature is new as of :app:`Pyramid` 1.1.
+.. versionadded:: 1.1
+   This feature.
 
 In the simplest case, :func:`pyramid.paster.bootstrap` can be used with a
 single argument, which accepts the :term:`PasteDeploy` ``.ini`` file
diff --git a/docs/narr/extconfig.rst b/docs/narr/extconfig.rst
index 875bc9006..f33326279 100644
--- a/docs/narr/extconfig.rst
+++ b/docs/narr/extconfig.rst
@@ -227,9 +227,7 @@ augment Pyramid's configuration introspection system.
 Adding Configuration Introspection
 ----------------------------------
 
-.. note::
-
-   The introspection subsystem is new in Pyramid 1.3.
+.. versionadded:: 1.3
 
 Pyramid provides a configuration introspection system that can be used by
 debugging tools to provide visibility into the configuration of a running
diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst
index b5efc0df1..fc5c0ff23 100644
--- a/docs/narr/hooks.rst
+++ b/docs/narr/hooks.rst
@@ -336,9 +336,9 @@ when adding renderer global values exists in :ref:`adding_renderer_globals`.
 Adding Renderer Globals (Deprecated)
 ------------------------------------
 
-.. warning:: this feature is deprecated as of Pyramid 1.1.  A non-deprecated
-   mechanism which allows event subscribers to add renderer global values
-   is documented in :ref:`beforerender_event`.
+.. deprecated:: 1.1
+   An alternative mechanism which allows event subscribers to add renderer
+   global values is documented in :ref:`beforerender_event`.
 
 Whenever :app:`Pyramid` handles a request to perform a rendering (after a
 view with a ``renderer=`` configuration attribute is invoked, or when any of
@@ -635,13 +635,13 @@ See :meth:`pyramid.config.add_resource_url_adapter` for more information.
 Changing How Pyramid Treats View Responses
 ------------------------------------------
 
+.. versionadded:: 1.1
+
 It is possible to control how Pyramid treats the result of calling a view
 callable on a per-type basis by using a hook involving
 :meth:`pyramid.config.Configurator.add_response_adapter` or the
 :class:`~pyramid.response.response_adapter` decorator.
 
-.. note:: This feature is new as of Pyramid 1.1.
-
 Pyramid, in various places, adapts the result of calling a view callable to
 the :class:`~pyramid.interfaces.IResponse` interface to ensure that the
 object returned by the view callable is a "true" response object.  The vast
@@ -936,8 +936,8 @@ For full details, please read the `Venusian documentation
 Registering "Tweens"
 --------------------
 
-.. note:: Tweens are a feature which were added in Pyramid 1.2.  They are
-   not available in any previous version.
+.. versionadded:: 1.2
+   Tweens
 
 A :term:`tween` (a contraction of the word "between") is a bit of code that
 sits between the Pyramid router's main request handling function and the
@@ -1241,10 +1241,7 @@ implict and explicit tween chains used by an application.  See
 Adding A Third Party View, Route, or Subscriber Predicate
 ---------------------------------------------------------
 
-.. note::
-
-   Third-party view, route, and subscriber predicates are a feature new as of
-   Pyramid 1.4.
+.. versionadded:: 1.4
 
 .. _view_and_route_predicates:
 
diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst
index 1cec26fbc..6a1fbf916 100644
--- a/docs/narr/templates.rst
+++ b/docs/narr/templates.rst
@@ -543,9 +543,7 @@ template as a :term:`renderer` like so:
 The above will render only the ``bar`` macro defined within the ``foo.pt``
 template instead of the entire template.
 
-.. note::
-
-   This feature is new in Pyramid 1.4.
+.. versionadded:: 1.4
 
 .. index::
    single: Chameleon text templates
@@ -743,9 +741,7 @@ configure the template as a :term:`renderer` like so:
 The above will render the ``bar`` def from within the ``foo.mak`` template
 instead of the entire template.
 
-.. note::
-
-   This feature is new in Pyramid 1.4.
+.. versionadded:: 1.4
 
 .. index::
    single: automatic reloading of templates
diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index f00dae451..7001cd980 100644
--- a/docs/narr/viewconfig.rst
+++ b/docs/narr/viewconfig.rst
@@ -306,7 +306,7 @@ configured view.
   consideration of keys and values in the ``request.params`` dictionary.
 
 ``match_param``
-  .. note:: This feature is new as of :app:`Pyramid` 1.2.
+  .. versionadded:: 1.2
 
   This param may be either a single string of the format "key=value" or a
   dict of key/value pairs.
@@ -724,9 +724,7 @@ configuration to take effect.
 ``@view_defaults`` Class Decorator
 ----------------------------------
 
-.. note::
-
-   This feature is new in Pyramid 1.3.
+.. versionadded:: 1.3
 
 If you use a class as a view, you can use the
 :class:`pyramid.view.view_defaults` class decorator on the class to provide
@@ -952,7 +950,7 @@ for more information about how, and where to set these values.
 Influencing HTTP Caching
 ------------------------
 
-.. note:: This feature is new in Pyramid 1.1.
+.. versionadded:: 1.1
 
 When a non-``None`` ``http_cache`` argument is passed to a view
 configuration, Pyramid will set ``Expires`` and ``Cache-Control`` response
diff --git a/docs/narr/views.rst b/docs/narr/views.rst
index 4f30bb7fa..860c380f3 100644
--- a/docs/narr/views.rst
+++ b/docs/narr/views.rst
@@ -227,8 +227,8 @@ equivalent to ``raise HTTPUnauthorized()``.  Documentation which maps each
 HTTP response code to its purpose and its associated HTTP exception object is
 provided within :mod:`pyramid.httpexceptions`.
 
-.. note:: The :func:`~pyramid.httpexceptions.exception_response` function is
-   new as of Pyramid 1.1.
+.. versionadded:: 1.1
+   The :func:`~pyramid.httpexceptions.exception_response` function.
 
 How Pyramid Uses HTTP Exceptions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/narr/webob.rst b/docs/narr/webob.rst
index a8c11acec..44940f9e6 100644
--- a/docs/narr/webob.rst
+++ b/docs/narr/webob.rst
@@ -251,7 +251,7 @@ API documentation for a multidict exists as
 Dealing With A JSON-Encoded Request Body
 ++++++++++++++++++++++++++++++++++++++++
 
-.. note:: this feature is new as of Pyramid 1.1.
+.. versionadded:: 1.1
 
 :attr:`pyramid.request.Request.json_body` is a property that returns a
 :term:`JSON` -decoded representation of the request body.  If the request
diff --git a/pyramid/config/adapters.py b/pyramid/config/adapters.py
index 3ce0680af..319beab67 100644
--- a/pyramid/config/adapters.py
+++ b/pyramid/config/adapters.py
@@ -136,6 +136,8 @@ class AdaptersConfiguratorMixin(object):
     def add_subscriber_predicate(self, name, factory, weighs_more_than=None,
                                  weighs_less_than=None):
         """
+        .. versionadded:: 1.4
+
         Adds a subscriber predicate factory.  The associated subscriber
         predicate can later be named as a keyword argument to
         :meth:`pyramid.config.Configurator.add_subscriber` in the
@@ -149,9 +151,6 @@ class AdaptersConfiguratorMixin(object):
 
         See :ref:`subscriber_predicates` for more information.
 
-        .. note::
-
-           This method is new as of Pyramid 1.4.
         """
         self._add_predicate(
             'subscriber',
diff --git a/pyramid/config/views.py b/pyramid/config/views.py
index de96363de..1b89437ea 100644
--- a/pyramid/config/views.py
+++ b/pyramid/config/views.py
@@ -822,7 +822,8 @@ class ViewsConfiguratorMixin(object):
           think about preserving function attributes such as ``__name__`` and
           ``__module__`` within decorator logic).
 
-          Passing an iterable is only supported as of :app:`Pyramid` 1.4a4.
+          .. versionchanged:: 1.4a4
+             Passing an iterable.
 
         mapper
 
@@ -878,8 +879,8 @@ class ViewsConfiguratorMixin(object):
           view will respond to ``HEAD`` as of Pyramid 1.4.
 
           .. versionchanged:: 1.2
-             The ability to pass a tuple of items as ``request_method`` is
-             new as of Pyramid 1.2.  Previous versions allowed only a string.
+             The ability to pass a tuple of items as ``request_method``.
+             Previous versions allowed only a string.
 
         request_param
 
diff --git a/pyramid/renderers.py b/pyramid/renderers.py
index 6310b7fee..64951a6ba 100644
--- a/pyramid/renderers.py
+++ b/pyramid/renderers.py
@@ -203,11 +203,9 @@ class JSON(object):
     ``default``, and any extra ``kw`` keyword argments passed during
     renderer construction.
 
-    .. note::
-
-       This feature is new in Pyramid 1.4. Prior to 1.4 there was
-       no public API for supplying options to the underlying
-       serializer without defining a custom renderer.
+    .. versionadded:: 1.4
+       Prior to this version, there was no public API for supplying options
+       to the underlying serializer without defining a custom renderer.
     """
 
     def __init__(self, serializer=json.dumps, adapters=(), **kw):
@@ -302,8 +300,8 @@ class JSONP(JSON):
        config = Configurator()
        config.add_renderer('jsonp', JSONP(param_name='callback', indent=4))
     
-    .. note:: The ability of this class to accept a ``**kw`` in its
-       constructor is new as of Pyramid 1.4.
+    .. versionchanged:: 1.4
+       The ability of this class to accept a ``**kw`` in its constructor.
 
     The arguments passed to this class' constructor mean the same thing as
     the arguments passed to :class:`pyramid.renderers.JSON` (including
@@ -331,7 +329,7 @@ class JSONP(JSON):
     - If there is no callback parameter in the request's query string, the
       renderer will return a 'plain' JSON response.
 
-    .. note:: This feature is new in Pyramid 1.1.
+    .. versionadded:: 1.1
 
     See also: :ref:`jsonp_renderer`.
     """
-- 
cgit v1.2.3


From 6821582d7e691b8c068ce80ec067319c65195716 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Wed, 30 Jan 2013 01:18:06 +0200
Subject: this obsolete info should have been removed in commit 22ed77d

---
 docs/narr/install.rst | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index 224a62db7..c467779f4 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -166,9 +166,7 @@ distribute is not yet installed:
    ImportError: No module named setuptools
 
 If ``import setuptools`` raises an :exc:`ImportError` as it does above, you
-will need to install setuptools or distribute manually.  Note that above
-we're using a Python 2.7-series interpreter on Mac OS X; your output may
-differ if you're using a later Python version or a different platform.
+will need to install setuptools or distribute manually.
 
 If you are using a "system" Python (one installed by your OS distributor or a
 3rd-party packager such as Fink or MacPorts), you can usually install the
-- 
cgit v1.2.3


From 3e9b1e566891bce88d63c188b92e223cb22dac2c Mon Sep 17 00:00:00 2001
From: Anton Vlasenko <antares.spica@gmail.com>
Date: Wed, 30 Jan 2013 22:58:18 +0200
Subject: Updated gunicorn information

---
 docs/glossary.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/glossary.rst b/docs/glossary.rst
index 0036d045b..9220e6b5f 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -1015,8 +1015,7 @@ Glossary
 
    Green Unicorn
       Aka ``gunicorn``, a fast :term:`WSGI` server that runs on UNIX under
-      Python 2.5+ (although at the time of this writing does not support
-      Python 3).  See http://gunicorn.org/ for detailed information.
+      Python 2.6+ or Python 3.1+.  See http://gunicorn.org/ for detailed information.
 
    predicate factory
       A callable which is used by a third party during the registration of a
-- 
cgit v1.2.3


From 3a6bdf983b51d8d0df124999ae217084c7dddbc6 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Sun, 3 Feb 2013 12:38:55 +0200
Subject: use clearer language

---
 docs/narr/environment.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/narr/environment.rst b/docs/narr/environment.rst
index def5e12a4..281bb6919 100644
--- a/docs/narr/environment.rst
+++ b/docs/narr/environment.rst
@@ -203,7 +203,7 @@ Using the setting is equivalent to using the
 |                                 |
 +---------------------------------+
 
-The value supplied as ``pyramid.includes`` should be a sequence.  The
+The value assigned to ``pyramid.includes`` should be a sequence.  The
 sequence can take several different forms.
 
 1) It can be a string.
@@ -323,7 +323,7 @@ the behest of an add-on author.
 |                                 |
 +---------------------------------+
 
-The value supplied as ``pyramid.tweens`` should be a sequence.  The
+The value assigned to ``pyramid.tweens`` should be a sequence.  The
 sequence can take several different forms.
 
 1) It can be a string.
-- 
cgit v1.2.3


From 80281d4be49e5a42f5c3548af9a32a788817cb2d Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Sun, 3 Feb 2013 13:08:03 +0200
Subject: simplify and shorten an overlong sentence

---
 pyramid/config/__init__.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index d662c7d3a..e1320a55f 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -821,10 +821,8 @@ class Configurator(
 
     def with_package(self, package):
         """ Return a new Configurator instance with the same registry
-        as this configurator using the package supplied as the
-        ``package`` argument to the new configurator.  ``package`` may
-        be an actual Python package object or a :term:`dotted Python name`
-        representing a package."""
+        as this configurator. ``package`` may be an actual Python package
+        object or a :term:`dotted Python name` representing a package."""
         configurator = self.__class__(
             registry=self.registry,
             package=package,
-- 
cgit v1.2.3


From 1d3b11ea4c7ce0e05ca80063f997596791f75fda Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Mon, 4 Feb 2013 20:53:03 +0200
Subject: fix and shorten broken sentence

---
 docs/narr/introduction.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index c4f2ea512..3540ee5c4 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -749,7 +749,7 @@ that we change Pyramid?  You can extend Pyramid's :term:`Configurator` with
 your own directives.  For example, let's say you find yourself calling
 :meth:`pyramid.config.Configurator.add_view` repetitively.  Usually you can
 take the boring away by using existing shortcuts, but let's say that this is
-a case such a way that no existing shortcut works to take the boring away:
+a case where there is no such shortcut:
 
 .. code-block:: python
    :linenos:
-- 
cgit v1.2.3


From bd070e77f4183a34507fe6f19604751cb78e3e8c Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Mon, 4 Feb 2013 21:15:08 +0200
Subject: unuglify Unix Python installation instructions

---
 docs/narr/install.rst | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index c467779f4..e18716baa 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -88,17 +88,15 @@ using the following commands:
 
 .. code-block:: text
 
-   [chrism@vitaminf ~]$ cd ~
-   [chrism@vitaminf ~]$ mkdir tmp
-   [chrism@vitaminf ~]$ mkdir opt
-   [chrism@vitaminf ~]$ cd tmp
-   [chrism@vitaminf tmp]$ wget \
-          http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tgz
-   [chrism@vitaminf tmp]$ tar xvzf Python-2.7.3.tgz
-   [chrism@vitaminf tmp]$ cd Python-2.7.3
-   [chrism@vitaminf Python-2.7.3]$ ./configure \
-           --prefix=$HOME/opt/Python-2.7.3
-   [chrism@vitaminf Python-2.7.3]$ make; make install
+   $ cd ~
+   $ mkdir tmp
+   $ mkdir opt
+   $ cd tmp
+   $ wget http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tgz
+   $ tar xvzf Python-2.7.3.tgz
+   $ cd Python-2.7.3
+   $ ./configure --prefix=$HOME/opt/Python-2.7.3
+   $ make && make install
 
 Once these steps are performed, the Python interpreter will be
 invokable via ``$HOME/opt/Python-2.7.3/bin/python`` from a shell
-- 
cgit v1.2.3


From 148c7da017ef775932b2a4baeb0bd3057976adcc Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Mon, 4 Feb 2013 21:27:03 +0200
Subject: no need to be so specific

This should reduce the frequency of needing to update it.
---
 docs/narr/install.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index c467779f4..91e1cae6f 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -14,8 +14,8 @@ run :app:`Pyramid`.
 
 .. sidebar:: Python Versions
 
-    As of this writing, :app:`Pyramid` has been tested under Python 2.6.8,
-    Python 2.7.3, Python 3.2.3, and Python 3.3b1.  :app:`Pyramid` does not
+    As of this writing, :app:`Pyramid` has been tested under Python 2.6,
+    Python 2.7, Python 3.2, and Python 3.3.  :app:`Pyramid` does not
     run under any version of Python before 2.6.
 
 :app:`Pyramid` is known to run on all popular UNIX-like systems such as
-- 
cgit v1.2.3


From 37da2cf374792b2ab12ae39be6994540c9dfe623 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marca@surveymonkey.com>
Date: Mon, 4 Feb 2013 15:23:46 -0800
Subject: narr/project.rst: Correct IP address 129.168.1.50 -> 192.168.1.50

---
 docs/narr/project.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index fb62f4bd2..5a8ea0ecf 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -297,7 +297,7 @@ For example, your system might be configured to have an external IP address
 ``192.168.1.50``.  If that's the case, if you use a browser running on the
 same system as Pyramid, it will be able to access the application via
 ``http://127.0.0.1:6543/`` as well as via
-``http://129.168.1.50:6543/``. However, *other people* on other computers on
+``http://192.168.1.50:6543/``. However, *other people* on other computers on
 the same network will also be able to visit your Pyramid application in their
 browser by visiting ``http://192.168.1.50:6543/``.
 
-- 
cgit v1.2.3


From cb659d206463607b5387878a857ead770c4df8cc Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Wed, 6 Feb 2013 23:25:42 +0200
Subject: displaying lineno for 1-line snippet is overkill

---
 docs/narr/configuration.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/narr/configuration.rst b/docs/narr/configuration.rst
index cd3dab099..820dda269 100644
--- a/docs/narr/configuration.rst
+++ b/docs/narr/configuration.rst
@@ -144,7 +144,6 @@ In the example above, the scanner translates the arguments to
 
 .. ignore-next-block
 .. code-block:: python
-   :linenos:
 
    config.add_view(hello)
 
-- 
cgit v1.2.3


From 6a4c6cb1c6ebe148e948726ddf668a3c2aa6c86c Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Wed, 6 Feb 2013 23:38:01 +0200
Subject: no need for a 'topic' directive

---
 docs/narr/configuration.rst | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/docs/narr/configuration.rst b/docs/narr/configuration.rst
index cd3dab099..4370367c0 100644
--- a/docs/narr/configuration.rst
+++ b/docs/narr/configuration.rst
@@ -99,29 +99,27 @@ available for a :term:`scan` to find it later.
 A :term:`scan` of a :term:`module` or a :term:`package` and its subpackages
 for decorations happens when the :meth:`pyramid.config.Configurator.scan`
 method is invoked: scanning implies searching for configuration declarations
-in a package and its subpackages.  For example:
-
-.. topic:: Starting A Scan
-
-   .. code-block:: python
-      :linenos:
-
-      from wsgiref.simple_server import make_server
-      from pyramid.config import Configurator
-      from pyramid.response import Response
-      from pyramid.view import view_config
-     
-      @view_config()
-      def hello(request):
-          return Response('Hello')
-
-      if __name__ == '__main__':
-          from pyramid.config import Configurator
-          config = Configurator()
-          config.scan()
-          app = config.make_wsgi_app()
-          server = make_server('0.0.0.0', 8080, app)
-          server.serve_forever()
+in a package and its subpackages.  For example::
+
+.. code-block:: python
+   :linenos:
+
+   from wsgiref.simple_server import make_server
+   from pyramid.config import Configurator
+   from pyramid.response import Response
+   from pyramid.view import view_config
+
+   @view_config()
+   def hello(request):
+       return Response('Hello')
+
+   if __name__ == '__main__':
+       from pyramid.config import Configurator
+       config = Configurator()
+       config.scan()
+       app = config.make_wsgi_app()
+       server = make_server('0.0.0.0', 8080, app)
+       server.serve_forever()
 
 The scanning machinery imports each module and subpackage in a package or
 module recursively, looking for special attributes attached to objects
-- 
cgit v1.2.3


From c7e558156dff1c8fdc96fe0382e48ca4d5bf8205 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Fri, 8 Feb 2013 20:48:08 +0200
Subject: fix a Sphinx warning

---
 docs/narr/configuration.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/narr/configuration.rst b/docs/narr/configuration.rst
index cc26c55d9..6f82baf32 100644
--- a/docs/narr/configuration.rst
+++ b/docs/narr/configuration.rst
@@ -99,7 +99,7 @@ available for a :term:`scan` to find it later.
 A :term:`scan` of a :term:`module` or a :term:`package` and its subpackages
 for decorations happens when the :meth:`pyramid.config.Configurator.scan`
 method is invoked: scanning implies searching for configuration declarations
-in a package and its subpackages.  For example::
+in a package and its subpackages.  For example:
 
 .. code-block:: python
    :linenos:
-- 
cgit v1.2.3