Merge pull request #921 from pzatrick/master

Updates to Wiki2

1 files changed, 9 insertions, 10 deletions

diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index eb2445864..6d6287126 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -132,11 +132,11 @@ Finally, ``main`` is finished configuring things, so it uses the
 View Declarations via ``views.py``
 ----------------------------------
 
-Mapping a :term:`route` to code that will be executed when a match for
-the route's pattern occurs is done by registering a :term:`view
-configuration`. Our application uses the
-:meth:`pyramid.view.view_config` decorator to map view callables to
-each route, thereby mapping URL patterns to code.
+Arguably, the main function of a web framework is mapping each URL
+patterns, see :term:`route`, to code, see :term:`view callable`, that is 
+executed when the requested URL matches the corresponding :term:`route`. Our 
+application uses the :meth:`pyramid.view.view_config` decorator to perform 
+this mapping.
 
 Open ``tutorial/tutorial/views.py``.  It should already contain the following:
 
@@ -228,11 +228,10 @@ To give a simple example of a  model class, we define one named ``MyModel``:
 
 Our example model has an ``__init__`` method that takes two arguments
 (``name``, and ``value``).  It stores these values as ``self.name`` and
-``self.value``
-within the ``__init__`` function itself.  The ``MyModel`` class also has a
-``__tablename__`` attribute.  This informs SQLAlchemy which table to use to
-store the data representing instances of this class.
+``self.value`` within the ``__init__`` function itself.  The ``MyModel`` class 
+also has a ``__tablename__`` attribute.  This informs SQLAlchemy which table 
+to use to store the data representing instances of this class.
 
-That's about all there is to it to models, views, and initialization code in
+That's about all there is to it with models, views, and initialization code in
 our stock application.