From bd83f6a66fed8bcca69c9982e9d0a65b870034d2 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Fri, 12 Oct 2012 20:02:43 -0700
Subject: documentation: dev-manual - edits to kernel section and compliance

* Edits to get the patching the kernel section more sane.

* A tweak to the opening sentence of the compliance section to
  rid it of the split-infinitives.

(From yocto-docs rev: 8e2ff293e85a602efd98aceb20da5a2ea5f2a34d)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 documentation/dev-manual/dev-manual-model.xml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'documentation/dev-manual/dev-manual-model.xml')

diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml
index 436ecb6fb7..b61eeb0678 100644
--- a/documentation/dev-manual/dev-manual-model.xml
+++ b/documentation/dev-manual/dev-manual-model.xml
@@ -1688,10 +1688,12 @@ directory.</para></listitem>
                     You need to be in the directory that has the temporary source code.
                     That directory is defined by the 
                     <ulink url='&YOCTO_DOCS_REF_URL;#var-S'>S</ulink>
-                    variable.
-                    For this discussion, assume that directory is <filename>linux</filename>.</para></listitem>
-                <listitem><para><emphasis>Initialize a Git Repository:</emphasis>
-                    Use the <filename>git init</filename> command to initialize a new local repository
+                    variable. 
+                    If you are working with a kernel, you need to be in the 
+                    <filename>${S}/linux</filename> directory.</para></listitem>
+                <listitem><para><emphasis>If needed, initialize a Git Repository:</emphasis>
+                    If you are not already in a Git repository, use the 
+                    <filename>git init</filename> command to initialize a new local repository
                     that is based on the work directory:
                     <literallayout class='monospaced'>
      $ git init
@@ -1730,11 +1732,6 @@ directory.</para></listitem>
                     "<ulink url='&YOCTO_DOCS_QS_URL;#building-image'>Building an Image</ulink>" 
                     section of the Yocto Project Quick Start.
                     </note></para></listitem>
-                <listitem><para><emphasis>Change Your Working Directory:</emphasis>
-                    After making your edits, move back to the directory from which you 
-                    initialized the Git repository.
-                    Returning to this directory ensures you are using the correct branch when 
-                    you go to commit your changes.</para></listitem>
                 <listitem><para><emphasis>See the List of Files You Changed:</emphasis>
                     Use the <filename>git status</filename> command to see what files you have actually edited. 
                     The ability to have Git track the files you have changed is an advantage that this
@@ -1749,7 +1746,7 @@ directory.</para></listitem>
                     Again, for this discussion assume the files changed are in the <filename>linux</filename>
                     directory:
                     <literallayout class='monospaced'>
-     $ git add linux/file1.c linux/file2.c linux/file3.c
+     $ git add &lt;somepath&gt;/file1.c &lt;somepath&gt;/file2.c &lt;somepath&gt;/file3.c
                     </literallayout></para></listitem>
                 <listitem><para><emphasis>Commit the Staged Files and View Your Changes:</emphasis>
                     Use the <filename>git commit</filename> command to commit the changes to the 
-- 
cgit v1.2.3-54-g00ecf