diff options
| author | Scott Rifenbark <srifenbark@gmail.com> | 2016-03-09 13:30:27 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-23 21:56:08 +0000 |
| commit | 4c5157f7dcfecab3b4e4483cd122e0ae74b377ee (patch) | |
| tree | 03c0812d79db78ebfd454b540338b66e2dc20521 /documentation/dev-manual/dev-manual-newbie.xml | |
| parent | 4306f7f97a2ea05ebf141947294729584795d832 (diff) | |
| download | poky-4c5157f7dcfecab3b4e4483cd122e0ae74b377ee.tar.gz | |
ref-manual: Resolving a conflict
(From yocto-docs rev: b364516928d04da38ef3188f07f190ffac64762b)
Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/dev-manual/dev-manual-newbie.xml')
| -rw-r--r-- | documentation/dev-manual/dev-manual-newbie.xml | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml index 70fa96975d..e81ec15f75 100644 --- a/documentation/dev-manual/dev-manual-newbie.xml +++ b/documentation/dev-manual/dev-manual-newbie.xml | |||
| @@ -106,12 +106,9 @@ | |||
| 106 | isolated applications.</para></listitem> | 106 | isolated applications.</para></listitem> |
| 107 | <listitem><para>When possible, use the Yocto Project | 107 | <listitem><para>When possible, use the Yocto Project |
| 108 | plug-in for the <trademark class='trade'>Eclipse</trademark> IDE | 108 | plug-in for the <trademark class='trade'>Eclipse</trademark> IDE |
| 109 | and other pieces of Application Development | 109 | and SDK development practices. |
| 110 | Technology (ADT). | ||
| 111 | For more information, see the | 110 | For more information, see the |
| 112 | "<link linkend='application-development-workflow'>Application | 111 | "<ulink url='&YOCTO_DOCS_SDK_URL;'>Yocto Project Software Development Kit (SDK) Developer's Guide</ulink>". |
| 113 | Development Workflow</link>" section as well as the | ||
| 114 | <ulink url='&YOCTO_DOCS_ADT_URL;'>Yocto Project Application Developer's Guide</ulink>. | ||
| 115 | </para></listitem> | 112 | </para></listitem> |
| 116 | <listitem><para>Keep your cross-development toolchains | 113 | <listitem><para>Keep your cross-development toolchains |
| 117 | updated. | 114 | updated. |
| @@ -650,8 +647,7 @@ | |||
| 650 | section in the Yocto Project Reference Manual. | 647 | section in the Yocto Project Reference Manual. |
| 651 | You can also find more information on using the | 648 | You can also find more information on using the |
| 652 | relocatable toolchain in the | 649 | relocatable toolchain in the |
| 653 | <ulink url='&YOCTO_DOCS_ADT_URL;'>Yocto Project | 650 | <ulink url='&YOCTO_DOCS_SDK_URL;'>Yocto Project Software Development Kit (SDK) Developer's Guide</ulink>. |
| 654 | Application Developer's Guide</ulink>. | ||
| 655 | </para></listitem> | 651 | </para></listitem> |
| 656 | <listitem><para><emphasis>Image:</emphasis> | 652 | <listitem><para><emphasis>Image:</emphasis> |
| 657 | An image is an artifact of the BitBake build process given | 653 | An image is an artifact of the BitBake build process given |