documentation/dev-manual/dev-manual-newbie.xml: edits suggested by Dave Stewart.

(From yocto-docs rev: c6924422778b525dfe63f5e9a121c92317c3ea25)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 11 insertions, 5 deletions

diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml
index a1652018df..8bed817926 100644
--- a/documentation/dev-manual/dev-manual-newbie.xml
+++ b/documentation/dev-manual/dev-manual-newbie.xml
@@ -132,9 +132,10 @@
         environment might find helpful.
         Some terms are universal but are included here just in case:
     <itemizedlist>
-        <listitem><para><emphasis>Image</emphasis> - An image is a collection of recipes created with 
-            Bitbake (baked).  
-            Images run on specific hardware and use cases.</para></listitem>
+        <listitem><para><emphasis>Image</emphasis> - An image is a complete executable file that 
+            runs on specific hardware or in the QEMU emulator.
+            Images are collections of recipes created with the Bitbake tool in the Yocto Project
+            development environment.</para></listitem>
         <listitem><para><emphasis>Recipe</emphasis> - A set of instructions for building packages.  
             A recipe describes where you get source code and which patches to apply.
             Recipes describe dependencies for libraries or for other recipes and they 
@@ -177,6 +178,11 @@
             extension.</para></listitem>
         <listitem><para><emphasis>Common OE-Core</emphasis> - A core set of metadata originating 
             with OpenEmbedded (OE) that is shared between OE and the Yocto Project.</para></listitem>
+        <listitem><para><emphasis>Up-stream</emphasis> - A reference to source code or repositories
+            that are not local to the development system but located in a master area that is controlled
+            by the maintainer of the source code.
+            For example, in order for a developer to work on a particular piece of code they need to 
+            first get a copy of it from an "up-stream" source.</para></listitem>
     </itemizedlist>
     </para>
 </section>
@@ -244,7 +250,7 @@
     <title>Git</title>
 
     <para>
-        The Yocto Project uses Git, which is a free, open source distributed version control.  
+        The Yocto Project uses Git, which is a free, open source distributed version control system.  
         Git supports distributed development, non-linear development, can handle large projects, 
         cryptographic authentication of history, and toolkit design.  
         It is best that you know how to work with Git if you are going to use Yocto Project for development.  
@@ -275,7 +281,7 @@
     </para>
 
     <para>
-        If you don’t know much about Git it is strongly suggested that you educate            
+        If you don’t know much about Git, we suggest you educate            
         yourself by visiting the links previously mentioned.
     </para>