From a3a27a35f649ed4dc25724e67e4896b56caed130 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Fri, 5 Nov 2010 03:54:55 -0400
Subject: fix pylons project urls, change some wording

---
 docs/index.rst | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'docs/index.rst')

diff --git a/docs/index.rst b/docs/index.rst
index 5a9aab565..a9b620a5e 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -5,9 +5,14 @@ The pyramid Web Application Development Framework
 =================================================
 
 :mod:`pyramid` is a small, fast, down-to-earth Python web application
-development framework.  It is developed as part of the `Pylons
-<http://pylonshq.com>`_ project.  It is licensed under a `BSD-like
-license <http://repoze.org/license.html>`_.
+development framework.  It is developed as part of the `Pylons Project
+<http://docs.pylonshq.com/>`_.  It is licensed under a `BSD-like license
+<http://repoze.org/license.html>`_.
+
+.. note::
+
+   Pyramid is the latest iteration of the web framework previously known as
+   :mod:`repoze.bfg`.
 
 Front Matter
 ============
@@ -161,8 +166,8 @@ commenting, and file uploads.  See the `KARL site
 Support and Development
 =======================
 
-The `Pyramid web site <http://pylonshq.com/pyramid>`_ is the main
-online source of :mod:`pyramid` support and development information.
+The `Pylons Project web site <http://docs.pylonshq.com/>`_ is the main online
+source of :mod:`pyramid` support and development information.
 
 To report bugs, use the `issue tracker
 <http://github.com/Pylons/pyramid/issues>`_.
-- 
cgit v1.2.3