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/usingpoky.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/usingpoky.xml')
-rw-r--r-- | documentation/ref-manual/usingpoky.xml | 12 |
1 files changed, 6 insertions, 6 deletions
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 @@ | |||
113 | <filename class="directory">tmp/deploy/images</filename>. | 113 | <filename class="directory">tmp/deploy/images</filename>. |
114 | For information on how to run pre-built images such as <filename>qemux86</filename> | 114 | For information on how to run pre-built images such as <filename>qemux86</filename> |
115 | and <filename>qemuarm</filename>, see the | 115 | and <filename>qemuarm</filename>, see the |
116 | "<ulink url='&YOCTO_DOCS_QS_URL;#using-pre-built'>Example Using Pre-Built Binaries and QEMU</ulink>" | 116 | <ulink url='&YOCTO_DOCS_SDK_URL;#sdk-manual'>Yocto Project Software Development Kit (SDK) Developer's Guide</ulink>. |
117 | section in the Yocto Project Application Developer's Guide. | ||
118 | For information about how to install these images, see the documentation for your | 117 | For information about how to install these images, see the documentation for your |
119 | particular board or machine. | 118 | particular board or machine. |
120 | </para> | 119 | </para> |
@@ -150,10 +149,11 @@ | |||
150 | 149 | ||
151 | <para> | 150 | <para> |
152 | For discussions on debugging, see the | 151 | For discussions on debugging, see the |
153 | "<ulink url='&YOCTO_DOCS_DEV_URL;#platdev-gdb-remotedebug'>Debugging With the GNU Project Debugger (GDB) Remotely</ulink>" | 152 | "<ulink url='&YOCTO_DOCS_DEV_URL;#platdev-gdb-remotedebug'>Debugging With the GNU Project Debugger (GDB) Remotely</ulink>" section |
154 | and | 153 | in the Yocto Project Developer's Manual |
155 | "<ulink url='&YOCTO_DOCS_DEV_URL;#adt-eclipse'>Working within Eclipse</ulink>" | 154 | and the |
156 | sections in the Yocto Project Development Manual. | 155 | "<ulink url='&YOCTO_DOCS_SDK_URL;#adt-eclipse'>Working within Eclipse</ulink>" |
156 | section in the Yocto Project Software Development Kit (SDK) Developer's Guide. | ||
157 | </para> | 157 | </para> |
158 | 158 | ||
159 | <note> | 159 | <note> |