diff options
| author | Chris McDonough <chrism@plope.com> | 2015-04-15 11:39:36 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2015-04-15 11:39:36 -0400 |
| commit | 50906f073be6c619dfd9a2062a444ff53a87d018 (patch) | |
| tree | a149ee7e34866cf3a6ef1eeb1e59d000bf386228 | |
| parent | 77097cbdf859d0b86a002538f80ca1314f51562b (diff) | |
| parent | fa16cb17480543f027bd5316edd3d4878513e5f7 (diff) | |
| download | pyramid-50906f073be6c619dfd9a2062a444ff53a87d018.tar.gz pyramid-50906f073be6c619dfd9a2062a444ff53a87d018.tar.bz2 pyramid-50906f073be6c619dfd9a2062a444ff53a87d018.zip | |
Merge branch '1.6-branch'
| -rw-r--r-- | RELEASING.txt | 3 | ||||
| -rw-r--r-- | docs/whatsnew-1.6.rst | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/RELEASING.txt b/RELEASING.txt index 1cc9e265f..6d25ecb62 100644 --- a/RELEASING.txt +++ b/RELEASING.txt @@ -29,6 +29,9 @@ Releasing Pyramid - update README.rst to use correct versions of badges and URLs according to each branch and context, i.e., RTD "latest" == GitHub/Travis "1.x-branch". +- Update whatsnew-X.X.rst in docs to point at change log entries for individual + releases if applicable. + - Change setup.py version to the new version number. - Change CHANGES.txt heading to reflect the new version number. diff --git a/docs/whatsnew-1.6.rst b/docs/whatsnew-1.6.rst index c38aa7a91..b99ebeec4 100644 --- a/docs/whatsnew-1.6.rst +++ b/docs/whatsnew-1.6.rst @@ -2,7 +2,7 @@ What's New In Pyramid 1.6 ========================= This article explains the new features in :app:`Pyramid` version 1.6 as -compared to its predecessor, :app:`Pyramid` 1.6. It also documents backwards +compared to its predecessor, :app:`Pyramid` 1.5. It also documents backwards incompatibilities between the two versions and deprecations added to :app:`Pyramid` 1.6, as well as software dependency changes and notable documentation additions. |