From b743bb4da42198f223ec756936dc0c581b08b534 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Thu, 23 Dec 2010 20:01:42 -0500
Subject: tutorial accuracy and wording improvements

---
 docs/tutorials/wiki/src/authorization/tutorial/login.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/tutorials/wiki/src')

diff --git a/docs/tutorials/wiki/src/authorization/tutorial/login.py b/docs/tutorials/wiki/src/authorization/tutorial/login.py
index 59e71a1d9..463db71a6 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/login.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/login.py
@@ -7,10 +7,10 @@ from pyramid.url import resource_url
 
 from tutorial.security import USERS
 
-@view_config(context='pyramid.exceptions.Forbidden',
-             renderer='templates/login.pt')
 @view_config(context='tutorial.models.Wiki', name='login',
              renderer='templates/login.pt')
+@view_config(context='pyramid.exceptions.Forbidden',
+             renderer='templates/login.pt')
 def login(request):
     login_url = resource_url(request.context, request, 'login')
     referrer = request.url
-- 
cgit v1.2.3


From 30c242755e6ec6f21b9f817de606bdad6aed276f Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Wed, 5 Jan 2011 23:42:45 -0500
Subject: Updated tutorial sources to use the new theme, use
 request.static_url('{{package}}:static/foo.css') instead of
 ${request.application_url}/static/foo.css for static files

---
 .../src/authorization/tutorial/static/footerbg.png | Bin 0 -> 333 bytes
 .../src/authorization/tutorial/static/headerbg.png | Bin 0 -> 203 bytes
 .../wiki/src/authorization/tutorial/static/ie6.css |   8 ++
 .../src/authorization/tutorial/static/logo.png     | Bin 6641 -> 0 bytes
 .../src/authorization/tutorial/static/middlebg.png | Bin 0 -> 2797 bytes
 .../src/authorization/tutorial/static/pylons.css   |  47 ++++-----
 .../src/authorization/tutorial/static/pyramid.png  | Bin 0 -> 33055 bytes
 .../src/authorization/tutorial/static/style.css    | 109 ---------------------
 .../authorization/tutorial/static/transparent.gif  | Bin 0 -> 49 bytes
 .../src/authorization/tutorial/templates/edit.pt   |  77 +++++++++------
 .../src/authorization/tutorial/templates/login.pt  |  73 ++++++++------
 .../authorization/tutorial/templates/mytemplate.pt | 107 ++++++++++----------
 .../src/authorization/tutorial/templates/view.pt   |  80 +++++++++------
 .../src/basiclayout/tutorial/static/footerbg.png   | Bin 0 -> 333 bytes
 .../src/basiclayout/tutorial/static/headerbg.png   | Bin 0 -> 203 bytes
 .../wiki/src/basiclayout/tutorial/static/ie6.css   |   8 ++
 .../wiki/src/basiclayout/tutorial/static/logo.png  | Bin 6641 -> 0 bytes
 .../src/basiclayout/tutorial/static/middlebg.png   | Bin 0 -> 2797 bytes
 .../src/basiclayout/tutorial/static/pylons.css     |  47 ++++-----
 .../src/basiclayout/tutorial/static/pyramid.png    | Bin 0 -> 33055 bytes
 .../basiclayout/tutorial/static/transparent.gif    | Bin 0 -> 49 bytes
 .../basiclayout/tutorial/templates/mytemplate.pt   |  31 +++---
 .../wiki/src/models/tutorial/static/footerbg.png   | Bin 0 -> 333 bytes
 .../wiki/src/models/tutorial/static/headerbg.png   | Bin 0 -> 203 bytes
 .../wiki/src/models/tutorial/static/ie6.css        |   8 ++
 .../wiki/src/models/tutorial/static/logo.png       | Bin 6641 -> 0 bytes
 .../wiki/src/models/tutorial/static/middlebg.png   | Bin 0 -> 2797 bytes
 .../wiki/src/models/tutorial/static/pylons.css     |  47 ++++-----
 .../wiki/src/models/tutorial/static/pyramid.png    | Bin 0 -> 33055 bytes
 .../src/models/tutorial/static/transparent.gif     | Bin 0 -> 49 bytes
 .../src/models/tutorial/templates/mytemplate.pt    | 107 ++++++++++----------
 .../wiki/src/views/tutorial/static/footerbg.png    | Bin 0 -> 333 bytes
 .../wiki/src/views/tutorial/static/headerbg.png    | Bin 0 -> 203 bytes
 .../wiki/src/views/tutorial/static/ie6.css         |   8 ++
 .../wiki/src/views/tutorial/static/logo.png        | Bin 6641 -> 0 bytes
 .../wiki/src/views/tutorial/static/middlebg.png    | Bin 0 -> 2797 bytes
 .../wiki/src/views/tutorial/static/pylons.css      |  47 ++++-----
 .../wiki/src/views/tutorial/static/pyramid.png     | Bin 0 -> 33055 bytes
 .../wiki/src/views/tutorial/static/style.css       | 109 ---------------------
 .../wiki/src/views/tutorial/static/transparent.gif | Bin 0 -> 49 bytes
 .../wiki/src/views/tutorial/templates/edit.pt      |  75 ++++++++------
 .../src/views/tutorial/templates/mytemplate.pt     | 107 ++++++++++----------
 .../wiki/src/views/tutorial/templates/view.pt      |  78 ++++++++++-----
 43 files changed, 536 insertions(+), 637 deletions(-)
 create mode 100644 docs/tutorials/wiki/src/authorization/tutorial/static/footerbg.png
 create mode 100644 docs/tutorials/wiki/src/authorization/tutorial/static/headerbg.png
 create mode 100644 docs/tutorials/wiki/src/authorization/tutorial/static/ie6.css
 delete mode 100644 docs/tutorials/wiki/src/authorization/tutorial/static/logo.png
 create mode 100644 docs/tutorials/wiki/src/authorization/tutorial/static/middlebg.png
 create mode 100644 docs/tutorials/wiki/src/authorization/tutorial/static/pyramid.png
 delete mode 100644 docs/tutorials/wiki/src/authorization/tutorial/static/style.css
 create mode 100644 docs/tutorials/wiki/src/authorization/tutorial/static/transparent.gif
 create mode 100644 docs/tutorials/wiki/src/basiclayout/tutorial/static/footerbg.png
 create mode 100644 docs/tutorials/wiki/src/basiclayout/tutorial/static/headerbg.png
 create mode 100644 docs/tutorials/wiki/src/basiclayout/tutorial/static/ie6.css
 delete mode 100644 docs/tutorials/wiki/src/basiclayout/tutorial/static/logo.png
 create mode 100644 docs/tutorials/wiki/src/basiclayout/tutorial/static/middlebg.png
 create mode 100644 docs/tutorials/wiki/src/basiclayout/tutorial/static/pyramid.png
 create mode 100644 docs/tutorials/wiki/src/basiclayout/tutorial/static/transparent.gif
 create mode 100644 docs/tutorials/wiki/src/models/tutorial/static/footerbg.png
 create mode 100644 docs/tutorials/wiki/src/models/tutorial/static/headerbg.png
 create mode 100644 docs/tutorials/wiki/src/models/tutorial/static/ie6.css
 delete mode 100644 docs/tutorials/wiki/src/models/tutorial/static/logo.png
 create mode 100644 docs/tutorials/wiki/src/models/tutorial/static/middlebg.png
 create mode 100644 docs/tutorials/wiki/src/models/tutorial/static/pyramid.png
 create mode 100644 docs/tutorials/wiki/src/models/tutorial/static/transparent.gif
 create mode 100644 docs/tutorials/wiki/src/views/tutorial/static/footerbg.png
 create mode 100644 docs/tutorials/wiki/src/views/tutorial/static/headerbg.png
 create mode 100644 docs/tutorials/wiki/src/views/tutorial/static/ie6.css
 delete mode 100644 docs/tutorials/wiki/src/views/tutorial/static/logo.png
 create mode 100644 docs/tutorials/wiki/src/views/tutorial/static/middlebg.png
 create mode 100644 docs/tutorials/wiki/src/views/tutorial/static/pyramid.png
 delete mode 100644 docs/tutorials/wiki/src/views/tutorial/static/style.css
 create mode 100644 docs/tutorials/wiki/src/views/tutorial/static/transparent.gif

(limited to 'docs/tutorials/wiki/src')

diff --git a/docs/tutorials/wiki/src/authorization/tutorial/static/footerbg.png b/docs/tutorials/wiki/src/authorization/tutorial/static/footerbg.png
new file mode 100644
index 000000000..1fbc873da
Binary files /dev/null and b/docs/tutorials/wiki/src/authorization/tutorial/static/footerbg.png differ
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/static/headerbg.png b/docs/tutorials/wiki/src/authorization/tutorial/static/headerbg.png
new file mode 100644
index 000000000..0596f2020
Binary files /dev/null and b/docs/tutorials/wiki/src/authorization/tutorial/static/headerbg.png differ
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/static/ie6.css b/docs/tutorials/wiki/src/authorization/tutorial/static/ie6.css
new file mode 100644
index 000000000..b7c8493d8
--- /dev/null
+++ b/docs/tutorials/wiki/src/authorization/tutorial/static/ie6.css
@@ -0,0 +1,8 @@
+* html img,
+* html .png{position:relative;behavior:expression((this.runtimeStyle.behavior="none")&&(this.pngSet?this.pngSet=true:(this.nodeName == "IMG" && this.src.toLowerCase().indexOf('.png')>-1?(this.runtimeStyle.backgroundImage = "none",
+this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.src + "',sizingMethod='image')",
+this.src = "static/transparent.gif"):(this.origBg = this.origBg? this.origBg :this.currentStyle.backgroundImage.toString().replace('url("','').replace('")',''),
+this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.origBg + "',sizingMethod='crop')",
+this.runtimeStyle.backgroundImage = "none")),this.pngSet=true)
+);}
+#wrap{display:table;height:100%}
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/static/logo.png b/docs/tutorials/wiki/src/authorization/tutorial/static/logo.png
deleted file mode 100644
index 88f5d9865..000000000
Binary files a/docs/tutorials/wiki/src/authorization/tutorial/static/logo.png and /dev/null differ
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/static/middlebg.png b/docs/tutorials/wiki/src/authorization/tutorial/static/middlebg.png
new file mode 100644
index 000000000..2369cfb7d
Binary files /dev/null and b/docs/tutorials/wiki/src/authorization/tutorial/static/middlebg.png differ
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/static/pylons.css b/docs/tutorials/wiki/src/authorization/tutorial/static/pylons.css
index c153be07f..4ebc5a081 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/static/pylons.css
+++ b/docs/tutorials/wiki/src/authorization/tutorial/static/pylons.css
@@ -4,34 +4,23 @@ body{line-height:1;}
 ol,ul{list-style:none;}
 blockquote,q{quotes:none;}
 blockquote:before,blockquote:after,q:before,q:after{content:'';content:none;}
-/* remember to define focus styles! */
 :focus{outline:0;}
-/* remember to highlight inserts somehow! */
 ins{text-decoration:none;}
 del{text-decoration:line-through;}
-/* tables still need 'cellspacing="0"' in the markup */
 table{border-collapse:collapse;border-spacing:0;}
-/* restyling */
 sub{vertical-align:sub;font-size:smaller;line-height:normal;}
 sup{vertical-align:super;font-size:smaller;line-height:normal;}
-/* lists */
 ul,menu,dir{display:block;list-style-type:disc;margin:1em 0;padding-left:40px;}
 ol{display:block;list-style-type:decimal-leading-zero;margin:1em 0;padding-left:40px;}
 li{display:list-item;}
-/* nested lists have no top/bottom margins */
 ul ul,ul ol,ul dir,ul menu,ul dl,ol ul,ol ol,ol dir,ol menu,ol dl,dir ul,dir ol,dir dir,dir menu,dir dl,menu ul,menu ol,menu dir,menu menu,menu dl,dl ul,dl ol,dl dir,dl menu,dl dl{margin-top:0;margin-bottom:0;}
-/* 2 deep unordered lists use a circle */
 ol ul,ul ul,menu ul,dir ul,ol menu,ul menu,menu menu,dir menu,ol dir,ul dir,menu dir,dir dir{list-style-type:circle;}
-/* 3 deep (or more) unordered lists use a square */
 ol ol ul,ol ul ul,ol menu ul,ol dir ul,ol ol menu,ol ul menu,ol menu menu,ol dir menu,ol ol dir,ol ul dir,ol menu dir,ol dir dir,ul ol ul,ul ul ul,ul menu ul,ul dir ul,ul ol menu,ul ul menu,ul menu menu,ul dir menu,ul ol dir,ul ul dir,ul menu dir,ul dir dir,menu ol ul,menu ul ul,menu menu ul,menu dir ul,menu ol menu,menu ul menu,menu menu menu,menu dir menu,menu ol dir,menu ul dir,menu menu dir,menu dir dir,dir ol ul,dir ul ul,dir menu ul,dir dir ul,dir ol menu,dir ul menu,dir menu menu,dir dir menu,dir ol dir,dir ul dir,dir menu dir,dir dir dir{list-style-type:square;}
 .hidden{display:none;}
 p{line-height:1.5em;}
-h1{font-size:1.75em;/* 28px */
-line-height:1.7em;font-family:helvetica,verdana;}
-h2{font-size:1.5em;/* 24px */
-line-height:1.7em;font-family:helvetica,verdana;}
-h3{font-size:1.25em;/* 20px */
-line-height:1.7em;font-family:helvetica,verdana;}
+h1{font-size:1.75em;line-height:1.7em;font-family:helvetica,verdana;}
+h2{font-size:1.5em;line-height:1.7em;font-family:helvetica,verdana;}
+h3{font-size:1.25em;line-height:1.7em;font-family:helvetica,verdana;}
 h4{font-size:1em;line-height:1.7em;font-family:helvetica,verdana;}
 html,body{width:100%;height:100%;}
 body{margin:0;padding:0;background-color:#ffffff;position:relative;font:16px/24px "Nobile","Lucida Grande",Lucida,Verdana,sans-serif;}
@@ -42,23 +31,25 @@ body h2,
 body h3,
 body h4,
 body h5,
-body h6{font-family:"Nobile","Lucida Grande",Lucida,Verdana,sans-serif;font-weight:normal;color:#144fb2;font-style:normal;}
-#wrap {min-height: 100%;}
-#header,#footer{width:100%;color:#ffffff;height:40px;position:absolute;text-align:center;line-height:40px;overflow:hidden;font-size:12px;}
-#header{background-color:#e88f00;top:0;font-size:14px;}
-#footer{background-color:#000000;bottom:0;position: relative;margin-top:-40px;clear:both;}
-.header,.footer{width:700px;margin-right:auto;margin-left:auto;}
+body h6{font-family:"Neuton","Lucida Grande",Lucida,Verdana,sans-serif;font-weight:normal;color:#373839;font-style:normal;}
+#wrap{min-height:100%;}
+#header,#footer{width:100%;color:#ffffff;height:40px;position:absolute;text-align:center;line-height:40px;overflow:hidden;font-size:12px;vertical-align:middle;}
+#header{background:#000000;top:0;font-size:14px;}
+#footer{bottom:0;background:#000000 url(footerbg.png) repeat-x 0 top;position:relative;margin-top:-40px;clear:both;}
+.header,.footer{width:750px;margin-right:auto;margin-left:auto;}
 .wrapper{width:100%}
 #top,#bottom{width:100%;}
-#top{color:#888;background-color:#eee;height:300px;border-bottom:2px solid #ddd;}
-#bottom{color:#222;background-color:#ffffff;overflow:hidden;padding-bottom:80px;}
-.top,.bottom{width:700px;margin-right:auto;margin-left:auto;}
-.top{padding-top:100px;}
+#top{color:#000000;height:230px;
+background:#ffffff url(headerbg.png) repeat-x 0 top;position:relative;}
+#bottom{color:#222;background-color:#ffffff;}
+.top,.middle,.bottom{width:750px;margin-right:auto;margin-left:auto;}
+.top{padding-top:40px;}
+#middle{width:100%;height:100px;background:url(middlebg.png) repeat-x;border-top:2px solid #ffffff;border-bottom:2px solid #b2b2b2;}
 .app-welcome{margin-top:25px;}
 .app-name{color:#000000;font-weight:bold;}
 .bottom{padding-top:50px;}
-#left{width:325px;float:left;padding-right:25px;}
-#right{width:325px;float:right;padding-left:25px;}
+#left{width:350px;float:left;padding-right:25px;}
+#right{width:350px;float:right;padding-left:25px;}
 .align-left{text-align:left;}
 .align-right{text-align:right;}
 .align-center{text-align:center;}
@@ -67,7 +58,7 @@ ul.links li{list-style-type:none;font-size:14px;}
 form{border-style:none;}
 fieldset{border-style:none;}
 input{color:#222;border:1px solid #ccc;font-family:sans-serif;font-size:12px;line-height:16px;}
-input[type=text]{}
+input[type=text],input[type=password]{width:205px;}
 input[type=submit]{background-color:#ddd;font-weight:bold;}
 /*Opera Fix*/
-body:before {content:"";height:100%;float:left;width:0;margin-top:-32767px;}
+body:before{content:"";height:100%;float:left;width:0;margin-top:-32767px;}
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/static/pyramid.png b/docs/tutorials/wiki/src/authorization/tutorial/static/pyramid.png
new file mode 100644
index 000000000..347e05549
Binary files /dev/null and b/docs/tutorials/wiki/src/authorization/tutorial/static/pyramid.png differ
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/static/style.css b/docs/tutorials/wiki/src/authorization/tutorial/static/style.css
deleted file mode 100644
index cad87e0d4..000000000
--- a/docs/tutorials/wiki/src/authorization/tutorial/static/style.css
+++ /dev/null
@@ -1,109 +0,0 @@
-html, body {
-  color: black;
-  background-color: #ddd;
-  font: x-small "Lucida Grande", "Lucida Sans Unicode", geneva, sans-serif;
-  margin: 0;
-  padding: 0;
-}
-
-td, th {padding:3px;border:none;}
-tr th {text-align:left;background-color:#f0f0f0;color:#333;}
-tr.odd td {background-color:#edf3fe;}
-tr.even td {background-color:#fff;}
-
-#header {
-  height: 80px;
-  width: 777px;
-  background: blue URL('../images/header_inner.png') no-repeat;
-  border-left: 1px solid #aaa;
-  border-right: 1px solid #aaa;
-  margin: 0 auto 0 auto;
-}
-
-a.link, a, a.active {
-  color: #369;
-}
-
-
-#main_content {
-  color: black;
-  font-size: 127%;
-  background-color: white;
-  width: 757px;
-  margin: 0 auto 0 auto;
-  border-left: 1px solid #aaa;
-  border-right: 1px solid #aaa;
-  padding: 10px;
-}
-
-#sidebar {
-  border: 1px solid #aaa;
-  background-color: #eee;
-  margin: 0.5em;
-  padding: 1em;
-  float: right;
-  width: 200px;
-  font-size: 88%;
-}
-
-#sidebar h2 {
-  margin-top: 0;
-}
-
-#sidebar ul {
-  margin-left: 1.5em;
-  padding-left: 0;
-}
-
-h1,h2,h3,h4,h5,h6,#getting_started_steps {
-  font-family: "Century Schoolbook L", Georgia, serif;
-  font-weight: bold;
-}
-
-h2 {
-  font-size: 150%;
-}
-
-#footer {
-  border: 1px solid #aaa;
-  border-top: 0px none;
-  color: #999;
-  background-color: white;
-  padding: 10px;
-  font-size: 80%;
-  text-align: center;
-  width: 757px;
-  margin: 0 auto 1em auto;
-}
-
-.code {
-  font-family: monospace;
-}
-
-span.code {
-  font-weight: bold;
-  background: #eee;
-}
-
-#status_block {
-  margin: 0 auto 0.5em auto;
-  padding: 15px 10px 15px 55px;
-  background: #cec URL('../images/ok.png') left center no-repeat;
-  border: 1px solid #9c9;
-  width: 450px;
-  font-size: 120%;
-  font-weight: bolder;
-}
-
-.notice {
-  margin: 0.5em auto 0.5em auto;
-  padding: 15px 10px 15px 55px;
-  width: 450px;
-  background: #eef URL('../images/info.png') left center no-repeat;
-  border: 1px solid #cce;
-}
-
-.fielderror {
-    color: red;
-    font-weight: bold;
-}
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/static/transparent.gif b/docs/tutorials/wiki/src/authorization/tutorial/static/transparent.gif
new file mode 100644
index 000000000..0341802e5
Binary files /dev/null and b/docs/tutorials/wiki/src/authorization/tutorial/static/transparent.gif differ
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
index 5f8b22207..1c764f924 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
@@ -1,34 +1,51 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-    xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:tal="http://xml.zope.org/namespaces/tal">
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" xmlns:tal="http://xml.zope.org/namespaces/tal">
 <head>
-    <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <title>Pyramid tutorial wiki (based on TurboGears 20-Minute Wiki) 
-           Editing: ${page.__name__}</title>
-        <link rel="stylesheet" type="text/css"
-          href="${request.application_url}/static/style.css" />
+	<title>${page.__name__} - Pyramid tutorial wiki (based on TurboGears 20-Minute Wiki)</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+	<meta name="keywords" content="python web application" />
+	<meta name="description" content="pyramid web application" />
+	<link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
+	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" 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 lte IE 6]>
+	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
+	<![endif]-->
 </head>
-
 <body>
-
-<div class="main_content">
-  <div style="float:right; width: 10em;"> Viewing
-    <span tal:replace="page.__name__">Page Name Goes Here</span> <br/>
-    You can return to the <a href="${request.application_url}"
-          >FrontPage</a>.
-   <span tal:condition="logged_in"><a 
-         href="${request.application_url}/logout">Logout</a></span>
-  </div>
-
-  <div>
-    <form action="${save_url}" method="post">
-      <textarea name="body" tal:content="page.data" rows="10" cols="60"/>
-      <input type="submit" name="form.submitted" value="Save"/>
-    </form>
-  </div>
-</div>  
+	<div id="wrap">
+		<div id="top">
+			<div class="top align-center">
+				<div>
+					<img src="${request.static_url('tutorial:static/pyramid.png')}" width="750" height="169" alt="pyramid" />
+				</div>
+			</div>
+		</div>
+		<div id="middle">
+			<div class="middle align-right">
+				<div id="left" class="app-welcome align-left">
+					Editing <b><span tal:replace="page.__name__">Page Name Goes Here</span></b><br/>
+					You can return to the <a href="${request.application_url}">FrontPage</a>.<br/>
+				</div>
+				<div id="right" class="app-welcome align-right">
+					<span tal:condition="logged_in">
+  						<a href="${request.application_url}/logout">Logout</a>
+					</span>
+				</div>
+			</div>
+		</div>
+		<div id="bottom">
+			<div class="bottom">
+				<form action="${save_url}" method="post">
+      				<textarea name="body" tal:content="page.data" rows="10" cols="60"/><br/>
+      				<input type="submit" name="form.submitted" value="Save"/>
+    			</form>
+			</div>
+		</div>
+	</div>
+	<div id="footer">
+		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+	</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
index c56983d64..4473b701a 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
@@ -1,32 +1,49 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:tal="http://xml.zope.org/namespaces/tal">
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" xmlns:tal="http://xml.zope.org/namespaces/tal">
 <head>
-  <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-  <title>Pyramid tutorial wiki (based on TurboGears 20-Minute Wiki)</title>
-  <link rel="stylesheet" type="text/css"
-        href="${request.application_url}/static/style.css" />
+	<title>Login - Pyramid tutorial wiki (based on TurboGears 20-Minute Wiki)</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+	<meta name="keywords" content="python web application" />
+	<meta name="description" content="pyramid web application" />
+	<link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
+	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" 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 lte IE 6]>
+	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
+	<![endif]-->
 </head>
-
 <body>
-
-<h1>Log In</h1>
-
-<div tal:replace="message"/>
-
-<div class="main_content">
-  <form action="${url}" method="post">
-    <input type="hidden" name="came_from" value="${came_from}"/>
-    <input type="text" name="login" value="${login}"/>
-    <br/>
-    <input type="password" name="password" value="${password}"/>
-    <br/>
-    <input type="submit" name="form.submitted" value="Log In"/>
-  </form>
-</div>  
-
+	<div id="wrap">
+		<div id="top">
+			<div class="top align-center">
+				<div>
+					<img src="${request.static_url('tutorial:static/pyramid.png')}" width="750" height="169" alt="pyramid" />
+				</div>
+			</div>
+		</div>
+		<div id="middle">
+			<div class="middle align-right">
+				<div id="left" class="app-welcome align-left">
+					<b>Login</b><br/>
+					<span tal:replace="message"/>
+				</div>
+				<div id="right" class="app-welcome align-right"></div>
+			</div>
+		</div>
+		<div id="bottom">
+			<div class="bottom">
+				<form action="${url}" method="post">
+    				<input type="hidden" name="came_from" value="${came_from}"/>
+    				<input type="text" name="login" value="${login}"/><br/>
+    				<input type="password" name="password" value="${password}"/><br/>
+    				<input type="submit" name="form.submitted" value="Log In"/>
+  				</form>
+			</div>
+		</div>
+	</div>
+	<div id="footer">
+		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+	</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
index a5a0dd214..cac9ccaa7 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
@@ -5,65 +5,72 @@
 	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
 	<meta name="keywords" content="python web application" />
 	<meta name="description" content="pyramid web application" />
-	<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="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
+	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" 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 lte IE 6]>
+	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
+	<![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="top">
+			<div class="top align-center">
+				<div><img src="${request.static_url('tutorial:static/pyramid.png')}" width="750" height="169" alt="pyramid"/></div>
+			</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="middle">
+			<div class="middle align-center">
+				<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">
+					<h2>Search documentation</h2>
+					<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="Go" />
+		  			</form>
+				</div>
+				<div id="right" class="align-left">
+					<h2>Pyramid links</h2>
+					<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>
 		</div>
 	</div>
 	<div id="footer">
-		<div class="footer">© Copyright 2008-2010, Agendaless Consulting.</div>
+		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
 	</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
index f957176f1..003349ea5 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
@@ -1,31 +1,55 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-    xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:tal="http://xml.zope.org/namespaces/tal">
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" xmlns:tal="http://xml.zope.org/namespaces/tal">
 <head>
-    <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <title>${page.__name__} - Pyramid tutorial wiki 
-           (based on TurboGears 20-Minute Wiki)
-    </title>
-        <link rel="stylesheet" type="text/css"
-          href="${request.application_url}/static/style.css" />
+	<title>${page.__name__} - Pyramid tutorial wiki (based on TurboGears 20-Minute Wiki)</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+	<meta name="keywords" content="python web application" />
+	<meta name="description" content="pyramid web application" />
+	<link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
+	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" 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 lte IE 6]>
+	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
+	<![endif]-->
 </head>
-
 <body>
-
-<div class="main_content">
-<div style="float:right; width: 10em;"> Viewing
-<span tal:replace="page.__name__">Page Name Goes Here</span> <br/>
-You can return to the <a href="${request.application_url}">FrontPage</a>.
-<span tal:condition="logged_in">
-  <a href="${request.application_url}/logout">Logout</a>
-</span>
-</div>
-
-<div tal:replace="structure content">Page text goes here.</div>
-<p><a tal:attributes="href edit_url" href="">Edit this page</a></p>
-</div>
-
-</body></html>
+	<div id="wrap">
+		<div id="top">
+			<div class="top align-center">
+				<div>
+					<img src="${request.static_url('tutorial:static/pyramid.png')}" width="750" height="169" alt="pyramid" />
+				</div>
+			</div>
+		</div>
+		<div id="middle">
+			<div class="middle align-right">
+				<div id="left" class="app-welcome align-left">
+					Viewing <b><span tal:replace="page.__name__">Page Name Goes Here</span></b><br/>
+					You can return to the <a href="${request.application_url}">FrontPage</a>.<br/>
+				</div>
+				<div id="right" class="app-welcome align-right">
+					<span tal:condition="logged_in">
+  						<a href="${request.application_url}/logout">Logout</a>
+					</span>
+				</div>
+			</div>
+		</div>
+		<div id="bottom">
+			<div class="bottom">
+				<div tal:replace="structure content">
+					Page text goes here.
+				</div>
+				<p>
+					<a tal:attributes="href edit_url" href="">
+						Edit this page
+					</a>
+				</p>
+			</div>
+		</div>
+	</div>
+	<div id="footer">
+		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+	</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/static/footerbg.png b/docs/tutorials/wiki/src/basiclayout/tutorial/static/footerbg.png
new file mode 100644
index 000000000..1fbc873da
Binary files /dev/null and b/docs/tutorials/wiki/src/basiclayout/tutorial/static/footerbg.png differ
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/static/headerbg.png b/docs/tutorials/wiki/src/basiclayout/tutorial/static/headerbg.png
new file mode 100644
index 000000000..0596f2020
Binary files /dev/null and b/docs/tutorials/wiki/src/basiclayout/tutorial/static/headerbg.png differ
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/static/ie6.css b/docs/tutorials/wiki/src/basiclayout/tutorial/static/ie6.css
new file mode 100644
index 000000000..b7c8493d8
--- /dev/null
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/static/ie6.css
@@ -0,0 +1,8 @@
+* html img,
+* html .png{position:relative;behavior:expression((this.runtimeStyle.behavior="none")&&(this.pngSet?this.pngSet=true:(this.nodeName == "IMG" && this.src.toLowerCase().indexOf('.png')>-1?(this.runtimeStyle.backgroundImage = "none",
+this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.src + "',sizingMethod='image')",
+this.src = "static/transparent.gif"):(this.origBg = this.origBg? this.origBg :this.currentStyle.backgroundImage.toString().replace('url("','').replace('")',''),
+this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.origBg + "',sizingMethod='crop')",
+this.runtimeStyle.backgroundImage = "none")),this.pngSet=true)
+);}
+#wrap{display:table;height:100%}
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/static/logo.png b/docs/tutorials/wiki/src/basiclayout/tutorial/static/logo.png
deleted file mode 100644
index 88f5d9865..000000000
Binary files a/docs/tutorials/wiki/src/basiclayout/tutorial/static/logo.png and /dev/null differ
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/static/middlebg.png b/docs/tutorials/wiki/src/basiclayout/tutorial/static/middlebg.png
new file mode 100644
index 000000000..2369cfb7d
Binary files /dev/null and b/docs/tutorials/wiki/src/basiclayout/tutorial/static/middlebg.png differ
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/static/pylons.css b/docs/tutorials/wiki/src/basiclayout/tutorial/static/pylons.css
index c153be07f..4ebc5a081 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/static/pylons.css
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/static/pylons.css
@@ -4,34 +4,23 @@ body{line-height:1;}
 ol,ul{list-style:none;}
 blockquote,q{quotes:none;}
 blockquote:before,blockquote:after,q:before,q:after{content:'';content:none;}
-/* remember to define focus styles! */
 :focus{outline:0;}
-/* remember to highlight inserts somehow! */
 ins{text-decoration:none;}
 del{text-decoration:line-through;}
-/* tables still need 'cellspacing="0"' in the markup */
 table{border-collapse:collapse;border-spacing:0;}
-/* restyling */
 sub{vertical-align:sub;font-size:smaller;line-height:normal;}
 sup{vertical-align:super;font-size:smaller;line-height:normal;}
-/* lists */
 ul,menu,dir{display:block;list-style-type:disc;margin:1em 0;padding-left:40px;}
 ol{display:block;list-style-type:decimal-leading-zero;margin:1em 0;padding-left:40px;}
 li{display:list-item;}
-/* nested lists have no top/bottom margins */
 ul ul,ul ol,ul dir,ul menu,ul dl,ol ul,ol ol,ol dir,ol menu,ol dl,dir ul,dir ol,dir dir,dir menu,dir dl,menu ul,menu ol,menu dir,menu menu,menu dl,dl ul,dl ol,dl dir,dl menu,dl dl{margin-top:0;margin-bottom:0;}
-/* 2 deep unordered lists use a circle */
 ol ul,ul ul,menu ul,dir ul,ol menu,ul menu,menu menu,dir menu,ol dir,ul dir,menu dir,dir dir{list-style-type:circle;}
-/* 3 deep (or more) unordered lists use a square */
 ol ol ul,ol ul ul,ol menu ul,ol dir ul,ol ol menu,ol ul menu,ol menu menu,ol dir menu,ol ol dir,ol ul dir,ol menu dir,ol dir dir,ul ol ul,ul ul ul,ul menu ul,ul dir ul,ul ol menu,ul ul menu,ul menu menu,ul dir menu,ul ol dir,ul ul dir,ul menu dir,ul dir dir,menu ol ul,menu ul ul,menu menu ul,menu dir ul,menu ol menu,menu ul menu,menu menu menu,menu dir menu,menu ol dir,menu ul dir,menu menu dir,menu dir dir,dir ol ul,dir ul ul,dir menu ul,dir dir ul,dir ol menu,dir ul menu,dir menu menu,dir dir menu,dir ol dir,dir ul dir,dir menu dir,dir dir dir{list-style-type:square;}
 .hidden{display:none;}
 p{line-height:1.5em;}
-h1{font-size:1.75em;/* 28px */
-line-height:1.7em;font-family:helvetica,verdana;}
-h2{font-size:1.5em;/* 24px */
-line-height:1.7em;font-family:helvetica,verdana;}
-h3{font-size:1.25em;/* 20px */
-line-height:1.7em;font-family:helvetica,verdana;}
+h1{font-size:1.75em;line-height:1.7em;font-family:helvetica,verdana;}
+h2{font-size:1.5em;line-height:1.7em;font-family:helvetica,verdana;}
+h3{font-size:1.25em;line-height:1.7em;font-family:helvetica,verdana;}
 h4{font-size:1em;line-height:1.7em;font-family:helvetica,verdana;}
 html,body{width:100%;height:100%;}
 body{margin:0;padding:0;background-color:#ffffff;position:relative;font:16px/24px "Nobile","Lucida Grande",Lucida,Verdana,sans-serif;}
@@ -42,23 +31,25 @@ body h2,
 body h3,
 body h4,
 body h5,
-body h6{font-family:"Nobile","Lucida Grande",Lucida,Verdana,sans-serif;font-weight:normal;color:#144fb2;font-style:normal;}
-#wrap {min-height: 100%;}
-#header,#footer{width:100%;color:#ffffff;height:40px;position:absolute;text-align:center;line-height:40px;overflow:hidden;font-size:12px;}
-#header{background-color:#e88f00;top:0;font-size:14px;}
-#footer{background-color:#000000;bottom:0;position: relative;margin-top:-40px;clear:both;}
-.header,.footer{width:700px;margin-right:auto;margin-left:auto;}
+body h6{font-family:"Neuton","Lucida Grande",Lucida,Verdana,sans-serif;font-weight:normal;color:#373839;font-style:normal;}
+#wrap{min-height:100%;}
+#header,#footer{width:100%;color:#ffffff;height:40px;position:absolute;text-align:center;line-height:40px;overflow:hidden;font-size:12px;vertical-align:middle;}
+#header{background:#000000;top:0;font-size:14px;}
+#footer{bottom:0;background:#000000 url(footerbg.png) repeat-x 0 top;position:relative;margin-top:-40px;clear:both;}
+.header,.footer{width:750px;margin-right:auto;margin-left:auto;}
 .wrapper{width:100%}
 #top,#bottom{width:100%;}
-#top{color:#888;background-color:#eee;height:300px;border-bottom:2px solid #ddd;}
-#bottom{color:#222;background-color:#ffffff;overflow:hidden;padding-bottom:80px;}
-.top,.bottom{width:700px;margin-right:auto;margin-left:auto;}
-.top{padding-top:100px;}
+#top{color:#000000;height:230px;
+background:#ffffff url(headerbg.png) repeat-x 0 top;position:relative;}
+#bottom{color:#222;background-color:#ffffff;}
+.top,.middle,.bottom{width:750px;margin-right:auto;margin-left:auto;}
+.top{padding-top:40px;}
+#middle{width:100%;height:100px;background:url(middlebg.png) repeat-x;border-top:2px solid #ffffff;border-bottom:2px solid #b2b2b2;}
 .app-welcome{margin-top:25px;}
 .app-name{color:#000000;font-weight:bold;}
 .bottom{padding-top:50px;}
-#left{width:325px;float:left;padding-right:25px;}
-#right{width:325px;float:right;padding-left:25px;}
+#left{width:350px;float:left;padding-right:25px;}
+#right{width:350px;float:right;padding-left:25px;}
 .align-left{text-align:left;}
 .align-right{text-align:right;}
 .align-center{text-align:center;}
@@ -67,7 +58,7 @@ ul.links li{list-style-type:none;font-size:14px;}
 form{border-style:none;}
 fieldset{border-style:none;}
 input{color:#222;border:1px solid #ccc;font-family:sans-serif;font-size:12px;line-height:16px;}
-input[type=text]{}
+input[type=text],input[type=password]{width:205px;}
 input[type=submit]{background-color:#ddd;font-weight:bold;}
 /*Opera Fix*/
-body:before {content:"";height:100%;float:left;width:0;margin-top:-32767px;}
+body:before{content:"";height:100%;float:left;width:0;margin-top:-32767px;}
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/static/pyramid.png b/docs/tutorials/wiki/src/basiclayout/tutorial/static/pyramid.png
new file mode 100644
index 000000000..347e05549
Binary files /dev/null and b/docs/tutorials/wiki/src/basiclayout/tutorial/static/pyramid.png differ
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/static/transparent.gif b/docs/tutorials/wiki/src/basiclayout/tutorial/static/transparent.gif
new file mode 100644
index 000000000..0341802e5
Binary files /dev/null and b/docs/tutorials/wiki/src/basiclayout/tutorial/static/transparent.gif differ
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
index 6ad23d44f..cac9ccaa7 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
@@ -5,23 +5,23 @@
 	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
 	<meta name="keywords" content="python web application" />
 	<meta name="description" content="pyramid web application" />
-	<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="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
+	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" 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>
+	<!--[if lte IE 6]>
+	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
 </head>
 <body>
 	<div id="wrap">
-		<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"/>
+				<div><img src="${request.static_url('tutorial:static/pyramid.png')}" width="750" height="169" alt="pyramid"/></div>
+			</div>
+		</div>
+		<div id="middle">
+			<div class="middle align-center">
 				<p class="app-welcome">
 					Welcome to <span class="app-name">${project}</span>, an application generated by<br/>
 					the Pyramid web application development framework.
@@ -31,21 +31,18 @@
 		<div id="bottom">
 			<div class="bottom">
 				<div id="left" class="align-right">
-					<h3>Search Pyramid documentation</h3>
+					<h2>Search documentation</h2>
 					<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" />
+		      			<input type="submit" id="x" value="Go" />
 		  			</form>
 				</div>
 				<div id="right" class="align-left">
-					<h3>Pyramid links</h3>
+					<h2>Pyramid links</h2>
 					<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>
@@ -73,7 +70,7 @@
 		</div>
 	</div>
 	<div id="footer">
-		<div class="footer">© Copyright 2008-2010, Agendaless Consulting.</div>
+		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
 	</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/tutorials/wiki/src/models/tutorial/static/footerbg.png b/docs/tutorials/wiki/src/models/tutorial/static/footerbg.png
new file mode 100644
index 000000000..1fbc873da
Binary files /dev/null and b/docs/tutorials/wiki/src/models/tutorial/static/footerbg.png differ
diff --git a/docs/tutorials/wiki/src/models/tutorial/static/headerbg.png b/docs/tutorials/wiki/src/models/tutorial/static/headerbg.png
new file mode 100644
index 000000000..0596f2020
Binary files /dev/null and b/docs/tutorials/wiki/src/models/tutorial/static/headerbg.png differ
diff --git a/docs/tutorials/wiki/src/models/tutorial/static/ie6.css b/docs/tutorials/wiki/src/models/tutorial/static/ie6.css
new file mode 100644
index 000000000..b7c8493d8
--- /dev/null
+++ b/docs/tutorials/wiki/src/models/tutorial/static/ie6.css
@@ -0,0 +1,8 @@
+* html img,
+* html .png{position:relative;behavior:expression((this.runtimeStyle.behavior="none")&&(this.pngSet?this.pngSet=true:(this.nodeName == "IMG" && this.src.toLowerCase().indexOf('.png')>-1?(this.runtimeStyle.backgroundImage = "none",
+this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.src + "',sizingMethod='image')",
+this.src = "static/transparent.gif"):(this.origBg = this.origBg? this.origBg :this.currentStyle.backgroundImage.toString().replace('url("','').replace('")',''),
+this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.origBg + "',sizingMethod='crop')",
+this.runtimeStyle.backgroundImage = "none")),this.pngSet=true)
+);}
+#wrap{display:table;height:100%}
diff --git a/docs/tutorials/wiki/src/models/tutorial/static/logo.png b/docs/tutorials/wiki/src/models/tutorial/static/logo.png
deleted file mode 100644
index 88f5d9865..000000000
Binary files a/docs/tutorials/wiki/src/models/tutorial/static/logo.png and /dev/null differ
diff --git a/docs/tutorials/wiki/src/models/tutorial/static/middlebg.png b/docs/tutorials/wiki/src/models/tutorial/static/middlebg.png
new file mode 100644
index 000000000..2369cfb7d
Binary files /dev/null and b/docs/tutorials/wiki/src/models/tutorial/static/middlebg.png differ
diff --git a/docs/tutorials/wiki/src/models/tutorial/static/pylons.css b/docs/tutorials/wiki/src/models/tutorial/static/pylons.css
index c153be07f..4ebc5a081 100644
--- a/docs/tutorials/wiki/src/models/tutorial/static/pylons.css
+++ b/docs/tutorials/wiki/src/models/tutorial/static/pylons.css
@@ -4,34 +4,23 @@ body{line-height:1;}
 ol,ul{list-style:none;}
 blockquote,q{quotes:none;}
 blockquote:before,blockquote:after,q:before,q:after{content:'';content:none;}
-/* remember to define focus styles! */
 :focus{outline:0;}
-/* remember to highlight inserts somehow! */
 ins{text-decoration:none;}
 del{text-decoration:line-through;}
-/* tables still need 'cellspacing="0"' in the markup */
 table{border-collapse:collapse;border-spacing:0;}
-/* restyling */
 sub{vertical-align:sub;font-size:smaller;line-height:normal;}
 sup{vertical-align:super;font-size:smaller;line-height:normal;}
-/* lists */
 ul,menu,dir{display:block;list-style-type:disc;margin:1em 0;padding-left:40px;}
 ol{display:block;list-style-type:decimal-leading-zero;margin:1em 0;padding-left:40px;}
 li{display:list-item;}
-/* nested lists have no top/bottom margins */
 ul ul,ul ol,ul dir,ul menu,ul dl,ol ul,ol ol,ol dir,ol menu,ol dl,dir ul,dir ol,dir dir,dir menu,dir dl,menu ul,menu ol,menu dir,menu menu,menu dl,dl ul,dl ol,dl dir,dl menu,dl dl{margin-top:0;margin-bottom:0;}
-/* 2 deep unordered lists use a circle */
 ol ul,ul ul,menu ul,dir ul,ol menu,ul menu,menu menu,dir menu,ol dir,ul dir,menu dir,dir dir{list-style-type:circle;}
-/* 3 deep (or more) unordered lists use a square */
 ol ol ul,ol ul ul,ol menu ul,ol dir ul,ol ol menu,ol ul menu,ol menu menu,ol dir menu,ol ol dir,ol ul dir,ol menu dir,ol dir dir,ul ol ul,ul ul ul,ul menu ul,ul dir ul,ul ol menu,ul ul menu,ul menu menu,ul dir menu,ul ol dir,ul ul dir,ul menu dir,ul dir dir,menu ol ul,menu ul ul,menu menu ul,menu dir ul,menu ol menu,menu ul menu,menu menu menu,menu dir menu,menu ol dir,menu ul dir,menu menu dir,menu dir dir,dir ol ul,dir ul ul,dir menu ul,dir dir ul,dir ol menu,dir ul menu,dir menu menu,dir dir menu,dir ol dir,dir ul dir,dir menu dir,dir dir dir{list-style-type:square;}
 .hidden{display:none;}
 p{line-height:1.5em;}
-h1{font-size:1.75em;/* 28px */
-line-height:1.7em;font-family:helvetica,verdana;}
-h2{font-size:1.5em;/* 24px */
-line-height:1.7em;font-family:helvetica,verdana;}
-h3{font-size:1.25em;/* 20px */
-line-height:1.7em;font-family:helvetica,verdana;}
+h1{font-size:1.75em;line-height:1.7em;font-family:helvetica,verdana;}
+h2{font-size:1.5em;line-height:1.7em;font-family:helvetica,verdana;}
+h3{font-size:1.25em;line-height:1.7em;font-family:helvetica,verdana;}
 h4{font-size:1em;line-height:1.7em;font-family:helvetica,verdana;}
 html,body{width:100%;height:100%;}
 body{margin:0;padding:0;background-color:#ffffff;position:relative;font:16px/24px "Nobile","Lucida Grande",Lucida,Verdana,sans-serif;}
@@ -42,23 +31,25 @@ body h2,
 body h3,
 body h4,
 body h5,
-body h6{font-family:"Nobile","Lucida Grande",Lucida,Verdana,sans-serif;font-weight:normal;color:#144fb2;font-style:normal;}
-#wrap {min-height: 100%;}
-#header,#footer{width:100%;color:#ffffff;height:40px;position:absolute;text-align:center;line-height:40px;overflow:hidden;font-size:12px;}
-#header{background-color:#e88f00;top:0;font-size:14px;}
-#footer{background-color:#000000;bottom:0;position: relative;margin-top:-40px;clear:both;}
-.header,.footer{width:700px;margin-right:auto;margin-left:auto;}
+body h6{font-family:"Neuton","Lucida Grande",Lucida,Verdana,sans-serif;font-weight:normal;color:#373839;font-style:normal;}
+#wrap{min-height:100%;}
+#header,#footer{width:100%;color:#ffffff;height:40px;position:absolute;text-align:center;line-height:40px;overflow:hidden;font-size:12px;vertical-align:middle;}
+#header{background:#000000;top:0;font-size:14px;}
+#footer{bottom:0;background:#000000 url(footerbg.png) repeat-x 0 top;position:relative;margin-top:-40px;clear:both;}
+.header,.footer{width:750px;margin-right:auto;margin-left:auto;}
 .wrapper{width:100%}
 #top,#bottom{width:100%;}
-#top{color:#888;background-color:#eee;height:300px;border-bottom:2px solid #ddd;}
-#bottom{color:#222;background-color:#ffffff;overflow:hidden;padding-bottom:80px;}
-.top,.bottom{width:700px;margin-right:auto;margin-left:auto;}
-.top{padding-top:100px;}
+#top{color:#000000;height:230px;
+background:#ffffff url(headerbg.png) repeat-x 0 top;position:relative;}
+#bottom{color:#222;background-color:#ffffff;}
+.top,.middle,.bottom{width:750px;margin-right:auto;margin-left:auto;}
+.top{padding-top:40px;}
+#middle{width:100%;height:100px;background:url(middlebg.png) repeat-x;border-top:2px solid #ffffff;border-bottom:2px solid #b2b2b2;}
 .app-welcome{margin-top:25px;}
 .app-name{color:#000000;font-weight:bold;}
 .bottom{padding-top:50px;}
-#left{width:325px;float:left;padding-right:25px;}
-#right{width:325px;float:right;padding-left:25px;}
+#left{width:350px;float:left;padding-right:25px;}
+#right{width:350px;float:right;padding-left:25px;}
 .align-left{text-align:left;}
 .align-right{text-align:right;}
 .align-center{text-align:center;}
@@ -67,7 +58,7 @@ ul.links li{list-style-type:none;font-size:14px;}
 form{border-style:none;}
 fieldset{border-style:none;}
 input{color:#222;border:1px solid #ccc;font-family:sans-serif;font-size:12px;line-height:16px;}
-input[type=text]{}
+input[type=text],input[type=password]{width:205px;}
 input[type=submit]{background-color:#ddd;font-weight:bold;}
 /*Opera Fix*/
-body:before {content:"";height:100%;float:left;width:0;margin-top:-32767px;}
+body:before{content:"";height:100%;float:left;width:0;margin-top:-32767px;}
diff --git a/docs/tutorials/wiki/src/models/tutorial/static/pyramid.png b/docs/tutorials/wiki/src/models/tutorial/static/pyramid.png
new file mode 100644
index 000000000..347e05549
Binary files /dev/null and b/docs/tutorials/wiki/src/models/tutorial/static/pyramid.png differ
diff --git a/docs/tutorials/wiki/src/models/tutorial/static/transparent.gif b/docs/tutorials/wiki/src/models/tutorial/static/transparent.gif
new file mode 100644
index 000000000..0341802e5
Binary files /dev/null and b/docs/tutorials/wiki/src/models/tutorial/static/transparent.gif differ
diff --git a/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
index a5a0dd214..cac9ccaa7 100644
--- a/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
@@ -5,65 +5,72 @@
 	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
 	<meta name="keywords" content="python web application" />
 	<meta name="description" content="pyramid web application" />
-	<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="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
+	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" 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 lte IE 6]>
+	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
+	<![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="top">
+			<div class="top align-center">
+				<div><img src="${request.static_url('tutorial:static/pyramid.png')}" width="750" height="169" alt="pyramid"/></div>
+			</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="middle">
+			<div class="middle align-center">
+				<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">
+					<h2>Search documentation</h2>
+					<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="Go" />
+		  			</form>
+				</div>
+				<div id="right" class="align-left">
+					<h2>Pyramid links</h2>
+					<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>
 		</div>
 	</div>
 	<div id="footer">
-		<div class="footer">© Copyright 2008-2010, Agendaless Consulting.</div>
+		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
 	</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/tutorials/wiki/src/views/tutorial/static/footerbg.png b/docs/tutorials/wiki/src/views/tutorial/static/footerbg.png
new file mode 100644
index 000000000..1fbc873da
Binary files /dev/null and b/docs/tutorials/wiki/src/views/tutorial/static/footerbg.png differ
diff --git a/docs/tutorials/wiki/src/views/tutorial/static/headerbg.png b/docs/tutorials/wiki/src/views/tutorial/static/headerbg.png
new file mode 100644
index 000000000..0596f2020
Binary files /dev/null and b/docs/tutorials/wiki/src/views/tutorial/static/headerbg.png differ
diff --git a/docs/tutorials/wiki/src/views/tutorial/static/ie6.css b/docs/tutorials/wiki/src/views/tutorial/static/ie6.css
new file mode 100644
index 000000000..b7c8493d8
--- /dev/null
+++ b/docs/tutorials/wiki/src/views/tutorial/static/ie6.css
@@ -0,0 +1,8 @@
+* html img,
+* html .png{position:relative;behavior:expression((this.runtimeStyle.behavior="none")&&(this.pngSet?this.pngSet=true:(this.nodeName == "IMG" && this.src.toLowerCase().indexOf('.png')>-1?(this.runtimeStyle.backgroundImage = "none",
+this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.src + "',sizingMethod='image')",
+this.src = "static/transparent.gif"):(this.origBg = this.origBg? this.origBg :this.currentStyle.backgroundImage.toString().replace('url("','').replace('")',''),
+this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.origBg + "',sizingMethod='crop')",
+this.runtimeStyle.backgroundImage = "none")),this.pngSet=true)
+);}
+#wrap{display:table;height:100%}
diff --git a/docs/tutorials/wiki/src/views/tutorial/static/logo.png b/docs/tutorials/wiki/src/views/tutorial/static/logo.png
deleted file mode 100644
index 88f5d9865..000000000
Binary files a/docs/tutorials/wiki/src/views/tutorial/static/logo.png and /dev/null differ
diff --git a/docs/tutorials/wiki/src/views/tutorial/static/middlebg.png b/docs/tutorials/wiki/src/views/tutorial/static/middlebg.png
new file mode 100644
index 000000000..2369cfb7d
Binary files /dev/null and b/docs/tutorials/wiki/src/views/tutorial/static/middlebg.png differ
diff --git a/docs/tutorials/wiki/src/views/tutorial/static/pylons.css b/docs/tutorials/wiki/src/views/tutorial/static/pylons.css
index c153be07f..4ebc5a081 100644
--- a/docs/tutorials/wiki/src/views/tutorial/static/pylons.css
+++ b/docs/tutorials/wiki/src/views/tutorial/static/pylons.css
@@ -4,34 +4,23 @@ body{line-height:1;}
 ol,ul{list-style:none;}
 blockquote,q{quotes:none;}
 blockquote:before,blockquote:after,q:before,q:after{content:'';content:none;}
-/* remember to define focus styles! */
 :focus{outline:0;}
-/* remember to highlight inserts somehow! */
 ins{text-decoration:none;}
 del{text-decoration:line-through;}
-/* tables still need 'cellspacing="0"' in the markup */
 table{border-collapse:collapse;border-spacing:0;}
-/* restyling */
 sub{vertical-align:sub;font-size:smaller;line-height:normal;}
 sup{vertical-align:super;font-size:smaller;line-height:normal;}
-/* lists */
 ul,menu,dir{display:block;list-style-type:disc;margin:1em 0;padding-left:40px;}
 ol{display:block;list-style-type:decimal-leading-zero;margin:1em 0;padding-left:40px;}
 li{display:list-item;}
-/* nested lists have no top/bottom margins */
 ul ul,ul ol,ul dir,ul menu,ul dl,ol ul,ol ol,ol dir,ol menu,ol dl,dir ul,dir ol,dir dir,dir menu,dir dl,menu ul,menu ol,menu dir,menu menu,menu dl,dl ul,dl ol,dl dir,dl menu,dl dl{margin-top:0;margin-bottom:0;}
-/* 2 deep unordered lists use a circle */
 ol ul,ul ul,menu ul,dir ul,ol menu,ul menu,menu menu,dir menu,ol dir,ul dir,menu dir,dir dir{list-style-type:circle;}
-/* 3 deep (or more) unordered lists use a square */
 ol ol ul,ol ul ul,ol menu ul,ol dir ul,ol ol menu,ol ul menu,ol menu menu,ol dir menu,ol ol dir,ol ul dir,ol menu dir,ol dir dir,ul ol ul,ul ul ul,ul menu ul,ul dir ul,ul ol menu,ul ul menu,ul menu menu,ul dir menu,ul ol dir,ul ul dir,ul menu dir,ul dir dir,menu ol ul,menu ul ul,menu menu ul,menu dir ul,menu ol menu,menu ul menu,menu menu menu,menu dir menu,menu ol dir,menu ul dir,menu menu dir,menu dir dir,dir ol ul,dir ul ul,dir menu ul,dir dir ul,dir ol menu,dir ul menu,dir menu menu,dir dir menu,dir ol dir,dir ul dir,dir menu dir,dir dir dir{list-style-type:square;}
 .hidden{display:none;}
 p{line-height:1.5em;}
-h1{font-size:1.75em;/* 28px */
-line-height:1.7em;font-family:helvetica,verdana;}
-h2{font-size:1.5em;/* 24px */
-line-height:1.7em;font-family:helvetica,verdana;}
-h3{font-size:1.25em;/* 20px */
-line-height:1.7em;font-family:helvetica,verdana;}
+h1{font-size:1.75em;line-height:1.7em;font-family:helvetica,verdana;}
+h2{font-size:1.5em;line-height:1.7em;font-family:helvetica,verdana;}
+h3{font-size:1.25em;line-height:1.7em;font-family:helvetica,verdana;}
 h4{font-size:1em;line-height:1.7em;font-family:helvetica,verdana;}
 html,body{width:100%;height:100%;}
 body{margin:0;padding:0;background-color:#ffffff;position:relative;font:16px/24px "Nobile","Lucida Grande",Lucida,Verdana,sans-serif;}
@@ -42,23 +31,25 @@ body h2,
 body h3,
 body h4,
 body h5,
-body h6{font-family:"Nobile","Lucida Grande",Lucida,Verdana,sans-serif;font-weight:normal;color:#144fb2;font-style:normal;}
-#wrap {min-height: 100%;}
-#header,#footer{width:100%;color:#ffffff;height:40px;position:absolute;text-align:center;line-height:40px;overflow:hidden;font-size:12px;}
-#header{background-color:#e88f00;top:0;font-size:14px;}
-#footer{background-color:#000000;bottom:0;position: relative;margin-top:-40px;clear:both;}
-.header,.footer{width:700px;margin-right:auto;margin-left:auto;}
+body h6{font-family:"Neuton","Lucida Grande",Lucida,Verdana,sans-serif;font-weight:normal;color:#373839;font-style:normal;}
+#wrap{min-height:100%;}
+#header,#footer{width:100%;color:#ffffff;height:40px;position:absolute;text-align:center;line-height:40px;overflow:hidden;font-size:12px;vertical-align:middle;}
+#header{background:#000000;top:0;font-size:14px;}
+#footer{bottom:0;background:#000000 url(footerbg.png) repeat-x 0 top;position:relative;margin-top:-40px;clear:both;}
+.header,.footer{width:750px;margin-right:auto;margin-left:auto;}
 .wrapper{width:100%}
 #top,#bottom{width:100%;}
-#top{color:#888;background-color:#eee;height:300px;border-bottom:2px solid #ddd;}
-#bottom{color:#222;background-color:#ffffff;overflow:hidden;padding-bottom:80px;}
-.top,.bottom{width:700px;margin-right:auto;margin-left:auto;}
-.top{padding-top:100px;}
+#top{color:#000000;height:230px;
+background:#ffffff url(headerbg.png) repeat-x 0 top;position:relative;}
+#bottom{color:#222;background-color:#ffffff;}
+.top,.middle,.bottom{width:750px;margin-right:auto;margin-left:auto;}
+.top{padding-top:40px;}
+#middle{width:100%;height:100px;background:url(middlebg.png) repeat-x;border-top:2px solid #ffffff;border-bottom:2px solid #b2b2b2;}
 .app-welcome{margin-top:25px;}
 .app-name{color:#000000;font-weight:bold;}
 .bottom{padding-top:50px;}
-#left{width:325px;float:left;padding-right:25px;}
-#right{width:325px;float:right;padding-left:25px;}
+#left{width:350px;float:left;padding-right:25px;}
+#right{width:350px;float:right;padding-left:25px;}
 .align-left{text-align:left;}
 .align-right{text-align:right;}
 .align-center{text-align:center;}
@@ -67,7 +58,7 @@ ul.links li{list-style-type:none;font-size:14px;}
 form{border-style:none;}
 fieldset{border-style:none;}
 input{color:#222;border:1px solid #ccc;font-family:sans-serif;font-size:12px;line-height:16px;}
-input[type=text]{}
+input[type=text],input[type=password]{width:205px;}
 input[type=submit]{background-color:#ddd;font-weight:bold;}
 /*Opera Fix*/
-body:before {content:"";height:100%;float:left;width:0;margin-top:-32767px;}
+body:before{content:"";height:100%;float:left;width:0;margin-top:-32767px;}
diff --git a/docs/tutorials/wiki/src/views/tutorial/static/pyramid.png b/docs/tutorials/wiki/src/views/tutorial/static/pyramid.png
new file mode 100644
index 000000000..347e05549
Binary files /dev/null and b/docs/tutorials/wiki/src/views/tutorial/static/pyramid.png differ
diff --git a/docs/tutorials/wiki/src/views/tutorial/static/style.css b/docs/tutorials/wiki/src/views/tutorial/static/style.css
deleted file mode 100644
index cad87e0d4..000000000
--- a/docs/tutorials/wiki/src/views/tutorial/static/style.css
+++ /dev/null
@@ -1,109 +0,0 @@
-html, body {
-  color: black;
-  background-color: #ddd;
-  font: x-small "Lucida Grande", "Lucida Sans Unicode", geneva, sans-serif;
-  margin: 0;
-  padding: 0;
-}
-
-td, th {padding:3px;border:none;}
-tr th {text-align:left;background-color:#f0f0f0;color:#333;}
-tr.odd td {background-color:#edf3fe;}
-tr.even td {background-color:#fff;}
-
-#header {
-  height: 80px;
-  width: 777px;
-  background: blue URL('../images/header_inner.png') no-repeat;
-  border-left: 1px solid #aaa;
-  border-right: 1px solid #aaa;
-  margin: 0 auto 0 auto;
-}
-
-a.link, a, a.active {
-  color: #369;
-}
-
-
-#main_content {
-  color: black;
-  font-size: 127%;
-  background-color: white;
-  width: 757px;
-  margin: 0 auto 0 auto;
-  border-left: 1px solid #aaa;
-  border-right: 1px solid #aaa;
-  padding: 10px;
-}
-
-#sidebar {
-  border: 1px solid #aaa;
-  background-color: #eee;
-  margin: 0.5em;
-  padding: 1em;
-  float: right;
-  width: 200px;
-  font-size: 88%;
-}
-
-#sidebar h2 {
-  margin-top: 0;
-}
-
-#sidebar ul {
-  margin-left: 1.5em;
-  padding-left: 0;
-}
-
-h1,h2,h3,h4,h5,h6,#getting_started_steps {
-  font-family: "Century Schoolbook L", Georgia, serif;
-  font-weight: bold;
-}
-
-h2 {
-  font-size: 150%;
-}
-
-#footer {
-  border: 1px solid #aaa;
-  border-top: 0px none;
-  color: #999;
-  background-color: white;
-  padding: 10px;
-  font-size: 80%;
-  text-align: center;
-  width: 757px;
-  margin: 0 auto 1em auto;
-}
-
-.code {
-  font-family: monospace;
-}
-
-span.code {
-  font-weight: bold;
-  background: #eee;
-}
-
-#status_block {
-  margin: 0 auto 0.5em auto;
-  padding: 15px 10px 15px 55px;
-  background: #cec URL('../images/ok.png') left center no-repeat;
-  border: 1px solid #9c9;
-  width: 450px;
-  font-size: 120%;
-  font-weight: bolder;
-}
-
-.notice {
-  margin: 0.5em auto 0.5em auto;
-  padding: 15px 10px 15px 55px;
-  width: 450px;
-  background: #eef URL('../images/info.png') left center no-repeat;
-  border: 1px solid #cce;
-}
-
-.fielderror {
-    color: red;
-    font-weight: bold;
-}
diff --git a/docs/tutorials/wiki/src/views/tutorial/static/transparent.gif b/docs/tutorials/wiki/src/views/tutorial/static/transparent.gif
new file mode 100644
index 000000000..0341802e5
Binary files /dev/null and b/docs/tutorials/wiki/src/views/tutorial/static/transparent.gif differ
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt b/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
index 1d40f526d..1c764f924 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
@@ -1,32 +1,51 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-    xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:tal="http://xml.zope.org/namespaces/tal">
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" xmlns:tal="http://xml.zope.org/namespaces/tal">
 <head>
-    <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <title>Pyramid tutorial wiki (based on TurboGears 20-Minute Wiki) 
-           Editing: ${page.__name__}</title>
-        <link rel="stylesheet" type="text/css"
-          href="${request.application_url}/static/style.css" />
+	<title>${page.__name__} - Pyramid tutorial wiki (based on TurboGears 20-Minute Wiki)</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+	<meta name="keywords" content="python web application" />
+	<meta name="description" content="pyramid web application" />
+	<link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
+	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" 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 lte IE 6]>
+	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
+	<![endif]-->
 </head>
-
 <body>
-
-<div class="main_content">
-  <div style="float:right; width: 10em;"> Viewing
-    <span tal:replace="page.__name__">Page Name Goes Here</span> <br/>
-    You can return to the <a href="${request.application_url}"
-        >FrontPage</a>.
-  </div>  
-
-  <div>
-    <form action="${save_url}" method="post">
-      <textarea name="body" tal:content="page.data" rows="10" cols="60"/>
-      <input type="submit" name="form.submitted" value="Save"/>
-    </form>
-  </div>
-</div>  
+	<div id="wrap">
+		<div id="top">
+			<div class="top align-center">
+				<div>
+					<img src="${request.static_url('tutorial:static/pyramid.png')}" width="750" height="169" alt="pyramid" />
+				</div>
+			</div>
+		</div>
+		<div id="middle">
+			<div class="middle align-right">
+				<div id="left" class="app-welcome align-left">
+					Editing <b><span tal:replace="page.__name__">Page Name Goes Here</span></b><br/>
+					You can return to the <a href="${request.application_url}">FrontPage</a>.<br/>
+				</div>
+				<div id="right" class="app-welcome align-right">
+					<span tal:condition="logged_in">
+  						<a href="${request.application_url}/logout">Logout</a>
+					</span>
+				</div>
+			</div>
+		</div>
+		<div id="bottom">
+			<div class="bottom">
+				<form action="${save_url}" method="post">
+      				<textarea name="body" tal:content="page.data" rows="10" cols="60"/><br/>
+      				<input type="submit" name="form.submitted" value="Save"/>
+    			</form>
+			</div>
+		</div>
+	</div>
+	<div id="footer">
+		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+	</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt
index a5a0dd214..cac9ccaa7 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt
@@ -5,65 +5,72 @@
 	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
 	<meta name="keywords" content="python web application" />
 	<meta name="description" content="pyramid web application" />
-	<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="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
+	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" 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 lte IE 6]>
+	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
+	<![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="top">
+			<div class="top align-center">
+				<div><img src="${request.static_url('tutorial:static/pyramid.png')}" width="750" height="169" alt="pyramid"/></div>
+			</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="middle">
+			<div class="middle align-center">
+				<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">
+					<h2>Search documentation</h2>
+					<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="Go" />
+		  			</form>
+				</div>
+				<div id="right" class="align-left">
+					<h2>Pyramid links</h2>
+					<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>
 		</div>
 	</div>
 	<div id="footer">
-		<div class="footer">© Copyright 2008-2010, Agendaless Consulting.</div>
+		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
 	</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/view.pt b/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
index 50719f9e9..003349ea5 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
@@ -1,29 +1,55 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-    xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:tal="http://xml.zope.org/namespaces/tal">
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" xmlns:tal="http://xml.zope.org/namespaces/tal">
 <head>
-    <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <title>${page.__name__} - Pyramid tutorial wiki 
-           (based on TurboGears 20-Minute Wiki)
-    </title>
-        <link rel="stylesheet" type="text/css"
-          href="${request.application_url}/static/style.css" />
+	<title>${page.__name__} - Pyramid tutorial wiki (based on TurboGears 20-Minute Wiki)</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+	<meta name="keywords" content="python web application" />
+	<meta name="description" content="pyramid web application" />
+	<link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
+	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" 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 lte IE 6]>
+	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
+	<![endif]-->
 </head>
-
 <body>
-
-<div class="main_content">
-<div style="float:right; width: 10em;"> Viewing
-<span tal:replace="page.__name__">Page Name Goes Here</span> <br/>
-You can return to the 
-<a href="${request.application_url}">FrontPage</a>.
-</div>
-
-<div tal:replace="structure content">Page text goes here.</div>
-<p><a tal:attributes="href edit_url" href="">Edit this page</a></p>
-</div>
-
-</body></html>
+	<div id="wrap">
+		<div id="top">
+			<div class="top align-center">
+				<div>
+					<img src="${request.static_url('tutorial:static/pyramid.png')}" width="750" height="169" alt="pyramid" />
+				</div>
+			</div>
+		</div>
+		<div id="middle">
+			<div class="middle align-right">
+				<div id="left" class="app-welcome align-left">
+					Viewing <b><span tal:replace="page.__name__">Page Name Goes Here</span></b><br/>
+					You can return to the <a href="${request.application_url}">FrontPage</a>.<br/>
+				</div>
+				<div id="right" class="app-welcome align-right">
+					<span tal:condition="logged_in">
+  						<a href="${request.application_url}/logout">Logout</a>
+					</span>
+				</div>
+			</div>
+		</div>
+		<div id="bottom">
+			<div class="bottom">
+				<div tal:replace="structure content">
+					Page text goes here.
+				</div>
+				<p>
+					<a tal:attributes="href edit_url" href="">
+						Edit this page
+					</a>
+				</p>
+			</div>
+		</div>
+	</div>
+	<div id="footer">
+		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+	</div>
+</body>
+</html>
\ No newline at end of file
-- 
cgit v1.2.3


From fda31be8f98ac76c69662b2b1dc9afd9caf7f4c1 Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Thu, 6 Jan 2011 00:35:07 -0500
Subject: Removed login option from tutorial defining views templates

---
 docs/tutorials/wiki/src/views/tutorial/templates/edit.pt | 6 +-----
 docs/tutorials/wiki/src/views/tutorial/templates/view.pt | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'docs/tutorials/wiki/src')

diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt b/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
index 1c764f924..8ed9f8b63 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
@@ -28,11 +28,7 @@
 					Editing <b><span tal:replace="page.__name__">Page Name Goes Here</span></b><br/>
 					You can return to the <a href="${request.application_url}">FrontPage</a>.<br/>
 				</div>
-				<div id="right" class="app-welcome align-right">
-					<span tal:condition="logged_in">
-  						<a href="${request.application_url}/logout">Logout</a>
-					</span>
-				</div>
+				<div id="right" class="app-welcome align-right"></div>
 			</div>
 		</div>
 		<div id="bottom">
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/view.pt b/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
index 003349ea5..f104e481c 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
@@ -28,11 +28,7 @@
 					Viewing <b><span tal:replace="page.__name__">Page Name Goes Here</span></b><br/>
 					You can return to the <a href="${request.application_url}">FrontPage</a>.<br/>
 				</div>
-				<div id="right" class="app-welcome align-right">
-					<span tal:condition="logged_in">
-  						<a href="${request.application_url}/logout">Logout</a>
-					</span>
-				</div>
+				<div id="right" class="app-welcome align-right"></div>
 			</div>
 		</div>
 		<div id="bottom">
-- 
cgit v1.2.3


From 7edf031a149f36ccdf1dd176f7018bd402dd65f6 Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Thu, 6 Jan 2011 01:35:30 -0500
Subject: Added small header support to css paster templates, using small
 header for wiki tutorial

---
 docs/tutorials/wiki/src/authorization/tutorial/static/pylons.css | 9 +++++----
 docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt | 6 +++---
 .../tutorials/wiki/src/authorization/tutorial/templates/login.pt | 6 +++---
 docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt | 6 +++---
 docs/tutorials/wiki/src/basiclayout/tutorial/static/pylons.css   | 9 +++++----
 docs/tutorials/wiki/src/models/tutorial/static/pylons.css        | 9 +++++----
 docs/tutorials/wiki/src/views/tutorial/static/pylons.css         | 9 +++++----
 docs/tutorials/wiki/src/views/tutorial/templates/edit.pt         | 6 +++---
 docs/tutorials/wiki/src/views/tutorial/templates/view.pt         | 6 +++---
 9 files changed, 35 insertions(+), 31 deletions(-)

(limited to 'docs/tutorials/wiki/src')

diff --git a/docs/tutorials/wiki/src/authorization/tutorial/static/pylons.css b/docs/tutorials/wiki/src/authorization/tutorial/static/pylons.css
index 4ebc5a081..fd1914d8d 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/static/pylons.css
+++ b/docs/tutorials/wiki/src/authorization/tutorial/static/pylons.css
@@ -38,12 +38,13 @@ body h6{font-family:"Neuton","Lucida Grande",Lucida,Verdana,sans-serif;font-weig
 #footer{bottom:0;background:#000000 url(footerbg.png) repeat-x 0 top;position:relative;margin-top:-40px;clear:both;}
 .header,.footer{width:750px;margin-right:auto;margin-left:auto;}
 .wrapper{width:100%}
-#top,#bottom{width:100%;}
-#top{color:#000000;height:230px;
-background:#ffffff url(headerbg.png) repeat-x 0 top;position:relative;}
+#top,#top-small,#bottom{width:100%;}
+#top{color:#000000;height:230px;background:#ffffff url(headerbg.png) repeat-x 0 top;position:relative;}
+#top-small{color:#000000;height:60px;background:#ffffff url(headerbg.png) repeat-x 0 top;position:relative;}
 #bottom{color:#222;background-color:#ffffff;}
-.top,.middle,.bottom{width:750px;margin-right:auto;margin-left:auto;}
+.top,.top-small,.middle,.bottom{width:750px;margin-right:auto;margin-left:auto;}
 .top{padding-top:40px;}
+.top-small{padding-top:10px;}
 #middle{width:100%;height:100px;background:url(middlebg.png) repeat-x;border-top:2px solid #ffffff;border-bottom:2px solid #b2b2b2;}
 .app-welcome{margin-top:25px;}
 .app-name{color:#000000;font-weight:bold;}
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
index 1c764f924..0e5858d3b 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
@@ -15,10 +15,10 @@
 </head>
 <body>
 	<div id="wrap">
-		<div id="top">
-			<div class="top align-center">
+		<div id="top-small">
+			<div class="top-small align-center">
 				<div>
-					<img src="${request.static_url('tutorial:static/pyramid.png')}" width="750" height="169" alt="pyramid" />
+					<img src="${request.static_url('tutorial:static/pyramid-small.png')}" width="220" height="50" alt="pyramid" />
 				</div>
 			</div>
 		</div>
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
index 4473b701a..974e22f37 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
@@ -15,10 +15,10 @@
 </head>
 <body>
 	<div id="wrap">
-		<div id="top">
-			<div class="top align-center">
+		<div id="top-small">
+			<div class="top-small align-center">
 				<div>
-					<img src="${request.static_url('tutorial:static/pyramid.png')}" width="750" height="169" alt="pyramid" />
+					<img src="${request.static_url('tutorial:static/pyramid-small.png')}" width="220" height="50" alt="pyramid" />
 				</div>
 			</div>
 		</div>
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
index 003349ea5..3fd709338 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
@@ -15,10 +15,10 @@
 </head>
 <body>
 	<div id="wrap">
-		<div id="top">
-			<div class="top align-center">
+		<div id="top-small">
+			<div class="top-small align-center">
 				<div>
-					<img src="${request.static_url('tutorial:static/pyramid.png')}" width="750" height="169" alt="pyramid" />
+					<img src="${request.static_url('tutorial:static/pyramid-small.png')}" width="220" height="50" alt="pyramid" />
 				</div>
 			</div>
 		</div>
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/static/pylons.css b/docs/tutorials/wiki/src/basiclayout/tutorial/static/pylons.css
index 4ebc5a081..fd1914d8d 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/static/pylons.css
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/static/pylons.css
@@ -38,12 +38,13 @@ body h6{font-family:"Neuton","Lucida Grande",Lucida,Verdana,sans-serif;font-weig
 #footer{bottom:0;background:#000000 url(footerbg.png) repeat-x 0 top;position:relative;margin-top:-40px;clear:both;}
 .header,.footer{width:750px;margin-right:auto;margin-left:auto;}
 .wrapper{width:100%}
-#top,#bottom{width:100%;}
-#top{color:#000000;height:230px;
-background:#ffffff url(headerbg.png) repeat-x 0 top;position:relative;}
+#top,#top-small,#bottom{width:100%;}
+#top{color:#000000;height:230px;background:#ffffff url(headerbg.png) repeat-x 0 top;position:relative;}
+#top-small{color:#000000;height:60px;background:#ffffff url(headerbg.png) repeat-x 0 top;position:relative;}
 #bottom{color:#222;background-color:#ffffff;}
-.top,.middle,.bottom{width:750px;margin-right:auto;margin-left:auto;}
+.top,.top-small,.middle,.bottom{width:750px;margin-right:auto;margin-left:auto;}
 .top{padding-top:40px;}
+.top-small{padding-top:10px;}
 #middle{width:100%;height:100px;background:url(middlebg.png) repeat-x;border-top:2px solid #ffffff;border-bottom:2px solid #b2b2b2;}
 .app-welcome{margin-top:25px;}
 .app-name{color:#000000;font-weight:bold;}
diff --git a/docs/tutorials/wiki/src/models/tutorial/static/pylons.css b/docs/tutorials/wiki/src/models/tutorial/static/pylons.css
index 4ebc5a081..a9f49cc85 100644
--- a/docs/tutorials/wiki/src/models/tutorial/static/pylons.css
+++ b/docs/tutorials/wiki/src/models/tutorial/static/pylons.css
@@ -38,12 +38,13 @@ body h6{font-family:"Neuton","Lucida Grande",Lucida,Verdana,sans-serif;font-weig
 #footer{bottom:0;background:#000000 url(footerbg.png) repeat-x 0 top;position:relative;margin-top:-40px;clear:both;}
 .header,.footer{width:750px;margin-right:auto;margin-left:auto;}
 .wrapper{width:100%}
-#top,#bottom{width:100%;}
-#top{color:#000000;height:230px;
-background:#ffffff url(headerbg.png) repeat-x 0 top;position:relative;}
+#top,#top-small,#bottom{width:100%;}
+#top{color:#000000;height:230px;background:#ffffff url(headerbg.png) repeat-x 0 top;position:relative;}
+#top-small{color:#000000;height:60px;background:#ffffff url(headerbg.png) repeat-x 0 top;position:relative;}
 #bottom{color:#222;background-color:#ffffff;}
-.top,.middle,.bottom{width:750px;margin-right:auto;margin-left:auto;}
+.top,.top-snall,.middle,.bottom{width:750px;margin-right:auto;margin-left:auto;}
 .top{padding-top:40px;}
+.top-small{padding-top:10px;}
 #middle{width:100%;height:100px;background:url(middlebg.png) repeat-x;border-top:2px solid #ffffff;border-bottom:2px solid #b2b2b2;}
 .app-welcome{margin-top:25px;}
 .app-name{color:#000000;font-weight:bold;}
diff --git a/docs/tutorials/wiki/src/views/tutorial/static/pylons.css b/docs/tutorials/wiki/src/views/tutorial/static/pylons.css
index 4ebc5a081..fd1914d8d 100644
--- a/docs/tutorials/wiki/src/views/tutorial/static/pylons.css
+++ b/docs/tutorials/wiki/src/views/tutorial/static/pylons.css
@@ -38,12 +38,13 @@ body h6{font-family:"Neuton","Lucida Grande",Lucida,Verdana,sans-serif;font-weig
 #footer{bottom:0;background:#000000 url(footerbg.png) repeat-x 0 top;position:relative;margin-top:-40px;clear:both;}
 .header,.footer{width:750px;margin-right:auto;margin-left:auto;}
 .wrapper{width:100%}
-#top,#bottom{width:100%;}
-#top{color:#000000;height:230px;
-background:#ffffff url(headerbg.png) repeat-x 0 top;position:relative;}
+#top,#top-small,#bottom{width:100%;}
+#top{color:#000000;height:230px;background:#ffffff url(headerbg.png) repeat-x 0 top;position:relative;}
+#top-small{color:#000000;height:60px;background:#ffffff url(headerbg.png) repeat-x 0 top;position:relative;}
 #bottom{color:#222;background-color:#ffffff;}
-.top,.middle,.bottom{width:750px;margin-right:auto;margin-left:auto;}
+.top,.top-small,.middle,.bottom{width:750px;margin-right:auto;margin-left:auto;}
 .top{padding-top:40px;}
+.top-small{padding-top:10px;}
 #middle{width:100%;height:100px;background:url(middlebg.png) repeat-x;border-top:2px solid #ffffff;border-bottom:2px solid #b2b2b2;}
 .app-welcome{margin-top:25px;}
 .app-name{color:#000000;font-weight:bold;}
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt b/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
index 8ed9f8b63..077a0dcb7 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
@@ -15,10 +15,10 @@
 </head>
 <body>
 	<div id="wrap">
-		<div id="top">
-			<div class="top align-center">
+		<div id="top-small">
+			<div class="top-small align-center">
 				<div>
-					<img src="${request.static_url('tutorial:static/pyramid.png')}" width="750" height="169" alt="pyramid" />
+					<img src="${request.static_url('tutorial:static/pyramid-small.png')}" width="220" height="50" alt="pyramid" />
 				</div>
 			</div>
 		</div>
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/view.pt b/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
index f104e481c..f676c1d25 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
@@ -15,10 +15,10 @@
 </head>
 <body>
 	<div id="wrap">
-		<div id="top">
-			<div class="top align-center">
+		<div id="top-small">
+			<div class="top-small align-center">
 				<div>
-					<img src="${request.static_url('tutorial:static/pyramid.png')}" width="750" height="169" alt="pyramid" />
+					<img src="${request.static_url('tutorial:static/pyramid-small.png')}" width="220" height="50" alt="pyramid" />
 				</div>
 			</div>
 		</div>
-- 
cgit v1.2.3


From dc2fad412f4608f86134ef3b01560f11adcb54de Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Thu, 6 Jan 2011 01:35:53 -0500
Subject: Added missing images

---
 .../src/authorization/tutorial/static/pyramid-small.png  | Bin 0 -> 7044 bytes
 .../src/basiclayout/tutorial/static/pyramid-small.png    | Bin 0 -> 7044 bytes
 .../wiki/src/models/tutorial/static/pyramid-small.png    | Bin 0 -> 7044 bytes
 .../wiki/src/views/tutorial/static/pyramid-small.png     | Bin 0 -> 7044 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 docs/tutorials/wiki/src/authorization/tutorial/static/pyramid-small.png
 create mode 100644 docs/tutorials/wiki/src/basiclayout/tutorial/static/pyramid-small.png
 create mode 100644 docs/tutorials/wiki/src/models/tutorial/static/pyramid-small.png
 create mode 100644 docs/tutorials/wiki/src/views/tutorial/static/pyramid-small.png

(limited to 'docs/tutorials/wiki/src')

diff --git a/docs/tutorials/wiki/src/authorization/tutorial/static/pyramid-small.png b/docs/tutorials/wiki/src/authorization/tutorial/static/pyramid-small.png
new file mode 100644
index 000000000..a5bc0ade7
Binary files /dev/null and b/docs/tutorials/wiki/src/authorization/tutorial/static/pyramid-small.png differ
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/static/pyramid-small.png b/docs/tutorials/wiki/src/basiclayout/tutorial/static/pyramid-small.png
new file mode 100644
index 000000000..a5bc0ade7
Binary files /dev/null and b/docs/tutorials/wiki/src/basiclayout/tutorial/static/pyramid-small.png differ
diff --git a/docs/tutorials/wiki/src/models/tutorial/static/pyramid-small.png b/docs/tutorials/wiki/src/models/tutorial/static/pyramid-small.png
new file mode 100644
index 000000000..a5bc0ade7
Binary files /dev/null and b/docs/tutorials/wiki/src/models/tutorial/static/pyramid-small.png differ
diff --git a/docs/tutorials/wiki/src/views/tutorial/static/pyramid-small.png b/docs/tutorials/wiki/src/views/tutorial/static/pyramid-small.png
new file mode 100644
index 000000000..a5bc0ade7
Binary files /dev/null and b/docs/tutorials/wiki/src/views/tutorial/static/pyramid-small.png differ
-- 
cgit v1.2.3


From f52d595bd1cef5cb97d440c8ba1b1a9850ec8f4b Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 12 Jan 2011 02:36:10 -0500
Subject: Features --------

- ``pyramid.testing.setUp`` and ``pyramid.testing.tearDown`` have been
  undeprecated.  They are now the canonical setup and teardown APIs for test
  configuration, replacing "direct" creation of a Configurator.  This is a
  change designed to provide a facade that will protect against any future
  Configurator deprecations.

Paster Templates
----------------

- All paster templates now use ``pyramid.testing.setUp`` and
  ``pyramid.testing.tearDown`` rather than creating a Configurator "by hand"
  within their ``tests.py`` module, as per decision in features above.

Documentation
-------------

- The wiki and wiki2 tutorials now use ``pyramid.testing.setUp`` and
  ``pyramid.testing.tearDown`` rather than creating a Configurator "by hand",
  as per decision in features above.

- The "Testing" narrative chapter now explains ``pyramid.testing.setUp`` and
  ``pyramid.testing.tearDown`` instead of Configurator creation and
  ``Configurator.begin()`` and ``Configurator.end()``.
---
 docs/tutorials/wiki/src/basiclayout/tutorial/tests.py | 6 ++----
 docs/tutorials/wiki/src/models/tutorial/tests.py      | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'docs/tutorials/wiki/src')

diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/tests.py b/docs/tutorials/wiki/src/basiclayout/tutorial/tests.py
index 0a3d507a0..1f3c3bb4d 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/tests.py
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/tests.py
@@ -1,15 +1,13 @@
 import unittest
 
-from pyramid.config import Configurator
 from pyramid import testing
 
 class ViewTests(unittest.TestCase):
     def setUp(self):
-        self.config = Configurator(autocommit=True)
-        self.config.begin()
+        self.config = testing.setUp()
 
     def tearDown(self):
-        self.config.end()
+        testing.tearDown()
 
     def test_my_view(self):
         from tutorial.views import my_view
diff --git a/docs/tutorials/wiki/src/models/tutorial/tests.py b/docs/tutorials/wiki/src/models/tutorial/tests.py
index 839964538..51c97a95d 100644
--- a/docs/tutorials/wiki/src/models/tutorial/tests.py
+++ b/docs/tutorials/wiki/src/models/tutorial/tests.py
@@ -1,6 +1,5 @@
 import unittest
 
-from pyramid.config import Configurator
 from pyramid import testing
 
 class PageModelTests(unittest.TestCase):
@@ -50,11 +49,10 @@ class AppmakerTests(unittest.TestCase):
 
 class ViewTests(unittest.TestCase):
     def setUp(self):
-        self.config = Configurator(autocommit=True)
-        self.config.begin()
+        self.config = testing.setUp()
 
     def tearDown(self):
-        self.config.end()
+        testing.tearDown()
 
     def test_my_view(self):
         from tutorial.views import my_view
-- 
cgit v1.2.3


From e7b5fe05297d46cc169bd2f255529952569d899c Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Wed, 12 Jan 2011 23:07:54 -0500
Subject: Changed some references from pylonshq.com to pylonsproject.org

---
 .../src/authorization/tutorial/templates/mytemplate.pt   | 16 ++++++++--------
 .../src/basiclayout/tutorial/templates/mytemplate.pt     | 16 ++++++++--------
 .../wiki/src/models/tutorial/templates/mytemplate.pt     | 16 ++++++++--------
 .../wiki/src/views/tutorial/templates/mytemplate.pt      | 16 ++++++++--------
 4 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'docs/tutorials/wiki/src')

diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
index cac9ccaa7..4bd01e73e 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
@@ -32,7 +32,7 @@
 			<div class="bottom">
 				<div id="left" class="align-right">
 					<h2>Search documentation</h2>
-					<form method="get" action="http://docs.pylonshq.com/pyramid/dev/search.html">
+					<form method="get" action="http://docs.pylonsproject.org/projects/pyramid/dev/search.html">
 		      			<input type="text" id="q" name="q" value="" />
 		      			<input type="submit" id="x" value="Go" />
 		  			</form>
@@ -41,25 +41,25 @@
 					<h2>Pyramid links</h2>
 					<ul class="links">
 						<li>
-							<a href="http://pylonshq.com">Pylons Website</a>
+							<a href="http://pylonsproject.org">Pylons Website</a>
 						</li>
 						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
+							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
 						</li>
 						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#api-documentation">API Documentation</a>
+							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation">API Documentation</a>
 						</li>
 						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#tutorials">Tutorials</a>
+							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials">Tutorials</a>
 						</li>
 						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#change-history">Change History</a>
+							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history">Change History</a>
 						</li>
 						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#sample-applications">Sample Applications</a>
+							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications">Sample Applications</a>
 						</li>
 						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#support-and-development">Support and Development</a>
+							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#support-and-development">Support and Development</a>
 						</li>
 						<li>
 							<a href="irc://irc.freenode.net#pyramid">IRC Channel</a>
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
index cac9ccaa7..98f178b31 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
@@ -32,7 +32,7 @@
 			<div class="bottom">
 				<div id="left" class="align-right">
 					<h2>Search documentation</h2>
-					<form method="get" action="http://docs.pylonshq.com/pyramid/dev/search.html">
+					<form method="get" action="http://docs.pylonsproject.org/projects/pyramid/dev/search.html">
 		      			<input type="text" id="q" name="q" value="" />
 		      			<input type="submit" id="x" value="Go" />
 		  			</form>
@@ -41,25 +41,25 @@
 					<h2>Pyramid links</h2>
 					<ul class="links">
 						<li>
-							<a href="http://pylonshq.com">Pylons Website</a>
+							<a href="http://pylonsproject.org/">Pylons Website</a>
 						</li>
 						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
+							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
 						</li>
 						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#api-documentation">API Documentation</a>
+							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation">API Documentation</a>
 						</li>
 						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#tutorials">Tutorials</a>
+							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials">Tutorials</a>
 						</li>
 						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#change-history">Change History</a>
+							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history">Change History</a>
 						</li>
 						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#sample-applications">Sample Applications</a>
+							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications">Sample Applications</a>
 						</li>
 						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#support-and-development">Support and Development</a>
+							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#support-and-development">Support and Development</a>
 						</li>
 						<li>
 							<a href="irc://irc.freenode.net#pyramid">IRC Channel</a>
diff --git a/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
index cac9ccaa7..4bd01e73e 100644
--- a/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
@@ -32,7 +32,7 @@
 			<div class="bottom">
 				<div id="left" class="align-right">
 					<h2>Search documentation</h2>
-					<form method="get" action="http://docs.pylonshq.com/pyramid/dev/search.html">
+					<form method="get" action="http://docs.pylonsproject.org/projects/pyramid/dev/search.html">
 		      			<input type="text" id="q" name="q" value="" />
 		      			<input type="submit" id="x" value="Go" />
 		  			</form>
@@ -41,25 +41,25 @@
 					<h2>Pyramid links</h2>
 					<ul class="links">
 						<li>
-							<a href="http://pylonshq.com">Pylons Website</a>
+							<a href="http://pylonsproject.org">Pylons Website</a>
 						</li>
 						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
+							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
 						</li>
 						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#api-documentation">API Documentation</a>
+							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation">API Documentation</a>
 						</li>
 						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#tutorials">Tutorials</a>
+							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials">Tutorials</a>
 						</li>
 						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#change-history">Change History</a>
+							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history">Change History</a>
 						</li>
 						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#sample-applications">Sample Applications</a>
+							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications">Sample Applications</a>
 						</li>
 						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#support-and-development">Support and Development</a>
+							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#support-and-development">Support and Development</a>
 						</li>
 						<li>
 							<a href="irc://irc.freenode.net#pyramid">IRC Channel</a>
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt
index cac9ccaa7..4bd01e73e 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt
@@ -32,7 +32,7 @@
 			<div class="bottom">
 				<div id="left" class="align-right">
 					<h2>Search documentation</h2>
-					<form method="get" action="http://docs.pylonshq.com/pyramid/dev/search.html">
+					<form method="get" action="http://docs.pylonsproject.org/projects/pyramid/dev/search.html">
 		      			<input type="text" id="q" name="q" value="" />
 		      			<input type="submit" id="x" value="Go" />
 		  			</form>
@@ -41,25 +41,25 @@
 					<h2>Pyramid links</h2>
 					<ul class="links">
 						<li>
-							<a href="http://pylonshq.com">Pylons Website</a>
+							<a href="http://pylonsproject.org">Pylons Website</a>
 						</li>
 						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
+							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
 						</li>
 						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#api-documentation">API Documentation</a>
+							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation">API Documentation</a>
 						</li>
 						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#tutorials">Tutorials</a>
+							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials">Tutorials</a>
 						</li>
 						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#change-history">Change History</a>
+							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history">Change History</a>
 						</li>
 						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#sample-applications">Sample Applications</a>
+							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications">Sample Applications</a>
 						</li>
 						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#support-and-development">Support and Development</a>
+							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#support-and-development">Support and Development</a>
 						</li>
 						<li>
 							<a href="irc://irc.freenode.net#pyramid">IRC Channel</a>
-- 
cgit v1.2.3


From 1c174d94aa4007222ecc8c74a0bb2c6a73f3dcb8 Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Wed, 12 Jan 2011 23:22:09 -0500
Subject: Changed google font link in tutorials

---
 docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt       | 3 +--
 docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt      | 3 +--
 docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt | 3 +--
 docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt       | 3 +--
 docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt   | 3 +--
 docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt        | 3 +--
 docs/tutorials/wiki/src/views/tutorial/templates/edit.pt               | 3 +--
 docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt         | 3 +--
 docs/tutorials/wiki/src/views/tutorial/templates/view.pt               | 3 +--
 9 files changed, 9 insertions(+), 18 deletions(-)

(limited to 'docs/tutorials/wiki/src')

diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
index 0e5858d3b..3cc61c432 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
@@ -7,8 +7,7 @@
 	<meta name="description" content="pyramid web application" />
 	<link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
 	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" 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" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
 	<!--[if lte IE 6]>
 	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
index 974e22f37..01944357f 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
@@ -7,8 +7,7 @@
 	<meta name="description" content="pyramid web application" />
 	<link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
 	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" 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" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
 	<!--[if lte IE 6]>
 	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
index 4bd01e73e..e31a342b2 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
@@ -7,8 +7,7 @@
 	<meta name="description" content="pyramid web application" />
 	<link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
 	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" 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" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
 	<!--[if lte IE 6]>
 	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
index 3fd709338..0a7ecdc6e 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
@@ -7,8 +7,7 @@
 	<meta name="description" content="pyramid web application" />
 	<link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
 	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" 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" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
 	<!--[if lte IE 6]>
 	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
index 98f178b31..2a2340683 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
@@ -7,8 +7,7 @@
 	<meta name="description" content="pyramid web application" />
 	<link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
 	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" 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" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
 	<!--[if lte IE 6]>
 	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
diff --git a/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
index 4bd01e73e..e31a342b2 100644
--- a/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
@@ -7,8 +7,7 @@
 	<meta name="description" content="pyramid web application" />
 	<link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
 	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" 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" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
 	<!--[if lte IE 6]>
 	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt b/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
index 077a0dcb7..902c1e5a6 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
@@ -7,8 +7,7 @@
 	<meta name="description" content="pyramid web application" />
 	<link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
 	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" 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" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
 	<!--[if lte IE 6]>
 	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt
index 4bd01e73e..e31a342b2 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt
@@ -7,8 +7,7 @@
 	<meta name="description" content="pyramid web application" />
 	<link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
 	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" 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" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
 	<!--[if lte IE 6]>
 	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/view.pt b/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
index f676c1d25..d6b137e27 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
@@ -7,8 +7,7 @@
 	<meta name="description" content="pyramid web application" />
 	<link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
 	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" 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" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
 	<!--[if lte IE 6]>
 	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
-- 
cgit v1.2.3


From 6471d307be249dc2aa22ab65128e8c2a0404ff79 Mon Sep 17 00:00:00 2001
From: John Shipman <john@rainbow.nmt.edu>
Date: Sat, 15 Jan 2011 14:45:17 -0700
Subject: General reformatting of the wiki and wiki2 tutorials to eliminate any
 overly long lines in the PDF rendering.

Changes to .rst files:

  (docs/tutorials/wiki/authorization.rst)
  (docs/tutorials/wiki/definingviews.rst)
  (docs/tutorials/wiki2/authorization.rst)
  (docs/tutorials/wiki2/definingviews.rst)

  1. For included templates, added :tab-width: 2 options.
  2. wiki2/authorization.rst:  Wrong markup for file names __init__.py and
     views.py just after the subhead "Adding security.py".

Changes to .py files:  Folded a few long lines.

  (docs/tutorials/wiki/src/basiclayout/tutorial/views.py)
  (docs/tutorials/wiki/src/authorization/tutorial/views.py)
  (docs/tutorials/wiki/src/views/tutorial/views.py)
  (docs/tutorials/wiki2/src/basiclayout/tutorial/models.py)
  (docs/tutorials/wiki2/src/models/tutorial/models.py)

Changes to .pt files:  Broke long lines; reformatted for 2-space
indentation using tabs.

  (docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt)
  (docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt)
  (docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt)
  (docs/tutorials/wiki/src/views/tutorial/templates/edit.pt)
  (docs/tutorials/wiki/src/views/tutorial/templates/view.pt)
  (docs/tutorials/wiki2/src/authorization/tutorial/templates/edit.pt)
  (docs/tutorials/wiki2/src/authorization/tutorial/templates/login.pt)
  (docs/tutorials/wiki2/src/authorization/tutorial/templates/view.pt)
  (docs/tutorials/wiki2/src/views/tutorial/templates/edit.pt)
  (docs/tutorials/wiki2/src/views/tutorial/templates/view.pt)
---
 .../src/authorization/tutorial/templates/edit.pt   | 42 +++++++++++++---------
 .../src/authorization/tutorial/templates/login.pt  | 38 ++++++++++++--------
 .../src/authorization/tutorial/templates/view.pt   | 35 +++++++++++-------
 .../wiki/src/authorization/tutorial/views.py       |  2 +-
 .../wiki/src/basiclayout/tutorial/views.py         |  3 +-
 .../wiki/src/views/tutorial/templates/edit.pt      | 40 +++++++++++++--------
 .../wiki/src/views/tutorial/templates/view.pt      | 33 ++++++++++-------
 docs/tutorials/wiki/src/views/tutorial/views.py    |  2 +-
 8 files changed, 121 insertions(+), 74 deletions(-)

(limited to 'docs/tutorials/wiki/src')

diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
index 0e5858d3b..b5fa54dec 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
@@ -1,16 +1,22 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" xmlns:tal="http://xml.zope.org/namespaces/tal">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+			xmlns:tal="http://xml.zope.org/namespaces/tal">
 <head>
-	<title>${page.__name__} - Pyramid tutorial wiki (based on TurboGears 20-Minute Wiki)</title>
+	<title>${page.__name__} - Pyramid tutorial wiki (based on
+			TurboGears 20-Minute Wiki)</title>
 	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
 	<meta name="keywords" content="python web application" />
 	<meta name="description" content="pyramid web application" />
-	<link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
-	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" 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" />
+	<link rel="shortcut icon"
+				href="${request.static_url('tutorial:static/favicon.ico')}" />
+	<link rel="stylesheet"
+				href="${request.static_url('tutorial:static/pylons.css')}"
+				type="text/css" media="screen" charset="utf-8" />
 	<!--[if lte IE 6]>
-	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet"
+				href="${request.static_url('tutorial:static/ie6.css')}"
+				type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
 </head>
 <body>
@@ -18,19 +24,22 @@
 		<div id="top-small">
 			<div class="top-small align-center">
 				<div>
-					<img src="${request.static_url('tutorial:static/pyramid-small.png')}" width="220" height="50" alt="pyramid" />
+					<img width="220" height="50" alt="pyramid"
+				src="${request.static_url('tutorial:static/pyramid-small.png')}" />
 				</div>
 			</div>
 		</div>
 		<div id="middle">
 			<div class="middle align-right">
 				<div id="left" class="app-welcome align-left">
-					Editing <b><span tal:replace="page.__name__">Page Name Goes Here</span></b><br/>
-					You can return to the <a href="${request.application_url}">FrontPage</a>.<br/>
+					Editing <b><span tal:replace="page.__name__">Page Name
+						Goes Here</span></b><br/>
+					You can return to the
+					<a href="${request.application_url}">FrontPage</a>.<br/>
 				</div>
 				<div id="right" class="app-welcome align-right">
 					<span tal:condition="logged_in">
-  						<a href="${request.application_url}/logout">Logout</a>
+							<a href="${request.application_url}/logout">Logout</a>
 					</span>
 				</div>
 			</div>
@@ -38,9 +47,10 @@
 		<div id="bottom">
 			<div class="bottom">
 				<form action="${save_url}" method="post">
-      				<textarea name="body" tal:content="page.data" rows="10" cols="60"/><br/>
-      				<input type="submit" name="form.submitted" value="Save"/>
-    			</form>
+					<textarea name="body" tal:content="page.data" rows="10"
+										cols="60"/><br/>
+					<input type="submit" name="form.submitted" value="Save"/>
+				</form>
 			</div>
 		</div>
 	</div>
@@ -48,4 +58,4 @@
 		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
index 974e22f37..554b4ea87 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
@@ -1,16 +1,22 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" xmlns:tal="http://xml.zope.org/namespaces/tal">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+			xmlns:tal="http://xml.zope.org/namespaces/tal">
 <head>
-	<title>Login - Pyramid tutorial wiki (based on TurboGears 20-Minute Wiki)</title>
+	<title>Login - Pyramid tutorial wiki (based on TurboGears
+		20-Minute Wiki)</title>
 	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
 	<meta name="keywords" content="python web application" />
 	<meta name="description" content="pyramid web application" />
-	<link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
-	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" 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" />
+	<link rel="shortcut icon"
+				href="${request.static_url('tutorial:static/favicon.ico')}" />
+	<link rel="stylesheet"
+				href="${request.static_url('tutorial:static/pylons.css')}"
+				type="text/css" media="screen" charset="utf-8" />
 	<!--[if lte IE 6]>
-	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet"
+				href="${request.static_url('tutorial:static/ie6.css')}"
+				type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
 </head>
 <body>
@@ -18,7 +24,8 @@
 		<div id="top-small">
 			<div class="top-small align-center">
 				<div>
-					<img src="${request.static_url('tutorial:static/pyramid-small.png')}" width="220" height="50" alt="pyramid" />
+					<img width="220" height="50" alt="pyramid"
+				src="${request.static_url('tutorial:static/pyramid-small.png')}" />
 				</div>
 			</div>
 		</div>
@@ -34,11 +41,12 @@
 		<div id="bottom">
 			<div class="bottom">
 				<form action="${url}" method="post">
-    				<input type="hidden" name="came_from" value="${came_from}"/>
-    				<input type="text" name="login" value="${login}"/><br/>
-    				<input type="password" name="password" value="${password}"/><br/>
-    				<input type="submit" name="form.submitted" value="Log In"/>
-  				</form>
+					<input type="hidden" name="came_from" value="${came_from}"/>
+					<input type="text" name="login" value="${login}"/><br/>
+					<input type="password" name="password"
+								 value="${password}"/><br/>
+					<input type="submit" name="form.submitted" value="Log In"/>
+				</form>
 			</div>
 		</div>
 	</div>
@@ -46,4 +54,4 @@
 		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
index 3fd709338..d77d174c1 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
@@ -1,16 +1,22 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" xmlns:tal="http://xml.zope.org/namespaces/tal">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+			xmlns:tal="http://xml.zope.org/namespaces/tal">
 <head>
-	<title>${page.__name__} - Pyramid tutorial wiki (based on TurboGears 20-Minute Wiki)</title>
+	<title>${page.__name__} - Pyramid tutorial wiki (based on
+		TurboGears 20-Minute Wiki)</title>
 	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
 	<meta name="keywords" content="python web application" />
 	<meta name="description" content="pyramid web application" />
-	<link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
-	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" 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" />
+	<link rel="shortcut icon"
+				href="${request.static_url('tutorial:static/favicon.ico')}" />
+	<link rel="stylesheet"
+				href="${request.static_url('tutorial:static/pylons.css')}"
+				type="text/css" media="screen" charset="utf-8" />
 	<!--[if lte IE 6]>
-	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet"
+				href="${request.static_url('tutorial:static/ie6.css')}"
+				type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
 </head>
 <body>
@@ -18,19 +24,22 @@
 		<div id="top-small">
 			<div class="top-small align-center">
 				<div>
-					<img src="${request.static_url('tutorial:static/pyramid-small.png')}" width="220" height="50" alt="pyramid" />
+					<img width="220" height="50" alt="pyramid"
+				src="${request.static_url('tutorial:static/pyramid-small.png')}" />
 				</div>
 			</div>
 		</div>
 		<div id="middle">
 			<div class="middle align-right">
 				<div id="left" class="app-welcome align-left">
-					Viewing <b><span tal:replace="page.__name__">Page Name Goes Here</span></b><br/>
-					You can return to the <a href="${request.application_url}">FrontPage</a>.<br/>
+					Viewing <b><span tal:replace="page.__name__">Page Name
+						Goes Here</span></b><br/>
+					You can return to the
+					<a href="${request.application_url}">FrontPage</a>.<br/>
 				</div>
 				<div id="right" class="app-welcome align-right">
 					<span tal:condition="logged_in">
-  						<a href="${request.application_url}/logout">Logout</a>
+						<a href="${request.application_url}/logout">Logout</a>
 					</span>
 				</div>
 			</div>
@@ -52,4 +61,4 @@
 		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/views.py b/docs/tutorials/wiki/src/authorization/tutorial/views.py
index 183cb2a8d..a83e17de4 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/views.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/views.py
@@ -13,7 +13,7 @@ wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)")
 
 @view_config(context='tutorial.models.Wiki', permission='view')
 def view_wiki(context, request):
-    return HTTPFound(location = resource_url(context, request, 'FrontPage'))
+    return HTTPFound(location=resource_url(context, request, 'FrontPage'))
 
 @view_config(context='tutorial.models.Page',
              renderer='templates/view.pt', permission='view')
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/views.py b/docs/tutorials/wiki/src/basiclayout/tutorial/views.py
index 555f49e6d..157b9ac8f 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 tutorial.models import MyModel
 
-@view_config(context=MyModel, renderer='tutorial:templates/mytemplate.pt')
+@view_config(context=MyModel,
+             renderer='tutorial:templates/mytemplate.pt')
 def my_view(request):
     return {'project':'tutorial'}
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt b/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
index 077a0dcb7..c6c589c1a 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
@@ -1,16 +1,22 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" xmlns:tal="http://xml.zope.org/namespaces/tal">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+			xmlns:tal="http://xml.zope.org/namespaces/tal">
 <head>
-	<title>${page.__name__} - Pyramid tutorial wiki (based on TurboGears 20-Minute Wiki)</title>
+	<title>${page.__name__} - Pyramid tutorial wiki (based on
+		TurboGears 20-Minute Wiki)</title>
 	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
 	<meta name="keywords" content="python web application" />
 	<meta name="description" content="pyramid web application" />
-	<link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
-	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" 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" />
+	<link rel="shortcut icon"
+				href="${request.static_url('tutorial:static/favicon.ico')}" />
+	<link rel="stylesheet"
+				href="${request.static_url('tutorial:static/pylons.css')}"
+				type="text/css" media="screen" charset="utf-8" />
 	<!--[if lte IE 6]>
-	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet"
+				href="${request.static_url('tutorial:static/ie6.css')}"
+				type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
 </head>
 <body>
@@ -18,15 +24,18 @@
 		<div id="top-small">
 			<div class="top-small align-center">
 				<div>
-					<img src="${request.static_url('tutorial:static/pyramid-small.png')}" width="220" height="50" alt="pyramid" />
+					<img width="220" height="50" alt="pyramid"
+				src="${request.static_url('tutorial:static/pyramid-small.png')}" />
 				</div>
 			</div>
 		</div>
 		<div id="middle">
 			<div class="middle align-right">
 				<div id="left" class="app-welcome align-left">
-					Editing <b><span tal:replace="page.__name__">Page Name Goes Here</span></b><br/>
-					You can return to the <a href="${request.application_url}">FrontPage</a>.<br/>
+					Editing <b><span tal:replace="page.__name__">Page Name Goes
+						Here</span></b><br/>
+					You can return to the
+					<a href="${request.application_url}">FrontPage</a>.<br/>
 				</div>
 				<div id="right" class="app-welcome align-right"></div>
 			</div>
@@ -34,9 +43,10 @@
 		<div id="bottom">
 			<div class="bottom">
 				<form action="${save_url}" method="post">
-      				<textarea name="body" tal:content="page.data" rows="10" cols="60"/><br/>
-      				<input type="submit" name="form.submitted" value="Save"/>
-    			</form>
+					<textarea name="body" tal:content="page.data" rows="10"
+										cols="60"/><br/>
+					<input type="submit" name="form.submitted" value="Save"/>
+				</form>
 			</div>
 		</div>
 	</div>
@@ -44,4 +54,4 @@
 		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/view.pt b/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
index f676c1d25..97b87c44f 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
@@ -1,16 +1,22 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" xmlns:tal="http://xml.zope.org/namespaces/tal">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+			xmlns:tal="http://xml.zope.org/namespaces/tal">
 <head>
-	<title>${page.__name__} - Pyramid tutorial wiki (based on TurboGears 20-Minute Wiki)</title>
+	<title>${page.__name__} - Pyramid tutorial wiki (based on
+			TurboGears 20-Minute Wiki)</title>
 	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
 	<meta name="keywords" content="python web application" />
 	<meta name="description" content="pyramid web application" />
-	<link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
-	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" 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" />
+	<link rel="shortcut icon"
+				href="${request.static_url('tutorial:static/favicon.ico')}" />
+	<link rel="stylesheet"
+				href="${request.static_url('tutorial:static/pylons.css')}"
+				type="text/css" media="screen" charset="utf-8" />
 	<!--[if lte IE 6]>
-	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet"
+				href="${request.static_url('tutorial:static/ie6.css')}"
+				type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
 </head>
 <body>
@@ -18,15 +24,18 @@
 		<div id="top-small">
 			<div class="top-small align-center">
 				<div>
-					<img src="${request.static_url('tutorial:static/pyramid-small.png')}" width="220" height="50" alt="pyramid" />
+					<img width="220" height="50" alt="pyramid"
+				src="${request.static_url('tutorial:static/pyramid-small.png')}" />
 				</div>
 			</div>
 		</div>
 		<div id="middle">
 			<div class="middle align-right">
 				<div id="left" class="app-welcome align-left">
-					Viewing <b><span tal:replace="page.__name__">Page Name Goes Here</span></b><br/>
-					You can return to the <a href="${request.application_url}">FrontPage</a>.<br/>
+					Viewing <b><span tal:replace="page.__name__">Page Name Goes
+					Here</span></b><br/>
+					You can return to the
+					<a href="${request.application_url}">FrontPage</a>.<br/>
 				</div>
 				<div id="right" class="app-welcome align-right"></div>
 			</div>
@@ -48,4 +57,4 @@
 		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/tutorials/wiki/src/views/tutorial/views.py b/docs/tutorials/wiki/src/views/tutorial/views.py
index c96bc2e9c..42420f2fe 100644
--- a/docs/tutorials/wiki/src/views/tutorial/views.py
+++ b/docs/tutorials/wiki/src/views/tutorial/views.py
@@ -12,7 +12,7 @@ wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)")
 
 @view_config(context='tutorial.models.Wiki')
 def view_wiki(context, request):
-    return HTTPFound(location = resource_url(context, request, 'FrontPage'))
+    return HTTPFound(location=resource_url(context, request, 'FrontPage'))
 
 @view_config(context='tutorial.models.Page',
              renderer='tutorial:templates/view.pt')
-- 
cgit v1.2.3


From 0d7e95b06e8946247e04552a1fb395ab107155eb Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 19 Jan 2011 21:44:30 -0500
Subject: adjust tutorial sources against pyramid_zodb changes

---
 docs/tutorials/wiki/src/authorization/development.ini | 6 +++++-
 docs/tutorials/wiki/src/authorization/setup.py        | 3 +--
 docs/tutorials/wiki/src/basiclayout/development.ini   | 6 +++++-
 docs/tutorials/wiki/src/basiclayout/setup.py          | 2 +-
 docs/tutorials/wiki/src/models/development.ini        | 6 +++++-
 docs/tutorials/wiki/src/models/setup.py               | 3 +--
 docs/tutorials/wiki/src/views/development.ini         | 6 +++++-
 docs/tutorials/wiki/src/views/setup.py                | 3 +--
 8 files changed, 24 insertions(+), 11 deletions(-)

(limited to 'docs/tutorials/wiki/src')

diff --git a/docs/tutorials/wiki/src/authorization/development.ini b/docs/tutorials/wiki/src/authorization/development.ini
index 6f4c33d93..054720aa2 100644
--- a/docs/tutorials/wiki/src/authorization/development.ini
+++ b/docs/tutorials/wiki/src/authorization/development.ini
@@ -12,9 +12,13 @@ zodb_uri = file://%(here)s/Data.fs?connection_cache_size=20000
 pipeline =
     egg:WebError#evalerror
     egg:repoze.zodbconn#closer
-    egg:repoze.tm#tm
+    tm
     tutorial
 
+[filter:tm]
+use = egg:repoze.tm2#tm
+commit_veto = repoze.tm:default_commit_veto
+
 [server:main]
 use = egg:Paste#http
 host = 0.0.0.0
diff --git a/docs/tutorials/wiki/src/authorization/setup.py b/docs/tutorials/wiki/src/authorization/setup.py
index c1b8e9f33..13bf5531c 100644
--- a/docs/tutorials/wiki/src/authorization/setup.py
+++ b/docs/tutorials/wiki/src/authorization/setup.py
@@ -9,10 +9,9 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 requires = [
     'pyramid',
     'repoze.zodbconn',
-    'repoze.tm',
+    'repoze.tm2>=1.0b1', # default_commit_veto
     'ZODB3',
     'WebError',
-    'docutils',
     ]
 
 setup(name='tutorial',
diff --git a/docs/tutorials/wiki/src/basiclayout/development.ini b/docs/tutorials/wiki/src/basiclayout/development.ini
index 6f4c33d93..054720aa2 100644
--- a/docs/tutorials/wiki/src/basiclayout/development.ini
+++ b/docs/tutorials/wiki/src/basiclayout/development.ini
@@ -12,9 +12,13 @@ zodb_uri = file://%(here)s/Data.fs?connection_cache_size=20000
 pipeline =
     egg:WebError#evalerror
     egg:repoze.zodbconn#closer
-    egg:repoze.tm#tm
+    tm
     tutorial
 
+[filter:tm]
+use = egg:repoze.tm2#tm
+commit_veto = repoze.tm:default_commit_veto
+
 [server:main]
 use = egg:Paste#http
 host = 0.0.0.0
diff --git a/docs/tutorials/wiki/src/basiclayout/setup.py b/docs/tutorials/wiki/src/basiclayout/setup.py
index 7fb15b782..cb3b92347 100644
--- a/docs/tutorials/wiki/src/basiclayout/setup.py
+++ b/docs/tutorials/wiki/src/basiclayout/setup.py
@@ -9,7 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 requires = [
     'pyramid',
     'repoze.zodbconn',
-    'repoze.tm',
+    'repoze.tm2>=1.0b1', # default_commit_veto
     'ZODB3',
     'WebError',
     ]
diff --git a/docs/tutorials/wiki/src/models/development.ini b/docs/tutorials/wiki/src/models/development.ini
index 6f4c33d93..054720aa2 100644
--- a/docs/tutorials/wiki/src/models/development.ini
+++ b/docs/tutorials/wiki/src/models/development.ini
@@ -12,9 +12,13 @@ zodb_uri = file://%(here)s/Data.fs?connection_cache_size=20000
 pipeline =
     egg:WebError#evalerror
     egg:repoze.zodbconn#closer
-    egg:repoze.tm#tm
+    tm
     tutorial
 
+[filter:tm]
+use = egg:repoze.tm2#tm
+commit_veto = repoze.tm:default_commit_veto
+
 [server:main]
 use = egg:Paste#http
 host = 0.0.0.0
diff --git a/docs/tutorials/wiki/src/models/setup.py b/docs/tutorials/wiki/src/models/setup.py
index 5034a3989..3cd43d5d8 100644
--- a/docs/tutorials/wiki/src/models/setup.py
+++ b/docs/tutorials/wiki/src/models/setup.py
@@ -9,10 +9,9 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 requires = [
     'pyramid',
     'repoze.zodbconn',
-    'repoze.tm',
+    'repoze.tm2>=1.0b1', # default_commit_veto
     'ZODB3',
     'WebError',
-    'docutils',
     ]
 
 setup(name='tutorial',
diff --git a/docs/tutorials/wiki/src/views/development.ini b/docs/tutorials/wiki/src/views/development.ini
index 6f4c33d93..054720aa2 100644
--- a/docs/tutorials/wiki/src/views/development.ini
+++ b/docs/tutorials/wiki/src/views/development.ini
@@ -12,9 +12,13 @@ zodb_uri = file://%(here)s/Data.fs?connection_cache_size=20000
 pipeline =
     egg:WebError#evalerror
     egg:repoze.zodbconn#closer
-    egg:repoze.tm#tm
+    tm
     tutorial
 
+[filter:tm]
+use = egg:repoze.tm2#tm
+commit_veto = repoze.tm:default_commit_veto
+
 [server:main]
 use = egg:Paste#http
 host = 0.0.0.0
diff --git a/docs/tutorials/wiki/src/views/setup.py b/docs/tutorials/wiki/src/views/setup.py
index 5034a3989..3cd43d5d8 100644
--- a/docs/tutorials/wiki/src/views/setup.py
+++ b/docs/tutorials/wiki/src/views/setup.py
@@ -9,10 +9,9 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 requires = [
     'pyramid',
     'repoze.zodbconn',
-    'repoze.tm',
+    'repoze.tm2>=1.0b1', # default_commit_veto
     'ZODB3',
     'WebError',
-    'docutils',
     ]
 
 setup(name='tutorial',
-- 
cgit v1.2.3


From 0996daa04ccb89d9b35203bd41f37673da099b20 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 19 Jan 2011 21:52:27 -0500
Subject: readd docutils

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

(limited to 'docs/tutorials/wiki/src')

diff --git a/docs/tutorials/wiki/src/authorization/setup.py b/docs/tutorials/wiki/src/authorization/setup.py
index 13bf5531c..38f913961 100644
--- a/docs/tutorials/wiki/src/authorization/setup.py
+++ b/docs/tutorials/wiki/src/authorization/setup.py
@@ -12,6 +12,7 @@ requires = [
     'repoze.tm2>=1.0b1', # default_commit_veto
     'ZODB3',
     'WebError',
+    'docutils',
     ]
 
 setup(name='tutorial',
diff --git a/docs/tutorials/wiki/src/views/setup.py b/docs/tutorials/wiki/src/views/setup.py
index 3cd43d5d8..9538cbbff 100644
--- a/docs/tutorials/wiki/src/views/setup.py
+++ b/docs/tutorials/wiki/src/views/setup.py
@@ -12,6 +12,7 @@ requires = [
     'repoze.tm2>=1.0b1', # default_commit_veto
     'ZODB3',
     'WebError',
+    'docutils',
     ]
 
 setup(name='tutorial',
-- 
cgit v1.2.3


From 43ab049020d000a84c86770e9782a9964ff4167d Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Fri, 21 Jan 2011 01:50:46 -0500
Subject: deal with the addition of production.ini

---
 .../wiki/src/authorization/production.ini          | 70 ++++++++++++++++++++++
 docs/tutorials/wiki/src/basiclayout/production.ini | 70 ++++++++++++++++++++++
 docs/tutorials/wiki/src/models/production.ini      | 70 ++++++++++++++++++++++
 docs/tutorials/wiki/src/views/production.ini       | 70 ++++++++++++++++++++++
 4 files changed, 280 insertions(+)
 create mode 100644 docs/tutorials/wiki/src/authorization/production.ini
 create mode 100644 docs/tutorials/wiki/src/basiclayout/production.ini
 create mode 100644 docs/tutorials/wiki/src/models/production.ini
 create mode 100644 docs/tutorials/wiki/src/views/production.ini

(limited to 'docs/tutorials/wiki/src')

diff --git a/docs/tutorials/wiki/src/authorization/production.ini b/docs/tutorials/wiki/src/authorization/production.ini
new file mode 100644
index 000000000..eac34bb56
--- /dev/null
+++ b/docs/tutorials/wiki/src/authorization/production.ini
@@ -0,0 +1,70 @@
+[app:tutorial]
+use = egg:tutorial
+reload_templates = false
+debug_authorization = false
+debug_notfound = false
+debug_routematch = false
+debug_templates = false
+default_locale_name = en
+zodb_uri = file://%(here)s/Data.fs?connection_cache_size=20000
+
+[filter:weberror]
+use = egg:WebError#error_catcher
+debug = false
+;error_log = 
+;show_exceptions_in_wsgi_errors = true
+;smtp_server = localhost
+;error_email = janitor@example.com
+;smtp_username = janitor
+;smtp_password = "janitor's password"
+;from_address = paste@localhost
+;error_subject_prefix = "Pyramid Error"
+;smtp_use_tls =
+;error_message =
+
+[filter:tm]
+use = egg:repoze.tm2#tm
+commit_veto = repoze.tm:default_commit_veto
+
+[pipeline:main]
+pipeline =
+    weberror
+    egg:repoze.zodbconn#closer
+    tm
+    tutorial
+
+[server:main]
+use = egg:Paste#http
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, tutorial
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[logger_tutorial]
+level = INFO
+handlers =
+qualname = tutorial
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+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/production.ini b/docs/tutorials/wiki/src/basiclayout/production.ini
new file mode 100644
index 000000000..eac34bb56
--- /dev/null
+++ b/docs/tutorials/wiki/src/basiclayout/production.ini
@@ -0,0 +1,70 @@
+[app:tutorial]
+use = egg:tutorial
+reload_templates = false
+debug_authorization = false
+debug_notfound = false
+debug_routematch = false
+debug_templates = false
+default_locale_name = en
+zodb_uri = file://%(here)s/Data.fs?connection_cache_size=20000
+
+[filter:weberror]
+use = egg:WebError#error_catcher
+debug = false
+;error_log = 
+;show_exceptions_in_wsgi_errors = true
+;smtp_server = localhost
+;error_email = janitor@example.com
+;smtp_username = janitor
+;smtp_password = "janitor's password"
+;from_address = paste@localhost
+;error_subject_prefix = "Pyramid Error"
+;smtp_use_tls =
+;error_message =
+
+[filter:tm]
+use = egg:repoze.tm2#tm
+commit_veto = repoze.tm:default_commit_veto
+
+[pipeline:main]
+pipeline =
+    weberror
+    egg:repoze.zodbconn#closer
+    tm
+    tutorial
+
+[server:main]
+use = egg:Paste#http
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, tutorial
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[logger_tutorial]
+level = INFO
+handlers =
+qualname = tutorial
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+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
new file mode 100644
index 000000000..eac34bb56
--- /dev/null
+++ b/docs/tutorials/wiki/src/models/production.ini
@@ -0,0 +1,70 @@
+[app:tutorial]
+use = egg:tutorial
+reload_templates = false
+debug_authorization = false
+debug_notfound = false
+debug_routematch = false
+debug_templates = false
+default_locale_name = en
+zodb_uri = file://%(here)s/Data.fs?connection_cache_size=20000
+
+[filter:weberror]
+use = egg:WebError#error_catcher
+debug = false
+;error_log = 
+;show_exceptions_in_wsgi_errors = true
+;smtp_server = localhost
+;error_email = janitor@example.com
+;smtp_username = janitor
+;smtp_password = "janitor's password"
+;from_address = paste@localhost
+;error_subject_prefix = "Pyramid Error"
+;smtp_use_tls =
+;error_message =
+
+[filter:tm]
+use = egg:repoze.tm2#tm
+commit_veto = repoze.tm:default_commit_veto
+
+[pipeline:main]
+pipeline =
+    weberror
+    egg:repoze.zodbconn#closer
+    tm
+    tutorial
+
+[server:main]
+use = egg:Paste#http
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, tutorial
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[logger_tutorial]
+level = INFO
+handlers =
+qualname = tutorial
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+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/production.ini b/docs/tutorials/wiki/src/views/production.ini
new file mode 100644
index 000000000..eac34bb56
--- /dev/null
+++ b/docs/tutorials/wiki/src/views/production.ini
@@ -0,0 +1,70 @@
+[app:tutorial]
+use = egg:tutorial
+reload_templates = false
+debug_authorization = false
+debug_notfound = false
+debug_routematch = false
+debug_templates = false
+default_locale_name = en
+zodb_uri = file://%(here)s/Data.fs?connection_cache_size=20000
+
+[filter:weberror]
+use = egg:WebError#error_catcher
+debug = false
+;error_log = 
+;show_exceptions_in_wsgi_errors = true
+;smtp_server = localhost
+;error_email = janitor@example.com
+;smtp_username = janitor
+;smtp_password = "janitor's password"
+;from_address = paste@localhost
+;error_subject_prefix = "Pyramid Error"
+;smtp_use_tls =
+;error_message =
+
+[filter:tm]
+use = egg:repoze.tm2#tm
+commit_veto = repoze.tm:default_commit_veto
+
+[pipeline:main]
+pipeline =
+    weberror
+    egg:repoze.zodbconn#closer
+    tm
+    tutorial
+
+[server:main]
+use = egg:Paste#http
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, tutorial
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[logger_tutorial]
+level = INFO
+handlers =
+qualname = tutorial
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
-- 
cgit v1.2.3


From 47442fb154eae5c6cd71a54e9b4aeee484e1c38b Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Fri, 21 Jan 2011 20:05:09 -0500
Subject: - Add a ``MANIFEST.in`` file to each paster template. See  
 https://github.com/Pylons/pyramid/issues#issue/95

Closes issue #95.
---
 docs/tutorials/wiki/src/authorization/MANIFEST.in | 2 ++
 docs/tutorials/wiki/src/basiclayout/MANIFEST.in   | 2 ++
 docs/tutorials/wiki/src/models/MANIFEST.in        | 2 ++
 docs/tutorials/wiki/src/views/MANIFEST.in         | 2 ++
 4 files changed, 8 insertions(+)
 create mode 100644 docs/tutorials/wiki/src/authorization/MANIFEST.in
 create mode 100644 docs/tutorials/wiki/src/basiclayout/MANIFEST.in
 create mode 100644 docs/tutorials/wiki/src/models/MANIFEST.in
 create mode 100644 docs/tutorials/wiki/src/views/MANIFEST.in

(limited to 'docs/tutorials/wiki/src')

diff --git a/docs/tutorials/wiki/src/authorization/MANIFEST.in b/docs/tutorials/wiki/src/authorization/MANIFEST.in
new file mode 100644
index 000000000..ad7b55103
--- /dev/null
+++ b/docs/tutorials/wiki/src/authorization/MANIFEST.in
@@ -0,0 +1,2 @@
+include *.txt *.ini *.cfg *.rst
+recursive-include tutorial *.ico *.png *.css *.gif *.jpg *.pt *.mak *.js
diff --git a/docs/tutorials/wiki/src/basiclayout/MANIFEST.in b/docs/tutorials/wiki/src/basiclayout/MANIFEST.in
new file mode 100644
index 000000000..ad7b55103
--- /dev/null
+++ b/docs/tutorials/wiki/src/basiclayout/MANIFEST.in
@@ -0,0 +1,2 @@
+include *.txt *.ini *.cfg *.rst
+recursive-include tutorial *.ico *.png *.css *.gif *.jpg *.pt *.mak *.js
diff --git a/docs/tutorials/wiki/src/models/MANIFEST.in b/docs/tutorials/wiki/src/models/MANIFEST.in
new file mode 100644
index 000000000..ad7b55103
--- /dev/null
+++ b/docs/tutorials/wiki/src/models/MANIFEST.in
@@ -0,0 +1,2 @@
+include *.txt *.ini *.cfg *.rst
+recursive-include tutorial *.ico *.png *.css *.gif *.jpg *.pt *.mak *.js
diff --git a/docs/tutorials/wiki/src/views/MANIFEST.in b/docs/tutorials/wiki/src/views/MANIFEST.in
new file mode 100644
index 000000000..ad7b55103
--- /dev/null
+++ b/docs/tutorials/wiki/src/views/MANIFEST.in
@@ -0,0 +1,2 @@
+include *.txt *.ini *.cfg *.rst
+recursive-include tutorial *.ico *.png *.css *.gif *.jpg *.pt *.mak *.js
-- 
cgit v1.2.3


From 6abe4422f9a36b4c7f5f5a0dfcbf11f171f9f572 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Fri, 21 Jan 2011 21:29:06 -0500
Subject: include txt, mako, xml, html

---
 docs/tutorials/wiki/src/authorization/MANIFEST.in | 2 +-
 docs/tutorials/wiki/src/basiclayout/MANIFEST.in   | 2 +-
 docs/tutorials/wiki/src/models/MANIFEST.in        | 2 +-
 docs/tutorials/wiki/src/views/MANIFEST.in         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'docs/tutorials/wiki/src')

diff --git a/docs/tutorials/wiki/src/authorization/MANIFEST.in b/docs/tutorials/wiki/src/authorization/MANIFEST.in
index ad7b55103..81beba1b1 100644
--- a/docs/tutorials/wiki/src/authorization/MANIFEST.in
+++ b/docs/tutorials/wiki/src/authorization/MANIFEST.in
@@ -1,2 +1,2 @@
 include *.txt *.ini *.cfg *.rst
-recursive-include tutorial *.ico *.png *.css *.gif *.jpg *.pt *.mak *.js
+recursive-include tutorial *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml
diff --git a/docs/tutorials/wiki/src/basiclayout/MANIFEST.in b/docs/tutorials/wiki/src/basiclayout/MANIFEST.in
index ad7b55103..81beba1b1 100644
--- a/docs/tutorials/wiki/src/basiclayout/MANIFEST.in
+++ b/docs/tutorials/wiki/src/basiclayout/MANIFEST.in
@@ -1,2 +1,2 @@
 include *.txt *.ini *.cfg *.rst
-recursive-include tutorial *.ico *.png *.css *.gif *.jpg *.pt *.mak *.js
+recursive-include tutorial *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml
diff --git a/docs/tutorials/wiki/src/models/MANIFEST.in b/docs/tutorials/wiki/src/models/MANIFEST.in
index ad7b55103..81beba1b1 100644
--- a/docs/tutorials/wiki/src/models/MANIFEST.in
+++ b/docs/tutorials/wiki/src/models/MANIFEST.in
@@ -1,2 +1,2 @@
 include *.txt *.ini *.cfg *.rst
-recursive-include tutorial *.ico *.png *.css *.gif *.jpg *.pt *.mak *.js
+recursive-include tutorial *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml
diff --git a/docs/tutorials/wiki/src/views/MANIFEST.in b/docs/tutorials/wiki/src/views/MANIFEST.in
index ad7b55103..81beba1b1 100644
--- a/docs/tutorials/wiki/src/views/MANIFEST.in
+++ b/docs/tutorials/wiki/src/views/MANIFEST.in
@@ -1,2 +1,2 @@
 include *.txt *.ini *.cfg *.rst
-recursive-include tutorial *.ico *.png *.css *.gif *.jpg *.pt *.mak *.js
+recursive-include tutorial *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml
-- 
cgit v1.2.3


From a87a68d83f713ed3cd81011b486178179e3b413e Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sat, 22 Jan 2011 23:02:57 -0500
Subject: - The ``production.ini`` generated by all paster templates now have
 an   effective logging level of WARN, which prevents e.g. SQLAlchemy
 statement   logging and other inappropriate output.

- The ``production.ini`` of the ``pyramid_routesalchemy`` and
  ``pyramid_alchemy`` paster templates did not have a ``sqlalchemy`` logger
  section, preventing ``paster serve production.ini`` from working.

- The ``pyramid_routesalchemy`` and ``pyramid_alchemy`` paster templates used
  the ``{{package}}`` variable in a place where it should have used the
  ``{{project}}`` variable, causing applications created with uppercase
  letters e.g. ``paster create -t pyramid_routesalchemy Dibbus`` to fail to
  start when ``paster serve development.ini`` was used against the result.
  See https://github.com/Pylons/pyramid/issues/#issue/107

Closes #107
---
 docs/tutorials/wiki/src/authorization/production.ini | 4 ++--
 docs/tutorials/wiki/src/basiclayout/production.ini   | 4 ++--
 docs/tutorials/wiki/src/models/production.ini        | 4 ++--
 docs/tutorials/wiki/src/views/production.ini         | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'docs/tutorials/wiki/src')

diff --git a/docs/tutorials/wiki/src/authorization/production.ini b/docs/tutorials/wiki/src/authorization/production.ini
index eac34bb56..458064388 100644
--- a/docs/tutorials/wiki/src/authorization/production.ini
+++ b/docs/tutorials/wiki/src/authorization/production.ini
@@ -50,11 +50,11 @@ keys = console
 keys = generic
 
 [logger_root]
-level = INFO
+level = WARN
 handlers = console
 
 [logger_tutorial]
-level = INFO
+level = WARN
 handlers =
 qualname = tutorial
 
diff --git a/docs/tutorials/wiki/src/basiclayout/production.ini b/docs/tutorials/wiki/src/basiclayout/production.ini
index eac34bb56..458064388 100644
--- a/docs/tutorials/wiki/src/basiclayout/production.ini
+++ b/docs/tutorials/wiki/src/basiclayout/production.ini
@@ -50,11 +50,11 @@ keys = console
 keys = generic
 
 [logger_root]
-level = INFO
+level = WARN
 handlers = console
 
 [logger_tutorial]
-level = INFO
+level = WARN
 handlers =
 qualname = tutorial
 
diff --git a/docs/tutorials/wiki/src/models/production.ini b/docs/tutorials/wiki/src/models/production.ini
index eac34bb56..458064388 100644
--- a/docs/tutorials/wiki/src/models/production.ini
+++ b/docs/tutorials/wiki/src/models/production.ini
@@ -50,11 +50,11 @@ keys = console
 keys = generic
 
 [logger_root]
-level = INFO
+level = WARN
 handlers = console
 
 [logger_tutorial]
-level = INFO
+level = WARN
 handlers =
 qualname = tutorial
 
diff --git a/docs/tutorials/wiki/src/views/production.ini b/docs/tutorials/wiki/src/views/production.ini
index eac34bb56..458064388 100644
--- a/docs/tutorials/wiki/src/views/production.ini
+++ b/docs/tutorials/wiki/src/views/production.ini
@@ -50,11 +50,11 @@ keys = console
 keys = generic
 
 [logger_root]
-level = INFO
+level = WARN
 handlers = console
 
 [logger_tutorial]
-level = INFO
+level = WARN
 handlers =
 qualname = tutorial
 
-- 
cgit v1.2.3


From bd330cfc22555ce0026b92d40091d0745b60e36c Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 25 Jan 2011 23:00:44 -0500
Subject: - Use &copy; instead of copyright symbol in paster templates /
 tutorial   templates for the benefit of folks who cutnpaste and save to a
 non-UTF8   format.

---
 docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt      | 2 +-
 docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt     | 2 +-
 .../tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt | 4 ++--
 docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt      | 2 +-
 docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt  | 4 ++--
 docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt       | 4 ++--
 docs/tutorials/wiki/src/views/tutorial/templates/edit.pt              | 2 +-
 docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt        | 4 ++--
 docs/tutorials/wiki/src/views/tutorial/templates/view.pt              | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'docs/tutorials/wiki/src')

diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
index b5fa54dec..30767b28b 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
@@ -55,7 +55,7 @@
 		</div>
 	</div>
 	<div id="footer">
-		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+		<div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
 	</div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
index 554b4ea87..09bcff65d 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
@@ -51,7 +51,7 @@
 		</div>
 	</div>
 	<div id="footer">
-		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+		<div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
 	</div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
index e31a342b2..712fd0737 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
@@ -69,7 +69,7 @@
 		</div>
 	</div>
 	<div id="footer">
-		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+		<div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
index d77d174c1..113144687 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
@@ -58,7 +58,7 @@
 		</div>
 	</div>
 	<div id="footer">
-		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+		<div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
 	</div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
index 2a2340683..c4dfc0707 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
@@ -69,7 +69,7 @@
 		</div>
 	</div>
 	<div id="footer">
-		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+		<div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
index e31a342b2..712fd0737 100644
--- a/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
@@ -69,7 +69,7 @@
 		</div>
 	</div>
 	<div id="footer">
-		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+		<div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt b/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
index c6c589c1a..e287e174e 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
@@ -51,7 +51,7 @@
 		</div>
 	</div>
 	<div id="footer">
-		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+		<div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
 	</div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt
index e31a342b2..712fd0737 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt
@@ -69,7 +69,7 @@
 		</div>
 	</div>
 	<div id="footer">
-		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+		<div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/view.pt b/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
index 97b87c44f..992c5aa43 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
@@ -54,7 +54,7 @@
 		</div>
 	</div>
 	<div id="footer">
-		<div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+		<div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
 	</div>
 </body>
 </html>
-- 
cgit v1.2.3


From ed252c573f5470aef4f73227a5c516eace9474b5 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Fri, 28 Jan 2011 00:08:35 -0500
Subject: convert all tabs to spaces in templates (sorry, blaise, i may have to
 use an older version of sphinx which doesnt respect tab-width)

---
 .../src/authorization/tutorial/templates/edit.pt   | 108 ++++++++--------
 .../src/authorization/tutorial/templates/login.pt  | 100 +++++++--------
 .../authorization/tutorial/templates/mytemplate.pt | 136 ++++++++++-----------
 .../src/authorization/tutorial/templates/view.pt   | 114 ++++++++---------
 .../basiclayout/tutorial/templates/mytemplate.pt   | 136 ++++++++++-----------
 .../src/models/tutorial/templates/mytemplate.pt    | 136 ++++++++++-----------
 .../wiki/src/views/tutorial/templates/edit.pt      | 100 +++++++--------
 .../src/views/tutorial/templates/mytemplate.pt     | 136 ++++++++++-----------
 .../wiki/src/views/tutorial/templates/view.pt      | 106 ++++++++--------
 9 files changed, 536 insertions(+), 536 deletions(-)

(limited to 'docs/tutorials/wiki/src')

diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
index 30767b28b..62b9cad7e 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
@@ -1,61 +1,61 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-			xmlns:tal="http://xml.zope.org/namespaces/tal">
+      xmlns:tal="http://xml.zope.org/namespaces/tal">
 <head>
-	<title>${page.__name__} - Pyramid tutorial wiki (based on
-			TurboGears 20-Minute Wiki)</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-	<meta name="keywords" content="python web application" />
-	<meta name="description" content="pyramid web application" />
-	<link rel="shortcut icon"
-				href="${request.static_url('tutorial:static/favicon.ico')}" />
-	<link rel="stylesheet"
-				href="${request.static_url('tutorial:static/pylons.css')}"
-				type="text/css" media="screen" charset="utf-8" />
-	<!--[if lte IE 6]>
-	<link rel="stylesheet"
-				href="${request.static_url('tutorial:static/ie6.css')}"
-				type="text/css" media="screen" charset="utf-8" />
-	<![endif]-->
+  <title>${page.__name__} - Pyramid tutorial wiki (based on
+      TurboGears 20-Minute Wiki)</title>
+  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+  <meta name="keywords" content="python web application" />
+  <meta name="description" content="pyramid web application" />
+  <link rel="shortcut icon"
+        href="${request.static_url('tutorial:static/favicon.ico')}" />
+  <link rel="stylesheet"
+        href="${request.static_url('tutorial:static/pylons.css')}"
+        type="text/css" media="screen" charset="utf-8" />
+  <!--[if lte IE 6]>
+  <link rel="stylesheet"
+        href="${request.static_url('tutorial:static/ie6.css')}"
+        type="text/css" media="screen" charset="utf-8" />
+  <![endif]-->
 </head>
 <body>
-	<div id="wrap">
-		<div id="top-small">
-			<div class="top-small align-center">
-				<div>
-					<img width="220" height="50" alt="pyramid"
-				src="${request.static_url('tutorial:static/pyramid-small.png')}" />
-				</div>
-			</div>
-		</div>
-		<div id="middle">
-			<div class="middle align-right">
-				<div id="left" class="app-welcome align-left">
-					Editing <b><span tal:replace="page.__name__">Page Name
-						Goes Here</span></b><br/>
-					You can return to the
-					<a href="${request.application_url}">FrontPage</a>.<br/>
-				</div>
-				<div id="right" class="app-welcome align-right">
-					<span tal:condition="logged_in">
-							<a href="${request.application_url}/logout">Logout</a>
-					</span>
-				</div>
-			</div>
-		</div>
-		<div id="bottom">
-			<div class="bottom">
-				<form action="${save_url}" method="post">
-					<textarea name="body" tal:content="page.data" rows="10"
-										cols="60"/><br/>
-					<input type="submit" name="form.submitted" value="Save"/>
-				</form>
-			</div>
-		</div>
-	</div>
-	<div id="footer">
-		<div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
-	</div>
+  <div id="wrap">
+    <div id="top-small">
+      <div class="top-small align-center">
+        <div>
+          <img width="220" height="50" alt="pyramid"
+        src="${request.static_url('tutorial:static/pyramid-small.png')}" />
+        </div>
+      </div>
+    </div>
+    <div id="middle">
+      <div class="middle align-right">
+        <div id="left" class="app-welcome align-left">
+          Editing <b><span tal:replace="page.__name__">Page Name
+            Goes Here</span></b><br/>
+          You can return to the
+          <a href="${request.application_url}">FrontPage</a>.<br/>
+        </div>
+        <div id="right" class="app-welcome align-right">
+          <span tal:condition="logged_in">
+              <a href="${request.application_url}/logout">Logout</a>
+          </span>
+        </div>
+      </div>
+    </div>
+    <div id="bottom">
+      <div class="bottom">
+        <form action="${save_url}" method="post">
+          <textarea name="body" tal:content="page.data" rows="10"
+                    cols="60"/><br/>
+          <input type="submit" name="form.submitted" value="Save"/>
+        </form>
+      </div>
+    </div>
+  </div>
+  <div id="footer">
+    <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
+  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
index 09bcff65d..eaf7123d7 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
@@ -1,57 +1,57 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-			xmlns:tal="http://xml.zope.org/namespaces/tal">
+      xmlns:tal="http://xml.zope.org/namespaces/tal">
 <head>
-	<title>Login - Pyramid tutorial wiki (based on TurboGears
-		20-Minute Wiki)</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-	<meta name="keywords" content="python web application" />
-	<meta name="description" content="pyramid web application" />
-	<link rel="shortcut icon"
-				href="${request.static_url('tutorial:static/favicon.ico')}" />
-	<link rel="stylesheet"
-				href="${request.static_url('tutorial:static/pylons.css')}"
-				type="text/css" media="screen" charset="utf-8" />
-	<!--[if lte IE 6]>
-	<link rel="stylesheet"
-				href="${request.static_url('tutorial:static/ie6.css')}"
-				type="text/css" media="screen" charset="utf-8" />
-	<![endif]-->
+  <title>Login - Pyramid tutorial wiki (based on TurboGears
+    20-Minute Wiki)</title>
+  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+  <meta name="keywords" content="python web application" />
+  <meta name="description" content="pyramid web application" />
+  <link rel="shortcut icon"
+        href="${request.static_url('tutorial:static/favicon.ico')}" />
+  <link rel="stylesheet"
+        href="${request.static_url('tutorial:static/pylons.css')}"
+        type="text/css" media="screen" charset="utf-8" />
+  <!--[if lte IE 6]>
+  <link rel="stylesheet"
+        href="${request.static_url('tutorial:static/ie6.css')}"
+        type="text/css" media="screen" charset="utf-8" />
+  <![endif]-->
 </head>
 <body>
-	<div id="wrap">
-		<div id="top-small">
-			<div class="top-small align-center">
-				<div>
-					<img width="220" height="50" alt="pyramid"
-				src="${request.static_url('tutorial:static/pyramid-small.png')}" />
-				</div>
-			</div>
-		</div>
-		<div id="middle">
-			<div class="middle align-right">
-				<div id="left" class="app-welcome align-left">
-					<b>Login</b><br/>
-					<span tal:replace="message"/>
-				</div>
-				<div id="right" class="app-welcome align-right"></div>
-			</div>
-		</div>
-		<div id="bottom">
-			<div class="bottom">
-				<form action="${url}" method="post">
-					<input type="hidden" name="came_from" value="${came_from}"/>
-					<input type="text" name="login" value="${login}"/><br/>
-					<input type="password" name="password"
-								 value="${password}"/><br/>
-					<input type="submit" name="form.submitted" value="Log In"/>
-				</form>
-			</div>
-		</div>
-	</div>
-	<div id="footer">
-		<div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
-	</div>
+  <div id="wrap">
+    <div id="top-small">
+      <div class="top-small align-center">
+        <div>
+          <img width="220" height="50" alt="pyramid"
+        src="${request.static_url('tutorial:static/pyramid-small.png')}" />
+        </div>
+      </div>
+    </div>
+    <div id="middle">
+      <div class="middle align-right">
+        <div id="left" class="app-welcome align-left">
+          <b>Login</b><br/>
+          <span tal:replace="message"/>
+        </div>
+        <div id="right" class="app-welcome align-right"></div>
+      </div>
+    </div>
+    <div id="bottom">
+      <div class="bottom">
+        <form action="${url}" method="post">
+          <input type="hidden" name="came_from" value="${came_from}"/>
+          <input type="text" name="login" value="${login}"/><br/>
+          <input type="password" name="password"
+                 value="${password}"/><br/>
+          <input type="submit" name="form.submitted" value="Log In"/>
+        </form>
+      </div>
+    </div>
+  </div>
+  <div id="footer">
+    <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
+  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
index 712fd0737..d98420680 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
@@ -1,75 +1,75 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" xmlns:tal="http://xml.zope.org/namespaces/tal">
 <head>
-	<title>The Pyramid Web Application Development Framework</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-	<meta name="keywords" content="python web application" />
-	<meta name="description" content="pyramid web application" />
-	<link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
-	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
-	<!--[if lte IE 6]>
-	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
-	<![endif]-->
+  <title>The Pyramid Web Application Development Framework</title>
+  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+  <meta name="keywords" content="python web application" />
+  <meta name="description" content="pyramid web application" />
+  <link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
+  <link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
+  <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
+  <!--[if lte IE 6]>
+  <link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
+  <![endif]-->
 </head>
 <body>
-	<div id="wrap">
-		<div id="top">
-			<div class="top align-center">
-				<div><img src="${request.static_url('tutorial:static/pyramid.png')}" width="750" height="169" alt="pyramid"/></div>
-			</div>
-		</div>
-		<div id="middle">
-			<div class="middle align-center">
-				<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>
-		<div id="bottom">
-			<div class="bottom">
-				<div id="left" class="align-right">
-					<h2>Search documentation</h2>
-					<form method="get" action="http://docs.pylonsproject.org/projects/pyramid/dev/search.html">
-		      			<input type="text" id="q" name="q" value="" />
-		      			<input type="submit" id="x" value="Go" />
-		  			</form>
-				</div>
-				<div id="right" class="align-left">
-					<h2>Pyramid links</h2>
-					<ul class="links">
-						<li>
-							<a href="http://pylonsproject.org">Pylons Website</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation">API Documentation</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials">Tutorials</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history">Change History</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications">Sample Applications</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonsproject.org/projects/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>
-	<div id="footer">
-		<div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
-	</div>
+  <div id="wrap">
+    <div id="top">
+      <div class="top align-center">
+        <div><img src="${request.static_url('tutorial:static/pyramid.png')}" width="750" height="169" alt="pyramid"/></div>
+      </div>
+    </div>
+    <div id="middle">
+      <div class="middle align-center">
+        <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>
+    <div id="bottom">
+      <div class="bottom">
+        <div id="left" class="align-right">
+          <h2>Search documentation</h2>
+          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/dev/search.html">
+                <input type="text" id="q" name="q" value="" />
+                <input type="submit" id="x" value="Go" />
+            </form>
+        </div>
+        <div id="right" class="align-left">
+          <h2>Pyramid links</h2>
+          <ul class="links">
+            <li>
+              <a href="http://pylonsproject.org">Pylons Website</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation">API Documentation</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials">Tutorials</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history">Change History</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications">Sample Applications</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/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>
+  <div id="footer">
+    <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
+  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
index 113144687..62f75da21 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
@@ -1,64 +1,64 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-			xmlns:tal="http://xml.zope.org/namespaces/tal">
+      xmlns:tal="http://xml.zope.org/namespaces/tal">
 <head>
-	<title>${page.__name__} - Pyramid tutorial wiki (based on
-		TurboGears 20-Minute Wiki)</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-	<meta name="keywords" content="python web application" />
-	<meta name="description" content="pyramid web application" />
-	<link rel="shortcut icon"
-				href="${request.static_url('tutorial:static/favicon.ico')}" />
-	<link rel="stylesheet"
-				href="${request.static_url('tutorial:static/pylons.css')}"
-				type="text/css" media="screen" charset="utf-8" />
-	<!--[if lte IE 6]>
-	<link rel="stylesheet"
-				href="${request.static_url('tutorial:static/ie6.css')}"
-				type="text/css" media="screen" charset="utf-8" />
-	<![endif]-->
+  <title>${page.__name__} - Pyramid tutorial wiki (based on
+    TurboGears 20-Minute Wiki)</title>
+  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+  <meta name="keywords" content="python web application" />
+  <meta name="description" content="pyramid web application" />
+  <link rel="shortcut icon"
+        href="${request.static_url('tutorial:static/favicon.ico')}" />
+  <link rel="stylesheet"
+        href="${request.static_url('tutorial:static/pylons.css')}"
+        type="text/css" media="screen" charset="utf-8" />
+  <!--[if lte IE 6]>
+  <link rel="stylesheet"
+        href="${request.static_url('tutorial:static/ie6.css')}"
+        type="text/css" media="screen" charset="utf-8" />
+  <![endif]-->
 </head>
 <body>
-	<div id="wrap">
-		<div id="top-small">
-			<div class="top-small align-center">
-				<div>
-					<img width="220" height="50" alt="pyramid"
-				src="${request.static_url('tutorial:static/pyramid-small.png')}" />
-				</div>
-			</div>
-		</div>
-		<div id="middle">
-			<div class="middle align-right">
-				<div id="left" class="app-welcome align-left">
-					Viewing <b><span tal:replace="page.__name__">Page Name
-						Goes Here</span></b><br/>
-					You can return to the
-					<a href="${request.application_url}">FrontPage</a>.<br/>
-				</div>
-				<div id="right" class="app-welcome align-right">
-					<span tal:condition="logged_in">
-						<a href="${request.application_url}/logout">Logout</a>
-					</span>
-				</div>
-			</div>
-		</div>
-		<div id="bottom">
-			<div class="bottom">
-				<div tal:replace="structure content">
-					Page text goes here.
-				</div>
-				<p>
-					<a tal:attributes="href edit_url" href="">
-						Edit this page
-					</a>
-				</p>
-			</div>
-		</div>
-	</div>
-	<div id="footer">
-		<div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
-	</div>
+  <div id="wrap">
+    <div id="top-small">
+      <div class="top-small align-center">
+        <div>
+          <img width="220" height="50" alt="pyramid"
+        src="${request.static_url('tutorial:static/pyramid-small.png')}" />
+        </div>
+      </div>
+    </div>
+    <div id="middle">
+      <div class="middle align-right">
+        <div id="left" class="app-welcome align-left">
+          Viewing <b><span tal:replace="page.__name__">Page Name
+            Goes Here</span></b><br/>
+          You can return to the
+          <a href="${request.application_url}">FrontPage</a>.<br/>
+        </div>
+        <div id="right" class="app-welcome align-right">
+          <span tal:condition="logged_in">
+            <a href="${request.application_url}/logout">Logout</a>
+          </span>
+        </div>
+      </div>
+    </div>
+    <div id="bottom">
+      <div class="bottom">
+        <div tal:replace="structure content">
+          Page text goes here.
+        </div>
+        <p>
+          <a tal:attributes="href edit_url" href="">
+            Edit this page
+          </a>
+        </p>
+      </div>
+    </div>
+  </div>
+  <div id="footer">
+    <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
+  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
index c4dfc0707..c24daa711 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
@@ -1,75 +1,75 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" xmlns:tal="http://xml.zope.org/namespaces/tal">
 <head>
-	<title>The Pyramid Web Application Development Framework</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-	<meta name="keywords" content="python web application" />
-	<meta name="description" content="pyramid web application" />
-	<link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
-	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
-	<!--[if lte IE 6]>
-	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
-	<![endif]-->
+  <title>The Pyramid Web Application Development Framework</title>
+  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+  <meta name="keywords" content="python web application" />
+  <meta name="description" content="pyramid web application" />
+  <link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
+  <link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
+  <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
+  <!--[if lte IE 6]>
+  <link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
+  <![endif]-->
 </head>
 <body>
-	<div id="wrap">
-		<div id="top">
-			<div class="top align-center">
-				<div><img src="${request.static_url('tutorial:static/pyramid.png')}" width="750" height="169" alt="pyramid"/></div>
-			</div>
-		</div>
-		<div id="middle">
-			<div class="middle align-center">
-				<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>
-		<div id="bottom">
-			<div class="bottom">
-				<div id="left" class="align-right">
-					<h2>Search documentation</h2>
-					<form method="get" action="http://docs.pylonsproject.org/projects/pyramid/dev/search.html">
-		      			<input type="text" id="q" name="q" value="" />
-		      			<input type="submit" id="x" value="Go" />
-		  			</form>
-				</div>
-				<div id="right" class="align-left">
-					<h2>Pyramid links</h2>
-					<ul class="links">
-						<li>
-							<a href="http://pylonsproject.org/">Pylons Website</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation">API Documentation</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials">Tutorials</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history">Change History</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications">Sample Applications</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonsproject.org/projects/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>
-	<div id="footer">
-		<div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
-	</div>
+  <div id="wrap">
+    <div id="top">
+      <div class="top align-center">
+        <div><img src="${request.static_url('tutorial:static/pyramid.png')}" width="750" height="169" alt="pyramid"/></div>
+      </div>
+    </div>
+    <div id="middle">
+      <div class="middle align-center">
+        <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>
+    <div id="bottom">
+      <div class="bottom">
+        <div id="left" class="align-right">
+          <h2>Search documentation</h2>
+          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/dev/search.html">
+                <input type="text" id="q" name="q" value="" />
+                <input type="submit" id="x" value="Go" />
+            </form>
+        </div>
+        <div id="right" class="align-left">
+          <h2>Pyramid links</h2>
+          <ul class="links">
+            <li>
+              <a href="http://pylonsproject.org/">Pylons Website</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation">API Documentation</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials">Tutorials</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history">Change History</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications">Sample Applications</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/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>
+  <div id="footer">
+    <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
+  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
index 712fd0737..d98420680 100644
--- a/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
@@ -1,75 +1,75 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" xmlns:tal="http://xml.zope.org/namespaces/tal">
 <head>
-	<title>The Pyramid Web Application Development Framework</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-	<meta name="keywords" content="python web application" />
-	<meta name="description" content="pyramid web application" />
-	<link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
-	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
-	<!--[if lte IE 6]>
-	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
-	<![endif]-->
+  <title>The Pyramid Web Application Development Framework</title>
+  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+  <meta name="keywords" content="python web application" />
+  <meta name="description" content="pyramid web application" />
+  <link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
+  <link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
+  <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
+  <!--[if lte IE 6]>
+  <link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
+  <![endif]-->
 </head>
 <body>
-	<div id="wrap">
-		<div id="top">
-			<div class="top align-center">
-				<div><img src="${request.static_url('tutorial:static/pyramid.png')}" width="750" height="169" alt="pyramid"/></div>
-			</div>
-		</div>
-		<div id="middle">
-			<div class="middle align-center">
-				<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>
-		<div id="bottom">
-			<div class="bottom">
-				<div id="left" class="align-right">
-					<h2>Search documentation</h2>
-					<form method="get" action="http://docs.pylonsproject.org/projects/pyramid/dev/search.html">
-		      			<input type="text" id="q" name="q" value="" />
-		      			<input type="submit" id="x" value="Go" />
-		  			</form>
-				</div>
-				<div id="right" class="align-left">
-					<h2>Pyramid links</h2>
-					<ul class="links">
-						<li>
-							<a href="http://pylonsproject.org">Pylons Website</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation">API Documentation</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials">Tutorials</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history">Change History</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications">Sample Applications</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonsproject.org/projects/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>
-	<div id="footer">
-		<div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
-	</div>
+  <div id="wrap">
+    <div id="top">
+      <div class="top align-center">
+        <div><img src="${request.static_url('tutorial:static/pyramid.png')}" width="750" height="169" alt="pyramid"/></div>
+      </div>
+    </div>
+    <div id="middle">
+      <div class="middle align-center">
+        <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>
+    <div id="bottom">
+      <div class="bottom">
+        <div id="left" class="align-right">
+          <h2>Search documentation</h2>
+          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/dev/search.html">
+                <input type="text" id="q" name="q" value="" />
+                <input type="submit" id="x" value="Go" />
+            </form>
+        </div>
+        <div id="right" class="align-left">
+          <h2>Pyramid links</h2>
+          <ul class="links">
+            <li>
+              <a href="http://pylonsproject.org">Pylons Website</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation">API Documentation</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials">Tutorials</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history">Change History</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications">Sample Applications</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/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>
+  <div id="footer">
+    <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
+  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt b/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
index e287e174e..9e6149188 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
@@ -1,57 +1,57 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-			xmlns:tal="http://xml.zope.org/namespaces/tal">
+      xmlns:tal="http://xml.zope.org/namespaces/tal">
 <head>
-	<title>${page.__name__} - Pyramid tutorial wiki (based on
-		TurboGears 20-Minute Wiki)</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-	<meta name="keywords" content="python web application" />
-	<meta name="description" content="pyramid web application" />
-	<link rel="shortcut icon"
-				href="${request.static_url('tutorial:static/favicon.ico')}" />
-	<link rel="stylesheet"
-				href="${request.static_url('tutorial:static/pylons.css')}"
-				type="text/css" media="screen" charset="utf-8" />
-	<!--[if lte IE 6]>
-	<link rel="stylesheet"
-				href="${request.static_url('tutorial:static/ie6.css')}"
-				type="text/css" media="screen" charset="utf-8" />
-	<![endif]-->
+  <title>${page.__name__} - Pyramid tutorial wiki (based on
+    TurboGears 20-Minute Wiki)</title>
+  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+  <meta name="keywords" content="python web application" />
+  <meta name="description" content="pyramid web application" />
+  <link rel="shortcut icon"
+        href="${request.static_url('tutorial:static/favicon.ico')}" />
+  <link rel="stylesheet"
+        href="${request.static_url('tutorial:static/pylons.css')}"
+        type="text/css" media="screen" charset="utf-8" />
+  <!--[if lte IE 6]>
+  <link rel="stylesheet"
+        href="${request.static_url('tutorial:static/ie6.css')}"
+        type="text/css" media="screen" charset="utf-8" />
+  <![endif]-->
 </head>
 <body>
-	<div id="wrap">
-		<div id="top-small">
-			<div class="top-small align-center">
-				<div>
-					<img width="220" height="50" alt="pyramid"
-				src="${request.static_url('tutorial:static/pyramid-small.png')}" />
-				</div>
-			</div>
-		</div>
-		<div id="middle">
-			<div class="middle align-right">
-				<div id="left" class="app-welcome align-left">
-					Editing <b><span tal:replace="page.__name__">Page Name Goes
-						Here</span></b><br/>
-					You can return to the
-					<a href="${request.application_url}">FrontPage</a>.<br/>
-				</div>
-				<div id="right" class="app-welcome align-right"></div>
-			</div>
-		</div>
-		<div id="bottom">
-			<div class="bottom">
-				<form action="${save_url}" method="post">
-					<textarea name="body" tal:content="page.data" rows="10"
-										cols="60"/><br/>
-					<input type="submit" name="form.submitted" value="Save"/>
-				</form>
-			</div>
-		</div>
-	</div>
-	<div id="footer">
-		<div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
-	</div>
+  <div id="wrap">
+    <div id="top-small">
+      <div class="top-small align-center">
+        <div>
+          <img width="220" height="50" alt="pyramid"
+        src="${request.static_url('tutorial:static/pyramid-small.png')}" />
+        </div>
+      </div>
+    </div>
+    <div id="middle">
+      <div class="middle align-right">
+        <div id="left" class="app-welcome align-left">
+          Editing <b><span tal:replace="page.__name__">Page Name Goes
+            Here</span></b><br/>
+          You can return to the
+          <a href="${request.application_url}">FrontPage</a>.<br/>
+        </div>
+        <div id="right" class="app-welcome align-right"></div>
+      </div>
+    </div>
+    <div id="bottom">
+      <div class="bottom">
+        <form action="${save_url}" method="post">
+          <textarea name="body" tal:content="page.data" rows="10"
+                    cols="60"/><br/>
+          <input type="submit" name="form.submitted" value="Save"/>
+        </form>
+      </div>
+    </div>
+  </div>
+  <div id="footer">
+    <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
+  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt
index 712fd0737..d98420680 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt
@@ -1,75 +1,75 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" xmlns:tal="http://xml.zope.org/namespaces/tal">
 <head>
-	<title>The Pyramid Web Application Development Framework</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-	<meta name="keywords" content="python web application" />
-	<meta name="description" content="pyramid web application" />
-	<link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
-	<link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
-	<!--[if lte IE 6]>
-	<link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
-	<![endif]-->
+  <title>The Pyramid Web Application Development Framework</title>
+  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+  <meta name="keywords" content="python web application" />
+  <meta name="description" content="pyramid web application" />
+  <link rel="shortcut icon" href="${request.static_url('tutorial:static/favicon.ico')}" />
+  <link rel="stylesheet" href="${request.static_url('tutorial:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
+  <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
+  <!--[if lte IE 6]>
+  <link rel="stylesheet" href="${request.static_url('tutorial:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
+  <![endif]-->
 </head>
 <body>
-	<div id="wrap">
-		<div id="top">
-			<div class="top align-center">
-				<div><img src="${request.static_url('tutorial:static/pyramid.png')}" width="750" height="169" alt="pyramid"/></div>
-			</div>
-		</div>
-		<div id="middle">
-			<div class="middle align-center">
-				<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>
-		<div id="bottom">
-			<div class="bottom">
-				<div id="left" class="align-right">
-					<h2>Search documentation</h2>
-					<form method="get" action="http://docs.pylonsproject.org/projects/pyramid/dev/search.html">
-		      			<input type="text" id="q" name="q" value="" />
-		      			<input type="submit" id="x" value="Go" />
-		  			</form>
-				</div>
-				<div id="right" class="align-left">
-					<h2>Pyramid links</h2>
-					<ul class="links">
-						<li>
-							<a href="http://pylonsproject.org">Pylons Website</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation">API Documentation</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials">Tutorials</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history">Change History</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications">Sample Applications</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonsproject.org/projects/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>
-	<div id="footer">
-		<div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
-	</div>
+  <div id="wrap">
+    <div id="top">
+      <div class="top align-center">
+        <div><img src="${request.static_url('tutorial:static/pyramid.png')}" width="750" height="169" alt="pyramid"/></div>
+      </div>
+    </div>
+    <div id="middle">
+      <div class="middle align-center">
+        <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>
+    <div id="bottom">
+      <div class="bottom">
+        <div id="left" class="align-right">
+          <h2>Search documentation</h2>
+          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/dev/search.html">
+                <input type="text" id="q" name="q" value="" />
+                <input type="submit" id="x" value="Go" />
+            </form>
+        </div>
+        <div id="right" class="align-left">
+          <h2>Pyramid links</h2>
+          <ul class="links">
+            <li>
+              <a href="http://pylonsproject.org">Pylons Website</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation">API Documentation</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials">Tutorials</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history">Change History</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications">Sample Applications</a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/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>
+  <div id="footer">
+    <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
+  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/view.pt b/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
index 992c5aa43..9b0713330 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
@@ -1,60 +1,60 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-			xmlns:tal="http://xml.zope.org/namespaces/tal">
+      xmlns:tal="http://xml.zope.org/namespaces/tal">
 <head>
-	<title>${page.__name__} - Pyramid tutorial wiki (based on
-			TurboGears 20-Minute Wiki)</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-	<meta name="keywords" content="python web application" />
-	<meta name="description" content="pyramid web application" />
-	<link rel="shortcut icon"
-				href="${request.static_url('tutorial:static/favicon.ico')}" />
-	<link rel="stylesheet"
-				href="${request.static_url('tutorial:static/pylons.css')}"
-				type="text/css" media="screen" charset="utf-8" />
-	<!--[if lte IE 6]>
-	<link rel="stylesheet"
-				href="${request.static_url('tutorial:static/ie6.css')}"
-				type="text/css" media="screen" charset="utf-8" />
-	<![endif]-->
+  <title>${page.__name__} - Pyramid tutorial wiki (based on
+      TurboGears 20-Minute Wiki)</title>
+  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+  <meta name="keywords" content="python web application" />
+  <meta name="description" content="pyramid web application" />
+  <link rel="shortcut icon"
+        href="${request.static_url('tutorial:static/favicon.ico')}" />
+  <link rel="stylesheet"
+        href="${request.static_url('tutorial:static/pylons.css')}"
+        type="text/css" media="screen" charset="utf-8" />
+  <!--[if lte IE 6]>
+  <link rel="stylesheet"
+        href="${request.static_url('tutorial:static/ie6.css')}"
+        type="text/css" media="screen" charset="utf-8" />
+  <![endif]-->
 </head>
 <body>
-	<div id="wrap">
-		<div id="top-small">
-			<div class="top-small align-center">
-				<div>
-					<img width="220" height="50" alt="pyramid"
-				src="${request.static_url('tutorial:static/pyramid-small.png')}" />
-				</div>
-			</div>
-		</div>
-		<div id="middle">
-			<div class="middle align-right">
-				<div id="left" class="app-welcome align-left">
-					Viewing <b><span tal:replace="page.__name__">Page Name Goes
-					Here</span></b><br/>
-					You can return to the
-					<a href="${request.application_url}">FrontPage</a>.<br/>
-				</div>
-				<div id="right" class="app-welcome align-right"></div>
-			</div>
-		</div>
-		<div id="bottom">
-			<div class="bottom">
-				<div tal:replace="structure content">
-					Page text goes here.
-				</div>
-				<p>
-					<a tal:attributes="href edit_url" href="">
-						Edit this page
-					</a>
-				</p>
-			</div>
-		</div>
-	</div>
-	<div id="footer">
-		<div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
-	</div>
+  <div id="wrap">
+    <div id="top-small">
+      <div class="top-small align-center">
+        <div>
+          <img width="220" height="50" alt="pyramid"
+        src="${request.static_url('tutorial:static/pyramid-small.png')}" />
+        </div>
+      </div>
+    </div>
+    <div id="middle">
+      <div class="middle align-right">
+        <div id="left" class="app-welcome align-left">
+          Viewing <b><span tal:replace="page.__name__">Page Name Goes
+          Here</span></b><br/>
+          You can return to the
+          <a href="${request.application_url}">FrontPage</a>.<br/>
+        </div>
+        <div id="right" class="app-welcome align-right"></div>
+      </div>
+    </div>
+    <div id="bottom">
+      <div class="bottom">
+        <div tal:replace="structure content">
+          Page text goes here.
+        </div>
+        <p>
+          <a tal:attributes="href edit_url" href="">
+            Edit this page
+          </a>
+        </p>
+      </div>
+    </div>
+  </div>
+  <div id="footer">
+    <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
+  </div>
 </body>
 </html>
-- 
cgit v1.2.3


From 104e60aa9a739253e136afb1f9957667d68feac0 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Fri, 28 Jan 2011 11:20:34 -0500
Subject: docutils necessary as per tutorial flow

---
 docs/tutorials/wiki/src/models/setup.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/tutorials/wiki/src')

diff --git a/docs/tutorials/wiki/src/models/setup.py b/docs/tutorials/wiki/src/models/setup.py
index 3cd43d5d8..9538cbbff 100644
--- a/docs/tutorials/wiki/src/models/setup.py
+++ b/docs/tutorials/wiki/src/models/setup.py
@@ -12,6 +12,7 @@ requires = [
     'repoze.tm2>=1.0b1', # default_commit_veto
     'ZODB3',
     'WebError',
+    'docutils',
     ]
 
 setup(name='tutorial',
-- 
cgit v1.2.3


From 390459202759e1c04d31755b7e9a94c47ac90a23 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sat, 29 Jan 2011 00:36:29 -0500
Subject: fix too-long lines in tutorials

---
 docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt  | 3 ++-
 docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt | 3 ++-
 docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt  | 3 ++-
 docs/tutorials/wiki/src/basiclayout/development.ini               | 2 +-
 docs/tutorials/wiki/src/views/tutorial/templates/edit.pt          | 3 ++-
 docs/tutorials/wiki/src/views/tutorial/templates/view.pt          | 3 ++-
 6 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'docs/tutorials/wiki/src')

diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
index 62b9cad7e..f9da6c414 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
@@ -55,7 +55,8 @@
     </div>
   </div>
   <div id="footer">
-    <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
+    <div class="footer"
+         >&copy; Copyright 2008-2011, Agendaless Consulting.</div>
   </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
index eaf7123d7..64e592ea9 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
@@ -51,7 +51,8 @@
     </div>
   </div>
   <div id="footer">
-    <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
+    <div class="footer"
+         >&copy; Copyright 2008-2011, Agendaless Consulting.</div>
   </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
index 62f75da21..d207a0c23 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
@@ -58,7 +58,8 @@
     </div>
   </div>
   <div id="footer">
-    <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
+    <div class="footer"
+         >&copy; Copyright 2008-2011, 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 054720aa2..fcd444cf6 100644
--- a/docs/tutorials/wiki/src/basiclayout/development.ini
+++ b/docs/tutorials/wiki/src/basiclayout/development.ini
@@ -46,6 +46,6 @@ level = NOTSET
 formatter = generic
 
 [formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s
 
 # End logging configuration
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt b/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
index 9e6149188..6dbb0edde 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
@@ -51,7 +51,8 @@
     </div>
   </div>
   <div id="footer">
-    <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
+    <div class="footer"
+         >&copy; Copyright 2008-2011, Agendaless Consulting.</div>
   </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/view.pt b/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
index 9b0713330..537ae3a15 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
@@ -54,7 +54,8 @@
     </div>
   </div>
   <div id="footer">
-    <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
+    <div class="footer"
+         >&copy; Copyright 2008-2011, Agendaless Consulting.</div>
   </div>
 </body>
 </html>
-- 
cgit v1.2.3


From 9afa52f0783d77b19e6ff0a509c5d556950a8a46 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sat, 29 Jan 2011 02:34:40 -0500
Subject: - Added ``egg:repoze.retry#retry`` middleware to the WSGI pipeline in
 ZODB   templates (retry ZODB conflict errors which occur in normal
 operations).

---
 docs/tutorials/wiki/src/authorization/development.ini | 1 +
 docs/tutorials/wiki/src/authorization/production.ini  | 1 +
 docs/tutorials/wiki/src/authorization/setup.py        | 1 +
 docs/tutorials/wiki/src/basiclayout/development.ini   | 1 +
 docs/tutorials/wiki/src/basiclayout/production.ini    | 1 +
 docs/tutorials/wiki/src/basiclayout/setup.py          | 1 +
 docs/tutorials/wiki/src/models/development.ini        | 1 +
 docs/tutorials/wiki/src/models/production.ini         | 1 +
 docs/tutorials/wiki/src/models/setup.py               | 1 +
 docs/tutorials/wiki/src/views/development.ini         | 1 +
 docs/tutorials/wiki/src/views/production.ini          | 1 +
 docs/tutorials/wiki/src/views/setup.py                | 1 +
 12 files changed, 12 insertions(+)

(limited to 'docs/tutorials/wiki/src')

diff --git a/docs/tutorials/wiki/src/authorization/development.ini b/docs/tutorials/wiki/src/authorization/development.ini
index 054720aa2..1ba746d0e 100644
--- a/docs/tutorials/wiki/src/authorization/development.ini
+++ b/docs/tutorials/wiki/src/authorization/development.ini
@@ -12,6 +12,7 @@ zodb_uri = file://%(here)s/Data.fs?connection_cache_size=20000
 pipeline =
     egg:WebError#evalerror
     egg:repoze.zodbconn#closer
+    egg:repoze.retry#retry
     tm
     tutorial
 
diff --git a/docs/tutorials/wiki/src/authorization/production.ini b/docs/tutorials/wiki/src/authorization/production.ini
index 458064388..5c47ade9b 100644
--- a/docs/tutorials/wiki/src/authorization/production.ini
+++ b/docs/tutorials/wiki/src/authorization/production.ini
@@ -30,6 +30,7 @@ commit_veto = repoze.tm:default_commit_veto
 pipeline =
     weberror
     egg:repoze.zodbconn#closer
+    egg:repoze.retry#retry
     tm
     tutorial
 
diff --git a/docs/tutorials/wiki/src/authorization/setup.py b/docs/tutorials/wiki/src/authorization/setup.py
index 38f913961..adfa70c9f 100644
--- a/docs/tutorials/wiki/src/authorization/setup.py
+++ b/docs/tutorials/wiki/src/authorization/setup.py
@@ -10,6 +10,7 @@ requires = [
     'pyramid',
     'repoze.zodbconn',
     'repoze.tm2>=1.0b1', # default_commit_veto
+    'repoze.retry',
     'ZODB3',
     'WebError',
     'docutils',
diff --git a/docs/tutorials/wiki/src/basiclayout/development.ini b/docs/tutorials/wiki/src/basiclayout/development.ini
index fcd444cf6..555010bed 100644
--- a/docs/tutorials/wiki/src/basiclayout/development.ini
+++ b/docs/tutorials/wiki/src/basiclayout/development.ini
@@ -12,6 +12,7 @@ zodb_uri = file://%(here)s/Data.fs?connection_cache_size=20000
 pipeline =
     egg:WebError#evalerror
     egg:repoze.zodbconn#closer
+    egg:repoze.retry#retry
     tm
     tutorial
 
diff --git a/docs/tutorials/wiki/src/basiclayout/production.ini b/docs/tutorials/wiki/src/basiclayout/production.ini
index 458064388..5c47ade9b 100644
--- a/docs/tutorials/wiki/src/basiclayout/production.ini
+++ b/docs/tutorials/wiki/src/basiclayout/production.ini
@@ -30,6 +30,7 @@ commit_veto = repoze.tm:default_commit_veto
 pipeline =
     weberror
     egg:repoze.zodbconn#closer
+    egg:repoze.retry#retry
     tm
     tutorial
 
diff --git a/docs/tutorials/wiki/src/basiclayout/setup.py b/docs/tutorials/wiki/src/basiclayout/setup.py
index cb3b92347..2d540d65b 100644
--- a/docs/tutorials/wiki/src/basiclayout/setup.py
+++ b/docs/tutorials/wiki/src/basiclayout/setup.py
@@ -10,6 +10,7 @@ requires = [
     'pyramid',
     'repoze.zodbconn',
     'repoze.tm2>=1.0b1', # default_commit_veto
+    'repoze.retry',
     'ZODB3',
     'WebError',
     ]
diff --git a/docs/tutorials/wiki/src/models/development.ini b/docs/tutorials/wiki/src/models/development.ini
index 054720aa2..1ba746d0e 100644
--- a/docs/tutorials/wiki/src/models/development.ini
+++ b/docs/tutorials/wiki/src/models/development.ini
@@ -12,6 +12,7 @@ zodb_uri = file://%(here)s/Data.fs?connection_cache_size=20000
 pipeline =
     egg:WebError#evalerror
     egg:repoze.zodbconn#closer
+    egg:repoze.retry#retry
     tm
     tutorial
 
diff --git a/docs/tutorials/wiki/src/models/production.ini b/docs/tutorials/wiki/src/models/production.ini
index 458064388..5c47ade9b 100644
--- a/docs/tutorials/wiki/src/models/production.ini
+++ b/docs/tutorials/wiki/src/models/production.ini
@@ -30,6 +30,7 @@ commit_veto = repoze.tm:default_commit_veto
 pipeline =
     weberror
     egg:repoze.zodbconn#closer
+    egg:repoze.retry#retry
     tm
     tutorial
 
diff --git a/docs/tutorials/wiki/src/models/setup.py b/docs/tutorials/wiki/src/models/setup.py
index 9538cbbff..daa5e5eb1 100644
--- a/docs/tutorials/wiki/src/models/setup.py
+++ b/docs/tutorials/wiki/src/models/setup.py
@@ -10,6 +10,7 @@ requires = [
     'pyramid',
     'repoze.zodbconn',
     'repoze.tm2>=1.0b1', # default_commit_veto
+    'repoze.retry',
     'ZODB3',
     'WebError',
     'docutils',
diff --git a/docs/tutorials/wiki/src/views/development.ini b/docs/tutorials/wiki/src/views/development.ini
index 054720aa2..1ba746d0e 100644
--- a/docs/tutorials/wiki/src/views/development.ini
+++ b/docs/tutorials/wiki/src/views/development.ini
@@ -12,6 +12,7 @@ zodb_uri = file://%(here)s/Data.fs?connection_cache_size=20000
 pipeline =
     egg:WebError#evalerror
     egg:repoze.zodbconn#closer
+    egg:repoze.retry#retry
     tm
     tutorial
 
diff --git a/docs/tutorials/wiki/src/views/production.ini b/docs/tutorials/wiki/src/views/production.ini
index 458064388..5c47ade9b 100644
--- a/docs/tutorials/wiki/src/views/production.ini
+++ b/docs/tutorials/wiki/src/views/production.ini
@@ -30,6 +30,7 @@ commit_veto = repoze.tm:default_commit_veto
 pipeline =
     weberror
     egg:repoze.zodbconn#closer
+    egg:repoze.retry#retry
     tm
     tutorial
 
diff --git a/docs/tutorials/wiki/src/views/setup.py b/docs/tutorials/wiki/src/views/setup.py
index 9538cbbff..daa5e5eb1 100644
--- a/docs/tutorials/wiki/src/views/setup.py
+++ b/docs/tutorials/wiki/src/views/setup.py
@@ -10,6 +10,7 @@ requires = [
     'pyramid',
     'repoze.zodbconn',
     'repoze.tm2>=1.0b1', # default_commit_veto
+    'repoze.retry',
     'ZODB3',
     'WebError',
     'docutils',
-- 
cgit v1.2.3


From 15e6f6ab79ec9f8ccb854135ec51da859059e6a3 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sun, 30 Jan 2011 17:26:35 -0500
Subject: fix too-long lines

---
 docs/tutorials/wiki/src/views/development.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/tutorials/wiki/src')

diff --git a/docs/tutorials/wiki/src/views/development.ini b/docs/tutorials/wiki/src/views/development.ini
index 1ba746d0e..555010bed 100644
--- a/docs/tutorials/wiki/src/views/development.ini
+++ b/docs/tutorials/wiki/src/views/development.ini
@@ -47,6 +47,6 @@ level = NOTSET
 formatter = generic
 
 [formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s
 
 # End logging configuration
-- 
cgit v1.2.3