@@ -1870,40 +1870,40 @@ help(void)
18701870{
18711871printf (_ ("PostgreSQL regression test driver\n" ));
18721872printf (_ ("\n" ));
1873- printf (_ ("Usage:options ...] [extra tests ...] \n" ),progname );
1873+ printf (_ ("Usage:\n %s [OPTION] ... [EXTRA-TEST] ...\n" ),progname );
18741874printf (_ ("\n" ));
18751875printf (_ ("Options:\n" ));
1876+ printf (_ (" --create-role=ROLE create the specified role before testing\n" ));
18761877printf (_ (" --dbname=DB use database DB (default \"regression\")\n" ));
18771878printf (_ (" --debug turn on debug mode in programs that are run\n" ));
1879+ printf (_ (" --dlpath=DIR look for dynamic libraries in DIR\n" ));
1880+ printf (_ (" --encoding=ENCODING use ENCODING as the encoding\n" ));
18781881printf (_ (" --inputdir=DIR take input files from DIR (default \".\")\n" ));
1879- printf (_ (" --load-language=lang load the named language before running the\n" ));
1882+ printf (_ (" --launcher=CMD use CMD as launcher of psql\n" ));
1883+ printf (_ (" --load-extension=EXT load the named extension before running the\n" ));
18801884printf (_ (" tests; can appear multiple times\n" ));
1881- printf (_ (" --load-extension=ext load the namedextension before running the\n" ));
1885+ printf (_ (" --load-language=LANG load the namedlanguage before running the\n" ));
18821886printf (_ (" tests; can appear multiple times\n" ));
1883- printf (_ (" --create-role=ROLE create the specified role before testing\n" ));
18841887printf (_ (" --max-connections=N maximum number of concurrent connections\n" ));
1885- printf (_ (" (default is 0 meaning unlimited)\n" ));
1886- printf (_ (" --encoding=ENCODING use ENCODING as the encoding\n" ));
1888+ printf (_ (" (default is 0, meaning unlimited)\n" ));
18871889printf (_ (" --outputdir=DIR place output files in DIR (default \".\")\n" ));
18881890printf (_ (" --schedule=FILE use test ordering schedule from FILE\n" ));
18891891printf (_ (" (can be used multiple times to concatenate)\n" ));
1890- printf (_ (" --dlpath=DIR look for dynamic libraries in DIR\n" ));
18911892printf (_ (" --temp-install=DIR create a temporary installation in DIR\n" ));
18921893printf (_ (" --use-existing use an existing installation\n" ));
1893- printf (_ (" --launcher=CMD use CMD as launcher of psql\n" ));
18941894printf (_ ("\n" ));
18951895printf (_ ("Options for \"temp-install\" mode:\n" ));
1896+ printf (_ (" --extra-install=DIR additional directory to install (e.g., contrib)\n" ));
18961897printf (_ (" --no-locale use C locale\n" ));
1897- printf (_ (" --top-builddir=DIR (relative) path to top level build directory\n" ));
18981898printf (_ (" --port=PORT start postmaster on PORT\n" ));
1899- printf (_ (" --temp-config=PATH append contents ofPATH to temporary config\n" ));
1900- printf (_ (" --extra-install =DIRadditional directory toinstall (e.g., contrib \n" ));
1899+ printf (_ (" --temp-config=FILE append contents ofFILE to temporary config\n" ));
1900+ printf (_ (" --top-builddir =DIR (relative) path totop level build directory \n" ));
19011901printf (_ ("\n" ));
19021902printf (_ ("Options for using an existing installation:\n" ));
19031903printf (_ (" --host=HOST use postmaster running on HOST\n" ));
19041904printf (_ (" --port=PORT use postmaster running at PORT\n" ));
19051905printf (_ (" --user=USER connect as USER\n" ));
1906- printf (_ (" --psqldir=DIR use psql in DIR (default:find in PATH )\n" ));
1906+ printf (_ (" --psqldir=DIR use psql in DIR (default:configured bindir )\n" ));
19071907printf (_ ("\n" ));
19081908printf (_ ("The exit status is 0 if all tests passed, 1 if some tests failed, and 2\n" ));
19091909printf (_ ("if the tests could not be run for some reason.\n" ));