Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl
===================================================================
--- /trunk/src/VBox/Main/idl/VirtualBox.xidl	(revision 84563)
+++ /trunk/src/VBox/Main/idl/VirtualBox.xidl	(revision 84564)
@@ -4401,5 +4401,5 @@
     <attribute name="installGuestAdditions" type="boolean">
       <desc>
-        Indicates whether the guest additions should be installed or not.
+        Indicates whether the Guest Additions should be installed or not.
 
         Setting this to false does not affect additions shipped with the linux
@@ -11634,5 +11634,5 @@
       <desc>Guest graphics mode. If not enabled, seamless rendering will not work, resize hints
         are not immediately acted on and guest display resizes are probably not initiated by
-        the guest additions.
+        the Guest Additions.
       </desc>
     </const>
@@ -12307,5 +12307,5 @@
     <desc>
       Guest process execution flags.
-      <note>The values are passed to the guest additions, so its not possible
+      <note>The values are passed to the Guest Additions, so its not possible
             to change (move) or reuse values.here. See EXECUTEPROCESSFLAG_XXX
             in GuestControlSvc.h.</note>
@@ -12492,5 +12492,5 @@
     <const name="Unknown" value="8">
       <desc>
-        The path style is not known, most likely because the guest additions
+        The path style is not known, most likely because the Guest Additions
         aren't active yet.
       </desc>
@@ -13071,5 +13071,5 @@
       for why we record changes to a base environment instead of working
       directly on an environment block is that we need to be compatible
-      with older guest additions.  Another reason is that this way it is always
+      with older Guest Additions.  Another reason is that this way it is always
       possible to undo all the changes you've scheduled.)
     </desc>
@@ -13123,15 +13123,15 @@
         one array entry per variable.
         <!-- @todo/TODO/FIXME: This doesn't end up in the PDF.
-        <result name="VBOX_E_NOT_SUPPORTED">If the guest additions does not
+        <result name="VBOX_E_NOT_SUPPORTED">If the Guest Additions does not
           support the session base environment feature.  Support for this was
           introduced with protocol version XXX.</result>
-        <result name="VBOX_E_INVALID_OBJECT_STATE">If the guest additions has
+        <result name="VBOX_E_INVALID_OBJECT_STATE">If the Guest Additions has
           yet to report the session base environment.</result> -->
 
-        Access fails with VBOX_E_NOT_SUPPORTED if the guest additions does not
+        Access fails with VBOX_E_NOT_SUPPORTED if the Guest Additions does not
         support the session base environment feature.  Support for this was
         introduced with protocol version XXXX.
 
-        Access fails with VBOX_E_INVALID_OBJECT_STATE if the guest additions
+        Access fails with VBOX_E_INVALID_OBJECT_STATE if the Guest Additions
         has yet to report the session base environment.
       </desc>
@@ -13591,8 +13591,8 @@
         (<link to="IGuestSession::environmentBase"/>).
 
-        <result name="VBOX_E_NOT_SUPPORTED">If the guest additions does not
+        <result name="VBOX_E_NOT_SUPPORTED">If the Guest Additions does not
           support the session base environment feature.  Support for this was
           introduced with protocol version XXXX.</result>
-        <result name="VBOX_E_INVALID_OBJECT_STATE">If the guest additions has
+        <result name="VBOX_E_INVALID_OBJECT_STATE">If the Guest Additions has
           yet to report the session base environment.</result>
       </desc>
@@ -13615,8 +13615,8 @@
         environment (<link to="IGuestSession::environmentBase"/>).
 
-        <result name="VBOX_E_NOT_SUPPORTED">If the guest additions does not
+        <result name="VBOX_E_NOT_SUPPORTED">If the Guest Additions does not
           support the session base environment feature.  Support for this was
           introduced with protocol version XXXX.</result>
-        <result name="VBOX_E_INVALID_OBJECT_STATE">If the guest additions has
+        <result name="VBOX_E_INVALID_OBJECT_STATE">If the Guest Additions has
           yet to report the session base environment.</result>
       </desc>
@@ -14192,5 +14192,5 @@
           guest user (<link to="IGuestSession::environmentBase"/>) when
           creating the process.  (This is done on the guest side of things in
-          order to be compatible with older guest additions.  That is one of
+          order to be compatible with older Guest Additions.  That is one of
           the motivations for not passing in the whole environment here.)
         </desc>
@@ -14251,5 +14251,5 @@
           guest user (<link to="IGuestSession::environmentBase"/>) when
           creating the process.  (This is done on the guest side of things in
-          order to be compatible with older guest additions.  That is one of
+          order to be compatible with older Guest Additions.  That is one of
           the motivations for not passing in the whole environment here.)
         </desc>
@@ -14273,5 +14273,5 @@
           Process priority to use for execution, see <link to="ProcessPriority"/>
           for available priority levels.
-          <note>This is silently ignored if not supported by guest additions.</note>
+          <note>This is silently ignored if not supported by Guest Additions.</note>
         </desc>
       </param>
@@ -14282,5 +14282,5 @@
           <note>
             This is silently ignored if the guest does not support setting the
-            affinity of processes, or if the guest additions does not implemet
+            affinity of processes, or if the Guest Additions does not implemet
             this feature.
           </note>
@@ -14722,5 +14722,5 @@
         transfering any file data like read and write does.
 
-        <note> This will not always be correct with older guest additions
+        <note> This will not always be correct with older Guest Additions
         (version 5.2.30 and earlier, as well as versions 6.0.0 thru 6.0.8)
         after a calling <link to="IFile::readAt"/> or <link to="IFile::writeAt"/>,
Index: /trunk/src/VBox/Main/include/AdditionsFacilityImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/AdditionsFacilityImpl.h	(revision 84563)
+++ /trunk/src/VBox/Main/include/AdditionsFacilityImpl.h	(revision 84564)
@@ -28,5 +28,5 @@
 
 /**
- * A guest additions facility.
+ * A Guest Additions facility.
  */
 class ATL_NO_VTABLE AdditionsFacility :
Index: /trunk/src/VBox/Main/include/DisplayImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/DisplayImpl.h	(revision 84563)
+++ /trunk/src/VBox/Main/include/DisplayImpl.h	(revision 84564)
@@ -98,5 +98,5 @@
 /* The legacy VBVA (VideoAccel) data.
  *
- * Backward compatibility with the guest additions 3.x or older.
+ * Backward compatibility with the Guest Additions 3.x or older.
  */
 typedef struct VIDEOACCEL
@@ -108,5 +108,5 @@
     uint32_t    cbVbvaPartial;
 
-    /* Old guest additions (3.x and older) use both VMMDev and DevVGA refresh timer
+    /* Old Guest Additions (3.x and older) use both VMMDev and DevVGA refresh timer
      * to process the VBVABUFFER memory. Therefore the legacy VBVA (VideoAccel) host
      * code can be executed concurrently by VGA refresh timer and the guest VMMDev
Index: /trunk/src/VBox/Main/include/UnattendedInstaller.h
===================================================================
--- /trunk/src/VBox/Main/include/UnattendedInstaller.h	(revision 84563)
+++ /trunk/src/VBox/Main/include/UnattendedInstaller.h	(revision 84564)
@@ -120,5 +120,5 @@
 #if 0 /* These are now in the AUX VISO. */
     /**
-     * Whether the VBox guest additions ISO is needed or not.
+     * Whether the VBox Guest Additions ISO is needed or not.
      *
      * The default implementation always returns false when a VISO is used, see
Index: /trunk/src/VBox/Main/include/UnattendedScript.h
===================================================================
--- /trunk/src/VBox/Main/include/UnattendedScript.h	(revision 84563)
+++ /trunk/src/VBox/Main/include/UnattendedScript.h	(revision 84564)
@@ -75,5 +75,5 @@
      *                              template parts.  Intended for voiding triggering
      *                              sanity checks regarding which replacements
-     *                              should be used and not (e.g. no guest additions
+     *                              should be used and not (e.g. no Guest Additions
      *                              path when installing GAs aren't enabled).
      * @param   rValue              Where to return the value.
Index: /trunk/src/VBox/Main/src-client/DisplayImplLegacy.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/DisplayImplLegacy.cpp	(revision 84563)
+++ /trunk/src/VBox/Main/src-client/DisplayImplLegacy.cpp	(revision 84564)
@@ -3,6 +3,6 @@
  * VirtualBox IDisplay implementation, helpers for legacy GAs.
  *
- * Methods and helpers to support old guest additions 3.x or older.
- * This is not used by the current guest additions.
+ * Methods and helpers to support old Guest Additions 3.x or older.
+ * This is not used by the current Guest Additions.
  */
 
Index: /trunk/src/VBox/Main/src-client/GuestFileImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestFileImpl.cpp	(revision 84563)
+++ /trunk/src/VBox/Main/src-client/GuestFileImpl.cpp	(revision 84564)
@@ -303,5 +303,5 @@
      *
      * Note! This will not be accurate with older (< 5.2.32, 6.0.0 - 6.0.9)
-     *       guest additions when using writeAt, readAt or writing to a file
+     *       Guest Additions when using writeAt, readAt or writing to a file
      *       opened in append mode.
      */
Index: /trunk/src/VBox/Main/src-client/GuestImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestImpl.cpp	(revision 84563)
+++ /trunk/src/VBox/Main/src-client/GuestImpl.cpp	(revision 84564)
@@ -415,5 +415,5 @@
     {
         /*
-         * If we're running older guest additions (< 3.2.0) try get it from
+         * If we're running older Guest Additions (< 3.2.0) try get it from
          * the guest properties.  Detected switched around Version and
          * Revision in early 3.1.x releases (see r57115).
@@ -462,5 +462,5 @@
     {
         /*
-         * If we're running older guest additions (< 3.2.0) try get it from
+         * If we're running older Guest Additions (< 3.2.0) try get it from
          * the guest properties. Detected switched around Version and
          * Revision in early 3.1.x releases (see r57115).
Index: /trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp	(revision 84563)
+++ /trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp	(revision 84564)
@@ -481,5 +481,5 @@
     }
     else if (mData.mProtocolVersion < 99999)
-        hrc = setError(VBOX_E_NOT_SUPPORTED, tr("The base environment feature is not supported by the guest additions"));
+        hrc = setError(VBOX_E_NOT_SUPPORTED, tr("The base environment feature is not supported by the Guest Additions"));
     else
         hrc = setError(VBOX_E_INVALID_OBJECT_STATE, tr("The base environment has not yet been reported by the guest"));
@@ -2778,5 +2778,5 @@
 {
     /*
-     * We currently do this based on the reported guest additions version,
+     * We currently do this based on the reported Guest Additions version,
      * ASSUMING that VBoxService and VBoxDrv are at the same version.
      */
@@ -2797,5 +2797,5 @@
 
     /*
-     * Inform the user about outdated guest additions (VM release log).
+     * Inform the user about outdated Guest Additions (VM release log).
      */
     if (mData.mProtocolVersion < 2)
@@ -3745,5 +3745,5 @@
     }
     else if (mData.mProtocolVersion < 99999)
-        hrc = setError(VBOX_E_NOT_SUPPORTED, tr("The base environment feature is not supported by the guest additions"));
+        hrc = setError(VBOX_E_NOT_SUPPORTED, tr("The base environment feature is not supported by the Guest Additions"));
     else
         hrc = setError(VBOX_E_INVALID_OBJECT_STATE, tr("The base environment has not yet been reported by the guest"));
@@ -3766,5 +3766,5 @@
     }
     else if (mData.mProtocolVersion < 99999)
-        hrc = setError(VBOX_E_NOT_SUPPORTED, tr("The base environment feature is not supported by the guest additions"));
+        hrc = setError(VBOX_E_NOT_SUPPORTED, tr("The base environment feature is not supported by the Guest Additions"));
     else
         hrc = setError(VBOX_E_INVALID_OBJECT_STATE, tr("The base environment has not yet been reported by the guest"));
Index: /trunk/src/VBox/Main/src-client/VMMDevInterface.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/VMMDevInterface.cpp	(revision 84563)
+++ /trunk/src/VBox/Main/src-client/VMMDevInterface.cpp	(revision 84564)
@@ -231,5 +231,5 @@
     {
         /*
-         * The guest additions was disabled because of a reset
+         * The Guest Additions was disabled because of a reset
          * or driver unload.
          */
@@ -270,6 +270,6 @@
 
 /**
- * Update the guest additions capabilities.
- * This is called when the guest additions capabilities change. The new capabilities
+ * Update the Guest Additions capabilities.
+ * This is called when the Guest Additions capabilities change. The new capabilities
  * are given and the connector should update its internal state.
  *
Index: /trunk/src/VBox/Main/src-server/UnattendedImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/UnattendedImpl.cpp	(revision 84563)
+++ /trunk/src/VBox/Main/src-server/UnattendedImpl.cpp	(revision 84564)
@@ -1240,5 +1240,5 @@
                             mStrIsoPath.c_str());
     if (mfInstallGuestAdditions && !RTFileExists(mStrAdditionsIsoPath.c_str()))
-        return setErrorBoth(E_FAIL, VERR_FILE_NOT_FOUND, tr("Could not locate the guest additions ISO file '%s'"),
+        return setErrorBoth(E_FAIL, VERR_FILE_NOT_FOUND, tr("Could not locate the Guest Additions ISO file '%s'"),
                             mStrAdditionsIsoPath.c_str());
     if (mfInstallTestExecService && !RTFileExists(mStrValidationKitIsoPath.c_str()))
Index: /trunk/src/VBox/Main/src-server/UnattendedScript.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/UnattendedScript.cpp	(revision 84563)
+++ /trunk/src/VBox/Main/src-server/UnattendedScript.cpp	(revision 84564)
@@ -434,5 +434,5 @@
          && memcmp(pachPlaceholder, "@@VBOX_COND_" a_szMatch "@@", sizeof("@@VBOX_COND_" a_szMatch "@@") - 1U) == 0)
 
-    /* Install guest additions: */
+    /* Install Guest Additions: */
     if (IS_PLACEHOLDER_MATCH("IS_INSTALLING_ADDITIONS"))
         *pfOutputting = mpUnattended->i_getInstallGuestAdditions();
