summaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2013-04-09 11:03:31 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-10 16:20:55 +0100
commit29148bc39a9038239c50ac8b7690be99e535441e (patch)
tree43792f40b201dcf54ad36df846bc180756afb6c9 /documentation
parent94b786bf91ed5ed655ae4c4543ba3a81faa9d583 (diff)
downloadpoky-29148bc39a9038239c50ac8b7690be99e535441e.tar.gz
dev-manual: Edits to the "Using Pre-Built Binaries and QEMU" section.
(From yocto-docs rev: d6626c7e90f01489e19c553752b08eb9ab575548) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r--documentation/dev-manual/dev-manual-start.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/documentation/dev-manual/dev-manual-start.xml b/documentation/dev-manual/dev-manual-start.xml
index 42a6e82c88..fb95d07377 100644
--- a/documentation/dev-manual/dev-manual-start.xml
+++ b/documentation/dev-manual/dev-manual-start.xml
@@ -366,7 +366,7 @@
366 You can accomplish this by defining the cross-compiler variable 366 You can accomplish this by defining the cross-compiler variable
367 (e.g. <filename>export CC="distcc"</filename>). 367 (e.g. <filename>export CC="distcc"</filename>).
368 Alternatively, if you are using a suitable SDK image or the appropriate 368 Alternatively, if you are using a suitable SDK image or the appropriate
369 stand-alone toolchain is present in <filename>/opt/poky</filename>, 369 stand-alone toolchain is present,
370 the toolchain is also automatically used. 370 the toolchain is also automatically used.
371 </para> 371 </para>
372 372
@@ -382,12 +382,12 @@
382 The connection uses standard IP networking.</para></listitem> 382 The connection uses standard IP networking.</para></listitem>
383 <listitem><para>SSH servers exist in some QEMU images. 383 <listitem><para>SSH servers exist in some QEMU images.
384 The <filename>core-image-sato</filename> QEMU image has a Dropbear secure 384 The <filename>core-image-sato</filename> QEMU image has a Dropbear secure
385 shell (ssh) server that runs with the root password disabled. 385 shell (SSH) server that runs with the root password disabled.
386 The <filename>core-image-basic</filename> and <filename>core-image-lsb</filename> QEMU images 386 The <filename>core-image-basic</filename> and <filename>core-image-lsb</filename> QEMU images
387 have OpenSSH instead of Dropbear. 387 have OpenSSH instead of Dropbear.
388 Including these SSH servers allow you to use standard <filename>ssh</filename> and 388 Including these SSH servers allow you to use standard <filename>ssh</filename> and
389 <filename>scp</filename> commands. 389 <filename>scp</filename> commands.
390 The <filename>core-image-minimal</filename> QEMU image, however, contains no ssh 390 The <filename>core-image-minimal</filename> QEMU image, however, contains no SSH
391 server.</para></listitem> 391 server.</para></listitem>
392 <listitem><para>You can use a provided, user-space NFS server to boot the QEMU session 392 <listitem><para>You can use a provided, user-space NFS server to boot the QEMU session
393 using a local copy of the root filesystem on the host. 393 using a local copy of the root filesystem on the host.