[master] 0c1408c Revert "Describe VMODs as VCL modules"

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Tue Mar 14 16:26:06 CET 2017


commit 0c1408cb2fbabcdfccd81281f6fcded4a2eed309
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Tue Mar 14 16:19:30 2017 +0100

    Revert "Describe VMODs as VCL modules"
    
    This reverts commit c2070784e2de3c75a1949599aed74c8fa01a1a65, we'll
    stick to varnish modules. I also updated a commented-out occurrence
    of "VCL modules" in params.h, we can probably get rid of these
    comments.

diff --git a/doc/sphinx/reference/vcl.rst b/doc/sphinx/reference/vcl.rst
index a53e543..075c345 100644
--- a/doc/sphinx/reference/vcl.rst
+++ b/doc/sphinx/reference/vcl.rst
@@ -174,7 +174,7 @@ To include a VCL file in another file use the include keyword::
 Import statement
 ----------------
 
-The ``import`` statement is used to load VCL modules (VMODs.)
+The ``import`` statement is used to load Varnish Modules (VMODs.)
 
 Example::
 
diff --git a/doc/sphinx/reference/vmod.rst b/doc/sphinx/reference/vmod.rst
index 1b8b0cf..910d613 100644
--- a/doc/sphinx/reference/vmod.rst
+++ b/doc/sphinx/reference/vmod.rst
@@ -1,8 +1,8 @@
 .. _ref-vmod:
 
-%%%%%%%%%%%%%%%%%%
-VMOD - VCL Modules
-%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+VMOD - Varnish Modules
+%%%%%%%%%%%%%%%%%%%%%%
 
 For all you can do in VCL, there are things you can not do.
 Look an IP number up in a database file for instance.
diff --git a/doc/sphinx/users-guide/vcl-backends.rst b/doc/sphinx/users-guide/vcl-backends.rst
index 6da1855..5844891 100644
--- a/doc/sphinx/users-guide/vcl-backends.rst
+++ b/doc/sphinx/users-guide/vcl-backends.rst
@@ -120,9 +120,9 @@ You can also group several backend into a group of backends. These
 groups are called directors. This will give you increased performance
 and resilience.
 
-You can define several backends and group them together in a director.
-This requires you to load a VMOD, a VCL module, and then to call certain
-actions in `vcl_init`.::
+You can define several backends and group them together in a
+director. This requires you to load a VMOD, a Varnish module, and then to
+call certain actions in `vcl_init`.::
 
 
     import directors;    # load the directors
diff --git a/include/tbl/params.h b/include/tbl/params.h
index cc12632..f66ffd1 100644
--- a/include/tbl/params.h
+++ b/include/tbl/params.h
@@ -1473,7 +1473,7 @@ PARAM(
 	/* units */	NULL,
 	/* flags */	0,
 	/* s-text */
-	"Directory where VCL modules are to be found.",
+	"Directory where Varnish modules are to be found.",
 	/* l-text */	"",
 	/* func */	NULL
 )



More information about the varnish-commit mailing list