aboutsummaryrefslogtreecommitdiffstats
path: root/documentation/dev-manual/dev-manual-newbie.xml
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2013-10-04 10:20:02 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-08 16:30:16 +0100
commit28bab2eb200f15f54334788f5be0683dc65dcbb7 (patch)
treefbf64cc49a36893127350621750a64aa5afa49bb /documentation/dev-manual/dev-manual-newbie.xml
parentceb56b7331b5ad035978f450af44184b9cc6c387 (diff)
downloadopenembedded-core-contrib-28bab2eb200f15f54334788f5be0683dc65dcbb7.tar.gz
dev-manual: updated the example list of branches for poky.
(From yocto-docs rev: 59723e825049853585469cc10bdd21cd8451a5a1) 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/dev-manual-newbie.xml')
-rw-r--r--documentation/dev-manual/dev-manual-newbie.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml
index d1a5e2fab4..32a843863c 100644
--- a/documentation/dev-manual/dev-manual-newbie.xml
+++ b/documentation/dev-manual/dev-manual-newbie.xml
@@ -688,7 +688,7 @@
For example, downloading and unpacking <filename>&YOCTO_POKY_TARBALL;</filename>
results in a Source Directory whose top-level folder is named
<filename>&YOCTO_POKY;</filename>.
- If you create a local copy of the Git repository, then you can name the repository
+ If you create a local copy of the Git repository, you can name the repository
anything you like.
Throughout much of the documentation, <filename>poky</filename> is used as the name of
the top-level folder of the local copy of the poky Git repository.
@@ -864,8 +864,8 @@
It is important to understand that Git tracks content change and not files.
Git uses "branches" to organize different development efforts.
For example, the <filename>poky</filename> repository has
- <filename>bernard</filename>,
- <filename>edison</filename>, <filename>denzil</filename>, <filename>danny</filename>
+ <filename>denzil</filename>, <filename>danny</filename>,
+ <filename>dylan</filename>, <filename>dora</filename>,
and <filename>master</filename> branches among others.
You can see all the branches by going to
<ulink url='&YOCTO_GIT_URL;/cgit.cgi/poky/'></ulink> and