diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-04-02 11:51:54 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-04-02 11:51:54 -0700 |
| commit | 7dac7bbd48bb56971c2fddfcf13d439d577740c1 (patch) | |
| tree | bb3968827ce2fefa8d043bd514285c5f0b6c5e75 /doc | |
| parent | 19b11d7e269360880d11d883a59b80b2909cee0f (diff) | |
| download | vyos-cloud-init-7dac7bbd48bb56971c2fddfcf13d439d577740c1.tar.gz vyos-cloud-init-7dac7bbd48bb56971c2fddfcf13d439d577740c1.zip | |
Fix the default string used for merging.
It had been changed in code, but not in docs. So we needed
to reflect the change in docs as well so that both are in
sync.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/merging.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/merging.rst b/doc/merging.rst index 6344facd..d4d5cd05 100644 --- a/doc/merging.rst +++ b/doc/merging.rst @@ -145,7 +145,7 @@ For example, the default string that is used when none is provided is the follow :: - list(extend)+dict()+str(append) + list()+dict()+str() Dictionary format ******** |