summaryrefslogtreecommitdiff
path: root/docs/whatsnew-1.3.rst
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2016-02-21 16:10:24 -0700
committerBert JW Regeer <bertjw@regeer.org>2016-02-21 16:10:24 -0700
commit1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad (patch)
tree0db5dd6f25a9166c118c4a24d66f281f43b0aeba /docs/whatsnew-1.3.rst
parent30ae71b4a7ad97a649165374a75a70f4b64ae25c (diff)
parentaa6e5fe4f1190e6df123e3f6ccde9deb789eb344 (diff)
downloadpyramid-1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad.tar.gz
pyramid-1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad.tar.bz2
pyramid-1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad.zip
Merge branch 'master' into feature/configurable-view-deriver
Diffstat (limited to 'docs/whatsnew-1.3.rst')
-rw-r--r--docs/whatsnew-1.3.rst11
1 files changed, 6 insertions, 5 deletions
diff --git a/docs/whatsnew-1.3.rst b/docs/whatsnew-1.3.rst
index 1a299e126..8de69c450 100644
--- a/docs/whatsnew-1.3.rst
+++ b/docs/whatsnew-1.3.rst
@@ -18,7 +18,7 @@ Python 3 Compatibility
.. image:: python-3.png
Pyramid continues to run on Python 2, but Pyramid is now also Python 3
-compatible. To use Pyramid under Python 3, Python 3.2 or better is required.
+compatible. To use Pyramid under Python 3, Python 3.3 or better is required.
Many Pyramid add-ons are already Python 3 compatible. For example,
``pyramid_debugtoolbar``, ``pyramid_jinja2``, ``pyramid_exclog``,
@@ -523,10 +523,11 @@ Documentation Enhancements
:ref:`making_a_console_script`.
- Removed the "Running Pyramid on Google App Engine" tutorial from the main
- docs. It survives on in the Cookbook
- (http://docs.pylonsproject.org/projects/pyramid_cookbook/en/latest/deployment/gae.html).
- Rationale: it provides the correct info for the Python 2.5 version of GAE
- only, and this version of Pyramid does not support Python 2.5.
+ docs. It survives on in the Pyramid Community Cookbook as
+ :ref:`Pyramid on Google's App Engine (using appengine-monkey)
+ <cookbook:appengine_tutorial>`. Rationale: it provides the correct info for
+ the Python 2.5 version of GAE only, and this version of Pyramid does not
+ support Python 2.5.
- Updated the :ref:`changing_the_forbidden_view` section, replacing
explanations of registering a view using ``add_view`` or ``view_config``