From f94b6298d87ee3392a24d8e0f0be2ccf2ebce2ef Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Mon, 23 Feb 2015 09:21:44 -0800
Subject: dev-manual: Adjusted text for deprecated 3.10 and 3.17 kernels.

These kernels are unsupported for the 1.8 release.  They will still
show up in the YP source repos but the recipes are removed from the
poky area.  Updated all references appropriately.

(From yocto-docs rev: a9adc071409fd31dabc3affec12350c300312600)

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

(limited to 'documentation/dev-manual/dev-manual-common-tasks.xml')

diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index 11ae3aa657..ce5cbf2528 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -5826,8 +5826,7 @@
                         <para>The <filename>merge_config.sh</filename> script is
                         part of the Linux Yocto kernel Git repositories
                         (i.e. <filename>linux-yocto-3.14</filename>,
-                        <filename>linux-yocto-3.10</filename>,
-                        <filename>linux-yocto-3.8</filename>, and so forth)
+                        <filename>linux-yocto-3.19</filename>, and so forth)
                         in the
                         <filename>scripts/kconfig</filename> directory.</para>
                         <para>For more information on configuration fragments,
-- 
cgit v1.2.3-54-g00ecf