From f1c2fea3f82c4b63a22d280f508dd32559d0cebe Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Tue, 9 Apr 2013 14:31:08 -0700 Subject: dev-manual: Edits to "Repositories, Tags, and Branches" section. (From yocto-docs rev: 6ab8d6441d53871b2e0a7163a31b1505a86872b2) Signed-off-by: Scott Rifenbark Signed-off-by: Richard Purdie --- documentation/dev-manual/dev-manual-newbie.xml | 28 ++++++++++++++------------ 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'documentation') diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml index d57260f10b..b42fafd770 100644 --- a/documentation/dev-manual/dev-manual-newbie.xml +++ b/documentation/dev-manual/dev-manual-newbie.xml @@ -838,7 +838,7 @@ Repositories, Tags, and Branches - As mentioned earlier in section + As mentioned earlier in the section "Yocto Project Source Repositories", the Yocto Project maintains source repositories at . @@ -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. @@ -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 - "Getting Set Up" earlier in this manual. + For examples on how to clone Git repositories, see the + "Getting Set Up" section. @@ -911,13 +911,15 @@ $ cd poky $ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME; - In this example, the name of the top-level directory of your local Yocto Project - Files Git repository is poky, - and the name of the local working area (or local branch) you have created and checked - out is &DISTRO_NAME;. - The files in your repository now reflect the same files that are in the - &DISTRO_NAME; development branch of the Yocto Project's - poky repository. + In this example, the name of the top-level directory of your local + Source Directory + is poky, + and the name of that local working area (local branch) you just + created and checked out is &DISTRO_NAME;. + The files in your local repository now reflect the same files that + are in the &DISTRO_NAME; development + branch of the Yocto Project's poky + 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 (&DISTRO_NAME;-&POKYVERSION;). 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. -- cgit v1.2.3-54-g00ecf