summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/basiclayout.rst
diff options
context:
space:
mode:
authorCarlos de la Guardia <cguardia@yahoo.com>2011-06-07 01:54:50 -0500
committerCarlos de la Guardia <cguardia@yahoo.com>2011-06-07 01:54:50 -0500
commitfd5203000d4d051b51f804af023aefe59b832029 (patch)
treef92f1f163aed0d2c282fb674069f987fe4dfba47 /docs/tutorials/wiki2/basiclayout.rst
parenta5713863a80a493a1485057609578b907d04c770 (diff)
parentdf75cee020e49cc4668448b83e0617b14904bfa2 (diff)
downloadpyramid-fd5203000d4d051b51f804af023aefe59b832029.tar.gz
pyramid-fd5203000d4d051b51f804af023aefe59b832029.tar.bz2
pyramid-fd5203000d4d051b51f804af023aefe59b832029.zip
Merge remote branch 'cito/master'
Diffstat (limited to 'docs/tutorials/wiki2/basiclayout.rst')
-rw-r--r--docs/tutorials/wiki2/basiclayout.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index 82e112c64..6151e0e25 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -92,7 +92,7 @@ use :meth:`pyramid.config.Configurator.add_view` in :term:`URL dispatch` to
register views for the routes, mapping your patterns to code:
.. literalinclude:: src/basiclayout/tutorial/__init__.py
- :lines: 14
+ :lines: 14-15
:language: py
The first positional ``add_view`` argument ``tutorial.views.my_view`` is the
@@ -102,7 +102,7 @@ which returns a response or a dictionary. This view also names a
``renderer``, which is a template which lives in the ``templates``
subdirectory of the package. When the ``tutorial.views.my_view`` view
returns a dictionary, a :term:`renderer` will use this template to create a
-response. This
+response.
Finally, we use the :meth:`pyramid.config.Configurator.make_wsgi_app`
method to return a :term:`WSGI` application:
@@ -133,7 +133,7 @@ Let's take a look. First, we need some imports to support later code.
:linenos:
:language: py
-Next we set up a SQLAlchemy "DBSession" object:
+Next we set up a SQLAlchemy "DBSession" object:
.. literalinclude:: src/basiclayout/tutorial/models.py
:lines: 15-16