ref-manual: Updated 1.5 Migration section and COMPLEMENTARY_GLOB variable

Review edits from Paul Egglegon applied to the Migrating to
1.5 section.

Also, part of the review affected the COMPLEMENTARY_GLOB variable
entry in the glossary.

(From yocto-docs rev: 941a388f45c99403f5cb480bf3e5aae55a800994)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 25 insertions, 25 deletions

diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index cf964c78a7..8133b9d14b 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -822,15 +822,15 @@ Core layer for images cannot be removed
         <glossentry id='var-BUSYBOX_SPLIT_SUID'><glossterm>BUSYBOX_SPLIT_SUID</glossterm>
             <glossdef>
                 <para>
-                    For the BusyBox recipe, specifies whether to split the 
-                    output executable file into two parts: one for features 
-                    that require <filename>setuid root</filename>, and one for 
+                    For the BusyBox recipe, specifies whether to split the
+                    output executable file into two parts: one for features
+                    that require <filename>setuid root</filename>, and one for
                     the remaining features (i.e. those that do not require
-                    <filename>setuid root</filename>). 
+                    <filename>setuid root</filename>).
                 </para>
 
                 <para>
-                    The <filename>BUSYBOX_SPLIT_SUID</filename> variable 
+                    The <filename>BUSYBOX_SPLIT_SUID</filename> variable
                     defaults to "1", which results in a single output
                     executable file.
                     Set the variable to "0" to split the output file.
@@ -907,21 +907,21 @@ Core layer for images cannot be removed
         <glossentry id='var-COMPLEMENTARY_GLOB'><glossterm>COMPLEMENTARY_GLOB</glossterm>
             <glossdef>
                 <para>
-                    Defines wildcards you can use when installing a list of 
-                    complementary packages for all the packages explicitly 
+                    Defines wildcards to match when installing a list of
+                    complementary packages for all the packages explicitly
                     (or implicitly) installed in an image.
-                    The resulting list of complementary packages is associated 
-                    with an item that can be added to  
+                    The resulting list of complementary packages is associated
+                    with an item that can be added to
                     <link linkend='var-IMAGE_FEATURES'><filename>IMAGE_FEATURES</filename></link>.
-                    An example usage of this is the "dev-pkgs" item that when 
+                    An example usage of this is the "dev-pkgs" item that when
                     added to <filename>IMAGE_FEATURES</filename> will
-                    install -dev packages (containing headers and other 
+                    install -dev packages (containing headers and other
                     development files) for every package in the image.
                 </para>
 
                 <para>
-                    To add a new feature item pointing to a wildcard, use a 
-                    variable flag to specify the feature item name and 
+                    To add a new feature item pointing to a wildcard, use a
+                    variable flag to specify the feature item name and
                     use the value to specify the wildcard.
                     Here is an example:
                     <literallayout class='monospaced'>
@@ -1911,8 +1911,8 @@ Core layer for images cannot be removed
         <glossentry id='var-IMAGE_BASENAME'><glossterm>IMAGE_BASENAME</glossterm>
             <glossdef>
                 <para>
-                    The base name of image output files. 
-                    This variable defaults to the recipe name 
+                    The base name of image output files.
+                    This variable defaults to the recipe name
                     (<filename>${</filename><link linkend='var-PN'><filename>PN</filename></link><filename>}</filename>).
                 </para>
             </glossdef>
@@ -3705,8 +3705,8 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
         <glossentry id='var-PACKAGE_GROUP'><glossterm>PACKAGE_GROUP</glossterm>
             <glossdef>
                 <para>
-                    Defines one or more packages to include in an image when 
-                    a specific item is included in 
+                    Defines one or more packages to include in an image when
+                    a specific item is included in
                     <link linkend='var-IMAGE_FEATURES'><filename>IMAGE_FEATURES</filename></link>.
                     When setting the value, <filename>PACKAGE_GROUP</filename>
                     should have the name of the feature item as an override.
@@ -3714,15 +3714,15 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     <literallayout class='monospaced'>
      PACKAGE_GROUP_widget = "package1 package2"
                     </literallayout>
-                    In this example, if "widget" were added to 
+                    In this example, if "widget" were added to
                     <filename>IMAGE_FEATURES</filename>, "package1" and
                     "package2" would be included in the image.
                     <note>
-                        Packages installed by features defined through 
-                        <filename>PACKAGE_GROUP</filename> are often package 
+                        Packages installed by features defined through
+                        <filename>PACKAGE_GROUP</filename> are often package
                         groups.
-                        While similarly named, you should not confuse the 
-                        <filename>PACKAGE_GROUP</filename> variable with 
+                        While similarly named, you should not confuse the
+                        <filename>PACKAGE_GROUP</filename> variable with
                         package groups, which are discussed elsewhere in the
                         documentation.
                     </note>
@@ -4680,7 +4680,7 @@ PARALLEL_MAKEINST with the description ".
         <glossentry id='var-SDK_ARCH'><glossterm>SDK_ARCH</glossterm>
             <glossdef>
                 <para>
-                    The target architecture for the SDK. 
+                    The target architecture for the SDK.
                     Typically, you do not directly set this variable.
                     Instead, use
                     <link linkend='var-SDKMACHINE'><filename>SDKMACHINE</filename></link>.
@@ -5623,8 +5623,8 @@ PARALLEL_MAKEINST with the description ".
         <glossentry id='var-TUNE_PKGARCH'><glossterm>TUNE_PKGARCH</glossterm>
             <glossdef>
                 <para>
-                    The package architecture understood by the packaging 
-                    system to define the architecture, ABI, and tuning of 
+                    The package architecture understood by the packaging
+                    system to define the architecture, ABI, and tuning of
                     output packages.
                 </para>
             </glossdef>