diff --git a/man/rules/meson.build b/man/rules/meson.build
index 0e6c3d8270..f4b161661a 100644
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@ -737,7 +737,10 @@ manpages = [
['systemd-journald',
'systemd-journald-audit.socket',
'systemd-journald-dev-log.socket',
- 'systemd-journald.socket'],
+ 'systemd-journald-varlink@.socket',
+ 'systemd-journald.socket',
+ 'systemd-journald@.service',
+ 'systemd-journald@.socket'],
''],
['systemd-localed.service', '8', ['systemd-localed'], 'ENABLE_LOCALED'],
['systemd-logind.service', '8', ['systemd-logind'], 'ENABLE_LOGIND'],
diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
index ec9f974f2d..f4ce4e4fe2 100644
--- a/man/systemd-journald.service.xml
+++ b/man/systemd-journald.service.xml
@@ -20,6 +20,9 @@
systemd-journald.socketsystemd-journald-dev-log.socketsystemd-journald-audit.socket
+ systemd-journald@.service
+ systemd-journald@.socket
+ systemd-journald-varlink@.socketsystemd-journaldJournal service
@@ -29,6 +32,9 @@
systemd-journald.socketsystemd-journald-dev-log.socketsystemd-journald-audit.socket
+ systemd-journald@.service
+ systemd-journald@.socket
+ systemd-journald-varlink@.socket/usr/lib/systemd/systemd-journald
@@ -129,6 +135,40 @@ systemd-tmpfiles --create --prefix /var/log/journal
EPIPE right from the beginning.
+
+ Journal Namespaces
+
+ Journal 'namespaces' are both a mechanism for logically isolating the log stream of projects
+ consisting of one or more services from the rest of the system and a mechanism for improving
+ performance. Multiple journal namespaces may exist simultaneously, each defining its own, independent log
+ stream managed by its own instance of systemd-journald. Namespaces are independent of
+ each other, both in the data store and in the IPC interface. By default only a single 'default' namespace
+ exists, managed by systemd-journald.service (and its associated socket
+ units). Additional namespaces are created by starting an instance of the
+ systemd-journald@.service service template. The instance name is the namespace
+ identifier, which is a short string used for referencing the journal namespace. Service units may be
+ assigned to a specific journal namespace through the LogNamespace= unit file setting,
+ see systemd.exec5 for
+ details. The switch of
+ journalctl1 may be
+ used to view the log stream of a specific namespace. If the switch is not used the log stream of the
+ default namespace is shown, i.e. log data from other namespaces is not visible.
+
+ Services associated with a specific log namespace may log via syslog, the native logging protocol
+ of the journal and via stdout/stderr; the logging from all three transports is associated with the
+ namespace.
+
+ By default only the default namespace will collect kernel and audit log messages.
+
+ The systemd-journald instance of the default namespace is configured through
+ /etc/systemd/journald.conf (see below), while the other instances are configured
+ through /etc/systemd/journald@NAMESPACE.conf. The journal
+ log data for the default namespace is placed in
+ /var/log/journal/MACHINE_ID (see below) while the data
+ for the other namespaces is located in
+ /var/log/journal/MACHINE_ID.NAMESPACE.
+
+
Signals
@@ -190,6 +230,9 @@ systemd-tmpfiles --create --prefix /var/log/journal
+
+ Note that these kernel command line options are only honoured by the default namespace, see
+ above.
@@ -279,12 +322,14 @@ systemd-tmpfiles --create --prefix /var/log/journal
/run/systemd/journal/socket/run/systemd/journal/stdout
- Sockets and other paths that
- systemd-journald will listen on that are
- visible in the file system. In addition to these, journald can
- listen for audit events using netlink.
+ Sockets and other file node paths that systemd-journald will
+ listen on and are visible in the file system. In addition to these,
+ systemd-journald can listen for audit events using netlink7.
+
+ If journal namespacing is used these paths are slightly altered to include a namespace identifier, see above.
@@ -296,7 +341,7 @@ systemd-tmpfiles --create --prefix /var/log/journal
systemd.journal-fields7,
sd-journal3,
systemd-coredump8,
- setfacl1,
+ setfacl1,
sd_journal_print3,
pydoc systemd.journal