Suggested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 docs/bootindex.txt       | 2 +-
 docs/qdev-device-use.txt | 4 ++--
 qemu-options.hx          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/bootindex.txt b/docs/bootindex.txt
index b9a8ba1..6937862 100644
--- a/docs/bootindex.txt
+++ b/docs/bootindex.txt
@@ -13,7 +13,7 @@ Let's assume we have a QEMU machine with two NICs (virtio, e1000) and two
 disks (IDE, virtio):
 
 qemu -drive file=disk1.img,if=none,id=disk1
-     -device ide-drive,drive=disk1,bootindex=4
+     -device ide-hd,drive=disk1,bootindex=4
      -drive file=disk2.img,if=none,id=disk2
      -device virtio-blk-pci,drive=disk2,bootindex=3
      -netdev type=user,id=net0 -device virtio-net-pci,netdev=net0,bootindex=2
diff --git a/docs/qdev-device-use.txt b/docs/qdev-device-use.txt
index b059405..caf779b 100644
--- a/docs/qdev-device-use.txt
+++ b/docs/qdev-device-use.txt
@@ -31,8 +31,8 @@ A QEMU block device (drive) has a host and a guest part.
 
 In the general case, the guest device is connected to a controller
 device.  For instance, the IDE controller provides two IDE buses, each
-of which can have up to two ide-drive devices, and each ide-drive
-device is a guest part, and is connected to a host part.
+of which can have up to two devices, and each device is a guest part,
+and is connected to a host part.
 
 Except we sometimes lump controller, bus(es) and drive device(s) all
 together into a single device.  For instance, the ISA floppy
diff --git a/qemu-options.hx b/qemu-options.hx
index f68829f..37147b3 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -224,7 +224,7 @@ STEXI
 Set default value of @var{driver}'s property @var{prop} to @var{value}, e.g.:
 
 @example
-qemu-system-i386 -global ide-drive.physical_block_size=4096 -drive file=file,if=ide,index=0,media=disk
+qemu-system-i386 -global ide-hd.physical_block_size=4096 disk-image.img
 @end example
 
 In particular, you can use this to set driver properties for devices which are 
-- 
2.7.4

On 09.05.2017 11:41, Markus Armbruster wrote:
> Suggested-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  docs/bootindex.txt       | 2 +-
>  docs/qdev-device-use.txt | 4 ++--
>  qemu-options.hx          | 2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/docs/bootindex.txt b/docs/bootindex.txt
> index b9a8ba1..6937862 100644
> --- a/docs/bootindex.txt
> +++ b/docs/bootindex.txt
> @@ -13,7 +13,7 @@ Let's assume we have a QEMU machine with two NICs (virtio, e1000) and two
>  disks (IDE, virtio):
>  
>  qemu -drive file=disk1.img,if=none,id=disk1
> -     -device ide-drive,drive=disk1,bootindex=4
> +     -device ide-hd,drive=disk1,bootindex=4
>       -drive file=disk2.img,if=none,id=disk2
>       -device virtio-blk-pci,drive=disk2,bootindex=3
>       -netdev type=user,id=net0 -device virtio-net-pci,netdev=net0,bootindex=2
> diff --git a/docs/qdev-device-use.txt b/docs/qdev-device-use.txt
> index b059405..caf779b 100644
> --- a/docs/qdev-device-use.txt
> +++ b/docs/qdev-device-use.txt
> @@ -31,8 +31,8 @@ A QEMU block device (drive) has a host and a guest part.
>  
>  In the general case, the guest device is connected to a controller
>  device.  For instance, the IDE controller provides two IDE buses, each
> -of which can have up to two ide-drive devices, and each ide-drive
> -device is a guest part, and is connected to a host part.
> +of which can have up to two devices, and each device is a guest part,
> +and is connected to a host part.
>  
>  Except we sometimes lump controller, bus(es) and drive device(s) all
>  together into a single device.  For instance, the ISA floppy
> diff --git a/qemu-options.hx b/qemu-options.hx
> index f68829f..37147b3 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -224,7 +224,7 @@ STEXI
>  Set default value of @var{driver}'s property @var{prop} to @var{value}, e.g.:
>  
>  @example
> -qemu-system-i386 -global ide-drive.physical_block_size=4096 -drive file=file,if=ide,index=0,media=disk
> +qemu-system-i386 -global ide-hd.physical_block_size=4096 disk-image.img
>  @end example
>  
>  In particular, you can use this to set driver properties for devices which are 
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>