summaryrefslogtreecommitdiffstats
path: root/documentation/dev-manual/dev-manual-intro.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-intro.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-intro.xml')
-rw-r--r--documentation/dev-manual/dev-manual-intro.xml17
1 files changed, 9 insertions, 8 deletions
diff --git a/documentation/dev-manual/dev-manual-intro.xml b/documentation/dev-manual/dev-manual-intro.xml
index 5affa86ea3..21b85a5333 100644
--- a/documentation/dev-manual/dev-manual-intro.xml
+++ b/documentation/dev-manual/dev-manual-intro.xml
@@ -86,10 +86,9 @@
86 <itemizedlist> 86 <itemizedlist>
87 <listitem><para><emphasis>Step-by-step instructions when those instructions exist in other Yocto 87 <listitem><para><emphasis>Step-by-step instructions when those instructions exist in other Yocto
88 Project documentation:</emphasis> 88 Project documentation:</emphasis>
89 For example, the Yocto Project Application Developer's Guide contains detailed 89 For example, the Yocto Project Software Development Kit (SDK) Developer's Guide contains detailed
90 instructions on how to run the 90 instructions on how to install an SDK, which is used to
91 <ulink url='&YOCTO_DOCS_ADT_URL;#installing-the-adt'>ADT Installer</ulink>, 91 develop applications for target hardware.</para></listitem>
92 which is used to set up a cross-development environment.</para></listitem>
93 <listitem><para><emphasis>Reference material:</emphasis> 92 <listitem><para><emphasis>Reference material:</emphasis>
94 This type of material resides in an appropriate reference manual. 93 This type of material resides in an appropriate reference manual.
95 For example, system variables are documented in the 94 For example, system variables are documented in the
@@ -126,10 +125,12 @@
126 The build system is sometimes referred to as "Poky". 125 The build system is sometimes referred to as "Poky".
127 </para></listitem> 126 </para></listitem>
128 <listitem><para><emphasis> 127 <listitem><para><emphasis>
129 <ulink url='&YOCTO_DOCS_ADT_URL;'>Yocto Project Application Developer's Guide</ulink>:</emphasis> 128 <ulink url='&YOCTO_DOCS_SDK_URL;'>Yocto Project Software Development Kit (SDK) Developer's Guide</ulink>:</emphasis>
130 This guide provides information that lets you get going with the Application 129 This guide provides information that lets you get going
131 Development Toolkit (ADT) and stand-alone cross-development toolchains to 130 with the standard or extensible SDK.
132 develop projects using the Yocto Project. 131 An SDK, with its cross-development toolchains, allows you
132 to develop projects inside or outside of the Yocto Project
133 environment.
133 </para></listitem> 134 </para></listitem>
134 <listitem><para><emphasis> 135 <listitem><para><emphasis>
135 <ulink url='&YOCTO_DOCS_BSP_URL;'>Yocto Project Board Support Package (BSP) Developer's Guide</ulink>:</emphasis> 136 <ulink url='&YOCTO_DOCS_BSP_URL;'>Yocto Project Board Support Package (BSP) Developer's Guide</ulink>:</emphasis>