diff options
author | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2013-04-09 14:31:08 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-10 16:20:56 +0100 |
commit | f1c2fea3f82c4b63a22d280f508dd32559d0cebe (patch) | |
tree | eb4e3520039b18624b2d085ca96945136db90edf | |
parent | 47fda36cec06347dede95f0fb98eb9e2a3576922 (diff) | |
download | ast2050-yocto-poky-f1c2fea3f82c4b63a22d280f508dd32559d0cebe.zip ast2050-yocto-poky-f1c2fea3f82c4b63a22d280f508dd32559d0cebe.tar.gz |
dev-manual: Edits to "Repositories, Tags, and Branches" section.
(From yocto-docs rev: 6ab8d6441d53871b2e0a7163a31b1505a86872b2)
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.xml | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml index d57260f..b42fafd 100644 --- a/documentation/dev-manual/dev-manual-newbie.xml +++ b/documentation/dev-manual/dev-manual-newbie.xml @@ -838,7 +838,7 @@ <title>Repositories, Tags, and Branches</title> <para> - As mentioned earlier in section + As mentioned earlier in the section "<link linkend='yocto-project-repositories'>Yocto Project Source Repositories</link>", the Yocto Project maintains source repositories at <ulink url='&YOCTO_GIT_URL;/cgit.cgi'></ulink>. @@ -851,8 +851,8 @@ within a project (e.g. a new feature or updated documentation). Creating a tree-like structure based on project divergence allows for excellent historical information over the life of a project. - This methodology also allows for an environment in which you can do lots of - local experimentation on a project as you develop changes or new features. + This methodology also allows for an environment from which you can do lots of + local experimentation on projects as you develop changes or new features. </para> <para> @@ -869,8 +869,8 @@ When you clone a Git repository, you end up with an identical copy of the repository on your development system. Once you have a local copy of a repository, you can take steps to develop locally. - For examples on how to clone Git repositories, see the section - "<link linkend='getting-setup'>Getting Set Up</link>" earlier in this manual. + For examples on how to clone Git repositories, see the + "<link linkend='getting-setup'>Getting Set Up</link>" section. </para> <para> @@ -911,13 +911,15 @@ $ cd poky $ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME; </literallayout> - In this example, the name of the top-level directory of your local Yocto Project - Files Git repository is <filename>poky</filename>, - and the name of the local working area (or local branch) you have created and checked - out is <filename>&DISTRO_NAME;</filename>. - The files in your repository now reflect the same files that are in the - <filename>&DISTRO_NAME;</filename> development branch of the Yocto Project's - <filename>poky</filename> repository. + In this example, the name of the top-level directory of your local + <link linkend='source-directory'>Source Directory</link> + is <filename>poky</filename>, + and the name of that local working area (local branch) you just + created and checked out is <filename>&DISTRO_NAME;</filename>. + The files in your local repository now reflect the same files that + are in the <filename>&DISTRO_NAME;</filename> development + branch of the Yocto Project's <filename>poky</filename> + upstream repository. It is important to understand that when you create and checkout a local working branch based on a branch name, your local environment matches the "tip" of that development branch @@ -970,7 +972,7 @@ Release tag (<filename>&DISTRO_NAME;-&POKYVERSION;</filename>). It is important to understand that when you create and checkout a local working branch based on a tag, your environment matches a specific point - in time and not a development branch. + in time and not the entire development branch. </para> </section> |