- SQLAlchemy+urldispach wiki (``wiki2``) tutorial updated due to changes to

  ``pyramid_routesalchemy`` paster template.

5 files changed, 72 insertions, 64 deletions

diff --git a/docs/tutorials/wiki2/src/basiclayout/development.ini b/docs/tutorials/wiki2/src/basiclayout/development.ini
index 73b5ed9a4..e1d0ab598 100644
--- a/docs/tutorials/wiki2/src/basiclayout/development.ini
+++ b/docs/tutorials/wiki2/src/basiclayout/development.ini
@@ -1,8 +1,5 @@
-[DEFAULT]
-debug = true
-
-[app:sqlalchemy]
-use = egg:tutorial#app
+[app:tutorial]
+use = egg:tutorial
 reload_templates = true
 debug_authorization = false
 debug_notfound = false
@@ -13,8 +10,9 @@ db_echo = false
 
 [pipeline:main]
 pipeline =
+    egg:WebError#evalerror
     egg:repoze.tm2#tm
-    sqlalchemy
+    tutorial
 
 [server:main]
 use = egg:Paste#http
diff --git a/docs/tutorials/wiki2/src/basiclayout/setup.py b/docs/tutorials/wiki2/src/basiclayout/setup.py
index 79b1a37c9..09764f40f 100644
--- a/docs/tutorials/wiki2/src/basiclayout/setup.py
+++ b/docs/tutorials/wiki2/src/basiclayout/setup.py
@@ -13,6 +13,7 @@ requires = [
     'transaction',
     'repoze.tm2',
     'zope.sqlalchemy',
+    'WebError',
     ]
 
 if sys.version_info[:3] < (2,5,0):
@@ -31,7 +32,7 @@ setup(name='tutorial',
       author='',
       author_email='',
       url='',
-      keywords='web wsgi pylons pyramid bfg',
+      keywords='web wsgi bfg pylons pyramid',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
@@ -39,7 +40,8 @@ setup(name='tutorial',
       install_requires = requires,
       entry_points = """\
       [paste.app_factory]
-      app = tutorial:app
-      """
+      main = tutorial:main
+      """,
+      paster_plugins=['pyramid'],
       )
 
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py b/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py
index 7a947f1e1..7a701fc02 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py
@@ -1,13 +1,10 @@
 from pyramid.configuration import Configurator
-from paste.deploy.converters import asbool
+from pyramid.settings import asbool
 
 from tutorial.models import initialize_sql
 
-def app(global_config, **settings):
-    """ This function returns a WSGI application.
-    
-    It is usually called by the PasteDeploy framework during 
-    ``paster serve``.
+def main(global_config, **settings):
+    """ This function returns a Pyramid WSGI application.
     """
     db_string = settings.get('db_string')
     if db_string is None:
@@ -21,3 +18,5 @@ def app(global_config, **settings):
                      view_renderer='templates/mytemplate.pt')
     config.end()
     return config.make_wsgi_app()
+
+
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/models.py b/docs/tutorials/wiki2/src/basiclayout/tutorial/models.py
index ae71e7943..a1726ebf4 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/models.py
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/models.py
@@ -13,8 +13,7 @@ from sqlalchemy.orm import sessionmaker
 
 from zope.sqlalchemy import ZopeTransactionExtension
 
-DBSession = scoped_session(sessionmaker(
-    extension=ZopeTransactionExtension()))
+DBSession = scoped_session(sessionmaker(extension=ZopeTransactionExtension()))
 Base = declarative_base()
 
 class MyModel(Base):
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt
index a5a0dd214..6ad23d44f 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt
@@ -8,57 +8,67 @@
 	<link rel="shortcut icon" href="${request.application_url}/static/favicon.ico" />
 	<link rel="stylesheet" href="${request.application_url}/static/pylons.css" type="text/css" media="screen" charset="utf-8" />
 	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Nobile:regular,italic,bold,bolditalic&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
+	<!--[if !IE 7]>
+	<style type="text/css">
+		#wrap {display:table;height:100%}
+	</style>
+	<![endif]-->
 </head>
 <body>
-	<div id="header">
-		<div class="header">The Pyramid Web Application Development Framework</div>
-	</div>
-	<div id="top">
-		<div class="top align-center">
-			<img src="${request.application_url}/static/logo.png" width="300" height="80"/>
-			<p class="app-welcome">
-				Welcome to <span class="app-name">${project}</span>, an application generated by<br/>
-				the Pyramid web application development framework.
-			</p>
+	<div id="wrap">
+		<div id="header">
+			<div class="header">The Pyramid Web Application Development Framework</div>
 		</div>
-	</div>
-	<div id="bottom">
-		<div class="bottom">
-			<div id="left" class="align-right">
-				<h3>Search Pyramid documentation</h3>
-				<form method="get" action="http://docs.pylonshq.com/pyramid/dev/search.html">
-	      			<input type="text" id="q" name="q" value="" />
-	      			<input type="submit" id="x" value="Search" />
-	  			</form>
+		<div id="top">
+			<div class="top align-center">
+				<img src="${request.application_url}/static/logo.png" width="300" height="80"/>
+				<p class="app-welcome">
+					Welcome to <span class="app-name">${project}</span>, an application generated by<br/>
+					the Pyramid web application development framework.
+				</p>
 			</div>
-			<div id="right" class="align-left">
-				<h3>Pyramid links</h3>
-				<ul class="links">
-					<li>
-						<a href="http://pylonshq.com">Pylons Website</a>
-					</li>
-					<li>
-						<a href="http://docs.pylonshq.com/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
-					</li>
-					<li>
-						<a href="http://docs.pylonshq.com/pyramid/dev/#api-documentation">API Documentation</a>
-					</li>
-					<li>
-						<a href="http://docs.pylonshq.com/pyramid/dev/#tutorials">Tutorials</a>
-					</li>
-					<li>
-						<a href="http://docs.pylonshq.com/pyramid/dev/#change-history">Change History</a>
-					</li>
-					<li>
-						<a href="http://docs.pylonshq.com/pyramid/dev/#sample-applications">Sample Applications</a>
-					</li>
-					<li>
-						<a href="http://docs.pylonshq.com/pyramid/dev/#support-and-development">Support and Development</a>
-					</li>
-					<li>
-						<a href="irc://irc.freenode.net#pyramid">IRC Channel</a>
-					</li>
-	  			</ul>
+		</div>
+		<div id="bottom">
+			<div class="bottom">
+				<div id="left" class="align-right">
+					<h3>Search Pyramid documentation</h3>
+					<form method="get" action="http://docs.pylonshq.com/pyramid/dev/search.html">
+		      			<input type="text" id="q" name="q" value="" />
+		      			<input type="submit" id="x" value="Search" />
+		  			</form>
+				</div>
+				<div id="right" class="align-left">
+					<h3>Pyramid links</h3>
+					<ul class="links">
+						<li>
+							<a href="http://pylonshq.com">Pylons Website</a>
+						</li>
+						<li>
+							<a href="http://docs.pylonshq.com/">The Pylons Project Documentation</a>
+						</li>
+						<li>
+							<a href="http://docs.pylonshq.com/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
+						</li>
+						<li>
+							<a href="http://docs.pylonshq.com/pyramid/dev/#api-documentation">API Documentation</a>
+						</li>
+						<li>
+							<a href="http://docs.pylonshq.com/pyramid/dev/#tutorials">Tutorials</a>
+						</li>
+						<li>
+							<a href="http://docs.pylonshq.com/pyramid/dev/#change-history">Change History</a>
+						</li>
+						<li>
+							<a href="http://docs.pylonshq.com/pyramid/dev/#sample-applications">Sample Applications</a>
+						</li>
+						<li>
+							<a href="http://docs.pylonshq.com/pyramid/dev/#support-and-development">Support and Development</a>
+						</li>
+						<li>
+							<a href="irc://irc.freenode.net#pyramid">IRC Channel</a>
+						</li>
+		  			</ul>
+				</div>
 			</div>
 		</div>
 	</div>