From 22909d0a47ba13e2b810007aa901fe8fd7b39b2c Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Mon, 30 Sep 2013 11:01:40 -0700
Subject: [PATCH] ref-manual: Applied review edits to migration section.

(From yocto-docs rev: f4c6423a48c5d27bd853abad9b28a6cc563d4054)

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

diff --git a/documentation/ref-manual/migration.xml b/documentation/ref-manual/migration.xml
index 4c7af582fa..bb6203998b 100644
--- a/documentation/ref-manual/migration.xml
+++ b/documentation/ref-manual/migration.xml
@@ -650,7 +650,7 @@
                     </para></listitem>
                 <listitem><para>
                     BitBake's global method pool has been removed.
-                    This method not particularly useful and led to clashes
+                    This method is not particularly useful and led to clashes
                     between recipes containing functions that had the
                     same name.</para></listitem>
                 <listitem><para>
@@ -666,7 +666,7 @@
                     <filename>${</filename><link linkend='var-PF'><filename>PF</filename></link><filename>}</filename>
                     are no longer added to
                     <link linkend='var-PROVIDES'><filename>PROVIDES</filename></link>
-                    by default.
+                    by default in <filename>bitbake.conf</filename>.
                     These version-specific <filename>PROVIDES</filename>
                     items were seldom used.
                     Attempting to use them could result in two versions being
@@ -925,45 +925,6 @@
         </para>
     </section>
 
-    <section id='removed-renamed-recipes'>
-        <title>Removed and Renamed Recipes</title>
-
-        <itemizedlist>
-            <listitem><para>
-                The <filename>linux-yocto</filename> 3.2 kernel has been
-                removed.</para></listitem>
-            <listitem><para>
-                <filename>libtool-nativesdk</filename> has been renamed to
-                <filename>nativesdk-libtool</filename>.</para></listitem>
-            <listitem><para>
-                <filename>tinylogin</filename> has been removed.
-                It has been replaced by a suid portion of Busybox.
-                See the
-                "<link linkend='migration-1.5-busybox'>BusyBox</link>" section
-                for more information.</para></listitem>
-            <listitem><para>
-                <filename>external-python-tarball</filename> has been renamed
-                to <filename>buildtools-tarball</filename>.
-                </para></listitem>
-            <listitem><para>
-                <filename>web-webkit</filename> has been removed.
-                It has been functionally replaced by
-                <filename>midori</filename>.</para></listitem>
-            <listitem><para>
-                <filename>imake</filename> has been removed.
-                It is no longer needed by any other recipe.
-                </para></listitem>
-            <listitem><para>
-                <filename>transfig-native</filename> has been removed.
-                It is no longer needed by any other recipe.
-                </para></listitem>
-            <listitem><para>
-                <filename>anjuta-remote-run</filename> has been removed.
-                Anjuta IDE integration has not been officially supported for
-                several releases.</para></listitem>
-        </itemizedlist>
-    </section>
-
     <section id='migration-1.5-build-history'>
         <title>Build History</title>
 
@@ -1022,6 +983,45 @@
         </para>
     </section>
 
+    <section id='removed-renamed-recipes'>
+        <title>Removed and Renamed Recipes</title>
+
+        <itemizedlist>
+            <listitem><para>
+                The <filename>linux-yocto</filename> 3.2 kernel has been
+                removed.</para></listitem>
+            <listitem><para>
+                <filename>libtool-nativesdk</filename> has been renamed to
+                <filename>nativesdk-libtool</filename>.</para></listitem>
+            <listitem><para>
+                <filename>tinylogin</filename> has been removed.
+                It has been replaced by a suid portion of Busybox.
+                See the
+                "<link linkend='migration-1.5-busybox'>BusyBox</link>" section
+                for more information.</para></listitem>
+            <listitem><para>
+                <filename>external-python-tarball</filename> has been renamed
+                to <filename>buildtools-tarball</filename>.
+                </para></listitem>
+            <listitem><para>
+                <filename>web-webkit</filename> has been removed.
+                It has been functionally replaced by
+                <filename>midori</filename>.</para></listitem>
+            <listitem><para>
+                <filename>imake</filename> has been removed.
+                It is no longer needed by any other recipe.
+                </para></listitem>
+            <listitem><para>
+                <filename>transfig-native</filename> has been removed.
+                It is no longer needed by any other recipe.
+                </para></listitem>
+            <listitem><para>
+                <filename>anjuta-remote-run</filename> has been removed.
+                Anjuta IDE integration has not been officially supported for
+                several releases.</para></listitem>
+        </itemizedlist>
+    </section>
+
     <section id='migration-1.5-other-changes'>
         <title>Other Changes</title>