Merge pull request #1723 from stevepiercy/master

include tests; grammar; correct title tag
Pylons · May 22, 2015 · 6b9c295 · 6b9c295
2 parents ea455d3 + fee4d40
commit 6b9c295
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 9 deletions.
diff --git a/docs/quick_tutorial/more_view_classes.rst b/docs/quick_tutorial/more_view_classes.rst
@@ -95,6 +95,23 @@ Steps
    .. literalinclude:: more_view_classes/tutorial/delete.pt
     :language: html
 
+#. Our tests in ``more_view_classes/tutorial/tests.py`` fail, so let's modify
+   them:
+
+   .. literalinclude:: more_view_classes/tutorial/tests.py
+    :linenos:
+
+#. Now run the tests:
+
+   .. code-block:: bash
+
+    $ $VENV/bin/nosetests tutorial
+    .
+    ----------------------------------------------------------------------
+    Ran 2 tests in 0.248s
+
+    OK
+
 #. Run your Pyramid application with:
 
    .. code-block:: bash
@@ -125,7 +142,7 @@ Specifically:
 - The fourth view is returned when clicking on a button such
   as ``<input type="submit" name="form.delete" value="Delete"/>``.
 
-In this step we show using the following information as criteria to
+In this step we show, using the following information as criteria, how to
 decide which view to use:
 
 - Method of the HTTP request (``GET``, ``POST``, etc.)

diff --git a/docs/quick_tutorial/more_view_classes/tutorial/delete.pt b/docs/quick_tutorial/more_view_classes/tutorial/delete.pt
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>Quick Tour: ${page_title}</title>
+    <title>Quick Tutorial: ${page_title}</title>
 </head>
 <body>
 <h1>${view.view_name} - ${page_title}</h1>
 </body>
-</html>
+</html>
diff --git a/docs/quick_tutorial/more_view_classes/tutorial/edit.pt b/docs/quick_tutorial/more_view_classes/tutorial/edit.pt
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>Quick Tour: ${view.view_name} - ${page_title}</title>
+    <title>Quick Tutorial: ${view.view_name} - ${page_title}</title>
 </head>
 <body>
 <h1>${view.view_name} - ${page_title}</h1>
 <p>You submitted <code>${new_name}</code></p>
 </body>
-</html>
+</html>
diff --git a/docs/quick_tutorial/more_view_classes/tutorial/hello.pt b/docs/quick_tutorial/more_view_classes/tutorial/hello.pt
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>Quick Tour: ${view.view_name} - ${page_title}</title>
+    <title>Quick Tutorial: ${view.view_name} - ${page_title}</title>
 </head>
 <body>
 <h1>${view.view_name} - ${page_title}</h1>
@@ -13,4 +13,4 @@
     <input type="submit" name="form.delete" value="Delete"/>
 </form>
 </body>
-</html>
+</html>
diff --git a/docs/quick_tutorial/more_view_classes/tutorial/home.pt b/docs/quick_tutorial/more_view_classes/tutorial/home.pt
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>Quick Tour: ${view.view_name} - ${page_title}</title>
+    <title>Quick Tutorial: ${view.view_name} - ${page_title}</title>
 </head>
 <body>
 <h1>${view.view_name} - ${page_title}</h1>
 
 <p>Go to the <a href="${request.route_url('hello', first='jane',
         last='doe')}">form</a>.</p>
 </body>
-</html>
+</html>