[master] 52c58d8 Update description of -n and -i arguments and where they end up.

[Poul-Henning Kamp]

commit 52c58d8643e3aee5fa4aa15e06bcddae1f63077b
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Jun 6 12:35:47 2017 +0000

    Update description of -n and -i arguments and where they end up.

diff --git a/doc/sphinx/reference/varnishd.rst b/doc/sphinx/reference/varnishd.rst
index 56a90c4..0064580 100644
--- a/doc/sphinx/reference/varnishd.rst
+++ b/doc/sphinx/reference/varnishd.rst
@@ -72,11 +72,10 @@ Basic options
 
 -n name
 
-  Specify the name for this instance.  Amongst other things, this name
-  is used to construct the name of the directory in which `varnishd`
-  keeps temporary files and persistent state. If the specified name
-  begins with a forward slash, it is interpreted as the absolute path
-  to the directory which should be used for this purpose.
+  Specify the name for this instance.  This name is used to construct
+  the name of the directory in which `varnishd` keeps temporary files
+  and persistent state. If the specified name begins with a forward slash,
+  it is interpreted as the absolute path to the directory.
 
 Documentation options
 ---------------------
@@ -135,7 +134,8 @@ Operations options
 -i identity
 
   Specify the identity of the Varnish server. This can be accessed
-  using ``server.identity`` from VCL.
+  using ``server.identity`` from VCL and with VSM_Name() from
+  utilities.
 
 -I clifile
 
diff --git a/lib/libvcc/generate.py b/lib/libvcc/generate.py
index fac8ee4..1a3d5da 100755
--- a/lib/libvcc/generate.py
+++ b/lib/libvcc/generate.py
@@ -216,8 +216,7 @@ sp_variables = [
 		(), """
 		The identity of the server, as set by the -i
 		parameter.  If the -i parameter is not passed to varnishd,
-		server.identity will be set to the name of the instance, as
-		specified by the -n parameter.
+		server.identity will be set to "varnishd".
 		"""
 	),
 	('req',