drop varnish 2 example from varnish cookbook article

dbu · dbu · commit dc9430aefaeb · 2014-12-19T17:53:34.000+01:00
diff --git a/conf.py b/conf.py
@@ -101,12 +101,10 @@
 lexers['php-annotations'] = PhpLexer(startinline=True)
 lexers['php-standalone'] = PhpLexer(startinline=True)
 lexers['php-symfony'] = PhpLexer(startinline=True)
-lexers['varnish2'] = CLexer()
 lexers['varnish3'] = CLexer()
 lexers['varnish4'] = CLexer()
 
 config_block = {
-    'varnish2': 'Varnish 2',
     'varnish3': 'Varnish 3',
     'varnish4': 'Varnish 4'
 }
diff --git a/cookbook/cache/varnish.rst b/cookbook/cache/varnish.rst
@@ -83,17 +83,6 @@ configuration if you are still using Varnish 3:
             }
         }
 
-    .. code-block:: varnish2
-
-        sub vcl_fetch {
-            // By default, Varnish2 ignores Pragma: nocache and Cache-Control: no-cache and private
-            if (beresp.http.Cache-Control ~ "no-cache" ||
-                beresp.http.Cache-Control ~ "private"
-            ) {
-                return (hit_for_pass);
-            }
-        }
-
 Enable Edge Side Includes (ESI)
 -------------------------------
 
@@ -151,22 +140,6 @@ Symfony adds automatically:
             }
         }
 
-    .. code-block:: varnish2
-
-        sub vcl_fetch {
-            // Check for ESI acknowledgement and remove Surrogate-Control header
-            if (beresp.http.Surrogate-Control ~ "ESI/1.0") {
-                unset beresp.http.Surrogate-Control;
-                esi;
-            }
-        }
-
-.. caution::
-
-    Compression with ESI was not supported in Varnish until version 3.0
-    (read `GZIP and Varnish`_). If you're not using Varnish 3.0, put a web
-    server in front of Varnish to perform the compression.
-
 .. tip::
 
     If you followed the advice about ensuring a consistent caching
