From d5d0b34aeb1af8e3df031215df3f113c392833a6 Mon Sep 17 00:00:00 2001 From: Casey Duncan Date: Tue, 18 Jan 2011 18:24:21 -0700 Subject: remove empty See Also --- docs/narr/advconfig.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/narr/advconfig.rst') diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst index eb9b70b12..1e2e7a0e9 100644 --- a/docs/narr/advconfig.rst +++ b/docs/narr/advconfig.rst @@ -274,7 +274,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 -- cgit v1.2.3 From 6430c7b3aa3f2f1e47d3a647a70c0a953fcbb23c Mon Sep 17 00:00:00 2001 From: Casey Duncan Date: Tue, 18 Jan 2011 18:28:15 -0700 Subject: they => the --- docs/narr/advconfig.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/narr/advconfig.rst') diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst index 1e2e7a0e9..4b10e6194 100644 --- a/docs/narr/advconfig.rst +++ b/docs/narr/advconfig.rst @@ -402,7 +402,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. -- cgit v1.2.3