summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2012-06-14 08:00:48 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-29 14:59:23 +0100
commit4cd83a91fba75114d9fd747521137a17addba9c4 (patch)
tree58717273091b193d49e89ef39b4d453655e4257b
parent953ad50a273bce512e679a9caa5050419989f414 (diff)
downloadpoky-4cd83a91fba75114d9fd747521137a17addba9c4.tar.gz
poky-4cd83a91fba75114d9fd747521137a17addba9c4.tar.bz2
poky-4cd83a91fba75114d9fd747521137a17addba9c4.zip
documentation/kernel-manual/kernel-concepts.xml: 1.1.2 variables and updates
First pass of implementing the the poky.ent variables. Also made corrections to text in various places. (From yocto-docs rev: a7ccdf1a2664e64d6b2a72381d9eb8db2eddcd9c) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--documentation/kernel-manual/kernel-concepts.xml39
1 files changed, 17 insertions, 22 deletions
diff --git a/documentation/kernel-manual/kernel-concepts.xml b/documentation/kernel-manual/kernel-concepts.xml
index b3a9fed0e3..4b3ee08408 100644
--- a/documentation/kernel-manual/kernel-concepts.xml
+++ b/documentation/kernel-manual/kernel-concepts.xml
@@ -1,5 +1,6 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
+[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
<chapter id='kernel-concepts'>
@@ -44,13 +45,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 +79,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 +95,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 +149,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>.
@@ -159,9 +161,8 @@
The features are tagged and organized by way of a branching strategy implemented by the
source code manager (SCM) Git.
For information on Git as applied to the Yocto Project, see the
- "<ulink url='http://www.yoctoproject.org/docs/1.1.1/dev-manual/dev-manual.html#git'>Git</ulink>"
- section in <ulink url='http://www.yoctoproject.org/docs/1.1.1/dev-manual/dev-manual.html'>The
- Yocto Project Development Manual</ulink>.
+ "<ulink url='&YOCTO_DOCS_DEV_URL;#git'>Git</ulink>" section in the
+ Yocto Project Development Manual.
</para>
<para>
The result is that the user has the ability to see the added features and
@@ -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.
@@ -288,11 +289,10 @@
<para>
You can find documentation on Git at <ulink url='http://git-scm.com/documentation'></ulink>.
You can also get an introduction to Git as it applies to the Yocto Project in the
- "<ulink url='http://www.yoctoproject.org/docs/1.1.1/dev-manual/dev-manual.html#git'>Git</ulink>"
- section in <ulink url='http://www.yoctoproject.org/docs/1.1.1/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.
+ "<ulink url='&YOCTO_DOCS_DEV_URL;#git'>Git</ulink>"
+ section in the Yocto Project Development Manual.
+ 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.
@@ -336,11 +336,6 @@ kernel toolkit:
</itemizedlist>
</para> -->
</section>
-
-
-
-
-
</chapter>
<!--
vim: expandtab tw=80 ts=4