X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.xml;h=32bca0b607bd00f34e6a6ad8221d7016d1ebd43c;hb=0b5a519c89b5fb48ec7a3cfbd9c02283ae0f23ac;hp=06d2ecf6f8ae7886894a71f8662bb662e1b5babe;hpb=1ec96668dd0dcb19cc2f7b99cbf73df0d769c97d;p=elogind.git diff --git a/man/systemd.xml b/man/systemd.xml index 06d2ecf6f..32bca0b60 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -294,18 +294,18 @@ systemd.unit5, however some are created automatically from other 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 + 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 + "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 + 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 @@ -1113,16 +1113,11 @@ systemd.setenv= Takes a string - argument in the form - VARIABLE=VALUE. May be used to set - environment variables for the init - process and all its children at boot - time. May be used more than once to - set multiple variables. If the equal - sign and variable are missing it unsets - an environment variable which might be - passed in from the initial ram - disk. + argument in the form VARIABLE=VALUE. + May be used to set default environment + variables to add to forked child processes. + May be used more than once to set multiple + variables.