summaryrefslogtreecommitdiff
path: root/docs/conventions.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/conventions.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/conventions.rst')
-rw-r--r--docs/conventions.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/conventions.rst b/docs/conventions.rst
index 71c40e104..9e8510e4d 100644
--- a/docs/conventions.rst
+++ b/docs/conventions.rst
@@ -35,7 +35,7 @@ References to glossary terms are presented using the following style:
URLs are presented using the following style:
- `Pylons <http://pylonshq.com>`_
+ `Pylons <http://pylonsproject.org>`_
References to sections and chapters are presented using the following
style: