Commit 75907ec9 authored by Daniel Watkins's avatar Daniel Watkins

Integrate MP feedback

parent b699df64
......@@ -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.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment