[Resolves #1187] Documentation tweaks

Sceptre · Mar 22, 2024 · bdb3f38 · bdb3f38
1 parent 32f486c
commit bdb3f38
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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