summaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2015-04-21 10:24:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-24 11:07:49 +0100
commit854edda7d777d438a31870ac75de441e946580f9 (patch)
treedf0a785d0fa08175bb5cdbd6c277122cdf65e0ca /documentation
parent4aa45aca7a42925104db10bfeb0e04a8d5f28824 (diff)
downloadast2050-yocto-poky-854edda7d777d438a31870ac75de441e946580f9.zip
ast2050-yocto-poky-854edda7d777d438a31870ac75de441e946580f9.tar.gz
dev-manual: Updated branch descriptions for better manual maintenance
The "Repositories, Tags, and Branches" section had some wording that described how branches are maintained in the poky repo that made it hard to maintain in the doc from release to release. I had a list of past releases by name and as such would have to update it every release to make it reflect the last set. Well... this is not the best way to do this and proved out as it slipped through the cracks for the YP 1.8 release. Consequently, I recast the text so it is "release proof". (From yocto-docs rev: 5ed1238f53320a3aa1f00ea04191cacdad5fbe95) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r--documentation/dev-manual/dev-manual-newbie.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml
index c8b7b56..71c142e 100644
--- a/documentation/dev-manual/dev-manual-newbie.xml
+++ b/documentation/dev-manual/dev-manual-newbie.xml
@@ -982,10 +982,10 @@
not files.
Git uses "branches" to organize different development efforts.
For example, the <filename>poky</filename> repository has
- <filename>denzil</filename>, <filename>danny</filename>,
- <filename>dylan</filename>, <filename>dora</filename>,
- <filename>daisy</filename>, and <filename>master</filename> branches
- among others.
+ several branches that include the current
+ <filename>&DISTRO_NAME;</filename> branch, the
+ <filename>master</filename> branch, and many branches for past
+ Yocto Project releases.
You can see all the branches by going to
<ulink url='&YOCTO_GIT_URL;/cgit.cgi/poky/'></ulink> and
clicking on the
OpenPOWER on IntegriCloud