[PATCH v2 16/17] docs: Change according to recent patches

[Henning Schild <henning.schild@siemens.com>]

Update the section on wic to tell people how to build images using it.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 doc/technical_overview.md |  7 ++++---
 doc/user_manual.md        | 25 ++++++++++++-------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/doc/technical_overview.md b/doc/technical_overview.md
index 83624a5..ab62de9 100644
--- a/doc/technical_overview.md
+++ b/doc/technical_overview.md
@@ -239,10 +239,11 @@ variable. Task `do_populate` performs the following:
 
 4. Execute dpkg command in chroot for all the copied packages.
 
-## 3.7 Generate Bootable Image
+## 3.7 Generate an Image
 
 This process contains the following steps:
 
-1. Task `do_ext4_image`: target filesystem is packed to extfs image.
+1. Task `do_<..>_image`: creates filesystem or disk images
 
-2. wic tool generates bootable image for dedicated platform.
+   1.1. `do_ext4_image`: target filesystem is packed to extfs image.
+   1.2. `do_wic_image`: a bootable disk image gets created for the platform
diff --git a/doc/user_manual.md b/doc/user_manual.md
index 7bd52f4..7bdfc1c 100644
--- a/doc/user_manual.md
+++ b/doc/user_manual.md
@@ -190,34 +190,33 @@ Created images are:
 ../build-2/tmp/deploy/images/isar-image-base-debian-jessie-qemuarm.ext4.img
 ../build-3/tmp/deploy/images/isar-image-base-debian-stretch-qemuarm.ext4.img
 ../build-4/tmp/deploy/images/isar-image-base-debian-jessie-qemui386.ext4.img
-../build-5/tmp/deploy/images/isar-image-base-debian-stretch-qemui386.ext4.img
+../build-5/tmp/deploy/images/isar-image-base-debian-stretch-qemui386.wic.img
 ../build-6/tmp/deploy/images/isar-image-base-debian-jessie-qemuamd64.ext4.img
-../build-7/tmp/deploy/images/isar-image-base-debian-stretch-qemuamd64.ext4.img
+../build-7/tmp/deploy/images/isar-image-base-debian-stretch-qemuamd64.wic.img
 ../build-8/tmp/deploy/images/isar-image-base.rpi-sdimg
 ```
 
-### Generate EFI disk images
+### Generate full disk image
 
-Once the image artifacts have been built (c.f. previous section), full EFI disk images can be generated using the `wic` utility.
-Currently, only the `i386` and `amd64` target architectures are supported:
+A bootable disk image is generated if you set IMAGE_TYPE to 'wic-img'. Behind the scenes a tool called `wic` is used to assemble the images. It is controlled by a `.wks` file which you can choose with changing WKS_FILE. Some examples in the tree use that feature already.
 ```
- # Generate an EFI image for the `i386` target architecture
- $ wic create -D sdimage-efi -o . -e multiconfig:qemui386-stretch:isar-image-base
- # Similarly, for the `amd64` target architecture
- $ wic create -D sdimage-efi -o . -e multiconfig:qemuamd64-stretch:isar-image-base
+ # Generate an image for the `i386` target architecture
+ $ bitbake multiconfig:qemui386-stretch:isar-image-base
+ # Similarly, for the `amd64` target architecture, in this case EFI
+ $ bitbake multiconfig:qemuamd64-stretch:isar-image-base
 ```
 
-In order to run the images with `qemu`, an EFI firmware is required and available at the following address:
+In order to run the EFI images with `qemu`, an EFI firmware is required and available at the following address:
 https://github.com/tianocore/edk2/tree/3858b4a1ff09d3243fea8d07bd135478237cb8f7
 
 Note that the `ovmf` package in Debian jessie/stretch/sid contains a pre-compiled firmware, but doesn't seem to be recent
 enough to allow images to be testable under `qemu`.
 
 ```
-# AMD64 image
-qemu-system-x86_64 -m 256M -nographic -bios edk2/Build/OvmfX64/RELEASE_*/FV/OVMF.fd -hda ./sdimage-*
+# AMD64 image, EFI
+qemu-system-x86_64 -m 256M -nographic -bios edk2/Build/OvmfX64/RELEASE_*/FV/OVMF.fd -hda tmp/deploy/images/isar-image-base-debian-stretch-qemuamd64.wic.img
 # i386 image
-qemu-system-i386 -m 256M -nographic -bios edk2/Build/OvmfIa32/RELEASE_*/FV/OVMF.fd -hda ./sdimage-*
+qemu-system-i386 -m 256M -nographic -hda tmp/deploy/images/isar-image-base-debian-stretch-qemui386.wic.img
 ```
 
 ---
-- 
2.16.1