aboutsummaryrefslogtreecommitdiffstats
path: root/documentation/dev-manual/dev-manual-newbie.xml
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@crashcourse.ca>2013-11-11 10:42:55 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-03 12:53:07 +0000
commitd054a45127a85b0234d6a3d76a5816c185be99dc (patch)
tree1b6146444c63c81f30f3ea809c4c57bca8593675 /documentation/dev-manual/dev-manual-newbie.xml
parent60e8b44f717b4d28aaa643d66a5a39aa50eb24de (diff)
downloadopenembedded-core-contrib-d054a45127a85b0234d6a3d76a5816c185be99dc.tar.gz
dev-manual: Small number of tweaks to ch 3, development manual.
(From yocto-docs rev: 1980ef906070803fd834b516c4b02adcc7e2bf03) 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/dev-manual-newbie.xml')
-rw-r--r--documentation/dev-manual/dev-manual-newbie.xml16
1 files changed, 8 insertions, 8 deletions
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml
index d10f629a4a..c335fccb21 100644
--- a/documentation/dev-manual/dev-manual-newbie.xml
+++ b/documentation/dev-manual/dev-manual-newbie.xml
@@ -430,7 +430,7 @@
<note>
The recommended method for setting up the Yocto Project
<link linkend='source-directory'>Source Directory</link> and the
- files for supported BSPs (<filename>meta-intel</filename>) is to
+ files for supported BSPs (eg., <filename>meta-intel</filename>) is to
use <link linkend='git'>Git</link> to create a local copy of the
upstream repositories.
</note>
@@ -823,7 +823,8 @@
<title>Git</title>
<para>
- The Yocto Project uses Git, which is a free, open source distributed version control system.
+ The Yocto Project makes extensive use of Git,
+ which is a free, open source distributed version control system.
Git supports distributed development, non-linear development, and can handle large projects.
It is best that you have some fundamental understanding of how Git tracks projects and
how to work with Git if you are going to use the Yocto Project for development.
@@ -927,7 +928,7 @@
local working branch based on a branch name,
your local environment matches the "tip" of that development branch
at the time you created your local branch, which could be
- different than the files at the time of a similarly named release.
+ different from the files at the time of a similarly named release.
In other words, creating and checking out a local branch based on the
<filename>&DISTRO_NAME;</filename> branch name is not the same as
cloning and checking out the <filename>master</filename> branch.
@@ -1020,7 +1021,7 @@
will allow the change, and for ultimately pushing the change from your local Git repository
into the project’s upstream (or master) repository.</para></listitem>
<listitem><para><emphasis><filename>git status</filename>:</emphasis> Reports any modified files that
- possibly need staged and committed.</para></listitem>
+ possibly need to be staged and committed.</para></listitem>
<listitem><para><emphasis><filename>git checkout &lt;branch-name&gt;</filename>:</emphasis> Changes
your working branch.
This command is analogous to "cd".</para></listitem>
@@ -1297,10 +1298,9 @@
<listitem><para><emphasis>Board Support Package (BSP) README Files:</emphasis>
For BSP maintainers of supported BSPs, you can examine
individual BSP <filename>README</filename> files.
- Alternatively, you can examine the
- <filename>MAINTAINERS</filename> file, which is found in the
- <filename>meta-intel</filename>, for a list of all supported
- BSP maintainers.
+ In addition, some layers (such as the <filename>meta-intel</filename> layer),
+ include a <filename>MAINTAINERS</filename> file which contains
+ a list of all supported BSP maintainers for that layer.
</para></listitem>
<listitem><para><emphasis>Search by File:</emphasis>
Using <link linkend='git'>Git</link>, you can enter the