From 0ce5ffab5fb24d136053f5c72ce7b6def91439e8 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 15 Apr 2008 16:57:30 +0000 Subject: fixed some typos @ print help added --- src/anyConfOptions.cpp | 19 +++++++++---------- src/anyCtrOptions.cpp | 14 +++++++------- src/man/Makefile | 11 ++++++++++- src/man/anytun.8.txt | 2 +- src/options.cpp | 4 ++-- 5 files changed, 29 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/src/anyConfOptions.cpp b/src/anyConfOptions.cpp index bde873a..88c70f9 100644 --- a/src/anyConfOptions.cpp +++ b/src/anyConfOptions.cpp @@ -169,16 +169,15 @@ bool Options::parse(int argc, char* argv[]) void Options::printUsage() { std::cout << "USAGE:" << std::endl; - std::cout << "anytun-config" << std::endl; - std::cout << " [-h|--help] prints this..." << std::endl; - std::cout << " [-r|--remote-host] remote host" << std::endl; - std::cout << " [-o|--remote-port] remote port" << std::endl; - std::cout << " [-w|--window-size] seqence number window size" << std::endl; - std::cout << " [-m|--mux] the multiplex id to use" << std::endl; - std::cout << " [-K|--key] master key to use for encryption" << std::endl; - std::cout << " [-A|--salt] master salt to use for encryption" << std::endl; -// std::cout << " [-k|--kd-prf] key derivation pseudo random function" << std::endl; - std::cout << " [-R|--route] add a route to connection, can be invoked several times" << std::endl; + std::cout << "anytun-config [-h|--help] prints this..." << std::endl; + std::cout << " [-r|--remote-host] remote host" << std::endl; + std::cout << " [-o|--remote-port] remote port" << std::endl; + std::cout << " [-w|--window-size] seqence number window size" << std::endl; + std::cout << " [-m|--mux] the multiplex id to use" << std::endl; + std::cout << " [-K|--key] master key to use for encryption" << std::endl; + std::cout << " [-A|--salt] master salt to use for encryption" << std::endl; +// std::cout << " [-k|--kd-prf] key derivation pseudo random function" << std::endl; + std::cout << " [-R|--route] / add a route to connection, can be invoked several times" << std::endl; } void Options::printOptions() diff --git a/src/anyCtrOptions.cpp b/src/anyCtrOptions.cpp index 4f03031..70568a5 100644 --- a/src/anyCtrOptions.cpp +++ b/src/anyCtrOptions.cpp @@ -169,13 +169,13 @@ bool Options::parse(int argc, char* argv[]) void Options::printUsage() { std::cout << "USAGE:" << std::endl; - std::cout << "anytun-controld [-h|--help] prints this..." << std::endl; - std::cout << " [-D|--nodaemonize] don't run in background" << std::endl; - std::cout << " [-C|--chroot] chroot and drop privileges" << std::endl; - std::cout << " [-u|--username] if chroot change to this user" << std::endl; - std::cout << " [-H|--chroot-dir] chroot to this directory" << std::endl; - std::cout << " [-P|--write-pid] write pid to this file" << std::endl; - std::cout << " [-f|--file] path to file" << std::endl; + std::cout << "anytun-controld [-h|--help] prints this..." << std::endl; + std::cout << " [-D|--nodaemonize] don't run in background" << std::endl; + std::cout << " [-C|--chroot] chroot and drop privileges" << std::endl; + std::cout << " [-u|--username] if chroot change to this user" << std::endl; + std::cout << " [-H|--chroot-dir] chroot to this directory" << std::endl; + std::cout << " [-P|--write-pid] write pid to this file" << std::endl; + std::cout << " [-f|--file] path to file" << std::endl; } diff --git a/src/man/Makefile b/src/man/Makefile index 3a1bc4c..ad5c5d5 100644 --- a/src/man/Makefile +++ b/src/man/Makefile @@ -3,7 +3,16 @@ all: manpage anytun.8: anytun.8.txt a2x -f manpage anytun.8.txt -manpage: anytun.8 +anytun-controld.8: anytun-controld.8.txt + a2x -f manpage anytun-controld.8.txt + +anytun-config.8: anytun-config.8.txt + a2x -f manpage anytun-config.8.txt + + +manpage: anytun.8 anytun-controld.8 anytun-config.8 clean: rm -f anytun.8 anytun.8.xml + rm -f anytun-controld.8 anytun-controld.8.xml + rm -f anytun-config.8 anytun-config.8.xml \ No newline at end of file diff --git a/src/man/anytun.8.txt b/src/man/anytun.8.txt index 1de30bf..27a0a3d 100644 --- a/src/man/anytun.8.txt +++ b/src/man/anytun.8.txt @@ -316,7 +316,7 @@ the developers know at satp@anytun.org. Of course, patches are preferred. SEE ALSO -------- -anytun-config(8), anytun-controld(8), anytun-showtables(8) +anytun-config(8), anytun-controld(8) AUTHORS ------- diff --git a/src/options.cpp b/src/options.cpp index 809dee1..3b7e468 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -216,8 +216,8 @@ void Options::printUsage() std::cout << " [-D|--nodaemonize] don't run in background" << std::endl; std::cout << " [-C|--chroot] chroot and drop privileges" << std::endl; std::cout << " [-u|--username] if chroot change to this user" << std::endl; - std::cout << " [-H|--chroot-dir] chroot to this directory" << std::endl; - std::cout << " [-P|--write-pid] write pid to this file" << std::endl; + std::cout << " [-H|--chroot-dir] chroot to this directory" << std::endl; + std::cout << " [-P|--write-pid] write pid to this file" << std::endl; std::cout << " [-s|--sender-id ] the sender id to use" << std::endl; std::cout << " [-i|--interface] local anycast ip address to bind to" << std::endl; std::cout << " [-p|--port] local anycast(data) port to bind to" << std::endl; -- cgit v1.2.3