From a3a27a35f649ed4dc25724e67e4896b56caed130 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 5 Nov 2010 03:54:55 -0400 Subject: fix pylons project urls, change some wording --- docs/narr/introduction.rst | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'docs/narr') 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 -`_ describes the Pylons brand in more detail. - -See `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 `_ +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 -- cgit v1.2.3