X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.socket.xml;h=7c10c5858bb813df63b30ca7418edbea13651342;hb=9a7adc9a0ed53d6e422321e9196eb83d18afcba5;hp=1b899c46a1204db9488f5cf9551dd86f1380ab76;hpb=479fe882ae92e4c2eac3c995cd0d23d4c604889f;p=elogind.git
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 1b899c46a..7c10c5858 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -77,9 +77,12 @@
and
commands are executed
in, and in
- systemd.kill5
- which define the way the processes are
- terminated.
+ systemd.kill5,
+ which define the way the processes are terminated, and
+ in
+ systemd.resource-control5,
+ which configure resource control settings for the
+ processes of the socket.
For each socket file a matching service file
(see
@@ -93,7 +96,7 @@
foo.socket needs a matching
service foo.service if
is set. If
- is set a service template
+ is set, a service template
file foo@.service must exist from
which services are instantiated for each incoming
connection.
@@ -161,17 +164,17 @@
family.
If the address starts with an at
- symbol (@) it is read as abstract
+ symbol (@), it is read as abstract
namespace socket in the
AF_UNIX
family. The @ is
replaced with a
NUL character
- before binding. For details see
+ before binding. For details, see
unix7.If the address string is a
- single number it is read as port
+ single number, it is read as port
number to listen on via
IPv6. Depending on the value of
BindIPv6Only= (see below) this
@@ -181,13 +184,13 @@
If the address string is a
- string in the format v.w.x.y:z it is
+ string in the format v.w.x.y:z, it is
read as IPv4 specifier for listening
on an address v.w.x.y on a port
z.If the address string is a
- string in the format [x]:y it is read
+ string in the format [x]:y, it is read
as IPv6 address x on a port y. Note
that this might make the service
available via IPv4, too, depending on
@@ -300,7 +303,7 @@
, they will
be accessible via IPv6 only. If
(which is the
- default, surprise!) the system wide
+ default, surprise!), the system wide
default setting is used, as controlled
by
/proc/sys/net/ipv6/bindv6only,
@@ -327,7 +330,7 @@
BindToDevice=Specifies a network
interface name to bind this socket
- to. If set traffic will only be
+ to. If set, traffic will only be
accepted from the specified network
interfaces. This controls the
SO_BINDTODEVICE socket option (see
@@ -507,7 +510,7 @@
ReusePort=Takes a boolean
- value. If true allows multiple bind()s
+ value. If true, allows multiple bind2s
to this TCP or UDP port. This
controls the SO_REUSEPORT socket
option. See
@@ -676,8 +679,8 @@
Takes a unit-less value in seconds, or
a time span value such as "5min
20s". Pass 0 to disable the timeout
- logic. Defaults to
- 90s.
+ logic. Defaults to TimeoutStartSec= from the
+ manager configuration file.
@@ -709,6 +712,7 @@
systemd.unit5,
systemd.exec5,
systemd.kill5,
+ systemd.resource-control5,
systemd.service5,
systemd.directives7