summaryrefslogtreecommitdiff
path: root/README.rst
diff options
context:
space:
mode:
authorcewing <cris@crisewing.com>2017-05-22 12:09:41 -0700
committercewing <cris@crisewing.com>2017-05-22 12:09:41 -0700
commitb033b966420b673bf0222c3576d3238773433d0f (patch)
treeba5d63e118ba5ebbad901b5c1558adff04224686 /README.rst
parent7c680930d09d20bfa05249e01553e6488e61f1ca (diff)
parent8c4d422965b633f31967ceed1e6cc25cc616d0bf (diff)
downloadpyramid-b033b966420b673bf0222c3576d3238773433d0f.tar.gz
pyramid-b033b966420b673bf0222c3576d3238773433d0f.tar.bz2
pyramid-b033b966420b673bf0222c3576d3238773433d0f.zip
Merge branch 'master' into issue.2614
Diffstat (limited to 'README.rst')
-rw-r--r--README.rst22
1 files changed, 11 insertions, 11 deletions
diff --git a/README.rst b/README.rst
index 6ef75e899..5f42115df 100644
--- a/README.rst
+++ b/README.rst
@@ -1,16 +1,16 @@
Pyramid
=======
-.. image:: https://travis-ci.org/Pylons/pyramid.png?branch=master
+.. image:: https://travis-ci.org/Pylons/pyramid.png?branch=1.9-branch
:target: https://travis-ci.org/Pylons/pyramid
- :alt: Master Travis CI Status
+ :alt: master Travis CI Status
-.. image:: https://readthedocs.org/projects/pyramid/badge/?version=master
- :target: http://docs.pylonsproject.org/projects/pyramid/en/master/
+.. image:: https://readthedocs.org/projects/pyramid/badge/?version=1.9-branch
+ :target: http://docs.pylonsproject.org/projects/pyramid/en/1.9-branch/
:alt: Master Documentation Status
-.. image:: https://readthedocs.org/projects/pyramid/badge/?version=latest
- :target: http://docs.pylonsproject.org/projects/pyramid/en/latest/
+.. image:: https://readthedocs.org/projects/pyramid/badge/?version=1.9-branch
+ :target: http://docs.pylonsproject.org/projects/pyramid/en/1.9-branch/
:alt: Latest Documentation Status
.. image:: https://img.shields.io/badge/irc-freenode-blue.svg
@@ -31,14 +31,14 @@ and deployment more fun, more predictable, and more productive.
return Response('Hello %(name)s!' % request.matchdict)
if __name__ == '__main__':
- config = Configurator()
- config.add_route('hello', '/hello/{name}')
- config.add_view(hello_world, route_name='hello')
- app = config.make_wsgi_app()
+ with Configurator() as config:
+ config.add_route('hello', '/hello/{name}')
+ config.add_view(hello_world, route_name='hello')
+ app = config.make_wsgi_app()
server = make_server('0.0.0.0', 8080, app)
server.serve_forever()
-Pyramid is a project of the `Pylons Project <http://www.pylonsproject.org/>`_.
+Pyramid is a project of the `Pylons Project <http://pylonsproject.org/>`_.
Support and Documentation
-------------------------