diff options
| author | Scott Moser <smoser@brickies.net> | 2017-07-31 14:46:00 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-07-31 14:46:00 -0400 |
| commit | 19c248d009af6a7cff26fbb2febf5c958987084d (patch) | |
| tree | 521cc4c8cd303fd7a9eb56bc4eb5975c48996298 /doc/rtd/topics/merging.rst | |
| parent | f47c7ac027fc905ca7f6bee776007e2a922c117e (diff) | |
| parent | e586fe35a692b7519000005c8024ebd2bcbc82e0 (diff) | |
| download | vyos-cloud-init-19c248d009af6a7cff26fbb2febf5c958987084d.tar.gz vyos-cloud-init-19c248d009af6a7cff26fbb2febf5c958987084d.zip | |
merge from master at 0.7.9-233-ge586fe35
Diffstat (limited to 'doc/rtd/topics/merging.rst')
| -rw-r--r-- | doc/rtd/topics/merging.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/rtd/topics/merging.rst b/doc/rtd/topics/merging.rst index 2f927a47..c75ca59c 100644 --- a/doc/rtd/topics/merging.rst +++ b/doc/rtd/topics/merging.rst @@ -7,7 +7,7 @@ Overview This was implemented because it has been a common feature request that there be a way to specify how cloud-config yaml "dictionaries" provided as user-data are -merged together when there are multiple yamls to merge together (say when +merged together when there are multiple yaml files to merge together (say when performing an #include). Since previously the merging algorithm was very simple and would only overwrite @@ -128,7 +128,7 @@ for your own usage. for, both of which can define the way merging is done (the first header to exist wins). These new headers (in lookup order) are 'Merge-Type' and 'X-Merge-Type'. The value should be a string which will satisfy the new - merging format defintion (see below for this format). + merging format definition (see below for this format). 2. The second way is actually specifying the merge-type in the body of the cloud-config dictionary. There are 2 ways to specify this, either as a |