summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/project.rst4
-rw-r--r--docs/whatsnew-1.0.rst5
2 files changed, 2 insertions, 7 deletions
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 5b35f2363..b227c5d3a 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -119,7 +119,7 @@ project we name ``MyProject``:
.. code-block:: text
$ bin/paster create -t pyramid_starter
- Selected and implied scaffolds:
+ Selected and implied templates:
pyramid#pyramid_starter pyramid starter project
Enter project name: MyProject
@@ -127,7 +127,7 @@ project we name ``MyProject``:
egg: MyProject
package: myproject
project: MyProject
- Creating scaffold pyramid
+ Creating template pyramid
Creating directory ./MyProject
# ... more output ...
Running /Users/chrism/projects/pyramid/bin/python setup.py egg_info
diff --git a/docs/whatsnew-1.0.rst b/docs/whatsnew-1.0.rst
index 028317e23..8602c5105 100644
--- a/docs/whatsnew-1.0.rst
+++ b/docs/whatsnew-1.0.rst
@@ -178,11 +178,6 @@ Terminology Changes
``reload_resources`` (config file) is now known, respectively, as
``PYRAMID_RELOAD_ASSETS`` and ``reload_assets``.
-- 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.'
-
Better Platform Compatibility and Support
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~