diff options
| author |   Scott Rifenbark <srifenbark@gmail.com> | 2015-10-02 12:38:45 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-21 23:06:33 +0100 |
| commit | 98d7d24a37c809a793496db0c4227e6b592bcb26 (patch) | |
| tree | db9ff7de1805089405dbd13dbf31b775a7572a84 /documentation/toaster-manual | |
| parent | b263a3e1217460b099b4bea05b5126e554b0df22 (diff) | |
| download | openembedded-core-contrib-98d7d24a37c809a793496db0c4227e6b592bcb26.tar.gz | |
toaster-manual: Updates to example toasterconf.json file
Fixes [YOCTO #8428]
The changes to the .json file are now shown in the documentation.
(From yocto-docs rev: 5636632f0a2f0d79d632c72037c4306cfad3ec75)
Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/toaster-manual')
| -rw-r--r-- | documentation/toaster-manual/toaster-manual-reference.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/documentation/toaster-manual/toaster-manual-reference.xml b/documentation/toaster-manual/toaster-manual-reference.xml index a0ed88b943..92938ca8d0 100644 --- a/documentation/toaster-manual/toaster-manual-reference.xml +++ b/documentation/toaster-manual/toaster-manual-reference.xml @@ -219,7 +219,7 @@ "name": "Local Yocto Project", "sourcetype": "local", "apiurl": "../../", - "branches": ["HEAD", "master", "fido", "jethro"], + "branches": ["HEAD", "master", "jethro","fido"], "layers": [ { "name": "openembedded-core", @@ -246,13 +246,13 @@ "name": "OpenEmbedded", "sourcetype": "layerindex", "apiurl": "http://layers.openembedded.org/layerindex/api/", - "branches": ["master", "fido", "jethro"] + "branches": ["master", "jethro","fido" ] }, { "name": "Imported layers", "sourcetype": "imported", "apiurl": "", - "branches": ["master", "fido", "jethro", "HEAD"] + "branches": ["master", "jethro","fido", "HEAD"] } ], @@ -538,7 +538,7 @@ "branch": "master", "defaultlayers": [ "openembedded-core" ], "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 }, - "helptext": "Toaster will run your builds using the OpenEmbedded master branch, where active development takes place. This is not a stable branch, so your builds might not work as expected." + "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." } ] </literallayout> |