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/ref-features.xml | |
parent | 4306f7f97a2ea05ebf141947294729584795d832 (diff) | |
download | poky-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/ref-features.xml')
-rw-r--r-- | documentation/ref-manual/ref-features.xml | 4 |
1 files changed, 1 insertions, 3 deletions
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 @@ | |||
333 | <filename>oprofile</filename>, <filename>exmap</filename>, | 333 | <filename>oprofile</filename>, <filename>exmap</filename>, |
334 | and <filename>LTTng</filename>. | 334 | and <filename>LTTng</filename>. |
335 | For general information on user-space tools, see the | 335 | For general information on user-space tools, see the |
336 | "<ulink url='&YOCTO_DOCS_ADT_URL;#user-space-tools'>User-Space Tools</ulink>" | 336 | <ulink url='&YOCTO_DOCS_SDK_URL;#sdk-manual'>Yocto Project Software Development Kit (SDK) Developer's Guide</ulink>. |
337 | section in the Yocto Project Application Developer's | ||
338 | Guide. | ||
339 | </para></listitem> | 337 | </para></listitem> |
340 | <listitem><para><emphasis>tools-sdk:</emphasis> | 338 | <listitem><para><emphasis>tools-sdk:</emphasis> |
341 | Installs a full SDK that runs on the device. | 339 | Installs a full SDK that runs on the device. |