diff --git a/documentation/poky-ref-manual/faq.xml b/documentation/poky-ref-manual/faq.xml
index 6a1f741aca..8091a6d71a 100644
--- a/documentation/poky-ref-manual/faq.xml
+++ b/documentation/poky-ref-manual/faq.xml
@@ -12,24 +12,20 @@
         </question>
         <answer>
             <para>
-                Poky is a derivative of <ulink 
-                url='http://www.openembedded.org/'>OpenEmbedded</ulink>, a stable, 
-                smaller subset focused on the GNOME Mobile environment. Development
-                in Poky is closely tied to OpenEmbedded with features being merged
-                regularly between the two for mutual benefit.
+                Poky is the Yocto Project build system that was derived from <ulink 
+                url='http://www.openembedded.org/'>OpenEmbedded</ulink>.
+                Poky is a stable, smaller subset focused on the GNOME Mobile environment. 
+                Development in the Yocto Project using Poky is closely tied to OpenEmbedded with 
+                features being merged regularly between the two for mutual benefit.
             </para>
         </answer>
     </qandaentry>
 
-
-
-
-
     <qandaentry>
         <question>
             <para>
                 I only have Python 2.4 or 2.5 but BitBake requires Python 2.6 or 2.7.
-                Can I still use Poky?
+                Can I still use the Yocto Project?
             </para>
         </question>
         <answer>
@@ -57,10 +53,6 @@
         </answer>
     </qandaentry>
 
-
-
-
-
     <qandaentry>
         <question>
             <para>
@@ -70,61 +62,54 @@
         <answer>
             <para>
                 There are three areas that help with stability;
-
-            <itemizedlist>
-                <listitem>
-                    <para>
-                        We keep Poky small and focused - around 650 packages compared to over 5000 for full OE
-                    </para>
-                </listitem>
-                <listitem>
-                    <para>
-                        We only support hardware that we have access to for testing
-                    </para>
-                </listitem>
-                <listitem>
-                    <para>
-                        We have an autobuilder which provides continuous build and integration tests
-                    </para>
-                </listitem>
-            </itemizedlist>
+                <itemizedlist>
+                    <listitem><para>The Yocto Project team keeps Poky small and focused.
+                        It contains around 650 packages as compared to over 5000 for full 
+                        OpenEmbedded.</para></listitem>
+                    <listitem><para>The Yocto Project only supports hardware that the 
+                        team has access to for testing.</para></listitem>
+                    <listitem><para>The Yocto Project uses an an autobuilder,
+                        which provides continuous build and integration tests.</para></listitem>
+                </itemizedlist>
             </para>
         </answer>
     </qandaentry>
+
     <qandaentry>
         <question>
             <para>
-                How do I get support for my board added to Poky?
+                How do I get support for my board added to the Yocto Project?
             </para>
         </question>
         <answer>
             <para>
                 There are two main ways to get a board supported in Poky;
-            <itemizedlist>
-                <listitem>
-                    <para>    
-                    Send us the board if we don't have it yet
-                    </para>
-                </listitem>
-                <listitem>
-                    <para>
-                    Send us BitBake recipes if you have them (see the Poky handbook to find out how to create recipes)
-                    </para>
-                </listitem>
-            </itemizedlist>
-                    Usually if it's not a completely exotic board then adding support in Poky should be fairly straightforward.
+                <itemizedlist>
+                    <listitem><para>Send the Yocto Project team information on the board
+                        and if the team does not have it yet they will consider adding it.</para></listitem>
+                    <listitem><para>Send the Yocto Project team the BitBake recipes if you have them.
+                        </para></listitem>
+                </itemizedlist>
+                Usually, if the board is not a completely exotic, adding support in 
+                the Yocto Project is fairly straightforward.
             </para>
         </answer>
     </qandaentry>
+
     <qandaentry>
         <question>
             <para>
-                Are there any products running poky ?
+                Are there any products running poky?
             </para>
         </question>
         <answer>
             <para>
-                The <ulink url='http://vernier.com/labquest/'>Vernier LabQuest</ulink> is using Poky (for more about the LabQuest see the case study at OpenedHand). There are a number of pre-production devices using Poky and we will announce those as soon as they are released.
+                The <ulink url='http://vernier.com/labquest/'>Vernier Labquest</ulink> is using 
+                Poky.  
+                See the <ulink url='http://www.vernier.com/products/interfaces/labq/'>Vernier Labquest</ulink>
+                for more information.
+                There are a number of pre-production devices using Poky and the Yocto Project team
+                announces them as soon as they are released.
             </para>
         </answer>
     </qandaentry>