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

doc/sphinx/installation/upgrade.rst

@@ -21,7 +21,7 @@ String concatenation did not have an operator previously, but this has now been
 becomes
 
 	import std;
-	std.log "log something";
+	std.log("log something");
 
 You only need to import std once.
 

doc/sphinx/reference/varnishlog.rst

@@ -52,10 +52,10 @@ The following options are available:
 -k num      Only show the first num log records.
 
 -m tag:regex only list transactions where tag matches regex. Multiple
-            -m options are AND-ed together.  Can not be combined with -O
+            -m options are AND-ed together.  
 
--n          Specifies the name of the varnishd instance to get logs from.  If -n is not 
-	    specified, the host name is used.
+-n          Specifies the name of the varnishd instance to get logs from.  If
+	    -n is not specified, the host name is used.
 
 -o          Ignored for compatibility with earlier versions.
 

doc/sphinx/reference/vcl.rst

@@ -485,8 +485,12 @@ vcl_fetch
   error code [reason]
     Return the specified error code to the client and abandon the request.
 
-  pass
-    Switch to pass mode.  Control will eventually pass to vcl_pass.
+  hit_for_pass
+    Pass in fetch. This will create a hit_for_pass object. Note that
+    the TTL for the hit_for_pass object will be set to what the
+    current value of beresp.ttl. Control will be handled to
+    vcl_deliver on the current request, but subsequent requests will
+    go directly to vcl_pass based on the hit_for_pass object.
 
   restart
     Restart the transaction. Increases the restart counter. If the number