[master] 98965de Write up VCL 4.0 -> 4.1 in "Upgrading to 6.0".

Geoff Simmons geoff at uplex.de
Wed Mar 14 23:04:07 UTC 2018

commit 98965de4257bbcf72f14f429d4ff470842837309
Author: Geoff Simmons <geoff at uplex.de>
Date:   Thu Mar 15 00:02:39 2018 +0100

    Write up VCL 4.0 -> 4.1 in "Upgrading to 6.0".

diff --git a/doc/sphinx/whats-new/upgrading-6.0.rst b/doc/sphinx/whats-new/upgrading-6.0.rst
index 2bb277d..c13889d 100644
--- a/doc/sphinx/whats-new/upgrading-6.0.rst
+++ b/doc/sphinx/whats-new/upgrading-6.0.rst
@@ -128,7 +128,20 @@ to do so by someone familiar with the innards of Varnish.
 Changes to VCL
-XXX: ... intro paragraph
+VCL 4.0 and 4.1
+The first line of code in a VCL program may now be either ``vcl 4.0;``
+or ``vcl 4.1;``, establishing the version of the language for that
+instance of VCL. Varnish 6.0 supports both versions.
+The VCL version mainly affects which variables may be used in your VCL
+program, or in some cases, whether the variable is writable or
+read-only. Only VCL 4.1 is permitted when Unix domain sockets are in
+For details, see :ref:`vcl_variables`, and the notes in the present
 VCL variables

More information about the varnish-commit mailing list