summaryrefslogtreecommitdiff
path: root/docs/narr
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-01-05 08:34:56 -0500
committerChris McDonough <chrism@plope.com>2012-01-05 08:34:56 -0500
commitf38fc45b21f7cad35bc9920a25733880d1ef1a9e (patch)
tree4da4790f07f9ef280c1cd0989e6bebd9c068e5d1 /docs/narr
parentb78b082e3778bb0e0a7c30d4cf711764407e0dcf (diff)
parenta1751e1a522e331301955c7b540b26d988b51e64 (diff)
downloadpyramid-f38fc45b21f7cad35bc9920a25733880d1ef1a9e.tar.gz
pyramid-f38fc45b21f7cad35bc9920a25733880d1ef1a9e.tar.bz2
pyramid-f38fc45b21f7cad35bc9920a25733880d1ef1a9e.zip
Merge branch '1.3-branch' of github.com:Pylons/pyramid into 1.3-branch
Diffstat (limited to 'docs/narr')
-rw-r--r--docs/narr/configuration.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/narr/configuration.rst b/docs/narr/configuration.rst
index 37122e382..cd3dab099 100644
--- a/docs/narr/configuration.rst
+++ b/docs/narr/configuration.rst
@@ -46,6 +46,7 @@ applications, configured imperatively:
if __name__ == '__main__':
config = Configurator()
config.add_view(hello_world)
+ app = config.make_wsgi_app()
server = make_server('0.0.0.0', 8080, app)
server.serve_forever()
@@ -106,6 +107,7 @@ in a package and its subpackages. For example:
:linenos:
from wsgiref.simple_server import make_server
+ from pyramid.config import Configurator
from pyramid.response import Response
from pyramid.view import view_config