From b699df642dec996c517a94ea44f5e763c08570d0 Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Fri, 20 May 2016 13:13:08 +0100 Subject: Update merging documentation to make its application clearer Currently, some users think that user-data and conf.d configuration will be merged together[0]. This has never been the case, and we should make it clear that this is not currently supported to avoid user confusion. [0] https://bugs.launchpad.net/cloud-init/+bug/1532234 --- doc/rtd/topics/merging.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc/rtd/topics/merging.rst') diff --git a/doc/rtd/topics/merging.rst b/doc/rtd/topics/merging.rst index 8a03f3c7..2bd87b16 100644 --- a/doc/rtd/topics/merging.rst +++ b/doc/rtd/topics/merging.rst @@ -1,5 +1,5 @@ -========= -Merging -========= +========================== +Merging User-Data Sections +========================== .. include:: ../../merging.rst -- cgit v1.2.3