summaryrefslogtreecommitdiff
path: root/README.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-07-03 01:36:19 -0400
committerChris McDonough <chrism@plope.com>2013-07-03 01:36:19 -0400
commitfc105d25af21589a5836c479684be0dc514adee3 (patch)
tree76fc77797b04f4a3d0316ae22d0aca5b2fabc035 /README.rst
parent050b71c19081d95c1fb8ed57a87fab7fa4dd3ab0 (diff)
parentd59440878b67b65e57c91c7b4aa8e7cbf943a729 (diff)
downloadpyramid-fc105d25af21589a5836c479684be0dc514adee3.tar.gz
pyramid-fc105d25af21589a5836c479684be0dc514adee3.tar.bz2
pyramid-fc105d25af21589a5836c479684be0dc514adee3.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'README.rst')
-rw-r--r--README.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/README.rst b/README.rst
index 4d427a13d..a3458028b 100644
--- a/README.rst
+++ b/README.rst
@@ -1,8 +1,8 @@
Pyramid
=======
-Pyramid is a small, fast, down-to-earth, open source Python web application
-development framework. It makes real-world web application development and
+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/>`_.