From dd4337cca258897d7bdbfb68f8ef7dfd215d9365 Mon Sep 17 00:00:00 2001 From: David Rabel Date: Fri, 15 Feb 2019 11:37:11 +0100 Subject: [PATCH] Fix indentation in docs Change-Id: If7044bb0d349eea1633474583e6f4c78afc93667 --- doc/source/template_guide/environment.rst | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/source/template_guide/environment.rst b/doc/source/template_guide/environment.rst index b7a3060a72..fb6a2bdf94 100644 --- a/doc/source/template_guide/environment.rst +++ b/doc/source/template_guide/environment.rst @@ -71,18 +71,18 @@ strategies in an environment file. There are three merge strategy types: - ``overwrite`` - Overwrites a parameter, existing parameter values are replaced. +``overwrite`` + Overwrites a parameter, existing parameter values are replaced. - ``merge`` - Merges the existing parameter value and the new value. String values - are concatenated, comma delimited lists are extended and json values - are updated. +``merge`` + Merges the existing parameter value and the new value. String values + are concatenated, comma delimited lists are extended and json values + are updated. - ``deep_merge`` - Json values are deep merged. Not useful for other types like comma - delimited lists and strings. If specified for them, it falls back to - ``merge``. +``deep_merge`` + Json values are deep merged. Not useful for other types like comma + delimited lists and strings. If specified for them, it falls back to + ``merge``. You can provide a default merge strategy and/or parameter specific merge strategies per environment file. Parameter specific merge strategy is only used for that