vyos-cloud-init.git/doc/merging.rst, branch rolling (mirror of https://github.com/vyos/vyos-cloud-init.git) https://git.amelek.net/vyos/vyos-cloud-init.git/atom?h=rolling 2017-04-12T19:35:58+00:00 doc: correct grammar and improve clarity in merging documentation. 2017-04-12T19:35:58+00:00 David Tagatac david@tagatac.net 2017-04-07T21:24:57+00:00 urn:sha1:d690216b67ab6f4cf0aaaba78abd1aa3da4e38df Move merging.rst into doc/rtd/topics with small fixes. doc: make the RST files consistently formated and other improvements. 2016-11-10T21:48:58+00:00 Scott Moser smoser@brickies.net 2016-11-10T21:42:43+00:00 urn:sha1:127f0f5076bf8e5c53dd538899199455ebc08fbc 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. Integrate MP feedback 2016-06-02T15:20:18+00:00 Daniel Watkins daniel.watkins@canonical.com 2016-06-02T15:20:18+00:00 urn:sha1:75907ec96181599dc0282aac989ce02a88c3b39d Update merging documentation to make its application clearer 2016-05-20T12:13:08+00:00 Daniel Watkins daniel.watkins@canonical.com 2016-05-20T12:13:08+00:00 urn:sha1:b699df642dec996c517a94ea44f5e763c08570d0 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 Clean up merging.rst formatting 2016-05-20T12:03:42+00:00 Daniel Watkins daniel.watkins@canonical.com 2016-05-20T12:03:42+00:00 urn:sha1:1df451e76d98371cf54e7a474c4d46fa3a96361a Fix the default string used for merging. 2013-04-02T18:51:54+00:00 Joshua Harlow harlowja@yahoo-inc.com 2013-04-02T18:51:54+00:00 urn:sha1:7dac7bbd48bb56971c2fddfcf13d439d577740c1 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. Enable the merging.txt to be in .rst format for public viewing 2013-03-08T23:57:05+00:00 Joshua Harlow harlowja@yahoo-inc.com 2013-03-08T23:57:05+00:00 urn:sha1:73cba9d1f841020b0ee1304f204923d994dd5363