diff options
| author | Chris McDonough <chrism@plope.com> | 2013-08-30 15:13:09 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-08-30 15:13:09 -0400 |
| commit | f21a765b0872468873061cf15400c54ddfedbaaa (patch) | |
| tree | d0199183059ba1826f4e55513c381a1c0ba8cf0d | |
| parent | 891100b3ec95dc83dc09f0895af399c5b1061c88 (diff) | |
| parent | 00bb95f513ddcedcaf025bb528e4d7f20b1f7a4b (diff) | |
| download | pyramid-f21a765b0872468873061cf15400c54ddfedbaaa.tar.gz pyramid-f21a765b0872468873061cf15400c54ddfedbaaa.tar.bz2 pyramid-f21a765b0872468873061cf15400c54ddfedbaaa.zip | |
Merge branch '1.5-branch'
| -rw-r--r-- | CHANGES.txt | 4 | ||||
| -rw-r--r-- | docs/whatsnew-1.5.rst | 7 | ||||
| -rw-r--r-- | setup.py | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index f7f7aa571..cdaad5a90 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,5 @@ -Next Release -============ +1.5a1 (2013-08-30) +================== Features -------- diff --git a/docs/whatsnew-1.5.rst b/docs/whatsnew-1.5.rst index 18c50c997..2a01f43bc 100644 --- a/docs/whatsnew-1.5.rst +++ b/docs/whatsnew-1.5.rst @@ -222,8 +222,11 @@ Deprecations Documentation Enhancements -------------------------- -Many documentation enhancements have been added, but there were too many -changes for us to keep track of. The docs are greatly enhanced. +- A new documentation chapter named :ref:`quick_tour` was added. It describes + starting out with Pyramid from a high level. + +- Many other enhancements. + Dependency Changes ------------------ @@ -71,7 +71,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.5dev', + version='1.5a1', description=('The Pyramid Web Framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, |