From: Mike Hommey <mh@glandium.org>
Date: Thu, 7 Jan 2010 10:46:43 +0100
Subject: Fix misalignments in --help command line

https://bugzilla.mozilla.org/show_bug.cgi?id=458631
---
 browser/components/nsBrowserContentHandler.js      |    2 +-
 .../components/shell/src/nsSetDefaultBrowser.js    |    2 +-
 toolkit/components/console/jsconsole-clhandler.js  |    2 +-
 toolkit/xre/nsAppRunner.cpp                        |   30 ++++++++++----------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/browser/components/nsBrowserContentHandler.js b/browser/components/nsBrowserContentHandler.js
index b0f621f..765184d 100644
--- a/browser/components/nsBrowserContentHandler.js
+++ b/browser/components/nsBrowserContentHandler.js
@@ -505,7 +505,7 @@ var nsBrowserContentHandler = {
 #endif
   },
 
-  helpInfo : "  -browser            Open a browser window.\n",
+  helpInfo : "  -browser           Open a browser window.\n",
 
   /* nsIBrowserHandler */
 
diff --git a/browser/components/shell/src/nsSetDefaultBrowser.js b/browser/components/shell/src/nsSetDefaultBrowser.js
index e8ddfca..c818acf 100644
--- a/browser/components/shell/src/nsSetDefaultBrowser.js
+++ b/browser/components/shell/src/nsSetDefaultBrowser.js
@@ -55,7 +55,7 @@ nsSetDefaultBrowser.prototype = {
     }
   },
 
-  helpInfo: "  -setDefaultBrowser   Set this app as the default browser.\n",
+  helpInfo: "  -setDefaultBrowser Set this app as the default browser.\n",
 
   classDescription: "Default Browser Cmdline Handler",
   contractID: "@mozilla.org/browser/default-browser-clh;1",
diff --git a/toolkit/components/console/jsconsole-clhandler.js b/toolkit/components/console/jsconsole-clhandler.js
index dc1e97c..3fa6e09 100644
--- a/toolkit/components/console/jsconsole-clhandler.js
+++ b/toolkit/components/console/jsconsole-clhandler.js
@@ -64,7 +64,7 @@ jsConsoleHandler.prototype = {
       cmdLine.preventDefault = true;
   },
 
-  helpInfo : "  -jsconsole           Open the Error console.\n",
+  helpInfo : "  -jsconsole         Open the Error console.\n",
 
   classDescription: "jsConsoleHandler",
   classID: Components.ID("{2cd0c310-e127-44d0-88fc-4435c9ab4d4b}"),
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 3b5a238..e6a3505 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -1191,28 +1191,28 @@ DumpHelp()
 
 #ifdef MOZ_X11
   printf("X11 options\n"
-         "\t--display=DISPLAY\t\tX display to use\n"
-         "\t--sync\t\tMake X calls synchronous\n"
-         "\t--no-xshm\t\tDon't use X shared memory extension\n"
-         "\t--xim-preedit=STYLE\n"
-         "\t--xim-status=STYLE\n");
+         "  --display=DISPLAY  X display to use\n"
+         "  --sync             Make X calls synchronous\n"
+         "  --no-xshm          Don't use X shared memory extension\n"
+         "  --xim-preedit=STYLE\n"
+         "  --xim-status=STYLE\n");
 #endif
 #ifdef XP_UNIX
-  printf("\t--g-fatal-warnings\t\tMake all warnings fatal\n"
+  printf("  --g-fatal-warnings Make all warnings fatal\n"
          "\n%s options\n", gAppData->name);
 #endif
 
-  printf("\t-h or -help\t\tPrint this message.\n"
-         "\t-v or -version\t\tPrint %s version.\n"
-         "\t-P <profile>\t\tStart with <profile>.\n"
-         "\t-migration\t\tStart with migration wizard.\n"
-         "\t-ProfileManager\t\tStart with ProfileManager.\n"
-         "\t-no-remote\t\tOpen new instance, not a new window in running instance.\n"
-         "\t-UILocale <locale>\tStart with <locale> resources as UI Locale.\n"
-         "\t-safe-mode\t\tDisables extensions and themes for this session.\n", gAppData->name);
+  printf("  -h or -help        Print this message.\n"
+         "  -v or -version     Print %s version.\n"
+         "  -P <profile>       Start with <profile>.\n"
+         "  -migration         Start with migration wizard.\n"
+         "  -ProfileManager    Start with ProfileManager.\n"
+         "  -no-remote         Open new instance, not a new window in running instance.\n"
+         "  -UILocale <locale> Start with <locale> resources as UI Locale.\n"
+         "  -safe-mode         Disables extensions and themes for this session.\n", gAppData->name);
 
 #if defined(XP_WIN) || defined(XP_OS2)
-  printf("\t-console\t\tStart %s with a debugging console.\n", gAppData->name);
+  printf("  -console           Start %s with a debugging console.\n", gAppData->name);
 #endif
 
   // this works, but only after the components have registered.  so if you drop in a new command line handler, -help
