diff options
| author | Chris McDonough <chrism@plope.com> | 2010-11-05 03:54:55 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-11-05 03:54:55 -0400 |
| commit | a3a27a35f649ed4dc25724e67e4896b56caed130 (patch) | |
| tree | 2bb10575f050dcc19dee9a5f6ead8c1d434a5fbc | |
| parent | 87063855737cab8a623eabfcc1a857fd71690e09 (diff) | |
| download | pyramid-a3a27a35f649ed4dc25724e67e4896b56caed130.tar.gz pyramid-a3a27a35f649ed4dc25724e67e4896b56caed130.tar.bz2 pyramid-a3a27a35f649ed4dc25724e67e4896b56caed130.zip | |
fix pylons project urls, change some wording
| -rw-r--r-- | docs/index.rst | 15 | ||||
| -rw-r--r-- | docs/narr/introduction.rst | 19 |
2 files changed, 18 insertions, 16 deletions
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>`_. diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst index f8dcdbf62..01dd91e26 100644 --- a/docs/narr/introduction.rst +++ b/docs/narr/introduction.rst @@ -99,16 +99,13 @@ Openness single: Agendaless Consulting single: repoze namespace package -What Is Pylons? ---------------- +What Is The Pylons Project? +--------------------------- -:mod:`pyramid` is a member of the collection of software published -under the :term:`Pylons` "brand". :term:`Pylons` software is written -by a loose-knit community of contributors. The `Pylons website -<http://pylonshq.com>`_ describes the Pylons brand in more detail. - -See `http://docs.pylonshq.com <http://docs.pylonshq.com>`_ for an overview of -the Pyramid project and how it relates to Pylons. +:mod:`pyramid` is a member of the collection of software published under the +Pylons Project. :Pylons software is written by a loose-knit community of +contributors. The `Pylons Project website <http://docs.pylonshq.com>`_ +includes details about how :mod:`pyramid` relates to the Pylons Project. .. index:: single: pyramid and other frameworks @@ -120,8 +117,8 @@ the Pyramid project and how it relates to Pylons. :mod:`pyramid` and Other Web Frameworks ------------------------------------------ -Until the end of 2010, :mod:`pyramid` was known as :mod:`repoze.bfg`; -it was merged into the Pylons project at the end of 2010. +Until the end of 2010, :mod:`pyramid` was known as :mod:`repoze.bfg`; it was +merged into the Pylons project as :mod:`pyramid` in November of that year. :mod:`pyramid` was inspired by :term:`Zope`, :term:`Pylons` (version 1.0) and :term:`Django`. As a result, :mod:`pyramid` borrows several |