summaryrefslogtreecommitdiff
path: root/docs/whatsnew-1.3.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/whatsnew-1.3.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/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``