X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.xml;h=c6c06e57e9fd1ebcc5938ecd2e8eae2199196a53;hb=3686ced6d76d72a7364db4616c14a164f9c1f01e;hp=6aa4f7052706b1f0fd75a0aa2358997312b9cc7b;hpb=248e6030e007b6ee7b31ada6e42053cb1ebfc80d;p=elogind.git
diff --git a/man/systemd.xml b/man/systemd.xml
index 6aa4f7052..c6c06e57e 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -45,7 +45,7 @@
systemdinit
- systemd System and Session Manager
+ systemd System and Service Manager
@@ -60,7 +60,7 @@
Description
- systemd is a system and session manager for
+ systemd is a system and service manager for
Linux operating systems. When run as first process on
boot (as PID 1), it acts as init system that brings
up and maintains userspace services.
@@ -77,7 +77,7 @@
When run as system instance, systemd interprets
the configuration file
system.conf, otherwise
- session.conf. See
+ user.conf. See
systemd.conf5
for more information.
@@ -136,10 +136,10 @@
-
+ Tell systemd to run a
- system instance (resp. session
+ system instance (resp. user
instance), even if the process ID is
not 1 (resp. is 1), i.e. systemd is
not (resp. is) run as init process.
@@ -159,27 +159,36 @@
- Dump core on crash. This switch has no effect when run as session instance.
+ Dump core on
+ crash. This switch has no effect when
+ run as user
+ instance.
- Run shell on crash. This switch has no effect when run as session instance.
+ Run shell on
+ crash. This switch has no effect when
+ run as user
+ instance.
- Ask for confirmation when spawning processes. This switch has no effect when run as session instance.
+ Ask for confirmation
+ when spawning processes. This switch
+ has no effect when run as user
+ instance.Show terse service
status information while booting. This
- switch has no effect when run as
- session instance. Takes a boolean
- argument which may be omitted
- which is interpreted as
+ switch has no effect when run as user
+ instance. Takes a boolean argument
+ which may be omitted which is
+ interpreted as
.
@@ -188,7 +197,7 @@
Controls whether
output of SysV init scripts will be
directed to the console. This switch
- has no effect when run as session
+ has no effect when run as user
instance. Takes a boolean argument
which may be omitted which is
interpreted as
@@ -323,9 +332,9 @@
systemd.timer5.Swap units are very similar to
- mount units and encapsulated memory swap
+ mount units and encapsulate memory swap
partitions or files of the operating
- systemd. They are described in systemd.swap5.
+ system. They are described in systemd.swap5.Path units may be used
to activate other services when file system
@@ -336,7 +345,7 @@
Units are named as their configuration
files. Some units have special semantics. A detailed
- list you may find in
+ list is available in
systemd.special7.systemd knows various kinds of dependencies,
@@ -361,7 +370,7 @@
this.Application programs and units (via
- dependencies) may requests state changes of units. In
+ dependencies) may request state changes of units. In
systemd, these requests are encapsulated as 'jobs' and
maintained in a job queue. Jobs may succeed or can
fail, their execution is ordered based on the ordering
@@ -489,10 +498,10 @@
- Session unit directories
+ User unit directoriesSimilar rules apply
- for the session unit
+ for the user unit
directories. However, here the XDG
Base Directory specification
@@ -500,11 +509,11 @@
units. Applications should place their
unit files in the directory returned
by pkg-config systemd
- --variable=systemdsessionunitdir. Global
+ --variable=systemduserunitdir. Global
configuration is done in the directory
reported by pkg-config
systemd
- --variable=systemdsessionconfdir. The
+ --variable=systemduserconfdir. The
enable and
disable commands of
the
@@ -565,12 +574,12 @@
to systemctl
daemon-reexec.
- systemd session managers will
+ systemd user managers will
start the
exit.target unit
when this signal is received. This is
mostly equivalent to
- systemctl --session start
+ systemctl --user start
exit.target.
@@ -585,7 +594,7 @@
systemctl start
ctl-alt-del.target.
- systemd session managers
+ systemd user managers
treat this signal the same way as
SIGTERM.
@@ -602,7 +611,7 @@
kbrequest.target.
This signal is ignored by
- systemd session
+ systemd user
managers.
@@ -757,7 +766,7 @@
$XDG_DATA_HOME$XDG_DATA_DIRS
- The systemd session
+ The systemd user
manager uses these variables in
accordance to the XDG
@@ -851,8 +860,8 @@
Takes a boolean
argument. If
systemd spawns a shell when it
- crashes. Otherwise no core dump is
- created. Defaults to
+ crashes. Otherwise no shell is
+ spawned. Defaults to
, for security
reasons, as the shell is not protected
by any password