diff options
| author | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2013-12-05 15:32:55 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-11 14:19:26 +0000 |
| commit | 76a5d86e25dcfaaea11d8e95edda2da67b6dd2e1 (patch) | |
| tree | d7c8b7ab80c9169f809bad6cb636a247df6ad346 /documentation | |
| parent | 58e3323caf3d0243e0a0af864705ccd74c996ce6 (diff) | |
| download | ast2050-yocto-poky-76a5d86e25dcfaaea11d8e95edda2da67b6dd2e1.zip ast2050-yocto-poky-76a5d86e25dcfaaea11d8e95edda2da67b6dd2e1.tar.gz | |
ref-manual: Edits to update-alternatives class.
Also had to update four instances in the variables glossary where
links to the section for the class became misnamed due to
stripping out the excess stuff from the class section heading.
(From yocto-docs rev: d98d3848327950c5c5cfc8559379e56c97157ad2)
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
| -rw-r--r-- | documentation/ref-manual/ref-classes.xml | 8 | ||||
| -rw-r--r-- | documentation/ref-manual/ref-variables.xml | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/documentation/ref-manual/ref-classes.xml b/documentation/ref-manual/ref-classes.xml index 17784c2..21f125b 100644 --- a/documentation/ref-manual/ref-classes.xml +++ b/documentation/ref-manual/ref-classes.xml @@ -2705,17 +2705,17 @@ </section> <section id='ref-classes-update-alternatives'> - <title>Alternatives - <filename>update-alternatives.bbclass</filename></title> + <title><filename>update-alternatives.bbclass</filename></title> <para> - This class helps the alternatives system when multiple sources provide - the same command. + The <filename>update-alternatives</filename> class helps the + alternatives system when multiple sources provide the same command. This situation occurs when several programs that have the same or similar function are installed with the same name. For example, the <filename>ar</filename> command is available from the <filename>busybox</filename>, <filename>binutils</filename> and <filename>elfutils</filename> packages. - The <filename>update-alternatives.bbclass</filename> class handles + The <filename>update-alternatives</filename> class handles renaming the binaries so that multiple packages can be installed without conflicts. The <filename>ar</filename> command still works regardless of which diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml index 7ece12c..4a0e4d1 100644 --- a/documentation/ref-manual/ref-variables.xml +++ b/documentation/ref-manual/ref-variables.xml @@ -89,7 +89,7 @@ ALTERNATIVE_busybox = "sh sed test bracket" </literallayout> For more information on the alternatives system, see the - "<link linkend='ref-classes-update-alternatives'>Alternatives - <filename>update-alternatives.bbclass</filename></link>" + "<link linkend='ref-classes-update-alternatives'><filename>update-alternatives.bbclass</filename></link>" section. </para> </glossdef> @@ -122,7 +122,7 @@ <para> For more information on the alternatives system, see the - "<link linkend='ref-classes-update-alternatives'>Alternatives - <filename>update-alternatives.bbclass</filename></link>" + "<link linkend='ref-classes-update-alternatives'><filename>update-alternatives.bbclass</filename></link>" section. </para> </glossdef> @@ -147,7 +147,7 @@ <para> For more information on the alternatives system, see the - "<link linkend='ref-classes-update-alternatives'>Alternatives - <filename>update-alternatives.bbclass</filename></link>" + "<link linkend='ref-classes-update-alternatives'><filename>update-alternatives.bbclass</filename></link>" section. </para> </glossdef> @@ -197,7 +197,7 @@ <para> For more information on the alternatives system, see the - "<link linkend='ref-classes-update-alternatives'>Alternatives - <filename>update-alternatives.bbclass</filename></link>" + "<link linkend='ref-classes-update-alternatives'><filename>update-alternatives.bbclass</filename></link>" section. </para> </glossdef> |
