diff options
Diffstat (limited to 'docs/narr/advconfig.rst')
| -rw-r--r-- | docs/narr/advconfig.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst index 8951166f5..30f76e456 100644 --- a/docs/narr/advconfig.rst +++ b/docs/narr/advconfig.rst @@ -271,7 +271,7 @@ If your code uses the :meth:`pyramid.config.Configurator.include` method to include external configuration, some conflicts are automatically resolved. Configuration statements that are made as the result of an "include" will be overridden by configuration statements that happen within the caller of -the "include" method. See also +the "include" method. Automatic conflict resolution supports this goal: if a user wants to reuse a Pyramid application, and they want to customize the configuration of this @@ -399,7 +399,7 @@ be ordered in dependency order. Some configuration methods, such as :meth:`pyramid.config.Configurator.add_route` have internal ordering -constraints: they routes they imply require relative ordering. Such ordering +constraints: the routes they imply require relative ordering. Such ordering constraints are not absolved by two-phase configuration. Routes are still added in configuration execution order. |