diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-03-08 15:57:05 -0800 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-03-08 15:57:05 -0800 |
| commit | 73cba9d1f841020b0ee1304f204923d994dd5363 (patch) | |
| tree | bd3169edfc958b0ecd0eaf91ea244e51963c2ac4 /doc/rtd | |
| parent | 973747b00af47c94ba0a719452aa823fb688e5ab (diff) | |
| download | vyos-cloud-init-73cba9d1f841020b0ee1304f204923d994dd5363.tar.gz vyos-cloud-init-73cba9d1f841020b0ee1304f204923d994dd5363.zip | |
Enable the merging.txt to be in .rst format for public viewing
Diffstat (limited to 'doc/rtd')
| -rw-r--r-- | doc/rtd/index.rst | 1 | ||||
| -rw-r--r-- | doc/rtd/topics/merging.rst | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/rtd/index.rst b/doc/rtd/index.rst index 619bb5dc..fe04b1a9 100644 --- a/doc/rtd/index.rst +++ b/doc/rtd/index.rst @@ -24,6 +24,7 @@ Summary topics/examples topics/datasources topics/modules + topics/merging topics/moreinfo topics/hacking diff --git a/doc/rtd/topics/merging.rst b/doc/rtd/topics/merging.rst new file mode 100644 index 00000000..8a03f3c7 --- /dev/null +++ b/doc/rtd/topics/merging.rst @@ -0,0 +1,5 @@ +========= +Merging +========= + +.. include:: ../../merging.rst |