cleaned up the --help output. Tried to unify the language. Shortened a bunch

of explanations.

1 files changed, 45 insertions, 45 deletions

diff --git a/src/main.c b/src/main.c
index 985e2b7f5..a7e051eb9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -378,98 +378,98 @@ static void help(void)
     " -b/--cookie <name=string/file> Cookie string or file to read cookies from (H)",
     "    --basic         Enable HTTP Basic Authentication (H)",
     " -B/--use-ascii     Use ASCII/text transfer",
-    " -c/--cookie-jar <file> Write all cookies to this file after operation (H)",
-    " -C/--continue-at <offset> Specify absolute resume offset",
+    " -c/--cookie-jar <file> Write cookies to this file after operation (H)",
+    " -C/--continue-at <offset> Resumed transfer offset",
     " -d/--data <data>   HTTP POST data (H)",
     "    --data-ascii <data>   HTTP POST ASCII data (H)",
     "    --data-binary <data>  HTTP POST binary data (H)",
-    "    --negotiate     Enable HTTP Negotiate Authentication (H - req GSS-lib)",
+    "    --negotiate     Enable HTTP Negotiate Authentication (H)",
     "    --digest        Enable HTTP Digest Authentication (H)",
-    "    --disable-eprt  Prevents curl from using EPRT or LPRT (F)",
-    "    --disable-epsv  Prevents curl from using EPSV (F)",
+    "    --disable-eprt  Prevent curl from using EPRT or LPRT (F)",
+    "    --disable-epsv  Prevent curl from using EPSV (F)",
     " -D/--dump-header <file> Write the headers to this file",
     "    --egd-file <file> EGD socket path for random data (SSL)",
 #ifdef USE_ENVIRONMENT
     "    --environment   Write result codes to environment variables (RISC OS)",
 #endif
-    " -e/--referer       Referer page (H)",
-    " -E/--cert <cert[:passwd]> Specifies your certificate file and password (SSL)",
-    "    --cert-type <type> Specifies certificate file type (DER/PEM/ENG) (SSL)",
-    "    --key <key>     Specifies private key file (SSL)",
-    "    --key-type <type> Specifies private key  file type (DER/PEM/ENG) (SSL)",
-    "    --pass  <pass>  Specifies passphrase for the private key (SSL)",
-    "    --engine <eng>  Specifies the crypto engine to use (HTTPS)",
+    " -e/--referer       Referer URL (H)",
+    " -E/--cert <cert[:passwd]> Client certificate file and password (SSL)",
+    "    --cert-type <type> Certificate file type (DER/PEM/ENG) (SSL)",
+    "    --key <key>     Private key file name (SSL)",
+    "    --key-type <type> Private key file type (DER/PEM/ENG) (SSL)",
+    "    --pass  <pass>  Pass phrase for the private key (SSL)",
+    "    --engine <eng>  Crypto engine to use (SSL)",
     "    --cacert <file> CA certificate to verify peer against (SSL)",
     "    --capath <directory> CA directory (made using c_rehash) to verify",
     "                    peer against (SSL)",
-    "    --ciphers <list> What SSL ciphers to use (SSL)",
-    "    --compressed    Request a compressed response (using deflate or gzip).",
+    "    --ciphers <list> SSL ciphers to use (SSL)",
+    "    --compressed    Request compressed response (using deflate or gzip).",
     "    --connect-timeout <seconds> Maximum time allowed for connection",
-    "    --create-dirs   Create the necessary local directory hierarchy",
-    "    --crlf          Convert LF to CRLF in upload. Useful for MVS (OS/390)",
+    "    --create-dirs   Create necessary local directory hierarchy",
+    "    --crlf          Convert LF to CRLF in upload.",
     " -f/--fail          Fail silently (no output at all) on errors (H)",
     "    --ftp-create-dirs Create the remote dirs if not present (F)",
-    " -F/--form <name=content> Specify HTTP POST data (H)",
+    " -F/--form <name=content> Specify HTTP multipart POST data (H)",
     " -g/--globoff       Disable URL sequences and ranges using {} and []",
     " -G/--get           Send the -d data with a HTTP GET (H)",
     " -h/--help          This help text",
     " -H/--header <line> Custom header to pass to server. (H)",
-    " -i/--include       Include the HTTP-header in the output (H)",
-    " -I/--head          Fetch document info only (HTTP HEAD/FTP SIZE)",
+    " -i/--include       Include protocol headers in the output (H/F)",
+    " -I/--head          Show document info only (H/F)",
     " -j/--junk-session-cookies Ignore session cookies read from file (H)",
-    "    --interface <interface> Specify the interface to be used",
+    "    --interface <interface> Specify network interface to use",
     "    --krb4 <level>  Enable krb4 with specified security level (F)",
     " -k/--insecure      Allow curl to connect to SSL sites without certs (H)",
     " -K/--config        Specify which config file to read",
     " -l/--list-only     List only names of an FTP directory (F)",
-    "    --limit-rate <rate> Limit how fast transfers to allow",
+    "    --limit-rate <rate> Limit transfer speed to this rate",
     " -L/--location      Follow Location: hints (H)",
-    "    --location-trusted Same, and continue to send authentication when ",
-    "                    following locations, even when hostname changed",
+    "    --location-trusted Follow Location: and send authentication even ",
+    "                    to other hostnames (H)",
     " -m/--max-time <seconds> Maximum time allowed for the transfer",
-    "    --max-redirs <num> Set maximum number of redirections allowed (H)",
-    "    --max-filesize <bytes> Set the maximum file size to download (H/F)",
-    " -M/--manual        Display huge help text",
+    "    --max-redirs <num> Maximum number of redirects allowed (H)",
+    "    --max-filesize <bytes> Maximum file size to download (H/F)",
+    " -M/--manual        Display the full manual",
     " -n/--netrc         Must read .netrc for user name and password",
-    "    --netrc-optional  Use either .netrc or URL; overrides -n",
+    "    --netrc-optional Use either .netrc or URL; overrides -n",
     "    --ntlm          Enable HTTP NTLM authentication (H)",
-    " -N/--no-buffer     Disables the buffering of the output stream",
+    " -N/--no-buffer     Disable buffering of the output stream",
     " -o/--output <file> Write output to <file> instead of stdout",
     " -O/--remote-name   Write output to a file named as the remote file",
-    " -p/--proxytunnel   Perform non-HTTP services through a HTTP proxy",
-    "    --proxy-ntlm    Use NTLM authentication on the proxy (H)",
-    " -P/--ftpport <address> Use PORT with address instead of PASV when ftping (F)",
-    " -q                 When used as the first parameter disables .curlrc",
-    " -Q/--quote <cmd>   Send QUOTE command to FTP before file transfer (F)",
+    " -p/--proxytunnel   Operate through a HTTP proxy tunnel (using CONNECT)",
+    "    --proxy-ntlm    Enable NTLM authentication on the proxy (H)",
+    " -P/--ftpport <address> Use PORT with address instead of PASV (F)",
+    " -q                 If used as the first parameter disables .curlrc",
+    " -Q/--quote <cmd>   Send command(s) to server before file transfer (F)",
     " -r/--range <range> Retrieve a byte range from a HTTP/1.1 or FTP server",
-    "    --random-file <file> File to use for reading random data from (SSL)",
+    "    --random-file <file> File for reading random data from (SSL)",
     " -R/--remote-time   Set the remote file's time on the local output",
     " -s/--silent        Silent mode. Don't output anything",
     " -S/--show-error    Show error. With -s, make curl show errors when they occur",
     "    --stderr <file> Where to redirect stderr. - means stdout.",
     " -t/--telnet-option <OPT=val> Set telnet option",
     "    --trace <file>  Dump a network/debug trace to the given file",
-    "    --trace-ascii <file>  Like --trace but without the hex output",
+    "    --trace-ascii <file> Like --trace but without the hex output",
     " -T/--upload-file <file> Transfer/upload <file> to remote site",
     "    --url <URL>     Another way to specify URL to work with",
     " -u/--user <user[:password]> Specify user and password to use",
     "                    Overrides -n and --netrc-optional",
     " -U/--proxy-user <user[:password]> Specify Proxy authentication",
-    " -v/--verbose       Makes the operation more talkative",
-    " -V/--version       Outputs version number then quits",
+    " -v/--verbose       Make the operation more talkative",
+    " -V/--version       Show version number and quit",
 #ifdef __DJGPP__
-    "    --wdebug        Turns on WATT-32 debugging under DJGPP",
+    "    --wdebug        Turn on WATT-32 debugging under DJGPP",
 #endif
     " -w/--write-out [format] What to output after completion",
-    " -x/--proxy <host[:port]>  Use proxy. (Default port is 1080)",
-    " -X/--request <command> Specific request command to use",
+    " -x/--proxy <host[:port]> Use HTTP proxy on given port.",
+    " -X/--request <command> Specify request command to use",
     " -y/--speed-time    Time needed to trig speed-limit abort. Defaults to 30",
     " -Y/--speed-limit   Stop transfer if below speed-limit for 'speed-time' secs",
-    " -z/--time-cond <time> Includes a time condition to the server (H)",
-    " -0/--http1.0       Force usage of HTTP 1.0 (H)",
-    " -1/--tlsv1         Force usage of TLSv1 (H)",
-    " -2/--sslv2         Force usage of SSLv2 (H)",
-    " -3/--sslv3         Force usage of SSLv3 (H)",
+    " -z/--time-cond <time> Transfer based on a time condition",
+    " -0/--http1.0       Use HTTP 1.0 (H)",
+    " -1/--tlsv1         Use TLSv1 (H)",
+    " -2/--sslv2         Use SSLv2 (H)",
+    " -3/--sslv3         Use SSLv3 (H)",
     " -4/--ipv4          Resolve name to IPv4 address",
     " -6/--ipv6          Resolve name to IPv6 address",
     " -#/--progress-bar  Display transfer progress as a progress bar",