[master] 03893a9 4.0 updates

Per Buer perbu at varnish-software.com
Fri Feb 21 12:09:46 CET 2014

commit 03893a974183b5468d72bab9b032c0c453843af1
Author: Per Buer <perbu at varnish-software.com>
Date:   Fri Feb 21 12:08:20 2014 +0100

    4.0 updates

diff --git a/doc/sphinx/users-guide/vcl-actions.rst b/doc/sphinx/users-guide/vcl-actions.rst
index c981051..fc5a0da 100644
--- a/doc/sphinx/users-guide/vcl-actions.rst
+++ b/doc/sphinx/users-guide/vcl-actions.rst
@@ -21,7 +21,7 @@ The most common actions to return are these:
   When you return lookup from vcl_recv you tell Varnish to deliver content 
   from cache even if the request othervise indicates that the request 
-  should be passed. You can't return lookup from vcl_fetch.
+  should be passed. 
   Pipe can be returned from vcl_recv as well. Pipe short circuits the
@@ -34,3 +34,12 @@ The most common actions to return are these:
  Deliver the cached object to the client.  Usually returned from vcl_fetch. 
+ Restart processing of the request. You can restart the processing of
+ the whole transaction. Changes to the req object are retained.
+ Retry the request against the backend. This can be called from
+ vcl_backend_response or vcl_backend_error if you don't like the response 
+ that the backend delivered.

More information about the varnish-commit mailing list