ref-manual: Repositioned PNG files for context image.

I moved the PNG file for the context to be the first item displayed
for a given glossary term.  The PNG file must be negatively indented
though to look decent.

Fixes [YOCTO #5601]

These reformatting changes were needed because of brower incompatibilities
discovered with the existing solution for displaying these PNG files
with glossary terms.

(From yocto-docs rev: 06aeb6540c1343825369dd02006cb19e5a318d48)

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

1 files changed, 1319 insertions, 1036 deletions

diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index 84c5295046..8d444a4687 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -46,12 +46,12 @@
 
     <glossdiv id='var-glossary-a'><title>A</title>
 
-        <glossentry id='var-ABIEXTENSION'><glossterm>ABIEXTENSION<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-ABIEXTENSION'><glossterm>ABIEXTENSION</glossterm>
             <info>
                 ABIEXTENSION[doc] = "Extension to the Application Binary Interface (ABI) field of the GNU canonical architecture name (e.g. "eabi")."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Extension to the Application Binary Interface (ABI)
                     field of the GNU canonical architecture name
                     (e.g. "eabi").
@@ -69,12 +69,12 @@
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-ALLOW_EMPTY'><glossterm>ALLOW_EMPTY<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-ALLOW_EMPTY'><glossterm>ALLOW_EMPTY</glossterm>
             <info>
                 ALLOW_EMPTY[doc] = "Specifies if an output package should still be produced if it is empty."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                    Specifies if an output package should still be produced if it is empty.
                    By default, BitBake does not produce empty packages.
                    This default behavior can cause issues when there is an
@@ -94,12 +94,12 @@
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-ALTERNATIVE'><glossterm>ALTERNATIVE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-ALTERNATIVE'><glossterm>ALTERNATIVE</glossterm>
             <info>
                 ALTERNATIVE[doc] = "Lists commands in a package that need an alternative binary naming scheme."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Lists commands in a package that need an alternative
                     binary naming scheme.
                     Sometimes the same command is provided in multiple packages.
@@ -124,12 +124,12 @@
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-ALTERNATIVE_LINK_NAME'><glossterm>ALTERNATIVE_LINK_NAME<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-ALTERNATIVE_LINK_NAME'><glossterm>ALTERNATIVE_LINK_NAME</glossterm>
             <info>
                 ALTERNATIVE_LINK_NAME[doc] = "Used by the alternatives system to map duplicated commands to actual locations."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Used by the alternatives system to map duplicated commands
                     to actual locations.
                     For example, if the <filename>bracket</filename> command
@@ -140,6 +140,9 @@
                     <literallayout class='monospaced'>
      ALTERNATIVE_LINK_NAME[bracket] = "/usr/bin/["
                     </literallayout>
+                </para>
+
+                <para>
                     In this example, the binary for the
                     <filename>bracket</filename> command (i.e.
                     <filename>[</filename>) from the
@@ -160,12 +163,12 @@
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-ALTERNATIVE_PRIORITY'><glossterm>ALTERNATIVE_PRIORITY<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-ALTERNATIVE_PRIORITY'><glossterm>ALTERNATIVE_PRIORITY</glossterm>
             <info>
                 ALTERNATIVE_PRIORITY[doc] = "Used by the alternatives system to create default priorities for duplicated commands."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Used by the alternatives system to create default
                     priorities for duplicated commands.
                     You can use the variable to create a single default
@@ -188,12 +191,12 @@
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-ALTERNATIVE_TARGET'><glossterm>ALTERNATIVE_TARGET<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-ALTERNATIVE_TARGET'><glossterm>ALTERNATIVE_TARGET</glossterm>
             <info>
                 ALTERNATIVE_TARGET[doc] = "Used by the alternatives system to create default link locations for duplicated commands."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Used by the alternatives system to create default link
                     locations for duplicated commands.
                     You can use the variable to create a single default
@@ -242,12 +245,12 @@
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-APPEND'><glossterm>APPEND<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-APPEND'><glossterm>APPEND</glossterm>
             <info>
                 APPEND[doc] = "An override list of append strings for each LABEL."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     An override list of append strings for each
                     <link linkend='var-LABELS'><filename>LABEL</filename></link>.
                 </para>
@@ -260,36 +263,36 @@
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-AR'><glossterm>AR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-AR'><glossterm>AR</glossterm>
             <info>
                 AR[doc] = "Minimal command and arguments to run 'ar'."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The minimal command and arguments used to run
                     <filename>ar</filename>.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-AS'><glossterm>AS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-AS'><glossterm>AS</glossterm>
             <info>
                 AS[doc] = "Minimal command and arguments to run the assembler."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The minimal command and arguments used to run the
                     assembler.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-ASSUME_PROVIDED'><glossterm>ASSUME_PROVIDED<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-ASSUME_PROVIDED'><glossterm>ASSUME_PROVIDED</glossterm>
             <info>
                 ASSUME_PROVIDED[doc] = "Lists recipe names (PN values) BitBake does not attempt to build."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Lists recipe names
                     (<link linkend='var-PN'><filename>PN</filename></link>
                     values) BitBake does not attempt to build.
@@ -307,12 +310,12 @@
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-ASSUME_SHLIBS'><glossterm>ASSUME_SHLIBS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-ASSUME_SHLIBS'><glossterm>ASSUME_SHLIBS</glossterm>
             <info>
                 ASSUME_SHLIBS[doc] = Provides additional shlibs provider mapping information, which adds to or overwrites the information provided automatically by the system."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Provides additional <filename>shlibs</filename> provider
                     mapping information, which adds to or overwrites the
                     information provided automatically by the system.
@@ -341,24 +344,24 @@
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-AUTHOR'><glossterm>AUTHOR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-AUTHOR'><glossterm>AUTHOR</glossterm>
             <info>
                 AUTHOR[doc] = "Email address used to contact the original author or authors in order to send patches and forward bugs."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The email address used to contact the original author
                     or authors in order to send patches and forward bugs.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-AUTO_LIBNAME_PKGS'><glossterm>AUTO_LIBNAME_PKGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-AUTO_LIBNAME_PKGS'><glossterm>AUTO_LIBNAME_PKGS</glossterm>
             <info>
                 AUTO_LIBNAME_PKGS[doc] = "Specifies which packages should be checked for libraries and renamed according to Debian library package naming."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When the
                     <link linkend='ref-classes-debian'><filename>debian</filename></link>
                     class is inherited, which is the default behavior,
@@ -375,12 +378,12 @@
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-AUTO_SYSLINUXMENU'><glossterm>AUTO_SYSLINUXMENU<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-AUTO_SYSLINUXMENU'><glossterm>AUTO_SYSLINUXMENU</glossterm>
             <info>
                 AUTO_SYSLINUXMENU[doc] = "Enables creating an automatic menu for the syslinux bootloader."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Enables creating an automatic menu for the syslinux
                     bootloader.
                     You must set this variable in your recipe.
@@ -391,12 +394,12 @@
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-AUTOREV'><glossterm>AUTOREV<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-AUTOREV'><glossterm>AUTOREV</glossterm>
             <info>
                 AUTOREV[doc] = "When SRCREV is set to the value of this variable, it specifies to use the latest source revision in the repository."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When
                     <filename><link linkend='var-SRCREV'>SRCREV</link></filename>
                     is set to the value of this variable, it specifies to use
@@ -426,12 +429,12 @@
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-AVAILTUNES'><glossterm>AVAILTUNES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-AVAILTUNES'><glossterm>AVAILTUNES</glossterm>
             <info>
                 AVAILTUNES[doc] = "The list of defined CPU and Application Binary Interface (ABI) tunings (i.e.  "tunes") available for use by the OpenEmbedded build system."
             </info>
             <glossdef>
-                <para id='var-define-AVAILTUNES'>
+                <para id='var-define-AVAILTUNES' role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The list of defined CPU and Application Binary Interface
                     (ABI) tunings (i.e.  "tunes") available for use by the
                     OpenEmbedded build system.
@@ -453,11 +456,6 @@
                     "<ulink url='&YOCTO_DOCS_BB_URL;#basic-syntax'>Basic Syntax</ulink>"
                     section in the BitBake User Manual for more information.
                 </para>
-<!--
-<para id='var-context-AVAILTUNES'>
-meta/conf/machine/include/<architecture>/arch-<architecture>.inc
-</para>
--->
             </glossdef>
         </glossentry>
 
@@ -465,12 +463,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
 
     <glossdiv id='var-glossary-b'><title>B</title>
 
-        <glossentry id='var-B'><glossterm>B<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-B'><glossterm>B</glossterm>
             <info>
                 B[doc] = "The Build Directory. The OpenEmbedded build system places generated objects into the Build Directory during a recipe's build process."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The directory within the
                     <ulink url='&YOCTO_DOCS_DEV_URL;#build-directory'>Build Directory</ulink>
                     in which the OpenEmbedded build system places generated
@@ -480,6 +478,9 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
                     <literallayout class='monospaced'>
      S = "${WORKDIR}/${BP}/"
                     </literallayout>
+                </para>
+
+                <para>
                     You can separate the (<filename>S</filename>) directory
                     and the directory pointed to by the <filename>B</filename>
                     variable.
@@ -491,12 +492,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BAD_RECOMMENDATIONS'><glossterm>BAD_RECOMMENDATIONS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BAD_RECOMMENDATIONS'><glossterm>BAD_RECOMMENDATIONS</glossterm>
             <info>
                 BAD_RECOMMENDATIONS[doc] = "A list of packages not to install despite being recommended by a recipe. Support for this variable exists only when using the IPK packaging backend."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Lists "recommended-only" packages to not install.
                     Recommended-only packages are packages installed only
                     through the
@@ -508,6 +509,9 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
                     <literallayout class='monospaced'>
      BAD_RECOMMENDATIONS = "<replaceable>package_name</replaceable> <replaceable>package_name</replaceable> <replaceable>package_name</replaceable> ..."
                     </literallayout>
+                </para>
+
+                <para>
                     You can set this variable globally in your
                     <filename>local.conf</filename> file or you can attach it to
                     a specific image recipe by using the recipe name override:
@@ -542,12 +546,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BASE_LIB'><glossterm>BASE_LIB<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BASE_LIB'><glossterm>BASE_LIB</glossterm>
             <info>
                 BASE_LIB[doc] = "The library directory name for the CPU or Application Binary Interface (ABI) tune."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The library directory name for the CPU or Application
                     Binary Interface (ABI) tune.
                     The <filename>BASE_LIB</filename> applies only in the
@@ -567,24 +571,24 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BASE_WORKDIR'><glossterm>BASE_WORKDIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BASE_WORKDIR'><glossterm>BASE_WORKDIR</glossterm>
             <info>
                 BASE_WORKDIR[doc] = "Points to the base of the work directory for all recipes."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Points to the base of the work directory for all recipes.
                     The default value is "${TMPDIR}/work".
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BB_DANGLINGAPPENDS_WARNONLY'><glossterm>BB_DANGLINGAPPENDS_WARNONLY<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BB_DANGLINGAPPENDS_WARNONLY'><glossterm>BB_DANGLINGAPPENDS_WARNONLY</glossterm>
             <info>
                 BB_DANGLINGAPPENDS_WARNONLY[doc] = "Defines how BitBake handles situations where an append file (.bbappend) has no corresponding recipe file (.bb)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Defines how BitBake handles situations where an append
                     file (<filename>.bbappend</filename>) has no
                     corresponding recipe file (<filename>.bb</filename>).
@@ -616,12 +620,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BB_DISKMON_DIRS'><glossterm>BB_DISKMON_DIRS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BB_DISKMON_DIRS'><glossterm>BB_DISKMON_DIRS</glossterm>
             <info>
                 BB_DISKMON_DIRS[doc] = "Monitors disk space and available inodes during the build and allows you to control the build based on these parameters."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Monitors disk space and available inodes during the build
                     and allows you to control the build based on these
                     parameters.
@@ -714,12 +718,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BB_DISKMON_WARNINTERVAL'><glossterm>BB_DISKMON_WARNINTERVAL<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BB_DISKMON_WARNINTERVAL'><glossterm>BB_DISKMON_WARNINTERVAL</glossterm>
             <info>
                 BB_DISKMON_WARNINTERVAL[doc] = "Defines the disk space and free inode warning intervals. To set these intervals, define the variable in the conf/local.conf file in the Build Directory."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Defines the disk space and free inode warning intervals.
                     To set these intervals, define the variable in your
                     <filename>conf/local.conf</filename> file in the
@@ -785,12 +789,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BB_GENERATE_MIRROR_TARBALLS'><glossterm>BB_GENERATE_MIRROR_TARBALLS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BB_GENERATE_MIRROR_TARBALLS'><glossterm>BB_GENERATE_MIRROR_TARBALLS</glossterm>
             <info>
                 BB_GENERATE_MIRROR_TARBALLS[doc] = "Causes tarballs of the Git repositories to be placed in the DL_DIR directory."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Causes tarballs of the Git repositories, including the
                     Git metadata, to be placed in the
                     <link linkend='var-DL_DIR'><filename>DL_DIR</filename></link>
@@ -811,12 +815,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BB_NUMBER_THREADS'><glossterm>BB_NUMBER_THREADS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BB_NUMBER_THREADS'><glossterm>BB_NUMBER_THREADS</glossterm>
             <info>
                 BB_NUMBER_THREADS[doc] = "The maximum number of tasks BitBake should run in parallel at any one time. This variable is automatically configured to be equal to the number of build system cores."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The maximum number of tasks BitBake should run in parallel
                     at any one time.
                     The OpenEmbedded build system automatically configures
@@ -828,12 +832,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BBCLASSEXTEND'><glossterm>BBCLASSEXTEND<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BBCLASSEXTEND'><glossterm>BBCLASSEXTEND</glossterm>
             <info>
                 BBCLASSEXTEND[doc] = "Allows you to extend a recipe so that it builds variants of the software. Common variants for recipes are 'native', 'cross', 'nativesdk' and multilibs."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Allows you to extend a recipe so that it builds variants of the software.
                     Common variants for recipes exist such as "natives" like <filename>quilt-native</filename>,
                     which is a copy of Quilt built to run on the build system;
@@ -855,12 +859,13 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
              </glossdef>
         </glossentry>
 
-        <glossentry id='var-BBFILE_COLLECTIONS'><glossterm>BBFILE_COLLECTIONS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BBFILE_COLLECTIONS'><glossterm>BBFILE_COLLECTIONS</glossterm>
             <info>
                 BBFILE_COLLECTIONS[doc] = "Lists the names of configured layers. These names are used to find the other BBFILE_* variables."
             </info>
             <glossdef>
-                <para>Lists the names of configured layers.
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Lists the names of configured layers.
                     These names are used to find the other <filename>BBFILE_*</filename>
                     variables.
                     Typically, each layer will append its name to this variable in its
@@ -869,27 +874,33 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BBFILE_PATTERN'><glossterm>BBFILE_PATTERN<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BBFILE_PATTERN'><glossterm>BBFILE_PATTERN</glossterm>
             <info>
                 BBFILE_PATTERN[doc] = "Variable that expands to match files from BBFILES in a particular layer. This variable is used in the layer.conf file and must be suffixed with the name of a layer."
             </info>
             <glossdef>
-                <para>Variable that expands to match files from
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Variable that expands to match files from
                     <link linkend='var-BBFILES'><filename>BBFILES</filename></link>
                     in a particular layer.
                     This variable is used in the <filename>conf/layer.conf</filename> file and must
                     be suffixed with the name of the specific layer (e.g.
-                    <filename>BBFILE_PATTERN_emenlow</filename>).</para>
+                    <filename>BBFILE_PATTERN_emenlow</filename>).
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BBFILE_PRIORITY'><glossterm>BBFILE_PRIORITY<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BBFILE_PRIORITY'><glossterm>BBFILE_PRIORITY</glossterm>
             <info>
                 BBFILE_PRIORITY[doc] = "Assigns the priority for recipe files in each layer. Setting this variable allows you to prioritize a layer against other layers that contain the same recipe."
             </info>
             <glossdef>
-                <para>Assigns the priority for recipe files in each layer.</para>
-                <para>This variable is useful in situations where the same recipe appears in
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Assigns the priority for recipe files in each layer.
+                </para>
+
+                <para>
+                    This variable is useful in situations where the same recipe appears in
                     more than one layer.
                     Setting this variable allows you to prioritize a
                     layer against other layers that contain the same recipe - effectively
@@ -899,8 +910,11 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
                     (<link linkend='var-PV'><filename>PV</filename></link> variable).
                     For example, a layer that has a recipe with a higher <filename>PV</filename> value but for
                     which the <filename>BBFILE_PRIORITY</filename> is set to have a lower precedence still has a
-                    lower precedence.</para>
-                <para>A larger value for the <filename>BBFILE_PRIORITY</filename> variable results in a higher
+                    lower precedence.
+                </para>
+
+                <para>
+                    A larger value for the <filename>BBFILE_PRIORITY</filename> variable results in a higher
                     precedence.
                     For example, the value 6 has a higher precedence than the value 5.
                     If not specified, the <filename>BBFILE_PRIORITY</filename> variable is set based on layer
@@ -909,7 +923,8 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
                     more information.
                     The default priority, if unspecified
                     for a layer with no dependencies, is the lowest defined priority + 1
-                    (or 1 if no priorities are defined).</para>
+                    (or 1 if no priorities are defined).
+                </para>
                 <tip>
                     You can use the command <filename>bitbake-layers show-layers</filename> to list
                     all configured layers along with their priorities.
@@ -917,30 +932,34 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BBFILES'><glossterm>BBFILES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BBFILES'><glossterm>BBFILES</glossterm>
             <info>
                 BBFILES[doc] = "List of recipe files used by BitBake to build software."
             </info>
             <glossdef>
-                <para>List of recipe files used by BitBake to build software.</para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    List of recipe files used by BitBake to build software.
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BBINCLUDELOGS'><glossterm>BBINCLUDELOGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BBINCLUDELOGS'><glossterm>BBINCLUDELOGS</glossterm>
             <info>
                 BBINCLUDELOGS[doc] = "Variable that controls how BitBake displays logs on build failure."
             </info>
             <glossdef>
-                <para>Variable that controls how BitBake displays logs on build failure.</para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Variable that controls how BitBake displays logs on build failure.
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BBINCLUDELOGS_LINES'><glossterm>BBINCLUDELOGS_LINES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BBINCLUDELOGS_LINES'><glossterm>BBINCLUDELOGS_LINES</glossterm>
             <info>
                 BBINCLUDELOGS_LINES[doc] = "Amount of log lines printed on failure."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     If
                     <link linkend='var-BBINCLUDELOGS'><filename>BBINCLUDELOGS</filename></link>
                     is set, specifies the maximum number of lines from the
@@ -951,12 +970,13 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BBLAYERS'><glossterm>BBLAYERS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BBLAYERS'><glossterm>BBLAYERS</glossterm>
             <info>
                 BBLAYERS[doc] = "Lists the layers to enable during the build. This variable is defined in the bblayers.conf configuration file."
             </info>
             <glossdef>
-                <para>Lists the layers to enable during the build.
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Lists the layers to enable during the build.
                     This variable is defined in the <filename>bblayers.conf</filename> configuration
                     file in the <ulink url='&YOCTO_DOCS_DEV_URL;#build-directory'>Build Directory</ulink>.
                     Here is an example:
@@ -973,18 +993,22 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
        /home/scottrif/poky/meta-yocto \
        "
                     </literallayout>
+                </para>
+
+                <para>
                     This example enables four layers, one of which is a custom, user-defined layer
                     named <filename>meta-mykernel</filename>.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BBLAYERS_NON_REMOVABLE'><glossterm>BBLAYERS_NON_REMOVABLE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BBLAYERS_NON_REMOVABLE'><glossterm>BBLAYERS_NON_REMOVABLE</glossterm>
             <info>
                 BBLAYERS_NON_REMOVABLE[doc] = "Lists core layers that cannot be removed from the bblayers.conf file."
             </info>
             <glossdef>
-                <para>Lists core layers that cannot be removed from the
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Lists core layers that cannot be removed from the
                     <filename>bblayers.conf</filename> file during a build
                     using the
                     <ulink url='https://www.yoctoproject.org/tools-resources/projects/hob'>Hob</ulink>.
@@ -992,6 +1016,9 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
                         When building an image outside of Hob, this variable
                         is ignored.
                     </note>
+                </para>
+
+                <para>
                     In order for BitBake to build your image using Hob, your
                     <filename>bblayers.conf</filename> file must include the
                     <filename>meta</filename> and <filename>meta-yocto</filename>
@@ -1015,12 +1042,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BBMASK'><glossterm>BBMASK<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BBMASK'><glossterm>BBMASK</glossterm>
             <glossdef>
             <info>
                 BBMASK[doc] = "Prevents BitBake from processing specific recipes or recipe append files. Use the BBMASK variable from within conf/local.conf."
             </info>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Prevents BitBake from processing recipes and recipe
                     append files.
                     Use the <filename>BBMASK</filename> variable from within the
@@ -1078,12 +1105,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BBPATH'><glossterm>BBPATH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BBPATH'><glossterm>BBPATH</glossterm>
             <info>
                 BBPATH[doc] = "Used by BitBake to locate .bbclass and configuration files. This variable is analogous to the PATH variable."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Used by BitBake to locate
                     <filename>.bbclass</filename> and configuration files.
                     This variable is analogous to the
@@ -1106,12 +1133,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BBSERVER'><glossterm>BBSERVER<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BBSERVER'><glossterm>BBSERVER</glossterm>
             <info>
                 BBSERVER[doc] = "Points to the server that runs memory-resident BitBake."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Points to the server that runs memory-resident BitBake.
                     This variable is set by the
                     <link linkend='structure-memres-core-script'><filename>oe-init-build-env-memres</filename></link>
@@ -1122,6 +1149,9 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
                     <literallayout class='monospaced'>
      export BBSERVER=localhost:$port
                     </literallayout>
+                </para>
+
+                <para>
                     For more information on how the
                     <filename>BBSERVER</filename> is used, see the
                     <filename>oe-init-build-env-memres</filename> script, which
@@ -1131,12 +1161,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BINCONFIG'><glossterm>BINCONFIG<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BINCONFIG'><glossterm>BINCONFIG</glossterm>
             <info>
                 BINCONFIG[doc] = "When inheriting the binconfig-disabled class, this variable specifies binary configuration scripts to disable in favor of using pkg-config to query the information."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-binconfig-disabled'><filename>binconfig-disabled</filename></link>
                     class, this variable specifies binary configuration
@@ -1158,12 +1188,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BINCONFIG_GLOB'><glossterm>BINCONFIG_GLOB<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BINCONFIG_GLOB'><glossterm>BINCONFIG_GLOB</glossterm>
             <info>
                 BINCONFIG_GLOB[doc] = "When inheriting binconfig.bbclass from a recipe, this variable specifies a wildcard for configuration scripts that need editing."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-binconfig'><filename>binconfig</filename></link>
                     class, this variable specifies a wildcard for
@@ -1185,27 +1215,30 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BP'><glossterm>BP<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BP'><glossterm>BP</glossterm>
             <info>
                 BP[doc] = "The base recipe name and version but without any special recipe name suffix (i.e. -native, lib64-, and so forth). BP is comprised of ${BPN}-${PV}"
             </info>
             <glossdef>
-                <para>The base recipe name and version but without any special
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    The base recipe name and version but without any special
                     recipe name suffix (i.e. <filename>-native</filename>, <filename>lib64-</filename>,
                     and so forth).
                     <filename>BP</filename> is comprised of the following:
                     <literallayout class="monospaced">
      ${BPN}-${PV}
-                    </literallayout></para>
+                    </literallayout>
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BPN'><glossterm>BPN<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BPN'><glossterm>BPN</glossterm>
             <info>
                 BPN[doc] = "The bare name of the recipe. This variable is a version of the PN variable but removes common suffixes and prefixes."
             </info>
             <glossdef>
-                <para>The bare name of the recipe.
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    The bare name of the recipe.
                     This variable is a version of the <link linkend='var-PN'><filename>PN</filename></link> variable
                     but removes common suffixes such as "-native" and "-cross" as well
                     as removes common prefixes such as multilib's "lib64-" and "lib32-".
@@ -1214,16 +1247,17 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
                     The exact list of prefixes removed is specified by the
                     <link linkend='var-MLPREFIX'><filename>MLPREFIX</filename></link> variable.
                     Prefixes are removed for <filename>multilib</filename>
-                    and <filename>nativesdk</filename> cases.</para>
+                    and <filename>nativesdk</filename> cases.
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BUGTRACKER'><glossterm>BUGTRACKER<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BUGTRACKER'><glossterm>BUGTRACKER</glossterm>
             <info>
                 BUGTRACKER[doc] = "Specifies a URL for an upstream bug tracking website for a recipe."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies a URL for an upstream bug tracking website for
                     a recipe.
                     The OpenEmbedded build system does not use this variable.
@@ -1233,12 +1267,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BUILD_ARCH'><glossterm>BUILD_ARCH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BUILD_ARCH'><glossterm>BUILD_ARCH</glossterm>
             <info>
                 BUILD_ARCH[doc] = "The name of the building architecture (e.g. i686)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the architecture of the build host
                     (e.g. <filename>i686</filename>).
                     The OpenEmbedded build system sets the value of
@@ -1248,12 +1282,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BUILD_CFLAGS'><glossterm>BUILD_CFLAGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BUILD_CFLAGS'><glossterm>BUILD_CFLAGS</glossterm>
             <info>
                 BUILD_CFLAGS[doc] = "Specifies the flags to pass to the C compiler when building for the build host."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the flags to pass to the C compiler when building
                     for the build host.
                     When building in the <filename>-native</filename> context,
@@ -1263,12 +1297,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BUILD_CPPFLAGS'><glossterm>BUILD_CPPFLAGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BUILD_CPPFLAGS'><glossterm>BUILD_CPPFLAGS</glossterm>
             <info>
                 BUILD_CPPFLAGS[doc] = "Specifies the flags to pass to the C pre-processor (i.e. to both the C and the C++ compilers) when building for the build host."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the flags to pass to the C pre-processor
                     (i.e. to both the C and the C++ compilers) when building
                     for the build host.
@@ -1279,12 +1313,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BUILD_CXXFLAGS'><glossterm>BUILD_CXXFLAGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BUILD_CXXFLAGS'><glossterm>BUILD_CXXFLAGS</glossterm>
             <info>
                 BUILD_CXXFLAGS[doc] = "Specifies the flags to pass to the C++ compiler when building for the build host."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the flags to pass to the C++ compiler when
                     building for the build host.
                     When building in the <filename>native</filename> context,
@@ -1294,12 +1328,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BUILD_LDFLAGS'><glossterm>BUILD_LDFLAGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BUILD_LDFLAGS'><glossterm>BUILD_LDFLAGS</glossterm>
             <info>
                 BUILD_LDFLAGS[doc] = "Specifies the flags to pass to the linker when building for the build host."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the flags to pass to the linker when building
                     for the build host.
                     When building in the <filename>-native</filename> context,
@@ -1309,12 +1343,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BUILD_OPTIMIZATION'><glossterm>BUILD_OPTIMIZATION<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BUILD_OPTIMIZATION'><glossterm>BUILD_OPTIMIZATION</glossterm>
             <info>
                 BUILD_OPTIMIZATION[doc] = "Specifies the optimization flags passed to the C compiler when building for the build host or the SDK."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the optimization flags passed to the C compiler
                     when building for the build host or the SDK.
                     The flags are passed through the
@@ -1332,12 +1366,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BUILD_OS'><glossterm>BUILD_OS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BUILD_OS'><glossterm>BUILD_OS</glossterm>
             <info>
                 BUILD_OS[doc] = "The operating system (in lower case) of the building architecture (e.g. Linux)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the operating system in use on the build
                     host (e.g. "linux").
                     The OpenEmbedded build system sets the value of
@@ -1348,12 +1382,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BUILD_PREFIX'><glossterm>BUILD_PREFIX<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BUILD_PREFIX'><glossterm>BUILD_PREFIX</glossterm>
             <info>
                 BUILD_PREFIX[doc] = "The toolchain binary prefix used for native recipes."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The toolchain binary prefix used for native recipes.
                     The OpenEmbedded build system uses the
                     <filename>BUILD_PREFIX</filename> value to set the
@@ -1363,12 +1397,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BUILD_SYS'><glossterm>BUILD_SYS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BUILD_SYS'><glossterm>BUILD_SYS</glossterm>
             <info>
                 BUILD_SYS[doc] = "The toolchain binary prefix used for native recipes."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the system, including the architecture and
                     the operating system, to use when building for the build
                     host (i.e. when building <filename>native</filename>
@@ -1388,12 +1422,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BUILD_VENDOR'><glossterm>BUILD_VENDOR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BUILD_VENDOR'><glossterm>BUILD_VENDOR</glossterm>
             <info>
          BUILD_VENDOR[doc] = "The vendor name to use when building for the build host."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the vendor name to use when building for the
                     build host.
                     The default value is an empty string ("").
@@ -1401,12 +1435,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BUILDDIR'><glossterm>BUILDDIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BUILDDIR'><glossterm>BUILDDIR</glossterm>
             <info>
                 BUILDDIR[doc] = "Points to the location of the Build Directory."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Points to the location of the
                     <ulink url='&YOCTO_DOCS_DEV_URL;#build-directory'>Build Directory</ulink>.
                     You can define this directory indirectly through the
@@ -1422,12 +1456,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BUILDHISTORY_COMMIT'><glossterm>BUILDHISTORY_COMMIT<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BUILDHISTORY_COMMIT'><glossterm>BUILDHISTORY_COMMIT</glossterm>
             <info>
                 BUILDHISTORY_COMMIT[doc] = "When inheriting the buildhistory class, this variable specifies whether or not to commit the build history output in a local Git repository."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-buildhistory'><filename>buildhistory</filename></link>
                     class, this variable specifies whether or not to commit the
@@ -1453,12 +1487,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BUILDHISTORY_COMMIT_AUTHOR'><glossterm>BUILDHISTORY_COMMIT_AUTHOR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BUILDHISTORY_COMMIT_AUTHOR'><glossterm>BUILDHISTORY_COMMIT_AUTHOR</glossterm>
             <info>
                 BUILDHISTORY_COMMIT_AUTHOR[doc] = "When inheriting the buildhistory class, this variable specifies the author to use for each Git commit."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-buildhistory'><filename>buildhistory</filename></link>
                     class, this variable specifies the author to use for each
@@ -1487,12 +1521,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BUILDHISTORY_DIR'><glossterm>BUILDHISTORY_DIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BUILDHISTORY_DIR'><glossterm>BUILDHISTORY_DIR</glossterm>
             <info>
                 BUILDHISTORY_DIR[doc] = "When inheriting the buildhistory class, this variable specifies the directory in which build history information is kept."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-buildhistory'><filename>buildhistory</filename></link>
                     class, this variable specifies the directory in which
@@ -1511,12 +1545,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BUILDHISTORY_FEATURES'><glossterm>BUILDHISTORY_FEATURES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BUILDHISTORY_FEATURES'><glossterm>BUILDHISTORY_FEATURES</glossterm>
             <info>
                 BUILDHISTORY_FEATURES[doc] = "When inheriting the buildhistory class, this variable specifies the build history features to be enabled."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-buildhistory'><filename>buildhistory</filename></link>
                     class, this variable specifies the build history features
@@ -1555,12 +1589,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BUILDHISTORY_IMAGE_FILES'><glossterm>BUILDHISTORY_IMAGE_FILES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BUILDHISTORY_IMAGE_FILES'><glossterm>BUILDHISTORY_IMAGE_FILES</glossterm>
             <info>
                 BUILDHISTORY_IMAGE_FILES[doc] = "When inheriting the buildhistory class, this variable specifies a list of paths to files copied from the image contents into the build history directory under an "image-files" directory in the directory for the image, so that you can track the contents of each file."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-buildhistory'><filename>buildhistory</filename></link>
                     class, this variable specifies a list of paths to files
@@ -1587,12 +1621,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BUILDHISTORY_PUSH_REPO'><glossterm>BUILDHISTORY_PUSH_REPO<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BUILDHISTORY_PUSH_REPO'><glossterm>BUILDHISTORY_PUSH_REPO</glossterm>
             <info>
                 BUILDHISTORY_PUSH_REPO[doc] = "When inheriting the buildhistory class, this variable optionally specifies a remote repository to which build history pushes Git changes."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-buildhistory'><filename>buildhistory</filename></link>
                     class, this variable optionally specifies a remote
@@ -1621,12 +1655,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BUILDSDK_CFLAGS'><glossterm>BUILDSDK_CFLAGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BUILDSDK_CFLAGS'><glossterm>BUILDSDK_CFLAGS</glossterm>
             <info>
                 BUILDSDK_CFLAGS[doc] = "Specifies the flags to pass to the C compiler when building for the SDK."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the flags to pass to the C compiler when building
                     for the SDK.
                     When building in the <filename>nativesdk</filename>
@@ -1637,12 +1671,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BUILDSDK_CPPFLAGS'><glossterm>BUILDSDK_CPPFLAGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BUILDSDK_CPPFLAGS'><glossterm>BUILDSDK_CPPFLAGS</glossterm>
             <info>
                 BUILDSDK_CPPFLAGS[doc] = "Specifies the flags to pass to the C pre-processor (i.e. to both the C and the C++ compilers) when building for the SDK."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the flags to pass to the C pre-processor
                     (i.e. to both the C and the C++ compilers) when building
                     for the SDK.
@@ -1654,12 +1688,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BUILDSDK_CXXFLAGS'><glossterm>BUILDSDK_CXXFLAGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BUILDSDK_CXXFLAGS'><glossterm>BUILDSDK_CXXFLAGS</glossterm>
             <info>
                 BUILDSDK_CXXFLAGS[doc] = "Specifies the flags to pass to the C++ compiler when building for the SDK."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the flags to pass to the C++ compiler when
                     building for the SDK.
                     When building in the <filename>nativesdk</filename>
@@ -1670,12 +1704,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BUILDSDK_LDFLAGS'><glossterm>BUILDSDK_LDFLAGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BUILDSDK_LDFLAGS'><glossterm>BUILDSDK_LDFLAGS</glossterm>
             <info>
                 BUILDSDK_LDFLAGS[doc] = "Specifies the flags to pass to the linker when building for the SDK."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the flags to pass to the linker when building
                     for the SDK.
                     When building in the <filename>nativesdk-</filename>
@@ -1686,12 +1720,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BUILDSTATS_BASE'><glossterm>BUILDSTATS_BASE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BUILDSTATS_BASE'><glossterm>BUILDSTATS_BASE</glossterm>
             <info>
                 BUILDSTATS_BASE[doc] = "Points to the location of the directory that holds build statistics when you use and enable the buildstats class."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Points to the location of the directory that holds build
                     statistics when you use and enable the
                     <link linkend='ref-classes-buildstats'><filename>buildstats</filename></link>
@@ -1703,12 +1737,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-BUSYBOX_SPLIT_SUID'><glossterm>BUSYBOX_SPLIT_SUID<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-BUSYBOX_SPLIT_SUID'><glossterm>BUSYBOX_SPLIT_SUID</glossterm>
             <info>
                 BUSYBOX_SPLIT_SUID[doc] = "For the BusyBox recipe, specifies whether to split the output executable file into two parts: one for features that require setuid root, and one for the remaining features."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     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
@@ -1729,12 +1763,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
 
     <glossdiv id='var-glossary-c'><title>C</title>
 
-        <glossentry id='var-CACHE'><glossterm>CACHE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-CACHE'><glossterm>CACHE</glossterm>
             <info>
                 CACHE[doc]  = "The directory BitBake uses to store a cache of the metadata."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the directory BitBake uses to store a cache
                     of the
                     <ulink url='&YOCTO_DOCS_DEV_URL;#metadata'>Metadata</ulink>
@@ -1744,24 +1778,24 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-CC'><glossterm>CC<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-CC'><glossterm>CC</glossterm>
             <info>
                 CC[doc] = "Minimum command and arguments to run the C compiler."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The minimal command and arguments used to run the C
                     compiler.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-CFLAGS'><glossterm>CFLAGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-CFLAGS'><glossterm>CFLAGS</glossterm>
             <info>
                 CFLAGS[doc] = "Flags passed to the C compiler for the target system. This variable evaluates to the same as TARGET_CFLAGS."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the flags to pass to the C compiler.
                     This variable is exported to an environment
                     variable and thus made visible to the software being
@@ -1791,12 +1825,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-CLASSOVERRIDE'><glossterm>CLASSOVERRIDE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-CLASSOVERRIDE'><glossterm>CLASSOVERRIDE</glossterm>
             <info>
                 CLASSOVERRIDE[doc] = "An internal variable specifying the special class override that should currently apply (e.g. "class-target", "class-native", and so forth)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     An internal variable specifying the special class override
                     that should currently apply (e.g. "class-target",
                     "class-native", and so forth).
@@ -1820,12 +1854,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-CLEANBROKEN'><glossterm>CLEANBROKEN<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-CLEANBROKEN'><glossterm>CLEANBROKEN</glossterm>
             <info>
                 CLEANBROKEN[doc] = "Prevents the build system from running 'make clean' during the do_configure task."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     If set to "1" within a recipe,
                     <filename>CLEANBROKEN</filename> specifies that
                     the <filename>make clean</filename> command does
@@ -1838,12 +1872,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-COMBINED_FEATURES'><glossterm>COMBINED_FEATURES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-COMBINED_FEATURES'><glossterm>COMBINED_FEATURES</glossterm>
             <info>
                 COMBINED_FEATURES[doc] = "A set of features common between MACHINE_FEATURES and DISTRO_FEATURES."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Provides a list of hardware features that are enabled in
                     both
                     <link linkend='var-MACHINE_FEATURES'><filename>MACHINE_FEATURES</filename></link>
@@ -1867,12 +1901,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-COMMON_LICENSE_DIR'><glossterm>COMMON_LICENSE_DIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-COMMON_LICENSE_DIR'><glossterm>COMMON_LICENSE_DIR</glossterm>
             <info>
                 COMMON_LICENSE_DIR[doc] = "Points to meta/files/common-licenses in the Source Directory, which is where generic license files reside."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Points to <filename>meta/files/common-licenses</filename>
                     in the
                     <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>,
@@ -1881,12 +1915,13 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-COMPATIBLE_HOST'><glossterm>COMPATIBLE_HOST<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-COMPATIBLE_HOST'><glossterm>COMPATIBLE_HOST</glossterm>
             <info>
                 COMPATIBLE_HOST[doc] = "A regular expression that resolves to one or more hosts (when the recipe is native) or one or more targets (when the recipe is non-native) with which a recipe is compatible."
             </info>
             <glossdef>
-                <para>A regular expression that resolves to one or more hosts
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    A regular expression that resolves to one or more hosts
                     (when the recipe is native) or one or more targets (when
                     the recipe is non-native) with which a recipe is compatible.
                     The regular expression is matched against
@@ -1897,16 +1932,18 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
                     Stopping these builds is particularly useful with kernels.
                     The variable also helps to increase parsing speed
                     since the build system skips parsing recipes not
-                    compatible with the current system.</para>
+                    compatible with the current system.
+               </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-COMPATIBLE_MACHINE'><glossterm>COMPATIBLE_MACHINE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-COMPATIBLE_MACHINE'><glossterm>COMPATIBLE_MACHINE</glossterm>
             <info>
                 COMPATIBLE_MACHINE[doc] = "A regular expression that resolves to one or more target machines with which a recipe is compatible."
             </info>
             <glossdef>
-                <para>A regular expression that resolves to one or more
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    A regular expression that resolves to one or more
                     target machines with which a recipe is compatible.
                     The regular expression is matched against
                     <link linkend="var-MACHINEOVERRIDES"><filename>MACHINEOVERRIDES</filename></link>.
@@ -1915,16 +1952,17 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
                     Stopping these builds is particularly useful with kernels.
                     The variable also helps to increase parsing speed
                     since the build system skips parsing recipes not
-                    compatible with the current machine.</para>
+                    compatible with the current machine.
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-COMPLEMENTARY_GLOB'><glossterm>COMPLEMENTARY_GLOB<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-COMPLEMENTARY_GLOB'><glossterm>COMPLEMENTARY_GLOB</glossterm>
             <info>
                 COMPLEMENTARY_GLOB[doc] = "Defines wildcards to match when installing a list of complementary packages for all the packages installed in an image."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Defines wildcards to match when installing a list of
                     complementary packages for all the packages explicitly
                     (or implicitly) installed in an image.
@@ -1949,12 +1987,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-CONF_VERSION'><glossterm>CONF_VERSION<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-CONF_VERSION'><glossterm>CONF_VERSION</glossterm>
             <info>
                 CONF_VERSION[doc] = "Tracks the version of local.conf.  Increased each time build/conf/ changes incompatibly."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Tracks the version of the local configuration file
                     (i.e. <filename>local.conf</filename>).
                     The value for <filename>CONF_VERSION</filename>
@@ -1963,12 +2001,13 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
                 </para>
             </glossdef>
         </glossentry>
-        <glossentry id='var-CONFFILES'><glossterm>CONFFILES<imagedata fileref="figures/define-generic.png" /></glossterm>
+
+        <glossentry id='var-CONFFILES'><glossterm>CONFFILES</glossterm>
             <info>
                 CONFFILES[doc] = "Identifies editable or configurable files that are part of a package."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Identifies editable or configurable files that are part of a package.
                     If the Package Management System (PMS) is being used to update
                     packages on the target system, it is possible that
@@ -2016,12 +2055,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-CONFIG_INITRAMFS_SOURCE'><glossterm>CONFIG_INITRAMFS_SOURCE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-CONFIG_INITRAMFS_SOURCE'><glossterm>CONFIG_INITRAMFS_SOURCE</glossterm>
             <info>
                 CONFIG_INITRAMFS_SOURCE[doc] = "Identifies the initial RAM disk (initramfs) source files. The OpenEmbedded build system receives and uses this kernel Kconfig variable as an environment variable."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Identifies the initial RAM disk (initramfs) source files.
                     The OpenEmbedded build system receives and uses
                     this kernel Kconfig variable as an environment variable.
@@ -2051,12 +2090,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-CONFIG_SITE'><glossterm>CONFIG_SITE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-CONFIG_SITE'><glossterm>CONFIG_SITE</glossterm>
             <info>
                 CONFIG_SITE[doc] = "A list of files that contains autoconf test results relevant to the current build. This variable is used by the Autotools utilities when running configure."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A list of files that contains <filename>autoconf</filename> test results relevant
                     to the current build.
                     This variable is used by the Autotools utilities when running
@@ -2065,23 +2104,23 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-CONFIGURE_FLAGS'><glossterm>CONFIGURE_FLAGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-CONFIGURE_FLAGS'><glossterm>CONFIGURE_FLAGS</glossterm>
             <info>
                 CONFIGURE_FLAGS[doc] = "The minimal arguments for GNU configure."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The minimal arguments for GNU configure.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-CONFLICT_DISTRO_FEATURES'><glossterm>CONFLICT_DISTRO_FEATURES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-CONFLICT_DISTRO_FEATURES'><glossterm>CONFLICT_DISTRO_FEATURES</glossterm>
             <info>
                 CONFLICT_DISTRO_FEATURES[doc] = "When a recipe inherits the distro_features_check class, this variable identifies distribution features that would be in conflict should the recipe be built."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-distro_features_check'><filename>distro_features_check</filename></link>
                     class, this
@@ -2098,12 +2137,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-COPY_LIC_DIRS'><glossterm>COPY_LIC_DIRS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-COPY_LIC_DIRS'><glossterm>COPY_LIC_DIRS</glossterm>
             <info>
                 COPY_LIC_DIRS[doc] = "If set to "1" along with the COPY_LIC_MANIFEST variable, the OpenEmbedded build system copies into the image the license files, which are located in /usr/share/common-licenses, for each package."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     If set to "1" along with the
                     <link linkend='var-COPY_LIC_MANIFEST'><filename>COPY_LIC_MANIFEST</filename></link>
                     variable, the OpenEmbedded build system copies
@@ -2112,16 +2151,16 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
                     for each package.
                     The license files are placed
                     in directories within the image itself.
-                    </para>
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-COPY_LIC_MANIFEST'><glossterm>COPY_LIC_MANIFEST<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-COPY_LIC_MANIFEST'><glossterm>COPY_LIC_MANIFEST</glossterm>
             <info>
                 COPY_LIC_MANIFEST[doc] = "If set to "1", the OpenEmbedded build system copies the license manifest for the image to /usr/share/common-licenses/license.manifest within the image itself."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     If set to "1", the OpenEmbedded build system copies
                     the license manifest for the image to
                     <filename>/usr/share/common-licenses/license.manifest</filename>
@@ -2130,12 +2169,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-CORE_IMAGE_EXTRA_INSTALL'><glossterm>CORE_IMAGE_EXTRA_INSTALL<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-CORE_IMAGE_EXTRA_INSTALL'><glossterm>CORE_IMAGE_EXTRA_INSTALL</glossterm>
             <info>
                 CORE_IMAGE_EXTRA_INSTALL[doc] = "Specifies the list of packages to be added to the image. You should only set this variable in the conf/local.conf file in the Build Directory."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the list of packages to be added to the image.
                     You should only set this variable in the
                     <filename>local.conf</filename> configuration file found
@@ -2149,12 +2188,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-COREBASE'><glossterm>COREBASE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-COREBASE'><glossterm>COREBASE</glossterm>
             <info>
                 COREBASE[doc] = "Specifies the parent directory of the OpenEmbedded Core Metadata layer (i.e. meta)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the parent directory of the OpenEmbedded
                     Core Metadata layer (i.e. <filename>meta</filename>).
                 </para>
@@ -2174,24 +2213,24 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-CPP'><glossterm>CPP<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-CPP'><glossterm>CPP</glossterm>
             <info>
                 CPP[doc] = "Minimum command and arguments to run the C preprocessor."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The minimal command and arguments used to run the C
                     preprocessor.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-CPPFLAGS'><glossterm>CPPFLAGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-CPPFLAGS'><glossterm>CPPFLAGS</glossterm>
             <info>
                 CPPFLAGS[doc] = "Specifies the flags to pass to the C pre-processor (i.e. to both the C and the C++ compilers)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the flags to pass to the C pre-processor
                     (i.e. to both the C and the C++ compilers).
                     This variable is exported to an environment
@@ -2222,12 +2261,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-CROSS_COMPILE'><glossterm>CROSS_COMPILE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-CROSS_COMPILE'><glossterm>CROSS_COMPILE</glossterm>
             <info>
                 CROSS_COMPILE[doc] = "The toolchain binary prefix for the target tools."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The toolchain binary prefix for the target tools.
                     The <filename>CROSS_COMPILE</filename> variable is the
                     same as the
@@ -2243,36 +2282,36 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-CVSDIR'><glossterm>CVSDIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-CVSDIR'><glossterm>CVSDIR</glossterm>
             <info>
                 CVSDIR[doc] = "The directory where cvs checkouts will be stored in."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The directory in which files checked out under the
                     CVS system are stored.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-CXX'><glossterm>CXX<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-CXX'><glossterm>CXX</glossterm>
             <info>
                 CXX[doc] = "Minimum command and arguments to run the C++ compiler."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The minimal command and arguments used to run the C++
                     compiler.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-CXXFLAGS'><glossterm>CXXFLAGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-CXXFLAGS'><glossterm>CXXFLAGS</glossterm>
             <info>
                 CXXFLAGS[doc] = "Specifies the flags to pass to the C++ compiler."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the flags to pass to the C++ compiler.
                     This variable is exported to an environment
                     variable and thus made visible to the software being
@@ -2306,12 +2345,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
 
     <glossdiv id='var-glossary-d'><title>D</title>
 
-        <glossentry id='var-D'><glossterm>D<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-D'><glossterm>D</glossterm>
             <info>
                 D[doc] = "The destination directory."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The destination directory.
                     The location in the <ulink url='&YOCTO_DOCS_DEV_URL;#build-directory'>Build Directory</ulink>
                     where components are installed by the
@@ -2325,12 +2364,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DATE'><glossterm>DATE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DATE'><glossterm>DATE</glossterm>
             <info>
                 DATE[doc] = "The date the build was started using YMD format."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The date the build was started.
                     Dates appear using the year, month, and day (YMD) format
                     (e.g. "20150209" for February 9th, 2015).
@@ -2338,24 +2377,24 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DATETIME'><glossterm>DATETIME<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DATETIME'><glossterm>DATETIME</glossterm>
             <info>
                 DATETIME[doc] = "The date and time the build was started."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The date and time on which the current build started.
                     The format is suitable for timestamps.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DEBIAN_NOAUTONAME'><glossterm>DEBIAN_NOAUTONAME<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DEBIAN_NOAUTONAME'><glossterm>DEBIAN_NOAUTONAME</glossterm>
             <info>
                 DEBIAN_NOAUTONAME[doc] = "Prevents a particular package from being renamed according to Debian package naming."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When the
                     <link linkend='ref-classes-debian'><filename>debian</filename></link>
                     class is inherited, which is the default behavior,
@@ -2373,12 +2412,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DEBIANNAME'><glossterm>DEBIANNAME<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DEBIANNAME'><glossterm>DEBIANNAME</glossterm>
             <info>
                 DEBIANNAME[doc] = "Allows you to override the library name for an individual package for Debian library package renaming."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When the
                     <link linkend='ref-classes-debian'><filename>debian</filename></link>
                     class is inherited, which is the default behavior,
@@ -2396,12 +2435,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DEBUG_BUILD'><glossterm>DEBUG_BUILD<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DEBUG_BUILD'><glossterm>DEBUG_BUILD</glossterm>
             <info>
                 DEBUG_BUILD[doc] = "Specifies to build packages with debugging information. This influences the value of the SELECTED_OPTIMIZATION variable."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies to build packages with debugging information.
                     This influences the value of the
                     <filename><link linkend='var-SELECTED_OPTIMIZATION'>SELECTED_OPTIMIZATION</link></filename>
@@ -2410,12 +2449,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DEBUG_OPTIMIZATION'><glossterm>DEBUG_OPTIMIZATION<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DEBUG_OPTIMIZATION'><glossterm>DEBUG_OPTIMIZATION</glossterm>
             <info>
                 DEBUG_OPTIMIZATION[doc] = "The options to pass in TARGET_CFLAGS and CFLAGS when compiling a system for debugging. This variable defaults to '-O -fno-omit-frame-pointer -g'."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The options to pass in
                     <filename><link linkend='var-TARGET_CFLAGS'>TARGET_CFLAGS</link></filename>
                     and <filename><link linkend='var-CFLAGS'>CFLAGS</link></filename> when compiling
@@ -2425,14 +2464,15 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DEFAULT_PREFERENCE'><glossterm>DEFAULT_PREFERENCE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DEFAULT_PREFERENCE'><glossterm>DEFAULT_PREFERENCE</glossterm>
             <info>
                 DEFAULT_PREFERENCE[doc] = "Specifies a weak bias for recipe selection priority."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies a weak bias for recipe selection priority.
                 </para>
+
                 <para>
                     The most common usage of this is variable is to set
                     it to "-1" within a recipe for a development version of a
@@ -2442,6 +2482,7 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
                     <filename><link linkend='var-PREFERRED_VERSION'>PREFERRED_VERSION</link></filename>
                     being used to build the development version.
                 </para>
+
                 <note>
                     The bias provided by <filename>DEFAULT_PREFERENCE</filename>
                     is weak and is overridden by
@@ -2452,12 +2493,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DEFAULTTUNE'><glossterm>DEFAULTTUNE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DEFAULTTUNE'><glossterm>DEFAULTTUNE</glossterm>
             <info>
                 DEFAULTTUNE[doc] = "The default CPU and Application Binary Interface (ABI) tunings (i.e.  the "tune") used by the OpenEmbedded build system."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The default CPU and Application Binary Interface (ABI)
                     tunings (i.e.  the "tune") used by the OpenEmbedded build
                     system.
@@ -2476,12 +2517,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DEPENDS'><glossterm>DEPENDS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DEPENDS'><glossterm>DEPENDS</glossterm>
             <info>
                 DEPENDS[doc] = "Lists a recipe's build-time dependencies (i.e. other recipe files)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Lists a recipe's build-time dependencies
                     (i.e. other recipe files).
                     The system ensures that all the dependencies listed
@@ -2514,12 +2555,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DEPLOY_DIR'><glossterm>DEPLOY_DIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DEPLOY_DIR'><glossterm>DEPLOY_DIR</glossterm>
             <info>
                 DEPLOY_DIR[doc] = "Points to the general area that the OpenEmbedded build system uses to place images, packages, SDKs and other output files that are ready to be used outside of the build system."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Points to the general area that the OpenEmbedded build
                     system uses to place images, packages, SDKs and other output
                     files that are ready to be used outside of the build system.
@@ -2542,12 +2583,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DEPLOY_DIR_IMAGE'><glossterm>DEPLOY_DIR_IMAGE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DEPLOY_DIR_IMAGE'><glossterm>DEPLOY_DIR_IMAGE</glossterm>
             <info>
                 DEPLOY_DIR_IMAGE[doc] = "Points to the area that the OpenEmbedded build system uses to place images and other associated output files that are ready to be deployed onto the target machine."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Points to the area that the OpenEmbedded build system uses
                     to place images and other associated output files that are
                     ready to be deployed onto the target machine.
@@ -2572,12 +2613,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DEPLOYDIR'><glossterm>DEPLOYDIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DEPLOYDIR'><glossterm>DEPLOYDIR</glossterm>
             <info>
                 DEPLOYDIR[doc] = "For recipes that inherit the deploy class, the DEPLOYDIR points to a temporary work area for deployed files."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-deploy'><filename>deploy</filename></link>
                     class, the <filename>DEPLOYDIR</filename> points to a
@@ -2586,6 +2627,9 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
                     <literallayout class='monospaced'>
      DEPLOYDIR = "${WORKDIR}/deploy-${<link linkend='var-PN'><filename>PN</filename></link>}"
                     </literallayout>
+                </para>
+
+                <para>
                     Recipes inheriting the <filename>deploy</filename> class
                     should copy files to be deployed into
                     <filename>DEPLOYDIR</filename>, and the class will take
@@ -2596,26 +2640,27 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DESCRIPTION'><glossterm>DESCRIPTION<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DESCRIPTION'><glossterm>DESCRIPTION</glossterm>
             <info>
                 DESCRIPTION[doc] = "The package description used by package managers. If not set, DESCRIPTION takes the value of the SUMMARY variable."
             </info>
             <glossdef>
-                <para>The package description used by package managers.
-                      If not set, <filename>DESCRIPTION</filename> takes
-                      the value of the
-                      <link linkend='var-SUMMARY'><filename>SUMMARY</filename></link>
-                      variable.
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    The package description used by package managers.
+                    If not set, <filename>DESCRIPTION</filename> takes
+                    the value of the
+                    <link linkend='var-SUMMARY'><filename>SUMMARY</filename></link>
+                    variable.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DISK_SIGNATURE'><glossterm>DISK_SIGNATURE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DISK_SIGNATURE'><glossterm>DISK_SIGNATURE</glossterm>
             <info>
                 DISK_SIGNATURE[doc] = "A 32-bit MBR disk signature used by directdisk images."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A 32-bit MBR disk signature used by
                     <filename>directdisk</filename> images.
                 </para>
@@ -2663,12 +2708,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DISTRO'><glossterm>DISTRO<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DISTRO'><glossterm>DISTRO</glossterm>
             <info>
                 DISTRO[doc] = "The short name of the distribution. If the variable is blank, meta/conf/distro/defaultsetup.conf will be used."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The short name of the distribution.
                     This variable corresponds to a distribution
                     configuration file whose root name is the same as the
@@ -2708,23 +2753,23 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DISTRO_CODENAME'><glossterm>DISTRO_CODENAME<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DISTRO_CODENAME'><glossterm>DISTRO_CODENAME</glossterm>
             <info>
                 DISTRO_CODENAME[doc] = "Specifies a codename for the distribution being built."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies a codename for the distribution being built.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DISTRO_EXTRA_RDEPENDS'><glossterm>DISTRO_EXTRA_RDEPENDS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DISTRO_EXTRA_RDEPENDS'><glossterm>DISTRO_EXTRA_RDEPENDS</glossterm>
             <info>
                 DISTRO_EXTRA_RDEPENDS[doc] = "Specifies a list of distro-specific packages to add to all images. The variable only applies to the images that include packagegroup-base."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies a list of distro-specific packages to add to all images.
                     This variable takes affect through
                     <filename>packagegroup-base</filename> so the
@@ -2738,12 +2783,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DISTRO_EXTRA_RRECOMMENDS'><glossterm>DISTRO_EXTRA_RRECOMMENDS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DISTRO_EXTRA_RRECOMMENDS'><glossterm>DISTRO_EXTRA_RRECOMMENDS</glossterm>
             <info>
                 DISTRO_EXTRA_RRECOMMENDS[doc] = "Specifies a list of distro-specific packages to add to all images if the packages exist. The list of packages are automatically installed but you can remove them."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies a list of distro-specific packages to add to all images
                     if the packages exist.
                     The packages might not exist or be empty (e.g. kernel modules).
@@ -2753,12 +2798,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DISTRO_FEATURES'><glossterm>DISTRO_FEATURES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DISTRO_FEATURES'><glossterm>DISTRO_FEATURES</glossterm>
             <info>
                 DISTRO_FEATURES[doc] = "The features enabled for the distribution."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The software support you want in your distribution for
                     various features.
                     You define your distribution features in the distribution
@@ -2789,12 +2834,13 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DISTRO_FEATURES_BACKFILL'><glossterm>DISTRO_FEATURES_BACKFILL<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DISTRO_FEATURES_BACKFILL'><glossterm>DISTRO_FEATURES_BACKFILL</glossterm>
             <info>
                 DISTRO_FEATURES_BACKFILL[doc] = "Features to be added to DISTRO_FEATURES if not also present in DISTRO_FEATURES_BACKFILL_CONSIDERED. This variable is set in the meta/conf/bitbake.conf file and it is not intended to be user-configurable."
             </info>
             <glossdef>
-                <para>Features to be added to
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Features to be added to
                     <filename><link linkend='var-DISTRO_FEATURES'>DISTRO_FEATURES</link></filename>
                     if not also present in
                     <filename><link linkend='var-DISTRO_FEATURES_BACKFILL_CONSIDERED'>DISTRO_FEATURES_BACKFILL_CONSIDERED</link></filename>.
@@ -2811,28 +2857,29 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DISTRO_FEATURES_BACKFILL_CONSIDERED'><glossterm>DISTRO_FEATURES_BACKFILL_CONSIDERED<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DISTRO_FEATURES_BACKFILL_CONSIDERED'><glossterm>DISTRO_FEATURES_BACKFILL_CONSIDERED</glossterm>
             <info>
                 DISTRO_FEATURES_BACKFILL_CONSIDERED[doc] = "Features from DISTRO_FEATURES_BACKFILL that should not be backfilled (i.e. added to DISTRO_FEATURES) during the build."
             </info>
             <glossdef>
-                <para>Features from
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Features from
                     <filename><link linkend='var-DISTRO_FEATURES_BACKFILL'>DISTRO_FEATURES_BACKFILL</link></filename>
                     that should not be backfilled (i.e. added to
                     <filename><link linkend='var-DISTRO_FEATURES'>DISTRO_FEATURES</link></filename>)
                     during the build.
                     See the "<link linkend='ref-features-backfill'>Feature Backfilling</link>" section for
                     more information.
-                    </para>
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DISTRO_FEATURES_DEFAULT'><glossterm>DISTRO_FEATURES_DEFAULT<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DISTRO_FEATURES_DEFAULT'><glossterm>DISTRO_FEATURES_DEFAULT</glossterm>
             <info>
                 DISTRO_FEATURES_DEFAULT[doc] = "Provides the default list of distro features with the exception of any libc-specific features."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A convenience variable that gives you the default
                     list of distro features with the exception of any
                     features specific to the C library
@@ -2854,12 +2901,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DISTRO_FEATURES_LIBC'><glossterm>DISTRO_FEATURES_LIBC<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DISTRO_FEATURES_LIBC'><glossterm>DISTRO_FEATURES_LIBC</glossterm>
             <info>
                 DISTRO_FEATURES_LIBC[doc] = "Specifies the list of distro features that are specific to the C library (libc)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A convenience variable that specifies the list of distro
                     features that are specific to the C library
                     (<filename>libc</filename>).
@@ -2870,30 +2917,34 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DISTRO_NAME'><glossterm>DISTRO_NAME<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DISTRO_NAME'><glossterm>DISTRO_NAME</glossterm>
             <info>
                 DISTRO_NAME[doc] = "The long name of the distribution."
             </info>
             <glossdef>
-                <para>The long name of the distribution.</para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    The long name of the distribution.
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DISTRO_VERSION'><glossterm>DISTRO_VERSION<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DISTRO_VERSION'><glossterm>DISTRO_VERSION</glossterm>
             <info>
                 DISTRO_VERSION[doc] = "The version of the distribution."
             </info>
             <glossdef>
-                <para>The version of the distribution.</para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    The version of the distribution.
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DISTROOVERRIDES'><glossterm>DISTROOVERRIDES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DISTROOVERRIDES'><glossterm>DISTROOVERRIDES</glossterm>
             <info>
                 DISTROOVERRIDES[doc] = "Lists overrides specific to the current distribution. By default, the variable list includes the value of the DISTRO variable."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     This variable lists overrides specific to the current
                     distribution.
                     By default, the variable list includes the value of the
@@ -2907,12 +2958,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DL_DIR'><glossterm>DL_DIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DL_DIR'><glossterm>DL_DIR</glossterm>
             <info>
                 DL_DIR[doc] = "The central download directory used by the build process to store downloads. By default, the directory is 'downloads' in the Build Directory."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The central download directory used by the build process to
                     store downloads.
                     By default, <filename>DL_DIR</filename> gets files
@@ -2966,12 +3017,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-DOC_COMPRESS'><glossterm>DOC_COMPRESS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-DOC_COMPRESS'><glossterm>DOC_COMPRESS</glossterm>
             <info>
                 DOC_COMPRESS[doc] = "When inheriting the compress_doc class, this variable sets the compression policy used when the OpenEmbedded build system compresses man pages and info pages."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-compress_doc'><filename>compress_doc</filename></link>
                     class, this variable sets the compression policy used when
@@ -2993,12 +3044,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
 
     <glossdiv id='var-glossary-e'><title>E</title>
 
-        <glossentry id='var-EFI_PROVIDER'><glossterm>EFI_PROVIDER<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-EFI_PROVIDER'><glossterm>EFI_PROVIDER</glossterm>
             <info>
                 EFI_PROVIDER[doc] = "When building bootable images (i.e. where hddimg or vmdk is in IMAGE_FSTYPES), the EFI_PROVIDER variable specifies the EFI bootloader to use."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When building bootable images (i.e. where
                     <filename>hddimg</filename> or <filename>vmdk</filename>
                     is in
@@ -3017,24 +3068,26 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-ENABLE_BINARY_LOCALE_GENERATION'><glossterm>ENABLE_BINARY_LOCALE_GENERATION<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-ENABLE_BINARY_LOCALE_GENERATION'><glossterm>ENABLE_BINARY_LOCALE_GENERATION</glossterm>
             <info>
                 ENABLE_BINARY_LOCALE_GENERATION[doc] = "Controls which locales for glibc are generated during the build. The variable is useful if the target device has 64Mbytes of RAM or less."
             </info>
             <glossdef>
-                <para>Variable that controls which locales for
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Variable that controls which locales for
                     <filename>glibc</filename> are generated during the
                     build (useful if the target device has 64Mbytes
-                    of RAM or less).</para>
+                    of RAM or less).
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-ERR_REPORT_DIR'><glossterm>ERR_REPORT_DIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-ERR_REPORT_DIR'><glossterm>ERR_REPORT_DIR</glossterm>
             <info>
                 ERR_REPORT_DIR[doc] = "When used with the report-error class, specifies the path used for storing the debug files created by the error reporting tool, which allows you to submit build errors you encounter to a central database."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When used with the
                     <link linkend='ref-classes-report-error'><filename>report-error</filename></link>
                     class, specifies the path used for storing the debug files
@@ -3057,12 +3110,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-ERROR_QA'><glossterm>ERROR_QA<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-ERROR_QA'><glossterm>ERROR_QA</glossterm>
             <info>
                 ERROR_QA[doc] = "Specifies the quality assurance checks whose failures are reported as errors by the OpenEmbedded build system."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the quality assurance checks whose failures are
                     reported as errors by the OpenEmbedded build system.
                     You set this variable in your distribution configuration
@@ -3075,12 +3128,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-EXCLUDE_FROM_WORLD'><glossterm>EXCLUDE_FROM_WORLD<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-EXCLUDE_FROM_WORLD'><glossterm>EXCLUDE_FROM_WORLD</glossterm>
             <info>
                 EXCLUDE_FROM_WORLD[doc] = "Directs BitBake to exclude a recipe from world builds (i.e. bitbake world)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Directs BitBake to exclude a recipe from world builds (i.e.
                     <filename>bitbake world</filename>).
                     During world builds, BitBake locates, parses and builds all
@@ -3104,12 +3157,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-EXTENDPE'><glossterm>EXTENDPE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-EXTENDPE'><glossterm>EXTENDPE</glossterm>
             <info>
                 EXTENDPE[doc] = "Used with file and pathnames to create a prefix for a recipe's version based on the recipe's PE value. If PE is set and greater than zero for a recipe, EXTENDPE becomes that value."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Used with file and pathnames to create a prefix for a recipe's
                     version based on the recipe's
                     <link linkend='var-PE'><filename>PE</filename></link> value.
@@ -3125,12 +3178,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-EXTENDPKGV'><glossterm>EXTENDPKGV<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-EXTENDPKGV'><glossterm>EXTENDPKGV</glossterm>
             <info>
                 EXTENDPKGV[doc] = "The full package version specification as it appears on the final packages produced by a recipe."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The full package version specification as it appears on the
                     final packages produced by a recipe.
                     The variable's value is normally used to fix a runtime
@@ -3149,12 +3202,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-EXTERNALSRC'><glossterm>EXTERNALSRC<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-EXTERNALSRC'><glossterm>EXTERNALSRC</glossterm>
             <info>
                 EXTERNALSRC[doc] = "If externalsrc.bbclass is inherited, this variable points to the source tree, which is outside of the OpenEmbedded build system."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-externalsrc'><filename>externalsrc</filename></link>
                     class, this variable points to the source tree, which is
@@ -3178,12 +3231,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-EXTERNALSRC_BUILD'><glossterm>EXTERNALSRC_BUILD<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-EXTERNALSRC_BUILD'><glossterm>EXTERNALSRC_BUILD</glossterm>
             <info>
                 EXTERNALSRC_BUILD[doc] = "If externalsrc.bbclass is inherited, this variable points to the directory in which the recipe's source code is built, which is outside of the OpenEmbedded build system."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-externalsrc'><filename>externalsrc</filename></link>
                     class, this variable points to the directory in which the
@@ -3208,12 +3261,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-EXTRA_AUTORECONF'><glossterm>EXTRA_AUTORECONF<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-EXTRA_AUTORECONF'><glossterm>EXTRA_AUTORECONF</glossterm>
             <info>
                 EXTRA_AUTORECONF[doc] = "Extra options passed to the autoreconf command, which is executed during do_configure."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     For recipes inheriting the
                     <link linkend='ref-classes-autotools'><filename>autotools</filename></link>
                     class, you can use <filename>EXTRA_AUTORECONF</filename> to
@@ -3230,12 +3283,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-EXTRA_IMAGE_FEATURES'><glossterm>EXTRA_IMAGE_FEATURES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-EXTRA_IMAGE_FEATURES'><glossterm>EXTRA_IMAGE_FEATURES</glossterm>
             <info>
                 EXTRA_IMAGE_FEATURES[doc] = "The list of additional features to include in an image. Configure this variable in the conf/local.conf file in the Build Directory."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The list of additional features to include in an image.
                     Typically, you configure this variable in your
                     <filename>local.conf</filename> file, which is found in the
@@ -3308,12 +3361,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-EXTRA_IMAGECMD'><glossterm>EXTRA_IMAGECMD<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-EXTRA_IMAGECMD'><glossterm>EXTRA_IMAGECMD</glossterm>
             <info>
                 EXTRA_IMAGECMD[doc] = "Specifies additional options for the image creation command that has been specified in IMAGE_CMD. When setting this variable, you should use an override for the associated type."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies additional options for the image
                     creation command that has been specified in
                     <link linkend='var-IMAGE_CMD'><filename>IMAGE_CMD</filename></link>.
@@ -3327,20 +3380,24 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-EXTRA_IMAGEDEPENDS'><glossterm>EXTRA_IMAGEDEPENDS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-EXTRA_IMAGEDEPENDS'><glossterm>EXTRA_IMAGEDEPENDS</glossterm>
             <info>
                 EXTRA_IMAGEDEPENDS[doc] = "A list of recipes to build that do not provide packages for installing into the root filesystem. Use this variable to list recipes that are required to build the final image, but not needed in the root filesystem."
             </info>
             <glossdef>
-                <para>A list of recipes to build that do not provide packages
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    A list of recipes to build that do not provide packages
                     for installing into the root filesystem.
                 </para>
-                <para>Sometimes a recipe is required to build the final image but is not
+
+                <para>
+                    Sometimes a recipe is required to build the final image but is not
                     needed in the root filesystem.
                     You can use the <filename>EXTRA_IMAGEDEPENDS</filename> variable to
                     list these recipes and thus specify the dependencies.
                     A typical example is a required bootloader in a machine configuration.
                 </para>
+
                 <note>
                     To add packages to the root filesystem, see the various
                     <filename>*<link linkend='var-RDEPENDS'>RDEPENDS</link></filename>
@@ -3350,39 +3407,45 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-EXTRA_OECMAKE'><glossterm>EXTRA_OECMAKE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-EXTRA_OECMAKE'><glossterm>EXTRA_OECMAKE</glossterm>
             <info>
                 EXTRA_OECMAKE[doc] = "Additional cmake options."
             </info>
             <glossdef>
-                <para>Additional <filename>cmake</filename> options.</para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Additional <filename>cmake</filename> options.
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-EXTRA_OECONF'><glossterm>EXTRA_OECONF<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-EXTRA_OECONF'><glossterm>EXTRA_OECONF</glossterm>
             <info>
                 EXTRA_OECONF[doc] = "Additional configure script options."
             </info>
             <glossdef>
-                <para>Additional <filename>configure</filename> script options.</para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Additional <filename>configure</filename> script options.
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-EXTRA_OEMAKE'><glossterm>EXTRA_OEMAKE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-EXTRA_OEMAKE'><glossterm>EXTRA_OEMAKE</glossterm>
             <info>
                 EXTRA_OEMAKE[doc] = "Additional GNU make options."
             </info>
             <glossdef>
-                <para>Additional GNU <filename>make</filename> options.</para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Additional GNU <filename>make</filename> options.
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-EXTRA_OESCONS'><glossterm>EXTRA_OESCONS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-EXTRA_OESCONS'><glossterm>EXTRA_OESCONS</glossterm>
             <info>
                 EXTRA_OESCONS[doc] = "When a recipe inherits the scons class, this variable specifies additional configuration options you want to pass to the scons command line."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-scons'><filename>scons</filename></link>
                     class, this variable specifies additional configuration
@@ -3392,12 +3455,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-EXTRA_QMAKEVARS_POST'><glossterm>EXTRA_QMAKEVARS_POST<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-EXTRA_QMAKEVARS_POST'><glossterm>EXTRA_QMAKEVARS_POST</glossterm>
             <info>
                 EXTRA_QMAKEVARS_POST[doc] = "Configuration variables or options you want to pass to qmake when the arguments need to be after the .pro file list on the command line."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Configuration variables or options you want to pass to
                     <filename>qmake</filename>.
                     Use this variable when the arguments need to be after the
@@ -3413,12 +3476,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-       <glossentry id='var-EXTRA_QMAKEVARS_PRE'><glossterm>EXTRA_QMAKEVARS_PRE<imagedata fileref="figures/define-generic.png" /></glossterm>
+       <glossentry id='var-EXTRA_QMAKEVARS_PRE'><glossterm>EXTRA_QMAKEVARS_PRE</glossterm>
             <info>
                 EXTRA_QMAKEVARS_PRE[doc] = "Configuration variables or options you want to pass to qmake when the arguments need to be before the .pro file list on the command line."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Configuration variables or options you want to pass to
                     <filename>qmake</filename>.
                     Use this variable when the arguments need to be before the
@@ -3434,12 +3497,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-EXTRA_USERS_PARAMS'><glossterm>EXTRA_USERS_PARAMS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-EXTRA_USERS_PARAMS'><glossterm>EXTRA_USERS_PARAMS</glossterm>
             <info>
                 EXTRA_USERS_PARAMS[doc] = "When a recipe inherits the extrausers class, this variable provides image level user and group operations."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-extrausers'><filename>extrausers</filename></link>
                     class, this variable provides image level user and group
@@ -3475,12 +3538,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
 
     <glossdiv id='var-glossary-f'><title>F</title>
 
-        <glossentry id='var-FEATURE_PACKAGES'><glossterm>FEATURE_PACKAGES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-FEATURE_PACKAGES'><glossterm>FEATURE_PACKAGES</glossterm>
             <info>
                 FEATURE_PACKAGES[doc] = "Defines one or more packages to include in an image when a specific item is included in IMAGE_FEATURES. When setting the value, FEATURE_PACKAGES should have the name of the feature item as an override."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     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>.
@@ -3490,6 +3553,9 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
                     <literallayout class='monospaced'>
      FEATURE_PACKAGES_widget = "<replaceable>package1</replaceable> <replaceable>package2</replaceable>"
                     </literallayout>
+                </para>
+
+                <para>
                     In this example, if "widget" were added to
                     <filename>IMAGE_FEATURES</filename>, <replaceable>package1</replaceable> and
                     <replaceable>package2</replaceable> would be included in the image.
@@ -3506,12 +3572,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-FEED_DEPLOYDIR_BASE_URI'><glossterm>FEED_DEPLOYDIR_BASE_URI<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-FEED_DEPLOYDIR_BASE_URI'><glossterm>FEED_DEPLOYDIR_BASE_URI</glossterm>
             <info>
                 FEED_DEPLOYDIR_BASE_URI[doc] = "Allow to serve ipk deploy directory as an ad hoc feed (bogofeed). Set to base URL of the directory as exported by HTTP. Set of ad hoc feed configs will be generated in the image."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Points to the base URL of the server and location within
                     the document-root that provides the metadata and
                     packages required by OPKG to support runtime package
@@ -3536,12 +3602,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-FILES'><glossterm>FILES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-FILES'><glossterm>FILES</glossterm>
             <info>
                 FILES[doc] = "The list of directories or files that are placed in packages."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The list of directories or files that are placed in packages.
                 </para>
 
@@ -3586,12 +3652,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-FILESEXTRAPATHS'><glossterm>FILESEXTRAPATHS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-FILESEXTRAPATHS'><glossterm>FILESEXTRAPATHS</glossterm>
             <info>
                 FILESEXTRAPATHS[doc] = "Extends the search path the OpenEmbedded build system uses when looking for files and patches as it processes recipes and append files."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Extends the search path the OpenEmbedded build system uses
                     when looking for files and patches as it processes recipes
                     and append files.
@@ -3656,12 +3722,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-FILESOVERRIDES'><glossterm>FILESOVERRIDES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-FILESOVERRIDES'><glossterm>FILESOVERRIDES</glossterm>
             <info>
                 FILESOVERRIDES[doc] = "A subset of OVERRIDES used by the OpenEmbedded build system for creating FILESPATH."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A subset of <link linkend='var-OVERRIDES'><filename>OVERRIDES</filename></link>
                     used by the OpenEmbedded build system for creating
                     <link linkend='var-FILESPATH'><filename>FILESPATH</filename></link>.
@@ -3687,12 +3753,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-FILESPATH'><glossterm>FILESPATH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-FILESPATH'><glossterm>FILESPATH</glossterm>
             <info>
                 FILESPATH[doc] = "The default set of directories the OpenEmbedded build system uses when searching for patches and files. It is defined in the base.bbclass class found in meta/classes in the Source Directory. Do not hand-edit the FILESPATH variable."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The default set of directories the OpenEmbedded build system
                     uses when searching for patches and files.
                     During the build process, BitBake searches each directory in
@@ -3733,18 +3799,20 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-FILESYSTEM_PERMS_TABLES'><glossterm>FILESYSTEM_PERMS_TABLES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-FILESYSTEM_PERMS_TABLES'><glossterm>FILESYSTEM_PERMS_TABLES</glossterm>
             <info>
                 FILESYSTEM_PERMS_TABLES[doc] = "Allows you to define your own file permissions settings table as part of your configuration for the packaging process."
             </info>
             <glossdef>
-                <para>Allows you to define your own file permissions settings table as part of
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Allows you to define your own file permissions settings table as part of
                     your configuration for the packaging process.
                     For example, suppose you need a consistent set of custom permissions for
                     a set of groups and users across an entire work project.
                     It is best to do this in the packages themselves but this is not always
                     possible.
                 </para>
+
                 <para>
                     By default, the OpenEmbedded build system uses the <filename>fs-perms.txt</filename>, which
                     is located in the <filename>meta/files</filename> folder in the
@@ -3752,6 +3820,7 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
                     If you create your own file permissions setting table, you should place it in your
                     layer or the distro's layer.
                 </para>
+
                 <para>
                     You define the <filename>FILESYSTEM_PERMS_TABLES</filename> variable in the
                     <filename>conf/local.conf</filename> file, which is found in the
@@ -3761,6 +3830,7 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
                     The paths you specify to these files must be defined within the
                     <link linkend='var-BBPATH'><filename>BBPATH</filename></link> variable.
                 </para>
+
                 <para>
                     For guidance on how to create your own file permissions settings table file,
                     examine the existing <filename>fs-perms.txt</filename>.
@@ -3768,12 +3838,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-FONT_EXTRA_RDEPENDS'><glossterm>FONT_EXTRA_RDEPENDS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-FONT_EXTRA_RDEPENDS'><glossterm>FONT_EXTRA_RDEPENDS</glossterm>
             <info>
                 FONT_EXTRA_RDEPENDS[doc] = "When a recipe inherits the fontcache class, this variable specifies runtime dependencies for font packages. This variable defaults to 'fontconfig-utils'."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-fontcache'><filename>fontcache</filename></link>
                     class, this variable specifies the runtime dependencies
@@ -3784,12 +3854,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-FONT_PACKAGES'><glossterm>FONT_PACKAGES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-FONT_PACKAGES'><glossterm>FONT_PACKAGES</glossterm>
             <info>
                 FONT_PACKAGES[doc] = "When a recipe inherits the fontcache class, this variable identifies packages containing font files that need to be cached by Fontconfig."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-fontcache'><filename>fontcache</filename></link>
                     class, this variable identifies packages containing font
@@ -3803,12 +3873,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-FULL_OPTIMIZATION'><glossterm>FULL_OPTIMIZATION<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-FULL_OPTIMIZATION'><glossterm>FULL_OPTIMIZATION</glossterm>
             <info>
                 FULL_OPTIMIZATION[doc]= "The options to pass in TARGET_CFLAGS and CFLAGS when compiling an optimized system. This variable defaults to '-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2'."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The options to pass in
                     <filename><link linkend='var-TARGET_CFLAGS'>TARGET_CFLAGS</link></filename>
                     and <filename><link linkend='var-CFLAGS'>CFLAGS</link></filename>
@@ -3822,35 +3892,35 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
 
     <glossdiv id='var-glossary-g'><title>G</title>
 
-        <glossentry id='var-GDB'><glossterm>GDB<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-GDB'><glossterm>GDB</glossterm>
             <info>
                 GDB[doc] = "The minimal command and arguments to run the GNU Debugger."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The minimal command and arguments to run the GNU Debugger.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-GITDIR'><glossterm>GITDIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-GITDIR'><glossterm>GITDIR</glossterm>
             <info>
                 GITDIR[doc] = "The directory where Git clones will be stored."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The directory in which a local copy of a Git repository
                     is stored when it is cloned.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-GLIBC_GENERATE_LOCALES'><glossterm>GLIBC_GENERATE_LOCALES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-GLIBC_GENERATE_LOCALES'><glossterm>GLIBC_GENERATE_LOCALES</glossterm>
             <info>
                 GLIBC_GENERATE_LOCALES[doc]= "Specifies the list of GLIBC locales to generate should you not wish generate all LIBC locals, which can be time consuming."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the list of GLIBC locales to generate should you
                     not wish generate all LIBC locals, which can be time
                     consuming.
@@ -3860,6 +3930,9 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
                         <link linkend='var-IMAGE_LINGUAS'><filename>IMAGE_LINGUAS</filename></link>
                         appropriately.
                     </note>
+                </para>
+
+                <para>
                     You can set <filename>GLIBC_GENERATE_LOCALES</filename>
                     in your <filename>local.conf</filename> file.
                     By default, all locales are generated.
@@ -3870,12 +3943,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-GROUPADD_PARAM'><glossterm>GROUPADD_PARAM<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-GROUPADD_PARAM'><glossterm>GROUPADD_PARAM</glossterm>
             <info>
                 GROUPADD_PARAM[doc] = "When a recipe inherits the useradd class, this variable specifies for a package what parameters should be passed to the groupadd command if you wish to add a group to the system when the package is installed."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-useradd'><filename>useradd</filename></link>
                     class, this variable
@@ -3898,12 +3971,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-GROUPMEMS_PARAM'><glossterm>GROUPMEMS_PARAM<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-GROUPMEMS_PARAM'><glossterm>GROUPMEMS_PARAM</glossterm>
             <info>
                 GROUPMEMS_PARAM[doc] = "When a recipe inherits the useradd class, this variable specifies for a package what parameters should be passed to the groupmems command if you wish to modify the members of a group when the package is installed."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-useradd'><filename>useradd</filename></link>
                     class, this variable
@@ -3921,12 +3994,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-GRUB_GFXSERIAL'><glossterm>GRUB_GFXSERIAL<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-GRUB_GFXSERIAL'><glossterm>GRUB_GFXSERIAL</glossterm>
             <info>
                 GRUB_GFXSERIAL[doc] = "Configures the GNU GRand Unified Bootloader (GRUB) to have graphics and serial in the boot menu."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Configures the GNU GRand Unified Bootloader (GRUB) to have
                     graphics and serial in the boot menu.
                     Set this variable to "1" in your
@@ -3943,12 +4016,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-GRUB_OPTS'><glossterm>GRUB_OPTS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-GRUB_OPTS'><glossterm>GRUB_OPTS</glossterm>
             <info>
                 GRUB_OPTS[doc] = "Additional options to add to the GNU GRand Unified Bootloader (GRUB) configuration."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Additional options to add to the GNU GRand Unified
                     Bootloader (GRUB) configuration.
                     Use a semi-colon character (<filename>;</filename>) to
@@ -3964,12 +4037,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-GRUB_TIMEOUT'><glossterm>GRUB_TIMEOUT<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-GRUB_TIMEOUT'><glossterm>GRUB_TIMEOUT</glossterm>
             <info>
                 GRUB_TIMEOUT[doc] = "Specifies the timeout before executing the default LABEL in the GNU GRand Unified Bootloader (GRUB)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the timeout before executing the default
                     <filename>LABEL</filename> in the GNU GRand Unified
                     Bootloader (GRUB).
@@ -3984,12 +4057,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-GTKIMMODULES_PACKAGES'><glossterm>GTKIMMODULES_PACKAGES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-GTKIMMODULES_PACKAGES'><glossterm>GTKIMMODULES_PACKAGES</glossterm>
             <info>
                 GTKIMMODULES_PACKAGES[doc] = "For recipes that inherit the gtk-immodules-cache class, this variable specifies the packages that contain the GTK+ input method modules being installed when the modules are in packages other than the main package."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-gtk-immodules-cache'><filename>gtk-immodules-cache</filename></link>
                     class, this variable specifies the packages that contain the
@@ -3999,12 +4072,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-GUMMIBOOT_CFG'><glossterm>GUMMIBOOT_CFG<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-GUMMIBOOT_CFG'><glossterm>GUMMIBOOT_CFG</glossterm>
             <info>
                 GUMMIBOOT_CFG[doc] = "When EFI_PROVIDER is set to "gummiboot", the GUMMIBOOT_CFG variable specifies the configuration file that should be used."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When
                     <link linkend='var-EFI_PROVIDER'><filename>EFI_PROVIDER</filename></link>
                     is set to "gummiboot", the
@@ -4026,12 +4099,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-GUMMIBOOT_ENTRIES'><glossterm>GUMMIBOOT_ENTRIES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-GUMMIBOOT_ENTRIES'><glossterm>GUMMIBOOT_ENTRIES</glossterm>
             <info>
                 GUMMIBOOT_ENTRIES[doc] = "When EFI_PROVIDER is set to "gummiboot", the GUMMIBOOT_ENTRIES variable specifies a list of entry files (*.conf) to be installed containing one boot entry per file."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When
                     <link linkend='var-EFI_PROVIDER'><filename>EFI_PROVIDER</filename></link>
                     is set to "gummiboot", the
@@ -4055,12 +4128,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-GUMMIBOOT_TIMEOUT'><glossterm>GUMMIBOOT_TIMEOUT<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-GUMMIBOOT_TIMEOUT'><glossterm>GUMMIBOOT_TIMEOUT</glossterm>
             <info>
                 GUMMIBOOT_TIMEOUT[doc] = "When EFI_PROVIDER is set to "gummiboot", the GUMMIBOOT_TIMEOUT variable specifies the boot menu timeout in seconds."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When
                     <link linkend='var-EFI_PROVIDER'><filename>EFI_PROVIDER</filename></link>
                     is set to "gummiboot", the
@@ -4086,23 +4159,25 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
 
     <glossdiv id='var-glossary-h'><title>H</title>
 
-        <glossentry id='var-HOMEPAGE'><glossterm>HOMEPAGE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-HOMEPAGE'><glossterm>HOMEPAGE</glossterm>
             <info>
                 HOMEPAGE[doc] = "Website where more information about the software the recipe is building can be found."
             </info>
             <glossdef>
-                <para>Website where more information about the software the recipe is building
-                    can be found.</para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Website where more information about the software the recipe is building
+                    can be found.
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-HOST_ARCH'><glossterm>HOST_ARCH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-HOST_ARCH'><glossterm>HOST_ARCH</glossterm>
             <info>
                 HOST_ARCH[doc] = "The name of the target architecture. Normally same as the TARGET_ARCH."
 
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The name of the target architecture, which is normally
                     the same as
                     <link linkend='var-TARGET_ARCH'><filename>TARGET_ARCH</filename></link>.
@@ -4124,12 +4199,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-HOST_CC_ARCH'><glossterm>HOST_CC_ARCH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-HOST_CC_ARCH'><glossterm>HOST_CC_ARCH</glossterm>
             <info>
                 HOST_CC_ARCH[doc] = "The name of the host architecture. Normally same as the TARGET_CC_ARCH."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies architecture-specific compiler flags that are
                     passed to the C compiler.
                 </para>
@@ -4157,12 +4232,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-HOST_OS'><glossterm>HOST_OS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-HOST_OS'><glossterm>HOST_OS</glossterm>
             <info>
                 HOST_OS[doc] = "The name of the target operating system. Normally the same as the TARGET_OS."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the name of the target operating system, which
                     is normally the same as the
                     <link linkend='var-TARGET_OS'><filename>TARGET_OS</filename></link>.
@@ -4174,12 +4249,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-HOST_PREFIX'><glossterm>HOST_PREFIX<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-HOST_PREFIX'><glossterm>HOST_PREFIX</glossterm>
             <info>
                 HOST_PREFIX[doc] = "The prefix for the cross compile toolchain. Normally same as the TARGET_PREFIX."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the prefix for the cross-compile toolchain.
                     <filename>HOST_PREFIX</filename> is normally the same as
                     <link linkend='var-TARGET_PREFIX'><filename>TARGET_PREFIX</filename></link>.
@@ -4187,12 +4262,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-HOST_SYS'><glossterm>HOST_SYS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-HOST_SYS'><glossterm>HOST_SYS</glossterm>
             <info>
                 HOST_SYS[doc] = "Specifies the system, including the architecture and the operating system, for with the build is occurring in the context of the current recipe."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the system, including the architecture and the
                     operating system, for which the build is occurring
                     in the context of the current recipe.
@@ -4227,12 +4302,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-HOST_VENDOR'><glossterm>HOST_VENDOR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-HOST_VENDOR'><glossterm>HOST_VENDOR</glossterm>
             <info>
                 HOST_VENDOR[doc] = "The name of the vendor. Normally same as the TARGET_VENDOR."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the name of the vendor.
                     <filename>HOST_VENDOR</filename> is normally the same as
                     <link linkend='var-TARGET_PREFIX'><filename>TARGET_VENDOR</filename></link>.
@@ -4244,12 +4319,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
 
     <glossdiv id='var-glossary-i'><title>I</title>
 
-        <glossentry id='var-ICECC_DISABLED'><glossterm>ICECC_DISABLED<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-ICECC_DISABLED'><glossterm>ICECC_DISABLED</glossterm>
             <info>
                 ICECC_DISABLED[doc] = "Disables or enables the icecc (Icecream) function."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Disables or enables the <filename>icecc</filename>
                     (Icecream) function.
                     For more information on this function and best practices
@@ -4272,12 +4347,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-ICECC_ENV_EXEC'><glossterm>ICECC_ENV_EXEC<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-ICECC_ENV_EXEC'><glossterm>ICECC_ENV_EXEC</glossterm>
             <info>
                 ICECC_ENV_EXEC[doc] = "Points to the icecc-create-env script that you provide."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Points to the <filename>icecc-create-env</filename> script
                     that you provide.
                     This variable is used by the
@@ -4297,12 +4372,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-ICECC_PARALLEL_MAKE'><glossterm>ICECC_PARALLEL_MAKE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-ICECC_PARALLEL_MAKE'><glossterm>ICECC_PARALLEL_MAKE</glossterm>
             <info>
                 ICECC_PARALLEL_MAKE[doc] = "Extra options passed to the make command during the do_compile task that specify parallel compilation."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Extra options passed to the <filename>make</filename>
                     command during the
                     <link linkend='ref-tasks-compile'><filename>do_compile</filename></link>
@@ -4341,12 +4416,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-ICECC_PATH'><glossterm>ICECC_PATH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-ICECC_PATH'><glossterm>ICECC_PATH</glossterm>
             <info>
                 ICECC_PATH[doc] = "The location of the icecc binary."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The location of the <filename>icecc</filename> binary.
                     You can set this variable in your
                     <filename>local.conf</filename> file.
@@ -4359,12 +4434,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-ICECC_USER_CLASS_BL'><glossterm>ICECC_USER_CLASS_BL<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-ICECC_USER_CLASS_BL'><glossterm>ICECC_USER_CLASS_BL</glossterm>
             <info>
                 ICECC_USER_CLASS_BL[doc] = "Identifies user classes that you do not want the Icecream distributed compile support to consider."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Identifies user classes that you do not want the
                     Icecream distributed compile support to consider.
                     This variable is used by the
@@ -4384,12 +4459,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-ICECC_USER_PACKAGE_BL'><glossterm>ICECC_USER_PACKAGE_BL<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-ICECC_USER_PACKAGE_BL'><glossterm>ICECC_USER_PACKAGE_BL</glossterm>
             <info>
                 ICECC_USER_PACKAGE_BL[doc] = "Identifies user recipes that you do not want the Icecream distributed compile support to consider."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Identifies user recipes that you do not want the
                     Icecream distributed compile support to consider.
                     This variable is used by the
@@ -4409,12 +4484,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-ICECC_USER_PACKAGE_WL'><glossterm>ICECC_USER_PACKAGE_WL<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-ICECC_USER_PACKAGE_WL'><glossterm>ICECC_USER_PACKAGE_WL</glossterm>
             <info>
                 ICECC_USER_PACKAGE_WL[doc] = "Identifies user recipes that use an empty PARALLEL_MAKE variable that you want to force remote distributed compilation on using the Icecream distributed compile support."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Identifies user recipes that use an empty
                     <link linkend='var-PARALLEL_MAKE'><filename>PARALLEL_MAKE</filename></link>
                     variable that you want to force remote distributed
@@ -4429,12 +4504,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-IMAGE_BASENAME'><glossterm>IMAGE_BASENAME<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-IMAGE_BASENAME'><glossterm>IMAGE_BASENAME</glossterm>
             <info>
                 IMAGE_BASENAME[doc] = "The base name of image output files."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     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>).
@@ -4442,12 +4517,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-IMAGE_BOOT_FILES'><glossterm>IMAGE_BOOT_FILES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-IMAGE_BOOT_FILES'><glossterm>IMAGE_BOOT_FILES</glossterm>
             <info>
                 IMAGE_BOOT_FILES[doc] = "Whitespace separated list of files from ${DEPLOY_DIR_IMAGE} to place in boot partition. Entries will be installed under a same name as the source file. To change the destination file name, pass a desired name after a semicolon (eg. u-boot.img;uboot)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A space-separated list of files installed into the
                     boot partition when preparing an image using the
                     <filename>wic</filename> tool with the
@@ -4465,6 +4540,9 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
      IMAGE_BOOT_FILES = "u-boot.img uImage;kernel"
      IMAGE_BOOT_FILES = "u-boot.${UBOOT_SUFFIX} ${KERNEL_IMAGETYPE}"
                     </literallayout>
+                </para>
+
+                <para>
                     Alternatively, source files can be picked up using
                     a glob pattern.
                     In this case, the destination file
@@ -4488,12 +4566,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-IMAGE_CLASSES'><glossterm>IMAGE_CLASSES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-IMAGE_CLASSES'><glossterm>IMAGE_CLASSES</glossterm>
             <info>
                 IMAGE_CLASSES[doc] = "A list of classes that all images should inherit."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A list of classes that all images should inherit.
                     You typically use this variable to specify the list of
                     classes that register the different types of images
@@ -4516,12 +4594,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-IMAGE_CMD'><glossterm>IMAGE_CMD<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-IMAGE_CMD'><glossterm>IMAGE_CMD</glossterm>
             <info>
                 IMAGE_CMD[doc] = "Specifies the command to create the image file for a specific image type, which corresponds to the value set set in IMAGE_FSTYPES, (e.g. ext3, btrfs, and so forth)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the command to create the image file for a
                     specific image type, which corresponds to the value set
                     set in
@@ -4536,6 +4614,9 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
         --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
         ${EXTRA_IMAGECMD}"
                     </literallayout>
+                </para>
+
+                <para>
                     You typically do not need to set this variable unless
                     you are adding support for a new image type.
                     For more examples on how to set this variable, see the
@@ -4546,12 +4627,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-IMAGE_DEVICE_TABLES'><glossterm>IMAGE_DEVICE_TABLES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-IMAGE_DEVICE_TABLES'><glossterm>IMAGE_DEVICE_TABLES</glossterm>
             <info>
                 IMAGE_DEVICE_TABLES[doc] = "Specifies one or more files that contain custom device tables that are passed to the makedevs command as part of creating an image."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies one or more files that contain custom device
                     tables that are passed to the
                     <filename>makedevs</filename> command as part of creating
@@ -4569,12 +4650,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-IMAGE_FEATURES'><glossterm>IMAGE_FEATURES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-IMAGE_FEATURES'><glossterm>IMAGE_FEATURES</glossterm>
             <info>
                 IMAGE_FEATURES[doc] = "The primary list of features to include in an image. Configure this variable in an image recipe."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The primary list of features to include in an image.
                     Typically, you configure this variable in an image recipe.
                     Although you can use this variable from your
@@ -4586,6 +4667,9 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
                         use the
                         <filename><link linkend='var-EXTRA_IMAGE_FEATURES'>EXTRA_IMAGE_FEATURES</link></filename> variable.
                     </note>
+                </para>
+
+                <para>
                     For a list of image features that ships with the Yocto
                     Project, see the
                     "<link linkend="ref-features-image">Image Features</link>"
@@ -4601,12 +4685,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-IMAGE_FSTYPES'><glossterm>IMAGE_FSTYPES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-IMAGE_FSTYPES'><glossterm>IMAGE_FSTYPES</glossterm>
             <info>
                 IMAGE_FSTYPES[doc] = "Formats of root filesystem images that you want to have created."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the formats the OpenEmbedded build system uses
                     during the build when creating the root filesystem.
                     For example, setting <filename>IMAGE_FSTYPES</filename>
@@ -4616,6 +4700,9 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
                     <literallayout class='monospaced'>
      IMAGE_FSTYPES = "ext3 tar.bz2"
                     </literallayout>
+                </para>
+
+                <para>
                     For the complete list of supported image formats from which
                     you can choose, see
                     <link linkend='var-IMAGE_TYPES'><filename>IMAGE_TYPES</filename></link>.
@@ -4639,12 +4726,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-IMAGE_INSTALL'><glossterm>IMAGE_INSTALL<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-IMAGE_INSTALL'><glossterm>IMAGE_INSTALL</glossterm>
             <info>
                 IMAGE_INSTALL[doc] = "Specifies the packages to install into an image. Image recipes set IMAGE_INSTALL to specify the packages to install into an image through image.bbclass."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the packages to install into an image.
                     The <filename>IMAGE_INSTALL</filename> variable is a
                     mechanism for an image recipe and you should use it
@@ -4705,12 +4792,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-IMAGE_LINGUAS'><glossterm>IMAGE_LINGUAS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-IMAGE_LINGUAS'><glossterm>IMAGE_LINGUAS</glossterm>
             <info>
                 IMAGE_LINGUAS[doc] = "Specifies the list of locales to install into the image during the root filesystem construction process."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the list of locales to install into the image
                     during the root filesystem construction process.
                     The OpenEmbedded build system automatically splits locale
@@ -4724,6 +4811,9 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
                     <literallayout class='monospaced'>
      IMAGE_LINGUAS = "pt-br de-de"
                     </literallayout>
+                </para>
+
+                <para>
                     In this example, the build system ensures any Brazilian
                     Portuguese and German locale files that correspond to
                     packages in the image are installed (i.e.
@@ -4743,12 +4833,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-IMAGE_MANIFEST'><glossterm>IMAGE_MANIFEST<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-IMAGE_MANIFEST'><glossterm>IMAGE_MANIFEST</glossterm>
             <info>
                 IMAGE_MANIFEST[doc] = "The manifest file for the image. This file lists all the installed packages that make up the image."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The manifest file for the image.
                     This file lists all the installed packages that make up
                     the image.
@@ -4779,12 +4869,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-IMAGE_NAME'><glossterm>IMAGE_NAME<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-IMAGE_NAME'><glossterm>IMAGE_NAME</glossterm>
             <info>
                 IMAGE_NAME[doc] = "The name of the output image files minus the extension."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The name of the output image files minus the extension.
                     This variable is derived using the
                     <link linkend='var-IMAGE_BASENAME'><filename>IMAGE_BASENAME</filename></link>,
@@ -4799,12 +4889,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-IMAGE_OVERHEAD_FACTOR'><glossterm>IMAGE_OVERHEAD_FACTOR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-IMAGE_OVERHEAD_FACTOR'><glossterm>IMAGE_OVERHEAD_FACTOR</glossterm>
             <info>
                 IMAGE_OVERHEAD_FACTOR[doc] = "Defines a multiplier that the build system applies to the initial image size for cases when the multiplier times the returned disk usage value for the image is greater than the sum of IMAGE_ROOTFS_SIZE and IMAGE_ROOTFS_EXTRA_SPACE."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Defines a multiplier that the build system applies to the initial image
                     size for cases when the multiplier times the returned disk usage value
                     for the image is greater than the sum of
@@ -4844,12 +4934,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-IMAGE_PKGTYPE'><glossterm>IMAGE_PKGTYPE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-IMAGE_PKGTYPE'><glossterm>IMAGE_PKGTYPE</glossterm>
             <info>
                 IMAGE_PKGTYPE[doc] = "Defines the package type (DEB, RPM, IPK, or TAR) used by the OpenEmbedded build system."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Defines the package type (DEB, RPM, IPK, or TAR) used
                     by the OpenEmbedded build system.
                     The variable is defined appropriately by the
@@ -4895,18 +4985,21 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-IMAGE_POSTPROCESS_COMMAND'><glossterm>IMAGE_POSTPROCESS_COMMAND<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-IMAGE_POSTPROCESS_COMMAND'><glossterm>IMAGE_POSTPROCESS_COMMAND</glossterm>
             <info>
                 IMAGE_POSTPROCESS_COMMAND[doc] = "Added by classes to run post processing commands once the OpenEmbedded build system has created the image."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Added by classes to run post processing commands once the
                     OpenEmbedded build system has created the image.
                     You can specify shell commands separated by semicolons:
                     <literallayout class='monospaced'>
      IMAGE_POSTPROCESS_COMMAND += "<replaceable>shell_command</replaceable>; ... "
                     </literallayout>
+                </para>
+
+                <para>
                     If you need to pass the path to the root filesystem within
                     the command, you can use
                     <filename>${IMAGE_ROOTFS}</filename>, which points to
@@ -4915,12 +5008,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-IMAGE_ROOTFS'><glossterm>IMAGE_ROOTFS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-IMAGE_ROOTFS'><glossterm>IMAGE_ROOTFS</glossterm>
             <info>
                 IMAGE_ROOTFS[doc] = "The location of the root filesystem while it is under construction (i.e. during do_rootfs)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The location of the root filesystem while it is under
                     construction (i.e. during the
                     <link linkend='ref-tasks-rootfs'><filename>do_rootfs</filename></link>
@@ -4931,12 +5024,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-IMAGE_ROOTFS_ALIGNMENT'><glossterm>IMAGE_ROOTFS_ALIGNMENT<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-IMAGE_ROOTFS_ALIGNMENT'><glossterm>IMAGE_ROOTFS_ALIGNMENT</glossterm>
             <info>
                 IMAGE_ROOTFS_ALIGNMENT[doc] = "Specifies the alignment for the output image file in Kbytes."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the alignment for the output image file in
                     Kbytes.
                     If the size of the image is not a multiple of
@@ -4950,12 +5043,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-IMAGE_ROOTFS_EXTRA_SPACE'><glossterm>IMAGE_ROOTFS_EXTRA_SPACE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-IMAGE_ROOTFS_EXTRA_SPACE'><glossterm>IMAGE_ROOTFS_EXTRA_SPACE</glossterm>
             <info>
                 IMAGE_ROOTFS_EXTRA_SPACE[doc] = "Defines additional free disk space created in the image in Kbytes. By default, this variable is set to '0'."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Defines additional free disk space created in the image in Kbytes.
                     By default, this variable is set to "0".
                     This free disk space is added to the image after the build system determines
@@ -4984,12 +5077,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-IMAGE_ROOTFS_SIZE'><glossterm>IMAGE_ROOTFS_SIZE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-IMAGE_ROOTFS_SIZE'><glossterm>IMAGE_ROOTFS_SIZE</glossterm>
             <info>
                 IMAGE_ROOTFS_SIZE[doc] = "Defines the size in Kbytes for the generated image."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Defines the size in Kbytes for the generated image.
                     The OpenEmbedded build system determines the final size for the generated
                     image using an algorithm that takes into account the initial disk space used
@@ -5017,6 +5110,9 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
 
       xspace = IMAGE_ROOTFS_EXTRA_SPACE
                     </literallayout>
+                </para>
+
+                <para>
                     See the <link linkend='var-IMAGE_OVERHEAD_FACTOR'><filename>IMAGE_OVERHEAD_FACTOR</filename></link>
                     and <link linkend='var-IMAGE_ROOTFS_EXTRA_SPACE'><filename>IMAGE_ROOTFS_EXTRA_SPACE</filename></link>
                     variables for related information.
@@ -5030,12 +5126,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-IMAGE_TYPEDEP'><glossterm>IMAGE_TYPEDEP<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-IMAGE_TYPEDEP'><glossterm>IMAGE_TYPEDEP</glossterm>
             <info>
                 IMAGE_TYPEDEP[doc] = "Specifies a dependency from one image type on another."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies a dependency from one image type on another.
                     Here is an example from the
                     <link linkend='ref-classes-image-live'><filename>image-live</filename></link>
@@ -5043,6 +5139,9 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
                     <literallayout class='monospaced'>
      IMAGE_TYPEDEP_live = "ext3"
                     </literallayout>
+                </para>
+
+                <para>
                     In the previous example, the variable ensures that when
                     "live" is listed with the
                     <link linkend='var-IMAGE_FSTYPES'><filename>IMAGE_FSTYPES</filename></link>
@@ -5056,12 +5155,12 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-IMAGE_TYPES'><glossterm>IMAGE_TYPES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-IMAGE_TYPES'><glossterm>IMAGE_TYPES</glossterm>
             <info>
                 IMAGE_TYPES[doc] = "Specifies the complete list of supported image types by default."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the complete list of supported image types
                     by default:
                     <literallayout class='monospaced'>
@@ -5091,6 +5190,9 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
      vmdk
      elf
                     </literallayout>
+                </para>
+
+                <para>
                     For more information about these types of images, see
                     <filename>meta/classes/image_types*.bbclass</filename>
                     in the
@@ -5099,16 +5201,20 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-INC_PR'><glossterm>INC_PR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-INC_PR'><glossterm>INC_PR</glossterm>
             <info>
                 INC_PR[doc] = "Helps define the recipe revision for recipes that share a common include file."
             </info>
             <glossdef>
-                <para>Helps define the recipe revision for recipes that share
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Helps define the recipe revision for recipes that share
                     a common <filename>include</filename> file.
                     You can think of this variable as part of the recipe revision
-                    as set from within an include file.</para>
-                <para>Suppose, for example, you have a set of recipes that
+                    as set from within an include file.
+                </para>
+
+                <para>
+                    Suppose, for example, you have a set of recipes that
                     are used across several projects.
                     And, within each of those recipes the revision
                     (its <link linkend='var-PR'><filename>PR</filename></link>
@@ -5119,14 +5225,18 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
                     version of the recipe.
                     In this scenario, it can get complicated when recipes
                     that are used in many places and provide common functionality
-                    are upgraded to a new revision.</para>
-                <para>A more efficient way of dealing with this situation is
+                    are upgraded to a new revision.
+                </para>
+
+                <para>
+                    A more efficient way of dealing with this situation is
                     to set the <filename>INC_PR</filename> variable inside
                     the <filename>include</filename> files that the recipes
                     share and then expand the <filename>INC_PR</filename>
                     variable within the recipes to help
                     define the recipe revision.
-                    </para>
+                </para>
+
                 <para>
                     The following provides an example that shows how to use
                     the <filename>INC_PR</filename> variable
@@ -5151,16 +5261,17 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     <filename>include</filename> file.
                     The remaining lines in the example are from individual
                     recipes and show how the <filename>PR</filename> value
-                    is set.</para>
+                    is set.
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-INCOMPATIBLE_LICENSE'><glossterm>INCOMPATIBLE_LICENSE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-INCOMPATIBLE_LICENSE'><glossterm>INCOMPATIBLE_LICENSE</glossterm>
             <info>
                 INCOMPATIBLE_LICENSE[doc] = "Specifies a space-separated list of license names (as they would appear in LICENSE) that should be excluded from the build."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies a space-separated list of license names
                     (as they would appear in
                     <link linkend='var-LICENSE'><filename>LICENSE</filename></link>)
@@ -5185,12 +5296,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-INHIBIT_DEFAULT_DEPS'><glossterm>INHIBIT_DEFAULT_DEPS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-INHIBIT_DEFAULT_DEPS'><glossterm>INHIBIT_DEFAULT_DEPS</glossterm>
             <info>
                 INHIBIT_DEFAULT_DEPS[doc] = "Prevents the default dependencies, namely the C compiler and standard C library (libc), from being added to DEPENDS."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Prevents the default dependencies, namely the C compiler
                     and standard C library (libc), from being added to
                     <link linkend='var-DEPENDS'><filename>DEPENDS</filename></link>.
@@ -5205,13 +5316,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-INHIBIT_PACKAGE_DEBUG_SPLIT'><glossterm>INHIBIT_PACKAGE_DEBUG_SPLIT<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-INHIBIT_PACKAGE_DEBUG_SPLIT'><glossterm>INHIBIT_PACKAGE_DEBUG_SPLIT</glossterm>
             <info>
                 INHIBIT_PACKAGE_STRIP[doc] = "If set to "1", causes the build to not strip binaries in resulting packages."
             </info>
             <glossdef>
-
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Prevents the OpenEmbedded build system from splitting
                     out debug information during packaging.
                     By default, the build system splits out debugging
@@ -5236,23 +5346,23 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-INHIBIT_PACKAGE_STRIP'><glossterm>INHIBIT_PACKAGE_STRIP<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-INHIBIT_PACKAGE_STRIP'><glossterm>INHIBIT_PACKAGE_STRIP</glossterm>
             <info>
                 INHIBIT_PACKAGE_STRIP[doc] = "If set to "1", causes the build to not strip binaries in resulting packages."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     If set to "1", causes the build to not strip binaries in resulting packages.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-INHERIT'><glossterm>INHERIT<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-INHERIT'><glossterm>INHERIT</glossterm>
             <info>
                 INHERIT[doc] = "Causes the named class to be inherited at this point during parsing. The variable is only valid in configuration files."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Causes the named class to be inherited at
                     this point during parsing.
                     The variable is only valid in configuration files.
@@ -5260,12 +5370,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-INHERIT_DISTRO'><glossterm>INHERIT_DISTRO<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-INHERIT_DISTRO'><glossterm>INHERIT_DISTRO</glossterm>
             <info>
                 INHERIT_DISTRO[doc] = "Lists classes that will be inherited at the distribution level. It is unlikely that you want to edit this variable."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Lists classes that will be inherited at the
                     distribution level.
                     It is unlikely that you want to edit this variable.
@@ -5282,12 +5392,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-INITRAMFS_FSTYPES'><glossterm>INITRAMFS_FSTYPES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-INITRAMFS_FSTYPES'><glossterm>INITRAMFS_FSTYPES</glossterm>
             <info>
                 INITRAMFS_FSTYPES[doc] = "Defines the format for the output image of an initial RAM disk (initramfs), which is used during boot."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Defines the format for the output image of an initial
                     RAM disk (initramfs), which is used during boot.
                     Supported formats are the same as those supported by the
@@ -5297,12 +5407,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-INITRAMFS_IMAGE'><glossterm>INITRAMFS_IMAGE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-INITRAMFS_IMAGE'><glossterm>INITRAMFS_IMAGE</glossterm>
             <info>
                 INITRAMFS_IMAGE[doc] = "Causes the OpenEmbedded build system to build an additional recipe as a dependency to your root filesystem recipe (e.g. core-image-sato)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Causes the OpenEmbedded build system to build an additional
                     recipe as a dependency to your root filesystem recipe
                     (e.g. <filename>core-image-sato</filename>).
@@ -5343,12 +5453,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-INITRAMFS_IMAGE_BUNDLE'><glossterm>INITRAMFS_IMAGE_BUNDLE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-INITRAMFS_IMAGE_BUNDLE'><glossterm>INITRAMFS_IMAGE_BUNDLE</glossterm>
             <info>
                 INITRAMFS_IMAGE_BUNDLE[doc] = "Controls whether or not the image recipe specified by INITRAMFS_IMAGE is run through an extra pass during kernel compilation in order to build a single binary that contains both the kernel image and the initial RAM disk (initramfs)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Controls whether or not the image recipe specified by
                     <link linkend='var-INITRAMFS_IMAGE'><filename>INITRAMFS_IMAGE</filename></link>
                     is run through an extra pass during kernel compilation
@@ -5393,12 +5503,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-INITRD'><glossterm>INITRD<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-INITRD'><glossterm>INITRD</glossterm>
             <info>
                 INITRD[doc] = "Indicates a list of filesystem images to concatenate and use as an initial RAM disk (initrd)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Indicates list of filesystem images to concatenate and use
                     as an initial RAM disk (<filename>initrd</filename>).
                 </para>
@@ -5412,12 +5522,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-INITRD_IMAGE'><glossterm>INITRD_IMAGE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-INITRD_IMAGE'><glossterm>INITRD_IMAGE</glossterm>
             <info>
                 INITRD_IMAGE[doc] = "When building a "live" bootable image (i.e. when IMAGE_FSTYPES contains "live"), INITRD_IMAGE specifies the image recipe that should be built to provide the initial RAM disk image."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When building a "live" bootable image (i.e. when
                     <link linkend='var-IMAGE_FSTYPES'><filename>IMAGE_FSTYPES</filename></link>
                     contains "live"), <filename>INITRD_IMAGE</filename>
@@ -5434,15 +5544,16 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-INITSCRIPT_NAME'><glossterm>INITSCRIPT_NAME<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-INITSCRIPT_NAME'><glossterm>INITSCRIPT_NAME</glossterm>
             <info>
                 INITSCRIPT_NAME[doc] = "The filename of the initialization script as installed to ${sysconfdir}/init.d."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The filename of the initialization script as installed to
                     <filename>${sysconfdir}/init.d</filename>.
                 </para>
+
                 <para>
                     This variable is used in recipes when using <filename>update-rc.d.bbclass</filename>.
                     The variable is mandatory.
@@ -5450,15 +5561,17 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-INITSCRIPT_PACKAGES'><glossterm>INITSCRIPT_PACKAGES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-INITSCRIPT_PACKAGES'><glossterm>INITSCRIPT_PACKAGES</glossterm>
             <info>
                 INITSCRIPT_PACKAGES[doc] = "A list of the packages that contain initscripts. This variable is used in recipes when using update-rc.d.bbclass. The variable is optional and defaults to the PN variable."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A list of the packages that contain initscripts.
                     If multiple packages are specified, you need to append the package name
-                    to the other <filename>INITSCRIPT_*</filename> as an override.</para>
+                    to the other <filename>INITSCRIPT_*</filename> as an override.
+                 </para>
+
                  <para>
                     This variable is used in recipes when using <filename>update-rc.d.bbclass</filename>.
                     The variable is optional and defaults to the
@@ -5467,27 +5580,32 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
            </glossdef>
         </glossentry>
 
-        <glossentry id='var-INITSCRIPT_PARAMS'><glossterm>INITSCRIPT_PARAMS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-INITSCRIPT_PARAMS'><glossterm>INITSCRIPT_PARAMS</glossterm>
             <info>
                 INITSCRIPT_PARAMS[doc] = "Specifies the options to pass to update-rc.d. The variable is mandatory and is used in recipes when using update-rc.d.bbclass."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the options to pass to <filename>update-rc.d</filename>.
                     Here is an example:
                     <literallayout class='monospaced'>
      INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
                     </literallayout>
+                </para>
+
+                <para>
                     In this example, the script has a runlevel of 99,
                     starts the script in initlevels 2 and 5, and
                     stops the script in levels 0, 1 and 6.
                 </para>
+
                 <para>
                     The variable's default value is "defaults", which is
                     set in the
                     <link linkend='ref-classes-update-rc.d'><filename>update-rc.d</filename></link>
                     class.
                 </para>
+
                 <para>
                     The value in
                     <filename>INITSCRIPT_PARAMS</filename> is passed through
@@ -5499,12 +5617,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-INSANE_SKIP'><glossterm>INSANE_SKIP<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-INSANE_SKIP'><glossterm>INSANE_SKIP</glossterm>
             <info>
                 INSANE_SKIP[doc] = "Specifies the QA checks to skip for a specific package within a recipe."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the QA checks to skip for a specific package
                     within a recipe.
                     For example, to skip the check for symbolic link
@@ -5516,6 +5634,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
      INSANE_SKIP_${PN} += "dev-so"
                     </literallayout>
                 </para>
+
                 <para>
                     See the "<link linkend='ref-classes-insane'><filename>insane.bbclass</filename></link>"
                     section for a list of the valid QA checks you can
@@ -5524,12 +5643,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-IPK_FEED_URIS'><glossterm>IPK_FEED_URIS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-IPK_FEED_URIS'><glossterm>IPK_FEED_URIS</glossterm>
             <info>
                 IPK_FEED_URIS[doc] = "List of ipkg feed records to put into generated image."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When the IPK backend is in use and package management
                     is enabled on the target, you can use this variable to
                     set up <filename>opkg</filename> in the target image
@@ -5542,7 +5661,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
         </glossentry>
 
 <!--
-        <glossentry id='var-INTERCEPT_DIR'><glossterm>INTERCEPT_DIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-INTERCEPT_DIR'><glossterm>INTERCEPT_DIR</glossterm>
             <glossdef>
                 <para>
                     An environment variable that defines the directory where
@@ -5583,12 +5702,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
 
    <glossdiv id='var-glossary-k'><title>K</title>
 
-        <glossentry id='var-KARCH'><glossterm>KARCH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-KARCH'><glossterm>KARCH</glossterm>
             <info>
                 KARCH[doc] = "Defines the kernel architecture used when assembling the configuration. You define the KARCH variable in the BSP Descriptions."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Defines the kernel architecture used when assembling
                     the configuration.
                     Architectures supported for this release are:
@@ -5609,12 +5728,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-KBRANCH'><glossterm>KBRANCH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-KBRANCH'><glossterm>KBRANCH</glossterm>
             <info>
                 KBRANCH[doc] = "A regular expression used by the build process to explicitly identify the kernel branch that is validated, patched and configured during a build."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A regular expression used by the build process to explicitly
                     identify the kernel branch that is validated, patched
                     and configured during a build.
@@ -5673,12 +5792,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-KBRANCH_DEFAULT'><glossterm>KBRANCH_DEFAULT<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-KBRANCH_DEFAULT'><glossterm>KBRANCH_DEFAULT</glossterm>
             <info>
                 KBRANCH_DEFAULT[doc] = "Defines the Linux kernel source repository's default branch used to build the Linux kernel. Unless you specify otherwise, the variable initializes to 'master'."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Defines the Linux kernel source repository's default
                     branch used to build the Linux kernel.
                     The <filename>KBRANCH_DEFAULT</filename> value is
@@ -5691,12 +5810,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-KERNEL_EXTRA_ARGS'><glossterm>KERNEL_EXTRA_ARGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-KERNEL_EXTRA_ARGS'><glossterm>KERNEL_EXTRA_ARGS</glossterm>
             <info>
                 KERNEL_EXTRA_ARGS[doc] = "Specifies additional make command-line arguments the OpenEmbedded build system passes on when compiling the kernel."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies additional <filename>make</filename>
                     command-line arguments the OpenEmbedded build system
                     passes on when compiling the kernel.
@@ -5704,27 +5823,34 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-KERNEL_FEATURES'><glossterm>KERNEL_FEATURES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-KERNEL_FEATURES'><glossterm>KERNEL_FEATURES</glossterm>
             <info>
                 KERNEL_FEATURES[doc] = "Includes additional metadata from the Yocto Project kernel Git repository. The metadata you add through this variable includes config fragments and features descriptions."
             </info>
             <glossdef>
-                <para>Includes additional metadata from the Yocto Project kernel Git repository.
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Includes additional metadata from the Yocto Project kernel Git repository.
                     In the OpenEmbedded build system, the default Board Support Packages (BSPs)
                     <ulink url='&YOCTO_DOCS_DEV_URL;#metadata'>Metadata</ulink>
                     is provided through
                     the <link linkend='var-KMACHINE'><filename>KMACHINE</filename></link>
                     and <link linkend='var-KBRANCH'><filename>KBRANCH</filename></link> variables.
                     You can use the <filename>KERNEL_FEATURES</filename> variable to further
-                    add metadata for all BSPs.</para>
-                <para>The metadata you add through this variable includes config fragments and
+                    add metadata for all BSPs.
+                </para>
+
+                <para>
+                    The metadata you add through this variable includes config fragments and
                     features descriptions,
                     which usually includes patches as well as config fragments.
                     You typically override the <filename>KERNEL_FEATURES</filename> variable
                     for a specific machine.
                     In this way, you can provide validated, but optional, sets of kernel
-                    configurations and features.</para>
-                <para>For example, the following adds <filename>netfilter</filename> to all
+                    configurations and features.
+                </para>
+
+                <para>
+                    For example, the following adds <filename>netfilter</filename> to all
                     the Yocto Project kernels and adds sound support to the <filename>qemux86</filename>
                     machine:
                     <literallayout class='monospaced'>
@@ -5737,12 +5863,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-KERNEL_IMAGE_BASE_NAME'><glossterm>KERNEL_IMAGE_BASE_NAME<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-KERNEL_IMAGE_BASE_NAME'><glossterm>KERNEL_IMAGE_BASE_NAME</glossterm>
             <info>
                 KERNEL_IMAGE_BASE_NAME[doc] = "The base name of the kernel image."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The base name of the kernel image.
                     This variable is set in the
                     <link linkend='ref-classes-kernel'>kernel</link> class
@@ -5750,6 +5876,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     <literallayout class='monospaced'>
      KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
                     </literallayout>
+                </para>
+
+                <para>
                     See the
                     <link linkend='var-KERNEL_IMAGETYPE'><filename>KERNEL_IMAGETYPE</filename></link>,
                     <link linkend='var-PKGE'><filename>PKGE</filename></link>,
@@ -5763,12 +5892,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-KERNEL_IMAGE_MAXSIZE'><glossterm>KERNEL_IMAGE_MAXSIZE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-KERNEL_IMAGE_MAXSIZE'><glossterm>KERNEL_IMAGE_MAXSIZE</glossterm>
             <info>
                 KERNEL_IMAGE_MAXSIZE[doc] = "The maximum allowable size in kilobytes of the kernel image file."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the maximum size of the kernel image file in
                     kilobytes.
                     If <filename>KERNEL_IMAGE_MAXSIZE</filename> is set,
@@ -5793,25 +5922,27 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-KERNEL_IMAGETYPE'><glossterm>KERNEL_IMAGETYPE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-KERNEL_IMAGETYPE'><glossterm>KERNEL_IMAGETYPE</glossterm>
             <info>
                 KERNEL_IMAGETYPE[doc] = "The type of kernel to build for a device, usually set by the machine configuration files and defaults to 'zImage'."
             </info>
             <glossdef>
-                <para>The type of kernel to build for a device, usually set by the
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    The type of kernel to build for a device, usually set by the
                     machine configuration files and defaults to "zImage".
                     This variable is used
                     when building the kernel and is passed to <filename>make</filename> as the target to
-                    build.</para>
+                    build.
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-KERNEL_MODULE_AUTOLOAD'><glossterm>KERNEL_MODULE_AUTOLOAD<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-KERNEL_MODULE_AUTOLOAD'><glossterm>KERNEL_MODULE_AUTOLOAD</glossterm>
             <info>
                 KERNEL_MODULE_AUTOLOAD[doc] = "Lists kernel modules that need to be auto-loaded during boot"
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Lists kernel modules that need to be auto-loaded during
                     boot.
                     <note>
@@ -5859,12 +5990,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-KERNEL_MODULE_PROBECONF'><glossterm>KERNEL_MODULE_PROBECONF<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-KERNEL_MODULE_PROBECONF'><glossterm>KERNEL_MODULE_PROBECONF</glossterm>
             <info>
                 KERNEL_MODULE_PROBECONF[doc] = "Lists kernel modules for which the build system expects to find module_conf_* values that specify configuration for each of the modules."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Provides a list of modules for which the OpenEmbedded
                     build system expects to find
                     <filename>module_conf_</filename><replaceable>modname</replaceable>
@@ -5877,12 +6008,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-KERNEL_PATH'><glossterm>KERNEL_PATH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-KERNEL_PATH'><glossterm>KERNEL_PATH</glossterm>
             <info>
                 KERNEL_PATH[doc] = "The location of the kernel sources. This variable is set to the value of the STAGING_KERNEL_DIR within the module class (module.bbclass)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The location of the kernel sources.
                     This variable is set to the value of the
                     <link linkend='var-STAGING_KERNEL_DIR'><filename>STAGING_KERNEL_DIR</filename></link>
@@ -5907,12 +6038,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-KERNEL_SRC'><glossterm>KERNEL_SRC<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-KERNEL_SRC'><glossterm>KERNEL_SRC</glossterm>
             <info>
                 KERNEL_SRC[doc] = "The location of the kernel sources. This variable is set to the value of the STAGING_KERNEL_DIR within the module class (module.bbclass)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The location of the kernel sources.
                     This variable is set to the value of the
                     <link linkend='var-STAGING_KERNEL_DIR'><filename>STAGING_KERNEL_DIR</filename></link>
@@ -5937,12 +6068,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-KFEATURE_DESCRIPTION'><glossterm>KFEATURE_DESCRIPTION<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-KFEATURE_DESCRIPTION'><glossterm>KFEATURE_DESCRIPTION</glossterm>
             <info>
                 KFEATURE_DESCRIPTION[doc] = "Provides a short description of a configuration fragment. You use this variable in the .scc file that describes a configuration fragment file."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Provides a short description of a configuration fragment.
                     You use this variable in the <filename>.scc</filename>
                     file that describes a configuration fragment file.
@@ -5956,12 +6087,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-KMACHINE'><glossterm>KMACHINE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-KMACHINE'><glossterm>KMACHINE</glossterm>
             <info>
                 KMACHINE[doc] = "The machine as known by the kernel."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The machine as known by the kernel.
                     Sometimes the machine name used by the kernel does not match the machine name
                     used by the OpenEmbedded build system.
@@ -6052,12 +6183,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-KTYPE'><glossterm>KTYPE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-KTYPE'><glossterm>KTYPE</glossterm>
             <info>
                 KTYPE[doc] = "Defines the kernel type to be used in assembling the configuration."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Defines the kernel type to be used in assembling the
                     configuration.
                     The linux-yocto recipes define "standard", "tiny",
@@ -6081,12 +6212,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
 
     <glossdiv id='var-glossary-l'><title>L</title>
 
-        <glossentry id='var-LABELS'><glossterm>LABELS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-LABELS'><glossterm>LABELS</glossterm>
             <info>
                 LABELS[doc] = "Provides a list of targets for automatic configuration."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Provides a list of targets for automatic configuration.
                 </para>
 
@@ -6098,12 +6229,13 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-LAYERDEPENDS'><glossterm>LAYERDEPENDS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-LAYERDEPENDS'><glossterm>LAYERDEPENDS</glossterm>
             <info>
                 LAYERDEPENDS[doc] = "Lists the layers, separated by spaces, upon which this recipe depends. This variable is used in the conf/layer.conf file and must be suffixed with the name of the specific layer."
             </info>
             <glossdef>
-                <para>Lists the layers that this recipe depends upon, separated by spaces.
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Lists the layers that this recipe depends upon, separated by spaces.
                     Optionally, you can specify a specific layer version for a dependency
                     by adding it to the end of the layer name with a colon, (e.g. "anotherlayer:3"
                     to be compared against
@@ -6113,56 +6245,61 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     the version numbers do not match exactly (if specified).
                     This variable is used in the <filename>conf/layer.conf</filename> file
                     and must be suffixed with the name of the specific layer (e.g.
-                    <filename>LAYERDEPENDS_mylayer</filename>).</para>
+                    <filename>LAYERDEPENDS_mylayer</filename>).
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-LAYERDIR'><glossterm>LAYERDIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-LAYERDIR'><glossterm>LAYERDIR</glossterm>
             <info>
                 LAYERDIR[doc] = "When used inside the layer.conf configuration file, this variable provides the path of the current layer."
             </info>
             <glossdef>
-                <para>When used inside the <filename>layer.conf</filename> configuration
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    When used inside the <filename>layer.conf</filename> configuration
                     file, this variable provides the path of the current layer.
                     This variable is not available outside of <filename>layer.conf</filename>
-                    and references are expanded immediately when parsing of the file completes.</para>
+                    and references are expanded immediately when parsing of the file completes.
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-LAYERVERSION'><glossterm>LAYERVERSION<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-LAYERVERSION'><glossterm>LAYERVERSION</glossterm>
             <info>
                 LAYERVERSION[doc] = "Optionally specifies the version of a layer as a single number. This variable is used in the conf/layer.conf file and must be suffixed with the name of the specific layer."
             </info>
             <glossdef>
-                <para>Optionally specifies the version of a layer as a single number.
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Optionally specifies the version of a layer as a single number.
                     You can use this within
                     <link linkend='var-LAYERDEPENDS'><filename>LAYERDEPENDS</filename></link>
                     for another layer in order to depend on a specific version
                     of the layer.
                     This variable is used in the <filename>conf/layer.conf</filename> file
                     and must be suffixed with the name of the specific layer (e.g.
-                    <filename>LAYERVERSION_mylayer</filename>).</para>
+                    <filename>LAYERVERSION_mylayer</filename>).
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-LD'><glossterm>LD<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-LD'><glossterm>LD</glossterm>
             <info>
                 LD[doc] = "Minimal command and arguments to run the linker."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The minimal command and arguments used to run the
                     linker.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-LDFLAGS'><glossterm>LDFLAGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-LDFLAGS'><glossterm>LDFLAGS</glossterm>
             <info>
                 LDFLAGS[doc] = "Specifies the flags to pass to the linker."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the flags to pass to the linker.
                     This variable is exported to an environment
                     variable and thus made visible to the software being
@@ -6192,12 +6329,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-LEAD_SONAME'><glossterm>LEAD_SONAME<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-LEAD_SONAME'><glossterm>LEAD_SONAME</glossterm>
             <info>
                 LEAD_SONAME[doc] = "Specifies the lead (or primary) compiled library file (.so) that the debian class applies its naming policy to given a recipe that packages multiple libraries."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the lead (or primary) compiled library file
                     (<filename>.so</filename>) that the
                     <link linkend='ref-classes-debian'><filename>debian</filename></link>
@@ -6212,33 +6349,37 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-LIC_FILES_CHKSUM'><glossterm>LIC_FILES_CHKSUM<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-LIC_FILES_CHKSUM'><glossterm>LIC_FILES_CHKSUM</glossterm>
             <info>
                 LIC_FILES_CHKSUM[doc] = "Checksums of the license text in the recipe source code."
             </info>
             <glossdef>
                 <para>Checksums of the license text in the recipe source code.</para>
-                <para>This variable tracks changes in license text of the source
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    This variable tracks changes in license text of the source
                     code files.
                     If the license text is changed, it will trigger a build
                     failure, which gives the developer an opportunity to review any
-                    license change.</para>
+                    license change.
+                </para>
+
                 <para>
                     This variable must be defined for all recipes (unless
                     <link linkend='var-LICENSE'><filename>LICENSE</filename></link>
                     is set to "CLOSED").</para>
                 <para>For more information, see the
                     "<link linkend='usingpoky-configuring-LIC_FILES_CHKSUM'>
-                    Tracking License Changes</link>" section.</para>
+                    Tracking License Changes</link>" section.
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-LICENSE'><glossterm>LICENSE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-LICENSE'><glossterm>LICENSE</glossterm>
             <info>
                 LICENSE[doc] = "The list of source licenses for the recipe. The logical operators &amp;, '|', and parentheses can be used."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The list of source licenses for the recipe.
                     Follow these rules:
                     <itemizedlist>
@@ -6297,12 +6438,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-LICENSE_FLAGS'><glossterm>LICENSE_FLAGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-LICENSE_FLAGS'><glossterm>LICENSE_FLAGS</glossterm>
             <info>
                 LICENSE_FLAGS[doc] = "Specifies additional flags for a recipe you must whitelist through LICENSE_FLAGS_WHITELIST in order to allow the recipe to be built."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies additional flags for a recipe you must
                     whitelist through
                     <link linkend='var-LICENSE_FLAGS_WHITELIST'><filename>LICENSE_FLAGS_WHITELIST</filename></link>
@@ -6324,12 +6465,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-LICENSE_FLAGS_WHITELIST'><glossterm>LICENSE_FLAGS_WHITELIST<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-LICENSE_FLAGS_WHITELIST'><glossterm>LICENSE_FLAGS_WHITELIST</glossterm>
             <info>
                 LICENSE_FLAGS_WHITELIST[doc] = "Lists license flags that when specified in LICENSE_FLAGS within a recipe should not prevent that recipe from being built."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Lists license flags that when specified in
                     <link linkend='var-LICENSE_FLAGS'><filename>LICENSE_FLAGS</filename></link>
                     within a recipe should not prevent that recipe from being
@@ -6343,28 +6484,30 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-LICENSE_PATH'><glossterm>LICENSE_PATH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-LICENSE_PATH'><glossterm>LICENSE_PATH</glossterm>
             <info>
                 LICENSE_PATH[doc] = "Path to additional licenses used during the build."
             </info>
             <glossdef>
-                <para>Path to additional licenses used during the build.
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Path to additional licenses used during the build.
                     By default, the OpenEmbedded build system uses <filename>COMMON_LICENSE_DIR</filename>
                     to define the directory that holds common license text used during the build.
                     The <filename>LICENSE_PATH</filename> variable allows you to extend that
                     location to other areas that have additional licenses:
                     <literallayout class='monospaced'>
      LICENSE_PATH += "<replaceable>path-to-additional-common-licenses</replaceable>"
-                    </literallayout></para>
+                    </literallayout>
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-LINUX_KERNEL_TYPE'><glossterm>LINUX_KERNEL_TYPE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-LINUX_KERNEL_TYPE'><glossterm>LINUX_KERNEL_TYPE</glossterm>
             <info>
                 LINUX_KERNEL_TYPE[doc] = "Defines the kernel type to be used in assembling the configuration."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Defines the kernel type to be used in assembling the
                     configuration.
                     The linux-yocto recipes define "standard", "tiny", and
@@ -6391,12 +6534,13 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-LINUX_VERSION'><glossterm>LINUX_VERSION<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-LINUX_VERSION'><glossterm>LINUX_VERSION</glossterm>
             <info>
                 LINUX_VERSION[doc] = "The Linux version from kernel.org on which the Linux kernel image being built using the OpenEmbedded build system is based. You define this variable in the kernel recipe."
             </info>
             <glossdef>
-                <para>The Linux version from <filename>kernel.org</filename>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    The Linux version from <filename>kernel.org</filename>
                     on which the Linux kernel image being built using the
                     OpenEmbedded build system is based.
                     You define this variable in the kernel recipe.
@@ -6407,21 +6551,26 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     <literallayout class='monospaced'>
      LINUX_VERSION ?= "3.4.24"
                     </literallayout>
+                </para>
+
+                <para>
                     The <filename>LINUX_VERSION</filename> variable is used to
                     define <link linkend='var-PV'><filename>PV</filename></link>
                     for the recipe:
                     <literallayout class='monospaced'>
      PV = "${LINUX_VERSION}+git${SRCPV}"
-                    </literallayout></para>
+                    </literallayout>
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-LINUX_VERSION_EXTENSION'><glossterm>LINUX_VERSION_EXTENSION<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-LINUX_VERSION_EXTENSION'><glossterm>LINUX_VERSION_EXTENSION</glossterm>
             <info>
                 LINUX_VERSION_EXTENSION[doc] = "A string extension compiled into the version string of the Linux kernel built with the OpenEmbedded build system. You define this variable in the kernel recipe."
             </info>
             <glossdef>
-                <para>A string extension compiled into the version
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    A string extension compiled into the version
                     string of the Linux kernel built with the OpenEmbedded
                     build system.
                     You define this variable in the kernel recipe.
@@ -6430,6 +6579,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     <literallayout class='monospaced'>
      LINUX_VERSION_EXTENSION ?= "-yocto-${<link linkend='var-LINUX_KERNEL_TYPE'>LINUX_KERNEL_TYPE</link>}"
                     </literallayout>
+                </para>
+
+                <para>
                     Defining this variable essentially sets the
                     Linux kernel configuration item
                     <filename>CONFIG_LOCALVERSION</filename>, which is visible
@@ -6444,16 +6596,17 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-LOG_DIR'><glossterm>LOG_DIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-LOG_DIR'><glossterm>LOG_DIR</glossterm>
             <info>
                 LOG_DIR[doc] = "Specifies the directory to which the OpenEmbedded build system writes overall log files. The default directory is ${TMPDIR}/log"
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the directory to which the OpenEmbedded build
                     system writes overall log files.
                     The default directory is <filename>${TMPDIR}/log</filename>.
                 </para>
+
                 <para>
                     For the directory containing logs specific to each task,
                     see the <link linkend='var-T'><filename>T</filename></link>
@@ -6466,12 +6619,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
 
     <glossdiv id='var-glossary-m'><title>M</title>
 
-         <glossentry id='var-MACHINE'><glossterm>MACHINE<imagedata fileref="figures/define-generic.png" /></glossterm>
+         <glossentry id='var-MACHINE'><glossterm>MACHINE</glossterm>
             <info>
                 MACHINE[doc] = "Specifies the target device for which the image is built. You define MACHINE in the conf/local.conf file in the Build Directory."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the target device for which the image is built.
                     You define <filename>MACHINE</filename> in the
                     <filename>local.conf</filename> file found in the
@@ -6482,6 +6635,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     <literallayout class='monospaced'>
      MACHINE ?= "qemux86"
                     </literallayout>
+                </para>
+
+                <para>
                     The variable corresponds to a machine configuration file of the
                     same name, through which machine-specific configurations are set.
                     Thus, when <filename>MACHINE</filename> is set to "qemux86" there
@@ -6516,12 +6672,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
          </glossentry>
 
-         <glossentry id='var-MACHINE_ARCH'><glossterm>MACHINE_ARCH<imagedata fileref="figures/define-generic.png" /></glossterm>
+         <glossentry id='var-MACHINE_ARCH'><glossterm>MACHINE_ARCH</glossterm>
             <info>
                 MACHINE_ARCH[doc] = "Specifies the name of the machine-specific architecture. This variable is set automatically from MACHINE or TUNE_PKGARCH."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the name of the machine-specific architecture.
                     This variable is set automatically from
                     <link linkend='var-MACHINE'><filename>MACHINE</filename></link>
@@ -6533,12 +6689,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
          </glossentry>
 
-         <glossentry id='var-MACHINE_ESSENTIAL_EXTRA_RDEPENDS'><glossterm>MACHINE_ESSENTIAL_EXTRA_RDEPENDS<imagedata fileref="figures/define-generic.png" /></glossterm>
+         <glossentry id='var-MACHINE_ESSENTIAL_EXTRA_RDEPENDS'><glossterm>MACHINE_ESSENTIAL_EXTRA_RDEPENDS</glossterm>
             <info>
                 MACHINE_ESSENTIAL_EXTRA_RDEPENDS[doc] = "A list of required machine-specific packages to install as part of the image being built. Because this is a 'machine essential' variable, the list of packages are essential for the machine to boot."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A list of required machine-specific packages to install as part of
                     the image being built.
                     The build process depends on these packages being present.
@@ -6548,6 +6704,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     <filename>packagegroup-core-boot</filename>,
                     including the <filename>core-image-minimal</filename> image.
                 </para>
+
                 <para>
                     This variable is similar to the
                     <filename><link linkend='var-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS'>MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS</link></filename>
@@ -6555,6 +6712,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     dependency on the variable's list of packages.
                     In other words, the image will not build if a file in this list is not found.
                 </para>
+
                 <para>
                     As an example, suppose the machine for which you are building requires
                     <filename>example-init</filename> to be run during boot to initialize the hardware.
@@ -6567,12 +6725,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
          </glossentry>
 
-         <glossentry id='var-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS'><glossterm>MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS<imagedata fileref="figures/define-generic.png" /></glossterm>
+         <glossentry id='var-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS'><glossterm>MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS</glossterm>
             <info>
                 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS[doc] = "A list of recommended machine-specific packages to install as part of the image being built. Because this is a 'machine essential' variable, the list of packages are essential for the machine to boot."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A list of recommended machine-specific packages to install as part of
                     the image being built.
                     The build process does not depend on these packages being present.
@@ -6582,6 +6740,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     <filename>packagegroup-core-boot</filename>,
                     including the <filename>core-image-minimal</filename> image.
                 </para>
+
                 <para>
                     This variable is similar to the
                     <filename><link linkend='var-MACHINE_ESSENTIAL_EXTRA_RDEPENDS'>MACHINE_ESSENTIAL_EXTRA_RDEPENDS</link></filename>
@@ -6592,6 +6751,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     functionality may be selected to be built into the kernel rather than as a module,
                     in which case a package will not be produced.
                 </para>
+
                 <para>
                     Consider an example where you have a custom kernel where a specific touchscreen
                     driver is required for the machine to be usable.
@@ -6610,6 +6770,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
      MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-module-ab123"
                     </literallayout>
                 </para>
+
                 <para>
                     Some examples of these machine essentials are flash, screen, keyboard, mouse,
                     or touchscreen drivers (depending on the machine).
@@ -6617,23 +6778,25 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-         <glossentry id='var-MACHINE_EXTRA_RDEPENDS'><glossterm>MACHINE_EXTRA_RDEPENDS<imagedata fileref="figures/define-generic.png" /></glossterm>
+         <glossentry id='var-MACHINE_EXTRA_RDEPENDS'><glossterm>MACHINE_EXTRA_RDEPENDS</glossterm>
             <info>
                 MACHINE_EXTRA_RDEPENDS[doc] = "A list of machine-specific packages to install as part of the image being built that are not essential for the machine to boot. However, the build process for more fully-featured images depends on the packages being present."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A list of machine-specific packages to install as part of the
                     image being built that are not essential for the machine to boot.
                     However, the build process for more fully-featured images
                     depends on the packages being present.
                 </para>
+
                 <para>
                     This variable affects all images based on
                     <filename>packagegroup-base</filename>, which does not include the
                     <filename>core-image-minimal</filename> or <filename>core-image-full-cmdline</filename>
                     images.
                 </para>
+
                 <para>
                     The variable is similar to the
                     <filename><link linkend='var-MACHINE_EXTRA_RRECOMMENDS'>MACHINE_EXTRA_RRECOMMENDS</link></filename>
@@ -6641,6 +6804,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     dependency on the variable's list of packages.
                     In other words, the image will not build if a file in this list is not found.
                 </para>
+
                 <para>
                     An example is a machine that has WiFi capability but is not
                     essential for the machine to boot the image.
@@ -6659,22 +6823,24 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
          </glossentry>
 
-         <glossentry id='var-MACHINE_EXTRA_RRECOMMENDS'><glossterm>MACHINE_EXTRA_RRECOMMENDS<imagedata fileref="figures/define-generic.png" /></glossterm>
+         <glossentry id='var-MACHINE_EXTRA_RRECOMMENDS'><glossterm>MACHINE_EXTRA_RRECOMMENDS</glossterm>
             <info>
                 MACHINE_EXTRA_RRECOMMENDS[doc] = "A list of machine-specific packages to install as part of the image being built that are not essential for booting the machine. The image being built has no build dependencies on the packages in this list."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A list of machine-specific packages to install as part of the
                     image being built that are not essential for booting the machine.
                     The image being built has no build dependency on this list of packages.
                 </para>
+
                 <para>
                     This variable affects only images based on
                     <filename>packagegroup-base</filename>, which does not include the
                     <filename>core-image-minimal</filename> or <filename>core-image-full-cmdline</filename>
                     images.
                 </para>
+
                 <para>
                     This variable is similar to the
                     <filename><link linkend='var-MACHINE_EXTRA_RDEPENDS'>MACHINE_EXTRA_RDEPENDS</link></filename>
@@ -6682,6 +6848,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     dependency on the variable's list of packages.
                     In other words, the image will build if a file in this list is not found.
                 </para>
+
                 <para>
                     An example is a machine that has WiFi capability but is not essential
                     For the machine to boot the image.
@@ -6700,12 +6867,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
          </glossentry>
 
-         <glossentry id='var-MACHINE_FEATURES'><glossterm>MACHINE_FEATURES<imagedata fileref="figures/define-generic.png" /></glossterm>
+         <glossentry id='var-MACHINE_FEATURES'><glossterm>MACHINE_FEATURES</glossterm>
             <info>
                 MACHINE_FEATURES[doc] = "Specifies the list of hardware features the MACHINE supports."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the list of hardware features the
                     <link linkend='var-MACHINE'><filename>MACHINE</filename></link> is capable
                     of supporting.
@@ -6726,12 +6893,13 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
          </glossentry>
 
-        <glossentry id='var-MACHINE_FEATURES_BACKFILL'><glossterm>MACHINE_FEATURES_BACKFILL<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-MACHINE_FEATURES_BACKFILL'><glossterm>MACHINE_FEATURES_BACKFILL</glossterm>
             <info>
                 MACHINE_FEATURES_BACKFILL[doc] = "Features to be added to MACHINE_FEATURES if not also present in MACHINE_FEATURES_BACKFILL_CONSIDERED. This variable is set in the meta/conf/bitbake.conf file and is not intended to be user-configurable."
             </info>
             <glossdef>
-                <para>Features to be added to
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Features to be added to
                     <filename><link linkend='var-MACHINE_FEATURES'>MACHINE_FEATURES</link></filename>
                     if not also present in
                     <filename><link linkend='var-MACHINE_FEATURES_BACKFILL_CONSIDERED'>MACHINE_FEATURES_BACKFILL_CONSIDERED</link></filename>.
@@ -6748,28 +6916,29 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-MACHINE_FEATURES_BACKFILL_CONSIDERED'><glossterm>MACHINE_FEATURES_BACKFILL_CONSIDERED<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-MACHINE_FEATURES_BACKFILL_CONSIDERED'><glossterm>MACHINE_FEATURES_BACKFILL_CONSIDERED</glossterm>
             <info>
                 MACHINE_FEATURES_BACKFILL_CONSIDERED[doc] = "Features from MACHINE_FEATURES_BACKFILL that should not be backfilled (i.e. added to MACHINE_FEATURES) during the build."
             </info>
             <glossdef>
-                <para>Features from
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Features from
                     <filename><link linkend='var-MACHINE_FEATURES_BACKFILL'>MACHINE_FEATURES_BACKFILL</link></filename>
                     that should not be backfilled (i.e. added to
                     <filename><link linkend='var-MACHINE_FEATURES'>MACHINE_FEATURES</link></filename>)
                     during the build.
                     See the "<link linkend='ref-features-backfill'>Feature backfilling</link>" section for
                     more information.
-                    </para>
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-MACHINEOVERRIDES'><glossterm>MACHINEOVERRIDES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-MACHINEOVERRIDES'><glossterm>MACHINEOVERRIDES</glossterm>
             <info>
                 MACHINEOVERRIDES[doc] = "Lists overrides specific to the current machine. By default, this list includes the value of MACHINE."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Lists overrides specific to the current machine.
                     By default, this list includes the value
                     of <filename><link linkend='var-MACHINE'>MACHINE</link></filename>.
@@ -6783,6 +6952,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     <literallayout class='monospaced'>
     MACHINEOVERRIDES =. "qemuall:"
                     </literallayout>
+                </para>
+
+                <para>
                     Applying an override like <filename>qemuall</filename>
                     affects all QEMU emulated machines elsewhere.
                     Here is an example from the
@@ -6796,21 +6968,23 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-MAINTAINER'><glossterm>MAINTAINER<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-MAINTAINER'><glossterm>MAINTAINER</glossterm>
             <info>
                 MAINTAINER[doc] = "The email address of the distribution maintainer."
             </info>
             <glossdef>
-                <para>The email address of the distribution maintainer.</para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    The email address of the distribution maintainer.
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-MIRRORS'><glossterm>MIRRORS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-MIRRORS'><glossterm>MIRRORS</glossterm>
             <info>
                 MIRRORS[doc] = "Specifies additional paths from which the OpenEmbedded build system gets source code."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies additional paths from which the OpenEmbedded
                     build system gets source code.
                     When the build system searches for source code, it first
@@ -6833,12 +7007,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-MLPREFIX'><glossterm>MLPREFIX<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-MLPREFIX'><glossterm>MLPREFIX</glossterm>
             <info>
                 MLPREFIX[doc] = "Specifies a prefix has been added to PN to create a special version of a recipe or package, such as a Multilib version."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies a prefix has been added to
                     <link linkend='var-PN'><filename>PN</filename></link> to create a special version
                     of a recipe or package, such as a Multilib version.
@@ -6851,12 +7025,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-module_autoload'><glossterm>module_autoload<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-module_autoload'><glossterm>module_autoload</glossterm>
             <info>
                 module_autoload[doc] = "This variable has been replaced by the KERNEL_MODULE_AUTOLOAD variable. You should replace all occurrences of module_autoload with additions to KERNEL_MODULE_AUTOLOAD."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     This variable has been replaced by the
                     <filename>KERNEL_MODULE_AUTOLOAD</filename> variable.
                     You should replace all occurrences of
@@ -6865,6 +7039,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     <literallayout class='monospaced'>
      module_autoload_rfcomm = "rfcomm"
                     </literallayout>
+                </para>
+
+                <para>
                     should now be replaced with:
                     <literallayout class='monospaced'>
      KERNEL_MODULE_AUTOLOAD += "rfcomm"
@@ -6876,12 +7053,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-module_conf'><glossterm>module_conf<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-module_conf'><glossterm>module_conf</glossterm>
             <info>
                 module_conf[doc] = "Specifies modprobe.d syntax lines for inclusion in the /etc/modprobe.d/modname.conf file."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies
                     <ulink url='http://linux.die.net/man/5/modprobe.d'><filename>modprobe.d</filename></ulink>
                     syntax lines for inclusion in the
@@ -6936,12 +7113,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-MODULE_IMAGE_BASE_NAME'><glossterm>MODULE_IMAGE_BASE_NAME<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-MODULE_IMAGE_BASE_NAME'><glossterm>MODULE_IMAGE_BASE_NAME</glossterm>
             <info>
                 MODULE_IMAGE_BASE_NAME[doc] = "The base name of the kernel modules tarball."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The base name of the kernel modules tarball.
                     This variable is set in the
                     <link linkend='ref-classes-kernel'>kernel</link> class
@@ -6949,6 +7126,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     <literallayout class='monospaced'>
      MODULE_IMAGE_BASE_NAME ?= "modules-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
                     </literallayout>
+                </para>
+
+                <para>
                     See the
                     <link linkend='var-PKGE'><filename>PKGE</filename></link>,
                     <link linkend='var-PKGV'><filename>PKGV</filename></link>,
@@ -6961,12 +7141,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-MODULE_TARBALL_DEPLOY'><glossterm>MODULE_TARBALL_DEPLOY<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-MODULE_TARBALL_DEPLOY'><glossterm>MODULE_TARBALL_DEPLOY</glossterm>
             <info>
                 MODULE_TARBALL_DEPLOY[doc] = "Controls creation of the modules-*.tgz file. Set this variable to "0" to disable creation of this file, which contains all of the kernel modules resulting from a kernel build."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Controls creation of the <filename>modules-*.tgz</filename>
                     file.
                     Set this variable to "0" to disable creation of this
@@ -6976,12 +7156,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-MULTIMACH_TARGET_SYS'><glossterm>MULTIMACH_TARGET_SYS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-MULTIMACH_TARGET_SYS'><glossterm>MULTIMACH_TARGET_SYS</glossterm>
             <info>
                 MULTIMACH_TARGET_SYS[doc] = "Separates files for different machines such that you can build for multiple target machines using the same output directories."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Separates files for different machines such that you can build
                     for multiple target machines using the same output directories.
                     See the <link linkend='var-STAMP'><filename>STAMP</filename></link> variable
@@ -6994,12 +7174,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
 
     <glossdiv id='var-glossary-n'><title>N</title>
 
-        <glossentry id='var-NATIVELSBSTRING'><glossterm>NATIVELSBSTRING<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-NATIVELSBSTRING'><glossterm>NATIVELSBSTRING</glossterm>
             <info>
                 NATIVELSBSTRING[doc] = "A string identifying the host distribution."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A string identifying the host distribution.
                     Strings consist of the host distributor ID
                     followed by the release, as reported by the
@@ -7010,6 +7190,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     If this information is unable to be determined, the value
                     resolves to "Unknown".
                 </para>
+
                 <para>
                     This variable is used by default to isolate native shared
                     state packages for different distributions (e.g. to avoid
@@ -7022,24 +7203,24 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-NM'><glossterm>NM<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-NM'><glossterm>NM</glossterm>
             <info>
                 NM[doc] = "Minimal command and arguments to run 'nm'."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The minimal command and arguments to run
                     <filename>nm</filename>.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-NO_RECOMMENDATIONS'><glossterm>NO_RECOMMENDATIONS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-NO_RECOMMENDATIONS'><glossterm>NO_RECOMMENDATIONS</glossterm>
             <info>
                 NO_RECOMMENDATIONS[doc] = "When set to '1', no recommended packages will be installed. Realize that some recommended packages might be required for certain system functionality, such as kernel-modules. It is up to the user to add packages to IMAGE_INSTALL as needed."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Prevents installation of all "recommended-only" packages.
                     Recommended-only packages are packages installed only
                     through the
@@ -7050,6 +7231,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     <literallayout class='monospaced'>
      NO_RECOMMENDATIONS = "1"
                     </literallayout>
+                </para>
+
+                <para>
                     You can set this variable globally in your
                     <filename>local.conf</filename> file or you can attach it to
                     a specific image recipe by using the recipe name override:
@@ -7091,12 +7275,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-NOHDD'><glossterm>NOHDD<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-NOHDD'><glossterm>NOHDD</glossterm>
             <info>
                 NOHDD[doc] = "Causes the OpenEmbedded build system to skip building the .hddimg image."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Causes the OpenEmbedded build system to skip building the
                     <filename>.hddimg</filename> image.
                     The <filename>NOHDD</filename> variable is used with the
@@ -7108,12 +7292,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-NOISO'><glossterm>NOISO<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-NOISO'><glossterm>NOISO</glossterm>
             <info>
                 NOISO[doc] = "Causes the OpenEmbedded build system to skip building the ISO image."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Causes the OpenEmbedded build system to skip building the
                     ISO image.
                     The <filename>NOISO</filename> variable is used with the
@@ -7130,36 +7314,36 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
 
     <glossdiv id='var-glossary-o'><title>O</title>
 
-        <glossentry id='var-OBJCOPY'><glossterm>OBJCOPY<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-OBJCOPY'><glossterm>OBJCOPY</glossterm>
             <info>
                 OBJCOPY[doc] = "Minimal command and arguments to run 'objcopy'."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The minimal command and arguments to run
                     <filename>objcopy</filename>.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-OBJDUMP'><glossterm>OBJDUMP<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-OBJDUMP'><glossterm>OBJDUMP</glossterm>
             <info>
                 OBJDUMP[doc] = "Minimal command and arguments to run 'objdump'."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The minimal command and arguments to run
                     <filename>objdump</filename>.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-OE_BINCONFIG_EXTRA_MANGLE'><glossterm>OE_BINCONFIG_EXTRA_MANGLE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-OE_BINCONFIG_EXTRA_MANGLE'><glossterm>OE_BINCONFIG_EXTRA_MANGLE</glossterm>
             <info>
                 OE_BINCONFIG_EXTRA_MANGLE[doc] = "When a recipe inherits the binconfig.bbclass class, this variable specifies additional arguments passed to the "sed" command."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-binconfig'><filename>binconfig</filename></link>
                     class, this variable
@@ -7187,12 +7371,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-OE_IMPORTS'><glossterm>OE_IMPORTS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-OE_IMPORTS'><glossterm>OE_IMPORTS</glossterm>
             <info>
                 OE_IMPORTS[doc] = "An internal variable used to tell the OpenEmbedded build system what Python modules to import for every Python function run by the system."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     An internal variable used to tell the OpenEmbedded build
                     system what Python modules to import for every Python
                     function run by the system.
@@ -7205,12 +7389,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-OE_TERMINAL'><glossterm>OE_TERMINAL<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-OE_TERMINAL'><glossterm>OE_TERMINAL</glossterm>
             <info>
                 OE_TERMINAL[doc] = "Controls how the OpenEmbedded build system spawns interactive terminals on the host development system."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Controls how the OpenEmbedded build system spawns
                     interactive terminals on the host development system
                     (e.g. using the BitBake command with the
@@ -7239,12 +7423,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-OEROOT'><glossterm>OEROOT<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-OEROOT'><glossterm>OEROOT</glossterm>
             <info>
                 OEROOT[doc] = "The directory from which the top-level build environment setup script is sourced."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The directory from which the top-level build environment
                     setup script is sourced.
                     The Yocto Project makes two top-level build environment
@@ -7264,12 +7448,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-OLDEST_KERNEL'><glossterm>OLDEST_KERNEL<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-OLDEST_KERNEL'><glossterm>OLDEST_KERNEL</glossterm>
             <info>
                 OLDEST_KERNEL[doc] = "Declares the oldest version of the Linux kernel that the produced binaries must support."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Declares the oldest version of the Linux kernel that the
                     produced binaries must support.
                     This variable is passed into the build of the Embedded
@@ -7286,12 +7470,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-OVERRIDES'><glossterm>OVERRIDES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-OVERRIDES'><glossterm>OVERRIDES</glossterm>
             <info>
                 OVERRIDES[doc] = "BitBake uses OVERRIDES to control what variables are overridden after BitBake parses recipes and configuration files."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     BitBake uses <filename>OVERRIDES</filename> to control
                     what variables are overridden after BitBake parses
                     recipes and configuration files.
@@ -7306,25 +7490,27 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
 
     <glossdiv id='var-glossary-p'><title>P</title>
 
-        <glossentry id='var-P'><glossterm>P<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-P'><glossterm>P</glossterm>
             <info>
                 P[doc] = "The recipe name and version. P is comprised of ${PN}-${PV}."
             </info>
             <glossdef>
-                <para>The recipe name and version.
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    The recipe name and version.
                     <filename>P</filename> is comprised of the following:
                     <literallayout class='monospaced'>
      ${PN}-${PV}
-                    </literallayout></para>
+                    </literallayout>
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PACKAGE_ARCH'><glossterm>PACKAGE_ARCH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PACKAGE_ARCH'><glossterm>PACKAGE_ARCH</glossterm>
             <info>
                 PACKAGE_ARCH[doc] = "The architecture of the resulting package or packages."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The architecture of the resulting package or packages.
                 </para>
 
@@ -7348,12 +7534,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PACKAGE_ARCHS'><glossterm>PACKAGE_ARCHS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PACKAGE_ARCHS'><glossterm>PACKAGE_ARCHS</glossterm>
             <info>
                 PACKAGE_ARCHS[doc] = "A list of architectures compatible with the given target in order of priority."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies a list of architectures compatible with
                     the target machine.
                     This variable is set automatically and should not
@@ -7367,25 +7553,27 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PACKAGE_BEFORE_PN'><glossterm>PACKAGE_BEFORE_PN<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PACKAGE_BEFORE_PN'><glossterm>PACKAGE_BEFORE_PN</glossterm>
             <info>
                 PACKAGE_BEFORE_PN[doc] = "Enables easily adding packages to PACKAGES before ${PN} so that the packages can pick up files that would normally be included in the default package."
             </info>
             <glossdef>
-                <para>Enables easily adding packages to
-                <filename><link linkend='var-PACKAGES'>PACKAGES</link></filename>
-                before <filename>${<link linkend='var-PN'>PN</link>}</filename>
-                so that those added packages can pick up files that would normally be
-                included in the default package.</para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Enables easily adding packages to
+                    <filename><link linkend='var-PACKAGES'>PACKAGES</link></filename>
+                    before <filename>${<link linkend='var-PN'>PN</link>}</filename>
+                    so that those added packages can pick up files that would normally be
+                    included in the default package.
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PACKAGE_CLASSES'><glossterm>PACKAGE_CLASSES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PACKAGE_CLASSES'><glossterm>PACKAGE_CLASSES</glossterm>
             <info>
                 PACKAGE_CLASSES[doc] = "This variable specifies the package manager to use when packaging data. It is set in the conf/local.conf file in the Build Directory."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     This variable, which is set in the
                     <filename>local.conf</filename> configuration file found in
                     the <filename>conf</filename> folder of the
@@ -7428,12 +7616,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PACKAGE_DEBUG_SPLIT_STYLE'><glossterm>PACKAGE_DEBUG_SPLIT_STYLE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PACKAGE_DEBUG_SPLIT_STYLE'><glossterm>PACKAGE_DEBUG_SPLIT_STYLE</glossterm>
             <info>
                 PACKAGE_DEBUG_SPLIT_STYLE[doc] = "Determines how to split up the binary and debug information when creating *-dbg packages to be used with the GNU Project Debugger (GDB)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Determines how to split up the binary and debug information
                     when creating <filename>*-dbg</filename> packages to be
                     used with the GNU Project Debugger (GDB).
@@ -7486,17 +7674,20 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PACKAGE_EXCLUDE'><glossterm>PACKAGE_EXCLUDE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PACKAGE_EXCLUDE'><glossterm>PACKAGE_EXCLUDE</glossterm>
             <info>
                 PACKAGE_EXCLUDE[doc] = "Packages to exclude from the installation. If a listed package is required, an error is generated."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Lists packages that should not be installed into an image.
                     For example:
                     <literallayout class='monospaced'>
      PACKAGE_EXCLUDE = "<replaceable>package_name</replaceable> <replaceable>package_name</replaceable> <replaceable>package_name</replaceable> ..."
                     </literallayout>
+                </para>
+
+                <para>
                     You can set this variable globally in your
                     <filename>local.conf</filename> file or you can attach it to
                     a specific image recipe by using the recipe name override:
@@ -7534,23 +7725,25 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PACKAGE_EXTRA_ARCHS'><glossterm>PACKAGE_EXTRA_ARCHS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PACKAGE_EXTRA_ARCHS'><glossterm>PACKAGE_EXTRA_ARCHS</glossterm>
             <info>
                 PACKAGE_EXTRA_ARCHS[doc] = "Specifies the list of architectures compatible with the device CPU. This variable is useful when you build for several different devices that use miscellaneous processors."
             </info>
             <glossdef>
-                <para>Specifies the list of architectures compatible with the device CPU.
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Specifies the list of architectures compatible with the device CPU.
                     This variable is useful when you build for several different devices that use
-                    miscellaneous processors such as XScale and ARM926-EJS.</para>
+                    miscellaneous processors such as XScale and ARM926-EJS.
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PACKAGE_GROUP'><glossterm>PACKAGE_GROUP<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PACKAGE_GROUP'><glossterm>PACKAGE_GROUP</glossterm>
             <info>
                 PACKAGE_GROUP[doc] = "Defines one or more packages to include in an image when a specific item is included in IMAGE_FEATURES."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The <filename>PACKAGE_GROUP</filename> variable has been
                     renamed to
                     <link linkend='var-FEATURE_PACKAGES'><filename>FEATURE_PACKAGES</filename></link>.
@@ -7566,12 +7759,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PACKAGE_INSTALL'><glossterm>PACKAGE_INSTALL<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PACKAGE_INSTALL'><glossterm>PACKAGE_INSTALL</glossterm>
             <info>
                 PACKAGE_INSTALL[doc] = "List of the packages to be installed into the image. The variable is generally not user-defined and uses IMAGE_INSTALL as part of the list."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The final list of packages passed to the package manager
                     for installation into the image.
                 </para>
@@ -7597,12 +7790,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PACKAGE_INSTALL_ATTEMPTONLY'><glossterm>PACKAGE_INSTALL_ATTEMPTONLY<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PACKAGE_INSTALL_ATTEMPTONLY'><glossterm>PACKAGE_INSTALL_ATTEMPTONLY</glossterm>
             <info>
                 PACKAGE_INSTALL_ATTEMPTONLY[doc] = "List of packages attempted to be installed when creating an image. If a listed package fails to install, the build system does not generate an error. This variable is generally not user-defined."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies a list of packages the OpenEmbedded build
                     system attempts to install when creating an image.
                     If a listed package fails to install, the build system
@@ -7612,12 +7805,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PACKAGE_PREPROCESS_FUNCS'><glossterm>PACKAGE_PREPROCESS_FUNCS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PACKAGE_PREPROCESS_FUNCS'><glossterm>PACKAGE_PREPROCESS_FUNCS</glossterm>
             <info>
                 PACKAGE_PREPROCESS_FUNCS[doc] = "Specifies a list of functions run to pre-process the PKGD directory prior to splitting the files out to individual packages."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies a list of functions run to pre-process the
                     <link linkend='var-PKGD'><filename>PKGD</filename></link>
                     directory prior to splitting the files out to individual
@@ -7626,12 +7819,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PACKAGECONFIG'><glossterm>PACKAGECONFIG<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PACKAGECONFIG'><glossterm>PACKAGECONFIG</glossterm>
             <info>
                 PACKAGECONFIG[doc] = "This variable provides a means of enabling or disabling features of a recipe on a per-recipe basis."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     This variable provides a means of enabling or disabling
                     features of a recipe on a per-recipe basis.
                     <filename>PACKAGECONFIG</filename> blocks are defined
@@ -7644,6 +7837,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
      PACKAGECONFIG[f2] = "--with-f2,--without-f2,build-deps-f2,rt-deps-f2"
      PACKAGECONFIG[f3] = "--with-f3,--without-f3,build-deps-f3,rt-deps-f3"
                     </literallayout>
+                </para>
+
+                <para>
                     The <filename>PACKAGECONFIG</filename>
                     variable itself specifies a space-separated list of the
                     features to enable.
@@ -7744,12 +7940,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PACKAGEGROUP_DISABLE_COMPLEMENTARY'><glossterm>PACKAGEGROUP_DISABLE_COMPLEMENTARY<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PACKAGEGROUP_DISABLE_COMPLEMENTARY'><glossterm>PACKAGEGROUP_DISABLE_COMPLEMENTARY</glossterm>
             <info>
                 PACKAGEGROUP_DISABLE_COMPLEMENTARY[doc] = "Prevents automatic creation of the normal complementary packages such as -dev and -dbg in a packagegroup recipe."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     For recipes inheriting the
                     <link linkend='ref-classes-packagegroup'><filename>packagegroup</filename></link>
                     class, setting
@@ -7764,25 +7960,27 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PACKAGES'><glossterm>PACKAGES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PACKAGES'><glossterm>PACKAGES</glossterm>
             <info>
                 PACKAGES[doc] = "The list of packages to be created from the recipe."
             </info>
             <glossdef>
-                <para>The list of packages to be created from the recipe.
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    The list of packages to be created from the recipe.
                     The default value is the following:
                     <literallayout class='monospaced'>
      ${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}
-                    </literallayout></para>
+                    </literallayout>
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PACKAGES_DYNAMIC'><glossterm>PACKAGES_DYNAMIC<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PACKAGES_DYNAMIC'><glossterm>PACKAGES_DYNAMIC</glossterm>
             <info>
                 PACKAGES_DYNAMIC[doc] = "A promise that your recipe satisfies runtime dependencies for optional modules that are found in other recipes."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A promise that your recipe satisfies runtime dependencies
                     for optional modules that are found in other recipes.
                     <filename>PACKAGES_DYNAMIC</filename>
@@ -7800,6 +7998,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     <link linkend='ref-tasks-rootfs'><filename>do_rootfs</filename></link>
                     task.
                 </para>
+
                 <para>
                     Typically, if there is a chance that such a situation can
                     occur and the package that is not created is valid
@@ -7818,12 +8017,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PACKAGESPLITFUNCS'><glossterm>PACKAGESPLITFUNCS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PACKAGESPLITFUNCS'><glossterm>PACKAGESPLITFUNCS</glossterm>
             <info>
                 PACKAGESPLITFUNCS[doc] = "Specifies a list of functions run to perform additional splitting of files into individual packages."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies a list of functions run to perform additional
                     splitting of files into individual packages.
                     Recipes can either prepend to this variable or prepend
@@ -7839,12 +8038,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PARALLEL_MAKE'><glossterm>PARALLEL_MAKE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PARALLEL_MAKE'><glossterm>PARALLEL_MAKE</glossterm>
             <info>
                 PARALLEL_MAKE[doc] = "Specifies extra options that are passed to the make command during the compile tasks. This variable is usually in the form -j 4, where the number represents the maximum number of parallel threads make can run."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Extra options passed to the <filename>make</filename>
                     command during the
                     <link linkend='ref-tasks-compile'><filename>do_compile</filename></link>
@@ -7868,12 +8067,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PARALLEL_MAKEINST'><glossterm>PARALLEL_MAKEINST<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PARALLEL_MAKEINST'><glossterm>PARALLEL_MAKEINST</glossterm>
             <info>
                 PARALLEL_MAKEINST[doc] = "Extra options passed to the make install command during the do_install task in order to specify parallel installation."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Extra options passed to the
                     <filename>make install</filename> command during the
                     <link linkend='ref-tasks-install'><filename>do_install</filename></link>
@@ -7889,12 +8088,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PATCHRESOLVE'><glossterm>PATCHRESOLVE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PATCHRESOLVE'><glossterm>PATCHRESOLVE</glossterm>
             <info>
                 PATCHRESOLVE[doc] = "Enable or disable interactive patch resolution."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Determines the action to take when a patch fails.
                     You can set this variable to one of two values: "noop" and
                     "user".
@@ -7916,12 +8115,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PATCHTOOL'><glossterm>PATCHTOOL<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PATCHTOOL'><glossterm>PATCHTOOL</glossterm>
             <info>
                 PATCHTOOL[doc] = "Specifies the utility used to apply patches for a recipe during do_patch."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the utility used to apply patches for a recipe
                     during the
                     <link linkend='ref-tasks-patch'><filename>do_patch</filename></link>
@@ -7946,12 +8145,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PE'><glossterm>PE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PE'><glossterm>PE</glossterm>
             <info>
                 PE[doc] = "The epoch of the recipe. The default value is '0'. The field is used to make upgrades possible when the versioning scheme changes in some backwards incompatible way."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The epoch of the recipe.
                     By default, this variable is unset.
                     The variable is used to make upgrades possible when the
@@ -7961,27 +8160,29 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PF'><glossterm>PF<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PF'><glossterm>PF</glossterm>
             <info>
                 PF[doc] = "Specifies the recipe or package name and includes all version and revision numbers. This variable is comprised of ${PN}-${EXTENDPE}${PV}-${PR}."
             </info>
             <glossdef>
-                <para>Specifies the recipe or package name and includes all version and revision
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Specifies the recipe or package name and includes all version and revision
                     numbers (i.e. <filename>glibc-2.13-r20+svnr15508/</filename> and
                     <filename>bash-4.2-r1/</filename>).
                     This variable is comprised of the following:
                     <literallayout class='monospaced'>
      ${<link linkend='var-PN'>PN</link>}-${<link linkend='var-EXTENDPE'>EXTENDPE</link>}${<link linkend='var-PV'>PV</link>}-${<link linkend='var-PR'>PR</link>}
-                    </literallayout></para>
+                    </literallayout>
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PIXBUF_PACKAGES'><glossterm>PIXBUF_PACKAGES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PIXBUF_PACKAGES'><glossterm>PIXBUF_PACKAGES</glossterm>
             <info>
                 PIXBUF_PACKAGES[doc] = "When a recipe inherits the pixbufcache class, this variable identifies packages that contain the pixbuf loaders used with gdk-pixbuf."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-pixbufcache'><filename>pixbufcache</filename></link>
                     class, this variable identifies packages that contain
@@ -7996,18 +8197,21 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PKG'><glossterm>PKG<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PKG'><glossterm>PKG</glossterm>
             <info>
                 PKG[doc] = "The name of the resulting package created by the OpenEmbedded build system. When you use this variable, you must use a package name override."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The name of the resulting package created by the
                     OpenEmbedded build system.
                     <note>
                         When using the <filename>PKG</filename> variable, you
                         must use a package name override.
                     </note>
+                </para>
+
+                <para>
                     For example, when the
                     <link linkend='ref-classes-debian'><filename>debian</filename></link>
                     class renames the output package, it does so by setting
@@ -8016,12 +8220,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PKG_CONFIG_PATH'><glossterm>PKG_CONFIG_PATH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PKG_CONFIG_PATH'><glossterm>PKG_CONFIG_PATH</glossterm>
             <info>
                 PKG_CONFIG_PATH[doc] = "Path to pkg-config files for the current build context."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The path to <filename>pkg-config</filename> files for the
                     current build context.
                     <filename>pkg-config</filename> reads this variable
@@ -8030,29 +8234,32 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PKGD'><glossterm>PKGD<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PKGD'><glossterm>PKGD</glossterm>
             <info>
                 PKGD[doc] = "Points to the destination directory for files to be packaged before they are split into individual packages."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Points to the destination directory for files to be
                     packaged before they are split into individual packages.
                     This directory defaults to the following:
                     <literallayout class='monospaced'>
      ${WORKDIR}/package
                     </literallayout>
+                </para>
+
+                <para>
                     Do not change this default.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PKGDATA_DIR'><glossterm>PKGDATA_DIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PKGDATA_DIR'><glossterm>PKGDATA_DIR</glossterm>
             <info>
                 PKGDATA_DIR[doc] = "Points to a shared, global-state directory that holds data generated during the packaging process."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Points to a shared, global-state directory that holds data
                     generated during the packaging process.
                     During the packaging process, the
@@ -8063,23 +8270,29 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     <literallayout class='monospaced'>
      ${STAGING_DIR_HOST}/pkgdata
                     </literallayout>
+                </para>
+
+                <para>
                     Do not change this default.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PKGDEST'><glossterm>PKGDEST<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PKGDEST'><glossterm>PKGDEST</glossterm>
             <info>
                 PKGDEST[doc] = "Points to the parent directory for files to be packaged after they have been split into individual packages."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Points to the parent directory for files to be packaged
                     after they have been split into individual packages.
                     This directory defaults to the following:
                     <literallayout class='monospaced'>
      ${WORKDIR}/packages-split
                     </literallayout>
+                </para>
+
+                <para>
                     Under this directory, the build system creates
                     directories for each package specified in
                     <link linkend='var-PACKAGES'><filename>PACKAGES</filename></link>.
@@ -8088,12 +8301,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PKGDESTWORK'><glossterm>PKGDESTWORK<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PKGDESTWORK'><glossterm>PKGDESTWORK</glossterm>
             <info>
                 PKGDESTWORK[doc] = "Points to a temporary work area used by the do_package task to write output from the do_packagedata task."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Points to a temporary work area used by the
                     <link linkend='ref-tasks-package'><filename>do_package</filename></link>
                     task to write output from the
@@ -8104,6 +8317,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     <literallayout class='monospaced'>
      ${WORKDIR}/pkgdata
                     </literallayout>
+                </para>
+
+                <para>
                     The <filename>do_packagedata</filename> task then packages
                     the data in the temporary work area and installs it into a
                     shared directory pointed to by
@@ -8116,12 +8332,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PKGE'><glossterm>PKGE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PKGE'><glossterm>PKGE</glossterm>
             <info>
                 PKGE[doc] = "The epoch of the output package built by the OpenEmbedded build system."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The epoch of the output package built by the
                     OpenEmbedded build system.
                     By default, <filename>PKGE</filename> is set to
@@ -8130,26 +8346,26 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PKGR'><glossterm>PKGR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PKGR'><glossterm>PKGR</glossterm>
             <info>
                 PKGR[doc] = "The revision of the output package built by the OpenEmbedded build system."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The revision of the output package built by the
                     OpenEmbedded build system.
                     By default, <filename>PKGR</filename> is set to
                     <link linkend='var-PR'><filename>PR</filename></link>.
-                    </para>
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PKGV'><glossterm>PKGV<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PKGV'><glossterm>PKGV</glossterm>
             <info>
                 PKGV[doc] = "The version of the output package built by the OpenEmbedded build system."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The version of the output package built by the
                     OpenEmbedded build system.
                     By default, <filename>PKGV</filename> is set to
@@ -8158,23 +8374,32 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PN'><glossterm>PN<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PN'><glossterm>PN</glossterm>
             <info>
                 PN[doc] = "PN refers to a recipe name in the context of a file used by the OpenEmbedded build system as input to create a package. It refers to a package name in the context of a file created or produced by the OpenEmbedded build system."
             </info>
             <glossdef>
-                <para>This variable can have two separate functions depending on the context: a recipe
-                    name or a resulting package name.</para>
-                <para><filename>PN</filename> refers to a recipe name in the context of a file used
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    This variable can have two separate functions depending on the context: a recipe
+                    name or a resulting package name.
+                </para>
+
+                <para>
+                    <filename>PN</filename> refers to a recipe name in the context of a file used
                     by the OpenEmbedded build system as input to create a package.
                     The name is normally extracted from the recipe file name.
                     For example, if the recipe is named
                     <filename>expat_2.0.1.bb</filename>, then the default value of <filename>PN</filename>
-                    will be "expat".</para>
+                    will be "expat".
+                </para>
+
                 <para>
                     The variable refers to a package name in the context of a file created or produced by the
-                    OpenEmbedded build system.</para>
-                <para>If applicable, the <filename>PN</filename> variable also contains any special
+                    OpenEmbedded build system.
+                </para>
+
+                <para>
+                    If applicable, the <filename>PN</filename> variable also contains any special
                     suffix or prefix.
                     For example, using <filename>bash</filename> to build packages for the native
                     machine, <filename>PN</filename> is <filename>bash-native</filename>.
@@ -8185,12 +8410,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PNBLACKLIST'><glossterm>PNBLACKLIST<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PNBLACKLIST'><glossterm>PNBLACKLIST</glossterm>
             <info>
                 PNBLACKLIST[doc] = "Lists recipes you do not want the OpenEmbedded build system to build."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Lists recipes you do not want the OpenEmbedded build system
                     to build.
                     This variable works in conjunction with the
@@ -8212,24 +8437,24 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PR'><glossterm>PR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PR'><glossterm>PR</glossterm>
             <info>
                 PR[doc] = "The revision of the recipe. The default value for this variable is 'r0'."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The revision of the recipe.
                     The default value for this variable is "r0".
-                    </para>
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PREFERRED_PROVIDER'><glossterm>PREFERRED_PROVIDER<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PREFERRED_PROVIDER'><glossterm>PREFERRED_PROVIDER</glossterm>
             <info>
                 PREFERRED_PROVIDER[doc] = "If multiple recipes provide an item, this variable determines which recipe should be given preference."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     If multiple recipes provide an item, this variable
                     determines which recipe should be given preference.
                     You should always suffix the variable with the name of the
@@ -8246,12 +8471,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PREFERRED_VERSION'><glossterm>PREFERRED_VERSION<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PREFERRED_VERSION'><glossterm>PREFERRED_VERSION</glossterm>
             <info>
                 PREFERRED_VERSION[doc] = "If there are multiple versions of recipes available, this variable determines which recipe should be given preference."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     If there are multiple versions of recipes available, this
                     variable determines which recipe should be given preference.
                     You must always suffix the variable with the
@@ -8272,12 +8497,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PREMIRRORS'><glossterm>PREMIRRORS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PREMIRRORS'><glossterm>PREMIRRORS</glossterm>
             <info>
                 PREMIRRORS[doc] = "Specifies additional paths from which the OpenEmbedded build system gets source code."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies additional paths from which the OpenEmbedded
                     build system gets source code.
                     When the build system searches for source code, it first
@@ -8320,13 +8545,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PRINC'><glossterm>PRINC<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PRINC'><glossterm>PRINC</glossterm>
             <info>
                 PRINC[doc] = "Causes the PR variable of .bbappend files to dynamically increment. This increment minimizes the impact of layer ordering. This variable defaults to '0'."
             </info>
             <glossdef>
-
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The <filename>PRINC</filename> variable has been deprecated
                     and triggers a warning if detected during a build.
                     For
@@ -8369,13 +8593,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PRIORITY'><glossterm>PRIORITY<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PRIORITY'><glossterm>PRIORITY</glossterm>
             <info>
                 PRIORITY[doc] = "Indicates the importance of a package.  The default value is 'optional'.  Other standard values are 'required', 'standard' and 'extra'."
             </info>
             <glossdef>
-
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Indicates the importance of a package.
                 </para>
 
@@ -8395,12 +8618,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PRIVATE_LIBS'><glossterm>PRIVATE_LIBS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PRIVATE_LIBS'><glossterm>PRIVATE_LIBS</glossterm>
             <info>
                 PRIVATE_LIBS[doc] = "Specifies libraries installed within a recipe that should be ignored by the OpenEmbedded build system's shared library resolver."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies libraries installed within a recipe that
                     should be ignored by the OpenEmbedded build system's
                     shared library resolver.
@@ -8430,12 +8653,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PROVIDES'><glossterm>PROVIDES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PROVIDES'><glossterm>PROVIDES</glossterm>
             <info>
                 PROVIDES[doc] = "A list of aliases that a recipe also provides. These aliases are useful for satisfying dependencies of other recipes during the build as specified by DEPENDS."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A list of aliases by which a particular recipe can be
                     known.
                     By default, a recipe's own
@@ -8462,12 +8685,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PRSERV_HOST'><glossterm>PRSERV_HOST<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PRSERV_HOST'><glossterm>PRSERV_HOST</glossterm>
             <info>
                 PRSERV_HOST[doc] = "The network based PR service host and port."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The network based
                     <link linkend='var-PR'><filename>PR</filename></link>
                     service host and port.
@@ -8491,12 +8714,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PTEST_ENABLED'><glossterm>PTEST_ENABLED<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PTEST_ENABLED'><glossterm>PTEST_ENABLED</glossterm>
             <info>
                 PRSERV_HOST[doc] = "Specifies whether or not Package Test (ptest) functionality is enabled when building a recipe."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies whether or not
                     <ulink url='&YOCTO_DOCS_DEV_URL;#testing-packages-with-ptest'>Package Test</ulink>
                     (ptest) functionality is enabled when building a recipe.
@@ -8509,12 +8732,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PV'><glossterm>PV<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PV'><glossterm>PV</glossterm>
             <info>
                 PV[doc] = "The version of the recipe. The version is normally extracted from the recipe filename."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The version of the recipe.
                     The version is normally extracted from the recipe filename.
                     For example, if the recipe is named
@@ -8527,12 +8750,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PYTHON_ABI'><glossterm>PYTHON_ABI<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PYTHON_ABI'><glossterm>PYTHON_ABI</glossterm>
             <info>
                 PYTHON_ABI[doc] = "When used by recipes that inherit the distutils3, setuptools3, distutils, or setuptools classes, denotes the Application Binary Interface (ABI) currently in use for Python."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When used by recipes that inherit the
                     <link linkend='ref-classes-distutils3'><filename>distutils3</filename></link>,
                     <link linkend='ref-classes-setuptools3'><filename>setuptools3</filename></link>,
@@ -8563,12 +8786,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-PYTHON_PN'><glossterm>PYTHON_PN<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-PYTHON_PN'><glossterm>PYTHON_PN</glossterm>
             <info>
                 PYTHON_PN[doc] = "When used by recipes that inherit the distutils3, setuptools3, distutils, or setuptools classes, specifies the major Python version being built."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When used by recipes that inherit the
                     <link linkend='ref-classes-distutils3'><filename>distutils3</filename></link>,
                     <link linkend='ref-classes-setuptools3'><filename>setuptools3</filename></link>,
@@ -8599,12 +8822,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
 
     <glossdiv id='var-glossary-q'><title>Q</title>
 
-        <glossentry id='var-QMAKE_PROFILES'><glossterm>QMAKE_PROFILES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-QMAKE_PROFILES'><glossterm>QMAKE_PROFILES</glossterm>
             <info>
                 QMAKE_PROFILES[doc] = "Specifies your own subset of .pro files to be built for use with qmake."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies your own subset of <filename>.pro</filename>
                     files to be built for use with
                     <filename>qmake</filename>.
@@ -8627,24 +8850,24 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
 
     <glossdiv id='var-glossary-r'><title>R</title>
 
-        <glossentry id='var-RANLIB'><glossterm>RANLIB<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-RANLIB'><glossterm>RANLIB</glossterm>
             <info>
                 RANLIB[doc] = "Minimal command and arguments to run 'ranlib'."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The minimal command and arguments to run
                     <filename>ranlib</filename>.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-RCONFLICTS'><glossterm>RCONFLICTS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-RCONFLICTS'><glossterm>RCONFLICTS</glossterm>
             <info>
                 RCONFLICTS[doc] = "The list of packages that conflict with another package. Note that the package will not be installed if the conflicting packages are not first removed."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The list of packages that conflict with packages.
                     Note that packages will not be installed if conflicting
                     packages are not first removed.
@@ -8687,12 +8910,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-RDEPENDS'><glossterm>RDEPENDS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-RDEPENDS'><glossterm>RDEPENDS</glossterm>
             <info>
                 RDEPENDS[doc] = "Lists a package's runtime dependencies (i.e. other packages) that must be installed for the package to be built. They must be the names of other packages as listed in the PACKAGES variable, not recipe names (PN)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Lists a package's runtime dependencies (i.e. other packages)
                     that must be installed in order for the built package to run
                     correctly.
@@ -8822,12 +9045,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-REQUIRED_DISTRO_FEATURES'><glossterm>REQUIRED_DISTRO_FEATURES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-REQUIRED_DISTRO_FEATURES'><glossterm>REQUIRED_DISTRO_FEATURES</glossterm>
             <info>
                 REQUIRED_DISTRO_FEATURES[doc] = "When a recipe inherits the distro_features_check class, this variable identifies distribution features that must exist in the current configuration in order for the OpenEmbedded build system to build the recipe."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-distro_features_check'><filename>distro_features_check</filename></link>
                     class, this
@@ -8844,12 +9067,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-RM_OLD_IMAGE'><glossterm>RM_OLD_IMAGE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-RM_OLD_IMAGE'><glossterm>RM_OLD_IMAGE</glossterm>
             <info>
                 RM_OLD_IMAGE[doc] = "Reclaims disk space by removing previously built versions of the same image from the images directory pointed to by the DEPLOY_DIR variable."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Reclaims disk space by removing previously built
                     versions of the same image from the
                     <filename>images</filename> directory pointed to by the
@@ -8865,12 +9088,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-RM_WORK_EXCLUDE'><glossterm>RM_WORK_EXCLUDE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-RM_WORK_EXCLUDE'><glossterm>RM_WORK_EXCLUDE</glossterm>
             <info>
                 RM_WORK_EXCLUDE[doc] = "With rm_work enabled, this variable specifies a list of packages whose work directories should not be removed."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     With <filename>rm_work</filename> enabled, this
                     variable specifies a list of recipes whose work directories
                     should not be removed.
@@ -8880,12 +9103,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-ROOT_HOME'><glossterm>ROOT_HOME<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-ROOT_HOME'><glossterm>ROOT_HOME</glossterm>
             <info>
                 ROOT_HOME[doc] = "Defines the root home directory."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Defines the root home directory.
                     By default, this directory is set as follows in the
                     BitBake configuration file:
@@ -8916,12 +9139,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-ROOTFS'><glossterm>ROOTFS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-ROOTFS'><glossterm>ROOTFS</glossterm>
             <info>
                 ROOTFS[doc] = "Indicates a filesystem image to include as the root filesystem."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Indicates a filesystem image to include as the root
                     filesystem.
                 </para>
@@ -8935,18 +9158,21 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-ROOTFS_POSTPROCESS_COMMAND'><glossterm>ROOTFS_POSTPROCESS_COMMAND<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-ROOTFS_POSTPROCESS_COMMAND'><glossterm>ROOTFS_POSTPROCESS_COMMAND</glossterm>
             <info>
                 ROOTFS_POSTPROCESS_COMMAND[doc] = "Added by classes to run post processing commands once the OpenEmbedded build system has created the root filesystem."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Added by classes to run post processing commands once the
                     OpenEmbedded build system has created the root filesystem.
                     You can specify shell commands separated by semicolons:
                     <literallayout class='monospaced'>
      ROOTFS_POSTPROCESS_COMMAND += "<replaceable>shell_command</replaceable>; ... "
                     </literallayout>
+                </para>
+
+                <para>
                     If you need to pass the path to the root filesystem within
                     the command, you can use
                     <filename>${IMAGE_ROOTFS}</filename>, which points to
@@ -8958,12 +9184,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-RPROVIDES'><glossterm>RPROVIDES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-RPROVIDES'><glossterm>RPROVIDES</glossterm>
             <info>
                 RPROVIDES[doc] = "A list of package name aliases that a package also provides. These aliases are useful for satisfying runtime dependencies of other packages both during the build and on the target."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A list of package name aliases that a package also provides.
                     These aliases are useful for satisfying runtime dependencies
                     of other packages both during the build and on the target
@@ -8974,6 +9200,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                         <filename>RPROVIDES</filename> list.
                     </note>
                 </para>
+
                 <para>
                    As with all package-controlling variables, you must always
                    use the variable in conjunction with a package name override.
@@ -8985,12 +9212,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-RRECOMMENDS'><glossterm>RRECOMMENDS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-RRECOMMENDS'><glossterm>RRECOMMENDS</glossterm>
             <info>
                 RRECOMMENDS[doc] = "A list of packages that extends the usability of a package being built. The package being built does not depend on this list of packages in order to successfully build, but needs them for the extended usability."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A list of packages that extends the usability of a package
                     being built.
                     The package being built does not depend on this list of
@@ -9077,12 +9304,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-RREPLACES'><glossterm>RREPLACES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-RREPLACES'><glossterm>RREPLACES</glossterm>
             <info>
                 RREPLACES[doc] = "A list of packages replaced by a package. The package manager uses this variable to determine which package should be installed to replace other package(s) during an upgrade."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A list of packages replaced by a package.
                     The package manager uses this variable to determine which
                     package should be installed to replace other package(s)
@@ -9092,6 +9319,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     package to the
                     <filename><link linkend='var-RCONFLICTS'>RCONFLICTS</link></filename> variable.
                 </para>
+
                 <para>
                    As with all package-controlling variables, you must use
                    this variable in conjunction with a package name
@@ -9131,17 +9359,18 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-RSUGGESTS'><glossterm>RSUGGESTS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-RSUGGESTS'><glossterm>RSUGGESTS</glossterm>
             <info>
                 RSUGGESTS[doc] = "A list of additional packages that you can suggest for installation by the package manager at the time a package is installed. Not all package managers support this functionality."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A list of additional packages that you can suggest for
                     installation by the package manager at the time a package
                     is installed.
                     Not all package managers support this functionality.
                 </para>
+
                 <para>
                    As with all package-controlling variables, you must always
                    use this variable in conjunction with a package name
@@ -9158,12 +9387,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
 
     <glossdiv id='var-glossary-s'><title>S</title>
 
-        <glossentry id='var-S'><glossterm>S<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-S'><glossterm>S</glossterm>
             <info>
                 S[doc] = "The location in the Build Directory where unpacked package source code resides."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The location in the
                     <ulink url='&YOCTO_DOCS_DEV_URL;#build-directory'>Build Directory</ulink>
                     where unpacked recipe source code resides.
@@ -9178,6 +9407,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     <literallayout class='monospaced'>
      ${WORKDIR}/${PN}-${PV}
                     </literallayout>
+                </para>
+
+                <para>
                     As an example, assume a
                     <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>
                     top-level folder named <filename>poky</filename> and a
@@ -9192,12 +9424,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SANITY_REQUIRED_UTILITIES'><glossterm>SANITY_REQUIRED_UTILITIES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SANITY_REQUIRED_UTILITIES'><glossterm>SANITY_REQUIRED_UTILITIES</glossterm>
             <info>
                 SANITY_REQUIRED_UTILITIES[doc] = "Specifies a list of command-line utilities that should be checked for during the initial sanity checking process when running BitBake."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies a list of command-line utilities that should be
                     checked for during the initial sanity checking process when
                     running BitBake.
@@ -9207,12 +9439,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SANITY_TESTED_DISTROS'><glossterm>SANITY_TESTED_DISTROS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SANITY_TESTED_DISTROS'><glossterm>SANITY_TESTED_DISTROS</glossterm>
             <info>
                 SANITY_TESTED_DISTROS[doc] = "A list of the host distribution identifiers that the build system has been tested against."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A list of the host distribution identifiers that the
                     build system has been tested against.
                     Identifiers consist of the host distributor ID
@@ -9231,12 +9463,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SDK_ARCH'><glossterm>SDK_ARCH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SDK_ARCH'><glossterm>SDK_ARCH</glossterm>
             <info>
                 SDK_ARCH[doc] = "The target architecture for the SDK."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The target architecture for the SDK.
                     Typically, you do not directly set this variable.
                     Instead, use
@@ -9245,12 +9477,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SDK_DEPLOY'><glossterm>SDK_DEPLOY<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SDK_DEPLOY'><glossterm>SDK_DEPLOY</glossterm>
             <info>
                 SDK_DEPLOY[doc] = "The directory set up and used by the populate_sdk_base to which the SDK is deployed."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The directory set up and used by the
                     <link linkend='ref-classes-populate-sdk'><filename>populate_sdk_base</filename></link>
                     to which the SDK is deployed.
@@ -9263,12 +9495,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SDK_DIR'><glossterm>SDK_DIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SDK_DIR'><glossterm>SDK_DIR</glossterm>
             <info>
                 SDK_DIR[doc] = "The parent directory used by the OpenEmbedded build system when creating SDK output."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The parent directory used by the OpenEmbedded build system
                     when creating SDK output.
                     The
@@ -9288,12 +9520,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SDK_NAME'><glossterm>SDK_NAME<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SDK_NAME'><glossterm>SDK_NAME</glossterm>
             <info>
                 SDK_NAME[doc] = "The base name for SDK output files."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The base name for SDK output files.
                     The name is derived from the
                     <link linkend='var-DISTRO'><filename>DISTRO</filename></link>,
@@ -9310,12 +9542,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SDK_OS'><glossterm>SDK_OS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SDK_OS'><glossterm>SDK_OS</glossterm>
             <info>
                 SDK_OS[doc] = "The operating system for which the SDK will be built."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the operating system for which the SDK
                     will be built.
                     The default value is the value of
@@ -9324,12 +9556,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SDK_OUTPUT'><glossterm>SDK_OUTPUT<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SDK_OUTPUT'><glossterm>SDK_OUTPUT</glossterm>
             <info>
                 SDK_OUTPUT[doc] = "The location used by the OpenEmbedded build system when creating SDK output."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The location used by the OpenEmbedded build system when
                     creating SDK output.
                     The
@@ -9346,17 +9578,16 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                         The final output directory is
                         <link linkend='var-SDK_DEPLOY'><filename>SDK_DEPLOY</filename></link>.
                     </note>
-
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SDK_PACKAGE_ARCHS'><glossterm>SDK_PACKAGE_ARCHS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SDK_PACKAGE_ARCHS'><glossterm>SDK_PACKAGE_ARCHS</glossterm>
             <info>
                 SDK_PACKAGE_ARCHS[doc] = "Specifies a list of architectures compatible with the SDK machine. This variable is set automatically and should not normally be hand-edited."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies a list of architectures compatible with
                     the SDK machine.
                     This variable is set automatically and should not
@@ -9370,12 +9601,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SDK_PREFIX'><glossterm>SDK_PREFIX<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SDK_PREFIX'><glossterm>SDK_PREFIX</glossterm>
             <info>
                 SDK_PREFIX[doc] = "The toolchain binary prefix used for nativesdk recipes."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The toolchain binary prefix used for nativesdk recipes.
                     The OpenEmbedded build system uses the
                     <filename>SDK_PREFIX</filename> value to set the
@@ -9386,12 +9617,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SDK_SYS'><glossterm>SDK_SYS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SDK_SYS'><glossterm>SDK_SYS</glossterm>
             <info>
                 SDK_SYS[doc] = "Specifies the system, including the architecture and the operating system, for which the SDK will be built."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the system, including the architecture and the
                     operating system, for which the SDK will be built.
                 </para>
@@ -9409,23 +9640,24 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SDK_VENDOR'><glossterm>SDK_VENDOR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SDK_VENDOR'><glossterm>SDK_VENDOR</glossterm>
             <info>
                 SDK_VENDOR[doc] = "Specifies the name of the SDK vendor."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the name of the SDK vendor.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SDKIMAGE_FEATURES'><glossterm>SDKIMAGE_FEATURES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SDKIMAGE_FEATURES'><glossterm>SDKIMAGE_FEATURES</glossterm>
             <info>
                 SDKIMAGE_FEATURES[doc] = "Equivalent to IMAGE_FEATURES. However, this variable applies to the SDK generated from an image using the command 'bitbake -c populate_sdk imagename'."
             </info>
             <glossdef>
-                <para>Equivalent to
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Equivalent to
                     <filename><link linkend='var-IMAGE_FEATURES'>IMAGE_FEATURES</link></filename>.
                     However, this variable applies to the SDK generated from an
                     image using the following command:
@@ -9436,12 +9668,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SDKMACHINE'><glossterm>SDKMACHINE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SDKMACHINE'><glossterm>SDKMACHINE</glossterm>
             <info>
                 SDKMACHINE[doc] = "Specifies the architecture (i.e. i686 or x86_64) for which to build SDK and ADT items."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The machine for which the Application Development Toolkit
                     (ADT) or SDK is built.
                     In other words, the SDK or ADT is built such that it
@@ -9468,12 +9700,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SDKPATH'><glossterm>SDKPATH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SDKPATH'><glossterm>SDKPATH</glossterm>
             <info>
                 SDKPATH[doc] = "Defines the path offered to the user for installation of the SDK that is generated by the OpenEmbedded build system."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Defines the path offered to the user for installation
                     of the SDK that is generated by the OpenEmbedded build
                     system.
@@ -9485,12 +9717,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SDKTARGETSYSROOT'><glossterm>SDKTARGETSYSROOT<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SDKTARGETSYSROOT'><glossterm>SDKTARGETSYSROOT</glossterm>
             <info>
                 SDKTARGETSYSROOT[doc] = "Full path to the sysroot used for cross-compilation within an SDK as it will be when installed into the default SDKPATH."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The full path to the sysroot used for cross-compilation
                     within an SDK as it will be when installed into the
                     default
@@ -9499,22 +9731,24 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SECTION'><glossterm>SECTION<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SECTION'><glossterm>SECTION</glossterm>
             <info>
                 SECTION[doc] = "The section in which packages should be categorized. Package management utilities can make use of this variable."
             </info>
             <glossdef>
-                <para>The section in which packages should be categorized.
-                    Package management utilities can make use of this variable.</para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    The section in which packages should be categorized.
+                    Package management utilities can make use of this variable.
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SELECTED_OPTIMIZATION'><glossterm>SELECTED_OPTIMIZATION<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SELECTED_OPTIMIZATION'><glossterm>SELECTED_OPTIMIZATION</glossterm>
             <info>
                 SELECTED_OPTIMIZATION[doc] = "The variable takes the value of FULL_OPTIMIZATION unless DEBUG_BUILD = '1'. In this case, the value of DEBUG_OPTIMIZATION is used."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the optimization flags passed to the C compiler
                     when building for the target.
                     The flags are passed through the default value of the
@@ -9533,12 +9767,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SERIAL_CONSOLE'><glossterm>SERIAL_CONSOLE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SERIAL_CONSOLE'><glossterm>SERIAL_CONSOLE</glossterm>
             <info>
                 SERIAL_CONSOLE[doc] = "The speed and device for the serial port used to attach the serial console. This variable is given to the kernel as the 'console' parameter. After booting occurs, getty is started on that port so remote login is possible."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Defines a serial console (TTY) to enable using getty.
                     Provide a value that specifies the baud rate followed by
                     the TTY device name separated by a space.
@@ -9557,12 +9791,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SERIAL_CONSOLES'><glossterm>SERIAL_CONSOLES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SERIAL_CONSOLES'><glossterm>SERIAL_CONSOLES</glossterm>
             <info>
                 SERIAL_CONSOLES[doc] = "Defines the serial consoles (TTYs) to enable using getty."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Defines the serial consoles (TTYs) to enable using getty.
                     Provide a value that specifies the baud rate followed by
                     the TTY device name separated by a semicolon.
@@ -9574,12 +9808,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SERIAL_CONSOLES_CHECK'><glossterm>SERIAL_CONSOLES_CHECK<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SERIAL_CONSOLES_CHECK'><glossterm>SERIAL_CONSOLES_CHECK</glossterm>
             <info>
                 SERIAL_CONSOLES_CHECK[doc] = "Similar to SERIAL_CONSOLES except the device is checked for existence before attempting to enable it. Supported only by SysVinit."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Similar to
                     <link linkend='var-SERIAL_CONSOLES'><filename>SERIAL_CONSOLES</filename></link>
                     except the device is checked for existence before attempting
@@ -9590,12 +9824,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS'><glossterm>SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS'><glossterm>SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS</glossterm>
             <info>
                 SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS[doc] = "A list of recipe dependencies that should not be used to determine signatures of tasks from one recipe when they depend on tasks from another recipe."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A list of recipe dependencies that should not be used to
                     determine signatures of tasks from one recipe when they
                     depend on tasks from another recipe.
@@ -9603,6 +9837,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     <literallayout class='monospaced'>
     SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "intone->mplayer2"
                     </literallayout>
+                </para>
+
+                <para>
                     In this example, <filename>intone</filename> depends on
                     <filename>mplayer2</filename>.
                 </para>
@@ -9621,12 +9858,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SIGGEN_EXCLUDERECIPES_ABISAFE'><glossterm>SIGGEN_EXCLUDERECIPES_ABISAFE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SIGGEN_EXCLUDERECIPES_ABISAFE'><glossterm>SIGGEN_EXCLUDERECIPES_ABISAFE</glossterm>
             <info>
                 SIGGEN_EXCLUDERECIPES_ABISAFE[doc] = "A list of recipes that are completely stable and will never change."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A list of recipes that are completely stable and will
                     never change.
                     The ABI for the recipes in the list are presented by
@@ -9644,36 +9881,36 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SITEINFO_BITS'><glossterm>SITEINFO_BITS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SITEINFO_BITS'><glossterm>SITEINFO_BITS</glossterm>
             <info>
                 SITEINFO_BITS[doc] = "Specifies the number of bits for the target system CPU."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the number of bits for the target system CPU.
                     The value should be either "32" or "64".
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SITEINFO_ENDIANNESS'><glossterm>SITEINFO_ENDIANNESS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SITEINFO_ENDIANNESS'><glossterm>SITEINFO_ENDIANNESS</glossterm>
             <info>
                 SITEINFO_ENDIANNESS[doc] = "Specifies the endian byte order of the target system. The value should be either 'le' for 'little-endian' or 'be' for 'big-endian'."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the endian byte order of the target system.
                     The value should be either "le" for little-endian or "be" for big-endian.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SOC_FAMILY'><glossterm>SOC_FAMILY<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SOC_FAMILY'><glossterm>SOC_FAMILY</glossterm>
             <info>
                 SOC_FAMILY[doc] = "Groups together machines based upon the same family of SOC (System On Chip). You typically set this variable in a common .inc file that you include in the configuration files of all the machines."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Groups together machines based upon the same family
                     of SOC (System On Chip).
                     You typically set this variable in a common
@@ -9683,18 +9920,18 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                         You must include
                         <filename>conf/machine/include/soc-family.inc</filename>
                         for this variable to appear in
-                    <link linkend='var-MACHINEOVERRIDES'><filename>MACHINEOVERRIDES</filename></link>.
+                        <link linkend='var-MACHINEOVERRIDES'><filename>MACHINEOVERRIDES</filename></link>.
                     </note>
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SOLIBS'><glossterm>SOLIBS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SOLIBS'><glossterm>SOLIBS</glossterm>
             <info>
                 SOLIBS[doc] = "Defines the suffix for shared libraries used on the target platform."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Defines the suffix for shared libraries used on the
                     target platform.
                     By default, this suffix is ".so.*" for all Linux-based
@@ -9710,12 +9947,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SOLIBSDEV'><glossterm>SOLIBSDEV<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SOLIBSDEV'><glossterm>SOLIBSDEV</glossterm>
             <info>
                 SOLIBSDEV[doc] = "Defines the suffix for the development symbolic link (symlink) for shared libraries on the target platform."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Defines the suffix for the development symbolic link
                     (symlink) for shared libraries on the target platform.
                     By default, this suffix is ".so" for Linux-based
@@ -9731,12 +9968,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SOURCE_MIRROR_FETCH'><glossterm>SOURCE_MIRROR_FETCH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SOURCE_MIRROR_FETCH'><glossterm>SOURCE_MIRROR_FETCH</glossterm>
             <info>
                 SOURCE_MIRROR_FETCH[doc] = "Set as part of a source mirror generation script to skip COMPATIBLE_MACHINE and COMPATIBLE_HOST checks."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When you are fetching files to create a mirror of sources
                     (i.e. creating a source mirror), setting
                     <filename>SOURCE_MIRROR_FETCH</filename> to "1" in your
@@ -9762,12 +9999,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SOURCE_MIRROR_URL'><glossterm>SOURCE_MIRROR_URL<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SOURCE_MIRROR_URL'><glossterm>SOURCE_MIRROR_URL</glossterm>
             <info>
                 SOURCE_MIRROR_URL[doc] = "URL to source mirror that will be used before fetching from original SRC_URI."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Defines your own
                     <link linkend='var-PREMIRRORS'><filename>PREMIRRORS</filename></link>
                     from which to first fetch source before attempting to fetch
@@ -9792,12 +10029,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SPDXLICENSEMAP'><glossterm>SPDXLICENSEMAP<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SPDXLICENSEMAP'><glossterm>SPDXLICENSEMAP</glossterm>
             <info>
                 SPDXLICENSEMAP[doc] = "Maps commonly used license names to their SPDX counterparts found in meta/files/common-licenses/."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Maps commonly used license names to their SPDX counterparts
                     found in <filename>meta/files/common-licenses/</filename>.
                     For the default <filename>SPDXLICENSEMAP</filename>
@@ -9813,12 +10050,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SPECIAL_PKGSUFFIX'><glossterm>SPECIAL_PKGSUFFIX<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SPECIAL_PKGSUFFIX'><glossterm>SPECIAL_PKGSUFFIX</glossterm>
             <info>
                 SPECIAL_PKGSUFFIX[doc] = "A list of prefixes for PN used by the OpenEmbedded build system to create variants of recipes or packages. The list specifies the prefixes to strip off during certain circumstances such as the generation of the BPN variable."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A list of prefixes for <link linkend='var-PN'><filename>PN</filename></link> used by the
                     OpenEmbedded build system to create variants of recipes or packages.
                     The list specifies the prefixes to strip off during certain circumstances
@@ -9827,12 +10064,13 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SRC_URI'><glossterm>SRC_URI<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SRC_URI'><glossterm>SRC_URI</glossterm>
             <info>
                 SRC_URI[doc] = "The list of source files - local or remote. This variable tells the OpenEmbedded build system what bits to pull in for the build and how to pull them in."
             </info>
             <glossdef>
-                <para>The list of source files - local or remote.
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    The list of source files - local or remote.
                     This variable tells the OpenEmbedded build system which bits
                     to pull in for the build and how to pull them in.
                     For example, if the recipe or append file only needs to
@@ -9842,8 +10080,11 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     On the other hand, if the recipe or append file needs to
                     fetch a tarball, apply two patches, and include a custom
                     file, the recipe or append file would include four
-                    instances of the variable.</para>
-                <para>The following list explains the available URI protocols:
+                    instances of the variable.
+                </para>
+
+                <para>
+                    The following list explains the available URI protocols:
                     <itemizedlist>
                         <listitem><para><emphasis><filename>file://</filename> -</emphasis>
                             Fetches files, which are usually files shipped with
@@ -9916,7 +10157,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                             a Subversion (<filename>svn</filename>) revision control repository.</para></listitem>
                     </itemizedlist>
                 </para>
-                <para>Standard and recipe-specific options for <filename>SRC_URI</filename> exist.
+
+                <para>
+                    Standard and recipe-specific options for <filename>SRC_URI</filename> exist.
                     Here are standard options:
                     <itemizedlist>
                         <listitem><para><emphasis><filename>apply</filename> -</emphasis> Whether to apply
@@ -9931,7 +10174,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                             </para></listitem>
                     </itemizedlist>
                 </para>
-                <para>Here are options specific to recipes building code from a revision control system:
+
+                <para>
+                    Here are options specific to recipes building code from a revision control system:
                     <itemizedlist>
                         <listitem><para><emphasis><filename>mindate</filename> -</emphasis>
                             Apply the patch only if
@@ -9960,7 +10205,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                             </para></listitem>
                     </itemizedlist>
                 </para>
-                <para>Here are some additional options worth mentioning:
+
+                <para>
+                    Here are some additional options worth mentioning:
                     <itemizedlist>
                         <listitem><para><emphasis><filename>unpack</filename> -</emphasis> Controls
                             whether or not to unpack the file if it is an archive.
@@ -9982,12 +10229,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SRC_URI_OVERRIDES_PACKAGE_ARCH'><glossterm>SRC_URI_OVERRIDES_PACKAGE_ARCH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SRC_URI_OVERRIDES_PACKAGE_ARCH'><glossterm>SRC_URI_OVERRIDES_PACKAGE_ARCH</glossterm>
             <info>
                 SRC_URI_OVERRIDES_PACKAGE_ARCH[doc] = "By default, the OpenEmbedded build system automatically detects whether SRC_URI contains files that are machine-specific. If so, the build system automatically changes PACKAGE_ARCH. Setting this variable to '0' disables this behavior."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     By default, the OpenEmbedded build system automatically detects whether
                     <filename><link linkend='var-SRC_URI'>SRC_URI</link></filename>
                     contains files that are machine-specific.
@@ -9998,24 +10245,24 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SRCDATE'><glossterm>SRCDATE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SRCDATE'><glossterm>SRCDATE</glossterm>
             <info>
                 SRCDATE[doc] = "The date of the source code used to build the package. This variable applies only if the source was fetched from a Source Code Manager (SCM)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The date of the source code used to build the package.
                     This variable applies only if the source was fetched from a Source Code Manager (SCM).
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SRCPV'><glossterm>SRCPV<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SRCPV'><glossterm>SRCPV</glossterm>
             <info>
                 SRCPV[doc] = "Returns the version string of the current package. This string is used to help define the value of PV."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Returns the version string of the current package.
                     This string is used to help define the value of
                     <link linkend='var-PV'><filename>PV</filename></link>.
@@ -10047,12 +10294,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SRCREV'><glossterm>SRCREV<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SRCREV'><glossterm>SRCREV</glossterm>
             <info>
                 SRCREV[doc] = "The revision of the source code used to build the package. This variable applies to Subversion, Git, Mercurial and Bazaar only."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The revision of the source code used to build the package.
                     This variable applies to Subversion, Git, Mercurial and
                     Bazaar only.
@@ -10073,21 +10320,23 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SSTATE_DIR'><glossterm>SSTATE_DIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SSTATE_DIR'><glossterm>SSTATE_DIR</glossterm>
             <info>
                 SSTATE_DIR[doc] = "The directory for the shared state cache."
             </info>
             <glossdef>
-                <para>The directory for the shared state cache.</para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    The directory for the shared state cache.
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SSTATE_MIRROR_ALLOW_NETWORK'><glossterm>SSTATE_MIRROR_ALLOW_NETWORK<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SSTATE_MIRROR_ALLOW_NETWORK'><glossterm>SSTATE_MIRROR_ALLOW_NETWORK</glossterm>
             <info>
                 SSTATE_MIRROR_ALLOW_NETWORK[doc] = "If set to "1", allows fetches from mirrors that are specified in SSTATE_MIRRORS to work even when fetching from the network has been disabled by setting BB_NO_NETWORK to "1"."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     If set to "1", allows fetches from
                     mirrors that are specified in
                     <link linkend='var-SSTATE_MIRRORS'><filename>SSTATE_MIRRORS</filename></link>
@@ -10104,12 +10353,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SSTATE_MIRRORS'><glossterm>SSTATE_MIRRORS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SSTATE_MIRRORS'><glossterm>SSTATE_MIRRORS</glossterm>
             <info>
                 SSTATE_MIRRORS[doc] = "Configures the OpenEmbedded build system to search other mirror locations for prebuilt cache data objects before building out the data. You can specify a filesystem directory or a remote URL such as HTTP or FTP."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Configures the OpenEmbedded build system to search other
                     mirror locations for prebuilt cache data objects before
                     building out the data.
@@ -10145,12 +10394,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-STAGING_BASE_LIBDIR_NATIVE'><glossterm>STAGING_BASE_LIBDIR_NATIVE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-STAGING_BASE_LIBDIR_NATIVE'><glossterm>STAGING_BASE_LIBDIR_NATIVE</glossterm>
             <info>
                 STAGING_BASE_LIBDIR_NATIVE[doc] = "Specifies the path to the /lib subdirectory of the sysroot directory for the build host."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the path to the <filename>/lib</filename>
                     subdirectory of the sysroot directory for the
                     build host.
@@ -10158,12 +10407,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-STAGING_BASELIBDIR'><glossterm>STAGING_BASELIBDIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-STAGING_BASELIBDIR'><glossterm>STAGING_BASELIBDIR</glossterm>
             <info>
                 STAGING_BASELIBDIR[doc] = "Specifies the path to the /lib subdirectory of the sysroot directory for the target for which the current recipe is being built (STAGING_DIR_HOST)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the path to the <filename>/lib</filename>
                     subdirectory of the sysroot directory for the target
                     for which the current recipe is being built
@@ -10172,12 +10421,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-STAGING_BINDIR'><glossterm>STAGING_BINDIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-STAGING_BINDIR'><glossterm>STAGING_BINDIR</glossterm>
             <info>
                 STAGING_BINDIR[doc] = "Specifies the path to the /usr/bin subdirectory of the sysroot directory for the target for which the current recipe is being built (STAGING_DIR_HOST)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the path to the
                     <filename>/usr/bin</filename> subdirectory of the
                     sysroot directory for the target for which the current
@@ -10187,12 +10436,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-STAGING_BINDIR_CROSS'><glossterm>STAGING_BINDIR_CROSS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-STAGING_BINDIR_CROSS'><glossterm>STAGING_BINDIR_CROSS</glossterm>
             <info>
                 STAGING_BINDIR_CROSS[doc] = "Specifies the path to the directory containing binary configuration scripts. These scripts provide configuration information for other software that wants to make use of libraries or include files provided by the software associated with the script."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the path to the directory containing binary
                     configuration scripts.
                     These scripts provide configuration information for
@@ -10212,12 +10461,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-STAGING_BINDIR_NATIVE'><glossterm>STAGING_BINDIR_NATIVE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-STAGING_BINDIR_NATIVE'><glossterm>STAGING_BINDIR_NATIVE</glossterm>
             <info>
                 STAGING_BINDIR_NATIVE[doc] = "Specifies the path to the /usr/bin subdirectory of the sysroot directory for the build host."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the path to the
                     <filename>/usr/bin</filename> subdirectory of the
                     sysroot directory for the build host.
@@ -10225,12 +10474,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-STAGING_DATADIR'><glossterm>STAGING_DATADIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-STAGING_DATADIR'><glossterm>STAGING_DATADIR</glossterm>
             <info>
                 STAGING_DATADIR[doc] = "Specifies the path to the /usr/share subdirectory of the sysroot directory for the target for which the current recipe is being built (STAGING_DIR_HOST)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                      Specifies the path to the <filename>/usr/share</filename>
                      subdirectory of the sysroot directory for the target
                      for which the current recipe is being built
@@ -10239,24 +10488,24 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-STAGING_DATADIR_NATIVE'><glossterm>STAGING_DATADIR_NATIVE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-STAGING_DATADIR_NATIVE'><glossterm>STAGING_DATADIR_NATIVE</glossterm>
             <info>
                 STAGING_DATADIR_NATIVE[doc] = "Specifies the path to the /usr/share subdirectory of the sysroot directory for the build host."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the path to the <filename>/usr/share</filename>
                     subdirectory of the sysroot directory for the build host.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-STAGING_DIR'><glossterm>STAGING_DIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-STAGING_DIR'><glossterm>STAGING_DIR</glossterm>
             <info>
                 STAGING_DIR[doc] = "Specifies the path to the top-level sysroots directory (i.e. ${TMPDIR}/sysroots)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the path to the top-level sysroots directory
                     (i.e.
                     <filename>${</filename><link linkend='var-TMPDIR'><filename>TMPDIR</filename></link><filename>}/sysroots</filename>).
@@ -10275,12 +10524,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-STAGING_DIR_HOST'><glossterm>STAGING_DIR_HOST<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-STAGING_DIR_HOST'><glossterm>STAGING_DIR_HOST</glossterm>
             <info>
                 STAGING_DIR_HOST[doc] = "Specifies the path to the primary sysroot directory for which the target is being built."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the path to the primary sysroot directory for
                     which the target is being built.
                     Depending on the type of recipe and the build target, the
@@ -10304,24 +10553,24 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-STAGING_DIR_NATIVE'><glossterm>STAGING_DIR_NATIVE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-STAGING_DIR_NATIVE'><glossterm>STAGING_DIR_NATIVE</glossterm>
             <info>
                 STAGING_DIR_NATIVE[doc] = "Specifies the path to the sysroot directory for the build host."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the path to the sysroot directory for the
                     build host.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-STAGING_DIR_TARGET'><glossterm>STAGING_DIR_TARGET<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-STAGING_DIR_TARGET'><glossterm>STAGING_DIR_TARGET</glossterm>
             <info>
                 STAGING_DIR_TARGET[doc] = "Specifies the path to the sysroot directory for the target for which the current recipe is being built."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the path to the sysroot directory for the
                     target for which the current recipe is being built.
                     In most cases, this path is the
@@ -10343,12 +10592,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-STAGING_ETCDIR_NATIVE'><glossterm>STAGING_ETCDIR_NATIVE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-STAGING_ETCDIR_NATIVE'><glossterm>STAGING_ETCDIR_NATIVE</glossterm>
             <info>
                 STAGING_ETCDIR_NATIVE[doc] = "Specifies the path to the /etc subdirectory of the sysroot directory for the build host."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the path to the <filename>/etc</filename>
                     subdirectory of the sysroot directory for the
                     build host.
@@ -10356,12 +10605,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-STAGING_EXECPREFIXDIR'><glossterm>STAGING_EXECPREFIXDIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-STAGING_EXECPREFIXDIR'><glossterm>STAGING_EXECPREFIXDIR</glossterm>
             <info>
                 STAGING_EXECPREFIXDIR[doc] = "Specifies the path to the /usr subdirectory of the sysroot directory for the target for which the current recipe is being built (STAGING_DIR_HOST)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the path to the <filename>/usr</filename>
                     subdirectory of the sysroot directory for the target
                     for which the current recipe is being built
@@ -10370,12 +10619,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-STAGING_INCDIR'><glossterm>STAGING_INCDIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-STAGING_INCDIR'><glossterm>STAGING_INCDIR</glossterm>
             <info>
                 STAGING_INCDIR[doc] = "Specifies the path to the /usr/include subdirectory of the sysroot directory for the target for which the current recipe being built (STAGING_DIR_HOST)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the path to the
                     <filename>/usr/include</filename> subdirectory of the
                     sysroot directory for the target for which the current
@@ -10385,36 +10634,36 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-STAGING_INCDIR_NATIVE'><glossterm>STAGING_INCDIR_NATIVE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-STAGING_INCDIR_NATIVE'><glossterm>STAGING_INCDIR_NATIVE</glossterm>
             <info>
                 STAGING_INCDIR_NATIVE[doc] = "Specifies the path to the /usr/include subdirectory of the sysroot directory for the build host."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the path to the <filename>/usr/include</filename>
                     subdirectory of the sysroot directory for the build host.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-STAGING_KERNEL_DIR'><glossterm>STAGING_KERNEL_DIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-STAGING_KERNEL_DIR'><glossterm>STAGING_KERNEL_DIR</glossterm>
             <info>
                 STAGING_KERNEL_DIR[doc] = "The directory with kernel headers that are required to build out-of-tree modules."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The directory with kernel headers that are required to build out-of-tree
                     modules.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-STAGING_LIBDIR'><glossterm>STAGING_LIBDIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-STAGING_LIBDIR'><glossterm>STAGING_LIBDIR</glossterm>
             <info>
                 STAGING_LIBDIR[doc] = "Specifies the path to the /usr/lib subdirectory of the sysroot directory for the target for which the current recipe is being built (STAGING_DIR_HOST)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the path to the <filename>/usr/lib</filename>
                     subdirectory of the sysroot directory for the target for
                     which the current recipe is being built
@@ -10423,24 +10672,24 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-STAGING_LIBDIR_NATIVE'><glossterm>STAGING_LIBDIR_NATIVE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-STAGING_LIBDIR_NATIVE'><glossterm>STAGING_LIBDIR_NATIVE</glossterm>
             <info>
                 STAGING_LIBDIR_NATIVE[doc] = "Specifies the path to the /usr/lib subdirectory of the sysroot directory for the build host."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the path to the <filename>/usr/lib</filename>
                     subdirectory of the sysroot directory for the build host.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-STAMP'><glossterm>STAMP<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-STAMP'><glossterm>STAMP</glossterm>
             <info>
                 STAMP[doc] = "Specifies the base path used to create recipe stamp files. The path to an actual stamp file is constructed by evaluating this string and then appending additional information."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the base path used to create recipe stamp files.
                     The path to an actual stamp file is constructed by evaluating this
                     string and then appending additional information.
@@ -10450,6 +10699,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     <literallayout class='monospaced'>
      STAMP = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/${EXTENDPE}${PV}-${PR}"
                     </literallayout>
+                </para>
+
+                <para>
                     See <link linkend='var-STAMPS_DIR'><filename>STAMPS_DIR</filename></link>,
                     <link linkend='var-MULTIMACH_TARGET_SYS'><filename>MULTIMACH_TARGET_SYS</filename></link>,
                     <link linkend='var-PN'><filename>PN</filename></link>,
@@ -10461,12 +10713,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-STAMPS_DIR'><glossterm>STAMPS_DIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-STAMPS_DIR'><glossterm>STAMPS_DIR</glossterm>
             <info>
                 STAMPS_DIR[doc] = "Specifies the base directory in which the OpenEmbedded build system places stamps."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the base directory in which the OpenEmbedded
                     build system places stamps.
                     The default directory is
@@ -10475,12 +10727,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-STRIP'><glossterm>STRIP<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-STRIP'><glossterm>STRIP</glossterm>
             <info>
                 STRIP[doc] = "Minimal command and arguments to run 'strip' (strip symbols)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The minimal command and arguments to run
                     <filename>strip</filename>, which is used to strip
                     symbols.
@@ -10488,12 +10740,13 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SUMMARY'><glossterm>SUMMARY<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SUMMARY'><glossterm>SUMMARY</glossterm>
             <info>
                 SUMMARY[doc] = "The short (80 characters or less) summary of the binary package for packaging systems such as opkg, rpm or dpkg. By default, SUMMARY is used to define the DESCRIPTION variable if DESCRIPTION is not set in the recipe."
             </info>
             <glossdef>
-                <para>The short (72 characters or less) summary of the binary package for packaging
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    The short (72 characters or less) summary of the binary package for packaging
                     systems such as <filename>opkg</filename>, <filename>rpm</filename> or
                     <filename>dpkg</filename>.
                     By default, <filename>SUMMARY</filename> is used to define
@@ -10504,25 +10757,24 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SVNDIR'><glossterm>SVNDIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SVNDIR'><glossterm>SVNDIR</glossterm>
             <info>
                 SVNDIR[doc] = "The directory where Subversion checkouts will be stored."
-
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The directory in which files checked out of a Subversion
                     system are stored.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SYSLINUX_DEFAULT_CONSOLE'><glossterm>SYSLINUX_DEFAULT_CONSOLE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SYSLINUX_DEFAULT_CONSOLE'><glossterm>SYSLINUX_DEFAULT_CONSOLE</glossterm>
             <info>
                 SYSLINUX_DEFAULT_CONSOLE[doc] = "Specifies the kernel boot default console."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the kernel boot default console.
                     If you want to use a console other than the default,
                     set this variable in your recipe as follows where "X" is
@@ -10541,12 +10793,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SYSLINUX_OPTS'><glossterm>SYSLINUX_OPTS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SYSLINUX_OPTS'><glossterm>SYSLINUX_OPTS</glossterm>
             <info>
                 SYSLINUX_OPTS[doc] = "Lists additional options to add to the syslinux file."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Lists additional options to add to the syslinux file.
                     You need to set this variable in your recipe.
                     If you want to list multiple options, separate the options
@@ -10561,12 +10813,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SYSLINUX_SERIAL'><glossterm>SYSLINUX_SERIAL<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SYSLINUX_SERIAL'><glossterm>SYSLINUX_SERIAL</glossterm>
             <info>
                 SYSLINUX_SERIAL[doc] = "Specifies the alternate serial port or turns it off."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the alternate serial port or turns it off.
                     To turn off serial, set this variable to an empty string
                     in your recipe.
@@ -10576,16 +10828,20 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     <literallayout class='monospaced'>
      SYSLINUX_SERIAL ?= "0 115200"
                     </literallayout>
-                    The class checks for and uses the variable as needed.                </para>
+                </para>
+
+                <para>
+                    The class checks for and uses the variable as needed.
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SYSLINUX_SPLASH'><glossterm>SYSLINUX_SPLASH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SYSLINUX_SPLASH'><glossterm>SYSLINUX_SPLASH</glossterm>
             <info>
                 SYSLINUX_SPLASH[doc] = "An .LSS file used as the background for the VGA boot menu when you are using the boot menu."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     An <filename>.LSS</filename> file used as the background
                     for the VGA boot menu when you are using the boot menu.
                     You need to set this variable in your recipe.
@@ -10600,12 +10856,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SYSLINUX_SERIAL_TTY'><glossterm>SYSLINUX_SERIAL_TTY<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SYSLINUX_SERIAL_TTY'><glossterm>SYSLINUX_SERIAL_TTY</glossterm>
             <info>
                 SYSLINUX_SERIAL_TTY[doc] = "Specifies the alternate console=tty... kernel boot argument."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the alternate console=tty... kernel boot argument.
                     The variable's default value is set in the
                     <link linkend='ref-classes-syslinux'><filename>syslinux</filename></link>
@@ -10613,17 +10869,20 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     <literallayout class='monospaced'>
      SYSLINUX_SERIAL_TTY ?= "console=ttyS0,115200"
                     </literallayout>
+                </para>
+
+                <para>
                     The class checks for and uses the variable as needed.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SYSROOT_PREPROCESS_FUNCS'><glossterm>SYSROOT_PREPROCESS_FUNCS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SYSROOT_PREPROCESS_FUNCS'><glossterm>SYSROOT_PREPROCESS_FUNCS</glossterm>
             <info>
                 SYSROOT_PREPROCESS_FUNCS[doc] = "A list of functions to execute after files are staged into the sysroot. These functions are usually used to apply additional processing on the staged files, or to stage additional files."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A list of functions to execute after files are staged into
                     the sysroot.
                     These functions are usually used to apply additional
@@ -10633,12 +10892,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SYSTEMD_AUTO_ENABLE'><glossterm>SYSTEMD_AUTO_ENABLE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SYSTEMD_AUTO_ENABLE'><glossterm>SYSTEMD_AUTO_ENABLE</glossterm>
             <info>
                 SYSTEMD_AUTO_ENABLE[doc] = "For recipes that inherit the systemd class, this variable specifies whether the service you have specified in SYSTEMD_SERVICE should be started automatically or not."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-systemd'><filename>systemd</filename></link>
                     class, this variable specifies whether the service you have
@@ -10653,18 +10912,21 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     <literallayout class='monospaced'>
      SYSTEMD_AUTO_ENABLE ??= "enable"
                     </literallayout>
+                </para>
+
+                <para>
                     You can disable the service by setting the variable to
                     "disable".
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SYSTEMD_PACKAGES'><glossterm>SYSTEMD_PACKAGES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SYSTEMD_PACKAGES'><glossterm>SYSTEMD_PACKAGES</glossterm>
             <info>
                 SYSTEMD_PACKAGES[doc] = "For recipes that inherit the systemd class, this variable locates the systemd unit files when they are not found in the main recipe's package."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-systemd'><filename>systemd</filename></link>
                     class, this variable locates the systemd unit files when
@@ -10676,6 +10938,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     <literallayout class='monospaced'>
      SYSTEMD_PACKAGES ?= "${PN}"
                     </literallayout>
+                </para>
+
+                <para>
                     If these unit files are not in this recipe's main
                     package, you need to use
                     <filename>SYSTEMD_PACKAGES</filename> to list the package
@@ -10685,12 +10950,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SYSTEMD_SERVICE'><glossterm>SYSTEMD_SERVICE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SYSTEMD_SERVICE'><glossterm>SYSTEMD_SERVICE</glossterm>
             <info>
                 SYSTEMD_SERVICE[doc] = "For recipes that inherit the systemd class, this variable specifies the systemd service name for a package."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-systemd'><filename>systemd</filename></link>
                     class, this variable specifies the systemd service name for
@@ -10709,12 +10974,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-SYSVINIT_ENABLED_GETTYS'><glossterm>SYSVINIT_ENABLED_GETTYS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-SYSVINIT_ENABLED_GETTYS'><glossterm>SYSVINIT_ENABLED_GETTYS</glossterm>
             <info>
                 SYSVINIT_ENABLED_GETTYS[doc] = "Specifies which virtual terminals should be running a getty, the default is '1'."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When using
                     <ulink url='&YOCTO_DOCS_DEV_URL;#new-recipe-enabling-system-services'>SysVinit</ulink>,
                     specifies a space-separated list of the virtual terminals
@@ -10737,18 +11002,22 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
 
     <glossdiv id='var-glossary-t'><title>T</title>
 
-        <glossentry id='var-T'><glossterm>T<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-T'><glossterm>T</glossterm>
             <info>
                 T[doc] = "This variable points to a directory were BitBake places temporary files, which consist mostly of task logs and scripts, when building a particular recipe."
             </info>
             <glossdef>
-                <para>This variable points to a directory were BitBake places
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    This variable points to a directory were BitBake places
                     temporary files, which consist mostly of task logs and
                     scripts, when building a particular recipe.
                     The variable is typically set as follows:
                     <literallayout class='monospaced'>
      T = "${WORKDIR}/temp"
                     </literallayout>
+                </para>
+
+                <para>
                     The <link linkend='var-WORKDIR'><filename>WORKDIR</filename></link>
                     is the directory into which BitBake unpacks and builds the
                     recipe.
@@ -10761,12 +11030,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TARGET_ARCH'><glossterm>TARGET_ARCH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TARGET_ARCH'><glossterm>TARGET_ARCH</glossterm>
             <info>
                 TARGET_ARCH[doc] = "The architecture of the device being built. The OpenEmbedded build system supports the following architectures: arm, mips, ppc, x86, x86-64."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The target machine's architecture.
                     The OpenEmbedded build system supports many
                     architectures.
@@ -10782,6 +11051,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
      mips
      mipsel
                     </literallayout>
+                </para>
+
+                <para>
                     For additional information on machine architectures, see
                     the
                     <link linkend='var-TUNE_ARCH'><filename>TUNE_ARCH</filename></link>
@@ -10790,12 +11062,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TARGET_AS_ARCH'><glossterm>TARGET_AS_ARCH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TARGET_AS_ARCH'><glossterm>TARGET_AS_ARCH</glossterm>
             <info>
                 TARGET_AS_ARCH[doc] = "Specifies architecture-specific assembler flags for the target system."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies architecture-specific assembler flags for the
                     target system.
                     <filename>TARGET_AS_ARCH</filename> is initialized from
@@ -10809,12 +11081,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TARGET_CC_ARCH'><glossterm>TARGET_CC_ARCH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TARGET_CC_ARCH'><glossterm>TARGET_CC_ARCH</glossterm>
             <info>
                 TARGET_CC_ARCH[doc] = "Specifies architecture-specific C compiler flags for the target system."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies architecture-specific C compiler flags for the
                     target system.
                     <filename>TARGET_CC_ARCH</filename> is initialized from
@@ -10832,12 +11104,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TARGET_CC_KERNEL_ARCH'><glossterm>TARGET_CC_KERNEL_ARCH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TARGET_CC_KERNEL_ARCH'><glossterm>TARGET_CC_KERNEL_ARCH</glossterm>
             <info>
                 TARGET_CC_KERNEL_ARCH[doc] = "This is a specific kernel compiler flag for a CPU or Application Binary Interface (ABI) tune."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     This is a specific kernel compiler flag for a CPU or
                     Application Binary Interface (ABI) tune.
                     The flag is used rarely and only for cases where a
@@ -10856,12 +11128,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TARGET_CFLAGS'><glossterm>TARGET_CFLAGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TARGET_CFLAGS'><glossterm>TARGET_CFLAGS</glossterm>
             <info>
                 TARGET_CFLAGS[doc] = "Flags passed to the C compiler for the target system. This variable evaluates to the same as CFLAGS."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the flags to pass to the C compiler when building
                     for the target.
                     When building in the target context,
@@ -10881,12 +11153,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TARGET_CPPFLAGS'><glossterm>TARGET_CPPFLAGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TARGET_CPPFLAGS'><glossterm>TARGET_CPPFLAGS</glossterm>
             <info>
                 TARGET_CPPFLAGS[doc] = "Specifies the flags to pass to the C pre-processor (i.e. to both the C and the C++ compilers) when building for the target."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the flags to pass to the C pre-processor
                     (i.e. to both the C and the C++ compilers) when building
                     for the target.
@@ -10907,12 +11179,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TARGET_CXXFLAGS'><glossterm>TARGET_CXXFLAGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TARGET_CXXFLAGS'><glossterm>TARGET_CXXFLAGS</glossterm>
             <info>
                 TARGET_CXXFLAGS[doc] = "Specifies the flags to pass to the C++ compiler when building for the target."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the flags to pass to the C++ compiler when
                     building for the target.
                     When building in the target context,
@@ -10932,24 +11204,26 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TARGET_FPU'><glossterm>TARGET_FPU<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TARGET_FPU'><glossterm>TARGET_FPU</glossterm>
             <info>
                 TARGET_FPU[doc] = "Specifies the method for handling FPU code. For FPU-less targets, which include most ARM CPUs, the variable must be set to 'soft'. If not, the kernel emulation gets used, which results in a performance penalty."
             </info>
             <glossdef>
-                <para>Specifies the method for handling FPU code.
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Specifies the method for handling FPU code.
                     For FPU-less targets, which include most ARM CPUs, the variable must be
                     set to "soft".
-                    If not, the kernel emulation gets used, which results in a performance penalty.</para>
+                    If not, the kernel emulation gets used, which results in a performance penalty.
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TARGET_LD_ARCH'><glossterm>TARGET_LD_ARCH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TARGET_LD_ARCH'><glossterm>TARGET_LD_ARCH</glossterm>
             <info>
                 TARGET_LD_ARCH[doc] = "Specifies architecture-specific linker flags for the target system."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies architecture-specific linker flags for the
                     target system.
                     <filename>TARGET_LD_ARCH</filename> is initialized from
@@ -10963,12 +11237,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TARGET_LDFLAGS'><glossterm>TARGET_LDFLAGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TARGET_LDFLAGS'><glossterm>TARGET_LDFLAGS</glossterm>
             <info>
                 TARGET_LDFLAGS[doc] = "Specifies the flags to pass to the linker when building for the target."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the flags to pass to the linker when building
                     for the target.
                     When building in the target context,
@@ -10988,25 +11262,27 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TARGET_OS'><glossterm>TARGET_OS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TARGET_OS'><glossterm>TARGET_OS</glossterm>
             <info>
                 TARGET_OS[doc] = "Specifies the target's operating system."
             </info>
             <glossdef>
-                <para>Specifies the target's operating system.
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
+                    Specifies the target's operating system.
                     The variable can be set to "linux" for <filename>glibc</filename>-based systems and
                     to "linux-uclibc" for <filename>uclibc</filename>.
                     For ARM/EABI targets, there are also "linux-gnueabi" and
-                    "linux-uclibc-gnueabi" values possible.</para>
+                    "linux-uclibc-gnueabi" values possible.
+                </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TARGET_PREFIX'><glossterm>TARGET_PREFIX<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TARGET_PREFIX'><glossterm>TARGET_PREFIX</glossterm>
             <info>
                 TARGET_PREFIX[doc] = "The prefix used for the toolchain binary target tools."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the prefix used for the toolchain binary target
                     tools.
                 </para>
@@ -11035,12 +11311,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TARGET_SYS'><glossterm>TARGET_SYS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TARGET_SYS'><glossterm>TARGET_SYS</glossterm>
             <info>
                 TARGET_SYS[doc] = "The target system is comprised of TARGET_ARCH,TARGET_VENDOR and TARGET_OS."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the system, including the architecture and the
                     operating system, for which the build is occurring in
                     the context of the current recipe.
@@ -11078,23 +11354,23 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TARGET_VENDOR'><glossterm>TARGET_VENDOR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TARGET_VENDOR'><glossterm>TARGET_VENDOR</glossterm>
             <info>
                 TARGET_VENDOR[doc] = "The name of the target vendor."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the name of the target vendor.
                 </para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TCLIBCAPPEND'><glossterm>TCLIBCAPPEND<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TCLIBCAPPEND'><glossterm>TCLIBCAPPEND</glossterm>
             <info>
                 TCLIBCAPPEND[doc] = "Specifies a suffix appended to TMPDIR that identifies the libc variant for the build."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies a suffix to be appended onto the
                     <link linkend='var-TMPDIR'><filename>TMPDIR</filename></link>
                     value.
@@ -11119,17 +11395,18 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TCLIBC'><glossterm>TCLIBC<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TCLIBC'><glossterm>TCLIBC</glossterm>
             <info>
                 TCLIBC[doc] = "Specifies GNU standard C library (libc) variant to use during the build process. You can select 'glibc' or 'uclibc'."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the GNU standard C library (<filename>libc</filename>)
                     variant to use during the build process.
                     This variable replaces <filename>POKYLIBC</filename>, which is no longer
                     supported.
                 </para>
+
                 <para>
                     You can select "glibc" or "uclibc".
                     <note>
@@ -11140,12 +11417,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TCMODE'><glossterm>TCMODE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TCMODE'><glossterm>TCMODE</glossterm>
             <info>
                 TCMODE[doc] = "Enables an external toolchain (where provided by an additional layer) if set to a value other than 'default'."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the toolchain selector.
                     <filename>TCMODE</filename> controls the characteristics
                     of the generated packages and images by telling the
@@ -11207,12 +11484,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TEST_EXPORT_DIR'><glossterm>TEST_EXPORT_DIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TEST_EXPORT_DIR'><glossterm>TEST_EXPORT_DIR</glossterm>
             <info>
                 TEST_EXPORT_DIR[doc] = "The location the OpenEmbedded build system uses to export tests when the TEST_EXPORT_ONLY variable is set to "1"."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The location the OpenEmbedded build system uses to export
                     tests when the
                     <link linkend='var-TEST_EXPORT_ONLY'><filename>TEST_EXPORT_ONLY</filename></link>
@@ -11226,12 +11503,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TEST_EXPORT_ONLY'><glossterm>TEST_EXPORT_ONLY<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TEST_EXPORT_ONLY'><glossterm>TEST_EXPORT_ONLY</glossterm>
             <info>
                 TEST_EXPORT_ONLY[doc] = "Specifies to export the tests only. Set this variable to "1" if you do not want to run the tests but you want them to be exported in a manner that you to run them outside of the build system."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies to export the tests only.
                     Set this variable to "1" if you do not want to run the
                     tests but you want them to be exported in a manner that
@@ -11240,12 +11517,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TEST_IMAGE'><glossterm>TEST_IMAGE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TEST_IMAGE'><glossterm>TEST_IMAGE</glossterm>
             <info>
                 TEST_IMAGE[doc] = "Enables test booting of virtual machine images under the QEMU emulator after any root filesystems are created and runs tests against those images."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Automatically runs the series of automated tests for
                     images when an image is successfully built.
                 </para>
@@ -11273,12 +11550,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TEST_LOG_DIR'><glossterm>TEST_LOG_DIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TEST_LOG_DIR'><glossterm>TEST_LOG_DIR</glossterm>
             <info>
                 TEST_LOG_DIR[doc] = "Holds the SSH log and the boot log for QEMU machines. The <filename>TEST_LOG_DIR</filename> variable defaults to "${WORKDIR}/testimage"."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Holds the SSH log and the boot log for QEMU machines.
                     The <filename>TEST_LOG_DIR</filename> variable defaults
                     to <filename>"${WORKDIR}/testimage"</filename>.
@@ -11291,12 +11568,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TEST_POWERCONTROL_CMD'><glossterm>TEST_POWERCONTROL_CMD<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TEST_POWERCONTROL_CMD'><glossterm>TEST_POWERCONTROL_CMD</glossterm>
             <info>
                 TEST_POWERCONTROL_CMD[doc] = "For automated hardware testing, specifies the command to use to control the power of the target machine under test"
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     For automated hardware testing, specifies the command to
                     use to control the power of the target machine under test.
                     Typically, this command would point to a script that
@@ -11310,12 +11587,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TEST_POWERCONTROL_EXTRA_ARGS'><glossterm>TEST_POWERCONTROL_EXTRA_ARGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TEST_POWERCONTROL_EXTRA_ARGS'><glossterm>TEST_POWERCONTROL_EXTRA_ARGS</glossterm>
             <info>
                 TEST_POWERCONTROL_EXTRA_ARGS[doc] = "For automated hardware testing, specifies additional arguments to pass through to the command specified in TEST_POWERCONTROL_CMD"
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     For automated hardware testing, specifies additional
                     arguments to pass through to the command specified in
                     <link linkend='var-TEST_POWERCONTROL_CMD'><filename>TEST_POWERCONTROL_CMD</filename></link>.
@@ -11328,12 +11605,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TEST_QEMUBOOT_TIMEOUT'><glossterm>TEST_QEMUBOOT_TIMEOUT<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TEST_QEMUBOOT_TIMEOUT'><glossterm>TEST_QEMUBOOT_TIMEOUT</glossterm>
             <info>
                 TEST_QEMUBOOT_TIMEOUT[doc] = "The time in seconds allowed for an image to boot before automated runtime tests begin to run against an image."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The time in seconds allowed for an image to boot before
                     automated runtime tests begin to run against an
                     image.
@@ -11351,12 +11628,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TEST_SERIALCONTROL_CMD'><glossterm>TEST_SERIALCONTROL_CMD<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TEST_SERIALCONTROL_CMD'><glossterm>TEST_SERIALCONTROL_CMD</glossterm>
             <info>
                 TEST_SERIALCONTROL_CMD[doc] = "For automated hardware testing, specifies the command to use to connect to the serial console of the target machine under test."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     For automated hardware testing, specifies the command
                     to use to connect to the serial console of the target
                     machine under test.
@@ -11376,12 +11653,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TEST_SERIALCONTROL_EXTRA_ARGS'><glossterm>TEST_SERIALCONTROL_EXTRA_ARGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TEST_SERIALCONTROL_EXTRA_ARGS'><glossterm>TEST_SERIALCONTROL_EXTRA_ARGS</glossterm>
             <info>
                 TEST_SERIALCONTROL_EXTRA_ARGS[doc] = "For automated hardware testing, specifies additional arguments to pass through to the command specified in TEST_SERIALCONTROL_CMD."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     For automated hardware testing, specifies additional
                     arguments to pass through to the command specified in
                     <link linkend='var-TEST_SERIALCONTROL_CMD'><filename>TEST_SERIALCONTROL_CMD</filename></link>.
@@ -11394,12 +11671,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TEST_SERVER_IP'><glossterm>TEST_SERVER_IP<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TEST_SERVER_IP'><glossterm>TEST_SERVER_IP</glossterm>
             <info>
                 TEST_SERVER_IP[doc] = "The IP address of the build machine (host machine). This IP address is usually automatically detected."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The IP address of the build machine (host machine).
                     This IP address is usually automatically detected.
                     However, if detection fails, this variable needs to be set
@@ -11415,18 +11692,21 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TEST_TARGET'><glossterm>TEST_TARGET<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TEST_TARGET'><glossterm>TEST_TARGET</glossterm>
             <info>
                 TEST_TARGET[doc] = "For automated runtime testing, specifies the method of deploying the image and running tests on the target machine."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the target controller to use when running tests
                     against a test image.
                     The default controller to use is "qemu":
                     <literallayout class='monospaced'>
      TEST_TARGET = "qemu"
                     </literallayout>
+                </para>
+
+                <para>
                     A target controller is a class that defines how an
                     image gets deployed on a target and how a target is started.
                     A layer can extend the controllers by adding a module
@@ -11483,12 +11763,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TEST_TARGET_IP'><glossterm>TEST_TARGET_IP<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TEST_TARGET_IP'><glossterm>TEST_TARGET_IP</glossterm>
             <info>
                 TEST_TARGET_IP[doc] = "The IP address of your hardware under test."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The IP address of your hardware under test.
                     The <filename>TEST_TARGET_IP</filename> variable has no
                     effect when
@@ -11512,12 +11792,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TEST_SUITES'><glossterm>TEST_SUITES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TEST_SUITES'><glossterm>TEST_SUITES</glossterm>
             <info>
                 TEST_SUITES[doc] = "An ordered list of tests (modules) to run against an image when performing automated runtime testing."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     An ordered list of tests (modules) to run against
                     an image when performing automated runtime testing.
                 </para>
@@ -11570,12 +11850,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-THISDIR'><glossterm>THISDIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-THISDIR'><glossterm>THISDIR</glossterm>
             <info>
                 THISDIR[doc] = "The directory in which the file BitBake is currently parsing is located."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The directory in which the file BitBake is currently
                     parsing is located.
                     Do not manually set this variable.
@@ -11583,12 +11863,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TIME'><glossterm>TIME<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TIME'><glossterm>TIME</glossterm>
             <info>
                 TIME[doc] = "The time the build was started using HMS format."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The time the build was started.
                     Times appear using the hour, minute, and second (HMS)
                     format (e.g. "140159" for one minute and fifty-nine
@@ -11597,12 +11877,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TMPDIR'><glossterm>TMPDIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TMPDIR'><glossterm>TMPDIR</glossterm>
             <info>
                 TMPDIR[doc] = "The temporary directory the OpenEmbedded build system uses when it does its work building images. By default, the TMPDIR variable is named tmp within the Build Directory."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     This variable is the base directory the OpenEmbedded
                     build system uses for all build output and intermediate
                     files (other than the shared state cache).
@@ -11638,12 +11918,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TOOLCHAIN_HOST_TASK'><glossterm>TOOLCHAIN_HOST_TASK<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TOOLCHAIN_HOST_TASK'><glossterm>TOOLCHAIN_HOST_TASK</glossterm>
             <info>
                 TOOLCHAIN_HOST_TASK[doc] = "This variable lists packages the OpenEmbedded build system uses when building an SDK, which contains a cross-development environment."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     This variable lists packages the OpenEmbedded build system
                     uses when building an SDK, which contains a
                     cross-development environment.
@@ -11671,12 +11951,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TOOLCHAIN_TARGET_TASK'><glossterm>TOOLCHAIN_TARGET_TASK<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TOOLCHAIN_TARGET_TASK'><glossterm>TOOLCHAIN_TARGET_TASK</glossterm>
             <info>
                 TOOLCHAIN_TARGET_TASK[doc] = "This variable lists packages the OpenEmbedded build system uses when it creates the target part of an SDK, which includes libraries and headers."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     This variable lists packages the OpenEmbedded build system
                     uses when it creates the target part of an SDK
                     (i.e. the part built for the target hardware), which
@@ -11696,12 +11976,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TOPDIR'><glossterm>TOPDIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TOPDIR'><glossterm>TOPDIR</glossterm>
             <info>
                 TOPDIR[doc] = "The Build Directory. BitBake automatically sets this variable. The OpenEmbedded build system uses the Build Directory when building images."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The top-level
                     <ulink url='&YOCTO_DOCS_DEV_URL;#build-directory'>Build Directory</ulink>.
                     BitBake automatically sets this variable when you
@@ -11713,12 +11993,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TRANSLATED_TARGET_ARCH'><glossterm>TRANSLATED_TARGET_ARCH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TRANSLATED_TARGET_ARCH'><glossterm>TRANSLATED_TARGET_ARCH</glossterm>
             <info>
                 TRANSLATED_TARGET_ARCH[doc] = "A sanitized version of TARGET_ARCH. This variable is used where the architecture is needed in a value where underscores are not allowed."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A sanitized version of
                     <link linkend='var-TARGET_ARCH'><filename>TARGET_ARCH</filename></link>.
                     This variable is used where the architecture is needed in
@@ -11734,12 +12014,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TUNE_ARCH'><glossterm>TUNE_ARCH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TUNE_ARCH'><glossterm>TUNE_ARCH</glossterm>
             <info>
                 TUNE_ARCH[doc] = "The GNU canonical architecture for a specific architecture (i.e. arm, armeb, mips, mips64, and so forth)."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The GNU canonical architecture for a specific architecture
                     (i.e. <filename>arm</filename>,
                     <filename>armeb</filename>,
@@ -11792,12 +12072,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TUNE_ASARGS'><glossterm>TUNE_ASARGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TUNE_ASARGS'><glossterm>TUNE_ASARGS</glossterm>
             <info>
                 TUNE_ASARGS[doc] = "Specifies architecture-specific assembler flags for the target system."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies architecture-specific assembler flags for
                     the target system.
                     The set of flags is based on the selected tune features.
@@ -11822,12 +12102,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TUNE_CCARGS'><glossterm>TUNE_CCARGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TUNE_CCARGS'><glossterm>TUNE_CCARGS</glossterm>
             <info>
                 TUNE_CCARGS[doc] = "Specifies architecture-specific C compiler flags for the target system."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies architecture-specific C compiler flags for
                     the target system.
                     The set of flags is based on the selected tune features.
@@ -11846,12 +12126,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TUNE_LDARGS'><glossterm>TUNE_LDARGS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TUNE_LDARGS'><glossterm>TUNE_LDARGS</glossterm>
             <info>
                 TUNE_LDARGS[doc] = "Specifies architecture-specific linker flags for the target system."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies architecture-specific linker flags for
                     the target system.
                     The set of flags is based on the selected tune features.
@@ -11876,12 +12156,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TUNE_FEATURES'><glossterm>TUNE_FEATURES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TUNE_FEATURES'><glossterm>TUNE_FEATURES</glossterm>
             <info>
                 TUNE_FEATURES[doc] = "Features used to "tune" a compiler for optimal use given a specific processor."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Features used to "tune" a compiler for optimal use
                     given a specific processor.
                     The features are defined within the tune files and allow
@@ -11909,12 +12189,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TUNE_PKGARCH'><glossterm>TUNE_PKGARCH<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TUNE_PKGARCH'><glossterm>TUNE_PKGARCH</glossterm>
             <info>
                 TUNE_PKGARCH[doc] = "The package architecture understood by the packaging system to define the architecture, ABI, and tuning of output packages."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The package architecture understood by the packaging
                     system to define the architecture, ABI, and tuning of
                     output packages.
@@ -11939,12 +12219,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TUNEABI'><glossterm>TUNEABI<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TUNEABI'><glossterm>TUNEABI</glossterm>
             <info>
                 TUNEABI[doc] = "An underlying ABI used by a particular tuning in a given toolchain layer. This feature allows providers using prebuilt libraries to check compatibility of a tuning against their selection of libraries."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     An underlying Application Binary Interface (ABI) used by
                     a particular tuning in a given toolchain layer.
                     Providers that use prebuilt libraries can use the
@@ -11966,12 +12246,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TUNEABI_OVERRIDE'><glossterm>TUNEABI_OVERRIDE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TUNEABI_OVERRIDE'><glossterm>TUNEABI_OVERRIDE</glossterm>
             <info>
                 TUNEABI_OVERRIDE[doc] = "If set, ignores TUNEABI_WHITELIST."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     If set, the OpenEmbedded system ignores the
                     <link linkend='var-TUNEABI_WHITELIST'><filename>TUNEABI_WHITELIST</filename></link>
                     variable.
@@ -11992,12 +12272,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TUNEABI_WHITELIST'><glossterm>TUNEABI_WHITELIST<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TUNEABI_WHITELIST'><glossterm>TUNEABI_WHITELIST</glossterm>
             <info>
                 TUNEABI_WHITELIST[doc] = "A whitelist of permissible TUNEABI values.  If the variable is not set, all values are allowed."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A whitelist of permissible
                     <link linkend='var-TUNEABI'><filename>TUNEABI</filename></link>
                     values.
@@ -12019,12 +12299,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TUNECONFLICTS'><glossterm>TUNECONFLICTS[<replaceable>feature</replaceable>]<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TUNECONFLICTS'><glossterm>TUNECONFLICTS[<replaceable>feature</replaceable>]</glossterm>
             <info>
                 TUNECONFLICTS[doc] = "Specifies CPU or Application Binary Interface (ABI) tuning features that conflict with specified feature."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies CPU or Application Binary Interface (ABI)
                     tuning features that conflict with <replaceable>feature</replaceable>.
                 </para>
@@ -12044,12 +12324,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TUNEVALID'><glossterm>TUNEVALID[<replaceable>feature</replaceable>]<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-TUNEVALID'><glossterm>TUNEVALID[<replaceable>feature</replaceable>]</glossterm>
             <info>
                TUNEVALID[doc] = "Descriptions, stored as flags, of valid tuning features."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies a valid CPU or Application Binary Interface (ABI)
                     tuning feature.
                     The specified feature is stored as a flag.
@@ -12059,6 +12339,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     <literallayout class='monospaced'>
      TUNEVALID[bigendian] = "Enable big-endian mode."
                     </literallayout>
+                </para>
+
+                <para>
                     See the machine include files in the
                     <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>
                     for these features.
@@ -12070,12 +12353,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
 
     <glossdiv id='var-glossary-u'><title>U</title>
 
-        <glossentry id='var-UBOOT_CONFIG'><glossterm>UBOOT_CONFIG<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-UBOOT_CONFIG'><glossterm>UBOOT_CONFIG</glossterm>
             <info>
                UBOOT_CONFIG[doc] = "Configures the UBOOT_MACHINE and can also define IMAGE_FSTYPES for individual cases."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Configures the
                     <link linkend='var-UBOOT_MACHINE'><filename>UBOOT_MACHINE</filename></link>
                     and can also define
@@ -12112,12 +12395,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-UBOOT_ENTRYPOINT'><glossterm>UBOOT_ENTRYPOINT<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-UBOOT_ENTRYPOINT'><glossterm>UBOOT_ENTRYPOINT</glossterm>
             <info>
                UBOOT_ENTRYPOINT[doc] = "Specifies the entry point for the U-Boot image."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the entry point for the U-Boot image.
                     During U-Boot image creation, the
                     <filename>UBOOT_ENTRYPOINT</filename> variable is passed
@@ -12127,12 +12410,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-UBOOT_LOADADDRESS'><glossterm>UBOOT_LOADADDRESS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-UBOOT_LOADADDRESS'><glossterm>UBOOT_LOADADDRESS</glossterm>
             <info>
                UBOOT_LOADADDRESS[doc] = "Specifies the load address for the U-Boot image."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the load address for the U-Boot image.
                     During U-Boot image creation, the
                     <filename>UBOOT_LOADADDRESS</filename> variable is passed
@@ -12142,12 +12425,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-UBOOT_LOCALVERSION'><glossterm>UBOOT_LOCALVERSION<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-UBOOT_LOCALVERSION'><glossterm>UBOOT_LOCALVERSION</glossterm>
             <info>
                UBOOT_LOCALVERSION[doc] = "Appends a string to the name of the local version of the U-Boot image."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Appends a string to the name of the local version of the
                     U-Boot image.
                     For example, assuming the version of the U-Boot image
@@ -12161,12 +12444,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-UBOOT_MACHINE'><glossterm>UBOOT_MACHINE<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-UBOOT_MACHINE'><glossterm>UBOOT_MACHINE</glossterm>
             <info>
                UBOOT_MACHINE[doc] = "Specifies the value passed on the make command line when building a U-Boot image."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the value passed on the
                     <filename>make</filename> command line when building
                     a U-Boot image.
@@ -12184,12 +12467,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-UBOOT_MAKE_TARGET'><glossterm>UBOOT_MAKE_TARGET<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-UBOOT_MAKE_TARGET'><glossterm>UBOOT_MAKE_TARGET</glossterm>
             <info>
                UBOOT_MAKE_TARGET[doc] = "Specifies the target called in the Makefile."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the target called in the
                     <filename>Makefile</filename>.
                     The default target is "all".
@@ -12197,12 +12480,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-UBOOT_SUFFIX'><glossterm>UBOOT_SUFFIX<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-UBOOT_SUFFIX'><glossterm>UBOOT_SUFFIX</glossterm>
             <info>
                UBOOT_SUFFIX[doc] = "Points to the generated U-Boot extension."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Points to the generated U-Boot extension.
                     For example, <filename>u-boot.sb</filename> has a
                     <filename>.sb</filename> extension.
@@ -12215,12 +12498,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-UBOOT_TARGET'><glossterm>UBOOT_TARGET<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-UBOOT_TARGET'><glossterm>UBOOT_TARGET</glossterm>
             <info>
                UBOOT_TARGET[doc] = "Specifies the target used for building U-Boot."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the target used for building U-Boot.
                     The target is passed directly as part of the "make" command
                     (e.g. SPL and AIS).
@@ -12231,12 +12514,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-UPDATERCPN'><glossterm>UPDATERCPN<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-UPDATERCPN'><glossterm>UPDATERCPN</glossterm>
             <info>
                UPDATERCPN[doc] = "Specifies the package that contains the initscript that is to be enabled."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     For recipes inheriting the
                     <link linkend='ref-classes-update-rc.d'><filename>update-rc.d</filename></link>
                     class, <filename>UPDATERCPN</filename> specifies
@@ -12253,12 +12536,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-USE_DEVFS'><glossterm>USE_DEVFS<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-USE_DEVFS'><glossterm>USE_DEVFS</glossterm>
             <info>
                USE_DEVFS[doc] = "Determines if devtmpfs is used for /dev population."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Determines if <filename>devtmpfs</filename> is used for
                     <filename>/dev</filename> population.
                     The default value used for <filename>USE_DEVFS</filename>
@@ -12277,12 +12560,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-USE_VT'><glossterm>USE_VT<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-USE_VT'><glossterm>USE_VT</glossterm>
             <info>
                USE_VT[doc] = "When using SysVinit, determines whether or not to run a getty on any virtual terminals in order to enable logging in through those terminals."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When using
                     <ulink url='&YOCTO_DOCS_DEV_URL;#new-recipe-enabling-system-services'>SysVinit</ulink>,
                     determines whether or not to run a
@@ -12302,12 +12585,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-USER_CLASSES'><glossterm>USER_CLASSES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-USER_CLASSES'><glossterm>USER_CLASSES</glossterm>
             <info>
                USER_CLASSES[doc] = "List of additional classes to use when building images that enable extra features."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     A list of classes to globally inherit.
                     These classes are used by the OpenEmbedded build system
                     to enable extra features (e.g.
@@ -12329,12 +12612,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-USERADD_ERROR_DYNAMIC'><glossterm>USERADD_ERROR_DYNAMIC<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-USERADD_ERROR_DYNAMIC'><glossterm>USERADD_ERROR_DYNAMIC</glossterm>
             <info>
                USERADD_ERROR_DYNAMIC[doc] = "Forces the OpenEmbedded build system to produce an error if the user identification (uid) and group identification (gid) values are not defined in files/passwd and files/group files."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Forces the OpenEmbedded build system to produce an error
                     if the user identification (<filename>uid</filename>) and
                     group identification (<filename>gid</filename>) values
@@ -12369,12 +12652,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-USERADD_GID_TABLES'><glossterm>USERADD_GID_TABLES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-USERADD_GID_TABLES'><glossterm>USERADD_GID_TABLES</glossterm>
             <info>
                USERADD_GID_TABLES[doc] = "Specifies a password file to use for obtaining static group identification (gid) values when the OpenEmbedded build system adds a group to the system during package installation."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies a password file to use for obtaining static
                     group identification (<filename>gid</filename>) values
                     when the OpenEmbedded build system adds a group to the
@@ -12404,12 +12687,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-USERADD_PACKAGES'><glossterm>USERADD_PACKAGES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-USERADD_PACKAGES'><glossterm>USERADD_PACKAGES</glossterm>
             <info>
                USERADD_PACKAGES[doc] = "When a recipe inherits the useradd class, this variable specifies the individual packages within the recipe that require users and/or groups to be added."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-useradd'><filename>useradd</filename></link>
                     class, this variable
@@ -12440,12 +12723,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-USERADD_PARAM'><glossterm>USERADD_PARAM<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-USERADD_PARAM'><glossterm>USERADD_PARAM</glossterm>
             <info>
                USERADD_PARAM[doc] = "When a recipe inherits the useradd class, this variable specifies for a package what parameters should be passed to the useradd command if you wish to add a user to the system when the package is installed."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When inheriting the
                     <link linkend='ref-classes-useradd'><filename>useradd</filename></link>
                     class, this variable
@@ -12470,12 +12753,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-USERADD_UID_TABLES'><glossterm>USERADD_UID_TABLES<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-USERADD_UID_TABLES'><glossterm>USERADD_UID_TABLES</glossterm>
             <info>
                USERADD_UID_TABLES[doc] = "Specifies a password file to use for obtaining static user identification (uid) values when the OpenEmbedded build system adds a user to the system during package installation."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies a password file to use for obtaining static
                     user identification (<filename>uid</filename>) values
                     when the OpenEmbedded build system adds a user to the
@@ -12505,12 +12788,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-USERADDEXTENSION'><glossterm>USERADDEXTENSION<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-USERADDEXTENSION'><glossterm>USERADDEXTENSION</glossterm>
             <info>
                USERADDEXTENSION[doc] = "When set to "useradd-staticids", causes the OpenEmbedded build system to base all user and group additions on a static passwd and group files found in BBPATH."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     When set to "useradd-staticids", causes the
                     OpenEmbedded build system to base all user and group
                     additions on a static
@@ -12560,12 +12843,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
 
     <glossdiv id='var-glossary-w'><title>W</title>
 
-        <glossentry id='var-WARN_QA'><glossterm>WARN_QA<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-WARN_QA'><glossterm>WARN_QA</glossterm>
             <info>
                WARN_QA[doc] = "Specifies the quality assurance checks whose failures are reported as warnings by the OpenEmbedded build system."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the quality assurance checks whose failures are
                     reported as warnings by the OpenEmbedded build system.
                     You set this variable in your distribution configuration
@@ -12578,12 +12861,12 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-WORKDIR'><glossterm>WORKDIR<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-WORKDIR'><glossterm>WORKDIR</glossterm>
             <info>
                WORKDIR[doc] = "The pathname of the working directory in which the OpenEmbedded build system builds a recipe. This directory is located within the TMPDIR directory structure and changes as different packages are built."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     The pathname of the work directory in which the OpenEmbedded
                     build system builds a recipe.
                     This directory is located within the
@@ -12639,13 +12922,13 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
 
     <glossdiv id='var-glossary-x'><title>X</title>
 
-        <glossentry id='var-XSERVER'><glossterm>XSERVER<imagedata fileref="figures/define-generic.png" /></glossterm>
+        <glossentry id='var-XSERVER'><glossterm>XSERVER</glossterm>
             <info>
                XSERVER[doc] = "Specifies the packages that should be installed
                to provide an X server and drivers for the current machine."
             </info>
             <glossdef>
-                <para>
+                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
                     Specifies the packages that should be installed to
                     provide an X server and drivers for the current machine,
                     assuming your image directly includes