From 56d099540f7cf471af8cc712bec77817c83a05f6 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Fri, 21 Nov 2014 10:16:24 -0600
Subject: ref-manual: Added XSERVER variable description to the glossary.

(From yocto-docs rev: 9e1551afd4d82197b2c46e76b6f6ea68c1dca886)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 documentation/ref-manual/ref-variables.xml | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

(limited to 'documentation/ref-manual')

diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index ced40c0549..b1f61454b2 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -39,7 +39,7 @@
        <link linkend='var-UBOOT_CONFIG'>U</link>
 <!--               <link linkend='var-glossary-v'>V</link> -->
        <link linkend='var-WARN_QA'>W</link>
-<!--               <link linkend='var-glossary-x'>X</link> -->
+       <link linkend='var-XSERVER'>X</link>
 <!--               <link linkend='var-glossary-y'>Y</link> -->
 <!--               <link linkend='var-glossary-z'>Z</link>-->
     </para>
@@ -11535,8 +11535,32 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
 
     </glossdiv>
 
-<!--            <glossdiv id='var-glossary-x'><title>X</title>-->
-<!--            </glossdiv>-->
+    <glossdiv id='var-glossary-x'><title>X</title>
+
+        <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>
+                    Specifies the packages that should be installed to
+                    provide an X server and drivers for the current machine,
+                    assuming your image directly includes
+                    <filename>packagegroup-core-x11-xserver</filename> or,
+                    perhaps indirectly, includes "x11-base" in
+                    <link linkend='var-IMAGE_FEATURES'><filename>IMAGE_FEATURES</filename></link>.
+                </para>
+
+                <para>
+                    The default value of <filename>XSERVER</filename>, if not
+                    specified in the machine configuration, is
+                    "xserver-xorg xf86-video-fbdev xf86-input-evdev".
+                </para>
+            </glossdef>
+        </glossentry>
+
+    </glossdiv>
 
 <!--            <glossdiv id='var-glossary-y'><title>Y</title>-->
 <!--            </glossdiv>-->
-- 
cgit v1.2.3-54-g00ecf