summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-03-25 01:27:22 -0400
committerChris McDonough <chrism@plope.com>2011-03-25 01:27:22 -0400
commit661790b6ca014021dd908cd6b93d789fe6c5dda1 (patch)
treea8944b860c10506521a07e6f67f7e5704f2fbd8c /CHANGES.txt
parentb596e1812627c359908759d7a8d83c339f08e385 (diff)
parent8027adf1e2ffe4498c7eda9a698ed61bec8a8c04 (diff)
downloadpyramid-661790b6ca014021dd908cd6b93d789fe6c5dda1.tar.gz
pyramid-661790b6ca014021dd908cd6b93d789fe6c5dda1.tar.bz2
pyramid-661790b6ca014021dd908cd6b93d789fe6c5dda1.zip
Merge branch 'jayd3e-master'
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 9ce6184a3..c731306e2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,14 @@
Next release
============
+Documentation
+-------------
+
+- The term 'template' used to refer to both 'paster templates' and 'rendered
+ templates'(templates created by a rendering engine. i.e. Mako, Chameleon,
+ Jinja, etc.). 'Paster templates' will now be refered to as 'scaffolds,'
+ whereas the name for 'rendered templates' will remain as 'templates.'
+
Features
--------