diff options
| author | Daniel Watkins <daniel.watkins@canonical.com> | 2016-06-02 16:20:18 +0100 |
|---|---|---|
| committer | Daniel Watkins <daniel.watkins@canonical.com> | 2016-06-02 16:20:18 +0100 |
| commit | 75907ec96181599dc0282aac989ce02a88c3b39d (patch) | |
| tree | 753e9ea284d62b8ab480a1f6d0575eab87fc7437 | |
| parent | b699df642dec996c517a94ea44f5e763c08570d0 (diff) | |
| download | vyos-cloud-init-75907ec96181599dc0282aac989ce02a88c3b39d.tar.gz vyos-cloud-init-75907ec96181599dc0282aac989ce02a88c3b39d.zip | |
Integrate MP feedback
| -rw-r--r-- | doc/merging.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/merging.rst b/doc/merging.rst index 2967ca9d..afe1a6dd 100644 --- a/doc/merging.rst +++ b/doc/merging.rst @@ -190,5 +190,5 @@ used the previous merging are also, similarly, now extensible (metadata merging, for example). Note, however, that merge algorithms are not used *across* types of -configuration. As was previously the case, merged user-data will still -overwrite conf.d configuration. +configuration. As was the case before merging was implemented, +user-data will overwrite conf.d configuration without merging. |