summaryrefslogtreecommitdiff
path: root/README.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-13 15:00:05 -0500
committerChris McDonough <chrism@plope.com>2011-01-13 15:00:05 -0500
commit05b22a41568de7f1783e76062e13bf52ed47a749 (patch)
tree2e8c1dc9ce2c8c6d0613c26ef573ae2c1e472e49 /README.rst
parent7c241987fa0f388c3c61a8b0a4a87ce9fafd8896 (diff)
parentf4fcd32e10f0d863ebc61fc09c81e02d103ffe2e (diff)
downloadpyramid-05b22a41568de7f1783e76062e13bf52ed47a749.tar.gz
pyramid-05b22a41568de7f1783e76062e13bf52ed47a749.tar.bz2
pyramid-05b22a41568de7f1783e76062e13bf52ed47a749.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 220dcbe73..acacd2422 100644
--- a/README.rst
+++ b/README.rst
@@ -5,7 +5,7 @@ Pyramid is a small, fast, down-to-earth, open source Python web development
framework. It makes real-world web application development and deployment
more fun, more predictable, and more productive.
-Pyramid is a `Pylons <http://docs.pylonshq.com/>`_ project, and underlies the
+Pyramid is a `Pylons <http://docs.pylonsproject.org/>`_ project, and underlies the
newest web frameworks produced by the Pylons community.
Pyramid was previously known as `repoze.bfg <http://bfg.repoze.org>`_.
@@ -13,7 +13,7 @@ Pyramid was previously known as `repoze.bfg <http://bfg.repoze.org>`_.
Support and Documentation
-------------------------
-See the `Pylons Project website <http://docs.pylonshq.com/>`_ to view
+See the `Pylons Project website <http://docs.pylonsproject.org/>`_ to view
documentation, report bugs, and obtain support.
License