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/ref-manual | |
parent | 4306f7f97a2ea05ebf141947294729584795d832 (diff) | |
download | openembedded-core-contrib-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')
-rw-r--r-- | documentation/ref-manual/introduction.xml | 16 | ||||
-rw-r--r-- | documentation/ref-manual/ref-classes.xml | 9 | ||||
-rw-r--r-- | documentation/ref-manual/ref-features.xml | 4 | ||||
-rw-r--r-- | documentation/ref-manual/ref-structure.xml | 4 | ||||
-rw-r--r-- | documentation/ref-manual/ref-variables.xml | 13 | ||||
-rw-r--r-- | documentation/ref-manual/technical-details.xml | 7 | ||||
-rw-r--r-- | documentation/ref-manual/usingpoky.xml | 12 |
7 files changed, 31 insertions, 34 deletions
diff --git a/documentation/ref-manual/introduction.xml b/documentation/ref-manual/introduction.xml index e82f8340fb..ecabaaa421 100644 --- a/documentation/ref-manual/introduction.xml +++ b/documentation/ref-manual/introduction.xml @@ -245,9 +245,9 @@ <literallayout class='monospaced'> $ sudo apt-get install make xsltproc docbook-utils fop dblatex xmlto </literallayout></para></listitem> - <listitem><para><emphasis>ADT Installer Extras:</emphasis> + <listitem><para><emphasis>SDK Installer Extras:</emphasis> Packages needed if you are going to be using the - <ulink url='&YOCTO_DOCS_ADT_URL;#using-the-adt-installer'>Application Development Toolkit (ADT) Installer</ulink>: + the standard or extensible SDK: <literallayout class='monospaced'> $ sudo apt-get install autoconf automake libtool libglib2.0-dev libarchive-dev </literallayout></para></listitem> @@ -289,9 +289,9 @@ $ sudo dnf install make docbook-style-dsssl docbook-style-xsl \ docbook-dtds docbook-utils fop libxslt dblatex xmlto xsltproc </literallayout></para></listitem> - <listitem><para><emphasis>ADT Installer Extras:</emphasis> + <listitem><para><emphasis>SDK Installer Extras:</emphasis> Packages needed if you are going to be using the - <ulink url='&YOCTO_DOCS_ADT_URL;#using-the-adt-installer'>Application Development Toolkit (ADT) Installer</ulink>: + standard or extensible SDK: <literallayout class='monospaced'> $ sudo dnf install autoconf automake libtool glib2-devel libarchive-devel </literallayout></para></listitem> @@ -332,9 +332,9 @@ <literallayout class='monospaced'> $ sudo zypper install make fop xsltproc dblatex xmlto </literallayout></para></listitem> - <listitem><para><emphasis>ADT Installer Extras:</emphasis> + <listitem><para><emphasis>SDK Installer Extras:</emphasis> Packages needed if you are going to be using the - <ulink url='&YOCTO_DOCS_ADT_URL;#using-the-adt-installer'>Application Development Toolkit (ADT) Installer</ulink>: + standard or extensible SDK: <literallayout class='monospaced'> $ sudo zypper install autoconf automake libtool glib2-devel libarchive-devel </literallayout></para></listitem> @@ -387,9 +387,9 @@ $ sudo yum install make docbook-style-dsssl docbook-style-xsl \ docbook-dtds docbook-utils fop libxslt dblatex xmlto xsltproc </literallayout></para></listitem> - <listitem><para><emphasis>ADT Installer Extras:</emphasis> + <listitem><para><emphasis>SDK Installer Extras:</emphasis> Packages needed if you are going to be using the - <ulink url='&YOCTO_DOCS_ADT_URL;#using-the-adt-installer'>Application Development Toolkit (ADT) Installer</ulink>: + standard or extensible SDK: <literallayout class='monospaced'> $ sudo yum install autoconf automake libtool glib2-devel libarchive-devel </literallayout></para></listitem> diff --git a/documentation/ref-manual/ref-classes.xml b/documentation/ref-manual/ref-classes.xml index bf4e5a949b..96258949a0 100644 --- a/documentation/ref-manual/ref-classes.xml +++ b/documentation/ref-manual/ref-classes.xml @@ -2638,8 +2638,8 @@ toolchain using the <link linkend='ref-tasks-populate_sdk'><filename>do_populate_sdk</filename></link> task, see the - "<ulink url='&YOCTO_DOCS_ADT_URL;#optionally-building-a-toolchain-installer'>Optionally Building a Toolchain Installer</ulink>" - section in the Yocto Project Application Developer's Guide. + "<ulink url='&YOCTO_DOCS_SDK_URL;#sdk-optionally-building-a-toolchain-installer'>Optionally Building a Toolchain Installer</ulink>" + section in the Yocto Project Software Development Kit (SDK) Developer's Guide. </para> </section> @@ -2718,8 +2718,9 @@ cross-development toolchain using the <link linkend='ref-tasks-populate_sdk'><filename>do_populate_sdk</filename></link> task, see the - "<ulink url='&YOCTO_DOCS_ADT_URL;#optionally-building-a-toolchain-installer'>Optionally Building a Toolchain Installer</ulink>" - section in the Yocto Project Application Developer's Guide. + "<ulink url='&YOCTO_DOCS_SDK_URL;#sdk-optionally-building-a-toolchain-installer'>Optionally Building a Toolchain Installer</ulink>" + section in the Yocto Project Software Development Kit (SDK) Developer's + Guide. </para> </section> diff --git a/documentation/ref-manual/ref-features.xml b/documentation/ref-manual/ref-features.xml index 1499853608..56e1185681 100644 --- a/documentation/ref-manual/ref-features.xml +++ b/documentation/ref-manual/ref-features.xml @@ -333,9 +333,7 @@ <filename>oprofile</filename>, <filename>exmap</filename>, and <filename>LTTng</filename>. For general information on user-space tools, see the - "<ulink url='&YOCTO_DOCS_ADT_URL;#user-space-tools'>User-Space Tools</ulink>" - section in the Yocto Project Application Developer's - Guide. + <ulink url='&YOCTO_DOCS_SDK_URL;#sdk-manual'>Yocto Project Software Development Kit (SDK) Developer's Guide</ulink>. </para></listitem> <listitem><para><emphasis>tools-sdk:</emphasis> Installs a full SDK that runs on the device. diff --git a/documentation/ref-manual/ref-structure.xml b/documentation/ref-manual/ref-structure.xml index 578b381e09..8be054ba08 100644 --- a/documentation/ref-manual/ref-structure.xml +++ b/documentation/ref-manual/ref-structure.xml @@ -766,8 +766,8 @@ toolchain installer scripts, which when executed, install the sysroot that matches your target hardware. You can find out more about these installers in the - "<ulink url='&YOCTO_DOCS_ADT_URL;#optionally-building-a-toolchain-installer'>Optionally Building a Toolchain Installer</ulink>" - section in the Yocto Project Application Developer's Guide. + "<ulink url='&YOCTO_DOCS_SDK_URL;#sdk-optionally-building-a-toolchain-installer'>Optionally Building a Toolchain Installer</ulink>" + section in the Yocto Project Software Development Kit (SDK) Developer's Guide. </para> </section> diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml index 376cd9a9ee..ad87a63312 100644 --- a/documentation/ref-manual/ref-variables.xml +++ b/documentation/ref-manual/ref-variables.xml @@ -11140,14 +11140,13 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" <glossentry id='var-SDKMACHINE'><glossterm>SDKMACHINE</glossterm> <info> - SDKMACHINE[doc] = "Specifies the architecture (i.e. i686 or x86_64) for which to build SDK and ADT items." + SDKMACHINE[doc] = "Specifies the architecture (i.e. i686 or x86_64) for which to build SDK items." </info> <glossdef> <para role="glossdeffirst"> <!-- <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" /> --> - The machine for which the Application Development Toolkit - (ADT) or SDK is built. - In other words, the SDK or ADT is built such that it + The machine for which the SDK is built. + In other words, the SDK is built such that it runs on the target you specify with the <filename>SDKMACHINE</filename> value. The value points to a corresponding @@ -13577,8 +13576,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" section. For information on setting up a cross-development environment, see the - "<ulink url='&YOCTO_DOCS_ADT_URL;#installing-the-adt'>Installing the ADT and Toolchains</ulink>" - section in the Yocto Project Application Developer's Guide. + <ulink url='&YOCTO_DOCS_SDK_URL;#sdk-manual'>Yocto Project Software Development Kit (SDK) Developer's Guide</ulink>. </para> </glossdef> </glossentry> @@ -13629,8 +13627,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" section. For information on setting up a cross-development environment, see the - "<ulink url='&YOCTO_DOCS_ADT_URL;#installing-the-adt'>Installing the ADT and Toolchains</ulink>" - section in the Yocto Project Application Developer's Guide. + <ulink url='&YOCTO_DOCS_SDK_URL;#sdk-manual'>Yocto Project Software Development Kit (SDK) Developer's Guide</ulink>. </para> </glossdef> </glossentry> 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 @@ This section provides some technical background on how cross-development toolchains are created and used. For more information on toolchains, you can also see the - <ulink url='&YOCTO_DOCS_ADT_URL;'>Yocto Project Application Developer's Guide</ulink>. + <ulink url='&YOCTO_DOCS_SDK_URL;'>Yocto Project Software Development Kit (SDK) Developer's Guide</ulink>. </para> <para> @@ -371,8 +371,9 @@ <note> For information on advantages gained when building a cross-development toolchain installer, see the - "<ulink url='&YOCTO_DOCS_ADT_URL;#optionally-building-a-toolchain-installer'>Optionally Building a Toolchain Installer</ulink>" - section in the Yocto Project Application Developer's Guide. + "<ulink url='&YOCTO_DOCS_SDK_URL;#sdk-optionally-building-a-toolchain-installer'>Optionally Building a Toolchain Installer</ulink>" + section in the Yocto Project Software Development Kit (SDK) Developer's + Guide. </note> </section> diff --git a/documentation/ref-manual/usingpoky.xml b/documentation/ref-manual/usingpoky.xml index d1a0a29eff..09ecaafda5 100644 --- a/documentation/ref-manual/usingpoky.xml +++ b/documentation/ref-manual/usingpoky.xml @@ -113,8 +113,7 @@ <filename class="directory">tmp/deploy/images</filename>. For information on how to run pre-built images such as <filename>qemux86</filename> and <filename>qemuarm</filename>, see the - "<ulink url='&YOCTO_DOCS_QS_URL;#using-pre-built'>Example Using Pre-Built Binaries and QEMU</ulink>" - section in the Yocto Project Application Developer's Guide. + <ulink url='&YOCTO_DOCS_SDK_URL;#sdk-manual'>Yocto Project Software Development Kit (SDK) Developer's Guide</ulink>. For information about how to install these images, see the documentation for your particular board or machine. </para> @@ -150,10 +149,11 @@ <para> For discussions on debugging, see the - "<ulink url='&YOCTO_DOCS_DEV_URL;#platdev-gdb-remotedebug'>Debugging With the GNU Project Debugger (GDB) Remotely</ulink>" - and - "<ulink url='&YOCTO_DOCS_DEV_URL;#adt-eclipse'>Working within Eclipse</ulink>" - sections in the Yocto Project Development Manual. + "<ulink url='&YOCTO_DOCS_DEV_URL;#platdev-gdb-remotedebug'>Debugging With the GNU Project Debugger (GDB) Remotely</ulink>" section + in the Yocto Project Developer's Manual + and the + "<ulink url='&YOCTO_DOCS_SDK_URL;#adt-eclipse'>Working within Eclipse</ulink>" + section in the Yocto Project Software Development Kit (SDK) Developer's Guide. </para> <note> |