<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vyos-cloud-init.git/doc/rtd/topics/merging.rst, branch rolling</title>
<subtitle> (mirror of https://github.com/vyos/vyos-cloud-init.git)
</subtitle>
<id>https://git.amelek.net/vyos/vyos-cloud-init.git/atom?h=rolling</id>
<link rel='self' href='https://git.amelek.net/vyos/vyos-cloud-init.git/atom?h=rolling'/>
<link rel='alternate' type='text/html' href='https://git.amelek.net/vyos/vyos-cloud-init.git/'/>
<updated>2022-02-10T21:44:37+00:00</updated>
<entry>
<title>minor improvements to documentation (#1259)</title>
<updated>2022-02-10T21:44:37+00:00</updated>
<author>
<name>Mark Esler</name>
<email>eslerm@umn.edu</email>
</author>
<published>2022-02-10T21:44:37+00:00</published>
<link rel='alternate' type='text/html' href='https://git.amelek.net/vyos/vyos-cloud-init.git/commit/?id=cbe840ac7247c9bf79cf63100b7f85ef38758763'/>
<id>urn:sha1:cbe840ac7247c9bf79cf63100b7f85ef38758763</id>
<content type='text'>
* Primarily improved grammar for clarity.
* A few Sphinx/RST syntax fixes.
* Set text width to 79 characters per footer documentation
  where needed.
* Changed "yaml" to "YAML" when used in sentences.</content>
</entry>
<entry>
<title>docs: fix whitespace, spelling, and line length</title>
<updated>2019-09-04T13:43:11+00:00</updated>
<author>
<name>Joshua Powers</name>
<email>josh.powers@canonical.com</email>
</author>
<published>2019-09-04T13:43:11+00:00</published>
<link rel='alternate' type='text/html' href='https://git.amelek.net/vyos/vyos-cloud-init.git/commit/?id=da826cd3e4d608d8ddb4b693d10378b52532677b'/>
<id>urn:sha1:da826cd3e4d608d8ddb4b693d10378b52532677b</id>
<content type='text'>
</content>
</entry>
<entry>
<title>doc: update merging doc with fixes and some additional details/examples</title>
<updated>2019-02-22T09:56:03+00:00</updated>
<author>
<name>Ryan Harper</name>
<email>ryan.harper@canonical.com</email>
</author>
<published>2019-02-22T09:56:03+00:00</published>
<link rel='alternate' type='text/html' href='https://git.amelek.net/vyos/vyos-cloud-init.git/commit/?id=79d40e6b7bce33af69572c6054b3398b8d8077c7'/>
<id>urn:sha1:79d40e6b7bce33af69572c6054b3398b8d8077c7</id>
<content type='text'>
Update config merging documentation with cloud-config syntax fix.  Add an
example showing how to merge two files with runcmd.
</content>
</entry>
<entry>
<title>fix typos and remove whitespace in various docs</title>
<updated>2017-06-06T15:43:40+00:00</updated>
<author>
<name>Stephan Telling</name>
<email>st@telling.xyz</email>
</author>
<published>2017-06-01T20:08:29+00:00</published>
<link rel='alternate' type='text/html' href='https://git.amelek.net/vyos/vyos-cloud-init.git/commit/?id=dc0e70d155b4ff7a3c914ae7aaed3a52571e2107'/>
<id>urn:sha1:dc0e70d155b4ff7a3c914ae7aaed3a52571e2107</id>
<content type='text'>
</content>
</entry>
<entry>
<title>doc: correct grammar and improve clarity in merging documentation.</title>
<updated>2017-04-12T19:35:58+00:00</updated>
<author>
<name>David Tagatac</name>
<email>david@tagatac.net</email>
</author>
<published>2017-04-07T21:24:57+00:00</published>
<link rel='alternate' type='text/html' href='https://git.amelek.net/vyos/vyos-cloud-init.git/commit/?id=d690216b67ab6f4cf0aaaba78abd1aa3da4e38df'/>
<id>urn:sha1:d690216b67ab6f4cf0aaaba78abd1aa3da4e38df</id>
<content type='text'>
Move merging.rst into doc/rtd/topics with small fixes.
</content>
</entry>
<entry>
<title>doc: make the RST files consistently formated and other improvements.</title>
<updated>2016-11-10T21:48:58+00:00</updated>
<author>
<name>Scott Moser</name>
<email>smoser@brickies.net</email>
</author>
<published>2016-11-10T21:42:43+00:00</published>
<link rel='alternate' type='text/html' href='https://git.amelek.net/vyos/vyos-cloud-init.git/commit/?id=127f0f5076bf8e5c53dd538899199455ebc08fbc'/>
<id>urn:sha1:127f0f5076bf8e5c53dd538899199455ebc08fbc</id>
<content type='text'>
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.
</content>
</entry>
<entry>
<title>Update merging documentation to make its application clearer</title>
<updated>2016-05-20T12:13:08+00:00</updated>
<author>
<name>Daniel Watkins</name>
<email>daniel.watkins@canonical.com</email>
</author>
<published>2016-05-20T12:13:08+00:00</published>
<link rel='alternate' type='text/html' href='https://git.amelek.net/vyos/vyos-cloud-init.git/commit/?id=b699df642dec996c517a94ea44f5e763c08570d0'/>
<id>urn:sha1:b699df642dec996c517a94ea44f5e763c08570d0</id>
<content type='text'>
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
</content>
</entry>
<entry>
<title>Enable the merging.txt to be in .rst format for public viewing</title>
<updated>2013-03-08T23:57:05+00:00</updated>
<author>
<name>Joshua Harlow</name>
<email>harlowja@yahoo-inc.com</email>
</author>
<published>2013-03-08T23:57:05+00:00</published>
<link rel='alternate' type='text/html' href='https://git.amelek.net/vyos/vyos-cloud-init.git/commit/?id=73cba9d1f841020b0ee1304f204923d994dd5363'/>
<id>urn:sha1:73cba9d1f841020b0ee1304f204923d994dd5363</id>
<content type='text'>
</content>
</entry>
</feed>
