Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl
===================================================================
--- /trunk/src/VBox/Main/idl/VirtualBox.xidl	(revision 23945)
+++ /trunk/src/VBox/Main/idl/VirtualBox.xidl	(revision 23946)
@@ -686,5 +686,5 @@
       <desc>
         A machine snapshot is being deleted; this can take a long time since this
-        may require merging differencing hard disk images.
+        may require merging differencing media.
       </desc>
     </const>
@@ -1943,5 +1943,5 @@
           The specified machine must not be in the Saved state, have an open
           (or a spawning) direct session associated with it, have snapshots or
-          have hard disks attached.
+          have any medium attached.
         </note>
 
@@ -1966,5 +1966,5 @@
         </result>
         <result name="VBOX_E_INVALID_OBJECT_STATE">
-          Machine has snapshot or open session or hard disk attached.
+          Machine has snapshot or open session or medium attached.
         </result>
 
@@ -3829,5 +3829,5 @@
           <ul>
             <li>setting up (weight 1);</li>
-            <li>one for each hard disk attachment that needs a differencing image (weight 1 each);</li>
+            <li>one for each medium attachment that needs a differencing image (weight 1 each);</li>
             <li>another one to copy the VM state (if offline with saved state, weight is VM memory size in MB);</li>
             <li>another one to save the VM state (if online, weight is VM memory size in MB);</li>
@@ -4647,6 +4647,7 @@
         be @c 0.
 
-        For fixed media such as hard disks, the given medium cannot be NULL. It may
-        be NULL for removable media such as DVDs and floppies.
+        For fixed media such as hard disks, the given medium identifier cannot
+        be a zero UUID. It may be a zero UUID for removable media such as DVDs
+        and floppies.
 
         After calling this returns successfully, a new instance of
@@ -4654,6 +4655,6 @@
         attachments (<link to="IMachine::mediumAttachments"/>).
 
-        The specified device slot must not have another disk attached to it, or
-        this method will fail.
+        The specified device slot must not have a device attached to it,
+        or this method will fail.
 
         See <link to="IMedium"/> and <link to="IMediumAttachment"/> for more
@@ -4661,6 +4662,6 @@
 
         <note>
-          You cannot attach a hard disk to a running machine. Also, you cannot
-          attach a hard disk to a newly created machine until this machine's
+          You cannot attach a device to a running machine. Also, you cannot
+          attach a device to a newly created machine until this machine's
           settings are saved to disk using <link to="#saveSettings"/>.
         </note>
@@ -4701,5 +4702,5 @@
       </param>
       <param name="id" type="uuid" mod="string" dir="in">
-        <desc>UUID of the medium to mount. NULL UUID means do not mount any
+        <desc>UUID of the medium to mount. Zero UUID means do not mount any
         medium.</desc>
       </param>
@@ -4717,5 +4718,5 @@
 
         <note>
-          You cannot detach the hard disk from a running machine.
+          You cannot detach a device from a running machine.
         </note>
         <note>
@@ -4736,5 +4737,5 @@
         </result>
         <result name="VBOX_E_NOT_SUPPORTED">
-          Hard disk format does not support storage deletion.
+          Medium format does not support storage deletion.
         </result>
 
@@ -6243,5 +6244,5 @@
         Starts the virtual machine execution using the current machine
         state (that is, its current execution state, current settings and
-        current hard disks).
+        current storage devices).
 
         If the machine is powered off or aborted, the execution will
@@ -6455,5 +6456,5 @@
           It's a caller's responsibility to make sure the given saved state
           file is compatible with the settings of this virtual machine that
-          represent its virtual hardware (memory size, hard disk configuration
+          represent its virtual hardware (memory size, storage disk configuration
           etc.). If there is a mismatch, the behavior of the virtual machine
           is undefined.
@@ -6676,14 +6677,12 @@
         See <link to="ISnapshot" /> for an introduction to snapshots.
 
-        The execution state
-        and settings of the associated machine stored in the snapshot
-        will be deleted. The contents of all differencing media of
-        this snapshot will be merged with the contents of their
-        dependent child media to keep the disks valid (in other
-        words, all changes represented by media being discarded
-        will be propagated to their child medium). After that, this
-        snapshot's differencing medium will be deleted. The parent
-        of this snapshot will become a new parent for all its child
-        snapshots.
+        The execution state and settings of the associated machine stored in
+        the snapshot will be deleted. The contents of all differencing media of
+        this snapshot will be merged with the contents of their dependent child
+        media to keep the medium chain valid (in other words, all changes
+        represented by media being discarded will be propagated to their child
+        medium). After that, this snapshot's differencing medium will be
+        deleted. The parent of this snapshot will become a new parent for all
+        its child snapshots.
 
         If the discarded snapshot is the current one, its parent
@@ -6716,5 +6715,5 @@
         to other machines. Such snapshots can be only discarded after
         you discard all snapshots of other machines containing "foreign"
-        child disks, or detach these "foreign" child disks from machines
+        child media, or detach these "foreign" child media from machines
         they are attached to.
 
@@ -6745,5 +6744,5 @@
         <note>
           Merging medium contents can be very time and disk space
-          consuming, if these disks are big in size and have many
+          consuming, if these media are big in size and have many
           children. However, if the snapshot being discarded is the last
           (head) snapshot on the branch, the operation will be rather
@@ -8172,5 +8171,5 @@
 
               Neither the current machine state nor other snapshots are affected
-              by this operation, except that parent disk images will be modified
+              by this operation, except that parent media will be modified
               to contain the disk data associated with the snapshot being deleted.
           </li>
@@ -8412,12 +8411,11 @@
       and device number. Fixed media (hard disks) will always also specify
       an instance of IMedium in <link to="#medium" />, referring to the hard disk
-      image or images that represent the virtual hard disk. For removeable media,
-      the IMedia instance is optional; it can be NULL if no media is mounted (see
-      <link to="IMachine::mountMedium" />).
+      medium. For removeable media, the IMedia instance is optional; it can be
+      @c null if no media is mounted (see <link to="IMachine::mountMedium" />).
     </desc>
 
     <attribute name="medium" type="IMedium" readonly="yes">
       <desc>Medium object associated with this attachment; it
-        can be NULL for removable devices.</desc>
+        can be @c null for removable devices.</desc>
     </attribute>
 
@@ -8554,36 +8552,35 @@
       check media accessibility right away or not.
 
-      <h3>Hard disk types</h3>
-
-      There are three types of hard disk images (see <link to="MediumType" />):
+      <h3>Medium types</h3>
+
+      There are three types of medium behavior (see <link to="MediumType" />):
       "normal", "immutable" and "writethrough", represented by the
-      <link to="#type"/> attribute. The type of the hard disk defines how the
-      hard disk is attached to a virtual machine and what happens when a
+      <link to="#type"/> attribute. The type of the medium defines how the
+      medium is attached to a virtual machine and what happens when a
       <link to="ISnapshot">snapshot</link> of the virtual machine with the
-      attached hard disk is taken.
-
-      All hard disks can be also divided in two groups: <i>base</i> hard
-      disks and <i>differencing</i> hard disks. A base hard disk contains all
-      sectors of the hard disk data in its own storage and therefore can be
-      used independently. On the contrary, a differencing hard disk is a
-      "delta" to some other disk and contains only those sectors which differ
-      from that other disk, which is then called a <i>parent</i>. The differencing
-      hard disk is said to be <i>linked to</i> that parent.
-      The parent may be itself a differencing image, thus forming a chain of
-      linked hard disks. The last element in that chain
-      must always be a base medium. Note that several differencing
-      hard disks may be linked to the same parent hard disk.
-
-      Differencing hard disks can be distinguished from base hard disks by
-      querying the <link to="#parent"/> attribute: base hard disks do not have
-      parents they would depend on, so the value of this attribute is always
-      @c null for them. Using this attribute, it is possible to walk up
-      the hard disk tree (from the child hard disk to its parent). It is also
-      possible to walk down the tree using the <link to="#children"/>
-      attribute.
-
-      Note that the type of all differencing hard disks is
-      <link to="MediumType_Normal" />; all other values are
-      meaningless for them. Base hard disks may be of any type.
+      attached medium is taken. At the moment DVD and floppy media are always
+      of type "writethrough".
+
+      All media can be also divided in two groups: <i>base</i> media and
+      <i>differencing</i> media. A base medium contains all sectors of the
+      medium data in its own storage and therefore can be used independently.
+      In contrast, a differencing mediun is a "delta" to some other medium and
+      contains only those sectors which differ from that other medium, which is
+      then called a <i>parent</i>. The differencing medium is said to be
+      <i>linked to</i> that parent. The parent may be itself a differencing
+      medium, thus forming a chain of linked media. The last element in that
+      chain must always be a base medium. Note that several differencing
+      media may be linked to the same parent medium.
+
+      Differencing media can be distinguished from base media by querying the
+      <link to="#parent"/> attribute: base media do not have parents they would
+      depend on, so the value of this attribute is always @c null for them.
+      Using this attribute, it is possible to walk up the medium tree (from the
+      child medium to its parent). It is also possible to walk down the tree
+      using the <link to="#children"/> attribute.
+
+      Note that the type of all differencing media is
+      <link to="MediumType_Normal" />; all other values are meaningless for
+      them. Base media may be of any type.
 
       <h3>Creating hard disks</h3>
@@ -8916,8 +8913,8 @@
         Storage format of this medium.
 
-        The value of this attribute is a string that specifies a backend used to
-        store hard disk data. The storage format is defined when you create a
-        new hard disk or automatically detected when you open an existing hard
-        disk medium, and cannot be changed later.
+        The value of this attribute is a string that specifies a backend used
+        to store medium data. The storage format is defined when you create a
+        new medium or automatically detected when you open an existing medium,
+        and cannot be changed later.
 
         The list of all storage formats supported by this VirtualBox
@@ -8929,23 +8926,24 @@
     <attribute name="type" type="MediumType">
       <desc>
-        Type (role) of this hard disk.
+        Type (role) of this medium.
 
         The following constraints apply when changing the value of this
         attribute:
         <ul>
-          <li>If a hard disk is attached to a virtual machine (either in the
+          <li>If a medium is attached to a virtual machine (either in the
               current state or in one of the snapshots), its type cannot be
               changed.
           </li>
-          <li>As long as the hard disk has children, its type cannot be set
+          <li>As long as the medium has children, its type cannot be set
               to <link to="MediumType_Writethrough"/>.
           </li>
-          <li>The type of all differencing hard disks is
+          <li>The type of all differencing media is
               <link to="MediumType_Normal"/> and cannot be changed.
           </li>
         </ul>
 
-        The type of a newly created or opened hard disk is set to
-        <link to="MediumType_Normal"/>.
+        The type of a newly created or opened medium is set to
+        <link to="MediumType_Normal"/>, except for DVD and floppy media,
+        which have a type of <link to="MediumType_Writethrough"/>.
       </desc>
     </attribute>
@@ -8953,9 +8951,9 @@
     <attribute name="parent" type="IMedium" readonly="yes">
       <desc>
-        Parent of this hard disk (a hard disk this hard disk is directly based
+        Parent of this medium (the medium this medium is directly based
         on).
 
-        Only differencing hard disks have parents. For base (non-differencing)
-        hard disks, @c null is returned.
+        Only differencing media have parents. For base (non-differencing)
+        media, @c null is returned.
       </desc>
     </attribute>
@@ -8963,6 +8961,6 @@
     <attribute name="children" type="IMedium" safearray="yes" readonly="yes">
       <desc>
-        Children of this hard disk (all differencing hard disks directly based
-        on this hard disk). A @c null array is returned if this hard disk
+        Children of this medium (all differencing media directly based
+        on this medium). A @c null array is returned if this medium
         does not have any children.
       </desc>
@@ -8973,8 +8971,8 @@
         Base medium of this medium.
 
-        If this is a differencing medium, its base hard disk is the medium
-        the given hard disk branch starts from. For all other types of hard
-        disks, this property returns the hard disk object itself (i.e. the same
-        object this property is read on).
+        If this is a differencing medium, its base medium is the medium
+        the given medium branch starts from. For all other types of media, this
+        property returns the medium object itself (i.e. the same object this
+        property is read on).
       </desc>
     </attribute>
@@ -8982,28 +8980,28 @@
     <attribute name="readOnly" type="boolean" readonly="yes">
       <desc>
-        Returns @c true if this hard disk is read-only and @c false otherwise.
-
-        A hard disk is considered to be read-only when its contents cannot be
+        Returns @c true if this medium is read-only and @c false otherwise.
+
+        A medium is considered to be read-only when its contents cannot be
         modified without breaking the integrity of other parties that depend on
-        this hard disk such as its child hard disks or snapshots of virtual
-        machines where this hard disk is attached to these machines. If there
-        are no children and no such snapshots then there is no dependency and
-        the hard disk is not read-only.
+        this medium such as its child media or snapshots of virtual machines
+        where this medium is attached to these machines. If there are no
+        children and no such snapshots then there is no dependency and the
+        medium is not read-only.
 
         The value of this attribute can be used to determine the kind of the
-        attachment that will take place when attaching this hard disk to a
-        virtual machine. If the value is @c false then the hard disk will
-        be attached directly. If the value is @c true then the hard disk
-        will be attached indirectly by creating a new differencing child hard
-        disk for that. See the interface description for more information.
-
-        Note that all <link to="MediumType_Immutable">Immutable</link> hard
-        disks are always read-only while all
-        <link to="MediumType_Writethrough">Writethrough</link> hard disks are
+        attachment that will take place when attaching this medium to a
+        virtual machine. If the value is @c false then the medium will
+        be attached directly. If the value is @c true then the medium
+        will be attached indirectly by creating a new differencing child
+        medium for that. See the interface description for more information.
+
+        Note that all <link to="MediumType_Immutable">Immutable</link> media
+        are always read-only while all
+        <link to="MediumType_Writethrough">Writethrough</link> media are
         always not.
 
         <note>
           The read-only condition represented by this attribute is related to
-          the hard disk type and usage, not to the current
+          the medium type and usage, not to the current
           <link to="IMedium::state">medium state</link> and not to the read-only
           state of the storage unit.
@@ -9014,18 +9012,18 @@
     <attribute name="logicalSize" type="unsigned long long" readonly="yes">
       <desc>
-        Logical size of this hard disk (in megabytes), as reported to the
-        guest OS running inside the virtual machine this disk is
-        attached to. The logical size is defined when the hard disk is created
+        Logical size of this medium (in megabytes), as reported to the
+        guest OS running inside the virtual machine this medium is
+        attached to. The logical size is defined when the medium is created
         and cannot be changed later.
 
         <note>
-          Reading this property on a differencing hard disk will return the size
+          Reading this property on a differencing medium will return the size
           of its <link to="#base"/> medium.
         </note>
         <note>
-          For hard disks whose state is <link to="#state"/> is <link
+          For media whose state is <link to="#state"/> is <link
           to="MediumState_Inaccessible"/>, the value of this property is the
-          last known logical size. For <link to="MediumaState_NotCreated"/> hard
-          disks, the returned value is zero.
+          last known logical size. For <link to="MediumaState_NotCreated"/>
+          media, the returned value is zero.
         </note>
       </desc>
@@ -9034,12 +9032,12 @@
     <attribute name="autoReset" type="boolean">
       <desc>
-        Whether this differencing hard disk will be automatically reset each
+        Whether this differencing medium will be automatically reset each
         time a virtual machine it is attached to is powered up.
 
         See <link to="#reset()"/> for more information about resetting
-        differencing hard disks.
+        differencing media.
 
         <note>
-          Reading this property on a base (non-differencing) hard disk will
+          Reading this property on a base (non-differencing) medium will
           always @c false. Changing the value of this property in this
           case is not supported.
@@ -9047,5 +9045,5 @@
 
         <result name="VBOX_E_NOT_SUPPORTED">
-          This is not a differencing hard disk (when changing the attribute
+          This is not a differencing medium (when changing the attribute
           value).
         </result>
@@ -9292,7 +9290,7 @@
     <method name="getProperty">
       <desc>
-        Returns the value of the custom hard disk property with the given name.
-
-        The list of all properties supported by the given hard disk format can
+        Returns the value of the custom medium property with the given name.
+
+        The list of all properties supported by the given medium format can
         be obtained with <link to="IMediumFormat::describeProperties"/>.
 
@@ -9315,7 +9313,7 @@
     <method name="setProperty">
       <desc>
-        Sets the value of the custom hard disk property with the given name.
-
-        The list of all properties supported by the given hard disk format can
+        Sets the value of the custom medium property with the given name.
+
+        The list of all properties supported by the given medium format can
         be obtained with <link to="IMediumFormat::describeProperties"/>.
 
@@ -9348,5 +9346,5 @@
         existing properties.
 
-        The list of all properties supported by the given hard disk format can
+        The list of all properties supported by the given medium format can
         be obtained with <link to="IMediumFormat::describeProperties"/>.
 
@@ -9393,5 +9391,5 @@
         IPC calls.
 
-        The list of all properties supported by the given hard disk format can
+        The list of all properties supported by the given medium format can
         be obtained with <link to="IMediumFormat::describeProperties"/>.
 
@@ -9418,5 +9416,5 @@
         <link to="#deleteStorage"/>, otherwise the operation will fail.
 
-        Before the operation starts, the hard disk is placed in
+        Before the operation starts, the medium is placed in
         <link to="MediumState_Creating"/> state. If the create operation
         fails, the medium will be placed back in <link to="MediumState_NotCreated"/>
@@ -9425,5 +9423,5 @@
         After the returned progress object reports that the operation has
         successfully completed, the medium state will be set to <link
-        to="MediumState_Created"/>, the hard disk will be remembered by this
+        to="MediumState_Created"/>, the medium will be remembered by this
         VirtualBox installation and may be attached to virtual machines.
 
@@ -9434,5 +9432,5 @@
       </desc>
       <param name="logicalSize" type="unsigned long long" dir="in">
-        <desc>Maximum logical size of the hard disk in megabytes.</desc>
+        <desc>Maximum logical size of the medium in megabytes.</desc>
       </param>
       <param name="variant" type="MediumVariant" dir="in">
@@ -9446,14 +9444,14 @@
     <method name="deleteStorage">
       <desc>
-        Starts deleting the storage unit of this hard disk.
-
-        The hard disk must not be attached to any known virtual machine and must
-        not have any known child hard disks, otherwise the operation will fail.
+        Starts deleting the storage unit of this medium.
+
+        The medium must not be attached to any known virtual machine and must
+        not have any known child media, otherwise the operation will fail.
         It will also fail if there is no storage unit to delete or if deletion
-        is already in progress, or if the hard disk is being in use (locked for
+        is already in progress, or if the medium is being in use (locked for
         read or for write) or inaccessible. Therefore, the only valid state for
         this operation to succeed is <link to="MediumState_Created"/>.
 
-        Before the operation starts, the hard disk is placed to
+        Before the operation starts, the medium is placed in
         <link to="MediumState_Deleting"/> state and gets removed from the list
         of remembered hard disks (media registry). If the delete operation
@@ -9469,5 +9467,5 @@
 
         <result name="VBOX_E_OBJECT_IN_USE">
-          Hard disk is attached to a virtual machine.
+          Medium is attached to a virtual machine.
         </result>
         <result name="VBOX_E_NOT_SUPPORTED">
@@ -9492,29 +9490,29 @@
     <method name="createDiffStorage">
       <desc>
-        Starts creating an empty differencing storage unit based on this hard
-        disk in the format and at the location defined by the @a target
+        Starts creating an empty differencing storage unit based on this
+        medium in the format and at the location defined by the @a target
         argument.
 
-        The target hard disk must be in <link to="MediumState_NotCreated"/>
+        The target medium must be in <link to="MediumState_NotCreated"/>
         state (i.e. must not have an existing storage unit). Upon successful
-        completion, this operation will set the type of the target hard disk to
+        completion, this operation will set the type of the target medium to
         <link to="MediumType_Normal"/> and create a storage unit necessary to
-        represent the differencing hard disk data in the given format (according
+        represent the differencing medium data in the given format (according
         to the storage format of the target object).
 
         After the returned progress object reports that the operation is
-        successfully complete, the target hard disk gets remembered by this
+        successfully complete, the target medium gets remembered by this
         VirtualBox installation and may be attached to virtual machines.
 
         <note>
-          The hard disk will be set to <link to="MediumState_LockedRead"/>
+          The medium will be set to <link to="MediumState_LockedRead"/>
           state for the duration of this operation.
         </note>
         <result name="VBOX_E_OBJECT_IN_USE">
-          Hard disk not in @c NotCreated state.
+          Medium not in @c NotCreated state.
         </result>
       </desc>
       <param name="target" type="IMedium" dir="in">
-        <desc>Target hard disk.</desc>
+        <desc>Target medium.</desc>
       </param>
       <param name="variant" type="MediumVariant" dir="in">
@@ -9528,38 +9526,38 @@
     <method name="mergeTo">
       <desc>
-        Starts merging the contents of this hard disk and all intermediate
-        differencing hard disks in the chain to the given target hard disk.
-
-        The target hard disk must be either a descendant of this hard disk or
+        Starts merging the contents of this medium and all intermediate
+        differencing media in the chain to the given target medium.
+
+        The target medium must be either a descendant of this medium or
         its ancestor (otherwise this method will immediately return a failure).
         It follows that there are two logical directions of the merge operation:
         from ancestor to descendant (<i>forward merge</i>) and from descendant to
-        ancestor (<i>backward merge</i>). Let us consider the following hard disk
+        ancestor (<i>backward merge</i>). Let us consider the following medium
         chain:
 
         <pre>Base &lt;- Diff_1 &lt;- Diff_2</pre>
 
-        Here, calling this method on the <tt>Base</tt> hard disk object with
+        Here, calling this method on the <tt>Base</tt> medium object with
         <tt>Diff_2</tt> as an argument will be a forward merge; calling it on
         <tt>Diff_2</tt> with <tt>Base</tt> as an argument will be a backward
-        merge. Note that in both cases the contents of the resulting hard disk
-        will be the same, the only difference is the hard disk object that takes
+        merge. Note that in both cases the contents of the resulting medium
+        will be the same, the only difference is the medium object that takes
         the result of the merge operation. In case of the forward merge in the
         above example, the result will be written to <tt>Diff_2</tt>; in case of
         the backward merge, the result will be written to <tt>Base</tt>. In
         other words, the result of the operation is always stored in the target
-        hard disk.
-
-        Upon successful operation completion, the storage units of all hard
-        disks in the chain between this (source) hard disk and the target hard
-        disk, including the source hard disk itself, will be automatically
-        deleted and the relevant hard disk objects (including this hard disk)
-        will become uninitialized. This means that any attempt to call any of
+        medium.
+
+        Upon successful operation completion, the storage units of all media in
+        the chain between this (source) medium and the target medium, including
+        the source medium itself, will be automatically deleted and the
+        relevant medium objects (including this medium) will become
+        uninitialized. This means that any attempt to call any of
         their methods or attributes will fail with the
         <tt>"Object not ready" (E_ACCESSDENIED)</tt> error. Applied to the above
         example, the forward merge of <tt>Base</tt> to <tt>Diff_2</tt> will
-        delete and uninitialize both <tt>Base</tt> and <tt>Diff_1</tt> hard
-        disks. Note that <tt>Diff_2</tt> in this case will become a base hard
-        disk itself since it will no longer be based on any other hard disk.
+        delete and uninitialize both <tt>Base</tt> and <tt>Diff_1</tt> media.
+        Note that <tt>Diff_2</tt> in this case will become a base medium
+        itself since it will no longer be based on any other medium.
 
         Considering the above, all of the following conditions must be met in
@@ -9567,23 +9565,23 @@
         <ul>
           <li>
-            Neither this (source) hard disk nor any intermediate
-            differencing hard disk in the chain between it and the target
-            hard disk is attached to any virtual machine.
+            Neither this (source) medium nor any intermediate
+            differencing medium in the chain between it and the target
+            medium is attached to any virtual machine.
           </li>
           <li>
-            Neither the source hard disk nor the target hard disk is an
-            <link to="MediumType_Immutable"/> hard disk.
+            Neither the source medium nor the target medium is an
+            <link to="MediumType_Immutable"/> medium.
           </li>
           <li>
-            The part of the hard disk tree from the source hard disk to the
-            target hard disk is a linear chain, i.e. all hard disks in this
-            chain have exactly one child which is the next hard disk in this
-            chain. The only exception from this rule is the target hard disk in
+            The part of the medium tree from the source medium to the
+            target medium is a linear chain, i.e. all medium in this
+            chain have exactly one child which is the next medium in this
+            chain. The only exception from this rule is the target medium in
             the forward merge operation; it is allowed to have any number of
-            child hard disks because the merge operation will hot change its
+            child media because the merge operation will not change its
             logical contents (as it is seen by the guest OS or by children).
           </li>
           <li>
-            None of the involved hard disks are in
+            None of the involved media are in
             <link to="MediumState_LockedRead"/> or
             <link to="MediumState_LockedWrite"/> state.
@@ -9592,6 +9590,6 @@
 
         <note>
-          This (source) hard disk and all intermediates will be placed to <link
-          to="MediumState_Deleting"/> state and the target hard disk will be
+          This (source) medium and all intermediates will be placed to <link
+          to="MediumState_Deleting"/> state and the target medium will be
           placed to <link to="MediumState_LockedWrite"/> state and for the
           duration of this operation.
@@ -9599,5 +9597,5 @@
       </desc>
       <param name="targetId" type="uuid" mod="string" dir="in">
-        <desc>UUID of the target ancestor or descendant hard disk.</desc>
+        <desc>UUID of the target ancestor or descendant medium.</desc>
       </param>
       <param name="progress" type="IProgress" dir="return">
@@ -9610,30 +9608,30 @@
     <method name="cloneTo">
       <desc>
-        Starts creating a clone of this hard disk in the format and at the
+        Starts creating a clone of this medium in the format and at the
         location defined by the @a target argument.
 
-        The target hard disk must be either in <link to="MediumState_NotCreated"/>
+        The target medium must be either in <link to="MediumState_NotCreated"/>
         state (i.e. must not have an existing storage unit) or in
         <link to="MediumState_Created"/> state (i.e. created and not locked, and
         big enough to hold the data or else the copy will be partial). Upon
-        successful completion, the cloned hard disk will contain exactly the
-        same sector data as the hard disk being cloned, except that in the
+        successful completion, the cloned medium will contain exactly the
+        same sector data as the medium being cloned, except that in the
         first case a new UUID for the clone will be randomly generated, and in
         the second case the UUID will remain unchanged.
 
-        The @a parent argument defines which hard disk will be the parent
+        The @a parent argument defines which medium will be the parent
         of the clone. Passing a @c null reference indicates that the clone will
         be a base image, i.e. completely independent. It is possible to specify
-        an arbitrary hard disk for this parameter, including the parent of the
-        hard disk which is being cloned. Even cloning to a child of the source
-        hard disk is possible. Note that when cloning to an existing image, the
+        an arbitrary medium for this parameter, including the parent of the
+        medium which is being cloned. Even cloning to a child of the source
+        medium is possible. Note that when cloning to an existing image, the
         @a parent irgument is ignored.
 
         After the returned progress object reports that the operation is
-        successfully complete, the target hard disk gets remembered by this
+        successfully complete, the target medium gets remembered by this
         VirtualBox installation and may be attached to virtual machines.
 
         <note>
-          This hard disk will be placed to <link to="MediumState_LockedRead"/>
+          This medium will be placed to <link to="MediumState_LockedRead"/>
           state for the duration of this operation.
         </note>
@@ -9643,5 +9641,5 @@
       </desc>
       <param name="target" type="IMedium" dir="in">
-        <desc>Target hard disk.</desc>
+        <desc>Target medium.</desc>
       </param>
       <param name="variant" type="MediumVariant" dir="in">
@@ -9649,5 +9647,5 @@
       </param>
       <param name="parent" type="IMedium" dir="in">
-        <desc>Parent of the cloned hard disk.</desc>
+        <desc>Parent of the cloned medium.</desc>
       </param>
       <param name="progress" type="IProgress" dir="return">
@@ -9660,11 +9658,11 @@
     <method name="compact">
       <desc>
-        Starts compacting of this hard disk. This means that the disk is
+        Starts compacting of this medium. This means that the medium is
         transformed into a possibly more compact storage representation.
         This potentially creates temporary images, which can require a
         substantial amount of additional disk space.
 
-        This hard disk will be placed to <link to="MediumState_LockedWrite"/>
-        state and all its parent hard disks (if any) will be placed to
+        This medium will be placed to <link to="MediumState_LockedWrite"/>
+        state and all its parent media (if any) will be placed to
         <link to="MediumState_LockedRead"/> state for the duration of this
         operation.
@@ -9675,5 +9673,5 @@
 
         <result name="VBOX_E_NOT_SUPPORTED">
-          Hard disk format does not support compacting (but potentially
+          Medium format does not support compacting (but potentially
           needs it).
         </result>
@@ -9686,18 +9684,18 @@
     <method name="reset">
       <desc>
-        Starts erasing the contents of this differencing hard disk.
-
-        This operation will reset the differencing hard disk to its initial
+        Starts erasing the contents of this differencing medium.
+
+        This operation will reset the differencing medium to its initial
         state when it does not contain any sector data and any read operation is
-        redirected to its parent hard disk.
-
-        This hard disk will be placed to <link to="MediumState_LockedWrite"/>
+        redirected to its parent medium.
+
+        This medium will be placed to <link to="MediumState_LockedWrite"/>
         for the duration of this operation.
 
         <result name="VBOX_E_NOT_SUPPORTED">
-          This is not a differencing hard disk.
+          This is not a differencing medium.
         </result>
         <result name="VBOX_E_INVALID_OBJECT_STATE">
-          Hard disk is not in <link to="MediumState_Created"/> or
+          Medium is not in <link to="MediumState_Created"/> or
           <link to="MediumState_Inaccessible"/> state.
         </result>
@@ -9741,5 +9739,5 @@
   >
     <desc>
-       Hard disk format capability flags.
+       Medium format capability flags.
     </desc>
 
@@ -12616,7 +12614,7 @@
     <desc>
         Represents a storage controller that is attached to a virtual machine
-        (<link to="IMachine" />). Just as disks (hard disks, DVDs, FDs) are
-        attached to storage controllers in a real computer, virtual media
-        (represented by <link to="IMedium" />) are attached to virtual
+        (<link to="IMachine" />). Just as drives (hard disks, DVDs, FDs) are
+        attached to storage controllers in a real computer, virtual drives
+        (represented by <link to="IMediumAttachment" />) are attached to virtual
         storage controllers, represented by this interface.