X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.service.xml;h=e563b1968bb9e17d6a39fc229124c3513f4c9855;hb=994701548d3ea6aafe3d9c47d51f701878118d65;hp=b9604b8c265d2ebcd72bdd9eb37a87d0b20a059c;hpb=97426dcfca64b2a259d81335da1dab63fe6f51dd;p=elogind.git
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index b9604b8c2..e563b1968 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -593,8 +593,9 @@
(i.e. the "keep-alive ping"). If the time
between two such calls is larger than
the configured time, then the service
- is placed in a failed state. By
- setting Restart= to
+ is placed in a failed state and it will
+ be terminated with SIGABRT.
+ By setting Restart= to
or
, the service
will be automatically restarted. The
@@ -968,21 +969,24 @@
Sockets=Specifies the name of
the socket units this service shall
- inherit the sockets from when the
- service is started. Normally it
- should not be necessary to use this
- setting as all sockets whose unit
+ inherit socket file descriptors
+ from when the service is
+ started. Normally it should not be
+ necessary to use this setting as all
+ socket file descriptors whose unit
shares the same name as the service
- (ignoring the different suffix of course)
- are passed to the spawned
- process.
-
- Note that the same socket may be
- passed to multiple processes at the
- same time. Also note that a different
- service may be activated on incoming
- traffic than that which inherits the
- sockets. Or in other words: the
+ (subject to the different unit name
+ suffix of course) are passed to the
+ spawned process.
+
+ Note that the same socket file
+ descriptors may be passed to multiple
+ processes simultaneously. Also note
+ that a different service may be
+ activated on incoming socket traffic
+ than the one which is ultimately
+ configured to inherit the socket file
+ descriptors. Or in other words: the
Service= setting of
.socket units
does not have to match the inverse of