summaryrefslogtreecommitdiff
path: root/README.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2016-02-07 16:34:46 -0500
committerChris McDonough <chrism@plope.com>2016-02-07 16:34:46 -0500
commitdf7a123a847e2243f38688c033f06200382ba139 (patch)
treecc8e032c2a85d9fee45e68f7f3501046c8bec8ed /README.rst
parent5cd91621668807f9b66811fe57a04fba96e7458a (diff)
parented04017d5a8e82db2e46412f841c55d83ef062b0 (diff)
downloadpyramid-df7a123a847e2243f38688c033f06200382ba139.tar.gz
pyramid-df7a123a847e2243f38688c033f06200382ba139.tar.bz2
pyramid-df7a123a847e2243f38688c033f06200382ba139.zip
Merge branch 'master' of github.com:Pylons/pyramid
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
-------