Update documentation.

Update man page, move help text at the same position.

diff --git a/main.c b/main.c
index 9a13106e6cc6849359b4708a4bd5e40cffa7907f..59c9f48142be22d8747687d7b6559114b7bff59c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -808,6 +808,9 @@ static void usage(void)
        printf("      --no-passwd                 %s\n", _("Disable password/SecurID authentication"));
        printf("      --non-inter                 %s\n", _("Do not expect user input; exit if it is required"));
        printf("      --passwd-on-stdin           %s\n", _("Read password from standard input"));
+#if ENABLE_KEYCHAIN
+       printf("      --use-keychain=NAME         %s\n", _("Name of password form option that look up Keychain to fill"));
+#endif
        printf("      --authgroup=GROUP           %s\n", _("Choose authentication login selection"));
        printf("  -c, --certificate=CERT          %s\n", _("Use SSL client certificate CERT"));
        printf("  -k, --sslkey=KEY                %s\n", _("Use SSL private key file KEY"));
@@ -823,9 +826,6 @@ static void usage(void)
 #ifndef HAVE_LIBPCSCLITE
        printf("                                  %s\n", _("(NOTE: Yubikey OATH disabled in this build)"));
 #endif
-#if ENABLE_KEYCHAIN
-       printf("      --use-keychain=NAME         %s\n", _("Name of password option to lookup Keychain"));
-#endif
 
        printf("\n%s:\n", _("Server validation"));
        printf("      --servercert=FINGERPRINT    %s\n", _("Server's certificate SHA1 fingerprint"));

diff --git a/openconnect.8.in b/openconnect.8.in
index 37a33d0c6033c94a305a1b95abd98ade977f4205..2fe57c0518858a481193e65cc70fab379c243aa2 100644 (file)
--- a/openconnect.8.in
+++ b/openconnect.8.in
@@ -57,6 +57,7 @@ openconnect \- Multi-protocol VPN client, for Cisco AnyConnect VPNs and others
 .OP \-\-no\-xmlpost
 .OP \-\-non\-inter
 .OP \-\-passwd\-on\-stdin
+.OP \-\-use-keychain string
 .OP \-\-protocol proto
 .OP \-\-token\-mode mode
 .OP \-\-token\-secret {secret\fR[\fI,counter\fR]|@\fIfile\fR}
@@ -426,6 +427,11 @@ Do not expect user input; exit if it is required.
 .B \-\-passwd\-on\-stdin
 Read password from standard input
 .TP
+.B \-\-use\-keychain=NAME
+Look up Keychain to fill one of password form options.
+.I NAME
+is the name of the password form option. It may be "password".
+.TP
 .B \-\-protocol=PROTO
 Select VPN protocol
 .I PROTO