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

7 files changed, 49 insertions, 51 deletions

diff --git a/docs/tutorials/modwsgi/index.rst b/docs/tutorials/modwsgi/index.rst
index d11167344..a22f12610 100644
--- a/docs/tutorials/modwsgi/index.rst
+++ b/docs/tutorials/modwsgi/index.rst
@@ -7,12 +7,11 @@ Running a :app:`Pyramid` Application under ``mod_wsgi``
 It allows :term:`WSGI` programs to be served using the Apache web
 server.
 
-This guide will outline broad steps that can be used to get a
-:app:`Pyramid` application running under Apache via ``mod_wsgi``.
-This particular tutorial was developed under Apple's Mac OS X platform
-(Snow Leopard, on a 32-bit Mac), but the instructions should be
-largely the same for all systems, delta specific path information for
-commands and files.
+This guide will outline broad steps that can be used to get a :app:`Pyramid`
+application running under Apache via ``mod_wsgi``.  This particular tutorial
+was developed under Apple's Mac OS X platform (Snow Leopard, on a 32-bit
+Mac), but the instructions should be largely the same for all systems, delta
+specific path information for commands and files.
 
 .. note:: Unfortunately these instructions almost certainly won't work for
    deploying a :app:`Pyramid` application on a Windows system using
@@ -90,12 +89,11 @@ commands and files.
     `logging` module to allow logging within your application.
     See :ref:`logging_config`.
 
-#.  Make the ``pyramid.wsgi`` script executable.
-
-    .. code-block:: text
-
-       $ cd ~/modwsgi/env
-       $ chmod 755 pyramid.wsgi
+    There is no need to make the ``pyramid.wsgi`` script executable.
+    However, you'll need to make sure that *two* users have access to change
+    into the ``~/modwsgi/env`` directory: your current user (mine is
+    ``chrism`` and the user that Apache will run as often named ``apache`` or
+    ``httpd``).  Make sure both of these users can "cd" into that directory.
 
 #.  Edit your Apache configuration and add some stuff.  I happened to
     create a file named ``/etc/apache2/other/modwsgi.conf`` on my own
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/views.py b/docs/tutorials/wiki/src/authorization/tutorial/views.py
index 21f12b31d..50485d279 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/views.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/views.py
@@ -51,17 +51,17 @@ def view_page(context, request):
              renderer='templates/edit.pt',
              permission='edit')
 def add_page(context, request):
-    name = request.subpath[0]
+    pagename = request.subpath[0]
     if 'form.submitted' in request.params:
         body = request.params['body']
         page = Page(body)
-        page.__name__ = name
+        page.__name__ = pagename
         page.__parent__ = context
-        context[name] = page
+        context[pagename] = page
         return HTTPFound(location = request.resource_url(page))
-    save_url = request.resource_url(context, 'add_page', name)
+    save_url = request.resource_url(context, 'add_page', pagename)
     page = Page('')
-    page.__name__ = name
+    page.__name__ = pagename
     page.__parent__ = context
 
     return dict(page = page, save_url = save_url,
diff --git a/docs/tutorials/wiki/src/tests/tutorial/views.py b/docs/tutorials/wiki/src/tests/tutorial/views.py
index 21f12b31d..50485d279 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/views.py
+++ b/docs/tutorials/wiki/src/tests/tutorial/views.py
@@ -51,17 +51,17 @@ def view_page(context, request):
              renderer='templates/edit.pt',
              permission='edit')
 def add_page(context, request):
-    name = request.subpath[0]
+    pagename = request.subpath[0]
     if 'form.submitted' in request.params:
         body = request.params['body']
         page = Page(body)
-        page.__name__ = name
+        page.__name__ = pagename
         page.__parent__ = context
-        context[name] = page
+        context[pagename] = page
         return HTTPFound(location = request.resource_url(page))
-    save_url = request.resource_url(context, 'add_page', name)
+    save_url = request.resource_url(context, 'add_page', pagename)
     page = Page('')
-    page.__name__ = name
+    page.__name__ = pagename
     page.__parent__ = context
 
     return dict(page = page, save_url = save_url,
diff --git a/docs/tutorials/wiki/src/views/tutorial/views.py b/docs/tutorials/wiki/src/views/tutorial/views.py
index 016f5b6bb..b0c15297f 100644
--- a/docs/tutorials/wiki/src/views/tutorial/views.py
+++ b/docs/tutorials/wiki/src/views/tutorial/views.py
@@ -35,17 +35,17 @@ def view_page(context, request):
 @view_config(name='add_page', context='.models.Wiki',
              renderer='templates/edit.pt')
 def add_page(context, request):
-    name = request.subpath[0]
+    pagename = request.subpath[0]
     if 'form.submitted' in request.params:
         body = request.params['body']
         page = Page(body)
-        page.__name__ = name
+        page.__name__ = pagename
         page.__parent__ = context
-        context[name] = page
+        context[pagename] = page
         return HTTPFound(location = request.resource_url(page))
-    save_url = request.resource_url(context, 'add_page', name)
+    save_url = request.resource_url(context, 'add_page', pagename)
     page = Page('')
-    page.__name__ = name
+    page.__name__ = pagename
     page.__parent__ = context
     return dict(page = page, save_url = save_url)
 
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),
         )