From 17ca01e5948be40e170971c04cb07a59ca3b9968 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Sat, 3 Aug 2013 10:52:21 +0200 Subject: [PATCH] doc update --- src/ocpasswd-args.c | 2 +- src/ocpasswd-args.h | 2 +- src/ocserv-args.c | 40 ++++++++++++++++++++-------------------- src/ocserv-args.def | 16 +++++++++------- src/ocserv-args.h | 2 +- 5 files changed, 32 insertions(+), 30 deletions(-) diff --git a/src/ocpasswd-args.c b/src/ocpasswd-args.c index 91ced66b..5301f4e2 100644 --- a/src/ocpasswd-args.c +++ b/src/ocpasswd-args.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ocpasswd-args.c) * - * It has been AutoGen-ed July 23, 2013 at 09:39:24 PM by AutoGen 5.17.3 + * It has been AutoGen-ed August 1, 2013 at 05:50:01 PM by AutoGen 5.17.3 * From the definitions ocpasswd-args.def * and the template file options * diff --git a/src/ocpasswd-args.h b/src/ocpasswd-args.h index 2dcead6e..db76660e 100644 --- a/src/ocpasswd-args.h +++ b/src/ocpasswd-args.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ocpasswd-args.h) * - * It has been AutoGen-ed July 23, 2013 at 09:39:24 PM by AutoGen 5.17.3 + * It has been AutoGen-ed August 1, 2013 at 05:50:01 PM by AutoGen 5.17.3 * From the definitions ocpasswd-args.def * and the template file options * diff --git a/src/ocserv-args.c b/src/ocserv-args.c index dc96744d..1eda4331 100644 --- a/src/ocserv-args.c +++ b/src/ocserv-args.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ocserv-args.c) * - * It has been AutoGen-ed July 23, 2013 at 09:39:01 PM by AutoGen 5.17.3 + * It has been AutoGen-ed August 3, 2013 at 10:51:57 AM by AutoGen 5.17.3 * From the definitions ocserv-args.def * and the template file options * @@ -62,7 +62,7 @@ extern FILE * option_usage_fp; /** * static const strings for ocserv options */ -static char const ocserv_opt_strs[1795] = +static char const ocserv_opt_strs[1819] = /* 0 */ "ocserv 0.1.5\n" "Copyright (C) 2013 Nikos Mavrogiannopoulos, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" @@ -100,15 +100,15 @@ static char const ocserv_opt_strs[1795] = "Usage: %s [ - [] | --[{=| }] ]...\n\0" /* 1266 */ "openconnect-devel@lists.infradead.org\0" /* 1304 */ "\n\0" -/* 1306 */ "This program is openconnect VPN server (ocserv), a server compatible with\n" - "the openconnect VPN client. It follows the protocol used by CISCO's\n" - "AnyConnect VPN.\n\n" - "Multiple authentication methods are available including PAM and certificate\n" - "authentication. Authenticated users are assigned an unprivileged worker\n" - "process and obtain a networking (tun) device and IP from a configurable\n" - "pool of addresses.\n\0" -/* 1707 */ "ocserv 0.1.5\0" -/* 1720 */ "Usage: ocserv [options] -c [config]\n" +/* 1306 */ "Openconnect VPN server (ocserv) is a VPN server compatible with the\n" + "openconnect VPN client. It follows the AnyConnect VPN protocol which is\n" + "used by several CISCO routers.\n\n" + "This server supports multiple authentication methods, including PAM and\n" + "certificate authentication. Authenticated users are assigned an\n" + "unprivileged worker process and obtain a networking (tun) device and an IP\n" + "from a configurable pool of addresses.\n\0" +/* 1731 */ "ocserv 0.1.5\0" +/* 1744 */ "Usage: ocserv [options] -c [config]\n" "ocserv --help for usage instructions.\n"; /** @@ -305,7 +305,7 @@ static tOptDesc optDesc[OPTION_CT] = { /** Extra detail explaining what ocserv does. */ #define zDetail (ocserv_opt_strs+1306) /** The full version string for ocserv. */ -#define zFullVersion (ocserv_opt_strs+1707) +#define zFullVersion (ocserv_opt_strs+1731) /* extracted from optcode.tlib near line 371 */ #if defined(ENABLE_NLS) @@ -317,7 +317,7 @@ static tOptDesc optDesc[OPTION_CT] = { #endif /* ENABLE_NLS */ #define ocserv_full_usage (NULL) -#define ocserv_short_usage (ocserv_opt_strs+1720) +#define ocserv_short_usage (ocserv_opt_strs+1744) #endif /* not defined __doxygen__ */ @@ -608,13 +608,13 @@ Usage: %s [ - [] | --[{=| }] ]...\n")); puts(_("\n")); /* referenced via ocservOptions.pzDetail */ - puts(_("This program is openconnect VPN server (ocserv), a server compatible with\n\ -the openconnect VPN client. It follows the protocol used by CISCO's\n\ -AnyConnect VPN.\n\n")); - puts(_("Multiple authentication methods are available including PAM and certificate\n\ -authentication. Authenticated users are assigned an unprivileged worker\n\ -process and obtain a networking (tun) device and IP from a configurable\n\ -pool of addresses.\n")); + puts(_("Openconnect VPN server (ocserv) is a VPN server compatible with the\n\ +openconnect VPN client. It follows the AnyConnect VPN protocol which is\n\ +used by several CISCO routers.\n\n")); + puts(_("This server supports multiple authentication methods, including PAM and\n\ +certificate authentication. Authenticated users are assigned an\n\ +unprivileged worker process and obtain a networking (tun) device and an IP\n\ +from a configurable pool of addresses.\n")); /* referenced via ocservOptions.pzFullVersion */ puts(_("ocserv 0.1.5")); diff --git a/src/ocserv-args.def b/src/ocserv-args.def index 7e0bcf52..2f2d6001 100644 --- a/src/ocserv-args.def +++ b/src/ocserv-args.def @@ -12,12 +12,14 @@ short-usage = "Usage: ocserv [options] -c [config]\nocserv --help for usage in explain = ""; #include version.inc -detail = "This program is openconnect VPN server (ocserv), a server compatible with the -openconnect VPN client. It follows the protocol used by CISCO's AnyConnect VPN. +detail = "Openconnect VPN server (ocserv) is a VPN server compatible with the +openconnect VPN client. It follows the AnyConnect VPN protocol which +is used by several CISCO routers. -Multiple authentication methods are available including PAM and certificate -authentication. Authenticated users are assigned an unprivileged worker process and obtain -a networking (tun) device and IP from a configurable pool of addresses."; +This server supports multiple authentication methods, +including PAM and certificate authentication. Authenticated users are +assigned an unprivileged worker process and obtain a networking (tun) device +and an IP from a configurable pool of addresses."; copyright = { date = "2013"; @@ -374,8 +376,8 @@ doc-section = { ds-format = 'texi'; ds-text = <<-_EOT_ The server has been tested to be compatible with the openconnect VPN client. -To enable compatibility with CISCO's AnyConnect clients use a simple client -policy that disables the downloader. An example policy file is shown below. +To enable compatibility with CISCO's AnyConnect the client's policy must +set in a way that disables the downloader. An example policy file is shown below. @example diff --git a/src/ocserv-args.h b/src/ocserv-args.h index 56ad2ac9..f8fe5d31 100644 --- a/src/ocserv-args.h +++ b/src/ocserv-args.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ocserv-args.h) * - * It has been AutoGen-ed July 23, 2013 at 09:39:01 PM by AutoGen 5.17.3 + * It has been AutoGen-ed August 3, 2013 at 10:51:57 AM by AutoGen 5.17.3 * From the definitions ocserv-args.def * and the template file options *