summaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2010-11-29 09:26:22 -0800
committerSaul Wold <Saul.Wold@intel.com>2010-12-10 22:01:18 -0800
commit14a8edb09c0f0866d211ec4f86fd8c005862a770 (patch)
tree01ea16e55922d339960e4a60e723700b6fd1e266 /documentation
parent15cf572f3e1544084e6855426266c808fcb60bb5 (diff)
downloadpoky-14a8edb09c0f0866d211ec4f86fd8c005862a770.tar.gz
documentation/kernel-manual/kernel-concepts.xml: Updated the text so that the conceptual figure showing the kernel is out.
Feedback indicated by Dave suggested getting rid of this. So I commented out the text around it and modified the reminder text so it did not reference a figure. Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Diffstat (limited to 'documentation')
-rw-r--r--documentation/kernel-manual/kernel-concepts.xml16
1 files changed, 13 insertions, 3 deletions
diff --git a/documentation/kernel-manual/kernel-concepts.xml b/documentation/kernel-manual/kernel-concepts.xml
index b884f138e0..872264c846 100644
--- a/documentation/kernel-manual/kernel-concepts.xml
+++ b/documentation/kernel-manual/kernel-concepts.xml
@@ -78,6 +78,16 @@
78 our baseline kernel version. 78 our baseline kernel version.
79 </para> 79 </para>
80 <para> 80 <para>
81 The ultimate source for the Yocto Project kernel is a released kernel
82 from kernel.org.
83 In addition to a foundational kernel from kernel.org the commercially released
84 Yocto Project kernel contains a mix of important new mainline
85 developments, non-mainline developments, Board Support Package (BSP) developments,
86 and custom features.
87 These additions result in a commercially released Yocto Project kernel that caters
88 to specific embedded designer needs for targeted hardware.
89 </para>
90<!-- <para>
81 The following figure represents the overall place the Yocto Project kernel fills. 91 The following figure represents the overall place the Yocto Project kernel fills.
82 </para> 92 </para>
83 <para> 93 <para>
@@ -92,7 +102,7 @@
92 and custom features. 102 and custom features.
93 These additions result in a commercially released Yocto Project kernel that caters 103 These additions result in a commercially released Yocto Project kernel that caters
94 to specific embedded designer needs for targeted hardware. 104 to specific embedded designer needs for targeted hardware.
95 </para> 105 </para> -->
96 <para> 106 <para>
97 Once a Yocto Project kernel is officially released the Yocto Project team goes into 107 Once a Yocto Project kernel is officially released the Yocto Project team goes into
98 their next development cycle, or "uprev" cycle. 108 their next development cycle, or "uprev" cycle.
@@ -105,8 +115,8 @@
105 possible kernel.org version. 115 possible kernel.org version.
106 The team continually monitors community kernel 116 The team continually monitors community kernel
107 development to look for significant features of interest. 117 development to look for significant features of interest.
108 The illustration depicts this by showing the team looking back to kernel.org for new features, 118<!-- The illustration depicts this by showing the team looking back to kernel.org for new features,
109 BSP features, and significant bug fixes. 119 BSP features, and significant bug fixes. -->
110 The team does consider back-porting large features if they have a significant advantage. 120 The team does consider back-porting large features if they have a significant advantage.
111 User or community demand can also trigger a back-port or creation of new 121 User or community demand can also trigger a back-port or creation of new
112 functionality in the Yocto Project baseline kernel during the uprev cycle. 122 functionality in the Yocto Project baseline kernel during the uprev cycle.