[master] 20d8489 Refer to VCL subroutines as such in error messages

[Dridi Boukelmoune]

commit 20d84897a3b47ccbbf324cdc914efb4a6679e401
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Tue Feb 6 11:26:21 2018 +0100

    Refer to VCL subroutines as such in error messages

diff --git a/bin/varnishtest/tests/v00020.vtc b/bin/varnishtest/tests/v00020.vtc
index 39defaa..ee2f2a2 100644
--- a/bin/varnishtest/tests/v00020.vtc
+++ b/bin/varnishtest/tests/v00020.vtc
@@ -203,7 +203,7 @@ varnish v1 -errvcl {Name of function, 'foo.bar', contains illegal character '.'}
 	}
 }
 
-varnish v1 -errvcl {The names 'vcl*' are reserved for methods.} {
+varnish v1 -errvcl {The names 'vcl*' are reserved for subroutines.} {
 	sub vcl_bar {
 	}
 	sub vcl_recv {
diff --git a/lib/libvcc/vcc_parse.c b/lib/libvcc/vcc_parse.c
index 0cd13cc..16ba0b7 100644
--- a/lib/libvcc/vcc_parse.c
+++ b/lib/libvcc/vcc_parse.c
@@ -228,9 +228,9 @@ vcc_ParseFunction(struct vcc *tl)
 		    (t->b[1] == 'c'|| t->b[1] == 'C') &&
 		    (t->b[2] == 'l'|| t->b[2] == 'L')) {
 			VSB_printf(tl->sb,
-			    "The names 'vcl*' are reserved for methods.\n");
+			    "The names 'vcl*' are reserved for subroutines.\n");
 			vcc_ErrWhere(tl, t);
-			VSB_printf(tl->sb, "Valid vcl_* methods are:\n");
+			VSB_printf(tl->sb, "Valid vcl_* subroutines are:\n");
 			VTAILQ_FOREACH(p, &tl->procs, list) {
 				if (p->method != NULL)
 					VSB_printf(tl->sb, "\t%s\n",