Skip to content

Commit

Permalink
Fix grammar and style
Browse files Browse the repository at this point in the history
  • Loading branch information
fgsch committed Aug 18, 2017
1 parent 7b0505f commit 8cde66b
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 13 deletions.
28 changes: 16 additions & 12 deletions doc/sphinx/reference/varnishd.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ HTTP accelerator daemon
SYNOPSIS
========

varnishd [-a [name=]address[:port][,PROTO]] [-b host[:port]] [-C] [-d] [-F] [-f config] [-h type[,options]] [-I clifile] [-i identity] [-j jail[,jailoptions]] [-l vsl[,vsm]] [-M address:port] [-n name] [-P file] [-p param=value] [-r param[,param...]] [-S secret-file] [-s [name=]kind[,options]] [-T address[:port]] [-t TTL] [-V] [-W waiter]
varnishd [-a [name=][address][:port][,PROTO]] [-b host[:port]] [-C] [-d] [-F] [-f config] [-h type[,options]] [-I clifile] [-i identity] [-j jail[,jailoptions]] [-l vsl[,vsm]] [-M address:port] [-n name] [-P file] [-p param=value] [-r param[,param...]] [-S secret-file] [-s [name=]kind[,options]] [-T address[:port]] [-t TTL] [-V] [-W waiter]

varnishd [-x parameter|vsl|cli|builtin]

Expand All @@ -36,18 +36,22 @@ OPTIONS
Basic options
-------------

-a <[name=]address[:port][,PROTO]>
-a <[name=][address][:port][,PROTO]>

Listen for client requests on the specified address and port. The
address can be a host name ("localhost"), an IPv4 dotted-quad
("127.0.0.1"), or an IPv6 address enclosed in square brackets
("[::1]"). If address is not specified, `varnishd` will listen on all
available IPv4 and IPv6 interfaces. If port is not specified, port
80 (http) is used. Names are referenced in logs, and when omitted they fall
back to "a0", "a1" etc.
An additional protocol type can be set for the listening socket with PROTO.
Valid protocol types are: HTTP/1 (default), and PROXY.
Multiple listening addresses can be specified by using multiple -a arguments.
("[::1]"). If address is not specified, `varnishd` will listen
on all available IPv4 and IPv6 interfaces. If port is not specified,
port 80 (http) is used. At least one of address or port is required.

Name is referenced in logs. If name is not specified, "a0", "a1",
etc. is used. An additional protocol type can be set for the
listening socket with PROTO. Valid protocol types are: HTTP/1
(default), and PROXY.

Multiple listening addresses can be specified by using different
-a arguments.

-b <host[:port]>

Expand Down Expand Up @@ -173,8 +177,8 @@ Tuning options
Use the specified storage backend. See `Storage Backend`_ section.

This option can be used multiple times to specify multiple storage
files. Names are referenced in logs, VCL, statistics... When omitted
names fall back to "s0", "s1" etc.
files. Name is referenced in logs, VCL, statistics, etc. If name
is not specified, "s0", "s1" and so forth is used.

-l <vsl[,vsm]>

Expand Down Expand Up @@ -293,7 +297,7 @@ The following storage types are available:
Advice tells the kernel how `varnishd` expects to use this mapped
region so that the kernel can choose the appropriate read-ahead
and caching techniques. Possible values are ``normal``, ``random``
and ``sequencial``, corresponding to MADV_NORMAL, MADV_RANDOM and
and ``sequential``, corresponding to MADV_NORMAL, MADV_RANDOM and
MADV_SEQUENTIAL madvise() advice argument, respectively. Defaults to
``random``.

Expand Down
2 changes: 1 addition & 1 deletion doc/sphinx/users-guide/storage-backends.rst
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ device, and depending on use, the seek time.
The 'advice' parameter tells the kernel how `varnishd` expects to
use this mapped region so that the kernel can choose the appropriate
read-ahead and caching techniques. Possible values are ``normal``,
``random`` and ``sequencial``, corresponding to MADV_NORMAL, MADV_RANDOM
``random`` and ``sequential``, corresponding to MADV_NORMAL, MADV_RANDOM
and MADV_SEQUENTIAL madvise() advice argument, respectively. Defaults to
``random``.

Expand Down

0 comments on commit 8cde66b

Please sign in to comment.