From 0278e3b76076d524761fc2afc82c0cbba498ec55 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Fri, 24 Aug 2012 15:49:09 -0700
Subject: documentation/dev-manual/dev-manual-newbie.xml: Edits to email patch
 section

I updated the section that describes how to submit a patch through
email while not using the scripts that send patches and request
pulls.

(From yocto-docs rev: 9167b89289134d8d16610cc527d0d71713c0641b)

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

diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml
index 3d6ee9c8bc..96d6829d3e 100644
--- a/documentation/dev-manual/dev-manual-newbie.xml
+++ b/documentation/dev-manual/dev-manual-newbie.xml
@@ -1054,8 +1054,12 @@
         <title>Using Email to Submit a Patch</title>
 
         <para>
-            If you have a just few changes, you can commit them and then submit them as an 
-            email to the maintainer.
+            You can submit patches without using the <filename>create-pull-request</filename> and 
+            <filename>send-pull-request</filename> scripts described in the previous section.
+            Keep in mind, the preferred method is to use the scripts, however.
+        </para>
+
+        <para>
             Depending on the components changed, you need to submit the email to a specific
             mailing list.
             For some guidance on which mailing list to use, see the list in the 
@@ -1067,7 +1071,8 @@
         </para>
 
         <para>            
-            Here is the general procedure on how to submit a patch through email:
+            Here is the general procedure on how to submit a patch through email without using the 
+            scripts:
             <itemizedlist>
                 <listitem><para>Make your changes in your local Git repository.</para></listitem>
                 <listitem><para>Stage your changes by using the <filename>git add</filename>
@@ -1105,16 +1110,9 @@
                     For information on the <filename>git format-patch</filename> command, 
                     see <filename>GIT_FORMAT_PATCH(1)</filename> displayed using the  
                     <filename>man git-format-patch</filename> command.</para>
-                    <note>If you have many patches to submit, you might consider using the 
-                    method described in the "<link linkend='pushing-a-change-upstream'>Using Scripts to Push
-                    a change Upstream and Request a Pull</link>" section described 
-                    earlier in the manual.
-                    This method uses the <filename>create-pull-request</filename> and 
-                    <filename>send-pull-request</filename> scripts that automate much of the 
-                    process.
-                    You might also consider requesting a contrib area and the associated rights
-                    needed if you become a regular contributor to either the Yocto Project or 
-                    OpenEmbedded.</note></listitem>
+                    <note>If you are or will be a frequent contributor to the Yocto Project
+                    or to OpenEmbedded, you might consider requesting a contrib area and the 
+                    necessary associated rights.</note></listitem>
                 <listitem><para>Import the files into your mail client by using the 
                     <filename>git send-email</filename> command.
                     <note>In order to use <filename>git send-email</filename>, you must have the 
-- 
cgit v1.2.3-54-g00ecf