summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-07-24 01:40:54 -0400
committerChris McDonough <chrism@plope.com>2011-07-24 01:40:54 -0400
commit695dad38bd13514482ea324ba1196dc5d9bab9f6 (patch)
tree7d2858e50d28a4d3c41c995ea8b5ba0e080f5fe7 /docs
parent47525f0359bee8db346f5dbf774e4974c69fd2a9 (diff)
parent84bd9544083c38ded264b58f13958ab945c92e5e (diff)
downloadpyramid-695dad38bd13514482ea324ba1196dc5d9bab9f6.tar.gz
pyramid-695dad38bd13514482ea324ba1196dc5d9bab9f6.tar.bz2
pyramid-695dad38bd13514482ea324ba1196dc5d9bab9f6.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/firstapp.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/firstapp.rst b/docs/narr/firstapp.rst
index 6c53f3de0..66632e123 100644
--- a/docs/narr/firstapp.rst
+++ b/docs/narr/firstapp.rst
@@ -153,7 +153,7 @@ defined imports and function definitions, placed within the confines of an
app = config.make_wsgi_app()
serve(app, host='0.0.0.0')
-Let's break this down this piece-by-piece.
+Let's break this down piece-by-piece.
Configurator Construction
~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -182,7 +182,7 @@ The ``config = Configurator()`` line above creates an instance of the
:class:`~pyramid.config.Configurator` class. The resulting ``config`` object
represents an API which the script uses to configure this particular
:app:`Pyramid` application. Methods called on the Configurator will cause
-registrations to be made in a :term:`application registry` associated with
+registrations to be made in an :term:`application registry` associated with
the application.
.. _adding_configuration: