Rewrite help message to remove some of the parentheticals. (There were a lot of...

diff --git a/Modules/main.c b/Modules/main.c
index dfafd06188f8f87bf62795a64ccb3c21bc32ab56..2224dfe2f0486c73e12bb93cf364886bc4e9085f 100644 (file)
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -60,33 +60,33 @@ static char *usage_line =
 static char *usage_1 = "\
 Options and arguments (and corresponding environment variables):\n\
 -c cmd : program passed in as string (terminates option list)\n\
--d     : debug output from parser (also PYTHONDEBUG=x)\n\
+-d     : debug output from parser; also PYTHONDEBUG=x\n\
 -E     : ignore environment variables (such as PYTHONPATH)\n\
 -h     : print this help message and exit (also --help)\n\
--i     : inspect interactively after running script, (also PYTHONINSPECT=x)\n\
-         and force prompts, even if stdin does not appear to be a terminal\n\
+-i     : inspect interactively after running script; forces a prompt even\n\
+         if stdin does not appear to be a terminal; also PYTHONINSPECT=x\n\
 ";
 static char *usage_2 = "\
 -m mod : run library module as a script (terminates option list)\n\
--O     : optimize generated bytecode (a tad; also PYTHONOPTIMIZE=x)\n\
+-O     : optimize generated bytecode slightly; also PYTHONOPTIMIZE=x\n\
 -OO    : remove doc-strings in addition to the -O optimizations\n\
 -Q arg : division options: -Qold (default), -Qwarn, -Qwarnall, -Qnew\n\
 -S     : don't imply 'import site' on initialization\n\
 -t     : issue warnings about inconsistent tab usage (-tt: issue errors)\n\
--u     : unbuffered binary stdout and stderr (also PYTHONUNBUFFERED=x)\n\
+-u     : unbuffered binary stdout and stderr; also PYTHONUNBUFFERED=x\n\
 ";
 static char *usage_3 = "\
          see man page for details on internal buffering relating to '-u'\n\
--v     : verbose (trace import statements) (also PYTHONVERBOSE=x)\n\
-         (can be supplied multiple times to increase verbosity)\n\
+-v     : verbose (trace import statements); also PYTHONVERBOSE=x\n\
+         can be supplied multiple times to increase verbosity\n\
 -V     : print the Python version number and exit (also --version)\n\
--W arg : warning control (arg is action:message:category:module:lineno)\n\
+-W arg : warning control; arg is action:message:category:module:lineno\n\
 -x     : skip first line of source, allowing use of non-Unix forms of #!cmd\n\
 file   : program read from script file\n\
 -      : program read from stdin (default; interactive mode if a tty)\n\
 ";
 static char *usage_4 = "\
-arg ...: arguments passed to program in sys.argv[1:]\n\
+arg ...: arguments passed to program in sys.argv[1:]\n\n\
 Other environment variables:\n\
 PYTHONSTARTUP: file executed on interactive startup (no default)\n\
 PYTHONPATH   : '%c'-separated list of directories prefixed to the\n\