diff options
author | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2011-07-14 07:46:18 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-21 10:59:20 +0100 |
commit | 6c70216f554bfbc04acf6a9f9f0cacaa955188b6 (patch) | |
tree | c1942cf08ec6f7d90d450c9038bc704e6bae0948 /documentation/kernel-manual | |
parent | 7dbabd85ea4e4ebc52a8e2b72960238c1bdaf684 (diff) | |
download | poky-6c70216f554bfbc04acf6a9f9f0cacaa955188b6.tar.gz |
documentation/kernel-manual/kernel-concepts.xml: Changed git to Git as needed (From yocto-docs rev: 3e4f2e32c0b98ccbc1eaa370832c0147f1a48045)
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/kernel-manual')
-rw-r--r-- | documentation/kernel-manual/kernel-concepts.xml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/documentation/kernel-manual/kernel-concepts.xml b/documentation/kernel-manual/kernel-concepts.xml index f26e2903eb..263e66a307 100644 --- a/documentation/kernel-manual/kernel-concepts.xml +++ b/documentation/kernel-manual/kernel-concepts.xml | |||
@@ -46,11 +46,11 @@ | |||
46 | the baseline kernel is the most stable official release.</para></listitem> | 46 | the baseline kernel is the most stable official release.</para></listitem> |
47 | <listitem><para>Include major technological features as part of Yocto Project's up-rev | 47 | <listitem><para>Include major technological features as part of Yocto Project's up-rev |
48 | strategy.</para></listitem> | 48 | strategy.</para></listitem> |
49 | <listitem><para>Present a git tree, that just like the upstream kernel.org tree, has a | 49 | <listitem><para>Present a Git tree, that just like the upstream kernel.org tree, has a |
50 | clear and continuous history.</para></listitem> | 50 | clear and continuous history.</para></listitem> |
51 | <listitem><para>Deliver a key set of supported kernel types, where each type is tailored | 51 | <listitem><para>Deliver a key set of supported kernel types, where each type is tailored |
52 | to a specific use case (i.g. networking, consumer, devices, and so forth).</para></listitem> | 52 | to a specific use case (i.g. networking, consumer, devices, and so forth).</para></listitem> |
53 | <listitem><para>Employ a git branching strategy that from a customer's point of view | 53 | <listitem><para>Employ a Git branching strategy that from a customer's point of view |
54 | results in a linear path from the baseline kernel.org, through a select group of features and | 54 | results in a linear path from the baseline kernel.org, through a select group of features and |
55 | ends with their BSP-specific commits.</para></listitem> | 55 | ends with their BSP-specific commits.</para></listitem> |
56 | </itemizedlist> | 56 | </itemizedlist> |
@@ -170,7 +170,7 @@ | |||
170 | You can think of the Yocto Project kernel as consisting of a baseline kernel with | 170 | You can think of the Yocto Project kernel as consisting of a baseline kernel with |
171 | added features logically structured on top of the baseline. | 171 | added features logically structured on top of the baseline. |
172 | The features are tagged and organized by way of a branching strategy implemented by the | 172 | The features are tagged and organized by way of a branching strategy implemented by the |
173 | source code manager (SCM) git. | 173 | source code manager (SCM) Git. |
174 | The result is that the user has the ability to see the added features and | 174 | The result is that the user has the ability to see the added features and |
175 | the commits that make up those features. | 175 | the commits that make up those features. |
176 | In addition to being able to see added features, the user can also view the history of what | 176 | In addition to being able to see added features, the user can also view the history of what |
@@ -279,15 +279,15 @@ | |||
279 | </section> | 279 | </section> |
280 | 280 | ||
281 | <section id='source-code-manager-git'> | 281 | <section id='source-code-manager-git'> |
282 | <title>Source Code Manager - git</title> | 282 | <title>Source Code Manager - Git</title> |
283 | <para> | 283 | <para> |
284 | The Source Code Manager (SCM) is git and it is the obvious mechanism for meeting the | 284 | The Source Code Manager (SCM) is Git and it is the obvious mechanism for meeting the |
285 | previously mentioned goals. | 285 | previously mentioned goals. |
286 | Not only is it the SCM for kernel.org but git continues to grow in popularity and | 286 | Not only is it the SCM for kernel.org but Git continues to grow in popularity and |
287 | supports many different work flows, front-ends and management techniques. | 287 | supports many different work flows, front-ends and management techniques. |
288 | </para> | 288 | </para> |
289 | <note><para> | 289 | <note><para> |
290 | It should be noted that you can use as much, or as little, of what git has to offer | 290 | It should be noted that you can use as much, or as little, of what Git has to offer |
291 | as is appropriate to your project. | 291 | as is appropriate to your project. |
292 | </para></note> | 292 | </para></note> |
293 | </section> | 293 | </section> |
@@ -308,7 +308,7 @@ kernel are: | |||
308 | <listitem><para>the ability to group patches into named, reusable features</para></listitem> | 308 | <listitem><para>the ability to group patches into named, reusable features</para></listitem> |
309 | <listitem><para>to allow top down control of included features</para></listitem> | 309 | <listitem><para>to allow top down control of included features</para></listitem> |
310 | <listitem><para>the binding of kernel configuration to kernel patches/features</para></listitem> | 310 | <listitem><para>the binding of kernel configuration to kernel patches/features</para></listitem> |
311 | <listitem><para>the presentation of a seamless git repository that blends Yocto Project value with the kernel.org history and development</para></listitem> | 311 | <listitem><para>the presentation of a seamless Git repository that blends Yocto Project value with the kernel.org history and development</para></listitem> |
312 | </itemizedlist> | 312 | </itemizedlist> |
313 | </para> | 313 | </para> |
314 | <!--<para> | 314 | <!--<para> |