[master] 2a98068 Update varnishstat usage output

[Martin Blix Grydeland]

commit 2a98068e6ed2e030b5fb6224f5ec2aa3944baa42
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Thu Sep 10 16:54:31 2015 +0200

    Update varnishstat usage output
    
    Patch by: Arianna

diff --git a/bin/varnishstat/varnishstat.c b/bin/varnishstat/varnishstat.c
index 2eda2bb..c7746d6 100644
--- a/bin/varnishstat/varnishstat.c
+++ b/bin/varnishstat/varnishstat.c
@@ -251,17 +251,21 @@ usage(void)
 {
 #define FMT "    %-28s # %s\n"
 	fprintf(stderr, "usage: varnishstat "
-	    "[-1lV] [-f field] "
+	    "[-1lV] [-f field] [-t seconds|<off>] "
 	    VSC_n_USAGE "\n");
 	fprintf(stderr, FMT, "-1", "Print the statistics to stdout.");
 	fprintf(stderr, FMT, "-f field", "Field inclusion glob");
 	fprintf(stderr, FMT, "",
-	    "If it starts with '^' it is used as an exclusion list");
+	    "If it starts with '^' it is used as an exclusion list.");
 	fprintf(stderr, FMT, "-l",
-	    "Lists the available fields to use with the -f option");
+	    "Lists the available fields to use with the -f option.");
 	fprintf(stderr, FMT, "-n varnish_name",
-	    "The varnishd instance to get logs from");
-	fprintf(stderr, FMT, "-V", "Display the version number and exit");
+	    "The varnishd instance to get logs from.");
+	fprintf(stderr, FMT, "-N filename",
+	    "Filename of a stale VSM instance.");
+	fprintf(stderr, FMT, "-t seconds|<off>",
+	    "Timeout before returning error on initial VSM connection.");
+	fprintf(stderr, FMT, "-V", "Display the version number and exit.");
 	fprintf(stderr, FMT, "-x",
 	    "Print statistics to stdout as XML.");
 	fprintf(stderr, FMT, "-j",
diff --git a/doc/sphinx/reference/varnishstat.rst b/doc/sphinx/reference/varnishstat.rst
index b85e8a8..5eef680 100644
--- a/doc/sphinx/reference/varnishstat.rst
+++ b/doc/sphinx/reference/varnishstat.rst
@@ -15,7 +15,7 @@ Varnish Cache statistics
 SYNOPSIS
 ========
 
-varnishstat [-1] [-x] [-j] [-f field] [-l] [-n varnish_name] [-N filename] [-V]
+varnishstat [-1] [-x] [-j] [-f field] [-l] [-n varnish_name] [-N filename] [-t seconds|<off>] [-V]
 
 .. TODO: autogenerate this synopsis like the others.