documentation/kernel-manual/kernel-concepts.xml: Re-worded a note to state best...

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>

diff --git a/documentation/kernel-manual/kernel-concepts.xml b/documentation/kernel-manual/kernel-concepts.xml
index d2ebab01017e3a15e80b66b5ad391aeb0ab346a0..f26e2903eb883dbbf5f7ba7964f13dc2d2a1bb76 100644 (file)
--- a/documentation/kernel-manual/kernel-concepts.xml
+++ b/documentation/kernel-manual/kernel-concepts.xml
@@ -230,9 +230,11 @@
                 in question.
             </para>
             <note><para>
-                This practice is not typically encouraged.
-                However, during development cycles or when large features are merged the practice
-                can't be avoided.
+                The Yocto Project team strives to place features in the tree such that they can be 
+                shared by all boards and kernel types where possible.
+                However, during development cycles or when large features are merged this practice 
+                cannot always be followed. 
+                In those cases isolated branches are used for feature merging.
             </para></note>
             <para>
                 BSP-specific code additions are handled in a similar manner to kernel-specific additions.