summaryrefslogtreecommitdiff
path: root/docs/index.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 /docs/index.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 'docs/index.rst')
-rw-r--r--docs/index.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/index.rst b/docs/index.rst
index 7b1c46b70..0dc476e46 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -6,7 +6,7 @@ The Pyramid Web Application Development Framework
:app:`Pyramid` is a small, fast, down-to-earth Python web application
development framework. It is developed as part of the `Pylons Project
-<http://docs.pylonshq.com/>`_. It is licensed under a `BSD-like license
+<http://docs.pylonsproject.org/>`_. It is licensed under a `BSD-like license
<http://repoze.org/license.html>`_.
.. note::
@@ -175,7 +175,7 @@ commenting, and file uploads. See the `KARL site
Support and Development
=======================
-The `Pylons Project web site <http://docs.pylonshq.com/>`_ is the main online
+The `Pylons Project web site <http://pylonsproject.org/>`_ is the main online
source of :app:`Pyramid` support and development information.
To report bugs, use the `issue tracker
@@ -196,7 +196,7 @@ To check out the trunk via ``git``, use this command:
To find out how to become a contributor to :app:`Pyramid`, please see the
`contributor's section of the documentation
-<http://docs.pylonshq.com/index.html#contributing>`_.
+<http://docs.pylonsproject.org/index.html#contributing>`_.
Index and Glossary
==================