summaryrefslogtreecommitdiff
path: root/docs/index.rst
diff options
context:
space:
mode:
Diffstat (limited to 'docs/index.rst')
-rw-r--r--docs/index.rst24
1 files changed, 12 insertions, 12 deletions
diff --git a/docs/index.rst b/docs/index.rst
index 7b1c46b70..23596e5ce 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -6,14 +6,9 @@ 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::
-
- Pyramid is the latest iteration of the web framework previously known as
- :mod:`repoze.bfg`.
-
Front Matter
============
@@ -23,6 +18,14 @@ Front Matter
copyright.rst
conventions.rst
+"What's New" Documents
+======================
+
+.. toctree::
+ :maxdepth: 2
+
+ whatsnew-1.0
+
Narrative documentation
=======================
@@ -58,7 +61,6 @@ Narrative documentation in chapter form explaining how to use
narr/testing
narr/hooks
narr/advconfig
- narr/declarative
narr/extending
narr/router
narr/threadlocals
@@ -86,14 +88,12 @@ applications to various platforms.
Reference Material
==================
-Reference material includes API documentation and documentation of
-every :app:`Pyramid` :term:`ZCML directive`.
+Reference material includes documentation for every :app:`Pyramid` API.
.. toctree::
:maxdepth: 2
api
- zcml
Detailed Change History
=======================
@@ -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
==================