summaryrefslogtreecommitdiff
path: root/documentation
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2010-12-03 08:32:23 -0800
committerSaul Wold <Saul.Wold@intel.com>2010-12-10 22:01:28 -0800
commitbe622ae87e581762452cf7c18ff780c935bf53a2 (patch)
treeea9b1f559bf274123b977b6ca8e812cd349a3d1e /documentation
parent579b5c2947c57eef3bc379272ceec6f95f980736 (diff)
downloadopenembedded-core-be622ae87e581762452cf7c18ff780c935bf53a2.tar.gz
openembedded-core-be622ae87e581762452cf7c18ff780c935bf53a2.tar.bz2
openembedded-core-be622ae87e581762452cf7c18ff780c935bf53a2.tar.xz
openembedded-core-be622ae87e581762452cf7c18ff780c935bf53a2.zip
documentation/kernel-manual/kernel-concepts.xml: Re-worded a note to state best practices for organizing shared features.
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Diffstat (limited to 'documentation')
-rw-r--r--documentation/kernel-manual/kernel-concepts.xml8
1 files changed, 5 insertions, 3 deletions
diff --git a/documentation/kernel-manual/kernel-concepts.xml b/documentation/kernel-manual/kernel-concepts.xml
index d2ebab010..f26e2903e 100644
--- 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.