[master] 8c28f42 Update usage text to reflect reality.

Lasse Karstensen lkarsten at varnish-software.com
Fri Dec 4 11:55:46 CET 2015

commit 8c28f42849f77bcd773553bdc7315ccd42395c12
Author: Lasse Karstensen <lkarsten at varnish-software.com>
Date:   Fri Dec 4 11:54:18 2015 +0100

    Update usage text to reflect reality.
    Update built-in usage text to reflect that -T is optional.

diff --git a/bin/varnishadm/varnishadm.c b/bin/varnishadm/varnishadm.c
index 12650b2..621d696 100644
--- a/bin/varnishadm/varnishadm.c
+++ b/bin/varnishadm/varnishadm.c
@@ -380,8 +380,8 @@ static void
-	    "usage: varnishadm [-n ident] [-t timeout] [-S secretfile] "
-	    "-T [address]:port command [...]\n");
+	    "Usage: varnishadm [-n ident] [-t timeout] [-S secretfile] "
+	    "[-T [address]:port] [command [...]]\n");
 	fprintf(stderr, "\t-n is mutually exclusive with -S and -T\n");
diff --git a/doc/sphinx/reference/varnishadm.rst b/doc/sphinx/reference/varnishadm.rst
index 4f24c2c..29a34ec 100644
--- a/doc/sphinx/reference/varnishadm.rst
+++ b/doc/sphinx/reference/varnishadm.rst
@@ -14,7 +14,7 @@ Control a running Varnish instance
-varnishadm [-n ident] [-t timeout] [-S secretfile] -T [address]:port [command [...]]
+varnishadm [-n ident] [-t timeout] [-S secretfile] [-T [address]:port] [command [...]]

More information about the varnish-commit mailing list