diff options
| author | Chris McDonough <chrism@plope.com> | 2012-02-05 23:56:51 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-02-05 23:56:51 -0500 |
| commit | c8e35f9d2d708b2e05143a296fcef46dfbc7952b (patch) | |
| tree | 5c857d4d3c18cfbb77a3956fc5011d662aefb42d | |
| parent | d01ae960c9e278bd361e2517e0fef7173549f642 (diff) | |
| parent | 030531188d55b83d0c6b4b5a911b273e381a0ea9 (diff) | |
| download | pyramid-c8e35f9d2d708b2e05143a296fcef46dfbc7952b.tar.gz pyramid-c8e35f9d2d708b2e05143a296fcef46dfbc7952b.tar.bz2 pyramid-c8e35f9d2d708b2e05143a296fcef46dfbc7952b.zip | |
Merge branch '1.3-branch' of github.com:Pylons/pyramid into 1.3-branch
| -rw-r--r-- | docs/whatsnew-1.3.rst | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/whatsnew-1.3.rst b/docs/whatsnew-1.3.rst index ed7024f62..2793471a3 100644 --- a/docs/whatsnew-1.3.rst +++ b/docs/whatsnew-1.3.rst @@ -15,7 +15,9 @@ The major feature additions in Pyramid 1.3 follow. Python 3 Compatibility ~~~~~~~~~~~~~~~~~~~~~~ -Pyramid is now Python 3 compatible. Python 3.2 or better is required. +In addition to running on Python 2 (version 2.6 or 2.7 required), Pyramid is +now Python 3 compatible. For Python 3 compatibility, Python 3.2 or better +is required. .. warning:: |