Bring up-to-date, and sort options correctly.

git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@1016 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishlog/varnishlog.1

@@ -9,15 +9,18 @@
 .Nd HTTP accelerator log watcher
 .Sh SYNOPSIS
 .Nm
-.Op Fl C
+.Op Fl a
 .Op Fl b
+.Op Fl C
 .Op Fl c
-.Op Fl o
+.Op Fl d
 .Op Fl I Ar regex
-.Op Fl X Ar regex
 .Op Fl i Ar tag
+.Op Fl o
 .Op Fl r Ar file
+.Op Fl V
 .Op Fl w Ar file
+.Op Fl X Ar regex
 .Op Fl x Ar tag
 .Sh DESCRIPTION
 The
@@ -28,8 +31,8 @@ shared memory logs.
 .Pp
 The following options are available:
 .Bl -tag -width Fl
-.It Fl C
-Ignore case when matching regular expressions.
+.It Fl a
+When writing to a file, append to it rather than overwrite it.
 .It Fl b
 Include log entries which result from communication with a backend
 server.
@@ -40,6 +43,8 @@ nor
 is specified,
 .Nm
 acts as if they both were.
+.It Fl C
+Ignore case when matching regular expressions.
 .It Fl c
 Include log entries which result from communication with a client.
 If neither
@@ -49,8 +54,12 @@ nor
 is specified,
 .Nm
 acts as if they both were.
-.It Fl o
-Group log entries by request ID.
+.It Fl d
+Process old log entries on startup.
+Normally,
+.Nm
+will only process entries which are written to the log after it
+starts.
 .It Fl I Ar regex
 Include log entries which match the specified regular expression.
 If neither
@@ -58,8 +67,6 @@ If neither
 nor
 .Fl i
 is specified, all log entries are included.
-.It Fl X Ar regex
-Exclude log entries which match the specified regular expression.
 .It Fl i Ar tag
 Include log entries with the specified tag.
 If neither
@@ -67,14 +74,23 @@ If neither
 nor
 .Fl i
 is specified, all log entries are included.
+.It Fl o
+Group log entries by request ID.
 .It Fl r Ar file
 Read log entries from
 .Ar file
 instead of shared memory.
+.It Fl V
+Display the version number and exit.
 .It Fl w Ar file
 Write log entries to
 .Ar file
 instead of displaying them.
+The file will be overwritten unless the
+.Fl a
+option was specified.
+.It Fl X Ar regex
+Exclude log entries which match the specified regular expression.
 .It Fl x Ar tag
 Exclude log entries with the specified tag.
 .El
@@ -88,7 +104,6 @@ The following log entry tags are currently defined:
 .It Dv BackendOpen
 .It Dv BackendReuse
 .It Dv BackendXID
-.It Dv BldHdr
 .It Dv CLI
 .It Dv ClientAddr
 .It Dv Debug
@@ -96,24 +111,44 @@ The following log entry tags are currently defined:
 .It Dv ExpBan
 .It Dv ExpKill
 .It Dv ExpPick
-.It Dv Header
 .It Dv Hit
+.It Dv HitPass
 .It Dv HttpError
+.It Dv HttpGarbage
 .It Dv Length
-.It Dv LostHeader
-.It Dv Protocol
-.It Dv Request
-.It Dv Response
+.It Dv ObjHeader
+.It Dv ObjLostHeader
+.It Dv ObjProtocol
+.It Dv ObjRequest
+.It Dv ObjResponse
+.It Dv ObjStatus
+.It Dv ObjURL
+.It Dv ReqEnd
+.It Dv ReqStart
+.It Dv RxHeader
+.It Dv RxLostHeader
+.It Dv RxProtocol
+.It Dv RxRequest
+.It Dv RxResponse
+.It Dv RxStatus
+.It Dv RxURL
 .It Dv SessionClose
 .It Dv SessionOpen
-.It Dv SessionReuse
-.It Dv Status
-.It Dv URL
+.It Dv StatAddr
+.It Dv StatSess
+.It Dv TTL
+.It Dv TxHeader
+.It Dv TxLostHeader
+.It Dv TxProtocol
+.It Dv TxRequest
+.It Dv TxResponse
+.It Dv TxStatus
+.It Dv TxURL
+.It Dv VCL_acl
 .It Dv VCL_call
 .It Dv VCL_return
 .It Dv VCL_trace
 .It Dv WorkThread
-.It Dv XID
 .El
 .Sh SEE ALSO
 .Xr varnishd 1 ,