From 863a8c0bf63c535c5937a488b3ecc1a4bcdc6016 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <srifenbark@gmail.com>
Date: Fri, 28 Jul 2017 11:15:53 -0700
Subject: [PATCH] yocto-project-qs: Updated overview to account for re-orged
 material

Because the YP development introductory information was moved to
the ref-manual, and the QS will get a CROPS section inserted,
the introductory section of the QS needed to be updated a bit.

(From yocto-docs rev: e173b762a74678cd660850e4f5bc28712c3d83ac)

Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../yocto-project-qs/yocto-project-qs.xml     | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/documentation/yocto-project-qs/yocto-project-qs.xml b/documentation/yocto-project-qs/yocto-project-qs.xml
index f1b6728bd0..6064f96cc4 100644
--- a/documentation/yocto-project-qs/yocto-project-qs.xml
+++ b/documentation/yocto-project-qs/yocto-project-qs.xml
@@ -62,7 +62,7 @@
             on the OpenEmbedded (OE) project, which uses the
             <ulink url='&YOCTO_DOCS_REF_URL;#bitbake-term'>BitBake</ulink>
             tool, to construct complete Linux images.
-            The BitBake and OE components are combined together to form
+            The BitBake and OE components combine together to form
             a reference build host, historically known as
             <ulink url='&YOCTO_DOCS_REF_URL;#poky'>Poky</ulink>
             (<emphasis>Pah</emphasis>-kee).
@@ -74,8 +74,14 @@
             Linux images.
             Rather than go into great detail about the Yocto Project and its
             many capabilities, this quick start provides the minimal
-            information you need to try out the Yocto Project using a
-            supported Linux build host.
+            information you need to try out the Yocto Project using either a
+            supported Linux build host or a build host set up to use
+            <ulink url='https://git.yoctoproject.org/cgit/cgit.cgi/crops/about/'>CROPS</ulink>,
+            which leverages
+            <ulink url='https://www.docker.com/'>Docker Containers</ulink>.
+        </para>
+
+        <para>
             Reading and using the quick start should result in you having a
             basic understanding of what the Yocto Project is and how to use
             some of its core components.
@@ -100,6 +106,7 @@
                     <ulink url='http://www.yoctoproject.org/docs/2.4/yocto-project-qs/yocto-project-qs.html#building-an-image-for-hardware'>Building an Image for Hardware</ulink>
                     </para></listitem>
             </itemizedlist>
+<!--
             <note>
                 If you do not have a system that runs Linux and you want to give
                 the Yocto Project a test run, you might consider using the Yocto
@@ -111,18 +118,13 @@
                 <ulink url='https://www.yoctoproject.org/tools-resources/projects/build-appliance'>Yocto Project Build Appliance</ulink>
                 for more information.
             </note>
+-->
         </para>
 
         <para>
             For more detailed information on the Yocto Project, you can
             reference these resources:
             <itemizedlist>
-                <listitem><para>
-                    <emphasis>Yocto Project Backgrounders:</emphasis>
-                    The
-                    <ulink url='&YOCTO_HOME_URL;/ecosystem/yocto-project-backgrounders'>Yocto Project Backgrounder</ulink>
-                    provides introductory information on the Yocto Project.
-                    </para></listitem>
                 <listitem><para>
                     <emphasis>Website:</emphasis>
                     The
@@ -131,6 +133,19 @@
                     documentation, and access to a rich Yocto Project
                     Development Community into which you can tap.
                     </para></listitem>
+                <listitem><para>
+                    <emphasis>Yocto Project Backgrounders:</emphasis>
+                    The
+                    <ulink url='&YOCTO_HOME_URL;/ecosystem/yocto-project-backgrounders'>Yocto Project Backgrounder</ulink>
+                    provides introductory information on the Yocto Project.
+                    </para></listitem>
+                <listitem><para>
+                    <emphasis>Yocto Project Development Environment Overview:</emphasis>
+                    The
+                    "<ulink url='&YOCTO_DOCS_REF_URL;#yp-intro'>Introducing the Yocto Project Development Environment</ulink>"
+                    section presents an overview of the Yocto Project
+                    development environment.
+                    </para></listitem>
                 <listitem><para>
                     <emphasis>FAQs:</emphasis>
                     Lists commonly asked Yocto Project questions and answers.