diff --git a/docs/source/topics/dev_notes/architecture.rst b/docs/source/topics/dev_notes/architecture.rst index 7cdf3617..b107a9fb 100644 --- a/docs/source/topics/dev_notes/architecture.rst +++ b/docs/source/topics/dev_notes/architecture.rst @@ -103,7 +103,7 @@ Anvil is designed to have the following set of software components: configuration driven (code when you need it but avoid it if you can). Distributions as seen by the ``conf/distros`` folder specify distribution-specific *configuration* that can be referenced by standard keys by a given - component. Each component also receives additonal configuration (accessible via a components + component. Each component also receives additional configuration (accessible via a components ``get_option`` function) via the yaml files specified in ``conf/components`` which provides for a way to have configuration that is not distribution specific but instead is component specific (say for configuring *nova* to use kvm instead of qemu). This diff --git a/docs/source/topics/qanda.rst b/docs/source/topics/qanda.rst index 82254085..07d79a32 100644 --- a/docs/source/topics/qanda.rst +++ b/docs/source/topics/qanda.rst @@ -51,12 +51,13 @@ An example of this, lets adjust ``nova`` to use the ``stable/essex`` branch. branch: stable/essex - Component origin parameters are: - - ``repo: `` - required - - ``branch: `` - optional - - ``tag: `` - optional + - ``repo: `` - required + - ``branch: `` - optional + - ``tag: `` - optional + If no branch nor tag parameters were specified then ``branch: master`` is used by default. - - **Note:** tag overrides branch (so you can't really include both) + **Note:** tag overrides branch (so you can't really include both) `OMG` the images take forever to download!