1 files changed, 27 insertions, 40 deletions

diff --git a/documentation/kernel-manual/kernel-concepts.xml b/documentation/kernel-manual/kernel-concepts.xml
index 54d75f6c16..fce6bfbffe 100644
--- a/documentation/kernel-manual/kernel-concepts.xml
+++ b/documentation/kernel-manual/kernel-concepts.xml
@@ -9,10 +9,10 @@
 <section id='concepts-org'>
     <title>Introduction</title>
     <para>
-        This chapter provides conceptual information about the Yocto Project kernel:
+        This chapter provides conceptual information about the kernel:
         <itemizedlist>
             <listitem><para>Kernel Goals</para></listitem>
-            <listitem><para>Yocto Project Kernel Development and Maintenance Overview</para></listitem>
+            <listitem><para>Kernel Development and Maintenance Overview</para></listitem>
             <listitem><para>Kernel Architecture</para></listitem>
             <listitem><para>Kernel Tools</para></listitem>
         </itemizedlist>
@@ -25,8 +25,8 @@
             The complexity of embedded kernel design has increased dramatically. 
             Whether it is managing multiple implementations of a particular feature or tuning and
             optimizing board specific features, flexibility and maintainability are key concerns. 
-            The Yocto Project Linux kernel is presented with the embedded
-            developer's needs in mind and has evolved to assist in these key concerns. 
+            The Linux kernels available through the Yocto Project are presented with the embedded
+            developer's needs in mind and have evolved to assist in these key concerns. 
             For example, prior methods such as applying hundreds of patches to an extracted
             tarball have been replaced with proven techniques that allow easy inspection,
             bisection and analysis of changes. 
@@ -34,7 +34,7 @@
             collaboration with the thousands of upstream development projects.
         </para>
         <para>
-            With all these considerations in mind, the Yocto Project kernel and development team
+            With all these considerations in mind, the Yocto Project's kernel and development team
             strives to attain these goals:
         <itemizedlist>
             <listitem><para>Allow the end user to leverage community best practices to seamlessly 
@@ -63,12 +63,12 @@
     <section id='kernel-big-picture'>
         <title>Yocto Project Kernel Development and Maintenance Overview</title>
         <para>
-            The Yocto Project kernel, like other kernels, is based off the Linux kernel release
-            from <ulink url='http://www.kernel.org'></ulink>.  
+            Kernels available through the Yocto Project, like other kernels, are based off the Linux 
+            kernel releases from <ulink url='http://www.kernel.org'></ulink>.  
             At the beginning of a major development cycle, the Yocto Project team
-            chooses its Yocto Project kernel 
-            based on factors like release timing, the anticipated release timing of final
-            upstream <filename>kernel.org</filename> versions, and Yocto Project feature requirements.
+            chooses its kernel based on factors such as release timing, the anticipated release 
+            timing of final upstream <filename>kernel.org</filename> versions, and Yocto Project 
+            feature requirements.
             Typically, the kernel chosen is in the
             final stages of development by the community.
             In other words, the kernel is in the release
@@ -80,21 +80,21 @@
         <para>
             This balance allows the team to deliver the most up-to-date kernel
             as possible, while still ensuring that the team has a stable official release for
-            the baseline kernel version.
+            the baseline Linux kernel version.
         </para>
         <para>
-            The ultimate source for the Yocto Project kernel is a released kernel 
+            The ultimate source for kernels available through the Yocto Project are released kernels 
             from <filename>kernel.org</filename>.
-            In addition to a foundational kernel from <filename>kernel.org</filename>, the released 
-            Yocto Project kernel contains a mix of important new mainline
+            In addition to a foundational kernel from <filename>kernel.org</filename>, the  
+            kernels available through the contain a mix of important new mainline
             developments, non-mainline developments (when there is no alternative),
             Board Support Package (BSP) developments,
             and custom features.
-            These additions result in a commercially released Yocto Project kernel that caters 
+            These additions result in a commercially released Yocto Project Linux kernel that caters 
             to specific embedded designer needs for targeted hardware.
         </para>
         <para>
-            Once a Yocto Project kernel is officially released, the Yocto Project team goes into 
+            Once a kernel is officially released, the Yocto Project team goes into 
             their next development cycle, or upward revision (uprev) cycle, while still 
             continuing maintenance on the released kernel.
             It is important to note that the most sustainable and stable way
@@ -127,8 +127,8 @@
             These policies result in both a stable and a cutting
             edge kernel that mixes forward ports of existing features and significant and critical 
             new functionality. 
-            Forward porting functionality in the Yocto Project kernel can be thought of as a
-            "micro uprev."
+            Forward porting functionality in the kernels available through the Yocto Project kernel 
+            can be thought of as a "micro uprev."
             The many “micro uprevs” produce a kernel version with a mix of 
             important new mainline, non-mainline, BSP developments and feature integrations. 
             This kernel gives insight into new features and allows focused
@@ -142,7 +142,8 @@
     <section id='kernel-architecture'>
         <title>Kernel Architecture</title>
         <para>
-            This section describes the architecture of the Yocto Project kernel and provides information
+            This section describes the architecture of the kernels available through the 
+            Yocto Project and provides information
             on the mechanisms used to achieve that architecture.
         </para>
         
@@ -156,7 +157,7 @@
                 upstream <filename>kernel.org</filename>.
             </para>
             <para>
-                You can think of the Yocto Project kernel as consisting of a baseline kernel with
+                You can think of a Yocto Project kernel as consisting of a baseline Linux kernel with
                 added features logically structured on top of the baseline.
                 The features are tagged and organized by way of a branching strategy implemented by the 
                 source code manager (SCM) Git.
@@ -305,9 +306,9 @@
     <section id='kernel-configuration'>
         <title>Kernel Configuration</title>
         <para>
-            Kernel configuration, along with kernel features, defines how a Linux Yocto
-            kernel image is built. 
-            Through configuration settings, you can customize a Linux Yocto kernel to be
+            Kernel configuration, along with kernel features, defines how a kernel
+            image is built for the Yocto Project. 
+            Through configuration settings, you can customize a Yocto Project kernel to be
             specific to particular hardware.
             For example, you can specify sound support or networking support.
             This section describes basic concepts behind Kernel configuration within the 
@@ -316,9 +317,9 @@
         </para>
 
         <para>
-            Conceptually, Linux Yocto kernel configuration occurs similarly to that needed for any
+            Conceptually, configuration of a Yocto Project kernel occurs similarly to that needed for any
             Linux kernel.
-            The Linux Yocto kernel build process uses a <filename>.config</filename> file, which 
+            The build process for a Yocto Project kernel uses a <filename>.config</filename> file, which 
             is created through the Linux Kernel Coinfiguration (LKC) tool.
             You can directly set various configurations in the 
             <filename>.config</filename> file by using the <filename>menuconfig</filename> 
@@ -352,7 +353,7 @@
                     list of kernel options just as they would appear syntactically in the 
                     <filename>.config</filename> file.
                     Configuration fragments are typically logical groupings and are assembled
-                    by the Yocto Project build system to produce input used by the LKC
+                    by the OpenEmbedded build system to produce input used by the LKC
                     that ultimately generates the <filename>.config</filename> file.</para>
                     <para>The 
                     <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-KERNEL_FEATURES'>KERNEL_FEATURES</ulink></filename>
@@ -384,20 +385,6 @@
                     with the <filename>kernel.org</filename> history and development.</para></listitem>
             </itemizedlist>
         </para>
-<!--<para>
-WRITER NOTE: Put this in for post 1.1 if possible:
-
-The tools that construct a kernel tree will be discussed later in this 
-document. The following tools form the foundation of the Yocto Project 
-kernel toolkit:
-<itemizedlist>
-    <listitem><para>git  : distributed revision control system created by Linus Torvalds</para></listitem>
-    <listitem><para>guilt: quilt on top of git</para></listitem>
-    <listitem><para>*cfg : kernel configuration management and classification</para></listitem>
-    <listitem><para>kgit*: Yocto Project kernel tree creation and management tools</para></listitem>
-    <listitem><para>scc  : series &amp; configuration compiler</para></listitem>
-</itemizedlist>
-</para> -->
     </section> 
 </chapter>
 <!--