summaryrefslogtreecommitdiff
path: root/docs/narr/extconfig.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2015-02-17 19:01:15 -0600
committerMichael Merickel <michael@merickel.org>2015-02-17 19:01:15 -0600
commitc0063b33e3b570120aab09b7d0a0adcf31c8705c (patch)
tree9301c67f65ddad272d4b6a9841ecbf6433da450f /docs/narr/extconfig.rst
parent568a025d3156ee1e7bdf92e14c9eba7390c1dd26 (diff)
downloadpyramid-c0063b33e3b570120aab09b7d0a0adcf31c8705c.tar.gz
pyramid-c0063b33e3b570120aab09b7d0a0adcf31c8705c.tar.bz2
pyramid-c0063b33e3b570120aab09b7d0a0adcf31c8705c.zip
fix odd sentence
Diffstat (limited to 'docs/narr/extconfig.rst')
-rw-r--r--docs/narr/extconfig.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/narr/extconfig.rst b/docs/narr/extconfig.rst
index c805f1572..47f2fcb46 100644
--- a/docs/narr/extconfig.rst
+++ b/docs/narr/extconfig.rst
@@ -235,7 +235,8 @@ actions. The logic within actions is deferred until a call to
:meth:`pyramid.config.Configurator.make_wsgi_app`). This means you may call
``config.add_view(route_name='foo')`` **before**
``config.add_route('foo', '/foo')`` because nothing actually happens until
-commit-time when conflicts are resolved, actions are ordered and executed.
+commit-time. During a commit cycle conflicts are resolved, actions are ordered
+and executed.
By default, almost every action in Pyramid has an ``order`` of ``0``. Every
action within the same order-level will be executed in the order it was called.