summaryrefslogtreecommitdiff
path: root/doc/rtd
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-06-02 16:45:58 -0400
committerScott Moser <smoser@ubuntu.com>2016-06-02 16:45:58 -0400
commit8ddfc28d055b610f592802e4c9fd4c3ede778918 (patch)
tree76a37c2aa6db0258ad7d2ca87c3e68df1c2e4dc9 /doc/rtd
parentd709524941ba2b4e06940a9eb0861f0819d5560f (diff)
parent710590d3a32e6b77222b288e5b751e7296abb2b4 (diff)
downloadvyos-cloud-init-8ddfc28d055b610f592802e4c9fd4c3ede778918.tar.gz
vyos-cloud-init-8ddfc28d055b610f592802e4c9fd4c3ede778918.zip
merge with trunk
Diffstat (limited to 'doc/rtd')
-rw-r--r--doc/rtd/topics/merging.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/rtd/topics/merging.rst b/doc/rtd/topics/merging.rst
index 8a03f3c7..2bd87b16 100644
--- a/doc/rtd/topics/merging.rst
+++ b/doc/rtd/topics/merging.rst
@@ -1,5 +1,5 @@
-=========
-Merging
-=========
+==========================
+Merging User-Data Sections
+==========================
.. include:: ../../merging.rst