merge from 3.4

This commit is contained in:
Senthil Kumaran 2014-06-11 06:19:47 -07:00
commit 38ee9afb34

View file

@ -687,7 +687,7 @@ published, which is a good starting point.
The newest version of TurboGears, version 2.0, moves even further in direction The newest version of TurboGears, version 2.0, moves even further in direction
of WSGI support and a component-based architecture. TurboGears 2 is based on of WSGI support and a component-based architecture. TurboGears 2 is based on
the WSGI stack of another popular component-based web framework, `Pylons the WSGI stack of another popular component-based web framework, `Pylons
<http://pylonshq.com/>`_. <http://www.pylonsproject.org/>`_.
Zope Zope