Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp	(revision 29489)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp	(revision 29490)
@@ -48,4 +48,5 @@
 void printUsage(USAGECATEGORY u64Cmd)
 {
+    bool fDumpOpts = false;
 #ifdef RT_OS_LINUX
     bool fLinux = true;
@@ -86,4 +87,5 @@
     if (u64Cmd == USAGE_DUMPOPTS)
     {
+        fDumpOpts = true;
         fLinux = true;
         fWin = true;
@@ -187,9 +189,10 @@
                  "                            [--boot<1-4> none|floppy|dvd|disk|net>]\n"
                  "                            [--nic<1-N> none|null|nat|bridged|intnet"
-#if defined(VBOX_WITH_NETFLT) /* RT_OS_LINUX || RT_OS_DARWIN */
+#if defined(VBOX_WITH_NETFLT)
                  "|hostonly"
 #endif
 #ifdef VBOX_WITH_VDE
-                 "|vde"
+                 "|\n"
+                 "                                        vde"
 #endif
                  "]\n"
@@ -216,9 +219,9 @@
                  "                            [--vdenet<1-N> <network>|default]\n"
 #endif
-                 "                            [--natsettings<1-N> \"[<mtu>],[<socksnd>],[<sockrcv>],\n"
-                 "                                                         [<tcpsnd>],[<tcprcv>]\"]\n"
-                 "                            [--natpf<1-N> \"[<rulename>],tcp|udp,\n"
-                 "                                                        [<hostip>],<hostport>,\n"
-                 "                                                        [<guestip>],<guestport>\"]\n"
+                 "                            [--natsettings<1-N> [<mtu>],[<socksnd>],\n"
+                 "                                                [<sockrcv>],[<tcpsnd>],\n"
+                 "                                                [<tcprcv>]]\n"
+                 "                            [--natpf<1-N> [<rulename>],tcp|udp,[<hostip>],\n"
+                 "                                          <hostport>,[<guestip>],<guestport>]\n"
                  "                            [--natpf<1-N> delete <rulename>]\n"
                  "                            [--nattftpprefix<1-N> <prefix>]\n"
@@ -228,5 +231,6 @@
                  "                            [--natdnsproxy<1-N> on|off]\n"
                  "                            [--natdnshostresolver<1-N> on|off]\n"
-                 "                            [--nataliasmode<1-N> default|[log],[proxyonly],[sameports]]\n"
+                 "                            [--nataliasmode<1-N> default|[log],[proxyonly],\n"
+                 "                                                         [sameports]]\n"
                  "                            [--macaddress<1-N> auto|<mac>]\n"
                  "                            [--mouse ps2|usb|usbtablet\n"
@@ -271,9 +275,15 @@
         if (fFreeBSD)
         {
-            RTPrintf(                        "|oss"
+            /* Get the line break sorted when dumping all option variants. */
+            if (fDumpOpts)
+            {
+                RTPrintf(                    "|\n"
+                 "                                     oss");
+            }
+            else
+                RTPrintf(                    "|oss");
 #ifdef VBOX_WITH_PULSE
-                                             "|pulse"
-#endif
-                                             );
+            RTPrintf(                        "|pulse");
+#endif
         }
         if (fDarwin)
@@ -444,6 +454,6 @@
                  "                            --name <name>\n"
                  "                            [--add ide|sata|scsi|floppy|sas]\n"
-                 "                            [--controller LSILogic|LSILogicSAS|BusLogic|IntelAHCI|\n"
-                 "                                          PIIX3|PIIX4|ICH6|I82078]\n"
+                 "                            [--controller LSILogic|LSILogicSAS|BusLogic|\n"
+                 "                                          IntelAHCI|PIIX3|PIIX4|ICH6|I82078]\n"
                  "                            [--sataideemulation<1-4> <1-30>]\n"
                  "                            [--sataportcount <1-30>]\n"