summaryrefslogtreecommitdiff
path: root/doc/rtd/topics/merging.rst
AgeCommit message (Collapse)Author
2016-05-20Update merging documentation to make its application clearerDaniel Watkins
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
2013-03-08Enable the merging.txt to be in .rst format for public viewingJoshua Harlow