[4.1] 3dde588 Better names and description

[Federico G. Schwindt]

commit 3dde58867c808d488ddf7b735562a107208443f6
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Aug 3 14:32:15 2015 +0100

    Better names and description

diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index 37b1985..eab4f90 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -162,9 +162,9 @@ usage(void)
 #endif
 	fprintf(stderr, FMT, "", "  -j unix[,user=<user>][,ccgroup=<group>]");
 	fprintf(stderr, FMT, "", "  -j none");
-	fprintf(stderr, FMT, "-l shl,free", "Size of shared memory file");
-	fprintf(stderr, FMT, "", "  shl: space for SHL records [80m]");
-	fprintf(stderr, FMT, "", "  free: space for other allocations [1m]");
+	fprintf(stderr, FMT, "-l vsl,vsm", "Size of shared memory file");
+	fprintf(stderr, FMT, "", "  vsl: space for VSL records [80m]");
+	fprintf(stderr, FMT, "", "  vsm: space for stats counters [1m]");
 	fprintf(stderr, FMT, "-M address:port", "Reverse CLI destination");
 	fprintf(stderr, FMT, "-n dir", "varnishd working directory");
 	fprintf(stderr, FMT, "-P file", "PID file");
diff --git a/doc/sphinx/reference/varnishd.rst b/doc/sphinx/reference/varnishd.rst
index 378daff..9506915 100644
--- a/doc/sphinx/reference/varnishd.rst
+++ b/doc/sphinx/reference/varnishd.rst
@@ -84,11 +84,11 @@ OPTIONS
 
   Specify the jailing technology to use.
 
--l <shl[,free]>
+-l <vsl[,vsm]>
 
-  Specifies size of shmlog file. shl is the store for the shared
-  memory log records [80M] and free is the store for other allocations
-  [1M]. Scaling suffixes like 'k', 'M' can be used up to (E)xabytes.
+  Specifies size of shmlog file. vsl is the space for the VSL records
+  [80M] and vsm is the space for stats counters [1M]. Scaling suffixes
+  like 'K' and 'M' can be used up to (G)igabytes.
   Default is 81 Megabytes.
 
 -M <address:port>