summaryrefslogtreecommitdiff
path: root/doc/rtd/topics/merging.rst
diff options
context:
space:
mode:
authorJoshua Powers <josh.powers@canonical.com>2019-09-04 13:43:11 +0000
committerServer Team CI Bot <josh.powers+server-team-bot@canonical.com>2019-09-04 13:43:11 +0000
commitda826cd3e4d608d8ddb4b693d10378b52532677b (patch)
treeb884710f60c006a2c8be1838c38286bdf9109815 /doc/rtd/topics/merging.rst
parentff11c0c63bfca0be451c58539b158acb7cb65a76 (diff)
downloadvyos-cloud-init-da826cd3e4d608d8ddb4b693d10378b52532677b.tar.gz
vyos-cloud-init-da826cd3e4d608d8ddb4b693d10378b52532677b.zip
docs: fix whitespace, spelling, and line length
Diffstat (limited to 'doc/rtd/topics/merging.rst')
-rw-r--r--doc/rtd/topics/merging.rst18
1 files changed, 12 insertions, 6 deletions
diff --git a/doc/rtd/topics/merging.rst b/doc/rtd/topics/merging.rst
index 5f7ca18d..2b5e5dad 100644
--- a/doc/rtd/topics/merging.rst
+++ b/doc/rtd/topics/merging.rst
@@ -68,8 +68,10 @@ Cloud-init provides merging for the following built-in types:
The ``Dict`` merger has the following options which control what is done with
values contained within the config.
-- ``allow_delete``: Existing values not present in the new value can be deleted, defaults to False
-- ``no_replace``: Do not replace an existing value if one is already present, enabled by default.
+- ``allow_delete``: Existing values not present in the new value can be
+ deleted, defaults to False
+- ``no_replace``: Do not replace an existing value if one is already present,
+ enabled by default.
- ``replace``: Overwrite existing values with new ones.
The ``List`` merger has the following options which control what is done with
@@ -77,7 +79,8 @@ the values contained within the config.
- ``append``: Add new value to the end of the list, defaults to False.
- ``prepend``: Add new values to the start of the list, defaults to False.
-- ``no_replace``: Do not replace an existing value if one is already present, enabled by default.
+- ``no_replace``: Do not replace an existing value if one is already present,
+ enabled by default.
- ``replace``: Overwrite existing values with new ones.
The ``Str`` merger has the following options which control what is done with
@@ -88,10 +91,13 @@ the values contained within the config.
Common options for all merge types which control how recursive merging is
done on other types.
-- ``recurse_dict``: If True merge the new values of the dictionary, defaults to True.
-- ``recurse_list``: If True merge the new values of the list, defaults to False.
+- ``recurse_dict``: If True merge the new values of the dictionary, defaults to
+ True.
+- ``recurse_list``: If True merge the new values of the list, defaults to
+ False.
- ``recurse_array``: Alias for ``recurse_list``.
-- ``recurse_str``: If True merge the new values of the string, defaults to False.
+- ``recurse_str``: If True merge the new values of the string, defaults to
+ False.
Customizability