summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2012-06-25 09:59:43 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-26 15:34:39 +0100
commita9f9eb27d320feb868f9ec228d95a911c85f2abc (patch)
treed14ac5a90bb53348ffbd2a30956711730a437b52
parent8ce8d25bcda0e2e0b62204d5ca5875dedcaacf7d (diff)
downloadpoky-a9f9eb27d320feb868f9ec228d95a911c85f2abc.tar.gz
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>
-rw-r--r--documentation/dev-manual/dev-manual-intro.xml7
-rw-r--r--documentation/poky-ref-manual/ref-images.xml7
2 files changed, 8 insertions, 6 deletions
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 @@
133 Hob's primary goal is to enable a user to perform common tasks more easily.</para></listitem> 133 Hob's primary goal is to enable a user to perform common tasks more easily.</para></listitem>
134 <listitem><para><emphasis> 134 <listitem><para><emphasis>
135 <ulink url='&YOCTO_HOME_URL;/documentation/build-appliance'> 135 <ulink url='&YOCTO_HOME_URL;/documentation/build-appliance'>
136 Build Appliance</ulink>:</emphasis> Allows you to build and boot a custom embedded Linux 136 Build Appliance</ulink>:</emphasis> A bootable custom embedded Linux image you can
137 image with the Yocto Project using a non-Linux development system.</para></listitem> 137 either build using a non-Linux development system (VMware applications) or download
138 from the Yocto Project website.
139 See the <ulink url='&YOCTO_HOME_URL;/documentation/build-appliance'>Build Appliance</ulink>
140 page for more information.</para></listitem>
138 <listitem><para><emphasis> 141 <listitem><para><emphasis>
139 <ulink url='&YOCTO_BUGZILLA_URL;'>Bugzilla</ulink>:</emphasis> 142 <ulink url='&YOCTO_BUGZILLA_URL;'>Bugzilla</ulink>:</emphasis>
140 The bug tracking application the Yocto Project uses. 143 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 @@
108 instead of X11. 108 instead of X11.
109 In order to build, this image requires specific distro configuration that enables 109 In order to build, this image requires specific distro configuration that enables
110 <filename>gtk</filename> over <filename>directfb</filename>.</para></listitem> 110 <filename>gtk</filename> over <filename>directfb</filename>.</para></listitem>
111 <listitem><para><emphasis><filename>self-hosted-image</filename>:</emphasis> 111 <listitem><para><emphasis><filename>build-appliance-image</filename>:</emphasis>
112 An image you can run using the Yocto Project Build Appliance. 112 An image you can boot and run using either the
113 The image is suitable to load and boot from either
114 <ulink url='http://www.vmware.com/products/player/overview.html'>VMware Player</ulink> 113 <ulink url='http://www.vmware.com/products/player/overview.html'>VMware Player</ulink>
115 or <ulink url='http://www.vmware.com/products/workstation/overview.html'>VMWare Workstation</ulink>. 114 or <ulink url='http://www.vmware.com/products/workstation/overview.html'>VMWare Workstation</ulink>.
116 For more information on the Build Appliance, see the 115 For more information on this image, see the
117 <ulink url='&YOCTO_HOME_URL;/documentation/build-appliance'>Build Appliance</ulink> page on 116 <ulink url='&YOCTO_HOME_URL;/documentation/build-appliance'>Build Appliance</ulink> page on
118 the Yocto Project website.</para></listitem> 117 the Yocto Project website.</para></listitem>
119 </itemizedlist> 118 </itemizedlist>