Merge branch '1.3-branch' of github.com:Pylons/pyramid into 1.3-branch

Chris McDonough

2012-01-05 f38fc45b21f7cad35bc9920a25733880d1ef1a9e

Merge branch '1.3-branch' of github.com:Pylons/pyramid into 1.3-branch

 docs/narr/configuration.rst

@@ -46,6 +46,7 @@
   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 @@
      :linenos:

      from wsgiref.simple_server import make_server
      from pyramid.config import Configurator
      from pyramid.response import Response
      from pyramid.view import view_config