summaryrefslogtreecommitdiff
path: root/docs/narr/introduction.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2016-01-31 16:18:02 -0600
committerMichael Merickel <michael@merickel.org>2016-01-31 16:18:02 -0600
commit3eb1c354d320536ee470b79dcb930d20da93d97d (patch)
tree18aa7fa0a4293919c1ed67ee7f8aae6372abcb06 /docs/narr/introduction.rst
parent67f733e161f19bb2b7322edd120b9bf489154536 (diff)
parent9c01bf58c211bf9c28f8043459a5a0e9b25a5c35 (diff)
downloadpyramid-3eb1c354d320536ee470b79dcb930d20da93d97d.tar.gz
pyramid-3eb1c354d320536ee470b79dcb930d20da93d97d.tar.bz2
pyramid-3eb1c354d320536ee470b79dcb930d20da93d97d.zip
Merge branch 'master' into feature/alchemy-scaffold-update
Diffstat (limited to 'docs/narr/introduction.rst')
-rw-r--r--docs/narr/introduction.rst7
1 files changed, 3 insertions, 4 deletions
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index 7906dd85d..8db52dc21 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -860,8 +860,8 @@ Every release of Pyramid has 100% statement coverage via unit and integration
tests, as measured by the ``coverage`` tool available on PyPI. It also has
greater than 95% decision/condition coverage as measured by the
``instrumental`` tool available on PyPI. It is automatically tested by the
-Jenkins tool on Python 2.6, Python 2.7, Python 3.2, Python 3.3, Python 3.4,
-PyPy, and PyPy3 after each commit to its GitHub repository. Official Pyramid
+Jenkins tool on Python 2.6, Python 2.7, Python 3.3, Python 3.4, Python 3.5,
+PyPy, and PyPy3 after each commit to its GitHub repository. Official Pyramid
add-ons are held to a similar testing standard. We still find bugs in Pyramid
and its official add-ons, but we've noticed we find a lot more of them while
working on other projects that don't have a good testing regime.
@@ -892,8 +892,7 @@ also maintain a "cookbook" of recipes, which are usually demonstrations of
common integration scenarios too specific to add to the official narrative
docs. In any case, the Pyramid documentation is comprehensive.
-Example: The Pyramid Cookbook at
-http://docs.pylonsproject.org/projects/pyramid-cookbook/en/latest/.
+Example: The :ref:`Pyramid Community Cookbook <cookbook:pyramid-cookbook>`.
.. index::
single: Pylons Project