Merge "vmware-vmdk-driver: mark notes as notes"

This commit is contained in:
Jenkins 2014-10-04 17:46:42 +00:00 committed by Gerrit Code Review
commit 636df08a60

View File

@ -233,15 +233,20 @@
operations:</para> operations:</para>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para>Create, delete, attach, and detach volumes. (When a <para>Create, delete, attach, and detach volumes.</para>
volume is attached to an instance, a reconfigure operation <note>
is performed on the instance to add the volume's VMDK to <para>When a volume is attached to an instance, a reconfigure
it. The user must manually rescan and mount the device operation is performed on the instance to add the volume's
from within the guest operating system.)</para> VMDK to it. The user must manually rescan and mount the device
from within the guest operating system.</para>
</note>
</listitem> </listitem>
<listitem> <listitem>
<para>Create, list, and delete volume snapshots. (Allowed only <para>Create, list, and delete volume snapshots.</para>
if volume is not attached to an instance.)</para> <note>
<para>Allowed only if volume is not attached to an
instance.</para>
</note>
</listitem> </listitem>
<listitem> <listitem>
<para>Create a volume from a snapshot.</para> <para>Create a volume from a snapshot.</para>
@ -260,22 +265,31 @@
</note> </note>
</listitem> </listitem>
<listitem> <listitem>
<para>Copy a volume to an image. (Allowed only if volume is not <para>Copy a volume to an image.</para>
attached to an instance.)</para> <note>
<para>Allowed only if the volume is not attached to an
instance.</para>
</note>
</listitem> </listitem>
<listitem> <listitem>
<para>Clone a volume. (Supported only if source volume is not <para>Clone a volume.</para>
attached to an instance.)</para> <note>
<para>Supported only if the source volume is not attached to an
instance.</para>
</note>
</listitem> </listitem>
<listitem> <listitem>
<para>Backup a volume.</para> <para>Backup a volume.</para>
</listitem> </listitem>
<listitem> <listitem>
<para>Restore backup to new or existing volume. (Supported only <para>Restore backup to new or existing volume.</para>
if the existing volume doesn't contain snapshots.)</para> <note>
<para>Supported only if the existing volume doesn't contain
snapshots.</para>
</note>
</listitem> </listitem>
<listitem> <listitem>
<para>Change the volume type of a volume.</para> <para>Change the type of a volume.</para>
<note> <note>
<para>This operation is supported only if the volume state is <para>This operation is supported only if the volume state is
<literal>available</literal>. <literal>available</literal>.