1 files changed, 21 insertions, 6 deletions
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml
index 77c14a6611..1245345cc4 100644
--- a/documentation/dev-manual/dev-manual-newbie.xml
+++ b/documentation/dev-manual/dev-manual-newbie.xml
@@ -431,12 +431,27 @@
        <filename>poky</filename> repository or any supported BSP tarballs.
        Unpacking these tarballs gives you a snapshot of the released
        files.
-        <note>
+        <note><title>Notes</title>
-            The recommended method for setting up the Yocto Project
+            <itemizedlist>
-            <link linkend='source-directory'>Source Directory</link> and the
+                <listitem><para>
-            files for supported BSPs (e.g., <filename>meta-intel</filename>) is to
+                    The recommended method for setting up the Yocto Project
-            use <link linkend='git'>Git</link> to create a local copy of the
+                    <link linkend='source-directory'>Source Directory</link>
-            upstream repositories.
+                    and the files for supported BSPs
+                    (e.g., <filename>meta-intel</filename>) is to use
+                    <link linkend='git'>Git</link> to create a local copy of
+                    the upstream repositories.
+                    </para></listitem>
+                <listitem><para>
+                    Be sure to always work in matching branches for both
+                    the <filename>meta-intel</filename> repository and the
+                    <link linkend='source-directory'>Source Directory</link>
+                    (i.e. <filename>poky</filename>) repository.
+                    For example, if you have checked out the "master" branch
+                    of <filename>poky</filename> and you are going to use
+                    <filename>meta-intel</filename>, be sure to checkout the
+                    "master" branch of <filename>meta-intel</filename>.
+                    </para></listitem>
+            </itemizedlist>
        </note>
    </para>

diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml index 77c14a6611..1245345cc4 100644 --- a/documentation/dev-manual/dev-manual-newbie.xml +++ b/documentation/dev-manual/dev-manual-newbie.xml
@@ -431,12 +431,27 @@
431	<filename>poky</filename> repository or any supported BSP tarballs.	431	<filename>poky</filename> repository or any supported BSP tarballs.
432	Unpacking these tarballs gives you a snapshot of the released	432	Unpacking these tarballs gives you a snapshot of the released
433	files.	433	files.
434	<note>	434	<note><title>Notes</title>
435	The recommended method for setting up the Yocto Project	435	<itemizedlist>
436	<link linkend='source-directory'>Source Directory</link> and the	436	<listitem><para>
437	files for supported BSPs (e.g., <filename>meta-intel</filename>) is to	437	The recommended method for setting up the Yocto Project
438	use <link linkend='git'>Git</link> to create a local copy of the	438	<link linkend='source-directory'>Source Directory</link>
439	upstream repositories.	439	and the files for supported BSPs
		440	(e.g., <filename>meta-intel</filename>) is to use
		441	<link linkend='git'>Git</link> to create a local copy of
		442	the upstream repositories.
		443	</para></listitem>
		444	<listitem><para>
		445	Be sure to always work in matching branches for both
		446	the <filename>meta-intel</filename> repository and the
		447	<link linkend='source-directory'>Source Directory</link>
		448	(i.e. <filename>poky</filename>) repository.
		449	For example, if you have checked out the "master" branch
		450	of <filename>poky</filename> and you are going to use
		451	<filename>meta-intel</filename>, be sure to checkout the
		452	"master" branch of <filename>meta-intel</filename>.
		453	</para></listitem>
		454	</itemizedlist>
440	</note>	455	</note>
441	</para>	456	</para>
442		457