diff --git a/pkgs/compiler-lib/compiler/commands/test.rkt b/pkgs/compiler-lib/compiler/commands/test.rkt
index c88b0b5cab..8e4b633579 100644
--- a/pkgs/compiler-lib/compiler/commands/test.rkt
+++ b/pkgs/compiler-lib/compiler/commands/test.rkt
@@ -1002,7 +1002,7 @@
   (set! packages? #t)]
  [("--modules" "-m")
   ("Interpret arguments as modules"
-   "  (ignore argument unless \".rkt\", \".scrbl\", or enabled by \"info.rkt\")")
+   "(ignore argument unless \".rkt\", \".scrbl\", or enabled by \"info.rkt\")")
   (set! check-top-suffix? #t)]
  #:once-each
  [("--drdr")
diff --git a/pkgs/racket-doc/scribblings/raco/command.scrbl b/pkgs/racket-doc/scribblings/raco/command.scrbl
index d9af9027e6..a79f4c2136 100644
--- a/pkgs/racket-doc/scribblings/raco/command.scrbl
+++ b/pkgs/racket-doc/scribblings/raco/command.scrbl
@@ -101,12 +101,17 @@ command-line arguments with
 so that @exec{raco decompile --help} prints
 
 @verbatim[#:indent 2]{
- raco decompile [ <option> ... ] [<source-or-bytecode-file>] ...
- where <option> is one of
-  --help, -h : Show this help
-  -- : Do not treat any remaining argument as a switch (at this level)
- Multiple single-letter switches can be combined after one `-'; for
-  example: `-h-' is the same as `-h --'
+usage: raco decompile [ <option> ... ] [<source-or-bytecode-file>] ...
+
+<option> is one of
+
+  --help, -h
+     Show this help
+  --
+     Do not treat any remaining argument as a switch (at this level)
+
+ Multiple single-letter switches can be combined after
+ one `-`. For example, `-h-` is the same as `-h --`.
 }}
 
 @defproc[(program+command-name) string?]{
diff --git a/racket/collects/racket/cmdline.rkt b/racket/collects/racket/cmdline.rkt
index 88be0d10fd..8417385014 100644
--- a/racket/collects/racket/cmdline.rkt
+++ b/racket/collects/racket/cmdline.rkt
@@ -356,13 +356,13 @@
                   (list "--help" "-h")
                   (lambda (f)
                     (let ([sp (open-output-string)])
-                      (fprintf sp "~a [ <option> ... ]" (program-name program))
+                      (fprintf sp "usage: ~a [ <option> ... ]" (program-name program))
                       (print-args sp finish-help finish)
                       (for ([set (in-list table)]
                             #:when (eq? (car set) 'usage-help))
                         (for ([line (in-list (cdr set))])
                           (fprintf sp "\n  ~a" line)))
-                      (fprintf sp "\n where <option> is one of\n")
+                      (fprintf sp "\n\n<option> is one of\n\n")
                       (for ([set (in-list table)] ; the original table
                             #:unless (memq (car set) '(ps usage-help)))
                         (if (eq? (car set) 'help-labels)
@@ -380,7 +380,8 @@
                                                         (first? help helps))
                                                    "/"]
                                                   [(and (last? line (cdr set))
-                                                        (last? help helps))
+                                                        (last? help helps)
+                                                        (> (length helps) 1))
                                                    "\\"]
                                                   [else "|"])]
                                                [(and (memq (car set) '(multi final))
@@ -396,17 +397,31 @@
                                       (unless (null? (cdr flags))
                                         (fprintf sp ",")
                                         (loop (cdr flags))))
-                                    (fprintf sp " :"))
-                                  (fprintf sp "  "))
+                                    (if (and (eq? (car set) 'once-any)
+                                             (pair? (cddr set)))
+                                      (if (and (last? line (cdr set))
+                                                (last? help helps))
+                                        ; | -i
+                                        ; \    description  <-
+                                        (fprintf sp "\n\\   ")
+                                        ; | -i
+                                        ; |    description 1  <-
+                                        ; \    description 2
+                                        (fprintf sp "\n|   "))
+                                      (fprintf sp "\n    ")))
+                                  (fprintf sp "   "))
                                 (fprintf sp " ~a\n" help))))))
-                      (fprintf sp "  --help, -h : Show this help\n")
-                      (fprintf sp "  -- : Do not treat any remaining argument as a switch (at this level)\n")
+                      (fprintf sp "  --help, -h\n     Show this help\n")
+                      (fprintf sp "  --\n     Do not treat any remaining argument as a switch (at this level)\n")
+                      (fprintf sp "\n")
                       (when (or (assq 'multi table) (assq 'final table))
-                        (fprintf sp " * Asterisks indicate options allowed multiple times.\n"))
+                        (fprintf sp " *   Asterisks indicate options allowed multiple times.\n"))
                       (when (assq 'once-any table)
                         (fprintf sp " /|\\ Brackets indicate mutually exclusive options.\n"))
-                      (fprintf sp " Multiple single-letter switches can be combined after one `-'; for\n")
-                      (fprintf sp "  example: `-h-' is the same as `-h --'\n")
+                      (when (or (assq 'multi table) (assq 'final table) (assq 'once-any table))
+                        (fprintf sp "\n"))
+                      (fprintf sp " Multiple single-letter switches can be combined after\n")
+                      (fprintf sp " one `-`. For example, `-h-` is the same as `-h --`.\n")
                       (for ([set (in-list table)] ; the original table
                             #:when (eq? (car set) 'ps))
                         (for ([line (in-list (cdr set))])
diff --git a/racket/src/bc/cmdline.inc b/racket/src/bc/cmdline.inc
index 04c354aeeb..4274b8d889 100644
--- a/racket/src/bc/cmdline.inc
+++ b/racket/src/bc/cmdline.inc
@@ -1419,88 +1419,149 @@ static int run_from_cmd_line(int argc, char *_argv[],
          PROGRAM_LC " [<option> ...] <argument> ...\n"
 # ifndef RACKET_CMD_LINE
 #  ifdef wx_x
-	 " X configuration options (must precede all other options):\n"
-	 "  -display <display>, -geometry <geometry>, -fn <font>, -font <font>,\n"
-         "  -bg <color>, -background <color>, -fg <color>, -foreground <color>,\n"
-	 "  -iconic, -name <name>, -rv, -reverse, +rv, -selectionTimeout <timeout>,\n"
-	 "  -synchronous, -title <title>, -xnllanguage <language>, -xrm <file>\n"
+  "\n"
+  "X configuration options (must precede all other options):\n\n"
+  "  -display <display>, -geometry <geometry>, -fn <font>,\n"
+  "  -font <font>, -bg <color>, -background <color>, -fg <color>,\n"
+  "  -foreground <color>, -iconic, -name <name>, -rv, -reverse,\n"
+  "  +rv, -selectionTimeout <timeout>, -synchronous, -title <title>,\n"
+  "  -xnllanguage <language>, -xrm <file>\n"
 #  endif
 # endif
-	 " File and expression options:\n"
-	 "  -e <exprs>, --eval <exprs> : Evaluate <exprs>, prints results\n"
-	 "  -f <file>, --load <file> : Like -e '(load \"<file>\")' without printing\n"
-	 "  -t <file>, --require <file> : Like -e '(require (file \"<file>\"))' [*]\n"
-	 "  -l <path>, --lib <path> : Like -e '(require (lib \"<path>\"))' [*]\n"
-	 "  -p <package> : Like -e '(require (planet \"<package>\")' [*]\n"
-	 "  -r <file>, --script <file> : Same as -f <file> -N <file> --\n" 
-	 "  -u <file>, --require-script <file> : Same as -t <file> -N <file> --\n" 
-	 "  -k <n> <m> <p> : Load executable-embedded code from offset <n> to <p>\n"
-	 "  -Y <file> <n> <m> <p> : Like -k <n> <m> <p>, but from <file>\n"
-	 "  -m, --main : Call `main' with command-line arguments, print results\n"
-         "  [*] Also `require's a `main' submodule, if any\n"
-	 " Interaction options:\n"
-         "  -i, --repl : Run interactive read-eval-print loop; implies -v\n"
-         "  -n, --no-lib : Skip `(require (lib \"<init-lib>\"))' for -i/-e/-f/-r\n"
-	 "  -v, --version : Show version\n"
+  "\n"
+  "File and expression options:\n\n"
+  "  -e <exprs>, --eval <exprs>\n"
+  "     Evaluate <exprs>, print results\n"
+  "  -f <file>, --load <file>\n"
+  "     Like -e '(load \"<file>\")' without printing\n"
+  "  -t <file>, --require <file>\n"
+  "     Like -e '(require (file \"<file>\"))' [*]\n"
+  "  -l <path>, --lib <path>\n"
+  "     Like -e '(require (lib \"<path>\"))' [*]\n"
+  "  -p <package>\n"
+  "     Like -e '(require (planet \"<package>\")' [*]\n"
+  "  -r <file>, --script <file>\n"
+  "     Same as -f <file> -N <file> --\n"
+  "  -u <file>, --require-script <file>\n"
+  "     Same as -t <file> -N <file> --\n"
+  "  -k <n> <m> <p>\n"
+  "     Load executable-embedded code from offset <n> to <p>\n"
+  "  -Y <file> <n> <m> <p>\n"
+  "     Like -k <n> <m> <p>, but from <file>\n"
+  "  -m, --main\n"
+  "     Call `main` with command-line arguments, print results\n"
+  "\n"
+  " [*] Also `require`s a `main` submodule, if any\n"
+  "\n"
+  "Interaction options:\n\n"
+  "  -i, --repl\n"
+  "     Run interactive read-eval-print loop; implies -v\n"
+  "  -n, --no-lib\n"
+  "     Skip `(require (lib \"<init-lib>\"))` for -i/-e/-f/-r\n"
+  "  -v, --version\n"
+  "     Show version\n"
 # ifdef CMDLINE_STDIO_FLAG
-	 "  -K, --back : Don't bring application to the foreground (Mac OS X)\n"
+  "  -K, --back\n"
+  "     Don't bring application to the foreground (Mac OS X)\n"
 # endif
 # ifndef NO_YIELD_BEFORE_EXIT
-	 "  -V, --no-yield : Skip `((executable-yield-handler) <status>)' on exit\n"
+  "  -V, --no-yield\n"
+  "     Skip `((executable-yield-handler) <status>)` on exit\n"
 # endif
-	 " Configuration options:\n"
-         "  -c, --no-compiled : Disable loading of compiled files\n"
-	 "  -q, --no-init-file : Skip load of " INIT_FILENAME " for -i\n"
+  "\n"
+  "Configuration options:\n\n"
+  "  -c, --no-compiled\n"
+  "     Disable loading of compiled files\n"
+  "  -q, --no-init-file\n"
+  "     Skip load of " INIT_FILENAME " for -i\n"
 # ifdef CMDLINE_STDIO_FLAG
-	 "  -z, --text-repl : Use text `read-eval-print-loop' for -i\n"
+  "  -z, --text-repl\n"
+  "     Use text `read-eval-print-loop` for -i\n"
 # endif
-         "  -I <path> : Set <init-lib> to <path> (sets language)\n"
-	 "  -X <dir>, --collects <dir> : Main collects at <dir> (or \"\" disables all)\n"
-	 "  -S <dir>, --search <dir> : More collects at <dir> (after main collects)\n"
-	 "  -G <dir>, --config <dir> : Main configuration directory at <dir>\n"
-	 "  -A <dir>, --addon <dir> : Addon directory at <dir>\n"
-	 "  -U, --no-user-path : Ignore user-specific collects, etc.\n"
-         "  -R <paths>, --compiled <paths> : Set compiled-file search roots to <paths>\n"
-	 "  -C, --cross : Cross-build mode; save current collects and config as host\n"
-	 "  -N <file>, --name <file> : Sets `(find-system-path 'run-file)' to <file>\n"
-	 "  -E <file>, --exec <file> : Sets `(find-system-path 'exec-file)' to <file>\n"
+  "  -I <path>\n"
+  "     Set <init-lib> to <path> (sets language)\n"
+  "  -X <dir>, --collects <dir>\n"
+  "     Main collects at <dir> (or \"\" disables all)\n"
+  "  -S <dir>, --search <dir>\n"
+  "     More collects at <dir> (after main collects)\n"
+  "  -G <dir>, --config <dir>\n"
+  "     Main configuration directory at <dir>\n"
+  "  -A <dir>, --addon <dir>\n"
+  "     Addon directory at <dir>\n"
+  "  -U, --no-user-path\n"
+  "     Ignore user-specific collects, etc.\n"
+  "  -R <paths>, --compiled <paths>\n"
+  "     Set compiled-file search roots to <paths>\n"
+  "  -C, --cross\n"
+  "     Cross-build mode; save current collects and config\n"
+  "     as host\n"
+  "  -N <file>, --name <file>\n"
+  "     Sets `(find-system-path 'run-file)` to <file>\n"
+  "  -E <file>, --exec <file>\n"
+  "     Sets `(find-system-path 'exec-file)` to <file>\n"
 # ifdef CMDLINE_STDIO_FLAG
-         "  -J <name>, ---wm-class <name> : Set WM_CLASS class to <name> (Unix)\n"
+  "  -J <name>, ---wm-class <name>\n"
+  "     Set WM_CLASS class to <name> (Unix)\n"
 # endif
 # ifdef MZ_USE_JIT
-	 "  -j, --no-jit : Disable the just-in-time compiler\n"
+  "  -j, --no-jit\n"
+  "     Disable the just-in-time compiler\n"
 # else
-	 "  -j, --no-jit : No effect, since the just-in-time compiler is unavailable\n"
+  "  -j, --no-jit\n"
+  "     No effect, since the just-in-time compiler is unavailable\n"
 # endif
-	 "  -M, --compile-any : Compile to machine-independent form\n"
-         "  -d, --no-delay : Disable on-demand loading of syntax and code\n"
-	 "  -b, --binary : No effect, since stdin and stdout/stderr are always binary\n"
-	 "  -W <levels>, --warn <levels> : Set stderr logging to <levels>\n"
-	 "  -O <levels>, --stdout <levels> : Set stdout logging to <levels>\n"
-	 "  -L <levels>, --syslog <levels> : Set syslog logging to <levels>\n"
-	 " Meta options:\n"
-	 "  -- : No argument following this switch is used as a switch\n"
-	 "  -Z : Ignore the argument following this switch\n"
-	 "  -h, --help : Show this information and exits, ignoring other options\n"
-         "Default options:\n"
-         " If only configuration options are provided, -i is added\n"
-         " If only configuration options are before the first argument, -u is added\n"
-         " If -t/-l/-p/-u appears before the first -i/-e/-f/-r, -n is added\n"
-         " <init-lib> defaults to " INITIAL_NAMESPACE_MODULE "\n"
-         "Switch syntax:\n"
-	 " Multiple single-letter switches can be collapsed, with arguments placed\n"
-	 "   after the collapsed switches; the first collapsed switch cannot be --\n"
-	 " Example: `-ifve file expr' is the same as `-i -f file -v -e expr'\n"
-         "Start-up sequence:\n"
-         " 1. Set `current-library-collection-paths'\n"
-         " 2. Require `(lib \"<init-lib>\")' [when -i/-e/-f/-r, unless -n]\n"
-         " 3. Evaluate/load expressions/files in order, until first error\n"
-         " 4. Load \"" INIT_FILENAME "\" [when -i]\n"
-         " 5. Run read-eval-print loop [when -i]\n"
+  "  -M, --compile-any\n"
+  "     Compile to machine-independent form\n"
+  "  -d, --no-delay\n"
+  "     Disable on-demand loading of syntax and code\n"
+  "  -b, --binary\n"
+  "     No effect, since stdin and stdout/stderr are\n"
+  "     always binary\n"
+  "  -W <levels>, --warn <levels>\n"
+  "     Set stderr logging to <levels>\n"
+  "  -O <levels>, --stdout <levels>\n"
+  "     Set stdout logging to <levels>\n"
+  "  -L <levels>, --syslog <levels>\n"
+  "     Set syslog logging to <levels>\n"
+  "\n"
+  "Meta options:\n\n"
+  "  --\n"
+  "     No argument following this switch is used as a switch\n"
+  "  -Z\n"
+  "     Ignore the argument following this switch\n"
+  "  -h, --help\n"
+  "     Show this information and exits, ignoring other options\n"
+  "\n"
+  "Default options:\n\n"
+  "  * If only configuration options are provided, -i is added\n"
+  "  * If only configuration options are before the first\n"
+  "    argument, -u is added\n"
+  "  * If -t/-l/-p/-u appears before the first -i/-e/-f/-r,\n"
+  "    -n is added\n"
+  "  * <init-lib> defaults to " INITIAL_NAMESPACE_MODULE "\n"
+  "\n"
+  "Switch syntax:\n\n"
+  "  Multiple single-letter switches can be collapsed, with\n"
+  "  arguments placed after the collapsed switches; the first\n"
+  "  collapsed switch cannot be --\n\n"
+  "  For example,\n"
+  "\n"
+  "      -ifve file expr\n"
+  "\n"
+  "  is the same as\n"
+  "\n"
+  "      -i -f file -v -e expr\n"
+  "\n"
+  "Start-up sequence:\n\n"
+  "  1. Set `current-library-collection-paths`\n"
+  "  2. Require `(lib \"<init-lib>\")` [when -i/-e/-f/-r, unless -n]\n"
+  "  3. Evaluate/load expressions/files in order, until first error\n"
+  "  4. Load \"" INIT_FILENAME "\" [when -i]\n"
+  "  5. Run read-eval-print loop [when -i]\n"
 # ifndef NO_YIELD_BEFORE_EXIT
-         " 6. Run `((executable-yield-handler) <status>)' [unless -V]\n"
+  "  6. Run `((executable-yield-handler) <status>)` [unless -V]\n"
 # endif
-	 );
+  );
   PRINTF(prog, BANNER);
 #if defined(WINDOWS_FILE_HANDLES)
   CMDLINE_FFLUSH(stdout);
diff --git a/racket/src/cs/main/help.ss b/racket/src/cs/main/help.ss
index ca31a0357a..d5f660b372 100644
--- a/racket/src/cs/main/help.ss
+++ b/racket/src/cs/main/help.ss
@@ -2,92 +2,157 @@
   (define init-filename
     (let-values ([(base name dir?) (split-path (find-system-path 'init-file))])
       (path->string name)))
-  (#%printf "~a: [<option> ...] <argument> ...\n" (if gracket? "gracket" "racket"))
+  (#%printf "usage: ~a [<option> ...] <argument> ...\n" (if gracket? "gracket" "racket"))
   (when (and gracket? (eq? 'unix (system-type)))
     (#%printf
      (string-append
-      " X configuration options (must precede all other options):\n"
-      "  -display <display>, -geometry <geometry>, -fn <font>, -font <font>,\n"
-      "  -bg <color>, -background <color>, -fg <color>, -foreground <color>,\n"
-      "  -iconic, -name <name>, -rv, -reverse, +rv, -selectionTimeout <timeout>,\n"
-      "  -synchronous, -title <title>, -xnllanguage <language>, -xrm <file>\n")))
+      "\n"
+      "X configuration options (must precede all other options):\n\n"
+      "  -display <display>, -geometry <geometry>, -fn <font>,\n"
+      "  -font <font>, -bg <color>, -background <color>, -fg <color>,\n"
+      "  -foreground <color>, -iconic, -name <name>, -rv, -reverse,\n"
+      "  +rv, -selectionTimeout <timeout>, -synchronous, -title <title>,\n"
+      "  -xnllanguage <language>, -xrm <file>\n")))
   (#%printf
    (string-append
-    " File and expression options:\n"
-    "  -e <exprs>, --eval <exprs> : Evaluate <exprs>, prints results\n"
-    "  -f <file>, --load <file> : Like -e '(load \"<file>\")' without printing\n"
-    "  -t <file>, --require <file> : Like -e '(require (file \"<file>\"))' [*]\n"
-    "  -l <path>, --lib <path> : Like -e '(require (lib \"<path>\"))' [*]\n"
-    "  -p <package> : Like -e '(require (planet \"<package>\")' [*]\n"
-    "  -r <file>, --script <file> : Same as -f <file> -N <file> --\n" 
-    "  -u <file>, --require-script <file> : Same as -t <file> -N <file> --\n" 
-    "  -k <n> <m> <p> : Load executable-embedded code from offset <n> to <p>\n"
-    "  -Y <file> <n> <m> <p> : Like -k <n> <m> <p>, but from <file>\n"
-    "  -m, --main : Call `main' with command-line arguments, print results\n"
-    "  [*] Also `require's a `main' submodule, if any\n"
-    " Interaction options:\n"
-    "  -i, --repl : Run interactive read-eval-print loop; implies -v\n"
-    "  -n, --no-lib : Skip `(require (lib \"<init-lib>\"))' for -i/-e/-f/-r\n"
-    "  -v, --version : Show version\n"))
+    "\n"
+    "File and expression options:\n\n"
+    "  -e <exprs>, --eval <exprs>\n"
+    "     Evaluate <exprs>, print results\n"
+    "  -f <file>, --load <file>\n"
+    "     Like -e '(load \"<file>\")' without printing\n"
+    "  -t <file>, --require <file>\n"
+    "     Like -e '(require (file \"<file>\"))' [*]\n"
+    "  -l <path>, --lib <path>\n"
+    "     Like -e '(require (lib \"<path>\"))' [*]\n"
+    "  -p <package>\n"
+    "     Like -e '(require (planet \"<package>\")' [*]\n"
+    "  -r <file>, --script <file>\n"
+    "     Same as -f <file> -N <file> --\n"
+    "  -u <file>, --require-script <file>\n"
+    "     Same as -t <file> -N <file> --\n"
+    "  -k <n> <m> <p>\n"
+    "     Load executable-embedded code from offset <n> to <p>\n"
+    "  -Y <file> <n> <m> <p>\n"
+    "     Like -k <n> <m> <p>, but from <file>\n"
+    "  -m, --main\n"
+    "     Call `main` with command-line arguments, print results\n"
+    "\n"
+    " [*] Also `require`s a `main` submodule, if any\n"
+    "\n"
+    "Interaction options:\n\n"
+    "  -i, --repl\n"
+    "     Run interactive read-eval-print loop; implies -v\n"
+    "  -n, --no-lib\n"
+    "     Skip `(require (lib \"<init-lib>\"))` for -i/-e/-f/-r\n"
+    "  -v, --version\n"
+    "     Show version\n"))
   (when gracket?
     (#%printf
      (string-append
-     "  -K, --back : Don't bring application to the foreground (Mac OS X)\n")))
+     "  -K, --back\n"
+     "     Don't bring application to the foreground (Mac OS X)\n")))
   (#%printf
    (string-append
-    "  -V, --no-yield : Skip `((executable-yield-handler) <status>)' on exit\n"
-    " Configuration options:\n"
-    "  -c, --no-compiled : Disable loading of compiled files\n"
-    "  -q, --no-init-file : Skip load of " init-filename " for -i\n"))
+    "  -V, --no-yield\n"
+    "     Skip `((executable-yield-handler) <status>)` on exit\n"
+    "\n"
+    "Configuration options:\n\n"
+    "  -c, --no-compiled\n"
+    "     Disable loading of compiled files\n"
+    "  -q, --no-init-file\n"
+    "     Skip load of " init-filename " for -i\n"))
   (when gracket?
     (#%printf
-     "  -z, --text-repl : Use text `read-eval-print-loop' for -i\n"))
+     (string-append
+      "  -z, --text-repl\n"
+      "     Use text `read-eval-print-loop` for -i\n")))
   (#%printf
    (string-append
-    "  -I <path> : Set <init-lib> to <path> (sets language)\n"
-    "  -X <dir>, --collects <dir> : Main collects at <dir> (or \"\" disables all)\n"
-    "  -S <dir>, --search <dir> : More collects at <dir> (after main collects)\n"
-    "  -G <dir>, --config <dir> : Main configuration directory at <dir>\n"
-    "  -A <dir>, --addon <dir> : Addon directory at <dir>\n"
-    "  -U, --no-user-path : Ignore user-specific collects, etc.\n"
-    "  -R <paths>, --compiled <paths> : Set compiled-file search roots to <paths>\n"
-    "  -C, --cross : Cross-build mode; save current collects and config as host\n"
-    "  -N <file>, --name <file> : Sets `(find-system-path 'run-file)' to <file>\n"
-    "  -E <file>, --exec <file> : Sets `(find-system-path 'exec-file)' to <file>\n"))
+    "  -I <path>\n"
+    "     Set <init-lib> to <path> (sets language)\n"
+    "  -X <dir>, --collects <dir>\n"
+    "     Main collects at <dir> (or \"\" disables all)\n"
+    "  -S <dir>, --search <dir>\n"
+    "     More collects at <dir> (after main collects)\n"
+    "  -G <dir>, --config <dir>\n"
+    "     Main configuration directory at <dir>\n"
+    "  -A <dir>, --addon <dir>\n"
+    "     Addon directory at <dir>\n"
+    "  -U, --no-user-path\n"
+    "     Ignore user-specific collects, etc.\n"
+    "  -R <paths>, --compiled <paths>\n"
+    "     Set compiled-file search roots to <paths>\n"
+    "  -C, --cross\n"
+    "     Cross-build mode; save current collects and config\n"
+    "     as host\n"
+    "  -N <file>, --name <file>\n"
+    "     Sets `(find-system-path 'run-file)` to <file>\n"
+    "  -E <file>, --exec <file>\n"
+    "     Sets `(find-system-path 'exec-file)` to <file>\n"))
   (when gracket?
     (#%printf
-     "  -J <name>, ---wm-class <name> : Set WM_CLASS class to <name> (Unix)\n"))
+     (string-append
+      "  -J <name>, ---wm-class <name>\n"
+      "     Set WM_CLASS class to <name> (Unix)\n")))
   (#%printf
    (string-append
-    "  -j, --no-jit : No effect, since there is no just-in-time compiler\n"
-    "  -M, --compile-any : Compile to machine-independent form\n"
-    "  -d, --no-delay : Disable on-demand loading of syntax and code\n"
-    "  -b, --binary : No effect, since stdin and stdout/stderr are always binary\n"
-    "  -W <levels>, --warn <levels> : Set stderr logging to <levels>\n"
-    "  -O <levels>, --stdout <levels> : Set stdout logging to <levels>\n"
-    "  -L <levels>, --syslog <levels> : Set syslog logging to <levels>\n"
-    "  --compile-machine <machine> : Compile for <machine>\n"
-    "  --cross-compiler <machine> <plugin-dir> : Use compiler plugin for <machine>\n"
-    "  --cross-server <mach> <comp> <lib> : Drive cross-compiler (as only option)\n"
-    " Meta options:\n"
-    "  -- : No argument following this switch is used as a switch\n"
-    "  -Z : Ignore the argument following this switch\n"
-    "  -h, --help : Show this information and exits, ignoring other options\n"
-    "Default options:\n"
-    " If only configuration options are provided, -i is added\n"
-    " If only configuration options are before the first argument, -u is added\n"
-    " If -t/-l/-p/-u appears before the first -i/-e/-f/-r, -n is added\n"
-    " <init-lib> defaults to " (if gracket? "racket/gui/init" "racket/init") "\n"
-    "Switch syntax:\n"
-    " Multiple single-letter switches can be collapsed, with arguments placed\n"
-    "   after the collapsed switches; the first collapsed switch cannot be --\n"
-    " Example: `-ifve file expr' is the same as `-i -f file -v -e expr'\n"
-    "Start-up sequence:\n"
-    " 1. Set `current-library-collection-paths'\n"
-    " 2. Require `(lib \"<init-lib>\")' [when -i/-e/-f/-r, unless -n]\n"
-    " 3. Evaluate/load expressions/files in order, until first error\n"
-    " 4. Load \"" init-filename "\" [when -i]\n"
-    " 5. Run read-eval-print loop [when -i]\n"))
+    "  -j, --no-jit\n"
+    "     No effect, since there is no just-in-time compiler\n"
+    "  -M, --compile-any\n"
+    "     Compile to machine-independent form\n"
+    "  -d, --no-delay\n"
+    "     Disable on-demand loading of syntax and code\n"
+    "  -b, --binary\n"
+    "     No effect, since stdin and stdout/stderr are\n"
+    "     always binary\n"
+    "  -W <levels>, --warn <levels>\n"
+    "     Set stderr logging to <levels>\n"
+    "  -O <levels>, --stdout <levels>\n"
+    "     Set stdout logging to <levels>\n"
+    "  -L <levels>, --syslog <levels>\n"
+    "     Set syslog logging to <levels>\n"
+    "  --compile-machine <machine>\n"
+    "     Compile for <machine>\n"
+    "  --cross-compiler <machine> <plugin-dir>\n"
+    "     Use compiler plugin for <machine>\n"
+    "  --cross-server <mach> <comp> <lib>\n"
+    "     Drive cross-compiler (as only option)\n"
+    "\n"
+    "Meta options:\n\n"
+    "  --\n"
+    "     No argument following this switch is used as a switch\n"
+    "  -Z\n"
+    "     Ignore the argument following this switch\n"
+    "  -h, --help\n"
+    "     Show this information and exits, ignoring other options\n"
+    "\n"
+    "Default options:\n\n"
+    "  * If only configuration options are provided, -i is added\n"
+    "  * If only configuration options are before the first\n"
+    "    argument, -u is added\n"
+    "  * If -t/-l/-p/-u appears before the first -i/-e/-f/-r,\n"
+    "    -n is added\n"
+    "  * <init-lib> defaults to " (if gracket? "racket/gui/init" "racket/init") "\n"
+    "\n"
+    "Switch syntax:\n\n"
+    "  Multiple single-letter switches can be collapsed, with\n"
+    "  arguments placed after the collapsed switches; the first\n"
+    "  collapsed switch cannot be --\n\n"
+    "  For example,\n"
+    "\n"
+    "      -ifve file expr\n"
+    "\n"
+    "  is the same as\n"
+    "\n"
+    "      -i -f file -v -e expr\n"
+    "\n"
+    "Start-up sequence:\n\n"
+    "  1. Set `current-library-collection-paths`\n"
+    "  2. Require `(lib \"<init-lib>\")` [when -i/-e/-f/-r, unless -n]\n"
+    "  3. Evaluate/load expressions/files in order, until first error\n"
+    "  4. Load \"" init-filename "\" [when -i]\n"
+    "  5. Run read-eval-print loop [when -i]\n"))
   (when gracket?
     (#%printf
-     " 6. Run `((executable-yield-handler) <status>)' [unless -V]\n")))
+     "  6. Run `((executable-yield-handler) <status>)` [unless -V]\n")))