From 028deee71fe66e3b2965535de629a296094029be Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <srifenbark@gmail.com>
Date: Mon, 12 Nov 2018 09:18:43 -0800
Subject: ref-manual: Applied review edits to the 2.6 migration section.

Minor fixes here and there.

(From yocto-docs rev: 740b4392bd98a12f188b79ae3ecdc7c3031f9f7d)

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

(limited to 'documentation/ref-manual/migration.xml')

diff --git a/documentation/ref-manual/migration.xml b/documentation/ref-manual/migration.xml
index bb24754ff7..bd670acc86 100644
--- a/documentation/ref-manual/migration.xml
+++ b/documentation/ref-manual/migration.xml
@@ -5714,7 +5714,7 @@ id=f4d4f99cfbc2396e49c1613a7d237b9e57f06f81'>commit message</ulink>.
         <para>
             The following recipes have been removed:
             <literallayout class='monospaced'>
-     <emphasis><filename>beecrypt</filename>:</emphasis> No longer needed since moving to <filename>rpm4</filename>.
+     <emphasis><filename>beecrypt</filename>:</emphasis> No longer needed since moving to RPM 4.
      <emphasis><filename>bigreqsproto</filename>:</emphasis> Replaced by <filename>xorgproto</filename>.
      <emphasis><filename>calibrateproto</filename>:</emphasis> Removed in favor of <filename>xinput</filename>.
      <emphasis><filename>compositeproto</filename>:</emphasis> Replaced by <filename>xorgproto</filename>.
@@ -5756,7 +5756,7 @@ id=f4d4f99cfbc2396e49c1613a7d237b9e57f06f81'>commit message</ulink>.
      <emphasis><filename>xf86driproto</filename>:</emphasis> Replaced by <filename>xorgproto</filename>.
      <emphasis><filename>xf86miscproto</filename>:</emphasis> Replaced by <filename>xorgproto</filename>.
      <emphasis><filename>xf86-video-omapfb</filename>:</emphasis> Became obsolete.  Use kernel modesetting driver instead.
-     <emphasis><filename>xf86-video-omap</filename>:</emphasis> Became obsolete  Use kernel modesetting driver instead.
+     <emphasis><filename>xf86-video-omap</filename>:</emphasis> Became obsolete.  Use kernel modesetting driver instead.
      <emphasis><filename>xf86vidmodeproto</filename>:</emphasis> Replaced by <filename>xorgproto</filename>.
      <emphasis><filename>xineramaproto</filename>:</emphasis> Replaced by <filename>xorgproto</filename>.
      <emphasis><filename>xproto</filename>:</emphasis> Replaced by <filename>xorgproto</filename>.
@@ -5796,7 +5796,7 @@ id=f4d4f99cfbc2396e49c1613a7d237b9e57f06f81'>commit message</ulink>.
                     </para></listitem>
                 <listitem><para>
                     <emphasis><filename>python</filename> and <filename>python3</filename>:</emphasis>
-                    These have been removed from the main package entirely.
+                    The main package has been removed from the recipe.
                     You must install specific packages or
                     <filename>python-modules</filename> for everything.
                     </para></listitem>
@@ -5847,7 +5847,7 @@ id=f4d4f99cfbc2396e49c1613a7d237b9e57f06f81'>commit message</ulink>.
             were missing from
             <link linkend='var-DEPENDS'><filename>DEPENDS</filename></link>).
             <note>
-                This dependency affects classes beyond just the two mentioned
+                This change affects classes beyond just the two mentioned
                 (i.e. <filename>distutils</filename> and
                 <filename>distutils3</filename>).
                 Any recipe that inherits <filename>distutils*</filename>
@@ -6102,7 +6102,7 @@ id=f4d4f99cfbc2396e49c1613a7d237b9e57f06f81'>commit message</ulink>.
      ${sysconfdir}/systemd/system.conf
      ${sysconfdir}/systemd/user.conf
             </literallayout>
-            If you previously used BitBake append files to append the
+            If you previously used bbappend files to append the
             <filename>systemd</filename> recipe to change any of the
             listed files, you must do so for the
             <filename>systemd-conf</filename> recipe instead.
@@ -6205,7 +6205,7 @@ id=f4d4f99cfbc2396e49c1613a7d237b9e57f06f81'>commit message</ulink>.
             optimization.
             Using this optimization requires a little extra build time in
             exchange for improved performance on the target at runtime.
-            And, the optimization is only enabled if the current
+            Additionally, the optimization is only enabled if the current
             <link linkend='var-MACHINE'><filename>MACHINE</filename></link>
             has support for user-mode emulation in QEMU (i.e. "qemu-usermode"
             is in
@@ -6251,9 +6251,7 @@ id=f4d4f99cfbc2396e49c1613a7d237b9e57f06f81'>commit message</ulink>.
                     <filename>/etc/*-postinsts</filename> for
                     <filename>dpkg/opkg</filename> in favor of built-in
                     postinst support.
-                    <note>
-                        RPM behavior remains unchanged.
-                    </note>
+                    RPM behavior remains unchanged.
                     </para></listitem>
                 <listitem><para>
                     The <filename>NOISO</filename> and
@@ -6302,8 +6300,7 @@ id=f4d4f99cfbc2396e49c1613a7d237b9e57f06f81'>commit message</ulink>.
                     Support for DSA host keys has been dropped from the
                     OpenSSH recipes.
                     If you are still using DSA keys, you must switch over to a
-                    more secure algorithm as recommended by the OpenSSH
-                    upstream.
+                    more secure algorithm as recommended by OpenSSH upstream.
                     </para></listitem>
                 <listitem><para>
                     The <filename>dhcp</filename> recipe now uses the
-- 
cgit v1.2.3-54-g00ecf