sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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: 2b7c245021d16a22fb5a2e14e26b2f9b0082a669)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Scott Rifenbark 2013-12-05 15:32:55 -06:00 committed by Richard Purdie
parent aa12d3bc48
commit ba1af319de
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
documentation/ref-manual/ref-classes.xml
View File

@ -2705,17 +2705,17 @@
</section> </section>
<section id='ref-classes-update-alternatives'> <section id='ref-classes-update-alternatives'>
<title>Alternatives - <filename>update-alternatives.bbclass</filename></title> <title><filename>update-alternatives.bbclass</filename></title>
<para> <para>
This class helps the alternatives system when multiple sources provide The <filename>update-alternatives</filename> class helps the
the same command. alternatives system when multiple sources provide the same command.
This situation occurs when several programs that have the same or This situation occurs when several programs that have the same or
similar function are installed with the same name. similar function are installed with the same name.
For example, the <filename>ar</filename> command is available from the For example, the <filename>ar</filename> command is available from the
<filename>busybox</filename>, <filename>binutils</filename> and <filename>busybox</filename>, <filename>binutils</filename> and
<filename>elfutils</filename> packages. <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 renaming the binaries so that multiple packages can be installed
without conflicts. without conflicts.
The <filename>ar</filename> command still works regardless of which The <filename>ar</filename> command still works regardless of which

8
documentation/ref-manual/ref-variables.xml
View File

@ -89,7 +89,7 @@
ALTERNATIVE_busybox = "sh sed test bracket" ALTERNATIVE_busybox = "sh sed test bracket"
</literallayout> </literallayout>
For more information on the alternatives system, see the 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. section.
</para> </para>
</glossdef> </glossdef>
@ -122,7 +122,7 @@
<para> <para>
For more information on the alternatives system, see the 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. section.
</para> </para>
</glossdef> </glossdef>
@ -147,7 +147,7 @@
<para> <para>
For more information on the alternatives system, see the 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. section.
</para> </para>
</glossdef> </glossdef>
@ -197,7 +197,7 @@
<para> <para>
For more information on the alternatives system, see the 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. section.
</para> </para>
</glossdef> </glossdef>