summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-01-14 16:08:20 -0800
committerChris McDonough <chrism@plope.com>2013-01-14 16:08:20 -0800
commite5f594c356d8aca488a3fbd8bc194991132533be (patch)
tree2339e913461891e00b68653753eb398fedd1abdd
parentfc69dbc24d540e1679e5d2149a366db6b133b1eb (diff)
parent2e95acb8b64694f0e99f553413cb2ddc123efd6f (diff)
downloadpyramid-e5f594c356d8aca488a3fbd8bc194991132533be.tar.gz
pyramid-e5f594c356d8aca488a3fbd8bc194991132533be.tar.bz2
pyramid-e5f594c356d8aca488a3fbd8bc194991132533be.zip
Merge pull request #794 from tshepang/flow
improve flow
-rw-r--r--pyramid/config/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 45762f48e..90bd89116 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -640,8 +640,8 @@ class Configurator(
A configuration callable should be a callable that accepts a single
argument named ``config``, which will be an instance of a
- :term:`Configurator` (be warned that it will not be the same
- configurator instance on which you call this method, however). The
+ :term:`Configurator`. However, be warned that it will not be the same
+ configurator instance on which you call this method. The
code which runs as the result of calling the callable should invoke
methods on the configurator passed to it which add configuration
state. The return value of a callable will be ignored.
@@ -701,7 +701,7 @@ class Configurator(
to :meth:`pyramid.config.Configurator.add_route` within the included
callable will have their pattern prefixed with the value of
``route_prefix``. This can be used to help mount a set of routes at a
- different location than the included callable's author intended while
+ different location than the included callable's author intended, while
still maintaining the same route names. For example:
.. code-block:: python