X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.xml;h=06d2ecf6f8ae7886894a71f8662bb662e1b5babe;hb=eb75d0ed059f56f0b5a8dcb8d490fae7063c76ca;hp=c7aed3c6ff06b320cf44ddaa6c56d14ab5d5b626;hpb=6ed80a4e346883b99263a1a13505ef6afcbc09c3;p=elogind.git
diff --git a/man/systemd.xml b/man/systemd.xml
index c7aed3c6f..06d2ecf6f 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -285,25 +285,27 @@
Concepts
systemd provides a dependency system between
- various entities called "units". Units encapsulate
- various objects that are relevant for system boot-up
- and maintenance. The majority of units are configured
- in unit configuration files, whose syntax and basic
- set of options is described in
+ various entities called "units" of 12 different
+ types. Units encapsulate various objects that are
+ relevant for system boot-up and maintenance. The
+ majority of units are configured in unit configuration
+ files, whose syntax and basic set of options is
+ described in
systemd.unit5,
however some are created automatically from other
- configuration or dynamically from system state. Units
- may be 'active' (meaning started, bound, plugged in,
- ... depending on the unit type, see below), or
- 'inactive' (meaning stopped, unbound, unplugged, ...),
- as well as in the process of being activated or
- deactivated, i.e. between the two states (these states
- are called 'activating', 'deactivating'). A special
- 'failed' state is available as well which is very
- similar to 'inactive' and is entered when the service
- failed in some way (process returned error code on
- exit, or crashed, or an operation timed out). If this
- state is entered the cause will be logged, for later
+ configuration, dynamically from system state or
+ programmatically at runtime. Units may be 'active'
+ (meaning started, bound, plugged in, ... depending on
+ the unit type, see below), or 'inactive' (meaning
+ stopped, unbound, unplugged, ...), as well as in the
+ process of being activated or deactivated,
+ i.e. between the two states (these states are called
+ 'activating', 'deactivating'). A special 'failed'
+ state is available as well which is very similar to
+ 'inactive' and is entered when the service failed in
+ some way (process returned error code on exit, or
+ crashed, or an operation timed out). If this state is
+ entered the cause will be logged, for later
reference. Note that the various unit types may have a
number of additional substates, which are mapped to
the five generalized unit states described
@@ -312,7 +314,7 @@
The following unit types are available:
- Service units, which control
+ Service units, which start and control
daemons and the processes they consist of. For
details see
systemd.service5.
@@ -369,6 +371,18 @@
objects change or are modified. See
systemd.path5.
+ Slice units may be used to
+ group units which manage system processes
+ (such as service and scope units) in a
+ hierachial tree for resource management
+ purposes. See
+ systemd.slice5.
+
+ Scope units are similar to
+ service units, but manage foreign processes
+ instead of starting them as well. See
+ systemd.scope5.
+
Units are named as their configuration