From a9f9eb27d320feb868f9ec228d95a911c85f2abc Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Mon, 25 Jun 2012 09:59:43 -0700
Subject: documentation: Re-defined "Build Appliance" to mean the file

Previous renditions of the term "Build Appliance" referred to the
VMware system.  However, it was determined that the term
"Build Appliance" should really refer to the actual image that
can be booted and run on the VMware applications.  I have updated
the areas affected by this change.  The change assumes the name of
the built or downloaded file you boot will be named
"build-appliance-image."

Fixes [YOCTO_#2656]

(From yocto-docs rev: 6b27b7d92b9722351eb43a7c2a341ce3af056dba)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 documentation/dev-manual/dev-manual-intro.xml | 7 +++++--
 documentation/poky-ref-manual/ref-images.xml  | 7 +++----
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'documentation')

diff --git a/documentation/dev-manual/dev-manual-intro.xml b/documentation/dev-manual/dev-manual-intro.xml
index 4a22590ef9..fd35e283c2 100644
--- a/documentation/dev-manual/dev-manual-intro.xml
+++ b/documentation/dev-manual/dev-manual-intro.xml
@@ -133,8 +133,11 @@
                     Hob's primary goal is to enable a user to perform common tasks more easily.</para></listitem>
                 <listitem><para><emphasis>
                     <ulink url='&YOCTO_HOME_URL;/documentation/build-appliance'>
-                    Build Appliance</ulink>:</emphasis> Allows you to build and boot a custom embedded Linux 
-                    image with the Yocto Project using a non-Linux development system.</para></listitem>
+                    Build Appliance</ulink>:</emphasis> A bootable custom embedded Linux image you can 
+                    either build using a non-Linux development system (VMware applications) or download 
+                    from the Yocto Project website.
+                    See the <ulink url='&YOCTO_HOME_URL;/documentation/build-appliance'>Build Appliance</ulink>
+                    page for more information.</para></listitem>
                 <listitem><para><emphasis>
                     <ulink url='&YOCTO_BUGZILLA_URL;'>Bugzilla</ulink>:</emphasis>
                     The bug tracking application the Yocto Project uses.
diff --git a/documentation/poky-ref-manual/ref-images.xml b/documentation/poky-ref-manual/ref-images.xml
index eb30942fec..7080034f53 100644
--- a/documentation/poky-ref-manual/ref-images.xml
+++ b/documentation/poky-ref-manual/ref-images.xml
@@ -108,12 +108,11 @@
             instead of X11.  
             In order to build, this image requires specific distro configuration that enables 
             <filename>gtk</filename> over <filename>directfb</filename>.</para></listitem>
-        <listitem><para><emphasis><filename>self-hosted-image</filename>:</emphasis>
-            An image you can run using the Yocto Project Build Appliance.
-            The image is suitable to load and boot from either 
+        <listitem><para><emphasis><filename>build-appliance-image</filename>:</emphasis>
+            An image you can boot and run using either the
             <ulink url='http://www.vmware.com/products/player/overview.html'>VMware Player</ulink>
             or <ulink url='http://www.vmware.com/products/workstation/overview.html'>VMWare Workstation</ulink>.
-            For more information on the Build Appliance, see the
+            For more information on this image, see the
             <ulink url='&YOCTO_HOME_URL;/documentation/build-appliance'>Build Appliance</ulink> page on 
             the Yocto Project website.</para></listitem>
     </itemizedlist>
-- 
cgit v1.2.3-54-g00ecf