aboutsummaryrefslogtreecommitdiffstats
path: root/documentation/dev-manual
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2014-03-20 08:55:38 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-25 12:29:44 +0000
commitc441f5f005f306a3dfc203237aab42b4a37336b5 (patch)
treed5b67722674c55f4c170ed35e88773f2bc97693e /documentation/dev-manual
parent7a5cd2123a5665afaa41ed97914650e711ac8682 (diff)
downloadopenembedded-core-contrib-c441f5f005f306a3dfc203237aab42b4a37336b5.tar.gz
dev-manual, ref-manual: Changed core-image-basic to core-image-full-cmdline
Fixes [YOCTO #2424] Some imgage names were cleaned up to have more meaningful names. These doc changes here take care of changing "core-image-basic" to "core-image-full-cmdline". Five instances changed. (From yocto-docs rev: b758f9645e66867b5728da1dd989bae70a216fcc) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/dev-manual')
-rw-r--r--documentation/dev-manual/dev-manual-common-tasks.xml2
-rw-r--r--documentation/dev-manual/dev-manual-start.xml20
2 files changed, 13 insertions, 9 deletions
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index 805badaa07..ec1e8fcc66 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -1017,7 +1017,7 @@
well-known standard SSH server implementation.
By default, the <filename>core-image-sato</filename> image
is configured to use Dropbear.
- The <filename>core-image-basic</filename> and
+ The <filename>core-image-full-cmdline</filename> and
<filename>core-image-lsb</filename> images both
include OpenSSH.
The <filename>core-image-minimal</filename> image does not
diff --git a/documentation/dev-manual/dev-manual-start.xml b/documentation/dev-manual/dev-manual-start.xml
index 05cb8fc9d9..deea5a7610 100644
--- a/documentation/dev-manual/dev-manual-start.xml
+++ b/documentation/dev-manual/dev-manual-start.xml
@@ -368,15 +368,19 @@
If so, you can configure the operating system of the running image
to use that port to run a console.
The connection uses standard IP networking.</para></listitem>
- <listitem><para>SSH servers exist in some QEMU images.
- The <filename>core-image-sato</filename> QEMU image has a Dropbear secure
- shell (SSH) server that runs with the root password disabled.
- The <filename>core-image-basic</filename> and <filename>core-image-lsb</filename> QEMU images
+ <listitem><para>
+ SSH servers exist in some QEMU images.
+ The <filename>core-image-sato</filename> QEMU image has a
+ Dropbear secure shell (SSH) server that runs with the root
+ password disabled.
+ The <filename>core-image-full-cmdline</filename> and
+ <filename>core-image-lsb</filename> QEMU images
have OpenSSH instead of Dropbear.
- Including these SSH servers allow you to use standard <filename>ssh</filename> and
- <filename>scp</filename> commands.
- The <filename>core-image-minimal</filename> QEMU image, however, contains no SSH
- server.</para></listitem>
+ Including these SSH servers allow you to use standard
+ <filename>ssh</filename> and <filename>scp</filename> commands.
+ The <filename>core-image-minimal</filename> QEMU image,
+ however, contains no SSH server.
+ </para></listitem>
<listitem><para>You can use a provided, user-space NFS server to boot the QEMU session
using a local copy of the root filesystem on the host.
In order to make this connection, you must extract a root filesystem tarball by using the