summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-12-27 00:11:15 -0800
committerSteve Piercy <web@stevepiercy.com>2016-12-27 00:11:15 -0800
commit0ff74073d3efc787a6fde1818d05f4aa9227d243 (patch)
tree7550cae8070f9a444dcd89f784fc49ce2b0a8124
parent6b3f9e5846879e7335c38eaf629500a1f6a97435 (diff)
downloadpyramid-0ff74073d3efc787a6fde1818d05f4aa9227d243.tar.gz
pyramid-0ff74073d3efc787a6fde1818d05f4aa9227d243.tar.bz2
pyramid-0ff74073d3efc787a6fde1818d05f4aa9227d243.zip
narr/introduction - update
-rw-r--r--docs/narr/introduction.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index adad196e4..7027d6601 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -182,7 +182,7 @@ available. Pyramid can automatically utilize changed templates when rendering
pages and automatically restart the application to incorporate changed Python
code. Plain old ``print()`` calls used for debugging can display to a console.
-Pyramid's debug toolbar comes activated when you use a Pyramid scaffold to
+Pyramid's debug toolbar comes activated when you use a Pyramid :term:`cookiecutter` to
render a project. This toolbar overlays your application in the browser, and
allows you access to framework data, such as the routes configured, the last
renderings performed, the current set of packages installed, SQLAlchemy queries
@@ -494,7 +494,7 @@ Example: :ref:`view_configuration_parameters`.
Transaction management
~~~~~~~~~~~~~~~~~~~~~~
-Pyramid's :term:`scaffold` system renders projects that include a *transaction
+A couple of Pyramid's :term:`cookiecutter`\ s include a *transaction
management* system, stolen from Zope. When you use this transaction management
system, you cease being responsible for committing your data anymore. Instead
Pyramid takes care of committing: it commits at the end of a request or aborts