From 85673e5466804f6918be72b3b27328783b5ac5c9 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Mon, 2 Jul 2012 09:59:11 -0700
Subject: documentation/dev-manual: Scrub for Yocto Project term

I have replaced the term "Yocto Project" with more appropriate terms
where possible.

(From yocto-docs rev: 622ef9a2b4897ecd151b641b43d7706ab673c989)

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

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

diff --git a/documentation/dev-manual/dev-manual-intro.xml b/documentation/dev-manual/dev-manual-intro.xml
index fd35e283c2..7caa6eb720 100644
--- a/documentation/dev-manual/dev-manual-intro.xml
+++ b/documentation/dev-manual/dev-manual-intro.xml
@@ -18,7 +18,8 @@
             sources where you can find more detail.
             For example, detailed information on Git, repositories and open source in general
             can be found in many places.  
-            Another example is how to get set up to use the Yocto Project, which our Yocto Project Quick Start covers.
+            Another example is how to get set up to use the Yocto Project, which our Yocto Project 
+            Quick Start covers.
         </para>
 
         <para>  
@@ -44,13 +45,7 @@
                     applications.</para></listitem>
                 <listitem><para>An overview and understanding of the emulation environment used with 
                     the Yocto Project (QEMU).</para></listitem>
-<!--                <listitem><para>A discussion of target-level analysis techniques, tools, tips, 
-                    and tricks.</para></listitem>
-                <listitem><para>Considerations for deploying your final product.</para></listitem> -->
-                <listitem><para>An understanding of basic kernel architecture and 
-                    concepts.</para></listitem>
-<!--                <listitem><para>Information that will help you migrate an existing project to the 
-                    Yocto Project development environment.</para></listitem> -->
+                <listitem><para>An understanding of basic kernel architecture and concepts.</para></listitem>
                 <listitem><para>Many references to other sources of related information.</para></listitem>
             </itemizedlist>
         </para>
@@ -97,7 +92,7 @@
                 <listitem><para><emphasis> 
                     <ulink url='&YOCTO_DOCS_REF_URL;'>
                     The Yocto Project Reference Manual</ulink>:</emphasis> This manual is a reference 
-                    guide to the Yocto Project build component known as "Poky."  
+                    guide to the OpenEmbedded build system known as "Poky."  
                     The manual also contains a reference chapter on Board Support Package (BSP) 
                     layout.</para></listitem>
                 <listitem><para><emphasis>
@@ -117,7 +112,7 @@
                     some work flow examples.</para></listitem>
                 <listitem><para><emphasis>
                     <ulink url='http://www.youtube.com/watch?v=3ZlOu-gLsh0'>
-                    Yocto Eclipse Plug-in</ulink>:</emphasis> A step-by-step instructional video that
+                    Eclipse IDE Yocto Plug-in</ulink>:</emphasis> A step-by-step instructional video that
                     demonstrates how an application developer uses Yocto Plug-in features within 
                     the Eclipse IDE.</para></listitem>
                 <listitem><para><emphasis>
@@ -158,22 +153,26 @@
                 <listitem><para><emphasis>Internet Relay Chat (IRC):</emphasis>
                     Two IRC channels on freenode are available 
                     for Yocto Project and Poky discussions: <filename>#yocto</filename> and 
-                    <filename>#poky</filename>.</para></listitem>
+                    <filename>#poky</filename>, respectively.</para></listitem>
                 <listitem><para><emphasis>
                     <ulink url='&OH_HOME_URL;'>OpenedHand</ulink>:</emphasis>
-                    The company where the Yocto Project build system Poky was first developed.
-                    OpenedHand has since been acquired by Intel Corporation.</para></listitem>
+                    The company that initially developed the Poky project, which is the basis
+                    for the OpenEmbedded build system used by the Yocto Project.
+                    OpenedHand was acquired by Intel Corporation in 2008.</para></listitem>
                 <listitem><para><emphasis>
                     <ulink url='http://www.intel.com/'>Intel Corporation</ulink>:</emphasis>
-                    The company that acquired OpenedHand in 2008 and continues development on the 
-                    Yocto Project.</para></listitem>
+                    A multinational semiconductor chip manufacturer company whose Software and 
+                    Services Group created and supports the Yocto Project.
+                    Intel acquired OpenedHand in 2008.</para></listitem>
                 <listitem><para><emphasis>
                     <ulink url='&OE_HOME_URL;'>OpenEmbedded</ulink>:</emphasis>
-                    The upstream, generic, embedded distribution the Yocto Project build system (Poky) derives
-                    from and to which it contributes.</para></listitem>
+                    The build system used by the Yocto Project. 
+                    This project is the upstream, generic, embedded distribution from which the Yocto 
+                    Project derives its build system (Poky) from and to which it contributes.</para></listitem>
                 <listitem><para><emphasis>
                     <ulink url='http://developer.berlios.de/projects/bitbake/'>
-                    BitBake</ulink>:</emphasis> The tool used to process Yocto Project metadata.</para></listitem>
+                    BitBake</ulink>:</emphasis> The tool used by the OpenEmbedded build systm 
+                    to process project metadata.</para></listitem>
                 <listitem><para><emphasis>
                     <ulink url='http://bitbake.berlios.de/manual/'>
                     BitBake User Manual</ulink>:</emphasis> A comprehensive guide to the BitBake tool.
-- 
cgit v1.2.3-54-g00ecf