From eea510cfd3ad31ae74727873cc6d27bb273c4040 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Mon, 13 Aug 2012 08:15:07 -0700
Subject: documentation/dev-manual: modified SSH server discussion for QEMU
 Images

Two areas of the manual updated to reflect the fact that not all
QEMU images have an SSH server in them.

Reported-by: Robert P. J. Day <rpjday@crashcourse.ca>
(From yocto-docs rev: a173d8cb05ee695b02188a037ee047db016c6a67)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 documentation/dev-manual/dev-manual-common-tasks.xml |  1 +
 documentation/dev-manual/dev-manual-start.xml        | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'documentation')

diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index b8708ff19f..018bc52199 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -580,6 +580,7 @@
                 By default, the <filename>core-image-sato</filename> image is configured to use Dropbear.
                 The <filename>core-image-basic</filename> and <filename>core-image-lsb</filename>
                 images both include OpenSSH.
+                The <filename>core-image-minimal</filename> image does not contain an SSH server.
                 To change these defaults, edit the <filename>IMAGE_FEATURES</filename> variable
                 so that it sets the image you are working with to include 
                 <filename>ssh-server-dropbear</filename> or <filename>ssh-server-openssh</filename>.
diff --git a/documentation/dev-manual/dev-manual-start.xml b/documentation/dev-manual/dev-manual-start.xml
index a004004ed2..989437c6c0 100644
--- a/documentation/dev-manual/dev-manual-start.xml
+++ b/documentation/dev-manual/dev-manual-start.xml
@@ -360,11 +360,16 @@
                 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>The QEMU images have a Dropbear secure shell (ssh) server 
-                that runs with the root password disabled.
-                This allows you to use standard <filename>ssh</filename> and 
-                <filename>scp</filename> commands.</para></listitem>
-            <listitem><para>The QEMU images also contain an embedded Network File
+            <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 
+                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>
+            <listitem><para>The QEMU images also can be contain an embedded Network File
                 System (NFS) server that exports the image's root filesystem.
                 This allows you to make the filesystem available to the 
                 host.</para></listitem>
-- 
cgit v1.2.3-54-g00ecf