summaryrefslogtreecommitdiffstats
path: root/documentation/dev-manual
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
parent60e8b44f717b4d28aaa643d66a5a39aa50eb24de (diff)
downloadpoky-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')
-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 @@
430 <note> 430 <note>
431 The recommended method for setting up the Yocto Project 431 The recommended method for setting up the Yocto Project
432 <link linkend='source-directory'>Source Directory</link> and the 432 <link linkend='source-directory'>Source Directory</link> and the
433 files for supported BSPs (<filename>meta-intel</filename>) is to 433 files for supported BSPs (eg., <filename>meta-intel</filename>) is to
434 use <link linkend='git'>Git</link> to create a local copy of the 434 use <link linkend='git'>Git</link> to create a local copy of the
435 upstream repositories. 435 upstream repositories.
436 </note> 436 </note>
@@ -823,7 +823,8 @@
823 <title>Git</title> 823 <title>Git</title>
824 824
825 <para> 825 <para>
826 The Yocto Project uses Git, which is a free, open source distributed version control system. 826 The Yocto Project makes extensive use of Git,
827 which is a free, open source distributed version control system.
827 Git supports distributed development, non-linear development, and can handle large projects. 828 Git supports distributed development, non-linear development, and can handle large projects.
828 It is best that you have some fundamental understanding of how Git tracks projects and 829 It is best that you have some fundamental understanding of how Git tracks projects and
829 how to work with Git if you are going to use the Yocto Project for development. 830 how to work with Git if you are going to use the Yocto Project for development.
@@ -927,7 +928,7 @@
927 local working branch based on a branch name, 928 local working branch based on a branch name,
928 your local environment matches the "tip" of that development branch 929 your local environment matches the "tip" of that development branch
929 at the time you created your local branch, which could be 930 at the time you created your local branch, which could be
930 different than the files at the time of a similarly named release. 931 different from the files at the time of a similarly named release.
931 In other words, creating and checking out a local branch based on the 932 In other words, creating and checking out a local branch based on the
932 <filename>&DISTRO_NAME;</filename> branch name is not the same as 933 <filename>&DISTRO_NAME;</filename> branch name is not the same as
933 cloning and checking out the <filename>master</filename> branch. 934 cloning and checking out the <filename>master</filename> branch.
@@ -1020,7 +1021,7 @@
1020 will allow the change, and for ultimately pushing the change from your local Git repository 1021 will allow the change, and for ultimately pushing the change from your local Git repository
1021 into the project’s upstream (or master) repository.</para></listitem> 1022 into the project’s upstream (or master) repository.</para></listitem>
1022 <listitem><para><emphasis><filename>git status</filename>:</emphasis> Reports any modified files that 1023 <listitem><para><emphasis><filename>git status</filename>:</emphasis> Reports any modified files that
1023 possibly need staged and committed.</para></listitem> 1024 possibly need to be staged and committed.</para></listitem>
1024 <listitem><para><emphasis><filename>git checkout &lt;branch-name&gt;</filename>:</emphasis> Changes 1025 <listitem><para><emphasis><filename>git checkout &lt;branch-name&gt;</filename>:</emphasis> Changes
1025 your working branch. 1026 your working branch.
1026 This command is analogous to "cd".</para></listitem> 1027 This command is analogous to "cd".</para></listitem>
@@ -1297,10 +1298,9 @@
1297 <listitem><para><emphasis>Board Support Package (BSP) README Files:</emphasis> 1298 <listitem><para><emphasis>Board Support Package (BSP) README Files:</emphasis>
1298 For BSP maintainers of supported BSPs, you can examine 1299 For BSP maintainers of supported BSPs, you can examine
1299 individual BSP <filename>README</filename> files. 1300 individual BSP <filename>README</filename> files.
1300 Alternatively, you can examine the 1301 In addition, some layers (such as the <filename>meta-intel</filename> layer),
1301 <filename>MAINTAINERS</filename> file, which is found in the 1302 include a <filename>MAINTAINERS</filename> file which contains
1302 <filename>meta-intel</filename>, for a list of all supported 1303 a list of all supported BSP maintainers for that layer.
1303 BSP maintainers.
1304 </para></listitem> 1304 </para></listitem>
1305 <listitem><para><emphasis>Search by File:</emphasis> 1305 <listitem><para><emphasis>Search by File:</emphasis>
1306 Using <link linkend='git'>Git</link>, you can enter the 1306 Using <link linkend='git'>Git</link>, you can enter the