summaryrefslogtreecommitdiffstats
path: root/documentation/dev-manual/dev-manual-model.xml
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2012-10-10 11:50:13 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-15 14:45:46 +0100
commit1a6bf6e4afc39a0853ad95bcb13cd1d8207ef44e (patch)
treec1a373f3f361b15604d35604a3f01227fae849ef /documentation/dev-manual/dev-manual-model.xml
parent1e4028c5d36f128fd848b0b0516864cc6ea8c1f3 (diff)
downloadpoky-1a6bf6e4afc39a0853ad95bcb13cd1d8207ef44e.tar.gz
documentation: Makefile, dev-manual - edits to patching kernel
Made some general edits to the new "Patching the Kernel" section. Also had to remove a couple of images no longer used in the section from the Makefile "TARFILES" variable. (From yocto-docs rev: ac61e22e2f89926fbbda56fbaa4384c3c5156360) 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-model.xml')
-rw-r--r--documentation/dev-manual/dev-manual-model.xml9
1 files changed, 6 insertions, 3 deletions
diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml
index 9d73f8e4f5..03bb83096e 100644
--- a/documentation/dev-manual/dev-manual-model.xml
+++ b/documentation/dev-manual/dev-manual-model.xml
@@ -1688,7 +1688,8 @@ directory.</para></listitem>
1688 You need to be in the directory that has the temporary source code. 1688 You need to be in the directory that has the temporary source code.
1689 That directory is defined by the 1689 That directory is defined by the
1690 <ulink url='&YOCTO_DOCS_REF_URL;#var-S'>S</ulink> 1690 <ulink url='&YOCTO_DOCS_REF_URL;#var-S'>S</ulink>
1691 variable.</para></listitem> 1691 variable.
1692 For this discussion, assume that directory is <filename>linux</filename>.</para></listitem>
1692 <listitem><para><emphasis>Initialize a Git Repository:</emphasis> 1693 <listitem><para><emphasis>Initialize a Git Repository:</emphasis>
1693 Use the <filename>git init</filename> command to initialize a new local repository 1694 Use the <filename>git init</filename> command to initialize a new local repository
1694 that is based on the work directory: 1695 that is based on the work directory:
@@ -1739,9 +1740,11 @@ directory.</para></listitem>
1739 </literallayout></para></listitem> 1740 </literallayout></para></listitem>
1740 <listitem><para><emphasis>Stage the Modified Files:</emphasis> 1741 <listitem><para><emphasis>Stage the Modified Files:</emphasis>
1741 Use the <filename>git add</filename> command to stage the changed files so they 1742 Use the <filename>git add</filename> command to stage the changed files so they
1742 can be committed as follows: 1743 can be committed as follows.
1744 Again, for this discussion assume the files changed are in the <filename>linux</filename>
1745 directory:
1743 <literallayout class='monospaced'> 1746 <literallayout class='monospaced'>
1744 $ git add file1.c file2.c file3.c 1747 $ git add linux/file1.c linux/file2.c linux/file3.c
1745 </literallayout></para></listitem> 1748 </literallayout></para></listitem>
1746 <listitem><para><emphasis>Commit the Staged Files and View Your Changes:</emphasis> 1749 <listitem><para><emphasis>Commit the Staged Files and View Your Changes:</emphasis>
1747 Use the <filename>git commit</filename> command to commit the changes to the 1750 Use the <filename>git commit</filename> command to commit the changes to the