Index: /trunk/doc/manual/en_US/user_Installation.xml
===================================================================
--- /trunk/doc/manual/en_US/user_Installation.xml	(revision 58569)
+++ /trunk/doc/manual/en_US/user_Installation.xml	(revision 58570)
@@ -244,9 +244,11 @@
             <glossterm>VBOX_START</glossterm>
 
-            <para>Specifies whether or not VirtualBox should be started right after
-            successful installation.</para>
-
-            <para>Set to <computeroutput>1</computeroutput> to enable,
-            <computeroutput>0</computeroutput> to disable. Default is 1.</para>
+            <glossdef>
+              <para>Specifies whether or not VirtualBox should be started right after
+              successful installation.</para>
+
+              <para>Set to <computeroutput>1</computeroutput> to enable,
+              <computeroutput>0</computeroutput> to disable. Default is 1.</para>
+            </glossdef>
           </glossentry>
         </glosslist>
Index: /trunk/src/VBox/Installer/win/VirtualBox.wxs
===================================================================
--- /trunk/src/VBox/Installer/win/VirtualBox.wxs	(revision 58569)
+++ /trunk/src/VBox/Installer/win/VirtualBox.wxs	(revision 58570)
@@ -347,5 +347,5 @@
 
                 <Component Id="cp_DesktopShortcut" Guid="668F8A1A-F5CE-48B3-BB1A-3042EE27B279" Win64="$(var.Property_Win64)">
-                    <Condition>VBOXINSTALLDESKTOPSHORTCUT</Condition>
+                    <Condition>VBOX_INSTALLDESKTOPSHORTCUT</Condition>
                     <Shortcut Id="sc_DesktopVBox" Directory="DesktopFolder" Name="$(env.VBOX_PRODUCT)" Description="$(env.VBOX_PRODUCT)"
                               Target="[INSTALLDIR]VirtualBox.exe" WorkingDirectory="INSTALLDIR"/>
@@ -356,5 +356,5 @@
                 <Component Id="cp_QuickLaunchVBox" Guid="CC19E026-938A-41CB-8E77-3F33296244B6" Win64="$(var.Property_Win64)">
                     <CreateFolder/>
-                    <Condition>VBOXINSTALLQUICKLAUNCHSHORTCUT</Condition>
+                    <Condition>VBOX_INSTALLQUICKLAUNCHSHORTCUT</Condition>
                     <Shortcut Id="sc_QuickLaunchVBox" Directory="dir_QuicklaunchFolder" Name="$(env.VBOX_PRODUCT)" Description="$(env.VBOX_PRODUCT)"
                               Target="[INSTALLDIR]VirtualBox.exe" WorkingDirectory="INSTALLDIR"/>