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

doc/sphinx/reference/vcl.rst

@@ -661,6 +661,12 @@ The following variables are available after the requested object has
 been retrieved from the backend, before it is entered into the cache. In
 other words, they are available in vcl_fetch:
 
+beresp.do_stream 
+  Deliver the object to the client directly without fetching the whole
+  object into varnish. If this request is pass'ed it will not be
+  stored in memory. As of Varnish Cache 3.0 the object will marked as busy
+  as it is delivered so only client can access the object.
+
 beresp.do_esi
   Boolean. ESI-process the object after fetching it. Defaults to false. Set it
   to true to parse the object for ESI directives.

doc/sphinx/tutorial/purging.rst

@@ -17,6 +17,10 @@ bans. First, let me explain the HTTP purges.
 HTTP Purges
 ===========
 
+A *purge* is what happens when you pick out an object from the cache
+and discard it along with its variants. Usually a purge is invoked
+through HTTP with the method PURGE.
+
 An HTTP purge is similar to an HTTP GET request, except that the
 *method* is PURGE. Actually you can call the method whatever you'd
 like, but most people refer to this as purging. Squid supports the