Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache

doc/sphinx/installation/upgrade.rst

@@ -57,7 +57,7 @@ becomes
 ``beresp.cacheable`` is gone
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-``beresp.cacheable`` is gone, and can be replaced with ``beresp.ttl > 0``
+``beresp.cacheable`` is gone, and can be replaced with ``beresp.ttl > 0s``
 
 returns are now done with the ``return()`` function
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -78,7 +78,7 @@ becomes
 ``req.hash`` is replaced with ``hash_data()``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-You no longer append to the hash with +=, so
+You no longer append to the hash with ``+=``, so
 
 	set req.hash += req.url;
 
@@ -86,6 +86,17 @@ becomes
 
 	hash_data(req.url);
 
+``esi`` is replaced with ``beresp.do_esi``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You no longer enable ESI with ``esi``, so
+
+	esi;
+
+in ``vcl_fetch`` becomes
+
+	set beresp.do_esi = true;
+
 ``pass`` in ``vcl_fetch`` renamed to ``hit_for_pass``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~