summaryrefslogtreecommitdiff
path: root/doc/rtd/topics/merging.rst
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2013-03-08 15:57:05 -0800
committerJoshua Harlow <harlowja@yahoo-inc.com>2013-03-08 15:57:05 -0800
commit73cba9d1f841020b0ee1304f204923d994dd5363 (patch)
treebd3169edfc958b0ecd0eaf91ea244e51963c2ac4 /doc/rtd/topics/merging.rst
parent973747b00af47c94ba0a719452aa823fb688e5ab (diff)
downloadvyos-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/topics/merging.rst')
-rw-r--r--doc/rtd/topics/merging.rst5
1 files changed, 5 insertions, 0 deletions
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