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/introduction.xml | |
| 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/introduction.xml')
| -rw-r--r-- | documentation/ref-manual/introduction.xml | 16 |
1 files changed, 8 insertions, 8 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> |