From 56ce44aa805389427bb4d6fd02a49e53d7a33cad Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Wed, 3 Apr 2013 09:12:49 -0700
Subject: [PATCH] dev-manual: merged "updating images" into the "working with
 packages"

The section that talked about IPK-specific information for
installing updated packages onto an existing running target
system is parse and really needs to be in the section that
talks about setting up a package repository.  I moved it to
the end of that repo section.

(From yocto-docs rev: 3b1c5858527cba908a5acff1ddc924630cc954b0)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../dev-manual/dev-manual-common-tasks.xml    | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index d65d73d59d..43dc61fb24 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -2075,24 +2075,6 @@
         </section>
     </section>
 
-    <section id="usingpoky-changes-updatingimages">
-        <title>Updating Existing Images</title>
-
-        <para>
-            Often, rather than re-flashing a new image, you might wish to install updated
-            packages into an existing running system.
-            You can do this by first sharing the <filename>tmp/deploy/ipk/</filename> directory
-            through a web server and then by changing <filename>/etc/opkg/base-feeds.conf</filename>
-            to point at the shared server.
-            Following is an example:
-            <literallayout class='monospaced'>
-     $ src/gz all http://www.mysite.com/somedir/deploy/ipk/all
-     $ src/gz armv7a http://www.mysite.com/somedir/deploy/ipk/armv7a
-     $ src/gz beagleboard http://www.mysite.com/somedir/deploy/ipk/beagleboard
-            </literallayout>
-        </para>
-    </section>
-
     <section id='creating-your-own-distribution'>
         <title>Creating Your Own Distribution</title>
 
@@ -3213,6 +3195,21 @@
                 reboot the target device to take advantage of runtime package
                 installations.
             </para>
+
+            <para>
+                If your packages are IPK, you can install packages onto an
+                existing running system by first sharing the
+                <filename>tmp/deploy/ipk/</filename> directory
+                through a web server and then by changing
+                <filename>/etc/opkg/base-feeds.conf</filename>
+                to point at the shared server.
+                Following is an example:
+                <literallayout class='monospaced'>
+     $ src/gz all http://www.mysite.com/somedir/deploy/ipk/all
+     $ src/gz armv7a http://www.mysite.com/somedir/deploy/ipk/armv7a
+     $ src/gz beagleboard http://www.mysite.com/somedir/deploy/ipk/beagleboard
+                </literallayout>
+            </para>
         </section>
     </section>