[master] e94b974 s/mgr/mgt/ for consistency

[Poul-Henning Kamp]

commit e94b9740c146110cfc4ebbf57a7b81fc0de2a6bc
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Sep 13 14:43:33 2017 +0000

    s/mgr/mgt/ for consistency

diff --git a/doc/sphinx/phk/barriers.rst b/doc/sphinx/phk/barriers.rst
index e85e81a..f9ba31b 100644
--- a/doc/sphinx/phk/barriers.rst
+++ b/doc/sphinx/phk/barriers.rst
@@ -22,7 +22,7 @@ barriers between the various components::
          |                          |                      |            |
          |runs                      |                      |            |
          |      .-<- create -<-.    |    .->- fork ->-.    v            |
-         v      |->- check -->-|-- MGR --|            |-- VCC <- loads -|
+         v      |->- check -->-|-- MGT --|            |-- VCC <- loads -|
         VSM     |-<- write --<-'    |    '-<- wait -<-'    |            |
        TOOLS    |                   |                      |            |
          ^      |     .-------------'                      |            |
@@ -48,7 +48,7 @@ barriers between the various components::
 The really Important Barrier
 ============================
 
-The central actor in Varnish is the Manager process, "MGR", which is the
+The central actor in Varnish is the Manager process, "MGT", which is the
 process the administrator "(ADMIN)" starts to get web-cache service.
 
 Having been there myself, I do not subscribe to the "I feel cool and important
diff --git a/doc/sphinx/whats-new/upgrading-5.2.rst b/doc/sphinx/whats-new/upgrading-5.2.rst
index 3a16ce0..8d837f9 100644
--- a/doc/sphinx/whats-new/upgrading-5.2.rst
+++ b/doc/sphinx/whats-new/upgrading-5.2.rst
@@ -113,7 +113,7 @@ Other changes
 
   * On a system that supports ``setproctitle(3)``, the Varnish
     management process will appear in the output of ``ps(1)`` as
-    ``Varnish-Mgr``, and the child process as ``Varnish-Child``. If
+    ``Varnish-Mgt``, and the child process as ``Varnish-Child``. If
     the ``-i`` option has been set, then these strings in the ps
     output are followed by ``-i`` and the identity string set by the
     option.
diff --git a/lib/libvcc/vcc_compile.h b/lib/libvcc/vcc_compile.h
index 79f9a02..5a5ffbb 100644
--- a/lib/libvcc/vcc_compile.h
+++ b/lib/libvcc/vcc_compile.h
@@ -184,7 +184,7 @@ struct vcc {
 	int			hindent;
 	unsigned		cnt;
 
-	struct vsb		*fi;		/* VCC info to MGR */
+	struct vsb		*fi;		/* VCC info to MGT */
 	struct vsb		*fc;		/* C-code */
 	struct vsb		*fh;		/* H-code (before C-code) */
 	struct vsb		*fb;		/* Body of current sub