summaryrefslogtreecommitdiffstats
path: root/documentation/dev-manual/dev-manual-common-tasks.xml
diff options
context:
space:
mode:
authorScott Rifenbark <srifenbark@gmail.com>2016-03-09 13:30:27 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-23 21:56:08 +0000
commit4c5157f7dcfecab3b4e4483cd122e0ae74b377ee (patch)
tree03c0812d79db78ebfd454b540338b66e2dc20521 /documentation/dev-manual/dev-manual-common-tasks.xml
parent4306f7f97a2ea05ebf141947294729584795d832 (diff)
downloadpoky-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-common-tasks.xml')
-rw-r--r--documentation/dev-manual/dev-manual-common-tasks.xml10
1 files changed, 3 insertions, 7 deletions
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index 36c69396cf..199728d2b8 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -9160,11 +9160,8 @@
9160 Before you can initiate a remote debugging session, you need 9160 Before you can initiate a remote debugging session, you need
9161 to be sure you have set up the cross-development environment, 9161 to be sure you have set up the cross-development environment,
9162 toolchain, and sysroot. 9162 toolchain, and sysroot.
9163 The "<ulink url='&YOCTO_DOCS_ADT_URL;#adt-prepare'>Preparing for Application Development</ulink>" 9163 The <ulink url='&YOCTO_DOCS_SDK_URL;#sdk-manual'>Yocto Project Software Development Kit (SDK) Developer's Guide</ulink>
9164 chapter of the Yocto Project Application Developer's Guide
9165 describes this process. 9164 describes this process.
9166 Be sure you have read that chapter and have set up
9167 your environment.
9168 </para> 9165 </para>
9169 </section> 9166 </section>
9170 9167
@@ -9273,9 +9270,8 @@
9273 location is at <filename>/opt/poky/&DISTRO;</filename> 9270 location is at <filename>/opt/poky/&DISTRO;</filename>
9274 and begins with the string "environment-setup". 9271 and begins with the string "environment-setup".
9275 For more information, see the 9272 For more information, see the
9276 "<ulink url='&YOCTO_DOCS_ADT_URL;#setting-up-the-cross-development-environment'>Setting Up the Cross-Development Environment</ulink>" 9273 <ulink url='&YOCTO_DOCS_SDK_URL;#sdk-manual'>Yocto Project Software Development Kit (SDK) Developer's
9277 section in the Yocto Project Application Developer's 9274 Guide</ulink>.
9278 Guide.
9279 </para> 9275 </para>
9280 9276
9281 <para> 9277 <para>