diff options
author | Joshua Powers <josh.powers@canonical.com> | 2019-12-13 13:49:58 -0800 |
---|---|---|
committer | Chad Smith <chad.smith@canonical.com> | 2019-12-13 14:49:58 -0700 |
commit | f5262e29cdbb5146e4e53f31f4d53fefe4a4052f (patch) | |
tree | 5ae7aa0847604a5dba5954590a271bff73ffa86c | |
parent | 72bc997bedcd41cd25e64e3e262ed9c7b9635011 (diff) | |
download | vyos-cloud-init-f5262e29cdbb5146e4e53f31f4d53fefe4a4052f.tar.gz vyos-cloud-init-f5262e29cdbb5146e4e53f31f4d53fefe4a4052f.zip |
docs: clear up apt config sections (#107)
More clearly differentiate between the primary apt repo configuration
and any 3rd party apt configuration.
LP: #1832823
-rw-r--r-- | doc/examples/cloud-config-add-apt-repos.txt | 6 | ||||
-rw-r--r-- | doc/rtd/topics/examples.rst | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/doc/examples/cloud-config-add-apt-repos.txt b/doc/examples/cloud-config-add-apt-repos.txt index 22ef7612..97722107 100644 --- a/doc/examples/cloud-config-add-apt-repos.txt +++ b/doc/examples/cloud-config-add-apt-repos.txt @@ -1,6 +1,10 @@ #cloud-config -# Add apt repositories +# Add primary apt repositories +# +# To add 3rd party repositories, see cloud-config-apt.txt or the +# Additional apt configuration and repositories section. +# # # Default: auto select based on cloud metadata # in ec2, the default is <region>.archive.ubuntu.com diff --git a/doc/rtd/topics/examples.rst b/doc/rtd/topics/examples.rst index 62b8ee49..94e6ed18 100644 --- a/doc/rtd/topics/examples.rst +++ b/doc/rtd/topics/examples.rst @@ -60,8 +60,8 @@ Setup and run `puppet`_ :language: yaml :linenos: -Add apt repositories -==================== +Add primary apt repositories +============================ .. literalinclude:: ../../examples/cloud-config-add-apt-repos.txt :language: yaml @@ -135,8 +135,8 @@ Configure instances ssh-keys :language: yaml :linenos: -Additional apt configuration -============================ +Additional apt configuration and repositories +============================================= .. literalinclude:: ../../examples/cloud-config-apt.txt :language: yaml |