X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.xml;h=c6c06e57e9fd1ebcc5938ecd2e8eae2199196a53;hp=f434bfcc580bcebc2e33ded102d5a364c8d265c9;hb=b6a7b0890ea7d4625e31fa5f413cc94b13660d91;hpb=f8553ccbb3b774ab39acfc5b4dc1564bb31ef801
diff --git a/man/systemd.xml b/man/systemd.xml
index f434bfcc5..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
@@ -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