summaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2013-12-05 15:32:55 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-11 14:19:26 +0000
commit76a5d86e25dcfaaea11d8e95edda2da67b6dd2e1 (patch)
treed7c8b7ab80c9169f809bad6cb636a247df6ad346 /documentation
parent58e3323caf3d0243e0a0af864705ccd74c996ce6 (diff)
downloadpoky-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.xml8
-rw-r--r--documentation/ref-manual/ref-variables.xml8
2 files changed, 8 insertions, 8 deletions
diff --git a/documentation/ref-manual/ref-classes.xml b/documentation/ref-manual/ref-classes.xml
index 17784c2628..21f125b6ad 100644
--- a/documentation/ref-manual/ref-classes.xml
+++ b/documentation/ref-manual/ref-classes.xml
@@ -2705,17 +2705,17 @@
2705</section> 2705</section>
2706 2706
2707<section id='ref-classes-update-alternatives'> 2707<section id='ref-classes-update-alternatives'>
2708 <title>Alternatives - <filename>update-alternatives.bbclass</filename></title> 2708 <title><filename>update-alternatives.bbclass</filename></title>
2709 2709
2710 <para> 2710 <para>
2711 This class helps the alternatives system when multiple sources provide 2711 The <filename>update-alternatives</filename> class helps the
2712 the same command. 2712 alternatives system when multiple sources provide the same command.
2713 This situation occurs when several programs that have the same or 2713 This situation occurs when several programs that have the same or
2714 similar function are installed with the same name. 2714 similar function are installed with the same name.
2715 For example, the <filename>ar</filename> command is available from the 2715 For example, the <filename>ar</filename> command is available from the
2716 <filename>busybox</filename>, <filename>binutils</filename> and 2716 <filename>busybox</filename>, <filename>binutils</filename> and
2717 <filename>elfutils</filename> packages. 2717 <filename>elfutils</filename> packages.
2718 The <filename>update-alternatives.bbclass</filename> class handles 2718 The <filename>update-alternatives</filename> class handles
2719 renaming the binaries so that multiple packages can be installed 2719 renaming the binaries so that multiple packages can be installed
2720 without conflicts. 2720 without conflicts.
2721 The <filename>ar</filename> command still works regardless of which 2721 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 7ece12cc2c..4a0e4d1047 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -89,7 +89,7 @@
89 ALTERNATIVE_busybox = "sh sed test bracket" 89 ALTERNATIVE_busybox = "sh sed test bracket"
90 </literallayout> 90 </literallayout>
91 For more information on the alternatives system, see the 91 For more information on the alternatives system, see the
92 "<link linkend='ref-classes-update-alternatives'>Alternatives - <filename>update-alternatives.bbclass</filename></link>" 92 "<link linkend='ref-classes-update-alternatives'><filename>update-alternatives.bbclass</filename></link>"
93 section. 93 section.
94 </para> 94 </para>
95 </glossdef> 95 </glossdef>
@@ -122,7 +122,7 @@
122 122
123 <para> 123 <para>
124 For more information on the alternatives system, see the 124 For more information on the alternatives system, see the
125 "<link linkend='ref-classes-update-alternatives'>Alternatives - <filename>update-alternatives.bbclass</filename></link>" 125 "<link linkend='ref-classes-update-alternatives'><filename>update-alternatives.bbclass</filename></link>"
126 section. 126 section.
127 </para> 127 </para>
128 </glossdef> 128 </glossdef>
@@ -147,7 +147,7 @@
147 147
148 <para> 148 <para>
149 For more information on the alternatives system, see the 149 For more information on the alternatives system, see the
150 "<link linkend='ref-classes-update-alternatives'>Alternatives - <filename>update-alternatives.bbclass</filename></link>" 150 "<link linkend='ref-classes-update-alternatives'><filename>update-alternatives.bbclass</filename></link>"
151 section. 151 section.
152 </para> 152 </para>
153 </glossdef> 153 </glossdef>
@@ -197,7 +197,7 @@
197 197
198 <para> 198 <para>
199 For more information on the alternatives system, see the 199 For more information on the alternatives system, see the
200 "<link linkend='ref-classes-update-alternatives'>Alternatives - <filename>update-alternatives.bbclass</filename></link>" 200 "<link linkend='ref-classes-update-alternatives'><filename>update-alternatives.bbclass</filename></link>"
201 section. 201 section.
202 </para> 202 </para>
203 </glossdef> 203 </glossdef>