merge upstream

3 files changed, 6 insertions, 6 deletions

diff --git a/docs/quick_tutorial/databases/tutorial/models.py b/docs/quick_tutorial/databases/tutorial/models.py
index b27c38417..8e6649d49 100644
--- a/docs/quick_tutorial/databases/tutorial/models.py
+++ b/docs/quick_tutorial/databases/tutorial/models.py
@@ -13,10 +13,10 @@ from sqlalchemy.orm import (
     sessionmaker,
     )
 
-from zope.sqlalchemy import ZopeTransactionExtension
+from zope.sqlalchemy import register
 
-DBSession = scoped_session(
-    sessionmaker(extension=ZopeTransactionExtension()))
+DBSession = scoped_session(sessionmaker())
+register(DBSession)
 Base = declarative_base()
 
 
@@ -32,4 +32,4 @@ class Root(object):
                (Allow, 'group:editors', 'edit')]
 
     def __init__(self, request):
-        pass
\ No newline at end of file
+        pass
diff --git a/docs/quick_tutorial/json.rst b/docs/quick_tutorial/json.rst
index 44d1de8cb..19d346199 100644
--- a/docs/quick_tutorial/json.rst
+++ b/docs/quick_tutorial/json.rst
@@ -63,7 +63,7 @@ Steps
 
    .. code-block:: bash
 
-    $ $VENV/bin/pserve development.ini --reload
+    $VENV/bin/pserve development.ini --reload
 
 #. Open http://localhost:6543/howdy.json in your browser and you will see the
    resulting JSON response.
diff --git a/docs/quick_tutorial/view_classes.rst b/docs/quick_tutorial/view_classes.rst
index 1307857b7..c9f61f5a3 100644
--- a/docs/quick_tutorial/view_classes.rst
+++ b/docs/quick_tutorial/view_classes.rst
@@ -78,7 +78,7 @@ To ease the transition to view classes, we didn't introduce any new
 functionality. We simply changed the view functions to methods on a view class,
 then updated the tests.
 
-In our ``TutorialViews`` view class, you can see that our two view classes are
+In our ``TutorialViews`` view class, you can see that our two view functions are
 logically grouped together as methods on a common class. Since the two views
 shared the same template, we could move that to a ``@view_defaults`` decorator
 at the class level.