From 0915ee7dc30ca5cd3ba45e85cdc03741a8d0a822 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <srifenbark@gmail.com>
Date: Fri, 21 Oct 2016 13:33:47 -0700
Subject: ref-manual: Applied minor corrections to 2.2 migration section.

Moved a couple notes around and changed some wordings...
nothing major.

(From yocto-docs rev: 518d368c4c981df5ddde6681859906c9eb16ff62)

Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 documentation/ref-manual/migration.xml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'documentation')

diff --git a/documentation/ref-manual/migration.xml b/documentation/ref-manual/migration.xml
index 64f6da876b..3e7e6b0844 100644
--- a/documentation/ref-manual/migration.xml
+++ b/documentation/ref-manual/migration.xml
@@ -3392,10 +3392,6 @@
 
         <para>
             The following changes for Python occurred:
-            <note>
-                Python 2 and recipes that use it can still be built for the
-                target as with previous versions.
-            </note>
         </para>
 
         <section id='migration-2.2-bitbake-now-requires-python-3.4'>
@@ -3443,6 +3439,10 @@
                 Unfortunately, systems using RPM as a package manager and
                 providing online package-manager support through SMART still
                 require Python 2.
+                <note>
+                    Python 2 and recipes that use it can still be built for the
+                    target as with previous versions.
+                </note>
             </para>
         </section>
 
@@ -3489,6 +3489,7 @@
         <para>
             <filename>runqemu</filename> has been ported to Python and has
             changed behavior in some cases.
+            Previous usage patterns continued to be supported.
         </para>
 
         <para>
@@ -3508,9 +3509,6 @@
             Using a configuration file is particularly convenient when trying
             to use QEMU with machines other than the
             <filename>qemu*</filename> machines in OE-Core.
-            <note>
-                Previous usage patterns are continued to be supported.
-            </note>
             The <filename>qemuboot.conf</filename> file is generated by the
             <filename>qemuboot</filename>
             class when the root filesystem is being build (i.e.
@@ -3612,8 +3610,8 @@ $ runqemu qemux86-64 tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.
             binary" QA issues when building such recipes.
             You need to fix these recipes so that they use the expected
             <filename>LDFLAGS</filename>.
-            Depending on how the software is built, the build system might
-            need to be patched.
+            Depending on how the software is built, the build system used by
+            the software (e.g. a Makefile) might need to be patched.
             However, sometimes making this fix is as simple as adding the
             following to the recipe:
             <literallayout class='monospaced'>
-- 
cgit v1.2.3-54-g00ecf