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

doc/sphinx/reference/varnishlog.rst

@@ -52,7 +52,8 @@ 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.  
+            -m options are AND-ed together. Can not be combined with 
+	    -O.
 
 -n          Specifies the name of the varnishd instance to get logs from.  If
 	    -n is not specified, the host name is used.

doc/sphinx/reference/vcl.rst

@@ -834,7 +834,7 @@ based on the request URL:::
 
   sub vcl_fetch {
     if (beresp.ttl < 120s) {
-      std.log "Adjusting TTL";
+      std.log("Adjusting TTL");
       set beresp.ttl = 120s;
     }
   }