From ba0483c9ed3706940ef96c7b4a4df8f344651f02 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Mon, 13 Oct 2014 16:31:02 -0700
Subject: dev-manual: Updated the list of linux-yocto kernels

I removed the linux-yocto 3.4 kernel from the list in the
section describing which kernels we support.  Also, added
the 3.17 linux-yocto kernel to the list.

(From yocto-docs rev: 41f57a9abe1201ed2fb657f8441c97f86f75200a)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 documentation/dev-manual/dev-manual-model.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'documentation')

diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml
index 45015e4e1c..12ad46bbdf 100644
--- a/documentation/dev-manual/dev-manual-model.xml
+++ b/documentation/dev-manual/dev-manual-model.xml
@@ -279,9 +279,6 @@
                 Within this group, you will find several kernels supported by
                 the Yocto Project:
                 <itemizedlist>
-                    <listitem><para><emphasis><filename>linux-yocto-3.4</filename></emphasis> - The
-                    stable Yocto Project kernel to use with the Yocto Project Release 1.3. This kernel
-                    is based on the Linux 3.4 released kernel.</para></listitem>
                     <listitem><para><emphasis><filename>linux-yocto-3.8</filename></emphasis> - The
                     stable Yocto Project kernel to use with the Yocto Project Release 1.4. This kernel
                     is based on the Linux 3.8 released kernel.</para></listitem>
@@ -291,6 +288,9 @@
                     <listitem><para><emphasis><filename>linux-yocto-3.14</filename></emphasis> - The
                     stable Yocto Project kernel to use with the Yocto Project Release 1.6. This kernel
                     is based on the Linux 3.14 released kernel.</para></listitem>
+                    <listitem><para><emphasis><filename>linux-yocto-3.17</filename></emphasis> - The
+                    stable Yocto Project kernel to use with the Yocto Project Release 1.7. This kernel
+                    is based on the Linux 3.17 released kernel.</para></listitem>
                     <listitem><para><emphasis><filename>linux-yocto-dev</filename></emphasis> - A development
                     kernel based on the latest upstream release candidate available.</para></listitem>
                 </itemizedlist>
-- 
cgit v1.2.3-54-g00ecf