summaryrefslogtreecommitdiff
path: root/doc/merging.rst
AgeCommit message (Collapse)Author
2017-04-12doc: correct grammar and improve clarity in merging documentation.David Tagatac
Move merging.rst into doc/rtd/topics with small fixes.
2016-11-10doc: make the RST files consistently formated and other improvements.Scott Moser
The biggest things here are: * move doc/sources/*/README.rst to doc/rtd/topics/datasources This gives each datasource a page in the rtd docs, which make it easier to read. * consistently use the same header style throughout. As suggested at http://thomas-cokelaer.info/tutorials/sphinx/rest_syntax.html use: # with overline, for parts * with overline, for chapters =, for sections -, for subsections ^, for subsubsections “, for paragraphs Also, move and re-format vendor-data documentation to rtd.
2016-06-02Integrate MP feedbackDaniel Watkins
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
2016-05-20Clean up merging.rst formattingDaniel Watkins
2013-04-02Fix the default string used for merging.Joshua Harlow
It had been changed in code, but not in docs. So we needed to reflect the change in docs as well so that both are in sync.
2013-03-08Enable the merging.txt to be in .rst format for public viewingJoshua Harlow