X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.service.xml;h=da9079cbb8dfe37aafeae9c534711e7eeb50af0b;hp=b9604b8c265d2ebcd72bdd9eb37a87d0b20a059c;hb=85a8eeee36b57c1ab382b0225fa9a87525bbeee9;hpb=97426dcfca64b2a259d81335da1dab63fe6f51dd
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index b9604b8c2..da9079cbb 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -301,9 +301,7 @@
as. This option is mandatory for
services where
Type= is set to
- , but its use
- is otherwise recommended if the process
- takes a name on the D-Bus bus.
+ .
@@ -593,8 +591,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 +967,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
@@ -1126,40 +1128,6 @@
-
- Compatibility Options
-
- The following options are also available in the
- [Service] section, but exist purely
- for compatibility reasons and should not be used in
- newly written service files.
-
-
-
- SysVStartPriority=
- Set the SysV start
- priority to use to order this service
- in relation to SysV services lacking
- LSB headers. This option is only
- necessary to fix ordering in relation
- to legacy SysV services that have no
- ordering information encoded in the
- script headers. As such, it should only
- be used as a temporary compatibility
- option and should not be used in new unit
- files. Almost always, it is a better
- choice to add explicit ordering
- directives via
- After= or
- Before=,
- instead. For more details, see
- systemd.unit5.
- If used, pass an integer value in the
- range 0-99.
-
-
-
-
Command lines