r4107 - in trunk/varnish-cache/bin: varnishd varnishlog varnishtest varnishtop

[ssm at projects.linpro.no]

Author: ssm
Date: 2009-06-17 07:20:34 +0200 (Wed, 17 Jun 2009)
New Revision: 4107

Modified:
   trunk/varnish-cache/bin/varnishd/varnishd.1
   trunk/varnish-cache/bin/varnishlog/varnishlog.1
   trunk/varnish-cache/bin/varnishtest/varnishtest.1
   trunk/varnish-cache/bin/varnishtop/varnishtop.1
Log:
Merge branch 'lintian/man'

Conflicts:
	varnish-cache/bin/varnishd/varnishd.1

Modified: trunk/varnish-cache/bin/varnishd/varnishd.1
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.1	2009-06-14 11:33:10 UTC (rev 4106)
+++ trunk/varnish-cache/bin/varnishd/varnishd.1	2009-06-17 05:20:34 UTC (rev 4107)
@@ -563,7 +563,7 @@
 Note that several operating systems have known bugs which make it
 inadvisable to use this.
 .Pp
-The default is -1, which disables the use of sendfile altogether.
+The default is \-1, which disables the use of sendfile altogether.
 .It Va send_timeout
 The time to wait before dropping the connection to a client which is
 not accepting data sent to it.

Modified: trunk/varnish-cache/bin/varnishlog/varnishlog.1
===================================================================
--- trunk/varnish-cache/bin/varnishlog/varnishlog.1	2009-06-14 11:33:10 UTC (rev 4106)
+++ trunk/varnish-cache/bin/varnishlog/varnishlog.1	2009-06-17 05:20:34 UTC (rev 4107)
@@ -232,13 +232,13 @@
 The following command line simply copies all log entries to a log
 file:
 .Bd -literal -offset 4n
-$ varnishlog -w /var/log/varnish.log
+$ varnishlog \-w /var/log/varnish.log
 .Ed
 .Pp
 The following command line reads that same log file and displays
 requests for the front page:
 .Bd -literal -offset 4n
-$ varnishlog -r /var/log/varnish.log -c -o RxURL '^/$'
+$ varnishlog \-r /var/log/varnish.log \-c \-o RxURL '^/$'
 .Ed
 .Sh SEE ALSO
 .Xr varnishd 1 ,

Modified: trunk/varnish-cache/bin/varnishtest/varnishtest.1
===================================================================
--- trunk/varnish-cache/bin/varnishtest/varnishtest.1	2009-06-14 11:33:10 UTC (rev 4106)
+++ trunk/varnish-cache/bin/varnishtest/varnishtest.1	2009-06-17 05:20:34 UTC (rev 4107)
@@ -69,23 +69,23 @@
 .Ss Example script
 .Bd -literal -offset 4n
 # Start a varnish instance called "v1"
-varnish v1 -arg "-b localhost:9080" -start
+varnish v1 \-arg "\-b localhost:9080" \-start
 
 # Create a server thread called "s1"
 server s1 {
     # Receive a request
     rxreq
     # Send a standard response
-    txresp -hdr "Connection: close" -body "012345\\n"
+    txresp \-hdr "Connection: close" \-body "012345\\n"
 }
 
 # Start the server thread
-server s1 -start
+server s1 \-start
 
 # Create a client thread called "c1"
 client c1 {
    # Send a request
-   txreq -url "/"
+   txreq \-url "/"
    # Wait for a response
    rxresp
    # Insist that it be a success
@@ -93,13 +93,13 @@
 }
 
 # Run the client
-client c1 -run
+client c1 \-run
 
 # Wait for the server to die
-server s1 -wait
+server s1 \-wait
 
 # (Forcefully) Stop the varnish instance.
-varnish v1 -stop
+varnish v1 \-stop
 .Ed
 .Ss Example script output
 The output, running this script looks as follows.
@@ -112,7 +112,7 @@
 The rest of the line is anyones guess :-)
 .Bd -literal -offset 4n
 #    TEST tests/b00000.vtc starting
-###  v1   CMD: cd ../varnishd && ./varnishd -d -d -n v1 -a :9081 -T :9001 -b localhost:9080
+###  v1   CMD: cd ../varnishd && ./varnishd \-d \-d \-n v1 \-a :9081 \-T :9001 \-b localhost:9080
 ###  v1   opening CLI connection
 #### v1   debug| NB: Storage size limited to 2GB on 32 bit architecture,\\n
 #### v1   debug| NB: otherwise we could run out of address space.\\n

Modified: trunk/varnish-cache/bin/varnishtop/varnishtop.1
===================================================================
--- trunk/varnish-cache/bin/varnishtop/varnishtop.1	2009-06-14 11:33:10 UTC (rev 4106)
+++ trunk/varnish-cache/bin/varnishtop/varnishtop.1	2009-06-17 05:20:34 UTC (rev 4107)
@@ -141,13 +141,13 @@
 The following example displays a continuously updated list of the most
 frequently requested URLs:
 .Bd -literal
-varnishtop -i RxURL
+varnishtop \-i RxURL
 .Ed
 .Pp
 The following example displays a continuously updated list of the most
 commonly used user agents:
 .Bd -literal
-varnishtop -i RxHeader -C -I \\^User-Agent
+varnishtop \-i RxHeader \-C \-I \\^User-Agent
 .Ed
 .Sh SEE ALSO
 .Xr varnishd 1 ,