[master] 9105474 Document -n and default behaviour

Per Andreas Buer perbu at varnish-cache.org
Wed Mar 23 18:39:41 CET 2011

commit 9105474f474234f7fc02ee0f1853a388942d2698
Author: Per Buer <perbu at varnish-software.com>
Date:   Wed Mar 23 15:23:01 2011 +0100

    Document -n and default behaviour

diff --git a/doc/sphinx/reference/varnishadm.rst b/doc/sphinx/reference/varnishadm.rst
index 9386cdf..af68355 100644
--- a/doc/sphinx/reference/varnishadm.rst
+++ b/doc/sphinx/reference/varnishadm.rst
@@ -15,12 +15,13 @@ Control a running varnish instance
-       varnishadm [-t timeout] [-S secret_file] -T address:port [command [...]]
+       varnishadm [-t timeout] [-S secret_file] [-T address:port] [-n name] [command [...]]
-The varnishadm utility establishes a CLI connection using the -T and -S arguments.
+The varnishadm utility establishes a CLI connection to varnishd either
+using -n *name* or using the -T and -S arguments. If -n *name* is the location of the secret file and the address:port is looked up in shared memory. If neither is given varnishadm will look for an instance without a given name. 
 If a command is given, the command and arguments are sent over the CLI
 connection and the result returned on stdout.
@@ -42,6 +43,8 @@ OPTIONS
 -T address:port   
         Connect to the management interface at the specified address and port.
+-n name
+	Connect to the instance of varnishd with this name.
 Available commands and parameters are documented in the varnishd(1)
 manual page.  Additionally, a summary of commands can be obtained by

More information about the varnish-commit mailing list