From 98a41af6d32653061699d1d3ac63620a33811ed5 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Thu, 4 Oct 2012 07:34:41 -0700
Subject: [PATCH] documentation: poky-ref-manual, yocto-project-qs - Packages
 fixed

Fixes [YOCTO_#3180]

Final changes to the packages section.  They were re-organized and
the set is complete and thus fixes this bug.

(From yocto-docs rev: 533b45c9d41330497bbd0da58b812a4738ba64a8)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../poky-ref-manual/introduction.xml          | 36 +++++++------------
 .../yocto-project-qs/yocto-project-qs.xml     |  4 +--
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/documentation/poky-ref-manual/introduction.xml b/documentation/poky-ref-manual/introduction.xml
index 1f3f4ec442..44583a67f1 100644
--- a/documentation/poky-ref-manual/introduction.xml
+++ b/documentation/poky-ref-manual/introduction.xml
@@ -140,12 +140,9 @@
                         <literallayout class='monospaced'>
      $ sudo apt-get install make xsltproc docbook-utils fop
                         </literallayout></para></listitem>
-                    <listitem><para><emphasis>Application Development Extras:</emphasis>
-                        Packages needed if you are going to be developing 
-                        user-space applications. 
-                        In particular, you are using the 
-                        <ulink url='&YOCTO_DOCS_ADT_URL;#adt-intro-section'>Application Development Toolkit (ADT)</ulink>
-                        or the <ulink url='&YOCTO_DOCS_ADT_URL;#using-the-adt-installer'>ADT Installer</ulink>:
+                    <listitem><para><emphasis>ADT Installer Extras:</emphasis>
+                        Packages needed if you are going to be using the 
+                        <ulink url='&YOCTO_DOCS_ADT_URL;#using-the-adt-installer'>Application Development Toolkit (ADT) Installer</ulink>:
                         <literallayout class='monospaced'>
      $ sudo apt-get install autoconf automake libtool libglib2.0-dev
                         </literallayout></para></listitem>
@@ -178,12 +175,9 @@
      $ sudo yum install make docbook-style-dsssl docbook-style-xsl \
      docbook-dtds docbook-utils fop libxslt
                         </literallayout></para></listitem>
-                    <listitem><para><emphasis>Application Development Extras:</emphasis>
-                        Packages needed if you are going to be developing 
-                        user-space applications. 
-                        In particular, you are using the 
-                        <ulink url='&YOCTO_DOCS_ADT_URL;#adt-intro-section'>Application Development Toolkit (ADT)</ulink>
-                        or the <ulink url='&YOCTO_DOCS_ADT_URL;#using-the-adt-installer'>ADT Installer</ulink>:
+                    <listitem><para><emphasis>ADT Installer Extras:</emphasis>
+                        Packages needed if you are going to be using the 
+                        <ulink url='&YOCTO_DOCS_ADT_URL;#using-the-adt-installer'>Application Development Toolkit (ADT) Installer</ulink>:
                         <literallayout class='monospaced'>
      $ sudo yum install autoconf automake libtool glib2-devel
                         </literallayout></para></listitem>
@@ -215,12 +209,9 @@
                         <literallayout class='monospaced'>
      $ sudo zypper install make fop xsltproc
                         </literallayout></para></listitem>
-                    <listitem><para><emphasis>Application Development Extras:</emphasis>
-                        Packages needed if you are going to be developing 
-                        user-space applications. 
-                        In particular, you are using the 
-                        <ulink url='&YOCTO_DOCS_ADT_URL;#adt-intro-section'>Application Development Toolkit (ADT)</ulink>
-                        or the <ulink url='&YOCTO_DOCS_ADT_URL;#using-the-adt-installer'>ADT Installer</ulink>:
+                    <listitem><para><emphasis>ADT Installer Extras:</emphasis>
+                        Packages needed if you are going to be using the 
+                        <ulink url='&YOCTO_DOCS_ADT_URL;#using-the-adt-installer'>Application Development Toolkit (ADT) Installer</ulink>:
                         <literallayout class='monospaced'>
      $ sudo zypper install autoconf automake libtool glib2-devel
                         </literallayout></para></listitem>
@@ -253,12 +244,9 @@
      $ sudo yum -y install make docbook-style-dsssl docbook-style-xsl \
      docbook-dtds docbook-utils fop libxslt
                         </literallayout></para></listitem>
-                    <listitem><para><emphasis>Application Development Extras:</emphasis>
-                        Packages needed if you are going to be developing 
-                        user-space applications. 
-                        In particular, you are using the 
-                        <ulink url='&YOCTO_DOCS_ADT_URL;#adt-intro-section'>Application Development Toolkit (ADT)</ulink>
-                        or the <ulink url='&YOCTO_DOCS_ADT_URL;#using-the-adt-installer'>ADT Installer</ulink>:
+                    <listitem><para><emphasis>ADT Installer Extras:</emphasis>
+                        Packages needed if you are going to be using the 
+                        <ulink url='&YOCTO_DOCS_ADT_URL;#using-the-adt-installer'>Application Development Toolkit (ADT) Installer</ulink>:
                         <literallayout class='monospaced'>
      $ sudo yum -y install autoconf automake libtool glib2-devel
                         </literallayout></para></listitem>
diff --git a/documentation/yocto-project-qs/yocto-project-qs.xml b/documentation/yocto-project-qs/yocto-project-qs.xml
index ca6f65bf00..265f436b37 100644
--- a/documentation/yocto-project-qs/yocto-project-qs.xml
+++ b/documentation/yocto-project-qs/yocto-project-qs.xml
@@ -256,7 +256,7 @@
 
             <para>
                 The essential packages you need for a supported Fedora distribution 
-                are shown in the following commands:
+                are shown in the following command:
                 <literallayout class='monospaced'>
      $ sudo yum install &FEDORA_HOST_PACKAGES_ESSENTIAL; SDL-devel xterm
                 </literallayout>
@@ -280,7 +280,7 @@
 
             <para>
                 The essential packages you need for a supported CentOS 
-                distribution are shown in the following commands:
+                distribution are shown in the following command:
                 <literallayout class='monospaced'>
      $ sudo yum -y install &CENTOS_HOST_PACKAGES_ESSENTIAL; SDL-devel xterm
                 </literallayout>