diff options
| author | Daniel Watkins <daniel.watkins@canonical.com> | 2016-05-20 13:13:08 +0100 |
|---|---|---|
| committer | Daniel Watkins <daniel.watkins@canonical.com> | 2016-05-20 13:13:08 +0100 |
| commit | b699df642dec996c517a94ea44f5e763c08570d0 (patch) | |
| tree | 8ce19b5291d8a232c34fe06b1f10b5dd35e48e40 /doc/rtd/topics/merging.rst | |
| parent | 1df451e76d98371cf54e7a474c4d46fa3a96361a (diff) | |
| download | vyos-cloud-init-b699df642dec996c517a94ea44f5e763c08570d0.tar.gz vyos-cloud-init-b699df642dec996c517a94ea44f5e763c08570d0.zip | |
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
Diffstat (limited to 'doc/rtd/topics/merging.rst')
| -rw-r--r-- | doc/rtd/topics/merging.rst | 6 |
1 files changed, 3 insertions, 3 deletions
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 |