summaryrefslogtreecommitdiff
path: root/README.rst
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2016-01-03 02:03:24 -0700
committerBert JW Regeer <bertjw@regeer.org>2016-01-03 02:03:24 -0700
commit30ae71b4a7ad97a649165374a75a70f4b64ae25c (patch)
treeb8a2cd06ff0130fd31b702862db2e46d39cd4e71 /README.rst
parent504027873ab0e1b15601e2d1900ef8a4469f6a43 (diff)
parent5558386fd1a6181b2e8ad06659049c055a7ed023 (diff)
downloadpyramid-30ae71b4a7ad97a649165374a75a70f4b64ae25c.tar.gz
pyramid-30ae71b4a7ad97a649165374a75a70f4b64ae25c.tar.bz2
pyramid-30ae71b4a7ad97a649165374a75a70f4b64ae25c.zip
Merge branch 'master' into feature/configurable-view-deriver
Diffstat (limited to 'README.rst')
-rw-r--r--README.rst13
1 files changed, 10 insertions, 3 deletions
diff --git a/README.rst b/README.rst
index e99133441..2237d9950 100644
--- a/README.rst
+++ b/README.rst
@@ -16,9 +16,9 @@ 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 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/>`_.
@@ -28,6 +28,13 @@ Support and Documentation
See the `Pylons Project website <http://pylonsproject.org/>`_ to view
documentation, report bugs, and obtain support.
+Developing and Contributing
+---------------------------
+
+See ``HACKING.txt`` and ``contributing.md`` for guidelines for running tests,
+adding features, coding style, and updating documentation when developing in or
+contributing to Pyramid.
+
License
-------