[master] 310bce0d0 doc: Mention varnish.m4 changes

[Dridi Boukelmoune]

commit 310bce0d02408c58addcf332ab69f95713b2662d
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Thu Sep 10 16:39:25 2020 +0200

    doc: Mention varnish.m4 changes
    
    And amend the 7.0.0 mis-prediction.

diff --git a/doc/changes.rst b/doc/changes.rst
index 29091fb66..3982fb699 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -213,6 +213,8 @@ NEXT (scheduled 2020-09-15)
 
 * Fixed the backend probe ``.timeout`` handling for "dripping" responses (3402_)
 
+* New ``VARNISH_VMODS_GENERATED()`` macro in ``varnish.m4``.
+
 .. _2990: https://github.com/varnishcache/varnish-cache/issues/2990
 .. _2999: https://github.com/varnishcache/varnish-cache/issues/2999
 .. _3002: https://github.com/varnishcache/varnish-cache/issues/3002
diff --git a/doc/sphinx/whats-new/changes-trunk.rst b/doc/sphinx/whats-new/changes-trunk.rst
index f980df0b7..4985fb7a1 100644
--- a/doc/sphinx/whats-new/changes-trunk.rst
+++ b/doc/sphinx/whats-new/changes-trunk.rst
@@ -110,6 +110,10 @@ new ``WS_ReservationSize()`` function.
 
 The return value for ``WS_Printf()`` is now a constant string.
 
+VMOD authors who would like to generate VCC files can now use the
+``VARNISH_VMODS_GENERATED()`` macro from ``varnish.m4`` for autotools
+builds.
+
 **XXX changes concerning VRT, the public APIs, source code organization,
 builds etc.**
 
diff --git a/varnish.m4 b/varnish.m4
index f86885a9a..abd8dfc78 100644
--- a/varnish.m4
+++ b/varnish.m4
@@ -31,7 +31,7 @@
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # varnish.m4 - Macros to build against Varnish.         -*- Autoconf -*-
-# serial 11 (varnish-7.0.0)
+# serial 11 (varnish-6.5.0)
 #
 # This collection of macros helps create VMODs or tools interacting with
 # Varnish Cache using the GNU build system (autotools). In order to work
@@ -380,9 +380,9 @@ AC_DEFUN([VARNISH_VMODS], [
 
 # VARNISH_VMODS_GENERATED(NAMES)
 # ------------------------------
-# Since: Varnish 7.0.0
+# Since: Varnish 6.5.0
 #
-# Varnish 7 adds the possibility to transparently work with a generated VCC
+# Varnish 6.5 adds the possibility to transparently work with a generated VCC
 # file. The VCC file would then be created in the build directory, which is
 # incompatible with how the VARNISH_VMODS macro operates.
 #