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

2 files changed, 6 insertions, 6 deletions

diff --git a/docs/quick_tutorial/databases/tutorial/tests.py b/docs/quick_tutorial/databases/tutorial/tests.py
index e18e70c8c..11e747d15 100644
--- a/docs/quick_tutorial/databases/tutorial/tests.py
+++ b/docs/quick_tutorial/databases/tutorial/tests.py
@@ -40,16 +40,14 @@ class WikiViewTests(unittest.TestCase):
 
 class WikiFunctionalTests(unittest.TestCase):
     def setUp(self):
-        self.session = _initTestingDB()
-        self.config = testing.setUp()
         from pyramid.paster import get_app
         app = get_app('development.ini')
         from webtest import TestApp
         self.testapp = TestApp(app)
 
     def tearDown(self):
-        self.session.remove()
-        testing.tearDown()
+        from .models import DBSession
+        DBSession.remove()
 
     def test_it(self):
         res = self.testapp.get('/', status=200)
diff --git a/docs/quick_tutorial/databases/tutorial/wikipage_addedit.pt b/docs/quick_tutorial/databases/tutorial/wikipage_addedit.pt
index d1fea0d7f..01955ef72 100644
--- a/docs/quick_tutorial/databases/tutorial/wikipage_addedit.pt
+++ b/docs/quick_tutorial/databases/tutorial/wikipage_addedit.pt
@@ -4,10 +4,12 @@
     <title>WikiPage: Add/Edit</title>
     <tal:block tal:repeat="reqt view.reqts['css']">
         <link rel="stylesheet" type="text/css"
-              href="${request.static_url('deform:static/' + reqt)}"/>
+                href="${request.static_url(reqt)}">
     </tal:block>
+    <script type="text/javascript"
+          src="${request.static_url('deform:static/scripts/jquery-2.0.3.min.js')}"></script>
     <tal:block tal:repeat="reqt view.reqts['js']">
-        <script src="${request.static_url('deform:static/' + reqt)}"
+        <script src="${request.static_url(reqt)}"
                 type="text/javascript"></script>
     </tal:block>
 </head>