diff options
| author | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2014-03-20 08:55:38 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-25 12:29:44 +0000 |
| commit | c441f5f005f306a3dfc203237aab42b4a37336b5 (patch) | |
| tree | d5b67722674c55f4c170ed35e88773f2bc97693e /documentation | |
| parent | 7a5cd2123a5665afaa41ed97914650e711ac8682 (diff) | |
| download | poky-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')
| -rw-r--r-- | documentation/dev-manual/dev-manual-common-tasks.xml | 2 | ||||
| -rw-r--r-- | documentation/dev-manual/dev-manual-start.xml | 20 | ||||
| -rw-r--r-- | documentation/ref-manual/ref-images.xml | 2 | ||||
| -rw-r--r-- | documentation/ref-manual/ref-variables.xml | 4 |
4 files changed, 16 insertions, 12 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 @@ | |||
| 1017 | well-known standard SSH server implementation. | 1017 | well-known standard SSH server implementation. |
| 1018 | By default, the <filename>core-image-sato</filename> image | 1018 | By default, the <filename>core-image-sato</filename> image |
| 1019 | is configured to use Dropbear. | 1019 | is configured to use Dropbear. |
| 1020 | The <filename>core-image-basic</filename> and | 1020 | The <filename>core-image-full-cmdline</filename> and |
| 1021 | <filename>core-image-lsb</filename> images both | 1021 | <filename>core-image-lsb</filename> images both |
| 1022 | include OpenSSH. | 1022 | include OpenSSH. |
| 1023 | The <filename>core-image-minimal</filename> image does not | 1023 | 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 @@ | |||
| 368 | If so, you can configure the operating system of the running image | 368 | If so, you can configure the operating system of the running image |
| 369 | to use that port to run a console. | 369 | to use that port to run a console. |
| 370 | The connection uses standard IP networking.</para></listitem> | 370 | The connection uses standard IP networking.</para></listitem> |
| 371 | <listitem><para>SSH servers exist in some QEMU images. | 371 | <listitem><para> |
| 372 | The <filename>core-image-sato</filename> QEMU image has a Dropbear secure | 372 | SSH servers exist in some QEMU images. |
| 373 | shell (SSH) server that runs with the root password disabled. | 373 | The <filename>core-image-sato</filename> QEMU image has a |
| 374 | The <filename>core-image-basic</filename> and <filename>core-image-lsb</filename> QEMU images | 374 | Dropbear secure shell (SSH) server that runs with the root |
| 375 | password disabled. | ||
| 376 | The <filename>core-image-full-cmdline</filename> and | ||
| 377 | <filename>core-image-lsb</filename> QEMU images | ||
| 375 | have OpenSSH instead of Dropbear. | 378 | have OpenSSH instead of Dropbear. |
| 376 | Including these SSH servers allow you to use standard <filename>ssh</filename> and | 379 | Including these SSH servers allow you to use standard |
| 377 | <filename>scp</filename> commands. | 380 | <filename>ssh</filename> and <filename>scp</filename> commands. |
| 378 | The <filename>core-image-minimal</filename> QEMU image, however, contains no SSH | 381 | The <filename>core-image-minimal</filename> QEMU image, |
| 379 | server.</para></listitem> | 382 | however, contains no SSH server. |
| 383 | </para></listitem> | ||
| 380 | <listitem><para>You can use a provided, user-space NFS server to boot the QEMU session | 384 | <listitem><para>You can use a provided, user-space NFS server to boot the QEMU session |
| 381 | using a local copy of the root filesystem on the host. | 385 | using a local copy of the root filesystem on the host. |
| 382 | In order to make this connection, you must extract a root filesystem tarball by using the | 386 | In order to make this connection, you must extract a root filesystem tarball by using the |
diff --git a/documentation/ref-manual/ref-images.xml b/documentation/ref-manual/ref-images.xml index a002c59d3f..529decfc96 100644 --- a/documentation/ref-manual/ref-images.xml +++ b/documentation/ref-manual/ref-images.xml | |||
| @@ -71,7 +71,7 @@ | |||
| 71 | for the Minimal MTD Utilities, which let the user interact with the | 71 | for the Minimal MTD Utilities, which let the user interact with the |
| 72 | MTD subsystem in the kernel to perform operations on flash devices. | 72 | MTD subsystem in the kernel to perform operations on flash devices. |
| 73 | </para></listitem> | 73 | </para></listitem> |
| 74 | <listitem><para><emphasis><filename>core-image-basic</filename>:</emphasis> | 74 | <listitem><para><emphasis><filename>core-image-full-cmdline</filename>:</emphasis> |
| 75 | A console-only image with more full-featured Linux system | 75 | A console-only image with more full-featured Linux system |
| 76 | functionality installed.</para></listitem> | 76 | functionality installed.</para></listitem> |
| 77 | <listitem><para><emphasis><filename>core-image-lsb</filename>:</emphasis> | 77 | <listitem><para><emphasis><filename>core-image-lsb</filename>:</emphasis> |
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml index 5f2b76be8c..8e4f1793bb 100644 --- a/documentation/ref-manual/ref-variables.xml +++ b/documentation/ref-manual/ref-variables.xml | |||
| @@ -4297,7 +4297,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" | |||
| 4297 | <para> | 4297 | <para> |
| 4298 | This variable affects all images based on | 4298 | This variable affects all images based on |
| 4299 | <filename>packagegroup-base</filename>, which does not include the | 4299 | <filename>packagegroup-base</filename>, which does not include the |
| 4300 | <filename>core-image-minimal</filename> or <filename>core-image-basic</filename> | 4300 | <filename>core-image-minimal</filename> or <filename>core-image-full-cmdline</filename> |
| 4301 | images. | 4301 | images. |
| 4302 | </para> | 4302 | </para> |
| 4303 | <para> | 4303 | <para> |
| @@ -4336,7 +4336,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" | |||
| 4336 | <para> | 4336 | <para> |
| 4337 | This variable affects only images based on | 4337 | This variable affects only images based on |
| 4338 | <filename>packagegroup-base</filename>, which does not include the | 4338 | <filename>packagegroup-base</filename>, which does not include the |
| 4339 | <filename>core-image-minimal</filename> or <filename>core-image-basic</filename> | 4339 | <filename>core-image-minimal</filename> or <filename>core-image-full-cmdline</filename> |
| 4340 | images. | 4340 | images. |
| 4341 | </para> | 4341 | </para> |
| 4342 | <para> | 4342 | <para> |
