From 07299bff4bf643456502fa39b9418882316815d7 Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Fri, 14 Jan 2011 17:39:37 -0500
Subject: Added tab-width: 2 to literalinclude to see if it formats better :)

---
 docs/tutorials/wiki/definingviews.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/tutorials/wiki')

diff --git a/docs/tutorials/wiki/definingviews.rst b/docs/tutorials/wiki/definingviews.rst
index 90768f320..fe0072c2a 100644
--- a/docs/tutorials/wiki/definingviews.rst
+++ b/docs/tutorials/wiki/definingviews.rst
@@ -231,6 +231,7 @@ the below:
 
 .. literalinclude:: src/views/tutorial/templates/view.pt
    :language: xml
+   :tab-width: 2
 
 .. note:: The names available for our use in a template are always those that
    are present in the dictionary returned by the view callable.  But our
-- 
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)
---
 docs/tutorials/wiki/authorization.rst              |  3 ++
 docs/tutorials/wiki/definingviews.rst              |  2 ++
 .../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 +-
 10 files changed, 126 insertions(+), 74 deletions(-)

(limited to 'docs/tutorials/wiki')

diff --git a/docs/tutorials/wiki/authorization.rst b/docs/tutorials/wiki/authorization.rst
index ee86eb543..5e45c070e 100644
--- a/docs/tutorials/wiki/authorization.rst
+++ b/docs/tutorials/wiki/authorization.rst
@@ -137,6 +137,7 @@ referred to within the login view we just added to ``login.py``.
 
 .. literalinclude:: src/authorization/tutorial/templates/login.pt
    :language: xml
+   :tab-width: 2
 
 Change ``view.pt`` and ``edit.pt``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -281,12 +282,14 @@ Our ``edit.pt`` template will look something like this when we're done:
 .. literalinclude:: src/authorization/tutorial/templates/edit.pt
    :linenos:
    :language: xml
+   :tab-width: 2
 
 Our ``view.pt`` template will look something like this when we're done:
 
 .. literalinclude:: src/authorization/tutorial/templates/view.pt
    :linenos:
    :language: xml
+   :tab-width: 2
 
 Revisiting the Application
 ---------------------------
diff --git a/docs/tutorials/wiki/definingviews.rst b/docs/tutorials/wiki/definingviews.rst
index 90768f320..7ad5e57cb 100644
--- a/docs/tutorials/wiki/definingviews.rst
+++ b/docs/tutorials/wiki/definingviews.rst
@@ -231,6 +231,7 @@ the below:
 
 .. literalinclude:: src/views/tutorial/templates/view.pt
    :language: xml
+   :tab-width: 2
 
 .. note:: The names available for our use in a template are always those that
    are present in the dictionary returned by the view callable.  But our
@@ -257,6 +258,7 @@ below:
 
 .. literalinclude:: src/views/tutorial/templates/edit.pt
    :language: xml
+   :tab-width: 2
 
 Static Assets
 -------------
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