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

doc/sphinx/reference/varnishlog.rst

+_reference-varnishlog:
+
 ==========
 varnishlog
 ==========

doc/sphinx/tutorial/increasing_your_hitrate.rst

@@ -31,9 +31,11 @@ Tool: varnishlog
 ~~~~~~~~~~~~~~~~
 
 When you have identified the an URL which is frequently sent to the
-backend you can use varnishlog to have a look at the whole request.
-``varnishlog -c -m 'RxURL:^/foo/bar`` will give the whole (-o)
-requests coming from the client (-c) matching /foo/bar.
+backend you can use varnishlog to have a look at the request.
+``varnishlog -c -m 'RxURL:^/foo/bar`` will show you the requests
+coming from the client (-c) matching /foo/bar.
+
+For more information on how varnishlog works please see :ref:`tutorial-logging`.
 
 For extended diagnostics headers, see
 http://www.varnish-cache.org/trac/wiki/VCLExampleHitMissHeader

doc/sphinx/tutorial/logging.rst

+.. _tutorial-logging:
 
 Logging in Varnish
 ------------------
@@ -8,7 +9,7 @@ memory segment. When the end of the segment is reached we start over,
 overwriting old data. This is much, much faster then logging to a file
 and it doesn't require disk space.
 
-The flip side is that is you forget to have program actually write the
+The flip side is that if you forget to have program actually write the
 logs to disk they will disappear.
 
 varnishlog is one of the programs you can use to look at what Varnish
@@ -59,19 +60,9 @@ want to know are:
 -c 
  Same as -b but for client side traffic.
 
--i tag
- Only show lines with a certain tag. "varnishlog -i SessionOpen" 
- will only give you new sessions. Note that the tags are case 
- insensitive. 
-
--I Regex
- Filter the data through a regex and only show the matching lines. To
- show all cookie headers coming from the clients:
- ``$ varnishlog -c -i RxHeader -I Cookie``
-
--o 
- Group log entries by request ID.
-
+-m tag:regex
+ Only list transactions where the tag matches a regular expression. If
+ it matches you will get the whole transaction.
 
 Now that Varnish seem to work OK it's time to put Varnish on port 80
 while we tune it.