diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index e026cefd8c..8bc27cc207 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -162,7 +162,7 @@
                 to work with BSP layers.
                 Once you have the host set up, you can create the layer
                 as described in the
-                "<link linkend='creating-a-new-bsp-layer-using-the-bitbake-layers-script'>Creating a new BSP Layer Using the yocto-bsp Script</link>"
+                "<link linkend='creating-a-new-bsp-layer-using-the-bitbake-layers-script'>Creating a new BSP Layer Using the <filename>bitbake-layers</filename> Script</link>"
                 section.
                 <note>
                     For structural information on BSPs, see the
@@ -188,7 +188,7 @@
                         "<ulink url='&YOCTO_DOCS_DEV_URL;#cloning-the-poky-repository'>Cloning the <filename>poky</filename> Repository</ulink>"
                         and possibly the
                         "<ulink url='&YOCTO_DOCS_DEV_URL;#checking-out-by-branch-in-poky'>Checking Out by Branch in Poky</ulink>"
-                        and
+                        or
                         "<ulink url='&YOCTO_DOCS_DEV_URL;#checkout-out-by-tag-in-poky'>Checking Out by Tag in Poky</ulink>"
                         sections all in the Yocto Project Development Tasks Manual for
                         information on how to clone the <filename>poky</filename>
@@ -221,17 +221,20 @@
                                 inside the
                                 <ulink url='&YOCTO_DOCS_REF_URL;#source-directory'>Source Directory</ulink>
                                 (e.g. <filename>poky</filename>).
+                                <literallayout class='monospaced'>
+     $ cd /home/<replaceable>you</replaceable>/poky
+                                </literallayout>
                                 </para></listitem>
                             <listitem><para>
                                 <emphasis>Clone the Layer:</emphasis>
                                 <literallayout class='monospaced'>
      $ git clone git://git.yoctoproject.org/meta-intel.git
      Cloning into 'meta-intel'...
-     remote: Counting objects: 14224, done.
-     remote: Compressing objects: 100% (4591/4591), done.
-     remote: Total 14224 (delta 8245), reused 13985 (delta 8006)
-     Receiving objects: 100% (14224/14224), 4.29 MiB | 2.90 MiB/s, done.
-     Resolving deltas: 100% (8245/8245), done.
+     remote: Counting objects: 15585, done.
+     remote: Compressing objects: 100% (5056/5056), done.
+     remote: Total 15585 (delta 9123), reused 15329 (delta 8867)
+     Receiving objects: 100% (15585/15585), 4.51 MiB | 3.19 MiB/s, done.
+     Resolving deltas: 100% (9123/9123), done.
      Checking connectivity... done.
                                 </literallayout>
                                 </para></listitem>
@@ -242,12 +245,19 @@
                                 branch you are using for the Yocto Project release
                                 (e.g. &DISTRO_NAME_NO_CAP;):
                                 <literallayout class='monospaced'>
-     $ git checkout <replaceable>branch_name</replaceable>
+     $ cd meta-intel
+     $ git checkout -b &DISTRO_NAME_NO_CAP; remotes/origin/&DISTRO_NAME_NO_CAP;
+     Branch &DISTRO_NAME_NO_CAP; set up to track remote branch &DISTRO_NAME_NO_CAP; from origin.
+     Switched to a new branch '&DISTRO_NAME_NO_CAP;'
                                 </literallayout>
-                                For an example on how to discover branch names and
-                                checkout on a branch, see the
-                                "<ulink url='&YOCTO_DOCS_DEV_URL;#checking-out-by-branch-in-poky'>Checking Out By Branch in Poky</ulink>"
-                                section in the Yocto Project Development Tasks Manual.
+                                <note>
+                                    To see the available branch names in a cloned repository,
+                                    use the <filename>git branch -al</filename> command.
+                                    See the
+                                    "<ulink url='&YOCTO_DOCS_DEV_URL;#checking-out-by-branch-in-poky'>Checking Out By Branch in Poky</ulink>"
+                                    section in the Yocto Project Development Tasks
+                                    Manual for more information.
+                                </note>
                                 </para></listitem>
                         </orderedlist>
                         </para></listitem>
@@ -261,16 +271,16 @@
                         <filename>meta-intel</filename> layer except for the layer's
                         name.
                         For example, if you determine that your hardware most
-                        closely matches the <filename>meta-minnow</filename>,
+                        closely matches the <filename>meta-raspberrypi</filename>,
                         clone that layer:
                         <literallayout class='monospaced'>
-     $ git clone git://git.yoctoproject.org/meta-minnow
-     Cloning into 'meta-minnow'...
-     remote: Counting objects: 456, done.
-     remote: Compressing objects: 100% (283/283), done.
-     remote: Total 456 (delta 163), reused 384 (delta 91)
-     Receiving objects: 100% (456/456), 96.74 KiB | 0 bytes/s, done.
-     Resolving deltas: 100% (163/163), done.
+     $ git clone git://git.yoctoproject.org/meta-raspberrypi
+     Cloning into 'meta-raspberrypi'...
+     remote: Counting objects: 4743, done.
+     remote: Compressing objects: 100% (2185/2185), done.
+     remote: Total 4743 (delta 2447), reused 4496 (delta 2258)
+     Receiving objects: 100% (4743/4743), 1.18 MiB | 0 bytes/s, done.
+     Resolving deltas: 100% (2447/2447), done.
      Checking connectivity... done.
                         </literallayout>
                         </para></listitem>