From 4ffde57e6ff7dcb76d613e0fce17c0a0504c4f1f Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Tue, 16 Apr 2013 08:54:00 -0700
Subject: ref-manual: Changes to the migration section

Paul gave this a review and we found some issues.
Slight changes.

(From yocto-docs rev: 1e64fe277a6daaf484e56c3e9117fd72bb107614)

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

(limited to 'documentation/ref-manual')

diff --git a/documentation/ref-manual/migration.xml b/documentation/ref-manual/migration.xml
index e1faea0fa9..69f0f8d3a2 100644
--- a/documentation/ref-manual/migration.xml
+++ b/documentation/ref-manual/migration.xml
@@ -314,6 +314,10 @@
                     <link linkend='var-MACHINEOVERRIDES'><filename>MACHINEOVERRIDES</filename></link> 
                     or <link linkend='var-DISTROOVERRIDES'><filename>DISTROOVERRIDES</filename></link>
                     variables, as appropriate.
+                    For more changes regarding the 
+                    <filename>SRC_URI</filename> variable, see the
+                    "<link linkend='migration-1.4-variables'>Variables</link>"
+                    section.
                     </para></listitem>
             </itemizedlist>
         </para>
@@ -367,16 +371,21 @@
                 <listitem><para><emphasis><filename>SRC_URI</filename>:</emphasis>
                     The <filename>${</filename><link linkend='var-PN'><filename>PN</filename></link><filename>}</filename>, 
                     <filename>${</filename><link linkend='var-PF'><filename>PF</filename></link><filename>}</filename>, 
-                    and <filename>${</filename><link linkend='var-P'><filename>P</filename></link><filename>}</filename>
-                    directories have been dropped from the default value of the 
+                    <filename>${</filename><link linkend='var-P'><filename>P</filename></link><filename>}</filename>, 
+                    and <filename>FILE_DIRNAME</filename> directories have been 
+                    dropped from the default value of the 
                     <link linkend='var-FILESPATH'><filename>FILESPATH</filename></link>
                     variable, which is used as the search path for finding files 
                     referred to in 
                     <link linkend='var-SRC_URI'><filename>SRC_URI</filename></link>. 
                     If you have a recipe that relied upon these directories, 
                     which would be unusual, then you will need to add the 
-                    appropriate paths to 
-                    <link linkend='var-FILESEXTRAPATHS'><filename>FILESEXTRAPATHS</filename></link>.
+                    appropriate paths within the recipe or, alternatively,
+                    rearrange the files. 
+                    The most common locations are still covered by 
+                    <filename>${BP}</filename>, <filename>${BPN}</filename>,
+                    and "files", which all remain in the default value of
+                    <link linkend='var-FILESPATH'><filename>FILESPATH</filename></link>. 
                     </para></listitem>
             </itemizedlist>           
         </para>
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index b5f04cbf6c..e4bcb56aed 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -3395,10 +3395,10 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                                     <filename>${<link linkend='var-BPN'>BPN</link>}-${PV}</filename>.
                                     The base recipe name and version but without any special
                                     package name suffix.</para></listitem>
-                                <listitem><para><emphasis>Files -</emphasis> Files beneath the directory in which the recipe
-                                    resides.</para></listitem>
-                                <listitem><para><emphasis>Directory -</emphasis> The directory itself in which the recipe
-                                    resides.</para></listitem>
+                                <listitem><para><emphasis>files -</emphasis> Files within a 
+                                    directory, which is named <filename>files</filename>
+                                    and is also alongside the recipe.
+                                    </para></listitem>
                             </itemizedlist></para></listitem>
                         <listitem><para><emphasis><filename>bzr://</filename> -</emphasis> Fetches files from a
                             Bazaar revision control repository.</para></listitem>
-- 
cgit v1.2.3-54-g00ecf