summaryrefslogtreecommitdiffstats
path: root/documentation/dev-manual
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2012-02-08 08:29:23 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-08 12:07:53 -0800
commit43e6e25bd5c8909e8f539acc4834f31be13f7483 (patch)
tree9c759fe8290cb8e8086eac556a51e51475e95bda /documentation/dev-manual
parentc74f732576e0f33dbfdf5099ac5021f5ab9ca7a1 (diff)
downloadpoky-43e6e25bd5c8909e8f539acc4834f31be13f7483.tar.gz
documentation/dev-manual/dev-manual-newbie.xml: Edits to Git section
Last edits to the "Git" section and the bulleted item that defines the term "Yocto Project Files." These edits were from a review of Joshua Lock. Reported-by: Joshua Lock <joshua.lock@intel.com> (From yocto-docs rev: 57cbb06aac566e02bb2e2a1ad05c3ff6dbb0359c) 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-newbie.xml6
1 files changed, 4 insertions, 2 deletions
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml
index 727c2ec25b..5ce67ed504 100644
--- a/documentation/dev-manual/dev-manual-newbie.xml
+++ b/documentation/dev-manual/dev-manual-newbie.xml
@@ -225,6 +225,7 @@
225 results in a Yocto Project file structure whose Yocto Project source directory is named 225 results in a Yocto Project file structure whose Yocto Project source directory is named
226 <filename>poky-edison-6.0</filename>. 226 <filename>poky-edison-6.0</filename>.
227 If you create a Git repository, then you can name the repository anything you like. 227 If you create a Git repository, then you can name the repository anything you like.
228 By default, your local Git repository is named <filename>poky</filename>.
228 </para> 229 </para>
229 230
230 <para> 231 <para>
@@ -238,7 +239,8 @@
238 active development repository. 239 active development repository.
239 In this case, any local changes you make to the Yocto Project can be later applied to active 240 In this case, any local changes you make to the Yocto Project can be later applied to active
240 development branches of the upstream Yocto Project Git repository. 241 development branches of the upstream Yocto Project Git repository.
241 Furthermore, with the Git repository you can create a local Git branch that 242 If you want to track a set of local changes while starting from the same point
243 as a release tarball, you can create a local Git branch that
242 reflects the exact copy of the files at the time of their release. 244 reflects the exact copy of the files at the time of their release.
243 You do this using Git tags that are part of the repository. 245 You do this using Git tags that are part of the repository.
244 For more information on concepts, see the section 246 For more information on concepts, see the section
@@ -490,7 +492,7 @@
490 And, the name of the local branch you have created and checked out is 492 And, the name of the local branch you have created and checked out is
491 <filename>edison-6.0</filename>. 493 <filename>edison-6.0</filename>.
492 The files in your repository now exactly match the Yocto Project 1.1 494 The files in your repository now exactly match the Yocto Project 1.1
493 Release (edison). 495 Release tag (edison).
494 It is important to understand that when you create and checkout a local 496 It is important to understand that when you create and checkout a local
495 working branch based on a tag, your environment matches a specific point 497 working branch based on a tag, your environment matches a specific point
496 in time and not a development branch. 498 in time and not a development branch.