diff options
| author | Michael Merickel <michael@merickel.org> | 2012-02-04 03:19:45 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2012-02-04 03:19:45 -0600 |
| commit | 030531188d55b83d0c6b4b5a911b273e381a0ea9 (patch) | |
| tree | 83ae7620938955f3a9620fbc8d5ff4f9c99366ff /docs | |
| parent | 7cf063bdf49c07debd4e9e961ee0b6670b9d1685 (diff) | |
| parent | d8afa3b5cb5e896700e654c3b8d90de54d54269c (diff) | |
| download | pyramid-030531188d55b83d0c6b4b5a911b273e381a0ea9.tar.gz pyramid-030531188d55b83d0c6b4b5a911b273e381a0ea9.tar.bz2 pyramid-030531188d55b83d0c6b4b5a911b273e381a0ea9.zip | |
Merge branch 'pull.421' into 1.3-branch
Diffstat (limited to 'docs')
| -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:: |