Browse Source

Fix clish help

git-svn-id: https://klish.googlecode.com/svn/trunk@534 0eaa4687-2ee9-07dd-09d9-bcdd2d2dd5fb
Serj Kalichev 12 years ago
parent
commit
da2c680273
2 changed files with 9 additions and 7 deletions
  1. 6 6
      bin/clish.cpp
  2. 3 1
      xml-examples/klish/etc/clish-xml/common.xml

+ 6 - 6
bin/clish.cpp

@@ -269,8 +269,8 @@ static void help(int status, const char *argv0)
 		fprintf(stderr, "Try `%s -h' for more information.\n",
 			name);
 	} else {
-		printf("Usage: %s [options]\n", name);
-		printf("CLI utility. "
+		printf("Usage: %s [options] [script_file] [script_file] ...\n", name);
+		printf("CLI utility. Command line shell."
 			"The part of the klish project.\n");
 		printf("Options:\n");
 		printf("\t-v, --version\tPrint version.\n");
@@ -278,13 +278,13 @@ static void help(int status, const char *argv0)
 		printf("\t-s <path>, --socket=<path>\tSpecify listen socket "
 			"of the konfd daemon.\n");
 		printf("\t-l, --lockless\tDon't use locking mechanism.\n");
-		printf("\t-e, --stop-on-error\tStop programm execution on error.\n");
+		printf("\t-e, --stop-on-error\tStop script execution on error.\n");
 		printf("\t-b, --background\tStart shell using non-interactive mode.\n");
 		printf("\t-q, --quiet\tDisable echo while executing commands from the file stream.\n");
 		printf("\t-d, --dry-run\tDon't actually execute ACTION scripts.\n");
-		printf("\t-x, --xml-path\tPath to XML scheme files.\n");
-		printf("\t-w, --view\tSet the startup view.\n");
-		printf("\t-i, --viewid\tSet the startup viewid.\n");
+		printf("\t-x <path>, --xml-path=<path>\tPath to XML scheme files.\n");
+		printf("\t-w <view_name>, --view=<view_name>\tSet the startup view.\n");
+		printf("\t-i <vars>, --viewid=<vars>\tSet the startup viewid variables.\n");
 		printf("\t-u, --utf8\tForce UTF-8 encoding.\n");
 		printf("\t-8, --8bit\tForce 8-bit encoding.\n");
 		printf("\t-o, --log\tEnable command logging to syslog's local0.\n");

+ 3 - 1
xml-examples/klish/etc/clish-xml/common.xml

@@ -12,7 +12,9 @@
 </COMMAND>
 
 <COMMAND name="!"
-	help="Comments">
+	help="Comments"
+	args="comment"
+	args_help="ignored comment text">
 	<ACTION builtin="clish_nop"/>
 </COMMAND>