From c5d94b72eb2e9666bb7a5abd8875770241b5f437 Mon Sep 17 00:00:00 2001
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Wed, 5 Sep 2012 12:33:05 -0700
Subject: [PATCH] documentation/poky-ref-manual/ref-images.xml: Update list of
 images

* core-image-core was renamed to core-image-x11 and the editor and file
  manager were removed.
* core-image-basic's description has been updated to reflect its
  intended purpose
* core-image-lsb is intended to be standalone - should not be
  associated with core-image-basic.
* The Pimlico applications have been removed so they are no longer
  present in the Sato images.

In addition to Paul's patch, I removed the "etc." word.  This word
is better replaced by "and so forth".  Also, consistent with the
YP documentation.

(From yocto-docs rev: aba7ae60a38dfeda9ef52237b81f387984621847)

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

diff --git a/documentation/poky-ref-manual/ref-images.xml b/documentation/poky-ref-manual/ref-images.xml
index d1ff6d0144..096f4b5731 100644
--- a/documentation/poky-ref-manual/ref-images.xml
+++ b/documentation/poky-ref-manual/ref-images.xml
@@ -40,9 +40,6 @@
     <itemizedlist>
         <listitem><para><emphasis><filename>core-image-base</filename>:</emphasis>
             A console-only image that fully supports the target device hardware.</para></listitem>
-        <listitem><para><emphasis><filename>core-image-core</filename>:</emphasis>
-            An X11 image with simple applications such as terminal, editor, and file manager.
-            </para></listitem>
         <listitem><para><emphasis><filename>core-image-minimal</filename>:</emphasis>
             A small image just capable of allowing a device to boot.</para></listitem>
         <listitem><para><emphasis><filename>core-image-minimal-dev</filename>:</emphasis>
@@ -61,12 +58,14 @@
             for the Minimal MTD Utilities, which let the user interact with the 
             MTD subsystem in the kernel to perform operations on flash devices.
             </para></listitem>
+        <listitem><para><emphasis><filename>core-image-x11</filename>:</emphasis>
+            A very basic X11 image with a terminal.
+            </para></listitem>
         <listitem><para><emphasis><filename>core-image-basic</filename>:</emphasis>
-            A foundational basic image without support for X that can be reasonably used for 
-            customization.</para></listitem>
+            A console-only image with more full-featured Linux system
+            functionality installed.</para></listitem>
         <listitem><para><emphasis><filename>core-image-lsb</filename>:</emphasis>
-            A <filename>core-image-basic</filename> image suitable for implementations 
-            that conform to Linux Standard Base (LSB).</para></listitem>
+            An image that conforms to the Linux Standard Base (LSB) specification.</para></listitem>
         <listitem><para><emphasis><filename>core-image-lsb-dev</filename>:</emphasis>
             A <filename>core-image-lsb</filename> image that is suitable for development work
             using the host.
@@ -83,8 +82,8 @@
         <listitem><para><emphasis><filename>core-image-sato</filename>:</emphasis>
             An image with Sato support, a mobile environment and visual style that works well 
             with mobile devices.
-            The image supports X11 with a Sato theme and Pimlico applications and also  
-            contains terminal, editor, and file manager.</para></listitem>
+            The image supports X11 with a Sato theme and applications such as
+            a terminal, editor, file manager, media player, and so forth.</para></listitem>
         <listitem><para><emphasis><filename>core-image-sato-dev</filename>:</emphasis>
             A <filename>core-image-sato</filename> image suitable for development 
             using the host.