diff options
| author | Chris McDonough <chrism@plope.com> | 2012-03-18 18:10:00 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-03-18 18:10:00 -0400 |
| commit | ac7d27dfb97bf887f8688264187db4a6c7be18ff (patch) | |
| tree | 2953fd7844bebdc6b407d6cbfedd4194724b2fbc /docs | |
| parent | 811494584847b8108a462c28ce50f9cf30f0fb6b (diff) | |
| parent | 2b41345e815c2e584fd51bbe534ba35e222f3b80 (diff) | |
| download | pyramid-ac7d27dfb97bf887f8688264187db4a6c7be18ff.tar.gz pyramid-ac7d27dfb97bf887f8688264187db4a6c7be18ff.tar.bz2 pyramid-ac7d27dfb97bf887f8688264187db4a6c7be18ff.zip | |
Merge branch '1.3-branch'
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/conf.py | 2 | ||||
| -rw-r--r-- | docs/python-3.png | bin | 0 -> 8858 bytes | |||
| -rw-r--r-- | docs/whatsnew-1.3.rst | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/docs/conf.py b/docs/conf.py index 1c957162e..d694b2151 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -80,7 +80,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year # other places throughout the built documents. # # The short X.Y version. -version = '1.3b2' +version = '1.3b3' # The full version, including alpha/beta/rc tags. release = version diff --git a/docs/python-3.png b/docs/python-3.png Binary files differnew file mode 100644 index 000000000..46ecd8581 --- /dev/null +++ b/docs/python-3.png diff --git a/docs/whatsnew-1.3.rst b/docs/whatsnew-1.3.rst index 85bb26ba5..b4138be13 100644 --- a/docs/whatsnew-1.3.rst +++ b/docs/whatsnew-1.3.rst @@ -15,6 +15,8 @@ The major feature additions in Pyramid 1.3 follow. 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. |
