summaryrefslogtreecommitdiffstats
path: root/documentation/ref-manual/technical-details.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/ref-manual/technical-details.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/ref-manual/technical-details.xml')
-rw-r--r--documentation/ref-manual/technical-details.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/documentation/ref-manual/technical-details.xml b/documentation/ref-manual/technical-details.xml
index 2098818d04..d99ff188ad 100644
--- a/documentation/ref-manual/technical-details.xml
+++ b/documentation/ref-manual/technical-details.xml
@@ -187,7 +187,7 @@
187 This section provides some technical background on how 187 This section provides some technical background on how
188 cross-development toolchains are created and used. 188 cross-development toolchains are created and used.
189 For more information on toolchains, you can also see the 189 For more information on toolchains, you can also see the
190 <ulink url='&YOCTO_DOCS_ADT_URL;'>Yocto Project Application Developer's Guide</ulink>. 190 <ulink url='&YOCTO_DOCS_SDK_URL;'>Yocto Project Software Development Kit (SDK) Developer's Guide</ulink>.
191 </para> 191 </para>
192 192
193 <para> 193 <para>
@@ -371,8 +371,9 @@
371 <note> 371 <note>
372 For information on advantages gained when building a 372 For information on advantages gained when building a
373 cross-development toolchain installer, see the 373 cross-development toolchain installer, see the
374 "<ulink url='&YOCTO_DOCS_ADT_URL;#optionally-building-a-toolchain-installer'>Optionally Building a Toolchain Installer</ulink>" 374 "<ulink url='&YOCTO_DOCS_SDK_URL;#sdk-optionally-building-a-toolchain-installer'>Optionally Building a Toolchain Installer</ulink>"
375 section in the Yocto Project Application Developer's Guide. 375 section in the Yocto Project Software Development Kit (SDK) Developer's
376 Guide.
376 </note> 377 </note>
377</section> 378</section>
378 379