Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h	(revision 42459)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h	(revision 42460)
@@ -183,8 +183,8 @@
 
 /* VBoxManageGuestProp.cpp */
-extern void usageGuestProperty(PRTSTREAM pStrm);
+extern void usageGuestProperty(PRTSTREAM pStrm, const char *pcszSep1, const char *pcszSep2);
 
 /* VBoxManageGuestCtrl.cpp */
-extern void usageGuestControl(PRTSTREAM pStrm);
+extern void usageGuestControl(PRTSTREAM pStrm, const char *pcszSep1, const char *pcszSep2);
 
 #ifndef VBOX_ONLY_DOCS
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp	(revision 42459)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp	(revision 42460)
@@ -218,8 +218,8 @@
 #endif /* VBOX_ONLY_DOCS */
 
-void usageGuestControl(PRTSTREAM pStrm)
+void usageGuestControl(PRTSTREAM pStrm, const char *pcszSep1, const char *pcszSep2)
 {
     RTStrmPrintf(pStrm,
-                 "VBoxManage guestcontrol     <vmname>|<uuid>\n"
+                       "%s guestcontrol %s    <vmname>|<uuid>\n"
                  "                            exec[ute]\n"
                  "                            --image <path to program> --username <name>\n"
@@ -255,5 +255,5 @@
                  "                            updateadditions\n"
                  "                            [--source <guest additions .ISO>] [--verbose]\n"
-                 "\n");
+                 "\n", pcszSep1, pcszSep2);
 }
 
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp	(revision 42459)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp	(revision 42460)
@@ -53,22 +53,22 @@
 #endif /* !VBOX_ONLY_DOCS */
 
-void usageGuestProperty(PRTSTREAM pStrm)
+void usageGuestProperty(PRTSTREAM pStrm, const char *pcszSep1, const char *pcszSep2)
 {
     RTStrmPrintf(pStrm,
-                 "VBoxManage guestproperty    get <vmname>|<uuid>\n"
+                       "%s guestproperty %s   get <vmname>|<uuid>\n"
                  "                            <property> [--verbose]\n"
-                 "\n");
+                 "\n", pcszSep1, pcszSep2);
     RTStrmPrintf(pStrm,
-                 "VBoxManage guestproperty    set <vmname>|<uuid>\n"
+                       "%s guestproperty %s   set <vmname>|<uuid>\n"
                  "                            <property> [<value> [--flags <flags>]]\n"
-                 "\n");
+                 "\n", pcszSep1, pcszSep2);
     RTStrmPrintf(pStrm,
-                 "VBoxManage guestproperty    enumerate <vmname>|<uuid>\n"
+                       "%s guestproperty %s   enumerate <vmname>|<uuid>\n"
                  "                            [--patterns <patterns>]\n"
-                 "\n");
+                 "\n", pcszSep1, pcszSep2);
     RTStrmPrintf(pStrm,
-                 "VBoxManage guestproperty    wait <vmname>|<uuid> <patterns>\n"
+                       "%s guestproperty %s   wait <vmname>|<uuid> <patterns>\n"
                  "                            [--timeout <msec>] [--fail-on-timeout]\n"
-                 "\n");
+                 "\n", pcszSep1, pcszSep2);
 }
 
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp	(revision 42459)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp	(revision 42460)
@@ -99,13 +99,27 @@
     if (u64Cmd == USAGE_ALL)
         RTStrmPrintf(pStrm,
-                     "VBoxManage [-v|--version]          print version number and exit\n"
-                     "VBoxManage [-q|--nologo]       ... suppress the logo\n"
-                     "VBoxManage [--settingspw <pw>] ...\n"
-                     "VBoxManage [--settingspwfile]  ... provide the settings password\n"
-                     "\n");
+                     "  VBoxManage [<general option>] <command>\n"
+                     " \n \n"
+                     "General Options:\n \n"
+                     "  [-v|--version]            print version number and exit\n"
+                     "  [-q|--nologo]             suppress the logo\n"
+                     "  [--settingspw <pw>]       provide the settings password\n"
+                     "  [--settingspwfile <file>] provide a file containing the settings password\n"
+                     " \n \n"
+                     "Commands:\n \n");
+
+    const char *pcszSep1 = " ";
+    const char *pcszSep2 = "         ";
+    if (u64Cmd != USAGE_ALL)
+    {
+        pcszSep1 = "VBoxManage";
+        pcszSep2 = "";
+    }
+
+#define SEP pcszSep1, pcszSep2
 
     if (u64Cmd & USAGE_LIST)
         RTStrmPrintf(pStrm,
-                     "VBoxManage list [--long|-l] vms|runningvms|ostypes|hostdvds|hostfloppies|\n"
+                           "%s list [--long|-l]%s vms|runningvms|ostypes|hostdvds|hostfloppies|\n"
 #if defined(VBOX_WITH_NETFLT)
                      "                            bridgedifs|hostonlyifs|dhcpservers|hostinfo|\n"
@@ -116,26 +130,26 @@
                      "                            usbhost|usbfilters|systemproperties|extpacks|\n"
                      "                            groups\n"
-                     "\n");
+                     "\n", SEP);
 
     if (u64Cmd & USAGE_SHOWVMINFO)
         RTStrmPrintf(pStrm,
-                     "VBoxManage showvminfo       <uuid>|<name> [--details]\n"
+                           "%s showvminfo %s      <uuid>|<name> [--details]\n"
                      "                            [--machinereadable]\n"
-                     "VBoxManage showvminfo       <uuid>|<name> --log <idx>\n"
-                     "\n");
+                           "%s showvminfo %s      <uuid>|<name> --log <idx>\n"
+                     "\n", SEP, SEP);
 
     if (u64Cmd & USAGE_REGISTERVM)
         RTStrmPrintf(pStrm,
-                     "VBoxManage registervm       <filename>\n"
-                     "\n");
+                           "%s registervm %s      <filename>\n"
+                     "\n", SEP);
 
     if (u64Cmd & USAGE_UNREGISTERVM)
         RTStrmPrintf(pStrm,
-                     "VBoxManage unregistervm     <uuid>|<name> [--delete]\n"
-                     "\n");
+                           "%s unregistervm %s    <uuid>|<name> [--delete]\n"
+                     "\n", SEP);
 
     if (u64Cmd & USAGE_CREATEVM)
         RTStrmPrintf(pStrm,
-                     "VBoxManage createvm         --name <name>\n"
+                           "%s createvm %s        --name <name>\n"
                      "                            [--groups <group>, ...]\n"
                      "                            [--ostype <ostype>]\n"
@@ -143,10 +157,10 @@
                      "                            [--basefolder <path>]\n"
                      "                            [--uuid <uuid>]\n"
-                     "\n");
+                     "\n", SEP);
 
     if (u64Cmd & USAGE_MODIFYVM)
     {
         RTStrmPrintf(pStrm,
-                     "VBoxManage modifyvm         <uuid|name>\n"
+                           "%s modifyvm %s        <uuid|name>\n"
                      "                            [--name <name>]\n"
                      "                            [--groups <group>, ...]\n"
@@ -255,5 +269,5 @@
                      "                            [--guestmemoryballoon <balloonsize in MB>]\n"
                      "                            [--gueststatisticsinterval <seconds>]\n"
-                     "                            [--audio none|null");
+                     "                            [--audio none|null", SEP);
         if (fWin)
         {
@@ -354,5 +368,5 @@
     if (u64Cmd & USAGE_CLONEVM)
         RTStrmPrintf(pStrm,
-                     "VBoxManage clonevm          <uuid>|<name>\n"
+                           "%s clonevm %s         <uuid>|<name>\n"
                      "                            [--snapshot <uuid>|<name>]\n"
                      "                            [--mode machine|machineandchildren|all]\n"
@@ -364,18 +378,18 @@
                      "                            [--uuid <uuid>]\n"
                      "                            [--register]\n"
-                     "\n");
+                     "\n", SEP);
 
     if (u64Cmd & USAGE_IMPORTAPPLIANCE)
         RTStrmPrintf(pStrm,
-                     "VBoxManage import           <ovf/ova>\n"
+                           "%s import %s          <ovf/ova>\n"
                      "                            [--dry-run|-n]\n"
                      "                            [--options keepallmacs|keepnatmacs]\n"
                      "                            [more options]\n"
                      "                            (run with -n to have options displayed\n"
-                     "                             for a particular OVF)\n\n");
+                     "                             for a particular OVF)\n\n", SEP);
 
     if (u64Cmd & USAGE_EXPORTAPPLIANCE)
         RTStrmPrintf(pStrm,
-                     "VBoxManage export           <machines> --output|-o <name>.<ovf/ova>\n"
+                           "%s export %s          <machines> --output|-o <name>.<ovf/ova>\n"
                      "                            [--legacy09|--ovf09|--ovf10|--ovf20]\n"
                      "                            [--manifest]\n"
@@ -388,12 +402,11 @@
                      "                                    [--eula <license text>]\n"
                      "                                    [--eulafile <filename>]\n"
-                     "\n");
+                     "\n", SEP);
 
     if (u64Cmd & USAGE_STARTVM)
     {
         RTStrmPrintf(pStrm,
-                     "VBoxManage startvm          <uuid>|<name>...\n");
-        RTStrmPrintf(pStrm,
-                     "                            [--type gui");
+                           "%s startvm %s         <uuid>|<name>...\n"
+                     "                            [--type gui", SEP);
         if (fVBoxSDL)
             RTStrmPrintf(pStrm, "|sdl");
@@ -406,5 +419,5 @@
     {
         RTStrmPrintf(pStrm,
-                     "VBoxManage controlvm        <uuid>|<name>\n"
+                           "%s controlvm %s       <uuid>|<name>\n"
                      "                            pause|resume|reset|poweroff|savestate|\n"
                      "                            acpipowerbutton|acpisleepbutton|\n"
@@ -451,20 +464,20 @@
                      "                            unplugcpu <id>\n"
                      "                            cpuexecutioncap <1-100>\n"
-                     "\n");
+                     "\n", SEP);
     }
 
     if (u64Cmd & USAGE_DISCARDSTATE)
         RTStrmPrintf(pStrm,
-                     "VBoxManage discardstate     <uuid>|<name>\n"
-                     "\n");
+                           "%s discardstate %s    <uuid>|<name>\n"
+                     "\n", SEP);
 
     if (u64Cmd & USAGE_ADOPTSTATE)
         RTStrmPrintf(pStrm,
-                     "VBoxManage adoptstate       <uuid>|<name> <state_file>\n"
-                     "\n");
+                           "%s adoptstate %s      <uuid>|<name> <state_file>\n"
+                     "\n", SEP);
 
     if (u64Cmd & USAGE_SNAPSHOT)
         RTStrmPrintf(pStrm,
-                     "VBoxManage snapshot         <uuid>|<name>\n"
+                           "%s snapshot %s        <uuid>|<name>\n"
                      "                            take <name> [--description <desc>] [--pause] |\n"
                      "                            delete <uuid>|<name> |\n"
@@ -476,15 +489,15 @@
                      "                            list [--details|--machinereadable]\n"
                      "                            showvminfo <uuid>|<name>\n"
-                     "\n");
+                     "\n", SEP);
 
     if (u64Cmd & USAGE_CLOSEMEDIUM)
         RTStrmPrintf(pStrm,
-                     "VBoxManage closemedium      disk|dvd|floppy <uuid>|<filename>\n"
+                           "%s closemedium %s     disk|dvd|floppy <uuid>|<filename>\n"
                      "                            [--delete]\n"
-                     "\n");
+                     "\n", SEP);
 
     if (u64Cmd & USAGE_STORAGEATTACH)
         RTStrmPrintf(pStrm,
-                     "VBoxManage storageattach    <uuid|vmname>\n"
+                           "%s storageattach %s   <uuid|vmname>\n"
                      "                            --storagectl <name>\n"
                      "                            [--port <number>]\n"
@@ -513,9 +526,9 @@
                      "                            [--initiator <initiator>]\n"
                      "                            [--intnet]\n"
-                     "\n");
+                     "\n", SEP);
 
     if (u64Cmd & USAGE_STORAGECONTROLLER)
         RTStrmPrintf(pStrm,
-                     "VBoxManage storagectl       <uuid|vmname>\n"
+                           "%s storagectl %s      <uuid|vmname>\n"
                      "                            --name <name>\n"
                      "                            [--add ide|sata|scsi|floppy|sas]\n"
@@ -527,9 +540,9 @@
                      "                            [--bootable on|off]\n"
                      "                            [--remove]\n"
-                     "\n");
+                     "\n", SEP);
 
     if (u64Cmd & USAGE_BANDWIDTHCONTROL)
         RTStrmPrintf(pStrm,
-                     "VBoxManage bandwidthctl     <uuid|vmname>\n"
+                           "%s bandwidthctl %s    <uuid|vmname>\n"
                      "                            add <name> --type disk|network\n"
                      "                                --limit <megabytes per second>[k|m|g|K|M|G] |\n"
@@ -540,23 +553,23 @@
                      "                            (limit units: k=kilobit, m=megabit, g=gigabit,\n"
                      "                                          K=kilobyte, M=megabyte, G=gigabyte)\n"
-                     "\n");
+                     "\n", SEP);
 
     if (u64Cmd & USAGE_SHOWHDINFO)
         RTStrmPrintf(pStrm,
-                     "VBoxManage showhdinfo       <uuid>|<filename>\n"
-                     "\n");
+                           "%s showhdinfo %s      <uuid>|<filename>\n"
+                     "\n", SEP);
 
     if (u64Cmd & USAGE_CREATEHD)
         RTStrmPrintf(pStrm,
-                     "VBoxManage createhd         --filename <filename>\n"
+                           "%s createhd %s        --filename <filename>\n"
                      "                            [--size <megabytes>|--sizebyte <bytes>]\n"
                      "                            [--diffparent <uuid>|<filename>\n"
                      "                            [--format VDI|VMDK|VHD] (default: VDI)\n"
                      "                            [--variant Standard,Fixed,Split2G,Stream,ESX]\n"
-                     "\n");
+                     "\n", SEP);
 
     if (u64Cmd & USAGE_MODIFYHD)
         RTStrmPrintf(pStrm,
-                     "VBoxManage modifyhd         <uuid>|<filename>\n"
+                           "%s modifyhd %s        <uuid>|<filename>\n"
                      "                            [--type normal|writethrough|immutable|shareable|\n"
                      "                                    readonly|multiattach]\n"
@@ -564,42 +577,42 @@
                      "                            [--compact]\n"
                      "                            [--resize <megabytes>|--resizebyte <bytes>]\n"
-                     "\n");
+                     "\n", SEP);
 
     if (u64Cmd & USAGE_CLONEHD)
         RTStrmPrintf(pStrm,
-                     "VBoxManage clonehd          <uuid>|<filename> <uuid>|<outputfile>\n"
+                           "%s clonehd %s         <uuid>|<filename> <uuid>|<outputfile>\n"
                      "                            [--format VDI|VMDK|VHD|RAW|<other>]\n"
                      "                            [--variant Standard,Fixed,Split2G,Stream,ESX]\n"
                      "                            [--existing]\n"
-                     "\n");
+                     "\n", SEP);
 
     if (u64Cmd & USAGE_CONVERTFROMRAW)
         RTStrmPrintf(pStrm,
-                     "VBoxManage convertfromraw   <filename> <outputfile>\n"
+                           "%s convertfromraw %s  <filename> <outputfile>\n"
                      "                            [--format VDI|VMDK|VHD]\n"
                      "                            [--variant Standard,Fixed,Split2G,Stream,ESX]\n"
                      "                            [--uuid <uuid>]\n"
-                     "VBoxManage convertfromraw   stdin <outputfile> <bytes>\n"
+                           "%s convertfromraw %s  stdin <outputfile> <bytes>\n"
                      "                            [--format VDI|VMDK|VHD]\n"
                      "                            [--variant Standard,Fixed,Split2G,Stream,ESX]\n"
                      "                            [--uuid <uuid>]\n"
-                     "\n");
+                     "\n", SEP, SEP);
 
     if (u64Cmd & USAGE_GETEXTRADATA)
         RTStrmPrintf(pStrm,
-                     "VBoxManage getextradata     global|<uuid>|<name>\n"
+                           "%s getextradata %s    global|<uuid>|<name>\n"
                      "                            <key>|enumerate\n"
-                     "\n");
+                     "\n", SEP);
 
     if (u64Cmd & USAGE_SETEXTRADATA)
         RTStrmPrintf(pStrm,
-                     "VBoxManage setextradata     global|<uuid>|<name>\n"
+                           "%s setextradata %s    global|<uuid>|<name>\n"
                      "                            <key>\n"
                      "                            [<value>] (no value deletes key)\n"
-                     "\n");
+                     "\n", SEP);
 
     if (u64Cmd & USAGE_SETPROPERTY)
         RTStrmPrintf(pStrm,
-                     "VBoxManage setproperty      machinefolder default|<folder> |\n"
+                           "%s setproperty %s     machinefolder default|<folder> |\n"
                      "                            vrdeauthlibrary default|<library> |\n"
                      "                            websrvauthlibrary default|null|<library> |\n"
@@ -607,9 +620,9 @@
                      "                            autostartdbpath null|<folder> |\n"
                      "                            loghistorycount <value>\n"
-                     "\n");
+                     "\n", SEP);
 
     if (u64Cmd & USAGE_USBFILTER_ADD)
         RTStrmPrintf(pStrm,
-                     "VBoxManage usbfilter        add <index,0-N>\n"
+                           "%s usbfilter %s       add <index,0-N>\n"
                      "                            --target <uuid>|<name>|global\n"
                      "                            --name <string>\n"
@@ -624,9 +637,9 @@
                      "                            [--serialnumber <string>] (null)\n"
                      "                            [--maskedinterfaces <XXXXXXXX>]\n"
-                     "\n");
+                     "\n", SEP);
 
     if (u64Cmd & USAGE_USBFILTER_MODIFY)
         RTStrmPrintf(pStrm,
-                     "VBoxManage usbfilter        modify <index,0-N>\n"
+                           "%s usbfilter %s       modify <index,0-N>\n"
                      "                            --target <uuid>|<name>|global\n"
                      "                            [--name <string>]\n"
@@ -641,33 +654,33 @@
                      "                            [--serialnumber <string>|\"\"]\n"
                      "                            [--maskedinterfaces <XXXXXXXX>]\n"
-                     "\n");
+                     "\n", SEP);
 
     if (u64Cmd & USAGE_USBFILTER_REMOVE)
         RTStrmPrintf(pStrm,
-                     "VBoxManage usbfilter        remove <index,0-N>\n"
+                           "%s usbfilter %s       remove <index,0-N>\n"
                      "                            --target <uuid>|<name>|global\n"
-                     "\n");
+                     "\n", SEP);
 
     if (u64Cmd & USAGE_SHAREDFOLDER_ADD)
         RTStrmPrintf(pStrm,
-                     "VBoxManage sharedfolder     add <vmname>|<uuid>\n"
+                           "%s sharedfolder %s    add <vmname>|<uuid>\n"
                      "                            --name <name> --hostpath <hostpath>\n"
                      "                            [--transient] [--readonly] [--automount]\n"
-                     "\n");
+                     "\n", SEP);
 
     if (u64Cmd & USAGE_SHAREDFOLDER_REMOVE)
         RTStrmPrintf(pStrm,
-                     "VBoxManage sharedfolder     remove <vmname>|<uuid>\n"
+                           "%s sharedfolder %s    remove <vmname>|<uuid>\n"
                      "                            --name <name> [--transient]\n"
-                     "\n");
+                     "\n", SEP);
 
 #ifdef VBOX_WITH_GUEST_PROPS
     if (u64Cmd & USAGE_GUESTPROPERTY)
-        usageGuestProperty(pStrm);
+        usageGuestProperty(pStrm, SEP);
 #endif /* VBOX_WITH_GUEST_PROPS defined */
 
 #ifdef VBOX_WITH_GUEST_CONTROL
     if (u64Cmd & USAGE_GUESTCONTROL)
-        usageGuestControl(pStrm);
+        usageGuestControl(pStrm, SEP);
 #endif /* VBOX_WITH_GUEST_CONTROL defined */
 
@@ -675,5 +688,5 @@
     {
         RTStrmPrintf(pStrm,
-                     "VBoxManage debugvm          <uuid>|<name>\n"
+                           "%s debugvm %s         <uuid>|<name>\n"
                      "                            dumpguestcore --filename <name> |\n"
                      "                            info <item> [args] |\n"
@@ -692,23 +705,23 @@
                      "                            statistics [--reset] [--pattern <pattern>]\n"
                      "                            [--descriptions]\n"
-                     "\n");
+                     "\n", SEP);
     }
     if (u64Cmd & USAGE_METRICS)
         RTStrmPrintf(pStrm,
-                     "VBoxManage metrics          list [*|host|<vmname> [<metric_list>]]\n"
+                           "%s metrics %s         list [*|host|<vmname> [<metric_list>]]\n"
                      "                                                 (comma-separated)\n\n"
-                     "VBoxManage metrics          setup\n"
+                           "%s metrics %s         setup\n"
                      "                            [--period <seconds>] (default: 1)\n"
                      "                            [--samples <count>] (default: 1)\n"
                      "                            [--list]\n"
                      "                            [*|host|<vmname> [<metric_list>]]\n\n"
-                     "VBoxManage metrics          query [*|host|<vmname> [<metric_list>]]\n\n"
-                     "VBoxManage metrics          enable\n"
+                           "%s metrics %s         query [*|host|<vmname> [<metric_list>]]\n\n"
+                           "%s metrics %s         enable\n"
                      "                            [--list]\n"
                      "                            [*|host|<vmname> [<metric_list>]]\n\n"
-                     "VBoxManage metrics          disable\n"
+                           "%s metrics %s         disable\n"
                      "                            [--list]\n"
                      "                            [*|host|<vmname> [<metric_list>]]\n\n"
-                     "VBoxManage metrics          collect\n"
+                           "%s metrics %s         collect\n"
                      "                            [--period <seconds>] (default: 1)\n"
                      "                            [--samples <count>] (default: 1)\n"
@@ -716,5 +729,5 @@
                      "                            [--detach]\n"
                      "                            [*|host|<vmname> [<metric_list>]]\n"
-                     "\n");
+                     "\n", SEP, SEP, SEP, SEP, SEP, SEP);
 
 #if defined(VBOX_WITH_NETFLT)
@@ -722,5 +735,5 @@
     {
         RTStrmPrintf(pStrm,
-                     "VBoxManage hostonlyif       ipconfig <name>\n"
+                           "%s hostonlyif %s      ipconfig <name>\n"
                      "                            [--dhcp |\n"
                      "                            --ip<ipv4> [--netmask<ipv4> (def: 255.255.255.0)] |\n"
@@ -730,5 +743,5 @@
                      "                            remove <name>\n"
 # endif
-                     "\n");
+                     "\n", SEP);
     }
 #endif
@@ -737,5 +750,5 @@
     {
         RTStrmPrintf(pStrm,
-                     "VBoxManage dhcpserver       add|modify --netname <network_name> |\n"
+                           "%s dhcpserver %s      add|modify --netname <network_name> |\n"
 #if defined(VBOX_WITH_NETFLT)
                      "                                       --ifname <hostonly_if_name>\n"
@@ -746,17 +759,17 @@
                      "                            --upperip <upper_ip>]\n"
                      "                            [--enable | --disable]\n\n"
-                     "VBoxManage dhcpserver       remove --netname <network_name> |\n"
+                           "%s dhcpserver %s      remove --netname <network_name> |\n"
 #if defined(VBOX_WITH_NETFLT)
                      "                                   --ifname <hostonly_if_name>\n"
 #endif
-                     "\n");
+                     "\n", SEP, SEP);
     }
     if (u64Cmd & USAGE_EXTPACK)
     {
         RTStrmPrintf(pStrm,
-                     "VBoxManage extpack          install [--replace] <tarball> |\n"
+                           "%s extpack %s         install [--replace] <tarball> |\n"
                      "                            uninstall [--force] <name> |\n"
                      "                            cleanup\n"
-                     "\n");
+                     "\n", SEP);
     }
 }