summaryrefslogtreecommitdiff
path: root/docs/narr/firstapp.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-01-01 21:05:48 -0500
committerChris McDonough <chrism@plope.com>2013-01-01 21:05:48 -0500
commit1a19bf74afc768db45c77604c2cd33cc26af34c1 (patch)
treece6cfba28f4ad75a89e34f51c3ba363e34e873a4 /docs/narr/firstapp.rst
parent96ab9f26990423f67045e5639a29579a1a76a71e (diff)
parente0062294430dd1d30d31b9f8c0a2e6e9060bcb76 (diff)
downloadpyramid-1a19bf74afc768db45c77604c2cd33cc26af34c1.tar.gz
pyramid-1a19bf74afc768db45c77604c2cd33cc26af34c1.tar.bz2
pyramid-1a19bf74afc768db45c77604c2cd33cc26af34c1.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/firstapp.rst')
-rw-r--r--docs/narr/firstapp.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/firstapp.rst b/docs/narr/firstapp.rst
index ccaa6e9e2..0b85d68d3 100644
--- a/docs/narr/firstapp.rst
+++ b/docs/narr/firstapp.rst
@@ -228,7 +228,7 @@ listens only on the ``127.0.0.1`` interface, which is problematic if you're
running the server on a remote system and you wish to access it with a web
browser from a local system. We also specify a TCP port number to listen on,
which is 8080, passing it as the second argument. The final argument is the
-``app`` object (a :term:`router`), which is the the application we wish to
+``app`` object (a :term:`router`), which is the application we wish to
serve. Finally, we call the server's ``serve_forever`` method, which starts
the main loop in which it will wait for requests from the outside world.