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-classes.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-classes.xml')
| -rw-r--r-- | documentation/ref-manual/ref-classes.xml | 9 |
1 files changed, 5 insertions, 4 deletions
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 @@ | |||
| 2638 | toolchain using the | 2638 | toolchain using the |
| 2639 | <link linkend='ref-tasks-populate_sdk'><filename>do_populate_sdk</filename></link> | 2639 | <link linkend='ref-tasks-populate_sdk'><filename>do_populate_sdk</filename></link> |
| 2640 | task, see the | 2640 | task, see the |
| 2641 | "<ulink url='&YOCTO_DOCS_ADT_URL;#optionally-building-a-toolchain-installer'>Optionally Building a Toolchain Installer</ulink>" | 2641 | "<ulink url='&YOCTO_DOCS_SDK_URL;#sdk-optionally-building-a-toolchain-installer'>Optionally Building a Toolchain Installer</ulink>" |
| 2642 | section in the Yocto Project Application Developer's Guide. | 2642 | section in the Yocto Project Software Development Kit (SDK) Developer's Guide. |
| 2643 | </para> | 2643 | </para> |
| 2644 | </section> | 2644 | </section> |
| 2645 | 2645 | ||
| @@ -2718,8 +2718,9 @@ | |||
| 2718 | cross-development toolchain using the | 2718 | cross-development toolchain using the |
| 2719 | <link linkend='ref-tasks-populate_sdk'><filename>do_populate_sdk</filename></link> | 2719 | <link linkend='ref-tasks-populate_sdk'><filename>do_populate_sdk</filename></link> |
| 2720 | task, see the | 2720 | task, see the |
| 2721 | "<ulink url='&YOCTO_DOCS_ADT_URL;#optionally-building-a-toolchain-installer'>Optionally Building a Toolchain Installer</ulink>" | 2721 | "<ulink url='&YOCTO_DOCS_SDK_URL;#sdk-optionally-building-a-toolchain-installer'>Optionally Building a Toolchain Installer</ulink>" |
| 2722 | section in the Yocto Project Application Developer's Guide. | 2722 | section in the Yocto Project Software Development Kit (SDK) Developer's |
| 2723 | Guide. | ||
| 2723 | </para> | 2724 | </para> |
| 2724 | </section> | 2725 | </section> |
| 2725 | 2726 | ||