1 files changed, 16 insertions, 16 deletions
diff --git a/documentation/toaster-manual/toaster-manual-reference.xml b/documentation/toaster-manual/toaster-manual-reference.xml
index cb27107143..3a46b61b73 100644
--- a/documentation/toaster-manual/toaster-manual-reference.xml
+++ b/documentation/toaster-manual/toaster-manual-reference.xml
@@ -172,9 +172,9 @@
                            <listitem><para>
                                The first version of the file is found in the
                                <filename>conf</filename> directory of the
-                                <filename>meta-yocto</filename> layer
+                                <filename>meta-poky</filename> layer
                                (i.e.
-                                <filename>meta-yocto/conf/toasterconf.json</filename>).
+                                <filename>meta-poky/conf/toasterconf.json</filename>).
                                This version contains the default Yocto Project
                                configuration for Toaster.
                                </para></listitem>
@@ -214,10 +214,10 @@
                    "dirpath": "meta"
                },
                {
-                    "name": "meta-yocto",
+                    "name": "meta-poky",
-                    "local_path": "meta-yocto",
+                    "local_path": "meta-poky",
                    "vcs_url": "remote:origin",
-                    "dirpath": "meta-yocto"
+                    "dirpath": "meta-poky"
                },
                {
                    "name": "meta-yocto-bsp",
@@ -293,10 +293,10 @@
                        <filename>toasterconf.json</filename> file you just edited.
                        For example, if you cloned the
                        <filename>poky</filename> repository and you edited the
-                        <filename>meta-yocto/conf/toasterconf.json</filename> file,
+                        <filename>meta-poky/conf/toasterconf.json</filename> file,
                        you would type something like the following:
                        <literallayout class='monospaced'>
-     $ bitbake/lib/toaster/manage.py loadconf /home/scottrif/poky/meta-yocto/conf/toasterconf.json
+     $ bitbake/lib/toaster/manage.py loadconf /home/scottrif/poky/meta-poky/conf/toasterconf.json
                        </literallayout>
                        After entering this command, you need to update the
                        Toaster database with the information coming from your
@@ -575,9 +575,9 @@
                <itemizedlist>
                    <listitem><para>
                        The
-                        <filename>meta-yocto/conf/toasterconf.json</filename>
+                        <filename>meta-poky/conf/toasterconf.json</filename>
                        in the <filename>conf</filename> directory of the
-                        Yocto Project's <filename>meta-yocto</filename> layer.
+                        Yocto Project's <filename>meta-poky</filename> layer.
                        This version contains the default Yocto Project
                        configuration for Toaster.
                        You are prompted to select this file during the Toaster
@@ -698,10 +698,10 @@
                    "dirpath": "meta"
                },
                {
-                    "name": "meta-yocto",
+                    "name": "meta-poky",
-                    "local_path": "meta-yocto",
+                    "local_path": "meta-poky",
                    "vcs_url": "remote:origin",
-                    "dirpath": "meta-yocto"
+                    "dirpath": "meta-poky"
                },
                {
                    "name": "meta-yocto-bsp",
@@ -817,7 +817,7 @@
             "description": "Yocto Project master",
             "bitbake": "master",
             "branch": "master",
-             "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],
+             "defaultlayers": [ "openembedded-core", "meta-poky", "meta-yocto-bsp"],
             "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" :  0 },
             "helptext": "Toaster will run your builds using the tip of the &lt;a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/\"&gt;Yocto Project master branch&lt;/a&gt;, where active development takes place. This is not a stable branch, so your builds might not work as expected."
         },
@@ -826,7 +826,7 @@
             "description": "Yocto Project 2.0 Jethro",
             "bitbake": "jethro",
             "branch": "jethro",
-             "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],
+             "defaultlayers": [ "openembedded-core", "meta-poky", "meta-yocto-bsp"],
             "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" :  0 },
             "helptext": "Toaster will run your builds with the tip of the &lt;a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=jethro\"&gt;Yocto Project 2.0 \"Jethro\"&lt;/a&gt; branch."
         },
@@ -835,7 +835,7 @@
             "description": "Yocto Project 1.8 Fido",
             "bitbake": "fido",
             "branch": "fido",
-             "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],
+             "defaultlayers": [ "openembedded-core", "meta-poky", "meta-yocto-bsp"],
             "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" :  0 },
             "helptext": "Toaster will run your builds with the tip of the &lt;a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=fido\"&gt;Yocto Project 1.8 \"Fido\"&lt;/a&gt; branch."
         },
@@ -844,7 +844,7 @@
             "description": "Local Yocto Project",
             "bitbake": "HEAD",
             "branch": "HEAD",
-             "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],
+             "defaultlayers": [ "openembedded-core", "meta-poky", "meta-yocto-bsp"],
             "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" :  0 },
             "helptext": "Toaster will run your builds with the version of the Yocto Project you have cloned or downloaded to your computer."
         }

diff --git a/documentation/toaster-manual/toaster-manual-reference.xml b/documentation/toaster-manual/toaster-manual-reference.xml index cb27107143..3a46b61b73 100644 --- a/documentation/toaster-manual/toaster-manual-reference.xml +++ b/documentation/toaster-manual/toaster-manual-reference.xml
@@ -172,9 +172,9 @@
172	<listitem><para>	172	<listitem><para>
173	The first version of the file is found in the	173	The first version of the file is found in the
174	<filename>conf</filename> directory of the	174	<filename>conf</filename> directory of the
175	<filename>meta-yocto</filename> layer	175	<filename>meta-poky</filename> layer
176	(i.e.	176	(i.e.
177	<filename>meta-yocto/conf/toasterconf.json</filename>).	177	<filename>meta-poky/conf/toasterconf.json</filename>).
178	This version contains the default Yocto Project	178	This version contains the default Yocto Project
179	configuration for Toaster.	179	configuration for Toaster.
180	</para></listitem>	180	</para></listitem>
@@ -214,10 +214,10 @@
214	"dirpath": "meta"	214	"dirpath": "meta"
215	},	215	},
216	{	216	{
217	"name": "meta-yocto",	217	"name": "meta-poky",
218	"local_path": "meta-yocto",	218	"local_path": "meta-poky",
219	"vcs_url": "remote:origin",	219	"vcs_url": "remote:origin",
220	"dirpath": "meta-yocto"	220	"dirpath": "meta-poky"
221	},	221	},
222	{	222	{
223	"name": "meta-yocto-bsp",	223	"name": "meta-yocto-bsp",
@@ -293,10 +293,10 @@
293	<filename>toasterconf.json</filename> file you just edited.	293	<filename>toasterconf.json</filename> file you just edited.
294	For example, if you cloned the	294	For example, if you cloned the
295	<filename>poky</filename> repository and you edited the	295	<filename>poky</filename> repository and you edited the
296	<filename>meta-yocto/conf/toasterconf.json</filename> file,	296	<filename>meta-poky/conf/toasterconf.json</filename> file,
297	you would type something like the following:	297	you would type something like the following:
298	<literallayout class='monospaced'>	298	<literallayout class='monospaced'>
299	$ bitbake/lib/toaster/manage.py loadconf /home/scottrif/poky/meta-yocto/conf/toasterconf.json	299	$ bitbake/lib/toaster/manage.py loadconf /home/scottrif/poky/meta-poky/conf/toasterconf.json
300	</literallayout>	300	</literallayout>
301	After entering this command, you need to update the	301	After entering this command, you need to update the
302	Toaster database with the information coming from your	302	Toaster database with the information coming from your
@@ -575,9 +575,9 @@
575	<itemizedlist>	575	<itemizedlist>
576	<listitem><para>	576	<listitem><para>
577	The	577	The
578	<filename>meta-yocto/conf/toasterconf.json</filename>	578	<filename>meta-poky/conf/toasterconf.json</filename>
579	in the <filename>conf</filename> directory of the	579	in the <filename>conf</filename> directory of the
580	Yocto Project's <filename>meta-yocto</filename> layer.	580	Yocto Project's <filename>meta-poky</filename> layer.
581	This version contains the default Yocto Project	581	This version contains the default Yocto Project
582	configuration for Toaster.	582	configuration for Toaster.
583	You are prompted to select this file during the Toaster	583	You are prompted to select this file during the Toaster
@@ -698,10 +698,10 @@
698	"dirpath": "meta"	698	"dirpath": "meta"
699	},	699	},
700	{	700	{
701	"name": "meta-yocto",	701	"name": "meta-poky",
702	"local_path": "meta-yocto",	702	"local_path": "meta-poky",
703	"vcs_url": "remote:origin",	703	"vcs_url": "remote:origin",
704	"dirpath": "meta-yocto"	704	"dirpath": "meta-poky"
705	},	705	},
706	{	706	{
707	"name": "meta-yocto-bsp",	707	"name": "meta-yocto-bsp",
@@ -817,7 +817,7 @@
817	"description": "Yocto Project master",	817	"description": "Yocto Project master",
818	"bitbake": "master",	818	"bitbake": "master",
819	"branch": "master",	819	"branch": "master",
820	"defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],	820	"defaultlayers": [ "openembedded-core", "meta-poky", "meta-yocto-bsp"],
821	"layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },	821	"layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
822	"helptext": "Toaster will run your builds using the tip of the <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/\">Yocto Project master branch</a>, where active development takes place. This is not a stable branch, so your builds might not work as expected."	822	"helptext": "Toaster will run your builds using the tip of the <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/\">Yocto Project master branch</a>, where active development takes place. This is not a stable branch, so your builds might not work as expected."
823	},	823	},
@@ -826,7 +826,7 @@
826	"description": "Yocto Project 2.0 Jethro",	826	"description": "Yocto Project 2.0 Jethro",
827	"bitbake": "jethro",	827	"bitbake": "jethro",
828	"branch": "jethro",	828	"branch": "jethro",
829	"defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],	829	"defaultlayers": [ "openembedded-core", "meta-poky", "meta-yocto-bsp"],
830	"layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },	830	"layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
831	"helptext": "Toaster will run your builds with the tip of the <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=jethro\">Yocto Project 2.0 \"Jethro\"</a> branch."	831	"helptext": "Toaster will run your builds with the tip of the <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=jethro\">Yocto Project 2.0 \"Jethro\"</a> branch."
832	},	832	},
@@ -835,7 +835,7 @@
835	"description": "Yocto Project 1.8 Fido",	835	"description": "Yocto Project 1.8 Fido",
836	"bitbake": "fido",	836	"bitbake": "fido",
837	"branch": "fido",	837	"branch": "fido",
838	"defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],	838	"defaultlayers": [ "openembedded-core", "meta-poky", "meta-yocto-bsp"],
839	"layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },	839	"layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
840	"helptext": "Toaster will run your builds with the tip of the <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=fido\">Yocto Project 1.8 \"Fido\"</a> branch."	840	"helptext": "Toaster will run your builds with the tip of the <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=fido\">Yocto Project 1.8 \"Fido\"</a> branch."
841	},	841	},
@@ -844,7 +844,7 @@
844	"description": "Local Yocto Project",	844	"description": "Local Yocto Project",
845	"bitbake": "HEAD",	845	"bitbake": "HEAD",
846	"branch": "HEAD",	846	"branch": "HEAD",
847	"defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],	847	"defaultlayers": [ "openembedded-core", "meta-poky", "meta-yocto-bsp"],
848	"layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },	848	"layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
849	"helptext": "Toaster will run your builds with the version of the Yocto Project you have cloned or downloaded to your computer."	849	"helptext": "Toaster will run your builds with the version of the Yocto Project you have cloned or downloaded to your computer."
850	}	850	}