summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2013-10-04 17:20:02 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-08 15:30:16 (GMT)
commit28bab2eb200f15f54334788f5be0683dc65dcbb7 (patch)
treefbf64cc49a36893127350621750a64aa5afa49bb
parentceb56b7331b5ad035978f450af44184b9cc6c387 (diff)
downloadpoky-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>
-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 d1a5e2f..32a8438 100644
--- a/documentation/dev-manual/dev-manual-newbie.xml
+++ b/documentation/dev-manual/dev-manual-newbie.xml
@@ -688,7 +688,7 @@
688 For example, downloading and unpacking <filename>&YOCTO_POKY_TARBALL;</filename> 688 For example, downloading and unpacking <filename>&YOCTO_POKY_TARBALL;</filename>
689 results in a Source Directory whose top-level folder is named 689 results in a Source Directory whose top-level folder is named
690 <filename>&YOCTO_POKY;</filename>. 690 <filename>&YOCTO_POKY;</filename>.
691 If you create a local copy of the Git repository, then you can name the repository 691 If you create a local copy of the Git repository, you can name the repository
692 anything you like. 692 anything you like.
693 Throughout much of the documentation, <filename>poky</filename> is used as the name of 693 Throughout much of the documentation, <filename>poky</filename> is used as the name of
694 the top-level folder of the local copy of the poky Git repository. 694 the top-level folder of the local copy of the poky Git repository.
@@ -864,8 +864,8 @@
864 It is important to understand that Git tracks content change and not files. 864 It is important to understand that Git tracks content change and not files.
865 Git uses "branches" to organize different development efforts. 865 Git uses "branches" to organize different development efforts.
866 For example, the <filename>poky</filename> repository has 866 For example, the <filename>poky</filename> repository has
867 <filename>bernard</filename>, 867 <filename>denzil</filename>, <filename>danny</filename>,
868 <filename>edison</filename>, <filename>denzil</filename>, <filename>danny</filename> 868 <filename>dylan</filename>, <filename>dora</filename>,
869 and <filename>master</filename> branches among others. 869 and <filename>master</filename> branches among others.
870 You can see all the branches by going to 870 You can see all the branches by going to
871 <ulink url='&YOCTO_GIT_URL;/cgit.cgi/poky/'></ulink> and 871 <ulink url='&YOCTO_GIT_URL;/cgit.cgi/poky/'></ulink> and