From 75fc3840aafba5a676351bf0a940d8fe3ccb2b6b Mon Sep 17 00:00:00 2001
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Tue, 23 Aug 2011 14:29:24 +0100
Subject: documentation: update for directdisk/live image changes

-live and -directdisk image have been removed; add a tip about using the
live option in IMAGE_FSTYPES to build any image as a live image.

(From yocto-docs rev: ef7c508a4073c4f04c2368420e64a5d6620c8fbc)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 documentation/poky-ref-manual/ref-images.xml | 32 +++++++---------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/documentation/poky-ref-manual/ref-images.xml b/documentation/poky-ref-manual/ref-images.xml
index c67a01fbe0..8c240fca6d 100644
--- a/documentation/poky-ref-manual/ref-images.xml
+++ b/documentation/poky-ref-manual/ref-images.xml
@@ -47,17 +47,11 @@
         <listitem><para><emphasis><filename>core-image-minimal-dev</filename>:</emphasis>
             A <filename>core-image-minimal</filename> image suitable for development work.
             </para></listitem>
-        <listitem><para><emphasis><filename>core-image-minimal-directdisk</filename>:</emphasis>
-            A <filename>core-image-minimal</filename> image that you can copy directly to the disk 
-            of the target device.</para></listitem>
         <listitem><para><emphasis><filename>core-image-minimal-initramfs</filename>:</emphasis>
             A <filename>core-image-minimal</filename> image that has the Minimal RAM-based 
             Initial Root Filesystem (<filename>initramfs</filename>) as part of the kernel, 
             which allows the system to find the first “init” program more efficiently.
             </para></listitem>
-        <listitem><para><emphasis><filename>core-image-minimal-live</filename>:</emphasis>
-            A <filename>core-image-minimal</filename> image you can run from a 
-            USB device or CD as is.</para></listitem>
         <listitem><para><emphasis><filename>core-image-minimal-mtdutils</filename>:</emphasis>
             A <filename>core-image-minimal</filename> image that has support 
             for the Minimal MTD Utilities, which let the user interact with the 
@@ -72,18 +66,12 @@
         <listitem><para><emphasis><filename>core-image-lsb-dev</filename>:</emphasis>
             A <filename>core-image-lsb</filename> image that is suitable for development work.
             </para></listitem>
-        <listitem><para><emphasis><filename>core-image-lsb-live</filename>:</emphasis>
-            A <filename>core-image-lsb</filename> image that you run from a USB device or CD as is.
-            </para></listitem>
         <listitem><para><emphasis><filename>core-image-lsb-sdk</filename>:</emphasis>
             A <filename>core-image-lsb</filename> that includes everything in meta-toolchain 
             but also includes development headers and libraries to form a complete standalone SDK. 
             See the <link linkend='platdev-appdev-external-sdk'> 
             External Development Using the Poky SDK</link> section for more information.
             </para></listitem>
-        <listitem><para><emphasis><filename>core-image-lsb-sdk-live</filename>:</emphasis>
-            A <filename>core-image-lsb-sdk</filename> image with the ability to run the image
-            from a USB device or CD as is.</para></listitem>
         <listitem><para><emphasis><filename>core-image-clutter</filename>:</emphasis>
             An image with support for the Open GL-based toolkit Clutter, which enables development of 
             rich and animated graphical user interfaces.</para></listitem>
@@ -98,25 +86,21 @@
             the device itself. 
             The image also includes testing and profiling tools as well as debug symbols.  
             This image was formerly <filename>core-image-sdk</filename>.</para></listitem>
-        <listitem><para><emphasis><filename>core-image-sato-directdisk</filename>:</emphasis>
-            A <filename>core-image-sato</filename> image that can be copied directly to the 
-            disk of the target device.</para></listitem>
-        <listitem><para><emphasis><filename>core-image-sato-live</filename>:</emphasis>
-            A <filename>core-image-sato</filename> image with the ability to run 
-            from a USB device or CD as is.</para></listitem>
         <listitem><para><emphasis><filename>core-image-sato-sdk</filename>:</emphasis>
             A <filename>core-image-sato</filename> image that includes everything in meta-toolchain. 
             The image also includes development headers and libraries to form a complete standalone SDK. 
             See the <link linkend='platdev-appdev-external-sdk'> 
             External Development Using the Poky SDK</link> section for more information.
             </para></listitem>
-        <listitem><para><emphasis><filename>core-image-sato-sdk-directdisk</filename>:</emphasis>
-            A <filename>core-image-sato-sdk</filename> image that can be copied directly to the 
-            disk of the target device.</para></listitem>
-        <listitem><para><emphasis><filename>core-image-sato-sdk-live</filename>:</emphasis>
-            A <filename>core-image-sato-sdk</filename> image that you can run  
-            from a USB device or CD as is.</para></listitem>
     </itemizedlist>
+
+    <tip>
+        From Yocto release 1.1 onwards, -live and -directdisk images have been replaced by a "live"
+        option in IMAGE_FSTYPES that will work with any image to produce an image file that can be
+        copied directly to a CD or USB device and run as is. To build a live image, simply add
+        "live" to IMAGE_FSTYPES within local.conf or whereever appropriate and then build the desired
+        image as normal.
+    </tip>
 </appendix>
 <!-- 
 vim: expandtab tw=80 ts=4 
-- 
cgit v1.2.3-54-g00ecf