diff --git a/doc/source/user/config-drive.rst b/doc/source/user/config-drive.rst
index 788ce6863a..2648139c4d 100644
--- a/doc/source/user/config-drive.rst
+++ b/doc/source/user/config-drive.rst
@@ -103,6 +103,9 @@ Enable and access the configuration drive
 
       force_config_drive = true
 
+   It is also possible to force the config drive by specifying the
+   ``img_config_drive=mandatory`` property in the image.
+
    .. note::
 
       If a user passes the ``--config-drive true`` flag to the
@@ -262,8 +265,12 @@ following line to the ``/etc/nova/nova.conf`` file:
 
 .. code-block:: console
 
+   [hyperv]
    config_drive_cdrom=true
 
+.. note:: Attaching a configuration drive as a CD drive is only supported
+          by the Hyper-V compute driver.
+
 For legacy reasons, you can configure the configuration drive to use
 VFAT format instead of ISO 9660. It is unlikely that you would require
 VFAT format because ISO 9660 is widely supported across operating