diff --git a/docs/_source/docs/stack_group_config.rst b/docs/_source/docs/stack_group_config.rst index c465f6ee5..2638dc231 100644 --- a/docs/_source/docs/stack_group_config.rst +++ b/docs/_source/docs/stack_group_config.rst @@ -192,8 +192,8 @@ The inheritance strategy of some properties may be overridden by the stack group Strategy options: -* ``merge``: Child config is merged with parent configs. For maps child keys take precedence. -* ``override``: Overrides parent if set. +* ``merge``: Child config is merged with parent configs, with child taking precedence for conflicting dictionary keys. +* ``override``: Overrides the parent config, if set. .. _setting_dependencies_for_stack_groups: diff --git a/sceptre/config/strategies.py b/sceptre/config/strategies.py index 65f033d2d..b0dc9891b 100644 --- a/sceptre/config/strategies.py +++ b/sceptre/config/strategies.py @@ -75,7 +75,7 @@ def child_wins(a, b): def child_or_parent(a, b): """ - Returns second arg if is not empty, else the first. + Returns the second arg if it is not empty, else the first. :param a: An object. :type a: object