Small documentation fix

* Fixed component origin parameters list
* Fixed small typo

Change-Id: Ifdb49627e7f4f8bf0a4165c5dac6d5a2c139ee8f
This commit is contained in:
Stanislav Kudriashev 2014-02-10 16:59:56 +02:00
parent 83a9d4eb38
commit 31f6fc18db
2 changed files with 6 additions and 5 deletions

View File

@ -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

View File

@ -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: <repo_url>`` - required
- ``branch: <branch>`` - optional
- ``tag: <tag>`` - optional
- ``repo: <repo_url>`` - required
- ``branch: <branch>`` - optional
- ``tag: <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!