diff options
| author | Scott Moser <smoser@brickies.net> | 2016-11-15 12:06:58 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-11-15 12:06:58 -0500 |
| commit | eb29af61f9388de7a69bf7112193976dd4feb6db (patch) | |
| tree | 0a12d1de1bc6bb5527a3f99d01401df95250c0c7 /doc/rtd/topics/merging.rst | |
| parent | 4613bb45dde05cc859a0b4dec6587d80767b47c7 (diff) | |
| parent | 584b8434872322a9f617831742cc6b15977ecfbc (diff) | |
| download | vyos-cloud-init-eb29af61f9388de7a69bf7112193976dd4feb6db.tar.gz vyos-cloud-init-eb29af61f9388de7a69bf7112193976dd4feb6db.zip | |
merge from master at 0.7.8-45-g584b843
Diffstat (limited to 'doc/rtd/topics/merging.rst')
| -rw-r--r-- | doc/rtd/topics/merging.rst | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/rtd/topics/merging.rst b/doc/rtd/topics/merging.rst index 2bd87b16..eca118f5 100644 --- a/doc/rtd/topics/merging.rst +++ b/doc/rtd/topics/merging.rst @@ -1,5 +1,6 @@ -========================== +************************** Merging User-Data Sections -========================== +************************** .. include:: ../../merging.rst +.. vi: textwidth=78 |