From 75907ec96181599dc0282aac989ce02a88c3b39d Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Thu, 2 Jun 2016 16:20:18 +0100 Subject: Integrate MP feedback --- doc/merging.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc/merging.rst') 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. -- cgit v1.2.3