From 4c5157f7dcfecab3b4e4483cd122e0ae74b377ee Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Wed, 9 Mar 2016 13:30:27 -0800 Subject: ref-manual: Resolving a conflict (From yocto-docs rev: b364516928d04da38ef3188f07f190ffac64762b) Signed-off-by: Scott Rifenbark Signed-off-by: Richard Purdie --- documentation/ref-manual/introduction.xml | 16 ++++++++-------- documentation/ref-manual/ref-classes.xml | 9 +++++---- documentation/ref-manual/ref-features.xml | 4 +--- documentation/ref-manual/ref-structure.xml | 4 ++-- documentation/ref-manual/ref-variables.xml | 13 +++++-------- documentation/ref-manual/technical-details.xml | 7 ++++--- documentation/ref-manual/usingpoky.xml | 12 ++++++------ 7 files changed, 31 insertions(+), 34 deletions(-) (limited to 'documentation/ref-manual') 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 @@ $ sudo apt-get install make xsltproc docbook-utils fop dblatex xmlto - ADT Installer Extras: + SDK Installer Extras: Packages needed if you are going to be using the - Application Development Toolkit (ADT) Installer: + the standard or extensible SDK: $ sudo apt-get install autoconf automake libtool libglib2.0-dev libarchive-dev @@ -289,9 +289,9 @@ $ sudo dnf install make docbook-style-dsssl docbook-style-xsl \ docbook-dtds docbook-utils fop libxslt dblatex xmlto xsltproc - ADT Installer Extras: + SDK Installer Extras: Packages needed if you are going to be using the - Application Development Toolkit (ADT) Installer: + standard or extensible SDK: $ sudo dnf install autoconf automake libtool glib2-devel libarchive-devel @@ -332,9 +332,9 @@ $ sudo zypper install make fop xsltproc dblatex xmlto - ADT Installer Extras: + SDK Installer Extras: Packages needed if you are going to be using the - Application Development Toolkit (ADT) Installer: + standard or extensible SDK: $ sudo zypper install autoconf automake libtool glib2-devel libarchive-devel @@ -387,9 +387,9 @@ $ sudo yum install make docbook-style-dsssl docbook-style-xsl \ docbook-dtds docbook-utils fop libxslt dblatex xmlto xsltproc - ADT Installer Extras: + SDK Installer Extras: Packages needed if you are going to be using the - Application Development Toolkit (ADT) Installer: + standard or extensible SDK: $ sudo yum install autoconf automake libtool glib2-devel libarchive-devel 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 do_populate_sdk task, see the - "Optionally Building a Toolchain Installer" - section in the Yocto Project Application Developer's Guide. + "Optionally Building a Toolchain Installer" + section in the Yocto Project Software Development Kit (SDK) Developer's Guide. @@ -2718,8 +2718,9 @@ cross-development toolchain using the do_populate_sdk task, see the - "Optionally Building a Toolchain Installer" - section in the Yocto Project Application Developer's Guide. + "Optionally Building a Toolchain Installer" + section in the Yocto Project Software Development Kit (SDK) Developer's + Guide. 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 @@ oprofile, exmap, and LTTng. For general information on user-space tools, see the - "User-Space Tools" - section in the Yocto Project Application Developer's - Guide. + Yocto Project Software Development Kit (SDK) Developer's Guide. tools-sdk: 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 - "Optionally Building a Toolchain Installer" - section in the Yocto Project Application Developer's Guide. + "Optionally Building a Toolchain Installer" + section in the Yocto Project Software Development Kit (SDK) Developer's Guide. 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" SDKMACHINE - 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." - 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 SDKMACHINE 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 - "Installing the ADT and Toolchains" - section in the Yocto Project Application Developer's Guide. + Yocto Project Software Development Kit (SDK) Developer's Guide. @@ -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 - "Installing the ADT and Toolchains" - section in the Yocto Project Application Developer's Guide. + Yocto Project Software Development Kit (SDK) Developer's Guide. 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 - Yocto Project Application Developer's Guide. + Yocto Project Software Development Kit (SDK) Developer's Guide. @@ -371,8 +371,9 @@ For information on advantages gained when building a cross-development toolchain installer, see the - "Optionally Building a Toolchain Installer" - section in the Yocto Project Application Developer's Guide. + "Optionally Building a Toolchain Installer" + section in the Yocto Project Software Development Kit (SDK) Developer's + Guide. 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 @@ tmp/deploy/images. For information on how to run pre-built images such as qemux86 and qemuarm, see the - "Example Using Pre-Built Binaries and QEMU" - section in the Yocto Project Application Developer's Guide. + Yocto Project Software Development Kit (SDK) Developer's Guide. For information about how to install these images, see the documentation for your particular board or machine. @@ -150,10 +149,11 @@ For discussions on debugging, see the - "Debugging With the GNU Project Debugger (GDB) Remotely" - and - "Working within Eclipse" - sections in the Yocto Project Development Manual. + "Debugging With the GNU Project Debugger (GDB) Remotely" section + in the Yocto Project Developer's Manual + and the + "Working within Eclipse" + section in the Yocto Project Software Development Kit (SDK) Developer's Guide. -- cgit 1.2.3-korg