Merge branch 'pull/master'

[collectd.git] / src / collectd.c

diff --git a/src/collectd.c b/src/collectd.c
index 4c9aafc212d61d843d751ee0628bf9c5eab9aad7..dec7e3f884db2be4d00fc1d8bf2748859c60c594 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -250,11 +250,13 @@ static void exit_usage (void)
                        "  General:\n"
                        "    -C <file>       Configuration file.\n"
                        "                    Default: "CONFIGFILE"\n"
+                       "    -t              Test config and exit.\n"
                        "    -P <file>       PID-file.\n"
                        "                    Default: "PIDFILE"\n"
 #if COLLECT_DAEMON
                        "    -f              Don't fork to the background.\n"
 #endif
+                       "    -h              Display help (this message)\n"
                        "\nBuiltin defaults:\n"
                        "  Config-File       "CONFIGFILE"\n"
                        "  PID-File          "PIDFILE"\n"