diff -r 714e4fac9cd0 -r 7ae30649b30b java/sql-dk/src/info/globalcode/sql/dk/CLIParser.java
--- a/java/sql-dk/src/info/globalcode/sql/dk/CLIParser.java	Sun Dec 29 14:50:10 2013 +0100
+++ b/java/sql-dk/src/info/globalcode/sql/dk/CLIParser.java	Sun Dec 29 15:28:24 2013 +0100
@@ -140,22 +140,22 @@
 	public static class Tokens {
 
 		// bash-completion:options:
-		public static final String DB = "--db"; // bash-completion:option
-		public static final String SQL = "--sql"; // bash-completion:option
-		public static final String BATCH = "--batch"; // bash-completion:option
-		public static final String DATA = "--data"; // bash-completion:option
-		public static final String DATA_NAMED = "--data-named"; // bash-completion:option
-		public static final String NAME_PREFIX = "--name-prefix"; // bash-completion:option
-		public static final String NAME_SUFFIX = "--name-suffix"; // bash-completion:option
-		public static final String TYPES = "--types"; // bash-completion:option
-		public static final String FORMATTER = "--formatter"; // bash-completion:option
-		public static final String INFO_HELP = "--help"; // bash-completion:option
-		public static final String INFO_VERSION = "--version"; // bash-completion:option
-		public static final String INFO_LICENSE = "--license"; // bash-completion:option
-		public static final String INFO_FORMATTERS = "--list-formatters"; // bash-completion:option
-		public static final String INFO_TYPES = "--list-types"; // bash-completion:option
-		public static final String INFO_DATABASES = "--list-databases"; // bash-completion:option
-		public static final String INFO_CONNECTION = "--test-connection"; // bash-completion:option
+		public static final String DB = "--db"; // bash-completion:option // help: database name
+		public static final String SQL = "--sql"; // bash-completion:option // help: SQL query/command
+		public static final String BATCH = "--batch"; // bash-completion:option // help: batch mode (no argument)
+		public static final String DATA = "--data"; // bash-completion:option // help: list of ordinal parameters
+		public static final String DATA_NAMED = "--data-named"; // bash-completion:option // help: list of named parameters
+		public static final String NAME_PREFIX = "--name-prefix"; // bash-completion:option // help: parameter name prefix – regular expression
+		public static final String NAME_SUFFIX = "--name-suffix"; // bash-completion:option // help: parameter name suffix – regular expression
+		public static final String TYPES = "--types"; // bash-completion:option // help: comma separated list of parameter types
+		public static final String FORMATTER = "--formatter"; // bash-completion:option // help: name of the output formatter
+		public static final String INFO_HELP = "--help"; // bash-completion:option // help: print this help
+		public static final String INFO_VERSION = "--version"; // bash-completion:option // help: print version info
+		public static final String INFO_LICENSE = "--license"; // bash-completion:option // help: print license
+		public static final String INFO_FORMATTERS = "--list-formatters"; // bash-completion:option // help: print list of available formatters
+		public static final String INFO_TYPES = "--list-types"; // bash-completion:option // help: print list of supported data types
+		public static final String INFO_DATABASES = "--list-databases"; // bash-completion:option // help: print list of configured databases
+		public static final String INFO_CONNECTION = "--test-connection"; // bash-completion:option // help: test connection to particular database
 
 		private Tokens() {
 		}