From 3f01e1f615041aa0e6787e1c6ba2f9c54d139100 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Sun, 18 Nov 2018 23:14:49 -0600 Subject: Fix so sentence has the right meaning --- docs/narr/advconfig.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/narr/advconfig.rst') diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst index 322741648..f6a6c5b42 100644 --- a/docs/narr/advconfig.rst +++ b/docs/narr/advconfig.rst @@ -169,8 +169,8 @@ Using ``config.commit()`` You can manually commit a configuration by using the :meth:`~pyramid.config.Configurator.commit` method between configuration calls. For example, we prevent conflicts from occurring in the application we examined -previously as the result of adding a ``commit``. Here's the application that -generates conflicts: +previously by adding a ``commit``. +Here's the application that generates conflicts: .. code-block:: python :linenos: -- cgit v1.2.3 From 084cdc68d27299a3aaf6f9a2464dd5b99fbb9947 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Sun, 18 Nov 2018 23:16:20 -0600 Subject: Note what directive takes effect when conflits are resolved with commit() --- docs/narr/advconfig.rst | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs/narr/advconfig.rst') diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst index f6a6c5b42..0d583029e 100644 --- a/docs/narr/advconfig.rst +++ b/docs/narr/advconfig.rst @@ -168,6 +168,8 @@ Using ``config.commit()`` You can manually commit a configuration by using the :meth:`~pyramid.config.Configurator.commit` method between configuration calls. +After a commit :term:`configuration declaration`\s which would otherwise result in a conflict may be added to a :term:`configurator` and will override previously committed directives. + For example, we prevent conflicts from occurring in the application we examined previously by adding a ``commit``. Here's the application that generates conflicts: -- cgit v1.2.3 From 34009af1bea519367d69c69e05c1af4df957db46 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Mon, 19 Nov 2018 08:15:12 -0600 Subject: Shorter sentences are better --- docs/narr/advconfig.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/narr/advconfig.rst') diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst index 0d583029e..4c969487c 100644 --- a/docs/narr/advconfig.rst +++ b/docs/narr/advconfig.rst @@ -168,7 +168,8 @@ Using ``config.commit()`` You can manually commit a configuration by using the :meth:`~pyramid.config.Configurator.commit` method between configuration calls. -After a commit :term:`configuration declaration`\s which would otherwise result in a conflict may be added to a :term:`configurator` and will override previously committed directives. +After a commit more :term:`configuration declaration`\s may be added to a :term:`configurator`. +New declarations will not conflict with committed declarations, they will override them. For example, we prevent conflicts from occurring in the application we examined previously by adding a ``commit``. -- cgit v1.2.3 From 1c83f5359a0d049b9a8587d016cb118e649edfdf Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Tue, 20 Nov 2018 07:48:31 -0600 Subject: Add comma per Steve Piercy --- 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 4c969487c..e0ced10f0 100644 --- a/docs/narr/advconfig.rst +++ b/docs/narr/advconfig.rst @@ -168,7 +168,7 @@ Using ``config.commit()`` You can manually commit a configuration by using the :meth:`~pyramid.config.Configurator.commit` method between configuration calls. -After a commit more :term:`configuration declaration`\s may be added to a :term:`configurator`. +After a commit, more :term:`configuration declaration`\s may be added to a :term:`configurator`. New declarations will not conflict with committed declarations, they will override them. For example, we prevent conflicts from occurring in the application we examined -- cgit v1.2.3 From 7414c862e8be7f4267e0e5ba7fc30e123f65a816 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Tue, 20 Nov 2018 07:48:50 -0600 Subject: Split into 2 sentences --- docs/narr/advconfig.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/narr/advconfig.rst') diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst index e0ced10f0..33edb0eae 100644 --- a/docs/narr/advconfig.rst +++ b/docs/narr/advconfig.rst @@ -169,7 +169,8 @@ Using ``config.commit()`` You can manually commit a configuration by using the :meth:`~pyramid.config.Configurator.commit` method between configuration calls. After a commit, more :term:`configuration declaration`\s may be added to a :term:`configurator`. -New declarations will not conflict with committed declarations, they will override them. +New declarations will not conflict with committed declarations. +The new declarations will override committed declarations. For example, we prevent conflicts from occurring in the application we examined previously by adding a ``commit``. -- cgit v1.2.3