summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2014-04-20 17:41:10 -0500
committerMichael Merickel <michael@merickel.org>2014-04-20 17:41:10 -0500
commitd8b2960afcf45b1dbb8cde40e9b582a70751ae95 (patch)
tree071b4ffd04cdfc96834c757b3460a9f16b4b2b65 /CHANGES.txt
parent872796d2c1743430ab04364d05657b46133fa230 (diff)
parent91f322214abe03b24cdecaea367f2df8713fd9e6 (diff)
downloadpyramid-d8b2960afcf45b1dbb8cde40e9b582a70751ae95.tar.gz
pyramid-d8b2960afcf45b1dbb8cde40e9b582a70751ae95.tar.bz2
pyramid-d8b2960afcf45b1dbb8cde40e9b582a70751ae95.zip
Merge branch 'pull.1300'
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 3d2b248ae..b0495617b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
Next release
============
+- Update scaffold generating machinery to return the version of pyramid and
+ pyramid docs for use in scaffolds. Updated starter, alchemy and zodb
+ templates to have links to correctly versioned documentation and reflect
+ which pyramid was used to generate the scaffold.
+
- Fix an issue whereby predicates would be resolved as maybe_dotted in the
introspectable but not when passed for registration. This would mean that
add_route_predicate for example can not take a string and turn it into the