Merge upstream master

1 files changed, 36 insertions, 9 deletions

diff --git a/README.rst b/README.rst
index e99133441..6ef75e899 100644
--- a/README.rst
+++ b/README.rst
@@ -3,6 +3,7 @@ Pyramid
 
 .. image:: https://travis-ci.org/Pylons/pyramid.png?branch=master
         :target: https://travis-ci.org/Pylons/pyramid
+        :alt: Master Travis CI Status
 
 .. image:: https://readthedocs.org/projects/pyramid/badge/?version=master
         :target: http://docs.pylonsproject.org/projects/pyramid/en/master/
@@ -16,17 +17,43 @@ Pyramid
         :target: https://webchat.freenode.net/?channels=pyramid
         :alt: IRC Freenode
 
-Pyramid is a small, fast, down-to-earth, open source Python web framework.
-It makes real-world web application development and
-deployment more fun, more predictable, and more productive.
+`Pyramid <https://trypyramid.com/>`_ is a small, fast, down-to-earth, open
+source Python web framework. It makes real-world web application development
+and deployment more fun, more predictable, and more productive.
 
-Pyramid is produced by the `Pylons Project <http://pylonsproject.org/>`_.
+.. code-block:: python
+
+   from wsgiref.simple_server import make_server
+   from pyramid.config import Configurator
+   from pyramid.response import Response
+
+   def hello_world(request):
+       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()
+       server = make_server('0.0.0.0', 8080, app)
+       server.serve_forever()
+
+Pyramid is a project of the `Pylons Project <http://www.pylonsproject.org/>`_.
 
 Support and Documentation
 -------------------------
 
-See the `Pylons Project website <http://pylonsproject.org/>`_ to view
-documentation, report bugs, and obtain support.
+See `Pyramid Support and Development
+<http://docs.pylonsproject.org/projects/pyramid/en/latest/#support-and-development>`_
+for documentation, reporting bugs, and getting support.
+
+Developing and Contributing
+---------------------------
+
+See `HACKING.txt <https://github.com/Pylons/pyramid/blob/master/HACKING.txt>`_ and
+`contributing.md <https://github.com/Pylons/pyramid/blob/master/contributing.md>`_
+for guidelines on running tests, adding features, coding style, and updating
+documentation when developing in or contributing to Pyramid.
 
 License
 -------
@@ -37,6 +64,6 @@ Pyramid is offered under the BSD-derived `Repoze Public License
 Authors
 -------
 
-Pyramid is made available by `Agendaless Consulting <http://agendaless.com>`_
-and a team of contributors.
-
+Pyramid is made available by `Agendaless Consulting <https://agendaless.com>`_
+and a team of `contributors
+<https://github.com/Pylons/pyramid/graphs/contributors>`_.