[master] 6fc0b3c71 Don't mention the catflap in "Upgrading".

Geoff Simmons geoff at uplex.de
Tue Mar 12 13:36:07 UTC 2019

commit 6fc0b3c719fcacfe3bc6a62feaad95625edf7e13
Author: Geoff Simmons <geoff at uplex.de>
Date:   Tue Mar 12 14:34:39 2019 +0100

    Don't mention the catflap in "Upgrading".

diff --git a/doc/sphinx/whats-new/upgrading-6.2.rst b/doc/sphinx/whats-new/upgrading-6.2.rst
index 5f6930967..097dbfb44 100644
--- a/doc/sphinx/whats-new/upgrading-6.2.rst
+++ b/doc/sphinx/whats-new/upgrading-6.2.rst
@@ -24,13 +24,13 @@ listening at the socket, or set its permissions, after Varnish starts
 or the VCL is loaded. Backend fetches fail if the socket is not
 accessible by the time the fetch is attempted.
-``return(miss)`` from ``vcl_hit{}`` is now removed. Options to
-implement similar functionality are:
+``return(miss)`` from ``vcl_hit{}`` is now removed. An option for
+implementing similar functionality is:
-* a vmod using the new *catflap* mechanism
+* ``return (restart)`` from ``vcl_hit{}``
-* ``return (restart)`` from ``vcl_hit{}`` and ``set
-  req.hash_always_miss = true;`` in ``vcl_recv{}`` for the restart.
+* in ``vcl_recv{}`` for the restart (when ``req.restarts`` has
+  increased), ``set req.hash_always_miss = true;``.
 .. _whatsnew_upgrading_params_2019_03:

More information about the varnish-commit mailing list