Merge branch 'lintian/man'

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

git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@4107 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent c26d7474
...@@ -563,7 +563,7 @@ large to fit in physical memory. ...@@ -563,7 +563,7 @@ large to fit in physical memory.
Note that several operating systems have known bugs which make it Note that several operating systems have known bugs which make it
inadvisable to use this. inadvisable to use this.
.Pp .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 .It Va send_timeout
The time to wait before dropping the connection to a client which is The time to wait before dropping the connection to a client which is
not accepting data sent to it. not accepting data sent to it.
......
...@@ -232,13 +232,13 @@ The following log entry tags are currently defined: ...@@ -232,13 +232,13 @@ The following log entry tags are currently defined:
The following command line simply copies all log entries to a log The following command line simply copies all log entries to a log
file: file:
.Bd -literal -offset 4n .Bd -literal -offset 4n
$ varnishlog -w /var/log/varnish.log $ varnishlog \-w /var/log/varnish.log
.Ed .Ed
.Pp .Pp
The following command line reads that same log file and displays The following command line reads that same log file and displays
requests for the front page: requests for the front page:
.Bd -literal -offset 4n .Bd -literal -offset 4n
$ varnishlog -r /var/log/varnish.log -c -o RxURL '^/$' $ varnishlog \-r /var/log/varnish.log \-c \-o RxURL '^/$'
.Ed .Ed
.Sh SEE ALSO .Sh SEE ALSO
.Xr varnishd 1 , .Xr varnishd 1 ,
......
...@@ -69,23 +69,23 @@ File to use as a script ...@@ -69,23 +69,23 @@ File to use as a script
.Ss Example script .Ss Example script
.Bd -literal -offset 4n .Bd -literal -offset 4n
# Start a varnish instance called "v1" # 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" # Create a server thread called "s1"
server s1 { server s1 {
# Receive a request # Receive a request
rxreq rxreq
# Send a standard response # Send a standard response
txresp -hdr "Connection: close" -body "012345\\n" txresp \-hdr "Connection: close" \-body "012345\\n"
} }
# Start the server thread # Start the server thread
server s1 -start server s1 \-start
# Create a client thread called "c1" # Create a client thread called "c1"
client c1 { client c1 {
# Send a request # Send a request
txreq -url "/" txreq \-url "/"
# Wait for a response # Wait for a response
rxresp rxresp
# Insist that it be a success # Insist that it be a success
...@@ -93,13 +93,13 @@ client c1 { ...@@ -93,13 +93,13 @@ client c1 {
} }
# Run the client # Run the client
client c1 -run client c1 \-run
# Wait for the server to die # Wait for the server to die
server s1 -wait server s1 \-wait
# (Forcefully) Stop the varnish instance. # (Forcefully) Stop the varnish instance.
varnish v1 -stop varnish v1 \-stop
.Ed .Ed
.Ss Example script output .Ss Example script output
The output, running this script looks as follows. The output, running this script looks as follows.
...@@ -112,7 +112,7 @@ The second field where the message comes from ...@@ -112,7 +112,7 @@ The second field where the message comes from
The rest of the line is anyones guess :-) The rest of the line is anyones guess :-)
.Bd -literal -offset 4n .Bd -literal -offset 4n
# TEST tests/b00000.vtc starting # 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 opening CLI connection
#### v1 debug| NB: Storage size limited to 2GB on 32 bit architecture,\\n #### 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 #### v1 debug| NB: otherwise we could run out of address space.\\n
......
...@@ -141,13 +141,13 @@ Exclude log entries with the specified tag. ...@@ -141,13 +141,13 @@ Exclude log entries with the specified tag.
The following example displays a continuously updated list of the most The following example displays a continuously updated list of the most
frequently requested URLs: frequently requested URLs:
.Bd -literal .Bd -literal
varnishtop -i RxURL varnishtop \-i RxURL
.Ed .Ed
.Pp .Pp
The following example displays a continuously updated list of the most The following example displays a continuously updated list of the most
commonly used user agents: commonly used user agents:
.Bd -literal .Bd -literal
varnishtop -i RxHeader -C -I \\^User-Agent varnishtop \-i RxHeader \-C \-I \\^User-Agent
.Ed .Ed
.Sh SEE ALSO .Sh SEE ALSO
.Xr varnishd 1 , .Xr varnishd 1 ,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment