Merge "[config-ref] update 'raw' to 'flat' image back end"

doc/config-reference/source/compute/hypervisor-kvm.rst

@@ -231,7 +231,7 @@ Backing Storage is the storage used to provide the expanded operating system
 image, and any ephemeral storage. Inside the virtual machine, this is normally
 presented as two virtual hard disks (for example, ``/dev/vda`` and ``/dev/vdb``
 respectively). However, inside OpenStack, this can be derived from one of
-these methods: ``lvm``, ``qcow``, ``rbd`` or ``raw``, chosen using the
+these methods: ``lvm``, ``qcow``, ``rbd`` or ``flat``, chosen using the
 ``images_type`` option in ``nova.conf`` on the compute node.
 
 QCOW is the default backing store. It uses a copy-on-write philosophy to delay
@@ -239,7 +239,7 @@ allocation of storage until it is actually needed. This means that the space
 required for the backing of an image can be significantly less on the real disk
 than what seems available in the virtual machine operating system.
 
-RAW creates files without any sort of file formatting, effectively creating
+Flat creates files without any sort of file formatting, effectively creating
 files with the plain binary one would normally see on a real disk. This can
 increase performance, but means that the entire size of the virtual disk is
 reserved on the physical disk.

doc/config-reference/source/compute/hypervisor-xen-libvirt.rst

@@ -144,7 +144,7 @@ Use the following as a guideline for configuring Xen for use in OpenStack:
 
       The default for virtualization mode in nova is PV mode.
 
-#. **Image formats**: Xen supports raw, qcow2 and vhd image formats.
+#. **Image formats**: Xen supports flat, qcow2 and vhd image formats.
    For more information on image formats, refer to the `OpenStack Virtual
    Image Guide <https://docs.openstack.org/image-guide/introduction.html>`__
    and the `Storage Options Guide on the Xen Project Wiki