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-start.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-start.xml')
-rw-r--r-- | documentation/dev-manual/dev-manual-start.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/documentation/dev-manual/dev-manual-start.xml b/documentation/dev-manual/dev-manual-start.xml index 9f349adcdd..a9a0c797b4 100644 --- a/documentation/dev-manual/dev-manual-start.xml +++ b/documentation/dev-manual/dev-manual-start.xml | |||
@@ -279,8 +279,9 @@ | |||
279 | applications using the Eclipse Integrated Development Environment (IDE), | 279 | applications using the Eclipse Integrated Development Environment (IDE), |
280 | you will need this plug-in. | 280 | you will need this plug-in. |
281 | See the | 281 | See the |
282 | "<link linkend='setting-up-the-eclipse-ide'>Setting up the Eclipse IDE</link>" | 282 | "<ulink url='&YOCTO_DOCS_SDK_URL;#setting-up-the-eclipse-ide'>Setting up the Eclipse IDE</ulink>" |
283 | section for more information.</para></listitem> | 283 | section in the Yocto Project Software Development Kit (SDK) |
284 | Developer's Guide for more information.</para></listitem> | ||
284 | </itemizedlist> | 285 | </itemizedlist> |
285 | </para> | 286 | </para> |
286 | </section> | 287 | </section> |
@@ -366,8 +367,7 @@ | |||
366 | by sourcing an environment setup script. | 367 | by sourcing an environment setup script. |
367 | Finally, you start the QEMU emulator. | 368 | Finally, you start the QEMU emulator. |
368 | You can find details on all these steps in the | 369 | You can find details on all these steps in the |
369 | "<ulink url='&YOCTO_DOCS_QS_URL;#using-pre-built'>Example Using Pre-Built Binaries and QEMU</ulink>" | 370 | <ulink url='&YOCTO_DOCS_SDK_URL;#sdk-manual'>Yocto Project Software Development Kit (SDK) Developer's Guide</ulink>. |
370 | section of the Yocto Project Application Developer's Guide. | ||
371 | You can learn more about using QEMU with the Yocto Project in the | 371 | You can learn more about using QEMU with the Yocto Project in the |
372 | "<link linkend='dev-manual-qemu'>Using the Quick EMUlator (QEMU)</link>" | 372 | "<link linkend='dev-manual-qemu'>Using the Quick EMUlator (QEMU)</link>" |
373 | section. | 373 | section. |