From f19b52c90c91241a5dc2e5ec6d4dc437a1b4cc8e Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <srifenbark@gmail.com>
Date: Fri, 23 Oct 2015 07:49:12 -0700
Subject: ref-manual: Updates to the 1.8 to 2.0 Migration section.

Applied review comments from Paul Eggleton.

(From yocto-docs rev: 5b41ef810fdae04a722253676edd9d5803cb50f4)

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

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

diff --git a/documentation/ref-manual/migration.xml b/documentation/ref-manual/migration.xml
index e8e258aa6f..aad04faad3 100644
--- a/documentation/ref-manual/migration.xml
+++ b/documentation/ref-manual/migration.xml
@@ -2324,12 +2324,21 @@
     </para>
 
     <section id='migration-2.0-gcc-5'>
-        <title>Gcc 5</title>
+        <title>GCC 5</title>
 
         <para>
             The default compiler is now GCC 5.2.
-            This change has resulted in fixes for compile errors in a number
+            This change has required fixes for compilation errors in a number
             of other recipes.
+        </para>
+
+        <para>
+            Alternatively, you can switch back to GCC 4.9 or 4.8 by
+            setting <filename>GCCVERSION</filename> in your configuration,
+            as follows:
+            <literallayout class='monospaced'>
+     GCCVERSION = "4.9%"
+            </literallayout>
             For further details, please see
             <ulink url='https://gcc.gnu.org/gcc-5/changes.html'></ulink>.
         </para>
@@ -2340,8 +2349,8 @@
 
         <para>
             Gstreamer 0.10 has been removed in favor of Gstreamer 1.x.
-            As part of the change, Gstreamer 0.10 recipes
-            that still need Gstreamer 0.10 are now located
+            As part of the change, recipes for Gstreamer 0.10 and related
+            software are now located
             in <filename>meta-multimedia</filename>.
             This change results in Qt4 having Phonon and Gstreamer
             support in QtWebkit disabled by default.
@@ -2371,9 +2380,8 @@
                     <filename>adwaita-icon-theme</filename>.
                     </para></listitem>
                 <listitem><para>
-                    Gstreamer 0.10 Recipes: Recipes that are part of
-                    Gstreamer 0.10 have been removed in favor of the
-                    recipes in Gstreamer 1.x.
+                    Gstreamer 0.10 Recipes: Recipes for Gstreamer 0.10 have
+                    been removed in favor of the recipes for Gstreamer 1.x.
                     </para></listitem>
                 <listitem><para>
                     <filename>insserv</filename>: The recipe is obsolete and
@@ -2381,7 +2389,7 @@
                     </para></listitem>
                 <listitem><para>
                     <filename>libunique</filename>: The recipe is no longer
-                    used and has been move to <filename>meta-oe</filename>.
+                    used and has been moved to <filename>meta-oe</filename>.
                     </para></listitem>
                 <listitem><para>
                     <filename>midori</filename>: The recipe's functionally
-- 
cgit v1.2.3-54-g00ecf