Permalink
Browse files

Merge branch 'pycon/feature.external-templates' of github.com:Pylons/…

…pyramid into pycon/feature.external-templates

Conflicts:
	docs/tutorials/wiki2/definingviews.rst
  • Loading branch information...
2 parents 9466023 + 425f508 commit 53c9eed8799a925f47600a8b3ee8174892e62f63 @reedobrien reedobrien committed Mar 14, 2012
Showing with 8 additions and 5 deletions.
  1. +8 −5 docs/tutorials/wiki2/definingviews.rst
View
13 docs/tutorials/wiki2/definingviews.rst
@@ -26,7 +26,7 @@ Declaring Dependencies in Our ``setup.py`` File
The view code in our application will depend on a package which is not a
dependency of the original "tutorial" application. The original "tutorial"
application was generated by the ``pcreate`` command; it doesn't know
-about our custom application requirements.
+about our custom application requirements.
We need to add a dependency on the ``docutils`` package to our ``tutorial``
package's ``setup.py`` file by assigning this dependency to the ``requires`` parameter in ``setup()``.
@@ -35,11 +35,14 @@ Open ``tutorial/setup.py`` and edit it to look like the following:
.. literalinclude:: src/views/setup.py
:linenos:
+ :emphasize-lines: 17
:language: python
:emphasize-lines: 17
(Only the highlighted line needs to be added.)
+(Only the highlighted line needs to be added)
+
Running ``setup.py develop``
============================
@@ -86,7 +89,7 @@ added when we originally rendered the ``alchemy`` scaffold. It was only an
example and isn't relevant to our application.
Then we added four :term:`view callable` functions to our ``views.py``
-module:
+module:
* ``view_wiki()`` - Displays the wiki itself. It will answer on the root URL.
* ``view_page()`` - Displays an individual page.
@@ -107,7 +110,7 @@ afterward.
The ``view_wiki`` view function
-------------------------------
-``view_wiki()`` is the :term:`default view` that gets called when a request
+``view_wiki()`` is the :term:`default view` that gets called when a request
is made to the root URL of our wiki. It always redirects to
a URL which represents the path to our "FrontPage".
@@ -121,8 +124,8 @@ a URL which represents the path to our "FrontPage".
the :class:`pyramid.interfaces.IResponse` interface like
:class:`pyramid.response.Response` does).
-It uses the :meth:`pyramid.request.Request.route_url` API to construct a
-URL to the ``FrontPage`` page (e.g. ``http://localhost:6543/FrontPage``), which
+It uses the :meth:`pyramid.request.Request.route_url` API to construct a
+URL to the ``FrontPage`` page (e.g. ``http://localhost:6543/FrontPage``), which
is used as the "location" of the HTTPFound response, forming an HTTP redirect.
The ``view_page`` view function

0 comments on commit 53c9eed

Please sign in to comment.