From 8027adf1e2ffe4498c7eda9a698ed61bec8a8c04 Mon Sep 17 00:00:00 2001
From: Joe Dallago <jd.dallago@gmail.com>
Date: Fri, 25 Mar 2011 00:17:23 -0500
Subject: Moved the content that was put into whatsnew-1.0.rst into the
 CHANGES.txt file, b/c the terminology change doesn't apply to version 1.0. 
 Also changed the output of the paster create command in project.rst back to
 its original state.

---
 CHANGES.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'CHANGES.txt')

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
 --------
 
-- 
cgit v1.2.3