summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--documentation/kernel-manual/kernel-how-to.xml30
-rw-r--r--documentation/kernel-manual/kernel-manual.xml12
2 files changed, 37 insertions, 5 deletions
diff --git a/documentation/kernel-manual/kernel-how-to.xml b/documentation/kernel-manual/kernel-how-to.xml
index e62cfad655..259e8200d7 100644
--- a/documentation/kernel-manual/kernel-how-to.xml
+++ b/documentation/kernel-manual/kernel-how-to.xml
@@ -223,6 +223,14 @@
<para>
This section contains several workflow examples.
+ Many of the examples use Git commands.
+ You can find Git documentation at
+ <ulink url='http://git-scm.com/documentation'></ulink>.
+ You can find a simple overview of using Git with the Yocto Project in the
+ "<ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html#git'>Git</ulink>"
+ section of
+ <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html'>The Yocto
+ Project Development Manual</ulink>.
</para>
<section id='change-inspection-kernel-changes-commits'>
@@ -341,6 +349,19 @@
</para>
<para>
+ This section and its sub-sections, describe general application of Git's
+ <filename>push</filename> and <filename>pull</filename> commands, which are used to
+ get your changes upstream or source your code from an upstream repository.
+ The Yocto Project provides scripts that help you work in a collaborative development
+ environment.
+ For information on these scripts, see the
+ "<ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html#pushing-a-change-upstream'>Pushing a Change Upstream and Requesting a Pull</ulink>" and
+ "<ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html#submitting-a-patch'>Submitting a Patch Through Email</ulink>" sections in
+ <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html'>The
+ Yocto Project Development Manual</ulink>".
+ </para>
+
+ <para>
There are many ways to save kernel modifications.
The technique employed
depends on the destination for the patches:
@@ -615,7 +636,14 @@
<para>
The messages used to commit changes are a large part of these standards.
- Consequently, be sure that the headers for each commit have the required information.
+ Consequently, be sure that the headers for each commit have the required information.
+ For information on how to follow the Yocto Project commit message standards, see the
+ "<ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html#how-to-submit-a-change'>How to Submit a Change</ulink>" section in
+ <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html'>The
+ Yocto Project Development Manual</ulink>".
+ </para>
+
+ <para>
If the initial commits were not properly documented or do not meet those standards,
you can re-base by using the <filename>git rebase -i</filename> command to
manipulate the commits and
diff --git a/documentation/kernel-manual/kernel-manual.xml b/documentation/kernel-manual/kernel-manual.xml
index a4ea8fd205..214892f19c 100644
--- a/documentation/kernel-manual/kernel-manual.xml
+++ b/documentation/kernel-manual/kernel-manual.xml
@@ -31,18 +31,22 @@
<revision>
<revnumber>0.9</revnumber>
<date>24 November 2010</date>
- <revremark>This revision is the initial document draft and corresponds with
- the Yocto Project 0.9 Release.</revremark>
+ <revremark>The initial document draft released with the Yocto Project 0.9 Release.</revremark>
</revision>
<revision>
<revnumber>1.0</revnumber>
<date>6 April 2011</date>
- <revremark>This revision corresponds with the Yocto Project 1.0 Release.</revremark>
+ <revremark>Released with the Yocto Project 1.0 Release.</revremark>
</revision>
<revision>
<revnumber>1.0.1</revnumber>
<date>23 May 2011</date>
- <revremark>Released with Yocto Project 1.0.1 on 23 May 2011.</revremark>
+ <revremark>Released with the Yocto Project 1.0.1 Release.</revremark>
+ </revision>
+ <revision>
+ <revnumber>1.1</revnumber>
+ <date>6 October 2011</date>
+ <revremark>Released with the Yocto Project 1.1 Release.</revremark>
</revision>
</revhistory>