1 files changed, 33 insertions, 48 deletions
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 
+                Poky is the Yocto Project build system that was derived from <ulink 
-                url='http://www.openembedded.org/'>OpenEmbedded</ulink>, a stable, 
+                url='http://www.openembedded.org/'>OpenEmbedded</ulink>.
-                smaller subset focused on the GNOME Mobile environment. Development
+                Poky is a stable, smaller subset focused on the GNOME Mobile environment. 
-                in Poky is closely tied to OpenEmbedded with features being merged
+                Development in the Yocto Project using Poky is closely tied to OpenEmbedded with 
-                regularly between the two for mutual benefit.
+                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>
-            <itemizedlist>
+                    <listitem><para>The Yocto Project team keeps Poky small and focused.
-                <listitem>
+                        It contains around 650 packages as compared to over 5000 for full 
-                    <para>
+                        OpenEmbedded.</para></listitem>
-                        We keep Poky small and focused - around 650 packages compared to over 5000 for full OE
+                    <listitem><para>The Yocto Project only supports hardware that the 
-                    </para>
+                        team has access to for testing.</para></listitem>
-                </listitem>
+                    <listitem><para>The Yocto Project uses an an autobuilder,
-                <listitem>
+                        which provides continuous build and integration tests.</para></listitem>
-                    <para>
+                </itemizedlist>
-                        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>
            </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>
+                <itemizedlist>
-                <listitem>
+                    <listitem><para>Send the Yocto Project team information on the board
-                    <para>    
+                        and if the team does not have it yet they will consider adding it.</para></listitem>
-                    Send us the board if we don't have it yet
+                    <listitem><para>Send the Yocto Project team the BitBake recipes if you have them.
-                    </para>
+                        </para></listitem>
-                </listitem>
+                </itemizedlist>
-                <listitem>
+                Usually, if the board is not a completely exotic, adding support in 
-                    <para>
+                the Yocto Project is fairly straightforward.
-                    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.
            </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>

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 @@
12	</question>	12	</question>
13	<answer>	13	<answer>
14	<para>	14	<para>
15	Poky is a derivative of <ulink	15	Poky is the Yocto Project build system that was derived from <ulink
16	url='http://www.openembedded.org/'>OpenEmbedded</ulink>, a stable,	16	url='http://www.openembedded.org/'>OpenEmbedded</ulink>.
17	smaller subset focused on the GNOME Mobile environment. Development	17	Poky is a stable, smaller subset focused on the GNOME Mobile environment.
18	in Poky is closely tied to OpenEmbedded with features being merged	18	Development in the Yocto Project using Poky is closely tied to OpenEmbedded with
19	regularly between the two for mutual benefit.	19	features being merged regularly between the two for mutual benefit.
20	</para>	20	</para>
21	</answer>	21	</answer>
22	</qandaentry>	22	</qandaentry>
23		23
24
25
26
27
28	<qandaentry>	24	<qandaentry>
29	<question>	25	<question>
30	<para>	26	<para>
31	I only have Python 2.4 or 2.5 but BitBake requires Python 2.6 or 2.7.	27	I only have Python 2.4 or 2.5 but BitBake requires Python 2.6 or 2.7.
32	Can I still use Poky?	28	Can I still use the Yocto Project?
33	</para>	29	</para>
34	</question>	30	</question>
35	<answer>	31	<answer>
@@ -57,10 +53,6 @@
57	</answer>	53	</answer>
58	</qandaentry>	54	</qandaentry>
59		55
60
61
62
63
64	<qandaentry>	56	<qandaentry>
65	<question>	57	<question>
66	<para>	58	<para>
@@ -70,61 +62,54 @@
70	<answer>	62	<answer>
71	<para>	63	<para>
72	There are three areas that help with stability;	64	There are three areas that help with stability;
73		65	<itemizedlist>
74	<itemizedlist>	66	<listitem><para>The Yocto Project team keeps Poky small and focused.
75	<listitem>	67	It contains around 650 packages as compared to over 5000 for full
76	<para>	68	OpenEmbedded.</para></listitem>
77	We keep Poky small and focused - around 650 packages compared to over 5000 for full OE	69	<listitem><para>The Yocto Project only supports hardware that the
78	</para>	70	team has access to for testing.</para></listitem>
79	</listitem>	71	<listitem><para>The Yocto Project uses an an autobuilder,
80	<listitem>	72	which provides continuous build and integration tests.</para></listitem>
81	<para>	73	</itemizedlist>
82	We only support hardware that we have access to for testing
83	</para>
84	</listitem>
85	<listitem>
86	<para>
87	We have an autobuilder which provides continuous build and integration tests
88	</para>
89	</listitem>
90	</itemizedlist>
91	</para>	74	</para>
92	</answer>	75	</answer>
93	</qandaentry>	76	</qandaentry>
		77
94	<qandaentry>	78	<qandaentry>
95	<question>	79	<question>
96	<para>	80	<para>
97	How do I get support for my board added to Poky?	81	How do I get support for my board added to the Yocto Project?
98	</para>	82	</para>
99	</question>	83	</question>
100	<answer>	84	<answer>
101	<para>	85	<para>
102	There are two main ways to get a board supported in Poky;	86	There are two main ways to get a board supported in Poky;
103	<itemizedlist>	87	<itemizedlist>
104	<listitem>	88	<listitem><para>Send the Yocto Project team information on the board
105	<para>	89	and if the team does not have it yet they will consider adding it.</para></listitem>
106	Send us the board if we don't have it yet	90	<listitem><para>Send the Yocto Project team the BitBake recipes if you have them.
107	</para>	91	</para></listitem>
108	</listitem>	92	</itemizedlist>
109	<listitem>	93	Usually, if the board is not a completely exotic, adding support in
110	<para>	94	the Yocto Project is fairly straightforward.
111	Send us BitBake recipes if you have them (see the Poky handbook to find out how to create recipes)
112	</para>
113	</listitem>
114	</itemizedlist>
115	Usually if it's not a completely exotic board then adding support in Poky should be fairly straightforward.
116	</para>	95	</para>
117	</answer>	96	</answer>
118	</qandaentry>	97	</qandaentry>
		98
119	<qandaentry>	99	<qandaentry>
120	<question>	100	<question>
121	<para>	101	<para>
122	Are there any products running poky ?	102	Are there any products running poky?
123	</para>	103	</para>
124	</question>	104	</question>
125	<answer>	105	<answer>
126	<para>	106	<para>
127	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.	107	The <ulink url='http://vernier.com/labquest/'>Vernier Labquest</ulink> is using
		108	Poky.
		109	See the <ulink url='http://www.vernier.com/products/interfaces/labq/'>Vernier Labquest</ulink>
		110	for more information.
		111	There are a number of pre-production devices using Poky and the Yocto Project team
		112	announces them as soon as they are released.
128	</para>	113	</para>
129	</answer>	114	</answer>
130	</qandaentry>	115	</qandaentry>