7 files changed, 29 insertions, 29 deletions

diff --git a/docs/tutorials/wiki2/authorization.rst b/docs/tutorials/wiki2/authorization.rst
index 2ef55d15b..d7bd24a53 100644
--- a/docs/tutorials/wiki2/authorization.rst
+++ b/docs/tutorials/wiki2/authorization.rst
@@ -353,7 +353,7 @@ when we're done:
 
 .. literalinclude:: src/authorization/tutorial/views.py
    :linenos:
-   :emphasize-lines: 11,14-18,31,37,58,61,73,76,88,91-117,119-123
+   :emphasize-lines: 11,14-18,25,31,37,58,61,73,76,88,91-117,119-123
    :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 5f4ea671c..b3184c4fc 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -100,7 +100,7 @@ used when the URL is ``/``:
       :language: py
 
 Since this route has a ``pattern`` equalling ``/`` it is the route that will
-be matched when the URL ``/`` is visted, e.g. ``http://localhost:6543/``.
+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
@@ -190,7 +190,7 @@ Next we set up a SQLAlchemy "DBSession" object:
 ``scoped_session`` allows us to access our database connection globally.
 ``sessionmaker`` creates a database session object.  We pass to
 ``sessionmaker`` the ``extension=ZopeTransactionExtension()`` extension
-option in order to allow the system to automatically manage datbase
+option in order to allow the system to automatically manage database
 transactions.  With ``ZopeTransactionExtension`` activated, our application
 will automatically issue a transaction commit after every request unless an
 exception is raised, in which case the transaction will be aborted.
diff --git a/docs/tutorials/wiki2/definingviews.rst b/docs/tutorials/wiki2/definingviews.rst
index efb72230e..24ac4338d 100644
--- a/docs/tutorials/wiki2/definingviews.rst
+++ b/docs/tutorials/wiki2/definingviews.rst
@@ -248,7 +248,7 @@ wiki page. It includes:
 - A ``div`` element that is replaced with the ``content``
   value provided by the view (rows 45-47).  ``content``
   contains HTML, so the ``structure`` keyword is used
-  to prevent escaping it (i.e. changing ">" to >, etc.)
+  to prevent escaping it (i.e. changing ">" to ">", etc.)
 - A link that points
   at the "edit" URL which invokes the ``edit_page`` view for
   the page being viewed (rows 49-51).
diff --git a/docs/tutorials/wiki2/design.rst b/docs/tutorials/wiki2/design.rst
index 2e6fc0e77..deaf32ef6 100644
--- a/docs/tutorials/wiki2/design.rst
+++ b/docs/tutorials/wiki2/design.rst
@@ -20,7 +20,7 @@ Models
 We'll be using a SQLite database to hold our wiki data, and we'll be using
 :term:`SQLAlchemy` to access the data in this database.
 
-Within the database, we define a single table named `tables`, whose elements
+Within the database, we define a single table named `pages`, whose elements
 will store the wiki pages.  There are two columns: `name` and `data`.
 
 URLs like ``/PageName`` will try to find an element in 
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/views.py b/docs/tutorials/wiki2/src/authorization/tutorial/views.py
index c7670b049..0d085b0e2 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/views.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/views.py
@@ -60,14 +60,14 @@ def view_page(request):
 @view_config(route_name='add_page', renderer='templates/edit.pt',
              permission='edit')
 def add_page(request):
-    name = request.matchdict['pagename']
+    pagename = request.matchdict['pagename']
     if 'form.submitted' in request.params:
         body = request.params['body']
-        page = Page(name, body)
+        page = Page(pagename, body)
         DBSession.add(page)
         return HTTPFound(location = request.route_url('view_page',
-                                                      pagename=name))
-    save_url = request.route_url('add_page', pagename=name)
+                                                      pagename=pagename))
+    save_url = request.route_url('add_page', pagename=pagename)
     page = Page('', '')
     return dict(page=page, save_url=save_url,
                 logged_in=authenticated_userid(request))
@@ -75,16 +75,16 @@ def add_page(request):
 @view_config(route_name='edit_page', renderer='templates/edit.pt',
              permission='edit')
 def edit_page(request):
-    name = request.matchdict['pagename']
-    page = DBSession.query(Page).filter_by(name=name).one()
+    pagename = request.matchdict['pagename']
+    page = DBSession.query(Page).filter_by(name=pagename).one()
     if 'form.submitted' in request.params:
         page.data = request.params['body']
         DBSession.add(page)
         return HTTPFound(location = request.route_url('view_page',
-                                                      pagename=name))
+                                                      pagename=pagename))
     return dict(
         page=page,
-        save_url = request.route_url('edit_page', pagename=name),
+        save_url = request.route_url('edit_page', pagename=pagename),
         logged_in=authenticated_userid(request),
         )
 
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/views.py b/docs/tutorials/wiki2/src/tests/tutorial/views.py
index f2a33af1e..42ac0eb7f 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/views.py
+++ b/docs/tutorials/wiki2/src/tests/tutorial/views.py
@@ -61,15 +61,15 @@ def view_page(request):
 @view_config(route_name='add_page', renderer='templates/edit.pt',
              permission='edit')
 def add_page(request):
-    name = request.matchdict['pagename']
+    pagename = request.matchdict['pagename']
     if 'form.submitted' in request.params:
         session = DBSession()
         body = request.params['body']
-        page = Page(name, body)
+        page = Page(pagename, body)
         session.add(page)
         return HTTPFound(location = request.route_url('view_page',
-                                                      pagename=name))
-    save_url = request.route_url('add_page', pagename=name)
+                                                      pagename=pagename))
+    save_url = request.route_url('add_page', pagename=pagename)
     page = Page('', '')
     return dict(page=page, save_url=save_url,
                 logged_in=authenticated_userid(request))
@@ -77,17 +77,17 @@ def add_page(request):
 @view_config(route_name='edit_page', renderer='templates/edit.pt',
              permission='edit')
 def edit_page(request):
-    name = request.matchdict['pagename']
+    pagename = request.matchdict['pagename']
     session = DBSession()
-    page = session.query(Page).filter_by(name=name).one()
+    page = session.query(Page).filter_by(name=pagename).one()
     if 'form.submitted' in request.params:
         page.data = request.params['body']
         session.add(page)
         return HTTPFound(location = request.route_url('view_page',
-                                                      pagename=name))
+                                                      pagename=pagename))
     return dict(
         page=page,
-        save_url = request.route_url('edit_page', pagename=name),
+        save_url = request.route_url('edit_page', pagename=pagename),
         logged_in=authenticated_userid(request),
         )
 
diff --git a/docs/tutorials/wiki2/src/views/tutorial/views.py b/docs/tutorials/wiki2/src/views/tutorial/views.py
index c2a94a96b..5a9c75a61 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/views.py
+++ b/docs/tutorials/wiki2/src/views/tutorial/views.py
@@ -44,27 +44,27 @@ def view_page(request):
 
 @view_config(route_name='add_page', renderer='templates/edit.pt')
 def add_page(request):
-    name = request.matchdict['pagename']
+    pagename = request.matchdict['pagename']
     if 'form.submitted' in request.params:
         body = request.params['body']
-        page = Page(name, body)
+        page = Page(pagename, body)
         DBSession.add(page)
         return HTTPFound(location = request.route_url('view_page',
-                                                      pagename=name))
-    save_url = request.route_url('add_page', pagename=name)
+                                                      pagename=pagename))
+    save_url = request.route_url('add_page', pagename=pagename)
     page = Page('', '')
     return dict(page=page, save_url=save_url)
 
 @view_config(route_name='edit_page', renderer='templates/edit.pt')
 def edit_page(request):
-    name = request.matchdict['pagename']
-    page = DBSession.query(Page).filter_by(name=name).one()
+    pagename = request.matchdict['pagename']
+    page = DBSession.query(Page).filter_by(name=pagename).one()
     if 'form.submitted' in request.params:
         page.data = request.params['body']
         DBSession.add(page)
         return HTTPFound(location = request.route_url('view_page',
-                                                      pagename=name))
+                                                      pagename=pagename))
     return dict(
         page=page,
-        save_url = request.route_url('edit_page', pagename=name),
+        save_url = request.route_url('edit_page', pagename=pagename),
         )