RedHatTraining/pyramid.git

			@@ -221,7 +221,7 @@
			JSON-RPC, let you integrate with jQuery Mobile, etc.

			Examples:
			http://docs.pylonsproject.org/en/latest/docs/pyramid.html#pyramid-add-on-documentation
			https://trypyramid.com/resources-extending-pyramid.html

			Class-based and function-based views
			~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
			@@ -859,14 +859,15 @@
			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,
			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.
			``instrumental`` tool available on PyPI. It is automatically tested by Travis
			and Jenkins on 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.

			Example: http://jenkins.pylonsproject.org/
			Travis: https://travis-ci.org/Pylons/pyramid
			Jenkins: http://jenkins.pylonsproject.org/job/pyramid/

			Support
			~~~~~~~
			@@ -878,9 +879,10 @@
			users in our various official support channels. We try to keep it well-lit and
			new-user-friendly.

			Example: Visit irc\://freenode.net#pyramid (the ``#pyramid`` channel on
			irc.freenode.net in an IRC client) or the pylons-discuss maillist at
			http://groups.google.com/group/pylons-discuss/.
			Example: Visit https://webchat.freenode.net/?channels=pyramid (or the
			``#pyramid`` channel on irc.freenode.net in an IRC client) or the
			pylons-discuss maillist at
			https://groups.google.com/forum/#!forum/pylons-discuss

			Documentation
			~~~~~~~~~~~~~
			@@ -897,12 +899,12 @@
			.. index::
			single: Pylons Project

			What Is The Pylons Project?
			What is the Pylons Project?
			---------------------------

			:app:`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://pylonsproject.org>`_
			contributors. The `Pylons Project website <http://www.pylonsproject.org>`_
			includes details about how :app:`Pyramid` relates to the Pylons Project.

			.. index::
			@@ -966,9 +968,9 @@

			Other Python web frameworks advertise themselves as members of a class of web
			frameworks named `model-view-controller
			<http://en.wikipedia.org/wiki/Model–view–controller>`_ frameworks. Insofar as
			this term has been claimed to represent a class of web frameworks,
			:app:`Pyramid` also generally fits into this class.
			<https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93controller>`_
			frameworks. Insofar as this term has been claimed to represent a class of web
			frameworks, :app:`Pyramid` also generally fits into this class.

			.. sidebar:: You Say :app:`Pyramid` is MVC, but Where's the Controller?