summaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2012-01-03 09:47:07 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-06 12:13:11 +0000
commitfbfb9b7fd8f56202183643a3d63e446ad01ae1f5 (patch)
tree017de2e39115c39b1ebaa14f5946061959590832 /documentation
parentab808a9d754e4f8eafe890ff9a8537cc5aced2dd (diff)
downloadast2050-yocto-poky-fbfb9b7fd8f56202183643a3d63e446ad01ae1f5.zip
ast2050-yocto-poky-fbfb9b7fd8f56202183643a3d63e446ad01ae1f5.tar.gz
documentation/kernel-manual/kernel-concepts.xml: General edits.
Cleaned up some areas. Fixed use of "uprev" term for consistency. (From yocto-docs rev: 2d0c4d3c28a218f6302aee8ff2841420fbde410d) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r--documentation/kernel-manual/kernel-concepts.xml21
1 files changed, 11 insertions, 10 deletions
diff --git a/documentation/kernel-manual/kernel-concepts.xml b/documentation/kernel-manual/kernel-concepts.xml
index 2fef32a..830042a 100644
--- a/documentation/kernel-manual/kernel-concepts.xml
+++ b/documentation/kernel-manual/kernel-concepts.xml
@@ -44,13 +44,13 @@
management techniques.</para></listitem>
<listitem><para>Deliver the most up-to-date kernel possible while still ensuring that
the baseline kernel is the most stable official release.</para></listitem>
- <listitem><para>Include major technological features as part of Yocto Project's up-rev
- strategy.</para></listitem>
+ <listitem><para>Include major technological features as part of Yocto Project's
+ upward revision strategy.</para></listitem>
<listitem><para>Present a kernel Git repository that, similar to the upstream
<filename>kernel.org</filename> tree,
has a clear and continuous history.</para></listitem>
<listitem><para>Deliver a key set of supported kernel types, where each type is tailored
- to a specific use case (e.g. networking, consumer, devices, and so forth).</para></listitem>
+ to meet a specific use (e.g. networking, consumer, devices, and so forth).</para></listitem>
<listitem><para>Employ a Git branching strategy that, from a developer's point of view,
results in a linear path from the baseline <filename>kernel.org</filename>,
through a select group of features and
@@ -78,7 +78,7 @@
</para>
<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 as
+ as possible, while still ensuring that the team has a stable official release for
the baseline kernel version.
</para>
<para>
@@ -94,8 +94,8 @@
</para>
<para>
Once a Yocto Project kernel is officially released, the Yocto Project team goes into
- their next development cycle, or "uprev" cycle, while still continuing maintenance on the
- released kernel.
+ 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
to include feature development upstream is through a kernel uprev process.
Back-porting hundreds of individual fixes and minor features from various
@@ -148,7 +148,8 @@
<section id='architecture-overview'>
<title>Overview</title>
<para>
- As mentioned earlier, a key goal of Yocto Project is to present the developer with
+ As mentioned earlier, a key goal of the Yocto Project is to present the
+ developer with
a kernel that has a clear and continuous history that is visible to the user.
The architecture and mechanisms used achieve that goal in a manner similar to the
upstream <filename>kernel.org</filename>.
@@ -176,7 +177,7 @@
<imagedata fileref="figures/kernel-architecture-overview.png" width="6in" depth="7in" align="center" scale="100" />
</para>
<para>
- In the illustration, the "<filename>kernel.org</filename> Branch Point"
+ In the illustration, the "Kernel.org Branch Point"
marks the specific spot (or release) from
which the Yocto Project kernel is created.
From this point "up" in the tree, features and differences are organized and tagged.
@@ -291,8 +292,8 @@
"<ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#git'>Git</ulink>"
section in <ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html'>The
Yocto Project Development Manual</ulink>.
- This section overviews Git and describes a minimal set of commands that allow you to be
- functional using Git.
+ These referenced sections overview Git and describe a minimal set of
+ commands that allow you to be functional using Git.
<note>
You can use as much, or as little, of what Git has to offer to accomplish what
you need for your project.
OpenPOWER on IntegriCloud