summaryrefslogtreecommitdiffstats
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:33 +0100
commit27471119e0f7971f213be94bc883a3a5eae5d548 (patch)
treee5495669f902c9f2076a0bfa5646f5e5fd9bba89
parent031aba2f4e98002e34703d61d225c8d22eccbe8b (diff)
downloadpoky-27471119e0f7971f213be94bc883a3a5eae5d548.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: b6e27d06df58a43bb767e9616ccf3c0711e83cf6) 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.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 c8b7b565ea..71c142e205 100644
--- a/documentation/dev-manual/dev-manual-newbie.xml
+++ b/documentation/dev-manual/dev-manual-newbie.xml
@@ -982,10 +982,10 @@
982 not files. 982 not files.
983 Git uses "branches" to organize different development efforts. 983 Git uses "branches" to organize different development efforts.
984 For example, the <filename>poky</filename> repository has 984 For example, the <filename>poky</filename> repository has
985 <filename>denzil</filename>, <filename>danny</filename>, 985 several branches that include the current
986 <filename>dylan</filename>, <filename>dora</filename>, 986 <filename>&DISTRO_NAME;</filename> branch, the
987 <filename>daisy</filename>, and <filename>master</filename> branches 987 <filename>master</filename> branch, and many branches for past
988 among others. 988 Yocto Project releases.
989 You can see all the branches by going to 989 You can see all the branches by going to
990 <ulink url='&YOCTO_GIT_URL;/cgit.cgi/poky/'></ulink> and 990 <ulink url='&YOCTO_GIT_URL;/cgit.cgi/poky/'></ulink> and
991 clicking on the 991 clicking on the