summaryrefslogtreecommitdiffstats
path: root/documentation/dev-manual
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2012-10-01 12:40:38 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 17:41:35 +0100
commit876a87ba1cf52a472a6171fb1c55d5fbd6129bdd (patch)
treef7abee4901c7d445e393e2b4e21734f1cf55c95f /documentation/dev-manual
parent13d147178a8ebb48f0ab6444c19cea5e67be0943 (diff)
downloadast2050-yocto-poky-876a87ba1cf52a472a6171fb1c55d5fbd6129bdd.zip
ast2050-yocto-poky-876a87ba1cf52a472a6171fb1c55d5fbd6129bdd.tar.gz
documentation: dev-manual - branch fix and reference fix.
Fixed the reference to the Downloads page. Also fixed the local branch in the meta-intel example so that it uses the same name as the local branch created for cloning poky. (From yocto-docs rev: edac781b37bce0d0bca6a741186cfa53a512b73e) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/dev-manual')
-rw-r--r--documentation/dev-manual/dev-manual-bsp-appendix.xml11
1 files changed, 6 insertions, 5 deletions
diff --git a/documentation/dev-manual/dev-manual-bsp-appendix.xml b/documentation/dev-manual/dev-manual-bsp-appendix.xml
index 1bb6556..c5a6c92 100644
--- a/documentation/dev-manual/dev-manual-bsp-appendix.xml
+++ b/documentation/dev-manual/dev-manual-bsp-appendix.xml
@@ -162,7 +162,7 @@
</literallayout>
Alternatively, you can start with the downloaded Crown Bay tarball.
You can download the &DISTRO_NAME; version of the BSP tarball from the
- <ulink url='&YOCTO_HOME_URL;/download'>Download</ulink> page of the
+ <ulink url='&YOCTO_HOME_URL;/download'>Downloads</ulink> page of the
Yocto Project website.
Here is the specific link for the tarball needed for this example:
<ulink url='&YOCTO_MACHINES_DL_URL;/crownbay-noemgd/crownbay-noemgd-&DISTRO_NAME;-&POKYVERSION;.tar.bz2'></ulink>.
@@ -183,11 +183,12 @@
skip to the next step.
Because <filename>meta-intel</filename> is its own Git repository, you will want
to be sure you are in the appropriate branch for your work.
- For this example we are going to use the <filename>&DISTRO_NAME;</filename> branch.
+ For this example we are going to use the <filename>&DISTRO_NAME;</filename>
+ branch.
<literallayout class='monospaced'>
- $ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME;
- Branch &DISTRO_NAME; set up to track remote branch &DISTRO_NAME; from origin.
- Switched to a new branch '&DISTRO_NAME;'
+ $ git checkout -b &DISTRO_NAME;-&POKYVERSION; origin/&DISTRO_NAME;
+ Branch &DISTRO_NAME;-&POKYVERSION; set up to track remote branch &DISTRO_NAME; from origin.
+ Switched to a new branch '&DISTRO_NAME;-&POKYVERSION;'
</literallayout>
</para>
</section>
OpenPOWER on IntegriCloud