make the descriptions for the behavior of some command-line flags less AnyConnect...

Signed-off-by: Daniel Lenski <dlenski@gmail.com>

diff --git a/main.c b/main.c
index 34e0cd9393888010d8a80ac3645b86b7fc929c25..283db780209bf51c4fe363340c5452b597aed7b9 100644 (file)
--- a/main.c
+++ b/main.c
@@ -825,14 +825,15 @@ static void usage(void)
        printf("      --reconnect-timeout         %s\n", _("Connection retry timeout in seconds"));
        printf("      --resolve=HOST:IP           %s\n", _("Use IP when connecting to HOST"));
        printf("      --passtos                   %s\n", _("copy TOS / TCLASS when using DTLS"));
-       printf("      --dtls-local-port=PORT      %s\n", _("Set local port for DTLS datagrams"));
+       printf("      --dtls-local-port=PORT      %s\n", _("Set local port for DTLS and ESP datagrams"));
 
        printf("\n%s:\n", _("Authentication (two-phase)"));
-       printf("  -C, --cookie=COOKIE             %s\n", _("Use WebVPN cookie COOKIE"));
+       printf("  -C, --cookie=COOKIE             %s\n", _("Use authentication cookie COOKIE"));
        printf("      --cookie-on-stdin           %s\n", _("Read cookie from standard input"));
        printf("      --authenticate              %s\n", _("Authenticate only and print login info"));
-       printf("      --cookieonly                %s\n", _("Fetch webvpn cookie only; don't connect"));
-       printf("      --printcookie               %s\n", _("Print webvpn cookie before connecting"));
+       printf("      --cookieonly                %s\n", _("Fetch and print cookie only; don't connect"));
+       printf("      --printcookie               %s\n", _("Print cookie before connecting"));
+
 #ifndef _WIN32
        printf("\n%s:\n", _("Process control"));
        printf("  -b, --background                %s\n", _("Continue in background after startup"));
@@ -866,7 +867,7 @@ static void usage(void)
        printf("  -D, --no-deflate                %s\n", _("Disable compression"));
        printf("      --force-dpd=INTERVAL        %s\n", _("Set minimum Dead Peer Detection interval"));
        printf("      --pfs                       %s\n", _("Require perfect forward secrecy"));
-       printf("      --no-dtls                   %s\n", _("Disable DTLS"));
+       printf("      --no-dtls                   %s\n", _("Disable DTLS and ESP"));
        printf("      --dtls-ciphers=LIST         %s\n", _("OpenSSL ciphers to support for DTLS"));
        printf("  -Q, --queue-len=LEN             %s\n", _("Set packet queue limit to LEN pkts"));
 
@@ -877,8 +878,8 @@ static void usage(void)
 
 #ifndef _WIN32
        printf("\n%s:\n", _("Trojan binary (CSD) execution"));
-       printf("      --csd-user=USER             %s\n", _("Drop privileges during CSD execution"));
-       printf("      --csd-wrapper=SCRIPT        %s\n", _("Run SCRIPT instead of CSD binary"));
+       printf("      --csd-user=USER             %s\n", _("Drop privileges during trojan execution"));
+       printf("      --csd-wrapper=SCRIPT        %s\n", _("Run SCRIPT instead of trojan binary"));
 #endif
 
        printf("\n%s:\n", _("Server bugs"));

diff --git a/openconnect.8.in b/openconnect.8.in
index 9f46b30517649dbf11d9e67fbc7f0d13263b5d6a..c1906806efb9bfa46466a99e4bf321e13869e2f8 100644 (file)
--- a/openconnect.8.in
+++ b/openconnect.8.in
@@ -139,7 +139,7 @@ which may be either a file name or, if OpenConnect has been built with an approp
 version of GnuTLS, a PKCS#11 URL.
 .TP
 .B \-C,\-\-cookie=COOKIE
-Use WebVPN cookie.
+Use authentication cookie COOKIE.
 .I COOKIE
 .TP
 .B \-\-cookie\-on\-stdin
@@ -210,12 +210,12 @@ Drop privileges after connecting, to become user
 .I USER
 .TP
 .B \-\-csd\-user=USER
-Drop privileges during CSD (Cisco Secure Desktop) script execution.
+Drop privileges during execution of trojan binary or script (CSD, TNCC, or HIP).
 .TP
 .B \-\-csd\-wrapper=SCRIPT
 Run
 .I SCRIPT
-instead of the CSD (Cisco Secure Desktop) script.
+instead of the trojan binary or script.
 .TP
 .B \-m,\-\-mtu=MTU
 Request
@@ -339,10 +339,10 @@ connection as root:
 .fi
 .TP
 .B \-\-cookieonly
-Fetch webvpn cookie only; don't connect
+Fetch and print cookie only; don't connect
 .TP
 .B \-\-printcookie
-Print webvpn cookie before connecting
+Print cookie before connecting
 .TP
 .B \-\-cafile=FILE
 Cert file for server verification
@@ -356,7 +356,7 @@ Set OpenSSL ciphers to support for DTLS
 .B \-\-dtls\-local\-port=PORT
 Use
 .I PORT
-as the local port for DTLS datagrams
+as the local port for DTLS and UDP datagrams
 .TP
 .B \-\-dump\-http\-traffic
 Enable verbose output of all HTTP requests and the bodies of all responses