New upstream version 234

2025-05-24 11:02:45 +00:00 · 2017-07-12 21:26:31 +02:00 · 2017-07-12 21:26:31 +02:00 · 81c583552e
commit 81c583552e
parent 2897b34385
636 changed files with 28891 additions and 6307 deletions
--- a/.dir-locals.el
+++ b/.dir-locals.el
@ -20,4 +20,8 @@
            (eval . (c-set-offset 'arglist-intro '++))
            (eval . (c-set-offset 'arglist-close 0))))
 (nxml-mode . ((nxml-child-indent . 2)
-               (fill-column . 119))))
+               (fill-column . 119)))
 (meson-mode . ((meson-indent-basic . 8)))
 (sh-mode . ((sh-basic-offset . 8)
             (sh-indentation . 8)))
 (awk-mode . ((c-basic-offset . 8))))
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@ -4,13 +4,23 @@ We welcome contributions from everyone. However, please follow the following gui
 ## Filing Issues
-* We use GitHub Issues **exclusively** for tracking **bugs** and **feature** **requests** of systemd. If you are looking for help, please contact our [mailing list](http://lists.freedesktop.org/mailman/listinfo/systemd-devel) instead.
+* We use GitHub Issues **exclusively** for tracking **bugs** and **feature** **requests** of systemd. If you are looking for help, please contact our [mailing list](https://lists.freedesktop.org/mailman/listinfo/systemd-devel) instead.
 * We only track bugs in the **two** **most** **recently** **released** **versions** of systemd in the GitHub Issue tracker. If you are using an older version of systemd, please contact your distribution's bug tracker instead.
 * When filing an issue, specify the **systemd** **version** you are experiencing the issue with. Also, indicate which **distribution** you are using.
 * Please include an explanation how to reproduce the issue you are pointing out.
 Following these guidelines makes it easier for us to process your issue, and ensures we won't close your issue right-away for being misfiled.
 ### Older downstream versions
 For older versions that are still supported by your distribution please use respective downstream tracker:
 * **Fedora** - [bugzilla](https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=systemd)
 * **RHEL-7/CentOS-7** - [bugzilla](https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%207&component=systemd) or [systemd-rhel github](https://github.com/lnykryn/systemd-rhel/issues)
 * **Debian** - [bugs.debian.org](https://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=systemd)
 ## Security vulnerability reports
 If you discover a security vulnerability, we'd appreciate a non-public disclosure. The issue tracker and mailing list listed above are fully public. If you need to reach systemd developers in a non-public way, report the issue in one of the "big" distributions using systemd: [Fedora](https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=systemd) (be sure to check "Security Sensitive Bug" under "Show Advanced Fields"), [Ubuntu](https://launchpad.net/ubuntu/+source/systemd/+filebug) (be sure to change "This bug contains information that is" from "Public" to "Private Security"), or [Debian](mailto:security@debian.org). Various systemd developers are active distribution maintainers and will propagate the information about the bug to other parties.
 ## Posting Pull Requests
 * Make sure to post PRs only relative to a very recent git master.
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@ -1,15 +1,18 @@
 ### Submission type
-  - [ ] Bug report
+<!-- Delete the inappropriate option below: -->
  - [ ] Request for enhancement (RFE)
-*NOTE: Do not submit anything other than bug reports or RFEs via the issue tracker!*
+ - Bug report
 - Request for enhancement (RFE)
 <!-- **NOTE:** Do not submit anything other than bug reports or RFEs via the issue tracker! -->
 ### systemd version the issue has been seen with
 > …
-*NOTE: Do not submit bug reports about anything but the two most recently released systemd versions upstream!*
+<!-- **NOTE:** Do not submit bug reports about anything but the two most recently released systemd versions upstream! -->
 <!-- For older version please use distribution trackers (see https://github.com/systemd/systemd/blob/master/.github/CONTRIBUTING.md#filing-issues). -->
 ### Used distribution
--- a/.gitignore
+++ b/.gitignore
@ -28,7 +28,7 @@
 /TAGS
 /ata_id
 /bootctl
-/build-aux
+/build*
 /busctl
 /cdrom_id
 /collect
@ -160,6 +160,8 @@
 /test-bus-server
 /test-bus-signature
 /test-bus-track
 /test-bus-vtable
 /test-bus-vtable-cc
 /test-bus-zero-copy
 /test-calendarspec
 /test-cap-list
@ -265,13 +267,16 @@
 /test-process-util
 /test-pty
 /test-qcow2
 /test-random-util
 /test-ratelimit
 /test-replace-var
 /test-resolve
 /test-resolve-tables
 /test-resolved-packet
 /test-ring
 /test-rlimit-util
 /test-sched-prio
 /test-sd-dhcp-lease
 /test-seccomp
 /test-selinux
 /test-set
@ -290,6 +295,7 @@
 /test-tables
 /test-terminal-util
 /test-time
 /test-timesync
 /test-tmpfiles
 /test-udev
 /test-uid-range
--- a/.mailmap
+++ b/.mailmap
@ -102,3 +102,24 @@ Paolo Giangrandi <paolo@luccalug.it>
 Karl Kraus <karl.kraus@tum.de> <laqueray@gmail.com>
 Tibor Nagy <xnagytibor@gmail.com>
 Stuart McLaren <stuart.mclaren@hp.com>
 John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
 John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> <glaubitz@suse.com>
 Sjoerd Simons <sjoerd.simons@collabora.co.uk>
 Neil Brown <neil@brown.name>
 Michal Suchanek <msuchanek@suse.de> <hramrach@gmail.com>
 Michal Suchanek <msuchanek@suse.de>
 Bastien Nocera <hadess@hadess.net> <hadess@users.noreply.github.com>
 Umut Tezduyar Lindskog <umut@tezduyar.com>
 Alexander Kurtz <alexander@kurtz.be>
 Piotr Szydełko <wiertel@users.sourceforge.net>
 Łukasz Stelmach <l.stelmach@samsung.com> <stlman@poczta.fm>
 Krzysztof Jackiewicz <k.jackiewicz@samsung.com> <kjackiewicz@users.noreply.github.com>
 Marcus Cooper <marcusc@axis.com> <codekipper@gmail.com>
 Insun Pyo <insun.pyo@samsung.com> <iplayinsun@gmail.com>
 Ted Wood <ted.l.wood@gmail.com>
 Ted Wood <ted@mailchimp.com>
 Anthony Parsons <flussence@users.noreply.github.com>
 Federico Di Pierro <nierro92@gmail.com>
 Josef Andersson <josef.andersson@fripost.org>
 Josef Andersson <l10nl18nsweja@gmail.com>
 Hendrik Westerberg <hendrik@gestorf.com>
--- a/.mkosi/mkosi.arch
+++ b/.mkosi/mkosi.arch
@ -32,8 +32,6 @@ RootSize=2G
 Cache=/var/cache/pacman/pkg/
 BuildPackages=
        acl
        autoconf
        automake
        bzip2
        cryptsetup
        curl
@ -50,7 +48,7 @@ BuildPackages=
        kmod
        libcap
        libgcrypt
-        libidn
+        libidn2
        libmicrohttpd
        libseccomp
        libtool
@ -58,10 +56,13 @@ BuildPackages=
        libxkbcommon
        libxslt
        lz4
-        make
+        meson
        pam
        pkgconfig
        python
        python-lxml
        qrencode
        xz
 Packages=
        libidn2
--- a/.mkosi/mkosi.debian
+++ b/.mkosi/mkosi.debian
@ -32,9 +32,6 @@ RootSize=2G
 [Packages]
 BuildPackages=
        acl
        autoconf
        automake
        diffutils
        docbook-xml
        docbook-xsl
        gcc
@ -55,7 +52,7 @@ BuildPackages=
        libfdisk-dev
        libgcrypt20-dev
        libgnutls28-dev
-        libidn11-dev
+        libidn2-0-dev
        libkmod-dev
        liblzma-dev
        liblz4-dev
@ -68,7 +65,7 @@ BuildPackages=
        libsmartcols-dev
        libtool
        libxkbcommon-dev
-        make
+        meson
        pkg-config
        python3
        python3-lxml
@ -80,3 +77,4 @@ BuildPackages=
 Packages=
        libqrencode3
        locales
        libidn2-0
--- a/.mkosi/mkosi.fedora
+++ b/.mkosi/mkosi.fedora
@ -20,7 +20,7 @@
 [Distribution]
 Distribution=fedora
-Release=25
+Release=26
 [Output]
 Format=raw_btrfs
@ -32,8 +32,6 @@ RootSize=3G
 [Packages]
 BuildPackages=
        audit-libs-devel
        autoconf
        automake
        bzip2-devel
        cryptsetup-devel
        dbus-devel
@ -54,7 +52,7 @@ BuildPackages=
        libcap-devel
        libcurl-devel
        libgcrypt-devel
-        libidn-devel
+        libidn2-devel
        libmicrohttpd-devel
        libmount-devel
        libseccomp-devel
@ -62,8 +60,9 @@ BuildPackages=
        libtool
        libxkbcommon-devel
        libxslt
        lz4
        lz4-devel
-        make
+        meson
        pam-devel
        pkgconfig
        python3-devel
@ -71,3 +70,6 @@ BuildPackages=
        qrencode-devel
        tree
        xz-devel
 Packages=
        libidn2
--- a/2
+++ b/2
@ -30,7 +30,7 @@ systemd-nspawn or in an UEFI-capable VM:
 or:
-        # qemu-kvm -m 512 -smp 2 -bios /usr/share/edk2/ovmf/OVMF_CODE.fd -hda image.raw
+        # qemu-system-x86_64 -enable-kvm -m 512 -smp 2 -bios /usr/share/edk2/ovmf/OVMF_CODE.fd -hda image.raw
 Every time you rerun the "mkosi" command a fresh image is built, incorporating
 all current changes you made to the project tree.
--- a/Makefile-man.am
+++ b/Makefile-man.am
@ -11,7 +11,6 @@ MANPAGES += \
 	man/bootup.7 \
 	man/busctl.1 \
 	man/daemon.7 \
 	man/environment.d.5 \
 	man/file-hierarchy.7 \
 	man/halt.8 \
 	man/hostname.5 \
@ -24,7 +23,6 @@ MANPAGES += \
 	man/localtime.5 \
 	man/machine-id.5 \
 	man/machine-info.5 \
 	man/nss-systemd.8 \
 	man/os-release.5 \
 	man/sd-bus-errors.3 \
 	man/sd-bus.3 \
@ -111,15 +109,12 @@ MANPAGES += \
 	man/systemd-debug-generator.8 \
 	man/systemd-delta.1 \
 	man/systemd-detect-virt.1 \
 	man/systemd-environment-d-generator.8 \
 	man/systemd-escape.1 \
 	man/systemd-fsck@.service.8 \
 	man/systemd-fstab-generator.8 \
 	man/systemd-getty-generator.8 \
 	man/systemd-gpt-auto-generator.8 \
 	man/systemd-halt.service.8 \
 	man/systemd-hibernate-resume-generator.8 \
 	man/systemd-hibernate-resume@.service.8 \
 	man/systemd-inhibit.1 \
 	man/systemd-initctl.service.8 \
 	man/systemd-journald.service.8 \
@ -130,7 +125,6 @@ MANPAGES += \
 	man/systemd-nspawn.1 \
 	man/systemd-path.1 \
 	man/systemd-remount-fs.service.8 \
 	man/systemd-resolve.1 \
 	man/systemd-run.1 \
 	man/systemd-sleep.conf.5 \
 	man/systemd-socket-activate.1 \
@ -148,7 +142,6 @@ MANPAGES += \
 	man/systemd.1 \
 	man/systemd.automount.5 \
 	man/systemd.device.5 \
 	man/systemd.environment-generator.7 \
 	man/systemd.exec.5 \
 	man/systemd.generator.7 \
 	man/systemd.journal-fields.7 \
@ -187,7 +180,6 @@ MANPAGES += \
 	man/udev_new.3 \
 	man/udevadm.8
 MANPAGES_ALIAS += \
 	man/30-systemd-environment-d-generator.8 \
 	man/SD_ALERT.3 \
 	man/SD_BUS_ERROR_ACCESS_DENIED.3 \
 	man/SD_BUS_ERROR_ADDRESS_IN_USE.3 \
@ -266,7 +258,6 @@ MANPAGES_ALIAS += \
 	man/SD_WARNING.3 \
 	man/init.1 \
 	man/journald.conf.d.5 \
 	man/libnss_systemd.so.2.8 \
 	man/poweroff.8 \
 	man/reboot.8 \
 	man/sd_bus_creds_get_audit_login_uid.3 \
@ -326,6 +317,7 @@ MANPAGES_ALIAS += \
 	man/sd_bus_message_append_array_space.3 \
 	man/sd_bus_message_append_string_iovec.3 \
 	man/sd_bus_message_append_string_space.3 \
 	man/sd_bus_message_appendv.3 \
 	man/sd_bus_message_get_realtime_usec.3 \
 	man/sd_bus_message_get_reply_cookie.3 \
 	man/sd_bus_message_get_seqnum.3 \
@ -462,7 +454,6 @@ MANPAGES_ALIAS += \
 	man/systemd-ask-password-wall.service.8 \
 	man/systemd-fsck-root.service.8 \
 	man/systemd-fsck.8 \
 	man/systemd-hibernate-resume.8 \
 	man/systemd-hibernate.service.8 \
 	man/systemd-hybrid-sleep.service.8 \
 	man/systemd-initctl.8 \
@ -546,7 +537,6 @@ MANPAGES_ALIAS += \
 	man/udev_ref.3 \
 	man/udev_unref.3 \
 	man/user.conf.d.5
 man/30-systemd-environment-d-generator.8: man/systemd-environment-d-generator.8
 man/SD_ALERT.3: man/sd-daemon.3
 man/SD_BUS_ERROR_ACCESS_DENIED.3: man/sd-bus-errors.3
 man/SD_BUS_ERROR_ADDRESS_IN_USE.3: man/sd-bus-errors.3
@ -625,7 +615,6 @@ man/SD_NOTICE.3: man/sd-daemon.3
 man/SD_WARNING.3: man/sd-daemon.3
 man/init.1: man/systemd.1
 man/journald.conf.d.5: man/journald.conf.5
 man/libnss_systemd.so.2.8: man/nss-systemd.8
 man/poweroff.8: man/halt.8
 man/reboot.8: man/halt.8
 man/sd_bus_creds_get_audit_login_uid.3: man/sd_bus_creds_get_pid.3
@ -685,6 +674,7 @@ man/sd_bus_message_append_array_memfd.3: man/sd_bus_message_append_array.3
 man/sd_bus_message_append_array_space.3: man/sd_bus_message_append_array.3
 man/sd_bus_message_append_string_iovec.3: man/sd_bus_message_append_string_memfd.3
 man/sd_bus_message_append_string_space.3: man/sd_bus_message_append_string_memfd.3
 man/sd_bus_message_appendv.3: man/sd_bus_message_append.3
 man/sd_bus_message_get_realtime_usec.3: man/sd_bus_message_get_monotonic_usec.3
 man/sd_bus_message_get_reply_cookie.3: man/sd_bus_message_get_cookie.3
 man/sd_bus_message_get_seqnum.3: man/sd_bus_message_get_monotonic_usec.3
@ -821,7 +811,6 @@ man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8
 man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.8
 man/systemd-fsck-root.service.8: man/systemd-fsck@.service.8
 man/systemd-fsck.8: man/systemd-fsck@.service.8
 man/systemd-hibernate-resume.8: man/systemd-hibernate-resume@.service.8
 man/systemd-hibernate.service.8: man/systemd-suspend.service.8
 man/systemd-hybrid-sleep.service.8: man/systemd-suspend.service.8
 man/systemd-initctl.8: man/systemd-initctl.service.8
@ -905,9 +894,6 @@ man/udev_monitor_unref.3: man/udev_monitor_new_from_netlink.3
 man/udev_ref.3: man/udev_new.3
 man/udev_unref.3: man/udev_new.3
 man/user.conf.d.5: man/systemd-system.conf.5
 man/30-systemd-environment-d-generator.html: man/systemd-environment-d-generator.html
 	$(html-alias)
 man/SD_ALERT.html: man/sd-daemon.html
 	$(html-alias)
@ -1142,9 +1128,6 @@ man/init.html: man/systemd.html
 man/journald.conf.d.html: man/journald.conf.html
 	$(html-alias)
 man/libnss_systemd.so.2.html: man/nss-systemd.html
 	$(html-alias)
 man/poweroff.html: man/halt.html
 	$(html-alias)
@ -1322,6 +1305,9 @@ man/sd_bus_message_append_string_iovec.html: man/sd_bus_message_append_string_me
 man/sd_bus_message_append_string_space.html: man/sd_bus_message_append_string_memfd.html
 	$(html-alias)
 man/sd_bus_message_appendv.html: man/sd_bus_message_append.html
 	$(html-alias)
 man/sd_bus_message_get_realtime_usec.html: man/sd_bus_message_get_monotonic_usec.html
 	$(html-alias)
@ -1730,9 +1716,6 @@ man/systemd-fsck-root.service.html: man/systemd-fsck@.service.html
 man/systemd-fsck.html: man/systemd-fsck@.service.html
 	$(html-alias)
 man/systemd-hibernate-resume.html: man/systemd-hibernate-resume@.service.html
 	$(html-alias)
 man/systemd-hibernate.service.html: man/systemd-suspend.service.html
 	$(html-alias)
@ -2038,6 +2021,19 @@ MANPAGES_ALIAS += \
 endif
 if ENABLE_ENVIRONMENT_D
 MANPAGES += \
 	man/environment.d.5 \
 	man/systemd-environment-d-generator.8 \
 	man/systemd.environment-generator.7
 MANPAGES_ALIAS += \
 	man/30-systemd-environment-d-generator.8
 man/30-systemd-environment-d-generator.8: man/systemd-environment-d-generator.8
 man/30-systemd-environment-d-generator.html: man/systemd-environment-d-generator.html
 	$(html-alias)
 endif
 if ENABLE_FIRSTBOOT
 MANPAGES += \
 	man/systemd-firstboot.1
@ -2049,6 +2045,18 @@ man/systemd-firstboot.service.html: man/systemd-firstboot.html
 endif
 if ENABLE_HIBERNATE
 MANPAGES += \
 	man/systemd-hibernate-resume-generator.8 \
 	man/systemd-hibernate-resume@.service.8
 MANPAGES_ALIAS += \
 	man/systemd-hibernate-resume.8
 man/systemd-hibernate-resume.8: man/systemd-hibernate-resume@.service.8
 man/systemd-hibernate-resume.html: man/systemd-hibernate-resume@.service.html
 	$(html-alias)
 endif
 if ENABLE_HOSTNAMED
 MANPAGES += \
 	man/hostnamectl.1 \
@ -2156,6 +2164,17 @@ man/systemd-networkd.html: man/systemd-networkd.service.html
 endif
 if ENABLE_NSS_SYSTEMD
 MANPAGES += \
 	man/nss-systemd.8
 MANPAGES_ALIAS += \
 	man/libnss_systemd.so.2.8
 man/libnss_systemd.so.2.8: man/nss-systemd.8
 man/libnss_systemd.so.2.html: man/nss-systemd.html
 	$(html-alias)
 endif
 if ENABLE_QUOTACHECK
 MANPAGES += \
 	man/systemd-quotacheck.service.8
@ -2183,6 +2202,7 @@ MANPAGES += \
 	man/dnssec-trust-anchors.d.5 \
 	man/nss-resolve.8 \
 	man/resolved.conf.5 \
 	man/systemd-resolve.1 \
 	man/systemd-resolved.service.8
 MANPAGES_ALIAS += \
 	man/libnss_resolve.so.2.8 \
--- a/Makefile.am
+++ b/Makefile.am
@ -42,9 +42,9 @@ LIBUDEV_CURRENT=7
 LIBUDEV_REVISION=6
 LIBUDEV_AGE=6
-LIBSYSTEMD_CURRENT=18
+LIBSYSTEMD_CURRENT=19
 LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=18
+LIBSYSTEMD_AGE=19
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@ -59,7 +59,7 @@ polkitrulesdir=$(datadir)/polkit-1/rules.d
 polkitpkladir=$(localstatedir)/lib/polkit-1/localauthority/10-vendor.d
 bashcompletiondir=@bashcompletiondir@
 zshcompletiondir=@zshcompletiondir@
-rpmmacrosdir=$(prefix)/lib/rpm/macros.d
+rpmmacrosdir=@rpmmacrosdir@
 sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
 sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
 varlogdir=$(localstatedir)/log
@ -178,6 +178,7 @@ CLEANFILES = $(BUILT_SOURCES) \
 	$(pkgconfiglib_DATA) \
 	$(nodist_bashcompletion_data) \
 	$(nodist_zshcompletion_data) \
 	$(nodist_rpmmacros_DATA) \
 	$(in_files:.in=) $(in_in_files:.in.in=) \
 	$(m4_files:.m4=)
@ -268,8 +269,10 @@ INSTALL_DIRS =
 SHUTDOWN_TARGET_WANTS =
 LOCAL_FS_TARGET_WANTS =
 REMOTE_FS_TARGET_WANTS =
 MULTI_USER_TARGET_WANTS =
 GRAPHICAL_TARGET_WANTS =
 MACHINES_TARGET_WANTS =
 RESCUE_TARGET_WANTS =
 SYSINIT_TARGET_WANTS =
 SOCKETS_TARGET_WANTS =
@ -286,6 +289,8 @@ GENERAL_ALIASES =
 install-target-wants-hook:
 	what="$(SHUTDOWN_TARGET_WANTS)" && wants=shutdown.target && dir=$(systemunitdir) && $(add-wants)
 	what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && dir=$(systemunitdir) && $(add-wants)
 	what="$(REMOTE_FS_TARGET_WANTS)" && wants=remote-fs.target && dir=$(systemunitdir) && $(add-wants)
 	what="$(MACHINES_TARGET_WANTS)" && wants=machines.target && dir=$(systemunitdir) && $(add-wants)
 	what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && dir=$(systemunitdir) && $(add-wants)
 	what="$(GRAPHICAL_TARGET_WANTS)" && wants=graphical.target && dir=$(systemunitdir) && $(add-wants)
 	what="$(RESCUE_TARGET_WANTS)" && wants=rescue.target && dir=$(systemunitdir) && $(add-wants)
@ -442,6 +447,12 @@ userenvgenerator_PROGRAMS = \
 	30-systemd-environment-d-generator
 endif
 rootlibexec_SCRIPTS = \
 	src/sulogin-shell/systemd-sulogin-shell
 EXTRA_DIST += \
 	src/sulogin-shell/systemd-sulogin-shell.in
 dist_bashcompletion_data = \
 	shell-completion/bash/busctl \
 	shell-completion/bash/journalctl \
@ -532,7 +543,6 @@ dist_systemunit_DATA = \
 	units/sys-kernel-debug.mount \
 	units/sys-fs-fuse-connections.mount \
 	units/tmp.mount \
 	units/var-lib-machines.mount \
 	units/printer.target \
 	units/sound.target \
 	units/bluetooth.target \
@ -650,7 +660,7 @@ EXTRA_DIST += \
 	units/initrd-switch-root.service.in \
 	units/systemd-nspawn@.service.in \
 	units/systemd-update-done.service.in \
-    units/tmp.mount.m4
+	units/tmp.mount.m4
 if HAVE_SYSV_COMPAT
 nodist_systemunit_DATA += \
@ -677,8 +687,6 @@ dist_doc_DATA = \
 	LICENSE.LGPL2.1 \
 	LICENSE.GPL2 \
 	DISTRO_PORTING \
 	src/libsystemd/sd-bus/PORTING-DBUS1 \
 	src/libsystemd/sd-bus/DIFFERENCES \
 	src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
 EXTRA_DIST += \
@ -744,9 +752,11 @@ man/index.html: man/systemd.index.html
 	$(AM_V_LN)$(LN_S) -f systemd.index.html $@
 if HAVE_PYTHON
 if ENABLE_MANPAGES
 noinst_DATA += \
 	man/index.html
 endif
 endif
 CLEANFILES += \
 	man/index.html
@ -1005,8 +1015,7 @@ libbasic_la_CFLAGS = \
 libbasic_la_LIBADD = \
 	$(SELINUX_LIBS) \
 	$(CAP_LIBS) \
-	-lrt \
+	-lrt
 	-lm
 # -----------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@ -1017,7 +1026,9 @@ libshared_la_SOURCES = \
 	src/shared/output-mode.c \
 	src/shared/gpt.h \
 	src/shared/udev-util.h \
 	src/shared/udev-util.c \
 	src/shared/linux/auto_dev-ioctl.h \
 	src/shared/linux-3.13/dm-ioctl.h \
 	src/shared/initreq.h \
 	src/shared/dns-domain.c \
 	src/shared/dns-domain.h \
@ -1130,6 +1141,7 @@ libshared_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(ACL_CFLAGS) \
 	$(LIBIDN_CFLAGS) \
 	$(LIBIDN2_CFLAGS) \
 	$(SECCOMP_CFLAGS) \
 	$(BLKID_CFLAGS) \
 	$(LIBCRYPTSETUP_CFLAGS)
@ -1141,6 +1153,7 @@ libshared_la_LIBADD = \
 	libudev-internal.la \
 	$(ACL_LIBS) \
 	$(LIBIDN_LIBS) \
 	$(LIBIDN2_LIBS) \
 	$(SECCOMP_LIBS) \
 	$(BLKID_LIBS) \
 	$(LIBCRYPTSETUP_LIBS)
@ -1164,6 +1177,7 @@ libsystemd_shared_la_CFLAGS = \
 	$(libudev_internal_la_CFLAGS) \
 	$(ACL_CFLAGS) \
 	$(LIBIDN_CFLAGS) \
 	$(LIBIDN2_CFLAGS) \
 	$(SECCOMP_CFLAGS) \
 	$(BLKID_CFLAGS) \
 	$(LIBCRYPTSETUP_CFLAGS) \
@ -1178,6 +1192,7 @@ libsystemd_shared_la_LIBADD = \
 	$(libudev_internal_la_LIBADD) \
 	$(ACL_LIBS) \
 	$(LIBIDN_LIBS) \
 	$(LIBIDN2_LIBS) \
 	$(SECCOMP_LIBS) \
 	$(BLKID_LIBS) \
 	$(LIBCRYPTSETUP_LIBS)
@ -1498,8 +1513,10 @@ polkitpolicy_in_in_files += \
 pkgconfigdata_DATA += \
 	src/core/systemd.pc
 if ENABLE_RPM_MACROS
 nodist_rpmmacros_DATA = \
 	src/core/macros.systemd
 endif
 BUILT_SOURCES += \
 	src/core/triggers.systemd
@ -1607,6 +1624,7 @@ tests += \
 	test-conf-parser \
 	test-capability \
 	test-async \
 	test-random-util \
 	test-ratelimit \
 	test-condition \
 	test-uid-range \
@ -1723,6 +1741,7 @@ TEST_DATA_FILES += \
 	test/test-execute/exec-readonlypaths-mount-propagation.service \
 	test/test-execute/exec-readwritepaths-mount-propagation.service \
 	test/test-execute/exec-inaccessiblepaths-mount-propagation.service \
 	test/test-execute/exec-inaccessiblepaths-proc.service \
 	test/test-execute/exec-spec-interpolation.service \
 	test/test-execute/exec-systemcallerrornumber.service \
 	test/test-execute/exec-systemcallfilter-failing2.service \
@ -1927,6 +1946,12 @@ test_fstab_util_SOURCES = \
 test_fstab_util_LDADD = \
 	libsystemd-shared.la
 test_random_util_SOURCES = \
 	src/test/test-random-util.c
 test_random_util_LDADD = \
 	libsystemd-shared.la
 test_ratelimit_SOURCES = \
 	src/test/test-ratelimit.c
@ -2130,6 +2155,10 @@ test_acl_util_LDADD = \
 test_seccomp_SOURCES = \
 	src/test/test-seccomp.c
 test_seccomp_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(SECCOMP_CFLAGS)
 test_seccomp_LDADD = \
 	libsystemd-shared.la \
 	$(SECCOMP_LIBS)
@ -2175,9 +2204,6 @@ test_selinux_LDADD = \
 test_sizeof_SOURCES = \
 	src/test/test-sizeof.c
 test_sizeof_LDADD = \
 	libsystemd-shared.la
 BUILT_SOURCES += \
 	src/test/test-hashmap-ordered.c
@ -2429,6 +2455,7 @@ test_execute_SOURCES = \
 test_execute_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(SECCOMP_CFLAGS) \
 	$(MOUNT_CFLAGS)
 test_execute_LDADD = \
@ -2659,13 +2686,13 @@ nodist_systemunit_DATA += \
 nodist_tmpfiles_DATA = \
 	tmpfiles.d/systemd.conf \
 	tmpfiles.d/var.conf \
 	tmpfiles.d/etc.conf
 dist_tmpfiles_DATA = \
 	tmpfiles.d/systemd-nologin.conf \
 	tmpfiles.d/tmp.conf \
 	tmpfiles.d/x11.conf \
 	tmpfiles.d/var.conf \
 	tmpfiles.d/home.conf \
 	tmpfiles.d/systemd-nspawn.conf \
 	tmpfiles.d/journal-nocow.conf
@ -2675,6 +2702,11 @@ dist_tmpfiles_DATA += \
 	tmpfiles.d/legacy.conf
 endif
 if HAVE_REMOTE
 nodist_tmpfiles_DATA += \
 	tmpfiles.d/systemd-remote.conf
 endif
 SYSINIT_TARGET_WANTS += \
 	systemd-tmpfiles-setup-dev.service \
 	systemd-tmpfiles-setup.service
@ -2692,7 +2724,9 @@ endif
 EXTRA_DIST += \
 	tmpfiles.d/systemd.conf.m4 \
 	tmpfiles.d/systemd-remote.conf.m4 \
 	tmpfiles.d/etc.conf.m4 \
 	tmpfiles.d/var.conf.m4 \
 	units/systemd-tmpfiles-setup-dev.service.in \
 	units/systemd-tmpfiles-setup.service.in \
 	units/systemd-tmpfiles-clean.service.in
@ -2812,9 +2846,6 @@ systemd_detect_virt_SOURCES = \
 systemd_detect_virt_LDADD = \
 	libsystemd-shared.la
 INSTALL_EXEC_HOOKS += \
 	systemd-detect-virt-install-hook
 # ------------------------------------------------------------------------------
 systemd_delta_SOURCES = \
 	src/delta/delta.c
@ -2978,28 +3009,37 @@ if ARCH_AARCH64
 efi_ldflags += --defsym=EFI_SUBSYSTEM=0xa
 EFI_FORMAT = -O binary
 else
 if ARCH_ARM
 efi_ldflags += --defsym=EFI_SUBSYSTEM=0xa
 EFI_FORMAT = -O binary
 else
 EFI_FORMAT = --target=efi-app-$(EFI_ARCH)
 endif
 endif
 endif
 endif
 # ------------------------------------------------------------------------------
-systemd_boot_headers = \
+efi_headers = \
 	src/boot/efi/util.h \
 	src/boot/efi/console.h \
 	src/boot/efi/disk.h \
 	src/boot/efi/graphics.h \
-	src/boot/efi/pefile.h \
+	src/boot/efi/linux.h \
 	src/boot/efi/measure.h \
-	src/boot/efi/disk.h
+	src/boot/efi/pe.h \
 	src/boot/efi/splash.h \
 	src/boot/efi/util.h \
 	src/boot/efi/shim.h
 systemd_boot_sources = \
-	src/boot/efi/util.c \
+	src/boot/efi/boot.c \
 	src/boot/efi/console.c \
 	src/boot/efi/graphics.c \
 	src/boot/efi/pefile.c \
 	src/boot/efi/disk.c \
 	src/boot/efi/graphics.c \
 	src/boot/efi/measure.c \
-	src/boot/efi/boot.c
+	src/boot/efi/pe.c \
 	src/boot/efi/util.c \
 	src/boot/efi/shim.c
 EXTRA_DIST += $(systemd_boot_sources) $(systemd_boot_headers)
@ -3011,7 +3051,7 @@ if ENABLE_EFI
 if HAVE_GNUEFI
 bootlib_DATA = $(systemd_boot)
-$(top_builddir)/src/boot/efi/%.o: $(top_srcdir)/src/boot/efi/%.c $(addprefix $(top_srcdir)/,$(systemd_boot_headers))
+$(top_builddir)/src/boot/efi/%.o: $(top_srcdir)/src/boot/efi/%.c $(addprefix $(top_srcdir)/,$(efi_headers))
 	@$(MKDIR_P) $(top_builddir)/src/boot/efi/
 	$(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@
@ -3029,24 +3069,15 @@ endif
 CLEANFILES += $(systemd_boot_objects) $(systemd_boot_solib) $(systemd_boot)
 # ------------------------------------------------------------------------------
 stub_headers = \
 	src/boot/efi/util.h \
 	src/boot/efi/pefile.h \
 	src/boot/efi/disk.h \
 	src/boot/efi/graphics.h \
 	src/boot/efi/splash.h \
 	src/boot/efi/measure.h \
 	src/boot/efi/linux.h
 stub_sources = \
 	src/boot/efi/util.c \
 	src/boot/efi/pefile.c \
 	src/boot/efi/disk.c \
 	src/boot/efi/graphics.c \
 	src/boot/efi/splash.c \
 	src/boot/efi/linux.c \
 	src/boot/efi/measure.c \
-	src/boot/efi/stub.c
+	src/boot/efi/pe.c \
 	src/boot/efi/splash.c \
 	src/boot/efi/stub.c \
 	src/boot/efi/util.c
 EXTRA_DIST += \
 	$(stub_sources) \
@ -3061,10 +3092,6 @@ if ENABLE_EFI
 if HAVE_GNUEFI
 bootlib_DATA += $(stub)
 $(top_builddir)/src/boot/efi/%.o: $(top_srcdir)/src/boot/efi/%.c $(addprefix $(top_srcdir)/,$(stub_headers))
 	@$(MKDIR_P) $(top_builddir)/src/boot/efi/
 	$(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@
 $(stub_solib): $(stub_objects)
 	$(AM_V_CCLD)$(LD) $(efi_ldflags) $(stub_objects) \
 		-o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name); \
@ -3082,8 +3109,8 @@ CLEANFILES += $(stub_objects) $(stub_solib) $(stub)
 # ------------------------------------------------------------------------------
 CLEANFILES += test-efi-disk.img
-test-efi-disk.img: $(systemd_boot) $(stub) test/test-efi-create-disk.sh
+test-efi-disk.img: $(systemd_boot) $(stub) test/splash.bmp test/test-efi-create-disk.sh
-	$(AM_V_GEN)test/test-efi-create-disk.sh
+	$(AM_V_GEN)test/test-efi-create-disk.sh $@ $(systemd_boot) $(stub) test/splash.bmp
 test-efi: test-efi-disk.img
 	$(QEMU) -machine accel=kvm -m 1024 -bios $(QEMU_BIOS) -snapshot test-efi-disk.img
@ -3410,7 +3437,6 @@ noinst_LTLIBRARIES += \
 EXTRA_DIST += \
 	src/libsystemd/libsystemd.pc.in \
 	src/libsystemd/sd-bus/DIFFERENCES \
 	src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
 libsystemd_la_SOURCES =
@ -3453,6 +3479,7 @@ tests += \
 	test-bus-zero-copy \
 	test-bus-introspect \
 	test-bus-objects \
 	test-bus-vtable \
 	test-bus-error \
 	test-bus-creds \
 	test-bus-gvariant \
@ -3522,6 +3549,12 @@ test_bus_objects_SOURCES = \
 test_bus_objects_LDADD = \
 	libsystemd-shared.la
 test_bus_vtable_SOURCES = \
 	src/libsystemd/sd-bus/test-bus-vtable.c
 test_bus_vtable_LDADD = \
 	libsystemd-shared.la
 test_bus_error_SOURCES = \
 	src/libsystemd/sd-bus/test-bus-error.c
@ -3607,9 +3640,9 @@ test_resolve_LDADD = \
 	libsystemd-shared.la
 busctl_SOURCES = \
-	src/libsystemd/sd-bus/busctl.c \
+	src/busctl/busctl.c \
-	src/libsystemd/sd-bus/busctl-introspect.c \
+	src/busctl/busctl-introspect.c \
-	src/libsystemd/sd-bus/busctl-introspect.h
+	src/busctl/busctl-introspect.h
 busctl_LDADD = \
 	libsystemd-shared.la
@ -3629,6 +3662,7 @@ libsystemd_network_la_SOURCES = \
 	src/systemd/sd-ipv4ll.h \
 	src/systemd/sd-ipv4acd.h \
 	src/systemd/sd-ndisc.h \
 	src/systemd/sd-radv.h \
 	src/systemd/sd-dhcp6-client.h \
 	src/systemd/sd-dhcp6-lease.h \
 	src/systemd/sd-lldp.h \
@ -3652,6 +3686,8 @@ libsystemd_network_la_SOURCES = \
 	src/libsystemd-network/ndisc-internal.h \
 	src/libsystemd-network/ndisc-router.h \
 	src/libsystemd-network/ndisc-router.c \
 	src/libsystemd-network/sd-radv.c \
 	src/libsystemd-network/radv-internal.h \
 	src/libsystemd-network/icmp6-util.h \
 	src/libsystemd-network/icmp6-util.c \
 	src/libsystemd-network/sd-dhcp6-client.c \
@ -3682,6 +3718,14 @@ test_dhcp_option_LDADD = \
 	libsystemd-network.la \
 	libsystemd-shared.la
 test_sd_dhcp_lease_SOURCES = \
      src/libsystemd-network/dhcp-lease-internal.h \
      src/libsystemd-network/test-sd-dhcp-lease.c
 test_sd_dhcp_lease_LDADD = \
      libsystemd-network.la \
      libsystemd-shared.la
 test_dhcp_client_SOURCES = \
 	src/systemd/sd-dhcp-client.h \
 	src/libsystemd-network/dhcp-protocol.h \
@ -3737,6 +3781,16 @@ test_ndisc_rs_LDADD = \
 	libudev.la \
 	libsystemd-shared.la
 test_ndisc_ra_SOURCES = \
 	src/systemd/sd-ndisc.h \
 	src/libsystemd-network/icmp6-util.h \
 	src/libsystemd-network/test-ndisc-ra.c
 test_ndisc_ra_LDADD = \
 	libsystemd-network.la \
 	libudev.la \
 	libsystemd-shared.la
 test_dhcp6_client_SOURCES = \
 	src/systemd/sd-dhcp6-client.h \
 	src/libsystemd-network/dhcp6-internal.h \
@ -3760,8 +3814,10 @@ tests += \
 	test-dhcp-option \
 	test-dhcp-client \
 	test-dhcp-server \
 	test-sd-dhcp-lease \
 	test-ipv4ll \
 	test-ndisc-rs \
 	test-ndisc-ra \
 	test-dhcp6-client \
 	test-lldp
@ -3819,10 +3875,10 @@ dist_network_DATA = \
 	network/80-container-vz.network
 dist_udevrules_DATA += \
 	rules/50-udev-default.rules \
 	rules/60-block.rules \
 	rules/60-drm.rules \
 	rules/60-evdev.rules \
 	rules/60-input-id.rules \
 	rules/60-persistent-storage-tape.rules \
 	rules/60-persistent-input.rules \
 	rules/60-persistent-alsa.rules \
@ -3830,6 +3886,7 @@ dist_udevrules_DATA += \
 	rules/60-sensor.rules \
 	rules/60-serial.rules \
 	rules/64-btrfs.rules \
 	rules/70-joystick.rules \
 	rules/70-mouse.rules \
 	rules/70-touchpad.rules \
 	rules/75-net-description.rules \
@ -3837,6 +3894,7 @@ dist_udevrules_DATA += \
 	rules/80-net-setup-link.rules
 nodist_udevrules_DATA += \
 	rules/50-udev-default.rules \
 	rules/99-systemd.rules
 udevconfdir = $(sysconfdir)/udev
@ -3847,6 +3905,7 @@ pkgconfigdata_DATA += \
 	src/udev/udev.pc
 EXTRA_DIST += \
 	rules/50-udev-default.rules.in \
 	rules/99-systemd.rules.in \
 	src/udev/udev.pc.in
@ -3874,10 +3933,10 @@ noinst_LTLIBRARIES += \
 src/udev/keyboard-keys-list.txt:
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($$2 != "KEY_MAX") { print $$2 } }' > $@
+	$(AM_V_GEN)$(top_srcdir)/src/udev/generate-keyboard-keys-list.sh "$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS)" > $@
 src/udev/keyboard-keys-from-name.gperf: src/udev/keyboard-keys-list.txt
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' < $< > $@
+	$(AM_V_GEN)$(top_srcdir)/src/udev/generate-keyboard-keys-gperf.sh $< > $@
 src/udev/keyboard-keys-from-name.h: src/udev/keyboard-keys-from-name.gperf
 	$(AM_V_GPERF)$(GPERF) -L ANSI-C -t -N keyboard_lookup_key -H hash_key_name -p -C < $< > $@
@ -3916,7 +3975,8 @@ gperf_gperf_sources += \
 libudev_core_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(BLKID_CFLAGS) \
-	$(KMOD_CFLAGS)
+	$(KMOD_CFLAGS) \
 	-DLOG_REALM=LOG_REALM_UDEV
 libudev_core_la_LIBADD = \
 	libsystemd-network.la \
@ -3948,6 +4008,10 @@ endif
 systemd_udevd_SOURCES = \
 	src/udev/udevd.c
 systemd_udevd_CFLAGS = \
 	$(AM_CFLAGS) \
       -DLOG_REALM=LOG_REALM_UDEV
 systemd_udevd_LDADD = \
 	libudev-core.la \
 	libbasic.la
@ -4091,6 +4155,10 @@ EXTRA_DIST += \
 ata_id_SOURCES = \
 	src/udev/ata_id/ata_id.c
 ata_id_CFLAGS = \
 	$(AM_CFLAGS) \
       -DLOG_REALM=LOG_REALM_UDEV
 ata_id_LDADD = \
 	libshared.la
@ -4101,6 +4169,10 @@ udevlibexec_PROGRAMS += \
 cdrom_id_SOURCES = \
 	src/udev/cdrom_id/cdrom_id.c
 cdrom_id_CFLAGS = \
 	$(AM_CFLAGS) \
       -DLOG_REALM=LOG_REALM_UDEV
 cdrom_id_LDADD = \
 	libshared.la
@ -4114,6 +4186,10 @@ dist_udevrules_DATA += \
 collect_SOURCES = \
 	src/udev/collect/collect.c
 collect_CFLAGS = \
 	$(AM_CFLAGS) \
       -DLOG_REALM=LOG_REALM_UDEV
 collect_LDADD = \
 	libshared.la
@ -4127,6 +4203,10 @@ scsi_id_SOURCES =\
 	src/udev/scsi_id/scsi.h \
 	src/udev/scsi_id/scsi_id.h
 scsi_id_CFLAGS = \
 	$(AM_CFLAGS) \
       -DLOG_REALM=LOG_REALM_UDEV
 scsi_id_LDADD = \
 	libshared.la
@ -4140,6 +4220,10 @@ EXTRA_DIST += \
 v4l_id_SOURCES = \
 	src/udev/v4l_id/v4l_id.c
 v4l_id_CFLAGS = \
 	$(AM_CFLAGS) \
       -DLOG_REALM=LOG_REALM_UDEV
 v4l_id_LDADD = \
 	libshared.la
@ -4155,6 +4239,10 @@ mtd_probe_SOURCES =  \
 	src/udev/mtd_probe/mtd_probe.h \
 	src/udev/mtd_probe/probe_smartmedia.c
 mtd_probe_CFLAGS = \
 	$(AM_CFLAGS) \
       -DLOG_REALM=LOG_REALM_UDEV
 dist_udevrules_DATA += \
 	rules/75-probe_mtd.rules
@ -4261,11 +4349,6 @@ systemd_journal_remote_CFLAGS = \
 systemd_journal_remote_LDADD += \
 	$(MICROHTTPD_LIBS)
 if ENABLE_TMPFILES
 dist_tmpfiles_DATA += \
 	tmpfiles.d/systemd-remote.conf
 endif
 if HAVE_GNUTLS
 systemd_journal_remote_LDADD += \
 	$(GNUTLS_LIBS)
@ -4561,10 +4644,8 @@ libsystemd_journal_internal_la_SOURCES += \
 libsystemd_journal_internal_la_LIBADD += \
 	$(GCRYPT_LIBS)
 # fsprg.c is a drop-in file using void pointer arithmetic
 libsystemd_journal_internal_la_CFLAGS += \
-	$(GCRYPT_CFLAGS) \
+	$(GCRYPT_CFLAGS)
 	-Wno-pointer-arith
 endif
 noinst_LTLIBRARIES += \
@ -5020,10 +5101,6 @@ systemd_localed_LDADD = \
 	libsystemd-shared.la \
 	-ldl
 systemd_localed_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(XKBCOMMON_CFLAGS)
 nodist_systemunit_DATA += \
 	units/systemd-localed.service
@ -5080,8 +5157,6 @@ dist_zshcompletion_data += \
 	shell-completion/zsh/_localectl
 endif
 .PHONY: update-kbd-model-map
 polkitpolicy_in_files += \
 	src/locale/org.freedesktop.locale1.policy.in
@ -5161,6 +5236,25 @@ systemd_timesyncd_LDADD = \
 	libsystemd-shared.la \
 	-lm
 test_timesync_SOURCES = \
 	src/timesync/test-timesync.c \
 	src/timesync/timesyncd-manager.c \
 	src/timesync/timesyncd-manager.h \
 	src/timesync/timesyncd-conf.c \
 	src/timesync/timesyncd-conf.h \
 	src/timesync/timesyncd-server.c \
 	src/timesync/timesyncd-server.h
 nodist_test_timesync_SOURCES = \
 	src/timesync/timesyncd-gperf.c
 test_timesync_LDADD = \
 	libsystemd-shared.la \
 	-lm
 tests += \
 	test-timesync
 rootlibexec_PROGRAMS += \
 	systemd-timesyncd
@ -5195,6 +5289,7 @@ manual_tests += \
 	test-nss
 # ------------------------------------------------------------------------------
 if ENABLE_NSS_SYSTEMD
 libnss_systemd_la_SOURCES = \
 	src/nss-systemd/nss-systemd.sym \
 	src/nss-systemd/nss-systemd.c
@ -5214,6 +5309,7 @@ libnss_systemd_la_LIBADD = \
 rootlib_LTLIBRARIES += \
 	libnss_systemd.la
 endif
 # ------------------------------------------------------------------------------
 if HAVE_MYHOSTNAME
@ -5240,6 +5336,10 @@ endif
 # ------------------------------------------------------------------------------
 if ENABLE_MACHINED
 dist_systemunit_DATA += \
 	units/var-lib-machines.mount
 systemd_machined_SOURCES = \
 	src/machine/machined.c \
 	src/machine/machined.h
@ -5612,6 +5712,9 @@ GENERAL_ALIASES += \
 nodist_pkgsysconf_DATA += \
 	src/resolve/resolved.conf
 dist_rootlibexec_DATA += \
 	src/resolve/resolv.conf
 libnss_resolve_la_SOURCES = \
 	src/nss-resolve/nss-resolve.sym \
 	src/nss-resolve/nss-resolve.c
@ -5627,8 +5730,7 @@ libnss_resolve_la_LDFLAGS = \
 libnss_resolve_la_LIBADD = \
 	libsystemd-internal.la \
-	libbasic.la \
+	libbasic.la
        -ldl
 rootlib_LTLIBRARIES += \
 	libnss_resolve.la
@ -5664,6 +5766,7 @@ dist_zshcompletion_data += \
 tests += \
 	test-dns-packet \
 	test-resolve-tables \
 	test-resolved-packet \
 	test-dnssec
 manual_tests += \
@ -5685,6 +5788,19 @@ test_resolve_tables_LDADD = \
 	$(GCRYPT_LIBS) \
 	-lm
 test_resolved_packet_SOURCES = \
 	src/resolve/test-resolved-packet.c \
 	$(basic_dns_sources)
 test_resolved_packet_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(GCRYPT_CFLAGS)
 test_resolved_packet_LDADD = \
 	libsystemd-shared.la \
 	$(GCRYPT_LIBS) \
 	-lm
 test_dns_packet_SOURCES = \
 	src/resolve/test-dns-packet.c \
 	$(basic_dns_sources)
@ -5750,9 +5866,6 @@ EXTRA_DIST += \
 	units/systemd-resolved.service.m4.in \
 	src/resolve/resolved.conf.in
 dist_rootlibexec_DATA += \
 	src/resolve/resolv.conf
 # ------------------------------------------------------------------------------
 if ENABLE_NETWORKD
 rootlibexec_PROGRAMS += \
@ -5787,6 +5900,8 @@ libnetworkd_core_la_SOURCES = \
 	src/network/netdev/veth.c \
 	src/network/netdev/vxlan.h \
 	src/network/netdev/vxlan.c \
 	src/network/netdev/geneve.h \
 	src/network/netdev/geneve.c \
 	src/network/netdev/vlan.h \
 	src/network/netdev/vlan.c \
 	src/network/netdev/macvlan.h \
@ -5817,12 +5932,16 @@ libnetworkd_core_la_SOURCES = \
 	src/network/networkd-dhcp4.c \
 	src/network/networkd-dhcp6.c \
 	src/network/networkd-ndisc.h \
 	src/network/networkd-radv.c \
 	src/network/networkd-radv.h \
 	src/network/networkd-ndisc.c \
 	src/network/networkd-network.h \
 	src/network/networkd-network.c \
 	src/network/networkd-network-bus.c \
 	src/network/networkd-address.h \
 	src/network/networkd-address.c \
 	src/network/networkd-address-label.h \
 	src/network/networkd-address-label.c \
 	src/network/networkd-route.h \
 	src/network/networkd-route.c \
 	src/network/networkd-fdb.h \
@ -5933,10 +6052,8 @@ dist_dbuspolicy_DATA += \
 GENERAL_ALIASES += \
 	$(systemunitdir)/systemd-networkd.socket $(pkgsysconfdir)/system/sockets.target.wants/systemd-networkd.socket \
 	$(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \
-	$(systemunitdir)/systemd-networkd-wait-online.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service
+	$(systemunitdir)/systemd-networkd-wait-online.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service \
-
+	$(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/dbus-org.freedesktop.network1.service
 SYSTEM_UNIT_ALIASES += \
 	systemd-networkd.service dbus-org.freedesktop.network1.service
 BUSNAMES_TARGET_WANTS += \
 	org.freedesktop.network1.busname
@ -5959,7 +6076,8 @@ EXTRA_DIST += \
 	src/network/systemd-networkd.pkla \
 	units/systemd-networkd.service.m4.in \
 	units/systemd-networkd-wait-online.service.in \
-	test/networkd-test.py
+	test/networkd-test.py \
 	test/test-exec-deserialization.py
 # ------------------------------------------------------------------------------
 if ENABLE_LOGIND
@ -6064,10 +6182,10 @@ test_login_tables_LDADD = \
 	liblogind-core.la
 manual_tests += \
 	test-login \
 	test-inhibit
 tests += \
 	test-login \
 	test-login-tables \
 	test-login-shared
@ -6271,7 +6389,6 @@ substitutions = \
       '|exec_prefix=$(exec_prefix)|' \
       '|libdir=$(libdir)|' \
       '|includedir=$(includedir)|' \
       '|VERSION=$(VERSION)|' \
       '|rootprefix=$(rootprefix)|' \
       '|udevlibexecdir=$(udevlibexecdir)|' \
       '|SUSHELL=$(SUSHELL)|' \
@ -6295,6 +6412,7 @@ substitutions = \
       '|KILL_USER_PROCESSES=$(KILL_USER_PROCESSES)|' \
       '|systemuidmax=$(SYSTEM_UID_MAX)|' \
       '|systemgidmax=$(SYSTEM_GID_MAX)|' \
       '|DEV_KVM_MODE=$(DEV_KVM_MODE)|' \
       '|TTY_GID=$(TTY_GID)|' \
       '|systemsleepdir=$(systemsleepdir)|' \
       '|systemshutdowndir=$(systemshutdowndir)|' \
@ -6328,6 +6446,10 @@ src/core/%.systemd: src/core/%.systemd.in
 src/%.policy.in: src/%.policy.in.in
 	$(SED_PROCESS)
 src/sulogin-shell/%: src/sulogin-shell/%.in
 	$(SED_PROCESS)
 	$(AM_V_GEN)chmod +x $@
 shell-completion/%: shell-completion/%.in
 	$(SED_PROCESS)
@ -6371,8 +6493,10 @@ nodist_polkitpolicy_DATA = \
 	$(polkitpolicy_files) \
 	$(polkitpolicy_in_in_files:.policy.in.in=.policy)
 polkitrules_DATA = $(polkitrules_files)
 if ENABLE_POLKIT_PKLA
 polkitpkla_DATA = $(polkitpkla_files)
 endif
 endif
 EXTRA_DIST += \
 	$(polkitpolicy_in_files) \
@ -6395,7 +6519,7 @@ XSLTPROC_FLAGS = \
 	--stringparam funcsynopsis.style ansi \
 	--stringparam man.authors.section.enabled 0 \
 	--stringparam man.copyright.section.enabled 0 \
-	--stringparam systemd.version $(VERSION) \
+	--stringparam systemd.version $(PACKAGE_VERSION) \
 	--path '$(builddir)/man:$(srcdir)/man'
 XSLT = $(if $(XSLTPROC), $(XSLTPROC), xsltproc)
@ -6476,7 +6600,9 @@ SYSINIT_TARGET_WANTS += \
 LOCAL_FS_TARGET_WANTS += \
 	systemd-remount-fs.service \
-	tmp.mount \
+	tmp.mount
 REMOTE_FS_TARGET_WANTS += \
 	var-lib-machines.mount
 MULTI_USER_TARGET_WANTS += \
@ -6492,6 +6618,11 @@ SYSINIT_TARGET_WANTS += \
 	systemd-sysctl.service \
 	systemd-ask-password-console.path
 if ENABLE_MACHINED
 MACHINES_TARGET_WANTS += \
 	var-lib-machines.mount
 endif
 if HAVE_SYSV_COMPAT
 SYSTEM_UNIT_ALIASES += \
 	poweroff.target runlevel0.target \
@ -6567,6 +6698,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
 	--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
 	--with-pamconfdir=$$dc_install_base/$(pamconfdir) \
 	--with-rpmmacrosdir=$$dc_install_base/$(rpmmacrosdir) \
 	--with-rootprefix=$$dc_install_base \
 	--enable-compat-libs
@ -6610,34 +6742,27 @@ dist-check-includes: $(public_headers)
 	done; exit $$res
 .PHONY: hwdb-update
-hwdb-update:
+hwdb-update: tools/meson-hwdb-update.sh
-	( cd $(top_srcdir)/hwdb && \
+	$< $(top_srcdir)/hwdb
 	wget -O usb.ids 'http://www.linux-usb.org/usb.ids' && \
 	wget -O pci.ids 'http://pci-ids.ucw.cz/v2.2/pci.ids' && \
 	wget -O ma-large.txt 'http://standards.ieee.org/develop/regauth/oui/oui.txt' && \
 	wget -O ma-medium.txt 'http://standards.ieee.org/develop/regauth/oui28/mam.txt' && \
 	wget -O ma-small.txt 'http://standards.ieee.org/develop/regauth/oui36/oui36.txt' && \
 	wget -O pnp_id_registry.html 'http://www.uefi.org/uefi-pnp-export' && \
 	wget -O acpi_id_registry.html 'http://www.uefi.org/uefi-acpi-export' && \
 	./ids-update.pl && \
 	./acpi-update.py > 20-acpi-vendor.hwdb.base && \
 	patch -p0 -o- 20-acpi-vendor.hwdb.base < 20-acpi-vendor.hwdb.patch > 20-acpi-vendor.hwdb )
 .PHONY: built-sources
 built-sources: $(BUILT_SOURCES)
 .PHONY: git-tag
 git-tag:
-	git tag -s "v$(VERSION)" -m "systemd $(VERSION)"
+	git tag -s "v$(PACKAGE_VERSION)" -m "systemd $(PACKAGE_VERSION)"
 .PHONY: git-tar
 git-tar:
-	git archive --format=tar --prefix=systemd-$(VERSION)/ HEAD | gzip > systemd-$(VERSION).tar.gz
+	git archive -o systemd-$(PACKAGE_VERSION).tar.gz --prefix=systemd-$(PACKAGE_VERSION)/ HEAD
 %.asc: %
 	gpg2 --detach-sign -a -o $@ $<
 www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd
 .PHONY: doc-sync
-doc-sync: all
+doc-sync: man
 	rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
 .PHONY: install-tree
@ -6774,14 +6899,17 @@ cppcheck:
 print-%:
 	@echo $($*)
 .PHONY: git-contrib
 git-contrib:
 	@git shortlog -s `git describe --abbrev=0`.. | cut -c8- | sed 's/ / /g' | awk '{ print $$0 "," }' | sort -u
 EXTRA_DIST += \
        tools/gdb-sd_dump_hashmaps.py
 .PHONY: list-keys
 list-keys:
 	gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --list-keys
 .PHONY: add-key
 add-key:
 	gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --import -
--- a/137
+++ b/137
@ -1,7 +1,140 @@
 systemd System and Service Manager
 CHANGES WITH 234:
        * Meson is now supported as build system in addition to Automake. It is
          our plan to remove Automake in one of our next releases, so that
          Meson becomes our exclusive build system. Hence, please start using
          the Meson build system in your downstream packaging. There's plenty
          of documentation around how to use Meson, the extremely brief
          summary:
              ./autogen.sh && ./configure && make && sudo make install
          becomes:
              meson build && ninja -C build && sudo ninja -C build install
        * Unit files gained support for a new JobRunningTimeoutUSec= setting,
          which permits configuring a timeout on the time a job is
          running. This is particularly useful for setting timeouts on jobs for
          .device units.
        * Unit files gained two new options ConditionUser= and ConditionGroup=
          for conditionalizing units based on the identity of the user/group
          running a systemd user instance.
        * systemd-networkd now understands a new FlowLabel= setting in the
          [VXLAN] section of .network files, as well as a Priority= in
          [Bridge], GVRP= + MVRP= + LooseBinding= + ReorderHeader= in [VLAN]
          and GatewayOnlink= + IPv6Preference= + Protocol= in [Route]. It also
          gained support for configuration of GENEVE links, and IPv6 address
          labels. The [Network] section gained the new IPv6ProxyNDP= setting.
        * .link files now understand a new Port= setting.
        * systemd-networkd's DHCP support gained support for DHCP option 119
          (domain search list).
        * systemd-networkd gained support for serving IPv6 address ranges using
          the Router Advertisment protocol. The new .network configuration
          section [IPv6Prefix] may be used to configure the ranges to
          serve. This is implemented based on a new, minimal, native server
          implementation of RA.
        * journalctl's --output= switch gained support for a new parameter
          "short-iso-precise" for a mode where timestamps are shown as precise
          ISO date values.
        * systemd-udevd's "net_id" builtin may now generate stable network
          interface names from IBM PowerVM VIO devices as well as ACPI platform
          devices.
        * MulticastDNS support in systemd-resolved may now be explicitly
          enabled/disabled using the new MulticastDNS= configuration file
          option.
        * systemd-resolved may now optionally use libidn2 instead of the libidn
          for processing internationalized domain names. Support for libidn2
          should be considered experimental and should not be enabled by
          default yet.
        * "machinectl pull-tar" and related call may now do verification of
          downloaded images using SUSE-style .sha256 checksum files in addition
          to the already existing support for validating using Ubuntu-style
          SHA256SUMS files.
        * sd-bus gained support for a new sd_bus_message_appendv() call which
          is va_list equivalent of sd_bus_message_append().
        * sd-boot gained support for validating images using SHIM/MOK.
        * The SMACK code learnt support for "onlycap".
        * systemd-mount --umount is now much smarter in figuring out how to
          properly unmount a device given its mount or device path.
        * The code to call libnss_dns as a fallback from libnss_resolve when
          the communication with systemd-resolved fails was removed. This
          fallback was redundant and interfered with the [!UNAVAIL=return]
          suffix. See nss-resolve(8) for the recommended configuration.
        * systemd-logind may now be restarted without losing state. It stores
          the file descriptors for devices it manages in the system manager
          using the FDSTORE= mechanism. Please note that further changes in
          other components may be required to make use of this (for example
          Xorg has code to listen for stops of systemd-logind and terminate
          itself when logind is stopped or restarted, in order to avoid using
          stale file descriptors for graphical devices, which is now
          counterproductive and must be reverted in order for restarts of
          systemd-logind to be safe. See
          https://cgit.freedesktop.org/xorg/xserver/commit/?id=dc48bd653c7e101.)
        * All kernel install plugins are called with the environment variable
          KERNEL_INSTALL_MACHINE_ID which is set to the machine ID given by
          /etc/machine-id. If the file is missing or empty, the variable is
          empty and BOOT_DIR_ABS is the path of a temporary directory which is
          removed after all the plugins exit. So, if KERNEL_INSTALL_MACHINE_ID
          is empty, all plugins should not put anything in BOOT_DIR_ABS.
        Contributions from: Adrian Heine né Lang, Aggelos Avgerinos, Alexander
        Kurtz, Alexandros Frantzis, Alexey Brodkin, Alex Lu, Amir Pakdel, Amir
        Yalon, Anchor Cat, Anthony Parsons, Bastien Nocera, Benjamin Gilbert,
        Benjamin Robin, Boucman, Charles Plessy, Chris Chiu, Chris Lamb,
        Christian Brauner, Christian Hesse, Colin Walters, Daniel Drake,
        Danielle Church, Daniel Molkentin, Daniel Rusek, Daniel Wang, Davide
        Cavalca, David Herrmann, David Michael, Dax Kelson, Dimitri John
        Ledkov, Djalal Harouni, Dušan Kazik, Elias Probst, Evgeny Vereshchagin,
        Federico Di Pierro, Felipe Sateler, Felix Zhang, Franck Bui, Gary
        Tierney, George McCollister, Giedrius Statkevičius, Hans de Goede,
        hecke, Hendrik Westerberg, Hristo Venev, Ian Wienand, Insun Pyo, Ivan
        Shapovalov, James Cowgill, James Hemsing, Janne Heß, Jan Synacek, Jason
        Reeder, João Paulo Rechi Vita, John Paul Adrian Glaubitz, Jörg
        Thalheim, Josef Andersson, Josef Gajdusek, Julian Mehne, Kai Krakow,
        Krzysztof Jackiewicz, Lars Karlitski, Lennart Poettering, Lluís Gili,
        Lucas Werkmeister, Lukáš Nykrýn, Łukasz Stelmach, Mantas Mikulėnas,
        Marcin Bachry, Marcus Cooper, Mark Stosberg, Martin Pitt, Matija Skala,
        Matt Clarkson, Matthew Garrett, Matthias Greiner, Matthijs van Duin,
        Max Resch, Michael Biebl, Michal Koutný, Michal Sekletar, Michal
        Soltys, Michal Suchanek, Mike Gilbert, Nate Clark, Nathaniel R. Lewis,
        Neil Brown, Nikolai Kondrashov, Pascal S. de Kloe, Pat Riehecky, Patrik
        Flykt, Paul Kocialkowski, Peter Hutterer, Philip Withnall, Piotr
        Szydełko, Rafael Fontenelle, Ray Strode, Richard Maw, Roelf Wichertjes,
        Ronny Chevalier, Sarang S. Dalal, Sjoerd Simons, slodki, Stefan
        Schweter, Susant Sahani, Ted Wood, Thomas Blume, Thomas Haller, Thomas
        H. P. Andersen, Timothée Ravier, Tobias Jungel, Tobias Stoeckmann, Tom
        Gundersen, Tom Yan, Torstein Husebø, Umut Tezduyar Lindskog,
        userwithuid, Vito Caputo, Waldemar Brodkorb, WaLyong Cho, Yu, Li-Yu,
        Yusuke Nojima, Yu Watanabe, Zbigniew Jędrzejewski-Szmek, Дамјан
        Георгиевски
        — Berlin, 2017-07-12
 CHANGES WITH 233:
        * This version requires at least gperf 3.1 for building, 3.0 is not
          sufficient.
        * The "hybrid" control group mode has been modified to improve
          compatibility with "legacy" cgroups-v1 setups. Specifically, the
          "hybrid" setup of /sys/fs/cgroup is now pretty much identical to
@ -348,7 +481,7 @@ CHANGES WITH 233:
          these NTP servers officially. We still recommend downstreams to
          properly register an NTP pool with the NTP pool project though.
-        * coredumpctl gained new new "--reverse" option for printing the list
+        * coredumpctl gained a new "--reverse" option for printing the list
          of coredumps in reverse order.
        * coredumpctl will now show additional information about truncated and
@ -3315,7 +3448,7 @@ CHANGES WITH 216:
          like Cockpit which register web clients as PAM sessions.
        * timer units with at least one OnCalendar= setting will now
-          be started only after timer-sync.target has been
+          be started only after time-sync.target has been
          reached. This way they will not elapse before the system
          clock has been corrected by a local NTP client or
          similar. This is particular useful on RTC-less embedded
--- a/47
+++ b/47
@ -35,7 +35,7 @@ LICENSE:
        - except src/udev/* which is (currently still) GPLv2, GPLv2+
 REQUIREMENTS:
-        Linux kernel >= 3.12
+        Linux kernel >= 3.13
        Linux kernel >= 4.2 for unified cgroup hierarchy support
        Kernel Config Options:
@ -127,7 +127,8 @@ REQUIREMENTS:
        glibc >= 2.16
        libcap
        libmount >= 2.27.1 (from util-linux)
-                (util-linux *must* be built with --enable-libmount-force-mountinfo)
+                (util-linux < 2.29 *must* be built with --enable-libmount-force-mountinfo,
                 and later versions without --enable-libmount-support-mtab.)
        libseccomp >= 2.3.1 (optional)
        libblkid >= 2.24 (from util-linux) (optional)
        libkmod >= 15 (optional)
@ -142,7 +143,7 @@ REQUIREMENTS:
        libqrencode (optional)
        libmicrohttpd (optional)
        libpython (optional)
-        libidn (optional)
+        libidn2 or libidn (optional)
        elfutils >= 158 (optional)
        make, gcc, and similar tools
@ -156,21 +157,47 @@ REQUIREMENTS:
        dracut (optional)
        PolicyKit (optional)
-        When building from git, the following tools are needed:
+        Two build systems are supported: meson + ninja-build and autools + make.
        The following tools are needed with both systems:
        pkg-config
-        docbook-xsl
+        gperf >= 3.1
-        xsltproc
+        docbook-xsl (optional, required for documentation)
        xsltproc    (optional, required for documentation)
        python-lxml (optional, required to build the indices)
        When building with meson, python and ninja-build are required.
        To build in directory build/:
          meson build/ && ninja -C build
        Any configuration options can be specfied as -Darg=value... arguments
        to meson. After the build directory is initially configured, meson will
        refuse to run again, and options must be changed with:
          mesonconf -Darg=value...
        mesonconf without any arguments will print out available options and
        their current values.
        Useful commands:
          ninja -v some/target
          ninja test
          sudo ninja install
          DESTDIR=... ninja install
        When building with autotools, the following tools are needed:
        automake
        autoconf
        libtool
        intltool
        gperf
        python (optional)
        python-lxml (optional, but required to build the indices)
-        The build system is initialized with ./autogen.sh. A tar ball
+        The build system is initialized with ./autogen.sh and the usual
-        can be created with:
+          ./configure && make
        should be used.
        A tar ball can be created with:
          git archive --format=tar --prefix=systemd-222/ v222 | xz > systemd-222.tar.xz
        When systemd-hostnamed is used, it is strongly recommended to
--- a/README.md
+++ b/README.md
@ -1,5 +1,7 @@
 # systemd - System and Service Manager
 <a href="https://in.waw.pl/systemd-github-state/systemd-systemd-issues.svg"><img align="right" src="https://in.waw.pl/systemd-github-state/systemd-systemd-issues-small.svg" alt="Count of open issues over time"></a>
 <a href="https://in.waw.pl/systemd-github-state/systemd-systemd-pull-requests.svg"><img align="right" src="https://in.waw.pl/systemd-github-state/systemd-systemd-pull-requests-small.svg" alt="Count of open pull requests over time"></a>
 [![Build Status](https://semaphoreci.com/api/v1/projects/28a5a3ca-3c56-4078-8b5e-7ed6ef912e14/443470/shields_badge.svg)](https://semaphoreci.com/systemd/systemd)<br/>
 [![Coverity Scan Status](https://scan.coverity.com/projects/350/badge.svg)](https://scan.coverity.com/projects/350)
--- a/9
+++ b/9
@ -24,6 +24,15 @@ Janitorial Clean-ups:
 Features:
 * Add AddUser= setting to unit files, similar to DynamicUser=1 which however
  creates a static, persistent user rather than a dynamic, transient user. We
  can leverage code from sysusers.d for this.
 * add some optional flag to ReadWritePaths= and friends, that has the effect
  that we create the dir in question when the service is started. Example:
  ReadWritePaths=:/var/lib/foobar
 * sort generated hwdb files alphabetically when we import them, so that git
  diffs remain minimal (in particular: the OUI databases we import are not
  sorted, and not stable)
--- a/catalog/meson.build
+++ b/catalog/meson.build
@ -0,0 +1,28 @@
 in_files = '''
        systemd.bg.catalog
        systemd.be.catalog
        systemd.be@latin.catalog
        systemd.fr.catalog
        systemd.it.catalog
        systemd.pl.catalog
        systemd.pt_BR.catalog
        systemd.ru.catalog
        systemd.zh_CN.catalog
        systemd.zh_TW.catalog
        systemd.catalog
 '''.split()
 support_url = get_option('support-url')
 support_sed = 's~%SUPPORT_URL%~@0@~'.format(support_url)
 build_catalog_dir = meson.current_build_dir()
 foreach file : in_files
        custom_target(
                file,
                input : file + '.in',
                output: file,
                command : [sed, support_sed, '@INPUT@'],
                capture : true,
                install : true,
                install_dir : catalogdir)
 endforeach
--- a/configure.ac
+++ b/configure.ac
@ -20,7 +20,7 @@
 AC_PREREQ([2.64])
 AC_INIT([systemd],
-        [233],
+        [234],
        [https://github.com/systemd/systemd/issues],
        [systemd],
        [https://www.freedesktop.org/wiki/Software/systemd])
@ -57,6 +57,7 @@ AS_IF([test "x$enable_largefile" = "xno"], [AC_MSG_ERROR([--disable-largefile is
 SET_ARCH(X86_64, x86_64*)
 SET_ARCH(IA32, i*86*)
 SET_ARCH(MIPS, mips*)
 SET_ARCH(ARM, arm*)
 SET_ARCH(AARCH64, aarch64*)
 # i18n stuff for the PolicyKit policy files, heck whether intltool can be found, disable NLS otherwise
@ -327,7 +328,6 @@ AC_CHECK_DECLS([
        pivot_root,
        name_to_handle_at,
        setns,
        getrandom,
        renameat2,
        kcmp,
        keyctl,
@ -342,6 +342,13 @@ AC_CHECK_DECLS([
 #include <sched.h>
 #include <string.h>
 #include <linux/loop.h>
 ]])
 AC_CHECK_DECLS([getrandom],
               [AC_DEFINE([USE_SYS_RANDOM_H], [], [sys/random.h is usable])],
               [AC_CHECK_DECLS([getrandom], [], [], [[
 #include <sys/random.h>
 ]])], [[
 #include <linux/random.h>
 ]])
@ -360,7 +367,8 @@ AC_CHECK_DECLS([IFLA_INET6_ADDR_GEN_MODE,
                IFLA_PHYS_PORT_ID,
                IFLA_BOND_AD_INFO,
                IFLA_VLAN_PROTOCOL,
-                IFLA_VXLAN_REMCSUM_NOPARTIAL,
+                IFLA_VXLAN_GPE,
                IFLA_GENEVE_LABEL,
                IFLA_IPTUN_ENCAP_DPORT,
                IFLA_GRE_ENCAP_DPORT,
                IFLA_BRIDGE_VLAN_INFO,
@ -397,6 +405,16 @@ AS_IF([test "x$enable_dbus" != "xno"], [
                [AC_MSG_ERROR([*** dbus-1 support requested but libraries not found])])])
 AM_CONDITIONAL(HAVE_DBUS, [test "$have_dbus" = "yes"])
 # ------------------------------------------------------------------------------
 have_glib=no
 AC_ARG_ENABLE(glib, AS_HELP_STRING([--disable-glib], [disable usage of glib,gobject,gio in tests]))
 AS_IF([test "x$enable_glib" != "xno"], [
        PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 gio-2.0],
                [AC_DEFINE(HAVE_GLIB, 1, [Define if glib,gobject,gio are available]) have_glib=yes],
                [have_glib=no])
        AS_IF([test "x$have_glib" = "xno" -a "x$enable_glib" = "xyes"],
                [AC_MSG_ERROR([*** glib support requested but libraries not found])])])
 # ------------------------------------------------------------------------------
 have_utmp=yes
 AC_ARG_ENABLE([utmp], AS_HELP_STRING([--disable-utmp], [disable utmp/wtmp log handling]),
@ -404,7 +422,11 @@ AC_ARG_ENABLE([utmp], AS_HELP_STRING([--disable-utmp], [disable utmp/wtmp log ha
                [xyes], [have_utmp=yes],
                [xno],  [have_utmp=no],
                AC_MSG_ERROR(bad value ${enableval} for --enable-utmp)))
-AS_IF([test "x$have_utmp" = "xyes"], [AC_DEFINE(HAVE_UTMP, 1, [Define if utmp/wtmp support is enabled])])
+AS_IF([test "x$have_utmp" = "xyes"], [
        AC_DEFINE(HAVE_UTMP, 1, [Define if utmp/wtmp support is enabled])
        have_utmp=yes
        M4_DEFINES="$M4_DEFINES -DHAVE_UTMP"],
        [have_utmp=no])
 AM_CONDITIONAL([HAVE_UTMP], [test "x$have_utmp" = "xyes"])
 # ------------------------------------------------------------------------------
@ -1011,6 +1033,40 @@ if test "x$enable_libidn" != "xno"; then
 fi
 AM_CONDITIONAL(HAVE_LIBIDN, [test "$have_libidn" = "yes"])
 have_libidn2=no
 AC_ARG_ENABLE(libidn2, AS_HELP_STRING([--disable-libidn2], [disable optional LIBIDN2 support]))
 if test "$have_libidn" != "yes"; then
        if test "x$enable_libidn2" != "xno"; then
                PKG_CHECK_MODULES(LIBIDN2, [libidn2 >= 2.0.0],
                       [AC_DEFINE(HAVE_LIBIDN2, 1, [Define if libidn2 is available])
                        have_libidn2=yes
                        M4_DEFINES="$M4_DEFINES -DHAVE_LIBIDN2"],
                       [have_libidn2=no])
                if test "x$have_libidn2" = "xno" -a "x$enable_libidn2" = "xyes"; then
                        AC_MSG_ERROR([*** libidn2 support requested but libraries not found])
                fi
        fi
 fi
 AM_CONDITIONAL(HAVE_LIBIDN2, [test "$have_libidn2" = "yes"])
 # ------------------------------------------------------------------------------
 have_idn=no
 AC_ARG_ENABLE(idn, AS_HELP_STRING([--disable-idn], [disable IDN when printing host names]))
 if test "x$enable_idn" != "xno"; then
        have_idn=yes
        AC_DEFINE(ENABLE_IDN, [1], [IDN is enabled])
 fi
 AM_CONDITIONAL(ENABLE_IDN, [test "$have_idn" = "yes"])
 # ------------------------------------------------------------------------------
 have_nss_systemd=no
 AC_ARG_ENABLE(nss-systemd, AS_HELP_STRING([--disable-nss-systemd], [disable nss-systemd support]))
 if test "x$enable_nss_systemd" != "xno"; then
        have_nss_systemd=yes
        AC_DEFINE(ENABLE_NSS_SYSTEMD, [1], [nss-systemd is enabled])
 fi
 AM_CONDITIONAL(ENABLE_NSS_SYSTEMD, [test "$have_nss_systemd" = "yes"])
 # ------------------------------------------------------------------------------
 have_libiptc=no
 AC_ARG_ENABLE(libiptc, AS_HELP_STRING([--disable-libiptc], [disable optional LIBIPTC support]))
@ -1074,6 +1130,11 @@ if test "x$enable_sysusers" != "xno"; then
 fi
 AM_CONDITIONAL(ENABLE_SYSUSERS, [test "$have_sysusers" = "yes"])
 AC_ARG_ENABLE(gshadow, AS_HELP_STRING([--disable-gshadow], [disable shadow group support]))
 AS_IF([test "x${enable_gshadow}" != "xno"], [
        AC_DEFINE(ENABLE_GSHADOW, 1, [shadow group support is enabled])
 ])
 # ------------------------------------------------------------------------------
 have_firstboot=no
 AC_ARG_ENABLE(firstboot, AS_HELP_STRING([--disable-firstboot], [disable firstboot support]))
@ -1113,7 +1174,7 @@ if test "x$enable_logind" != "xno"; then
        have_logind=yes
 fi
 AM_CONDITIONAL(ENABLE_LOGIND, [test "$have_logind" = "yes"])
-AS_IF([test "$have_logind" = "yes"], [ AC_DEFINE(HAVE_LOGIND, [1], [Logind support available]) ])
+AS_IF([test "$have_logind" = "yes"], [ AC_DEFINE(ENABLE_LOGIND, [1], [Logind support available]) ])
 AC_ARG_WITH([kill-user-processes],
        [AS_HELP_STRING([--without-kill-user-processes], [set logind's KillUserProcesses=no by default])])
@ -1205,6 +1266,16 @@ AC_ARG_WITH(system-gid-max,
 AC_DEFINE_UNQUOTED(SYSTEM_GID_MAX, [$SYSTEM_GID_MAX], [Maximum System GID])
 AC_SUBST(SYSTEM_GID_MAX)
 # ------------------------------------------------------------------------------
 AC_ARG_WITH(dev-kvm-mode,
        AS_HELP_STRING([--with-dev-kvm-mode=MODE],
                [/dev/kvm access mode, defaults to "0660"]),
        [DEV_KVM_MODE="$withval"],
        [DEV_KVM_MODE="0660"])
 AC_SUBST(DEV_KVM_MODE, [$DEV_KVM_MODE], [/dev/kvm access mode])
 # ------------------------------------------------------------------------------
 have_localed=no
 AC_ARG_ENABLE(localed, AS_HELP_STRING([--disable-localed], [disable locale daemon]))
@ -1228,8 +1299,14 @@ AC_ARG_ENABLE(polkit, AS_HELP_STRING([--disable-polkit], [disable PolicyKit supp
 if test "x$enable_polkit" != "xno"; then
        AC_DEFINE(ENABLE_POLKIT, 1, [Define if PolicyKit support is to be enabled])
        have_polkit=yes
        # also enable support for *.pkla files on old polkit
        PKG_CHECK_MODULES(POLKIT, [ polkit-gobject-1 < 0.106 ],
                           [polkit_pkla=yes],
                           [polkit_pkla=no])
 fi
 AM_CONDITIONAL(ENABLE_POLKIT, [test "x$have_polkit" = "xyes"])
 AM_CONDITIONAL(ENABLE_POLKIT_PKLA, [test "x$polkit_pkla" = "xyes"])
 # ------------------------------------------------------------------------------
 have_resolved=no
@ -1258,6 +1335,11 @@ AC_ARG_WITH(default-dnssec,
        [DEFAULT_DNSSEC_MODE="$withval"],
        [DEFAULT_DNSSEC_MODE="allow-downgrade"])
 if test "x$have_gcrypt" = xno -a "x${DEFAULT_DNSSEC_MODE}" != xno ; then
        AC_MSG_WARN(default-dnssec cannot be set to yes or allow-downgrade when gcrypt is disabled. Setting default-dnssec to no.)
        DEFAULT_DNSSEC_MODE="no"
 fi
 AS_CASE("x${DEFAULT_DNSSEC_MODE}",
        [xno], [mode=DNSSEC_NO],
        [xyes], [mode=DNSSEC_YES],
@ -1297,6 +1379,9 @@ AM_COND_IF(ARCH_IA32, [
 AM_COND_IF(ARCH_X86_64, [
        EFI_MACHINE_TYPE_NAME=x64])
 AM_COND_IF(ARCH_ARM, [
        EFI_MACHINE_TYPE_NAME=arm])
 AM_COND_IF(ARCH_AARCH64, [
        EFI_MACHINE_TYPE_NAME=aa64])
@ -1306,7 +1391,13 @@ AC_SUBST([EFI_MACHINE_TYPE_NAME])
 have_gnuefi=no
 AC_ARG_ENABLE(gnuefi, AS_HELP_STRING([--enable-gnuefi], [enable optional gnuefi support]))
 AS_IF([test "x$enable_gnuefi" != "xno"], [
-        AC_CHECK_HEADERS(efi/${EFI_ARCH}/efibind.h,
+        AC_ARG_WITH(efi-includedir,
                AS_HELP_STRING([--with-efi-includedir=PATH], [path to EFI include directory]),
                [EFI_INC_DIR="$withval"], [EFI_INC_DIR="/usr/include"]
        )
        AC_SUBST([EFI_INC_DIR])
        AC_CHECK_HEADERS(${EFI_INC_DIR}/efi/${EFI_ARCH}/efibind.h,
                [AC_DEFINE(HAVE_GNUEFI, 1, [Define if gnuefi is available])
                 have_gnuefi=yes],
                [AS_IF([test "x$enable_gnuefi" = xyes],
@ -1335,12 +1426,6 @@ AS_IF([test "x$enable_gnuefi" != "xno"], [
              [AS_IF([test "x$enable_gnuefi" = xyes],
                     [AC_MSG_ERROR([*** gnuefi support requested but files not found])],
                     [have_gnuefi=no])])
        AC_ARG_WITH(efi-includedir,
                AS_HELP_STRING([--with-efi-includedir=PATH], [path to EFI include directory]),
                [EFI_INC_DIR="$withval"], [EFI_INC_DIR="/usr/include"]
        )
        AC_SUBST([EFI_INC_DIR])
 ])
 AM_CONDITIONAL(HAVE_GNUEFI, [test "x$have_gnuefi" = xyes])
@ -1571,6 +1656,12 @@ AC_ARG_WITH([pamconfdir],
 AM_CONDITIONAL(ENABLE_PAM_CONFIG, [test "$with_pamconfdir" != "no"])
 AX_NORMALIZE_PATH([with_pamconfdir])
 AC_ARG_WITH([rpmmacrosdir],
        AS_HELP_STRING([--with-rpmmacrosdir=DIR], [directory to store macros for RPM]),
        [], [with_rpmmacrosdir=\${prefix}/lib/rpm/macros.d])
 AM_CONDITIONAL(ENABLE_RPM_MACROS, [test "$with_rpmmacrosdir" != "no"])
 AX_NORMALIZE_PATH([with_rpmmacrosdir])
 AC_ARG_ENABLE([split-usr],
        AS_HELP_STRING([--enable-split-usr], [assume that /bin, /sbin aren't symlinks into /usr]),
        [],
@ -1641,6 +1732,7 @@ AC_SUBST([bashcompletiondir], [$with_bashcompletiondir])
 AC_SUBST([zshcompletiondir], [$with_zshcompletiondir])
 AC_SUBST([pamlibdir], [$with_pamlibdir])
 AC_SUBST([pamconfdir], [$with_pamconfdir])
 AC_SUBST([rpmmacrosdir], [$with_rpmmacrosdir])
 AC_SUBST([rootprefix], [$with_rootprefix])
 AC_SUBST([rootlibdir], [$with_rootlibdir])
@ -1651,7 +1743,7 @@ AC_CONFIG_FILES([
 AC_OUTPUT
 AC_MSG_RESULT([
-        $PACKAGE_NAME $VERSION
+        $PACKAGE_NAME $PACKAGE_VERSION
        libcryptsetup:                     ${have_libcryptsetup}
        PAM:                               ${have_pam}
@ -1671,7 +1763,9 @@ AC_MSG_RESULT([
        MICROHTTPD:                        ${have_microhttpd}
        GNUTLS:                            ${have_gnutls}
        libcurl:                           ${have_libcurl}
        libidn2:                           ${have_libidn2}
        libidn:                            ${have_libidn}
        IDN:                               ${have_idn}
        libiptc:                           ${have_libiptc}
        ELFUTILS:                          ${have_elfutils}
        binfmt:                            ${have_binfmt}
@ -1700,7 +1794,7 @@ AC_MSG_RESULT([
        default DNS servers:               ${DNS_SERVERS}
        default DNSSEC mode:               ${DEFAULT_DNSSEC_MODE}
        coredump:                          ${have_coredump}
-        polkit:                            ${have_polkit}
+        polkit:                            ${have_polkit} (legacy pkla support: ${polkit_pkla})
        efi:                               ${have_efi}
        gnuefi:                            ${have_gnuefi}
        efi arch:                          ${EFI_ARCH}
@ -1714,7 +1808,9 @@ AC_MSG_RESULT([
        blkid:                             ${have_blkid}
        libmount:                          ${have_libmount}
        dbus:                              ${have_dbus}
        glib:                              ${have_glib}
        nss-myhostname:                    ${have_myhostname}
        nss-systemd:                       ${have_nss_systemd}
        hwdb:                              ${enable_hwdb}
        tpm:                               ${have_tpm}
        Python:                            ${have_python}
@ -1740,6 +1836,7 @@ AC_MSG_RESULT([
        build Python:                      ${PYTHON}
        PAM modules dir:                   ${with_pamlibdir}
        PAM configuration dir:             ${with_pamconfdir}
        RPM macros dir:                    ${with_rpmmacrosdir}
        D-Bus policy dir:                  ${with_dbuspolicydir}
        D-Bus session dir:                 ${with_dbussessionservicedir}
        D-Bus system dir:                  ${with_dbussystemservicedir}
@ -1753,6 +1850,7 @@ AC_MSG_RESULT([
        TTY GID:                           ${TTY_GID}
        maximum system UID:                ${SYSTEM_UID_MAX}
        maximum system GID:                ${SYSTEM_GID_MAX}
        /dev/kvm access mode:              ${DEV_KVM_MODE}
        certificate root:                  ${CERTIFICATEROOT}
        support URL:                       ${SUPPORT_URL}
        nobody user name:                  ${NOBODY_USER_NAME}
--- a/docs/sysvinit/meson.build
+++ b/docs/sysvinit/meson.build
@ -0,0 +1,9 @@
 file = configure_file(
        input : 'README.in',
        output : 'README',
        configuration : substs)
 if conf.get('HAVE_SYSV_COMPAT', false)
        install_data(file,
                     install_dir : sysvinit_path)
 endif
--- a/docs/var-log/meson.build
+++ b/docs/var-log/meson.build
@ -0,0 +1,9 @@
 file = configure_file(
        input : 'README.in',
        output : 'README',
        configuration : substs)
 if conf.get('HAVE_SYSV_COMPAT', false)
        install_data(file,
                     install_dir : varlogdir)
 endif
--- a/hwdb/20-OUI.hwdb
+++ b/hwdb/20-OUI.hwdb
--- a/hwdb/20-acpi-vendor.hwdb
+++ b/hwdb/20-acpi-vendor.hwdb
@ -42,6 +42,9 @@ acpi:ATML*:
 acpi:AUTH*:
 ID_VENDOR_FROM_DATABASE=AuthenTec
 acpi:BOOT*:
 ID_VENDOR_FROM_DATABASE=Coreboot Project
 acpi:BOSC*:
 ID_VENDOR_FROM_DATABASE=Robert Bosch GmbH
@ -72,6 +75,9 @@ acpi:ELAN*:
 acpi:ESSX*:
 ID_VENDOR_FROM_DATABASE=Everest Semiconductor Co., Ltd.
 acpi:EXAR*:
 ID_VENDOR_FROM_DATABASE=Exar Corporation
 acpi:FRSC*:
 ID_VENDOR_FROM_DATABASE=Freescale, Inc
@ -141,6 +147,9 @@ acpi:MCHP*:
 acpi:MIPI*:
 ID_VENDOR_FROM_DATABASE=MIPI Alliance
 acpi:MRVL*:
 ID_VENDOR_FROM_DATABASE=Marvell Technology Group Ltd.
 acpi:MSAY*:
 ID_VENDOR_FROM_DATABASE=Microsoft Corporation
@ -951,6 +960,9 @@ acpi:BBH*:
 acpi:BBL*:
 ID_VENDOR_FROM_DATABASE=Brain Boxes Limited
 acpi:BBX*:
 ID_VENDOR_FROM_DATABASE=Black Box Corporation
 acpi:BCC*:
 ID_VENDOR_FROM_DATABASE=Beaver Computer Corporaton
@ -1326,6 +1338,9 @@ acpi:CHO*:
 acpi:CHP*:
 ID_VENDOR_FROM_DATABASE=CH Products
 acpi:CHR*:
 ID_VENDOR_FROM_DATABASE=christmann informationstechnik + medien GmbH & Co. KG
 acpi:CHS*:
 ID_VENDOR_FROM_DATABASE=Agentur Chairos
@ -2721,6 +2736,9 @@ acpi:GFN*:
 acpi:GGL*:
 ID_VENDOR_FROM_DATABASE=Google Inc.
 acpi:GGT*:
 ID_VENDOR_FROM_DATABASE=G2TOUCH KOREA
 acpi:GIC*:
 ID_VENDOR_FROM_DATABASE=General Inst. Corporation
@ -3099,6 +3117,9 @@ acpi:HYC*:
 acpi:HYD*:
 ID_VENDOR_FROM_DATABASE=Hydis Technologies.Co.,LTD
 acpi:HYL*:
 ID_VENDOR_FROM_DATABASE=Shanghai Chai Ming Huang Info&Tech Co, Ltd
 acpi:HYO*:
 ID_VENDOR_FROM_DATABASE=HYC CO., LTD.
@ -4530,6 +4551,9 @@ acpi:MVM*:
 acpi:MVN*:
 ID_VENDOR_FROM_DATABASE=Meta Company
 acpi:MVR*:
 ID_VENDOR_FROM_DATABASE=MediCapture, Inc.
 acpi:MVS*:
 ID_VENDOR_FROM_DATABASE=Microvision
@ -5220,6 +5244,9 @@ acpi:PMD*:
 acpi:PMM*:
 ID_VENDOR_FROM_DATABASE=Point Multimedia System
 acpi:PMS*:
 ID_VENDOR_FROM_DATABASE=Pabian Embedded Systems
 acpi:PMT*:
 ID_VENDOR_FROM_DATABASE=Promate Electronic Co., Ltd.
@ -5238,6 +5265,9 @@ acpi:PNR*:
 acpi:PNS*:
 ID_VENDOR_FROM_DATABASE=PanaScope
 acpi:PNT*:
 ID_VENDOR_FROM_DATABASE=HOYA Corporation PENTAX Lifecare Division
 acpi:PNX*:
 ID_VENDOR_FROM_DATABASE=Phoenix Technologies, Ltd.
@ -6414,6 +6444,9 @@ acpi:TCD*:
 acpi:TCE*:
 ID_VENDOR_FROM_DATABASE=Century Corporation
 acpi:TCF*:
 ID_VENDOR_FROM_DATABASE=Televic Conference
 acpi:TCH*:
 ID_VENDOR_FROM_DATABASE=Interaction Systems, Inc
@ -6489,6 +6522,9 @@ acpi:TEK*:
 acpi:TEL*:
 ID_VENDOR_FROM_DATABASE=Promotion and Display Technology Ltd.
 acpi:TEN*:
 ID_VENDOR_FROM_DATABASE=Tencent
 acpi:TER*:
 ID_VENDOR_FROM_DATABASE=TerraTec Electronic GmbH
@ -6570,6 +6606,9 @@ acpi:TLK*:
 acpi:TLL*:
 ID_VENDOR_FROM_DATABASE=Thinklogical
 acpi:TLN*:
 ID_VENDOR_FROM_DATABASE=Techlogix Networx
 acpi:TLS*:
 ID_VENDOR_FROM_DATABASE=Teleste Educational OY
@ -6696,6 +6735,9 @@ acpi:TRM*:
 acpi:TRN*:
 ID_VENDOR_FROM_DATABASE=Datacommunicatie Tron B.V.
 acpi:TRP*:
 ID_VENDOR_FROM_DATABASE=TRAPEZE GROUP
 acpi:TRS*:
 ID_VENDOR_FROM_DATABASE=Torus Systems Ltd
--- a/hwdb/20-pci-vendor-model.hwdb
+++ b/hwdb/20-pci-vendor-model.hwdb
--- a/hwdb/20-usb-vendor-model.hwdb
+++ b/hwdb/20-usb-vendor-model.hwdb
--- a/hwdb/60-evdev.hwdb
+++ b/hwdb/60-evdev.hwdb
@ -115,6 +115,13 @@ evdev:name:ETPS/2 Elantech Touchpad:dmi:*:svnASUSTeKCOMPUTERINC.:pn?550C?:*
 EVDEV_ABS_35=::31
 EVDEV_ABS_36=::30
 # Asus UX301L
 evdev:name:Elan Touchpad:dmi:*:svnASUSTeKCOMPUTERINC.:pnUX301LAA:*
 EVDEV_ABS_00=::30
 EVDEV_ABS_01=::29
 EVDEV_ABS_35=::30
 EVDEV_ABS_36=::29
 # Asus UX305
 evdev:name:Elan Touchpad:dmi:*:svnASUSTeKCOMPUTERINC.:pnUX305UA:*
 EVDEV_ABS_00=0:3097:32
@ -152,6 +159,13 @@ evdev:name:AlpsPS/2 ALPS DualPoint TouchPad:dmi:bvn*:bvr*:bd*:svnDellInc.:pnLati
 EVDEV_ABS_35=79:1841:22
 EVDEV_ABS_36=140:1325:29
 # Dell Latitude E7470
 evdev:name:AlpsPS/2 ALPS DualPoint TouchPad:dmi:bvn*:bvr*:bd*:svnDellInc.:pnLatitudeE7470*
 EVDEV_ABS_00=39:5856:59
 EVDEV_ABS_01=10:1532:29
 EVDEV_ABS_35=39:5856:59
 EVDEV_ABS_36=10:1532:29
 # Dell Precision 5510
 evdev:name:SynPS/2 Synaptics TouchPad:dmi:bvn*:bvr*:bd*:svnDellInc.:pnPrecision5510*
 EVDEV_ABS_00=::42
@ -178,6 +192,15 @@ evdev:name:AlpsPS/2 ALPS GlidePoint:dmi:bvn*:bvr*:bd*:svnDellInc.:pnXPSM1530*
 EVDEV_ABS_00=85:947:15
 EVDEV_ABS_01=154:726:18
 #####
 # Sun
 #####
 # Fujitsu Component - USB Touch Panel
 evdev:input:b0003v0430p0530*
 EVDEV_ABS_00=0:4096:16
 EVDEV_ABS_01=0:4096:16
 #########################################
 # Google
 #########################################
@ -268,6 +291,20 @@ evdev:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO*:pvrThinkPadX1Carbon4th*
 EVDEV_ABS_35=1262:5679:44
 EVDEV_ABS_36=1101:4824:65
 # Lenovo Thinkpad Carbon X1 5th gen.
 evdev:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO*:pvrThinkPadX1Carbon5th*
 EVDEV_ABS_00=::44
 EVDEV_ABS_01=::65
 EVDEV_ABS_35=::44
 EVDEV_ABS_36=::65
 # Lenovo Thinkpad Carbon X1 5th gen. (rmi4)
 evdev:name:Synaptics TM3289-002:dmi:*svnLENOVO*:pvrThinkPadX1Carbon5th*
 EVDEV_ABS_00=::19
 EVDEV_ABS_01=::19
 EVDEV_ABS_35=::19
 EVDEV_ABS_36=::19
 # Lenovo T460
 evdev:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO*:pn*ThinkPad*T460*
 EVDEV_ABS_00=1266:5677:44
@ -338,6 +375,13 @@ evdev:name:ETPS/2 Elantech Touchpad:dmi:*svnSAMSUNGELECTRONICSCO.,LTD.:pn305V4A/
 EVDEV_ABS_35=0:2480:28
 EVDEV_ABS_36=0:1116:24
 # Samsung 880Z5E
 evdev:name:ETPS/2 Elantech Touchpad:dmi:*svnSAMSUNGELECTRONICSCO.,LTD.:pn870Z5E/880Z5E/680Z5E*
 EVDEV_ABS_00=::30
 EVDEV_ABS_01=::29
 EVDEV_ABS_35=::30
 EVDEV_ABS_36=::29
 #########################################
 # Toshiba
 #########################################
@ -346,3 +390,12 @@ evdev:name:ETPS/2 Elantech Touchpad:dmi:*svnSAMSUNGELECTRONICSCO.,LTD.:pn305V4A/
 evdev:name:AlpsPS/2 ALPS DualPoint TouchPad:dmi:*svnTOSHIBA:pnTECRAM11*
 EVDEV_ABS_00=90:962:11
 EVDEV_ABS_01=51:681:14
 #########################################
 # Waltop
 #########################################
 # WALTOP International Corp. Slim Tablet
 evdev:input:b0003v172Fp0031*
 EVDEV_ABS_00=0:10000:400
 EVDEV_ABS_01=0:6250:400
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@ -1,7 +1,14 @@
 # This file is part of systemd.
 #
-# Keyboard mapping of scan codes to key codes, and
+# This file contains 3 types of metadata to apply to keyboards and
-# scan codes to add to the AT keyboard's 'force-release' list.
+# keyboard-like input devices:
 # - Key mapping
 # - Hard-coded layouts
 # - Absence of modifier LEDs
 #
 # The matching process is the same for the different types of metadata.
 #
 # ########################### MATCHING #######################################
 #
 # The lookup keys are composed in:
 #   60-evdev.rules
@ -40,11 +47,19 @@
 #    /sys/class/input/input?/capabilities/ev" and <vendor> is the
 #    firmware-provided string exported by the kernel DMI modalias,
 #    see /sys/class/dmi/id/modalias
 # ######################### KEY MAPPING ######################################
 #
 # Keyboard mapping of scan codes to key codes, and
 # scan codes to add to the AT keyboard's 'force-release' list.
 #
 # Scan codes are specified as:
 #   KEYBOARD_KEY_<hex scan code>=<key code identifier>
 # The scan code should be expressed in hex lowercase. The key codes
 # are retrieved and normalized from the kernel input API header.
 # Keycodes are either KEY_* defines in lowercase with the key_ prefix
 # optionally removed or BTN_ defines in lowercase with btn_ preserved.
 #
 # An '!' as the first character of the key identifier string
 # will add the scan code to the AT keyboard's list of scan codes
@ -67,7 +82,8 @@
 #   systemd-hwdb update
 #   udevadm trigger /dev/input/eventXX
 # where /dev/input/eventXX is the keyboard in question. If in
-# doubt, simply use /dev/input/event* to reload all input rules.
+# doubt, simply reload all input rules
 #   udevadm trigger --verbose --sysname-match="event*"
 #
 # If your changes are generally applicable, preferably send them as a pull
 # request to
@ -84,6 +100,7 @@
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pn*
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnGateway*:pnA0A1*:pvr*
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svneMachines:pneMachines*E725:pvr*
 KEYBOARD_KEY_86=wlan                                   # Fn+F3 or Fn+Q for comunication key
 KEYBOARD_KEY_a5=help                                   # Fn+F1
 KEYBOARD_KEY_a6=setup                                  # Fn+F2 Acer eSettings
 KEYBOARD_KEY_a7=battery                                # Fn+F3 Power Management
@ -105,6 +122,7 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svneMachines:pneMachines*E725:pvr*
 KEYBOARD_KEY_f3=prog2                                  # "P2" programmable button
 KEYBOARD_KEY_f4=prog1                                  # "P1" programmable button
 KEYBOARD_KEY_f5=presentation
 KEYBOARD_KEY_f6=power                                  # Power button
 KEYBOARD_KEY_f8=fn
 KEYBOARD_KEY_f9=prog1                                  # Launch NTI shadow
@ -144,6 +162,10 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*C3[01]0*:pvr*
 KEYBOARD_KEY_6b=fn
 KEYBOARD_KEY_6c=screenlock                             # FIXME: lock tablet device/buttons
 # Travelmate P648-G2-MG
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*P648-G2-MG*:pvr*
 KEYBOARD_KEY_8a=f20                                    # Microphone mute button; should be micmute
 # on some models this isn't brightnessup
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pn*5210*:pvr*
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pn*5220*:pvr*
@ -158,6 +180,10 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire*1640:*
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pnAOA*:pvr*
 KEYBOARD_KEY_a9=!switchvideomode                       # Fn+F5
 # Easynote models
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnPackard*Bell*:pnEasynote*:pvr*
 KEYBOARD_KEY_86=wlan                                   # Fn+F3 or Fn+Q for comunication key
 ###########################################################
 # Alienware
 ###########################################################
@ -222,7 +248,7 @@ evdev:input:b0003v049Fp0051*
 ###########################################################
 evdev:name:gpio-keys:phys:gpio-keys/input0:ev:3:dmi:bvn*:bvr*:bd*:svncube:pni1-TF:*
- KEYBOARD_KEY_0=home
+ KEYBOARD_KEY_0=leftmeta
 KEYBOARD_KEY_1=power
 ###########################################################
@ -291,6 +317,10 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnDell*:pnPrecision*:pvr*
 KEYBOARD_KEY_88=!                                      # wireless switch
 KEYBOARD_KEY_9e=!f21
 # Dell Latitude E7*
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnDell*:pnLatitude*E7*:pvr*
 KEYBOARD_KEY_88=unknown                                # Fn-PrtScr rfkill - handled in HW
 # Dell XPS
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnDell*:pnXPS*:pvr*
 KEYBOARD_KEY_8c=!unknown
@ -831,6 +861,7 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnMAXDATA:pnPro*7000*:pvr*
 ###########################################################
 # Akoya
 evdev:atkbd:dmi:bvn*:bvr*:svnMEDION*:pnS3409*:pvr*
 evdev:atkbd:dmi:bvn*:bvr*:svnMedion*:pnAkoya*:pvr*
 KEYBOARD_KEY_a0=!mute
 KEYBOARD_KEY_ae=!volumedown
@ -1274,9 +1305,13 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnDIXONSP:pnDIXON*:pvr*
 KEYBOARD_KEY_ae=!                                      # volume down
 KEYBOARD_KEY_b0=!                                      # volume up
-###########################################################
+######################### FIXED LAYOUT DEVICES #############################
-# Fixed layout devices
+# This section lists devices for which only one keyboard layout is possible
-###########################################################
+# or useful such as devices which "type" expecting the user's keymap to match
 # a particular one. For example, barcode readers and OTP keys.
 #
 # The layout must be an xkb compatible layout (defined with XKB_FIXED_LAYOUT),
 # with an accompanying variant (defined with XKB_FIXED_VARIANT) if necessary.
 # Yubico Yubico Yubikey II"
 evdev:input:b0003v1050p0010*
@ -1288,3 +1323,16 @@ evdev:input:b0003v1050p0116*
 evdev:input:b0003v05FEp1010*
 XKB_FIXED_LAYOUT="us"
 XKB_FIXED_VARIANT=""
 ######################### LACK OF MODIFIER LEDS ############################
 # This section lists keyboard which do not have their own LEDs for some
 # modifiers. Only Caps-Lock (KEYBOARD_LED_CAPSLOCK) and Num-Lock
 # (KEYBOARD_LED_CAPSLOCK) are currently handled and need their values set
 # to "0" to indicate the absence of LED.
 #
 # Presence of a LED is implicit when the property is absent.
 # Logitech K750
 evdev:input:b0003v046Dp4002*
 KEYBOARD_LED_NUMLOCK=0
 KEYBOARD_LED_CAPSLOCK=0
--- a/hwdb/60-sensor.hwdb
+++ b/hwdb/60-sensor.hwdb
@ -47,8 +47,31 @@
 sensor:modalias:acpi:SMO8500*:dmi:*svn*ASUSTeK*:*pn*TP500LB*
 ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 0
 sensor:modalias:acpi:SMO8500*:dmi:*svn*ASUSTeK*:*pn*TP300LJ*
 ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
 #########################################
 # Endless
 #########################################
 sensor:modalias:acpi:ACCE0001*:dmi:*svnEndless*:*pnELT-NL3*
 ACCEL_MOUNT_MATRIX=0, 1, 0; 0, 0, -1; -1, 0, 0
 #########################################
 # HP
 #########################################
 sensor:modalias:platform:lis3lv02d:dmi:*svn*Hewlett-Packard*:*pn*HPEliteBook8540w*
 sensor:modalias:platform:lis3lv02d:dmi:*svn*Hewlett-Packard*:*pn*HPEliteBook8560w*
  ACCEL_MOUNT_MATRIX=1, 0, 0; 0, 0, -1; 0, 1, 0
 #########################################
 # Winbook
 #########################################
 sensor:modalias:acpi:BMA250*:dmi:*svn*WinBook*:*pn*TW100*
 ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 0
 #########################################
 # Cytrix (Mytrix)
 #########################################
 sensor:modalias:acpi:*KIOX000A*:dmi:*svn*CytrixTechnology:*pn*Complex11t*
 ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, 1, 0; 0, 0, 1
--- a/hwdb/70-joystick.hwdb
+++ b/hwdb/70-joystick.hwdb
@ -0,0 +1,50 @@
 # This file is part of systemd.
 #
 # Database for joystick device information that cannot be queried directly.
 #
 # The lookup keys are composed in:
 #   70-joystick.rules
 #
 # Note: The format of the "joystick:" prefix match key is a
 # contract between the rules file and the hardware data, it might
 # change in later revisions to support more or better matches, it
 # is not necessarily expected to be a stable ABI.
 #
 # Match string format:
 # joystick:<bustype>:v<vid>p<pid>:name:<name>:
 #
 # vid/pid as 4-digit hex lowercase vendor/product
 #
 # To add local entries, create a new file
 #   /etc/udev/hwdb.d/71-joystick-local.hwdb
 # and add your rules there. To load the new rules execute (as root):
 #   systemd-hwdb update
 #   udevadm trigger /dev/input/eventXX
 # where /dev/input/eventXX is the joystick in question. If in
 # doubt, simply use /dev/input/event* to reload all input rules.
 #
 # If your changes are generally applicable, preferably send them as a pull
 # request to
 #   https://github.com/systemd/systemd
 # or create a bug report on https://github.com/systemd/systemd/issues and
 # include your new rules, a description of the device, and the output of
 #   udevadm info /dev/input/eventXX.
 #
 # Permitted keys:
 #   Specify if a joystick is a built-in one or external:
 #   ID_INPUT_JOYSTICK_INTEGRATION=internal|external
 #
 #   If the property is missing, user-space can assume:
 #   ID_INPUT_JOYSTICK_INTEGRATION=external
 joystick:bluetooth:*
 ID_INPUT_JOYSTICK_INTEGRATION=external
 ###########################################################
 # GPD
 ###########################################################
 # GPD Win, Classic and XBox 360 compat modes
 joystick:usb:v11c5p5507*
 joystick:usb:v045ep028e*
 ID_INPUT_JOYSTICK_INTEGRATION=internal
--- a/hwdb/70-mouse.hwdb
+++ b/hwdb/70-mouse.hwdb
@ -213,6 +213,14 @@ mouse:usb:v0461p4d46:name:USB Optical Mouse:
 mouse:usb:v0461p4d16:name:USB Optical Mouse:
 MOUSE_DPI=500@125
 ##########################################
 # Future Technology Devices International
 ##########################################
 # SNES Mouse plugged into a Retrode 2
 mouse:usb:v0403p97c1:name:Retrode SNES Mouse:
 MOUSE_DPI=235@126
 ##########################################
 # HandShoe Mouse
 ##########################################
@ -243,6 +251,14 @@ mouse:usb:v093ap2510:name:PixArt USB Optical Mouse:
 mouse:usb:v093ap2510:name:PIXART USB OPTICAL MOUSE:
 MOUSE_DPI=1000@125
 ##########################################
 # IBM
 ##########################################
 # IBM USB Travel Mouse (MO32BO)
 mouse:usb:v04b3p3107:name:*
 MOUSE_DPI=800@125
 ##########################################
 # Lenovo
 ##########################################
--- a/hwdb/70-pointingstick.hwdb
+++ b/hwdb/70-pointingstick.hwdb
@ -126,10 +126,16 @@ evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadX1Ta
 POINTINGSTICK_SENSITIVITY=200
 POINTINGSTICK_CONST_ACCEL=1.0
-# Lenovo Thinkpad X200s / X201s
+# Lenovo Thinkpad X200/X201/X200s/X201s
 # Note these come with 2 revisions of keyboard, with the trackpoints having a
 # different sensitivity in the different revisions. 1.25 is a bit slow for the
 # least sensitive revision, but it is better to be a bit slow than too fast.
-evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadX20?s:*
+evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadX20?:*
 evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadX20??:*
 POINTINGSTICK_SENSITIVITY=200
 POINTINGSTICK_CONST_ACCEL=1.25
 # Lenovo UltraNav SK-8845 (USB keyboard)
 evdev:input:b0003v06CBp0009*
 POINTINGSTICK_CONST_ACCEL=2.5
 POINTINGSTICK_SENSITIVITY=200
--- a/hwdb/70-touchpad.hwdb
+++ b/hwdb/70-touchpad.hwdb
@ -53,3 +53,10 @@ touchpad:usb:v05ac*
 ###########################################################
 touchpad:usb:v056a*
 ID_INPUT_TOUCHPAD_INTEGRATION=external
 ###########################################################
 # Microsoft (Surface Type Covers)
 ###########################################################
 touchpad:usb:v045ep07*
 ID_INPUT_TOUCHPAD_INTEGRATION=internal
--- a/hwdb/acpi-update.py
+++ b/hwdb/acpi-update.py
@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 from html.parser import HTMLParser
 from enum import Enum
--- a/hwdb/meson.build
+++ b/hwdb/meson.build
@ -0,0 +1,43 @@
 hwdb_files = files('''
        20-pci-vendor-model.hwdb
        20-pci-classes.hwdb
        20-usb-vendor-model.hwdb
        20-usb-classes.hwdb
        20-sdio-vendor-model.hwdb
        20-sdio-classes.hwdb
        20-bluetooth-vendor-product.hwdb
        20-acpi-vendor.hwdb
        20-OUI.hwdb
        20-net-ifname.hwdb
        60-evdev.hwdb
        60-keyboard.hwdb
        60-sensor.hwdb
        70-mouse.hwdb
        70-pointingstick.hwdb
        70-touchpad.hwdb
 '''.split())
 if conf.get('ENABLE_HWDB', false)
        install_data(hwdb_files,
                     install_dir : udevhwdbdir)
        meson.add_install_script('sh', '-c',
                                 mkdir_p.format(join_paths(sysconfdir, 'udev/hwdb.d')))
        meson.add_install_script('sh', '-c',
                                 'test -n "$DESTDIR" || @0@/systemd-hwdb update'
                                 .format(rootbindir))
 endif
 ############################################################
 parse_hwdb_py = find_program('parse_hwdb.py')
 test('parse-hwdb',
     parse_hwdb_py,
     timeout : 90)
 ############################################################
 run_target(
        'update',
        command : [hwdb_update_sh, meson.current_source_dir()])
--- a/hwdb/parse_hwdb.py
+++ b/hwdb/parse_hwdb.py
@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
 #
 # This file is part of systemd. It is distrubuted under the MIT license, see
@ -66,6 +66,7 @@ UDEV_TAG = Word(string.ascii_uppercase, alphanums + '_')
 TYPES = {'mouse':    ('usb', 'bluetooth', 'ps2', '*'),
         'evdev':    ('name', 'atkbd', 'input'),
         'touchpad': ('i8042', 'rmi', 'bluetooth', 'usb'),
         'joystick': ('i8042', 'rmi', 'bluetooth', 'usb'),
         'keyboard': ('name', ),
         'sensor':   ('modalias', ),
        }
@ -109,9 +110,12 @@ def property_grammar():
             ('MOUSE_WHEEL_TILT_VERTICAL', Literal('1')),
             ('POINTINGSTICK_SENSITIVITY', INTEGER),
             ('POINTINGSTICK_CONST_ACCEL', REAL),
             ('ID_INPUT_JOYSTICK_INTEGRATION', Or(('internal', 'external'))),
             ('ID_INPUT_TOUCHPAD_INTEGRATION', Or(('internal', 'external'))),
             ('XKB_FIXED_LAYOUT', STRING),
             ('XKB_FIXED_VARIANT', STRING),
             ('KEYBOARD_LED_NUMLOCK', Literal('0')),
             ('KEYBOARD_LED_CAPSLOCK', Literal('0')),
             ('ACCEL_MOUNT_MATRIX', mount_matrix),
            )
    fixed_props = [Literal(name)('NAME') - Suppress('=') - val('VALUE')
@ -168,7 +172,9 @@ def check_one_keycode(prop, value):
    if value != '!' and ecodes is not None:
        key = 'KEY_' + value.upper()
        if key not in ecodes:
-            error('Keycode {} unknown', key)
+            key = value.upper()
            if key not in ecodes:
                error('Keycode {} unknown', key)
 def check_properties(groups):
    grammar = property_grammar()
--- a/man/90-rearrange-path.py
+++ b/man/90-rearrange-path.py
@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 """
--- a/man/custom-entities.ent.in
+++ b/man/custom-entities.ent.in
@ -0,0 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!ENTITY MOUNT_PATH @MOUNT_PATH@>
 <!ENTITY UMOUNT_PATH @UMOUNT_PATH@>
 <!ENTITY systemgeneratordir @SYSTEM_GENERATOR_PATH@>
 <!ENTITY usergeneratordir @USER_GENERATOR_PATH@>
 <!ENTITY systemenvgeneratordir @SYSTEM_ENV_GENERATOR_PATH@>
 <!ENTITY userenvgeneratordir @USER_ENV_GENERATOR_PATH@>
--- a/man/environment.d.xml
+++ b/man/environment.d.xml
@ -20,7 +20,8 @@
  You should have received a copy of the GNU Lesser General Public License
  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
-<refentry id="environment.d" xmlns:xi="http://www.w3.org/2001/XInclude">
+<refentry id="environment.d" conditional='ENABLE_ENVIRONMENT_D'
    xmlns:xi="http://www.w3.org/2001/XInclude">
  <refentryinfo>
    <title>environment.d</title>
@ -103,7 +104,7 @@
        <programlisting>
        FOO_DEBUG=force-software-gl,log-verbose
        PATH=/opt/foo/bin:$PATH
-        LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}/opt/foo/lib
+        LD_LIBRARY_PATH=/opt/foo/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
        XDG_DATA_DIRS=/opt/foo/share:${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/}
        </programlisting>
      </example>
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@ -270,13 +270,23 @@
              </listitem>
            </varlistentry>
            <varlistentry>
              <term>
                <option>short-iso-precise</option>
              </term>
              <listitem>
                <para>as for <option>short-iso</option> but includes full
                microsecond precision.</para>
              </listitem>
            </varlistentry>
            <varlistentry>
              <term>
                <option>short-precise</option>
              </term>
              <listitem>
-                <para>is very similar, but shows timestamps with full
+                <para>is very similar, but shows classic syslog timestamps
-                microsecond precision.</para>
+                with full microsecond precision.</para>
              </listitem>
            </varlistentry>
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@ -59,8 +59,8 @@
    kernel command line arguments.</para>
    <para>For command line parameters understood by the kernel, please
-    see <ulink
+    see
-    url="https://www.kernel.org/doc/Documentation/kernel-parameters.txt"><filename>kernel-parameters.txt</filename></ulink>
+    <ulink url="https://www.kernel.org/doc/html/latest/admin-guide/kernel-parameters.html"><filename>kernel-parameters.html</filename></ulink>
    and
    <citerefentry project='man-pages'><refentrytitle>bootparam</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
--- a/man/less-variables.xml
+++ b/man/less-variables.xml
@ -12,8 +12,8 @@
      <listitem><para>Pager to use when <option>--no-pager</option> is not given; overrides
      <varname>$PAGER</varname>. If neither <varname>$SYSTEMD_PAGER</varname> nor <varname>$PAGER</varname> are set, a
      set of well-known pager implementations are tried in turn, including
-      <citerefentry><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></citerefentry> and
+      <citerefentry project='man-pages'><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></citerefentry> and
-      <citerefentry><refentrytitle>more</refentrytitle><manvolnum>1</manvolnum></citerefentry>, until one is found. If
+      <citerefentry project='man-pages'><refentrytitle>more</refentrytitle><manvolnum>1</manvolnum></citerefentry>, until one is found. If
      no pager implementation is discovered no pager is invoked. Setting this environment variable to an empty string
      or the value <literal>cat</literal> is equivalent to passing <option>--no-pager</option>.</para></listitem>
    </varlistentry>
--- a/man/locale.conf.xml
+++ b/man/locale.conf.xml
@ -91,12 +91,14 @@
    might be checked for locale configuration as well, however only as
    fallback.</para>
-    <para><citerefentry project='man-pages'><refentrytitle>localectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+    <para><filename>/etc/vconsole.conf</filename> is usually created and updated
    using
    <citerefentry><refentrytitle>systemd-localed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
    <citerefentry project='man-pages'><refentrytitle>localectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
    may be used to alter the settings in this file during runtime from
    the command line. Use
    <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    to initialize them on mounted (but not booted) system
+    to initialize them on mounted (but not booted) system images.</para>
    images.</para>
  </refsect1>
  <refsect1>
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@ -244,8 +244,9 @@
        <para>A different application may disable logind's handling of system power and
        sleep keys and the lid switch by taking a low-level inhibitor lock
-        ("handle-power-key", "handle-suspend-key", "handle-hibernate-key",
+        (<literal>handle-power-key</literal>, <literal>handle-suspend-key</literal>,
-        "handle-lid-switch"). This is most commonly used by graphical desktop environments
+        <literal>handle-hibernate-key</literal>, <literal>handle-lid-switch</literal>).
        This is most commonly used by graphical desktop environments
        to take over suspend and hibernation handling, and to use their own configuration
        mechanisms. If a low-level inhibitor lock is taken, logind will not take any
        action when that key or switch is triggered and the <varname>Handle*=</varname>
@ -261,7 +262,9 @@
        <listitem><para>Controls whether actions that <command>systemd-logind</command>
        takes when the power and sleep keys and the lid switch are triggered are subject
        to high-level inhibitor locks ("shutdown", "sleep", "idle"). Low level inhibitor
-        locks ("handle-*-key"), are always honored, irrespective of this setting.</para>
+        locks (<literal>handle-power-key</literal>, <literal>handle-suspend-key</literal>,
        <literal>handle-hibernate-key</literal>, <literal>handle-lid-switch</literal>),
        are always honored, irrespective of this setting.</para>
        <para>These settings take boolean arguments. If <literal>no</literal>, the
        inhibitor locks taken by applications are respected. If <literal>yes</literal>,
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@ -713,19 +713,22 @@
        is automatically derived from the last component of the URL,
        with its suffix removed.</para>
-        <para>The image is verified before it is made available,
+        <para>The image is verified before it is made available, unless
-        unless <option>--verify=no</option> is specified. Verification
+        <option>--verify=no</option> is specified.
-        is done via SHA256SUMS and SHA256SUMS.gpg files that need to
+        Verification is done either via an inline signed file with the name
-        be made available on the same web server, under the same URL
+        of the image and the suffix <filename>.sha256</filename> or via
-        as the <filename>.tar</filename> file, but with the last
+        separate <filename>SHA256SUMS</filename> and
-        component (the filename) of the URL replaced. With
+        <filename>SHA256SUMS.gpg</filename> files.
-        <option>--verify=checksum</option>, only the SHA256 checksum
+        The signature files need to be made available on the same web
-        for the file is verified, based on the
+        server, under the same URL as the <filename>.tar</filename> file.
-        <filename>SHA256SUMS</filename> file. With
+        With <option>--verify=checksum</option>, only the SHA256 checksum
-        <option>--verify=signature</option>, the SHA256SUMS file is
+        for the file is verified, based on the <filename>.sha256</filename>
-        first verified with detached GPG signature file
+        suffixed file or the<filename>SHA256SUMS</filename> file.
-        <filename>SHA256SUMS.gpg</filename>. The public key for this
+        With <option>--verify=signature</option>, the sha checksum file is
-        verification step needs to be available in
+        first verified with the inline signature in the
        <filename>.sha256</filename> file or the detached GPG signature file
        <filename>SHA256SUMS.gpg</filename>.
        The public key for this verification step needs to be available in
        <filename>/usr/lib/systemd/import-pubring.gpg</filename> or
        <filename>/etc/systemd/import-pubring.gpg</filename>.</para>
--- a/man/meson.build
+++ b/man/meson.build
@ -0,0 +1,204 @@
 # This is lame, I know, but meson has no other include mechanism
 subdir('rules')
 want_man = get_option('man')
 want_html = get_option('html')
 xsltproc = find_program('xsltproc',
                        required : want_man == 'true' or want_html == 'true')
 want_man = want_man != 'false' and xsltproc.found()
 want_html = want_html != 'false' and xsltproc.found()
 xsltproc_flags = [
        '--nonet',
        '--xinclude',
        '--stringparam', 'man.output.quietly', '1',
        '--stringparam', 'funcsynopsis.style', 'ansi',
        '--stringparam', 'man.authors.section.enabled', '0',
        '--stringparam', 'man.copyright.section.enabled', '0',
        '--stringparam', 'systemd.version', '@0@'.format(meson.project_version()),
        '--path',
        '@0@:@1@'.format(meson.current_build_dir(), meson.current_source_dir())]
 custom_man_xsl = files('custom-man.xsl')
 custom_html_xsl = files('custom-html.xsl')
 xslt_cmd = [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags
 custom_entities_ent = configure_file(
        input : 'custom-entities.ent.in',
        output : 'custom-entities.ent',
        configuration : conf)
 man_pages = []
 html_pages = []
 source_xml_files = []
 foreach tuple : manpages
        stem = tuple[0]
        section = tuple[1]
        aliases = tuple[2]
        condition = tuple[3]
        xml = stem + '.xml'
        html = stem + '.html'
        man = stem + '.' + section
        manaliases = []
        htmlaliases = []
        foreach alias : aliases
                manaliases += [alias + '.' + section]
                htmlaliases += [alias + '.html']
        endforeach
        mandirn = join_paths(get_option('mandir'), 'man' + section)
        if condition == '' or conf.get(condition, false)
                p1 = custom_target(
                        man,
                        input : xml,
                        output : [man] + manaliases,
                        command : xslt_cmd + [custom_man_xsl, '@INPUT@'],
                        depend_files : custom_entities_ent,
                        install : want_man,
                        install_dir : mandirn)
                man_pages += [p1]
                p2 = []
                foreach htmlalias : htmlaliases
                        link = custom_target(
                                htmlalias,
                                input : p2,
                                output : htmlalias,
                                command : ['ln', '-fs', html, '@OUTPUT@'])
                        if want_html
                                dst = join_paths(docdir, 'html', htmlalias)
                                cmd = 'ln -fs @0@ $DESTDIR@1@'.format(html, dst)
                                meson.add_install_script('sh', '-c', cmd)
                                p2 += [link]
                        endif
                        html_pages += [link]
                endforeach
                p3 = custom_target(
                        html,
                        input : xml,
                        output : html,
                        command : xslt_cmd + [custom_html_xsl, '@INPUT@'],
                        depend_files : custom_entities_ent,
                        depends : p2,
                        install : want_html,
                        install_dir : join_paths(docdir, 'html'))
                html_pages += [p3]
                source_xml_files += files(tuple[0] + '.xml')
        else
                message('Skipping @0@.@1@ because @2@ is false'.format(stem, section, condition))
        endif
 endforeach
 ############################################################
 have_lxml = run_command(xml_helper_py).returncode() == 0
 if not have_lxml
        message('python-lxml not available, not making man page indices')
 endif
 systemd_directives_xml = custom_target(
        'systemd.directives.xml',
        input : source_xml_files,
        output : 'systemd.directives.xml',
        command : [make_directive_index_py, '@OUTPUT@'] + source_xml_files)
 nonindex_xml_files = source_xml_files + [systemd_directives_xml]
 systemd_index_xml = custom_target(
        'systemd.index.xml',
        input : nonindex_xml_files,
        output : 'systemd.index.xml',
        command : [make_man_index_py, '@OUTPUT@'] + nonindex_xml_files)
 foreach tuple : [['systemd.directives', '7', systemd_directives_xml],
                 ['systemd.index',      '7', systemd_index_xml]]
        stem = tuple[0]
        section = tuple[1]
        xml = tuple[2]
        html = stem + '.html'
        man = stem + '.' + section
        mandirn = join_paths(get_option('mandir'), 'man' + section)
        p1 = custom_target(
                man,
                input : xml,
                output : man,
                command : xslt_cmd + [custom_man_xsl, '@INPUT@'],
                install : want_man and have_lxml,
                install_dir : mandirn)
        man_pages += [p1]
        p2 = []
        if html == 'systemd.index.html'
                htmlalias = 'index.html'
                link = custom_target(
                        htmlalias,
                        input : p2,
                        output : htmlalias,
                        command : ['ln', '-fs', html, '@OUTPUT@'])
                if want_html
                        dst = join_paths(docdir, 'html', htmlalias)
                        cmd = 'ln -fs @0@ $DESTDIR@1@'.format(html, dst)
                        meson.add_install_script('sh', '-c', cmd)
                        p2 += [link]
                endif
                html_pages += [link]
        endif
        p3 = custom_target(
                html,
                input : xml,
                output : html,
                command : xslt_cmd + [custom_html_xsl, '@INPUT@'],
                depend_files : custom_entities_ent,
                depends : p2,
                install : want_html and have_lxml,
                install_dir : join_paths(docdir, 'html'))
        html_pages += [p3]
 endforeach
 # cannot use run_target until https://github.com/mesonbuild/meson/issues/1644 is resolved
 man = custom_target(
        'man',
        output : 'man',
        depends : man_pages,
        command : ['echo'])
 html = run_target(
        'html',
        depends : html_pages,
        output : 'html',
        command : ['echo'])
 run_target(
        'doc-sync',
        depends : man_pages + html_pages,
        command : ['rsync', '-rlv',
                   '--delete-excluded',
                   '--include=man',
                   '--include=*.html',
                   '--exclude=*',
                   '--omit-dir-times',
                   meson.current_build_dir(),
                   get_option('www-target')])
 ############################################################
 if git.found()
        run_target(
                'update-man-rules',
                # slightly strange syntax because of
                # https://github.com/mesonbuild/meson/issues/1643
                # and https://github.com/mesonbuild/meson/issues/1512
                command : ['sh', '-c',
                           'cd @0@ && '.format(meson.build_root()) +
                           'python3 @0@/tools/make-man-rules.py --meson `git ls-files ":/man/*.xml"` >t && '.format(meson.source_root()) +
                           'mv t @0@/rules/meson.build'.format(meson.current_source_dir())],
                depend_files : custom_entities_ent)
 endif
--- a/man/networkctl.xml
+++ b/man/networkctl.xml
@ -172,14 +172,40 @@ s - Service VLAN, m - Two-port MAC Relay (TPMR)
 1 neighbors listed.</programlisting></para>
        </listitem>
      </varlistentry>
      <varlistentry>
        <term>
          <command>label</command>
        </term>
        <listitem><para>Show numerical address labels that can be used for address selection.
        This is the same information that
        <citerefentry><refentrytitle>ip-addrlabel</refentrytitle><manvolnum>8</manvolnum></citerefentry>
        shows. See <ulink url="https://tools.ietf.org/html/rfc3484">RFC 3484</ulink>
        for a discussion of address labels.</para>
        <para>Produces output similar to:
        <programlisting>Prefix/Prefixlen                          Label
        ::/0                                  1
    fc00::/7                                  5
    fec0::/10                                11
    2002::/16                                 2
    3ffe::/16                                12
 2001:10::/28                                 7
    2001::/32                                 6
 ::ffff:0.0.0.0/96                             4
        ::/96                                 3
       ::1/128                                0</programlisting></para>
        </listitem>
      </varlistentry>
    </variablelist>
  </refsect1>
  <refsect1>
    <title>Exit status</title>
-    <para>On success, 0 is returned, a non-zero failure
+    <para>On success, 0 is returned, a non-zero failure code otherwise.</para>
    code otherwise.</para>
  </refsect1>
  <refsect1>
@ -187,7 +213,8 @@ s - Service VLAN, m - Two-port MAC Relay (TPMR)
    <para>
      <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
      <citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+      <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
      <citerefentry project='die-net'><refentrytitle>ip</refentrytitle><manvolnum>8</manvolnum></citerefentry>
    </para>
  </refsect1>
 </refentry>
--- a/man/nss-resolve.xml
+++ b/man/nss-resolve.xml
@ -63,13 +63,24 @@
    hostnames via DNS.</para>
    <para>To activate the NSS module, add <literal>resolve</literal> to the line starting with
-    <literal>hosts:</literal> in <filename>/etc/nsswitch.conf</filename>. Specifcally, it is recommended to place
+    <literal>hosts:</literal> in <filename>/etc/nsswitch.conf</filename>. Specifically, it is recommended to place
-    <literal>resolve</literal> early in <filename>/etc/nsswitch.conf</filename>' <literal>hosts:</literal> line (but
+    <literal>resolve</literal> early in <filename>/etc/nsswitch.conf</filename>'s <literal>hosts:</literal> line (but
    after the <literal>files</literal> or <literal>mymachines</literal> entries), right before the
    <literal>dns</literal> entry if it exists, followed by <literal>[!UNAVAIL=return]</literal>, to ensure DNS queries
    are always routed via
    <citerefentry><refentrytitle>systemd-resolved</refentrytitle><manvolnum>8</manvolnum></citerefentry> if it is
    running, but are routed to <command>nss-dns</command> if this service is not available.</para>
    <para>Note that <command>systemd-resolved</command> will synthesize DNS resource
    records in a few cases, for example for <literal>localhost</literal> and the
    current hostname, see
    <citerefentry><refentrytitle>systemd-resolved</refentrytitle><manvolnum>8</manvolnum></citerefentry>
    for the full list. This duplicates the functionality of
    <citerefentry><refentrytitle>nss-myhostname</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
    but it is still recommended (see examples below) to keep
    <command>nss-myhostname</command> configured in
    <filename>/etc/nsswitch.conf</filename>, to keep those names resolveable if
    <command>systemd-resolved</command> is not running.</para>
  </refsect1>
  <refsect1>
--- a/man/nss-systemd.xml
+++ b/man/nss-systemd.xml
@ -21,7 +21,7 @@
  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
-<refentry id="nss-systemd">
+<refentry id="nss-systemd" conditional='ENABLE_NSS_SYSTEMD'>
  <refentryinfo>
    <title>nss-systemd</title>
--- a/man/pam_systemd.xml
+++ b/man/pam_systemd.xml
@ -88,7 +88,7 @@
      and so will the user's slice unit.</para></listitem>
      <listitem><para>If the last concurrent session of a user ends,
-      the <varname>$XDG_RUNTIME_DIR</varname> directory and all its
+      the user runtime directory <filename>/run/user/$UID</filename> and all its
      contents are removed, too.</para></listitem>
    </orderedlist>
@ -192,7 +192,8 @@
        offers the greatest possible file system feature set the
        operating system provides. For further details, see the <ulink
        url="http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html">XDG
-        Base Directory Specification</ulink>.</para></listitem>
+        Base Directory Specification</ulink>. <varname>$XDG_RUNTIME_DIR</varname>
        is not set if the current user is not the original user of the session.</para></listitem>
      </varlistentry>
    </variablelist>
--- a/man/resolved.conf.xml
+++ b/man/resolved.conf.xml
@ -126,6 +126,21 @@
        global setting is on.</para></listitem>
      </varlistentry>
      <varlistentry>
        <term><varname>MulticastDNS=</varname></term>
        <listitem><para>Takes a boolean argument or
        <literal>resolve</literal>. Controls Multicast DNS support (<ulink
        url="https://tools.ietf.org/html/rfc6762">RFC 6762</ulink>) on
        the local host. If true, enables full Multicast DNS responder and
        resolver support. If false, disables both. If set to
        <literal>resolve</literal>, only resolution support is enabled,
        but responding is disabled. Note that
        <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
        also maintains per-link Multicast DNS settings. Multicast DNS will be
        enabled on a link only if the per-link and the
        global setting is on.</para></listitem>
      </varlistentry>
      <varlistentry>
        <term><varname>DNSSEC=</varname></term>
        <listitem><para>Takes a boolean argument or
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@ -0,0 +1,766 @@
 # Do not edit. Generated by make-man-rules.py.
 manpages = [
 ['binfmt.d', '5', [], 'ENABLE_BINFMT'],
 ['bootctl', '1', [], 'ENABLE_EFI'],
 ['bootup', '7', [], ''],
 ['busctl', '1', [], ''],
 ['coredump.conf', '5', ['coredump.conf.d'], 'ENABLE_COREDUMP'],
 ['coredumpctl', '1', [], 'ENABLE_COREDUMP'],
 ['crypttab', '5', [], 'HAVE_LIBCRYPTSETUP'],
 ['daemon', '7', [], ''],
 ['dnssec-trust-anchors.d',
  '5',
  ['systemd.negative', 'systemd.positive'],
  'ENABLE_RESOLVED'],
 ['environment.d', '5', [], 'ENABLE_ENVIRONMENT_D'],
 ['file-hierarchy', '7', [], ''],
 ['halt', '8', ['poweroff', 'reboot'], ''],
 ['hostname', '5', [], ''],
 ['hostnamectl', '1', [], 'ENABLE_HOSTNAMED'],
 ['hwdb', '7', [], 'ENABLE_HWDB'],
 ['journal-remote.conf', '5', ['journal-remote.conf.d'], 'HAVE_MICROHTTPD'],
 ['journal-upload.conf', '5', ['journal-upload.conf.d'], 'HAVE_MICROHTTPD'],
 ['journalctl', '1', [], ''],
 ['journald.conf', '5', ['journald.conf.d'], ''],
 ['kernel-command-line', '7', [], ''],
 ['kernel-install', '8', [], ''],
 ['libudev', '3', [], ''],
 ['locale.conf', '5', [], ''],
 ['localectl', '1', [], 'ENABLE_LOCALED'],
 ['localtime', '5', [], ''],
 ['loginctl', '1', [], 'ENABLE_LOGIND'],
 ['logind.conf', '5', ['logind.conf.d'], 'ENABLE_LOGIND'],
 ['machine-id', '5', [], ''],
 ['machine-info', '5', [], ''],
 ['machinectl', '1', [], 'ENABLE_MACHINED'],
 ['modules-load.d', '5', [], 'HAVE_KMOD'],
 ['networkctl', '1', [], 'ENABLE_NETWORKD'],
 ['networkd.conf', '5', ['networkd.conf.d'], 'ENABLE_NETWORKD'],
 ['nss-myhostname', '8', ['libnss_myhostname.so.2'], 'HAVE_MYHOSTNAME'],
 ['nss-mymachines', '8', ['libnss_mymachines.so.2'], 'ENABLE_MACHINED'],
 ['nss-resolve', '8', ['libnss_resolve.so.2'], 'ENABLE_RESOLVED'],
 ['nss-systemd', '8', ['libnss_systemd.so.2'], 'ENABLE_NSS_SYSTEMD'],
 ['os-release', '5', [], ''],
 ['pam_systemd', '8', [], 'HAVE_PAM'],
 ['resolved.conf', '5', ['resolved.conf.d'], 'ENABLE_RESOLVED'],
 ['runlevel', '8', [], 'HAVE_UTMP'],
 ['sd-bus-errors',
  '3',
  ['SD_BUS_ERROR_ACCESS_DENIED',
   'SD_BUS_ERROR_ADDRESS_IN_USE',
   'SD_BUS_ERROR_AUTH_FAILED',
   'SD_BUS_ERROR_BAD_ADDRESS',
   'SD_BUS_ERROR_DISCONNECTED',
   'SD_BUS_ERROR_FAILED',
   'SD_BUS_ERROR_FILE_EXISTS',
   'SD_BUS_ERROR_FILE_NOT_FOUND',
   'SD_BUS_ERROR_INCONSISTENT_MESSAGE',
   'SD_BUS_ERROR_INTERACTIVE_AUTHORIZATION_REQUIRED',
   'SD_BUS_ERROR_INVALID_ARGS',
   'SD_BUS_ERROR_INVALID_SIGNATURE',
   'SD_BUS_ERROR_IO_ERROR',
   'SD_BUS_ERROR_LIMITS_EXCEEDED',
   'SD_BUS_ERROR_MATCH_RULE_INVALID',
   'SD_BUS_ERROR_MATCH_RULE_NOT_FOUND',
   'SD_BUS_ERROR_NAME_HAS_NO_OWNER',
   'SD_BUS_ERROR_NOT_SUPPORTED',
   'SD_BUS_ERROR_NO_MEMORY',
   'SD_BUS_ERROR_NO_NETWORK',
   'SD_BUS_ERROR_NO_REPLY',
   'SD_BUS_ERROR_NO_SERVER',
   'SD_BUS_ERROR_PROPERTY_READ_ONLY',
   'SD_BUS_ERROR_SERVICE_UNKNOWN',
   'SD_BUS_ERROR_TIMEOUT',
   'SD_BUS_ERROR_UNIX_PROCESS_ID_UNKNOWN',
   'SD_BUS_ERROR_UNKNOWN_INTERFACE',
   'SD_BUS_ERROR_UNKNOWN_METHOD',
   'SD_BUS_ERROR_UNKNOWN_OBJECT',
   'SD_BUS_ERROR_UNKNOWN_PROPERTY'],
  ''],
 ['sd-bus', '3', [], ''],
 ['sd-daemon',
  '3',
  ['SD_ALERT',
   'SD_CRIT',
   'SD_DEBUG',
   'SD_EMERG',
   'SD_ERR',
   'SD_INFO',
   'SD_NOTICE',
   'SD_WARNING'],
  ''],
 ['sd-event', '3', [], ''],
 ['sd-id128',
  '3',
  ['SD_ID128_CONST_STR',
   'SD_ID128_FORMAT_STR',
   'SD_ID128_FORMAT_VAL',
   'SD_ID128_MAKE',
   'SD_ID128_MAKE_STR',
   'SD_ID128_NULL',
   'sd_id128_equal',
   'sd_id128_is_null',
   'sd_id128_t'],
  ''],
 ['sd-journal', '3', [], ''],
 ['sd-login', '3', [], 'HAVE_PAM'],
 ['sd_booted', '3', [], ''],
 ['sd_bus_add_match', '3', [], ''],
 ['sd_bus_creds_get_pid',
  '3',
  ['sd_bus_creds_get_audit_login_uid',
   'sd_bus_creds_get_audit_session_id',
   'sd_bus_creds_get_cgroup',
   'sd_bus_creds_get_cmdline',
   'sd_bus_creds_get_comm',
   'sd_bus_creds_get_description',
   'sd_bus_creds_get_egid',
   'sd_bus_creds_get_euid',
   'sd_bus_creds_get_exe',
   'sd_bus_creds_get_fsgid',
   'sd_bus_creds_get_fsuid',
   'sd_bus_creds_get_gid',
   'sd_bus_creds_get_owner_uid',
   'sd_bus_creds_get_ppid',
   'sd_bus_creds_get_selinux_context',
   'sd_bus_creds_get_session',
   'sd_bus_creds_get_sgid',
   'sd_bus_creds_get_slice',
   'sd_bus_creds_get_suid',
   'sd_bus_creds_get_supplementary_gids',
   'sd_bus_creds_get_tid',
   'sd_bus_creds_get_tid_comm',
   'sd_bus_creds_get_tty',
   'sd_bus_creds_get_uid',
   'sd_bus_creds_get_unique_name',
   'sd_bus_creds_get_unit',
   'sd_bus_creds_get_user_slice',
   'sd_bus_creds_get_user_unit',
   'sd_bus_creds_get_well_known_names',
   'sd_bus_creds_has_bounding_cap',
   'sd_bus_creds_has_effective_cap',
   'sd_bus_creds_has_inheritable_cap',
   'sd_bus_creds_has_permitted_cap'],
  ''],
 ['sd_bus_creds_new_from_pid',
  '3',
  ['sd_bus_creds_get_augmented_mask',
   'sd_bus_creds_get_mask',
   'sd_bus_creds_ref',
   'sd_bus_creds_unref',
   'sd_bus_creds_unrefp'],
  ''],
 ['sd_bus_default',
  '3',
  ['sd_bus_default_system',
   'sd_bus_default_user',
   'sd_bus_open',
   'sd_bus_open_system',
   'sd_bus_open_system_machine',
   'sd_bus_open_system_remote',
   'sd_bus_open_user'],
  ''],
 ['sd_bus_error',
  '3',
  ['SD_BUS_ERROR_MAKE_CONST',
   'SD_BUS_ERROR_NULL',
   'sd_bus_error_copy',
   'sd_bus_error_free',
   'sd_bus_error_get_errno',
   'sd_bus_error_has_name',
   'sd_bus_error_is_set',
   'sd_bus_error_set',
   'sd_bus_error_set_const',
   'sd_bus_error_set_errno',
   'sd_bus_error_set_errnof',
   'sd_bus_error_set_errnofv',
   'sd_bus_error_setf'],
  ''],
 ['sd_bus_error_add_map',
  '3',
  ['SD_BUS_ERROR_END', 'SD_BUS_ERROR_MAP', 'sd_bus_error_map'],
  ''],
 ['sd_bus_get_fd', '3', [], ''],
 ['sd_bus_message_append', '3', ['sd_bus_message_appendv'], ''],
 ['sd_bus_message_append_array',
  '3',
  ['sd_bus_message_append_array_iovec',
   'sd_bus_message_append_array_memfd',
   'sd_bus_message_append_array_space'],
  ''],
 ['sd_bus_message_append_basic', '3', [], ''],
 ['sd_bus_message_append_string_memfd',
  '3',
  ['sd_bus_message_append_string_iovec', 'sd_bus_message_append_string_space'],
  ''],
 ['sd_bus_message_append_strv', '3', [], ''],
 ['sd_bus_message_get_cookie', '3', ['sd_bus_message_get_reply_cookie'], ''],
 ['sd_bus_message_get_monotonic_usec',
  '3',
  ['sd_bus_message_get_realtime_usec', 'sd_bus_message_get_seqnum'],
  ''],
 ['sd_bus_message_read_basic', '3', [], ''],
 ['sd_bus_negotiate_fds',
  '3',
  ['sd_bus_negotiate_creds', 'sd_bus_negotiate_timestamp'],
  ''],
 ['sd_bus_new', '3', ['sd_bus_ref', 'sd_bus_unref', 'sd_bus_unrefp'], ''],
 ['sd_bus_path_encode',
  '3',
  ['sd_bus_path_decode', 'sd_bus_path_decode_many', 'sd_bus_path_encode_many'],
  ''],
 ['sd_bus_process', '3', [], ''],
 ['sd_bus_request_name', '3', ['sd_bus_release_name'], ''],
 ['sd_bus_track_add_name',
  '3',
  ['sd_bus_track_add_sender',
   'sd_bus_track_contains',
   'sd_bus_track_count',
   'sd_bus_track_count_name',
   'sd_bus_track_count_sender',
   'sd_bus_track_first',
   'sd_bus_track_next',
   'sd_bus_track_remove_name',
   'sd_bus_track_remove_sender'],
  ''],
 ['sd_bus_track_new',
  '3',
  ['sd_bus_track_get_bus',
   'sd_bus_track_get_recursive',
   'sd_bus_track_get_userdata',
   'sd_bus_track_ref',
   'sd_bus_track_set_recursive',
   'sd_bus_track_set_userdata',
   'sd_bus_track_unref',
   'sd_bus_track_unrefp'],
  ''],
 ['sd_event_add_child',
  '3',
  ['sd_event_child_handler_t', 'sd_event_source_get_child_pid'],
  ''],
 ['sd_event_add_defer',
  '3',
  ['sd_event_add_exit', 'sd_event_add_post', 'sd_event_handler_t'],
  ''],
 ['sd_event_add_io',
  '3',
  ['sd_event_io_handler_t',
   'sd_event_source',
   'sd_event_source_get_io_events',
   'sd_event_source_get_io_fd',
   'sd_event_source_get_io_revents',
   'sd_event_source_set_io_events',
   'sd_event_source_set_io_fd'],
  ''],
 ['sd_event_add_signal',
  '3',
  ['sd_event_signal_handler_t', 'sd_event_source_get_signal'],
  ''],
 ['sd_event_add_time',
  '3',
  ['sd_event_source_get_time',
   'sd_event_source_get_time_accuracy',
   'sd_event_source_get_time_clock',
   'sd_event_source_set_time',
   'sd_event_source_set_time_accuracy',
   'sd_event_time_handler_t'],
  ''],
 ['sd_event_exit', '3', ['sd_event_get_exit_code'], ''],
 ['sd_event_get_fd', '3', [], ''],
 ['sd_event_new',
  '3',
  ['sd_event',
   'sd_event_default',
   'sd_event_get_tid',
   'sd_event_ref',
   'sd_event_unref',
   'sd_event_unrefp'],
  ''],
 ['sd_event_now', '3', [], ''],
 ['sd_event_run', '3', ['sd_event_loop'], ''],
 ['sd_event_set_watchdog', '3', ['sd_event_get_watchdog'], ''],
 ['sd_event_source_get_event', '3', [], ''],
 ['sd_event_source_get_pending', '3', [], ''],
 ['sd_event_source_set_description',
  '3',
  ['sd_event_source_get_description'],
  ''],
 ['sd_event_source_set_enabled',
  '3',
  ['SD_EVENT_OFF',
   'SD_EVENT_ON',
   'SD_EVENT_ONESHOT',
   'sd_event_source_get_enabled'],
  ''],
 ['sd_event_source_set_prepare', '3', [], ''],
 ['sd_event_source_set_priority',
  '3',
  ['SD_EVENT_PRIORITY_IDLE',
   'SD_EVENT_PRIORITY_IMPORTANT',
   'SD_EVENT_PRIORITY_NORMAL',
   'sd_event_source_get_priority'],
  ''],
 ['sd_event_source_set_userdata', '3', ['sd_event_source_get_userdata'], ''],
 ['sd_event_source_unref',
  '3',
  ['sd_event_source_ref', 'sd_event_source_unrefp'],
  ''],
 ['sd_event_wait',
  '3',
  ['SD_EVENT_ARMED',
   'SD_EVENT_EXITING',
   'SD_EVENT_FINISHED',
   'SD_EVENT_INITIAL',
   'SD_EVENT_PENDING',
   'SD_EVENT_PREPARING',
   'SD_EVENT_RUNNING',
   'sd_event_dispatch',
   'sd_event_get_iteration',
   'sd_event_get_state',
   'sd_event_prepare'],
  ''],
 ['sd_get_seats',
  '3',
  ['sd_get_machine_names', 'sd_get_sessions', 'sd_get_uids'],
  'HAVE_PAM'],
 ['sd_id128_get_machine',
  '3',
  ['sd_id128_get_boot',
   'sd_id128_get_invocation',
   'sd_id128_get_machine_app_specific'],
  ''],
 ['sd_id128_randomize', '3', [], ''],
 ['sd_id128_to_string', '3', ['sd_id128_from_string'], ''],
 ['sd_is_fifo',
  '3',
  ['sd_is_mq',
   'sd_is_socket',
   'sd_is_socket_inet',
   'sd_is_socket_sockaddr',
   'sd_is_socket_unix',
   'sd_is_special'],
  ''],
 ['sd_journal_add_match',
  '3',
  ['sd_journal_add_conjunction',
   'sd_journal_add_disjunction',
   'sd_journal_flush_matches'],
  ''],
 ['sd_journal_enumerate_fields',
  '3',
  ['SD_JOURNAL_FOREACH_FIELD', 'sd_journal_restart_fields'],
  ''],
 ['sd_journal_get_catalog', '3', ['sd_journal_get_catalog_for_message_id'], ''],
 ['sd_journal_get_cursor', '3', ['sd_journal_test_cursor'], ''],
 ['sd_journal_get_cutoff_realtime_usec',
  '3',
  ['sd_journal_get_cutoff_monotonic_usec'],
  ''],
 ['sd_journal_get_data',
  '3',
  ['SD_JOURNAL_FOREACH_DATA',
   'sd_journal_enumerate_data',
   'sd_journal_get_data_threshold',
   'sd_journal_restart_data',
   'sd_journal_set_data_threshold'],
  ''],
 ['sd_journal_get_fd',
  '3',
  ['SD_JOURNAL_APPEND',
   'SD_JOURNAL_INVALIDATE',
   'SD_JOURNAL_NOP',
   'sd_journal_get_events',
   'sd_journal_get_timeout',
   'sd_journal_process',
   'sd_journal_reliable_fd',
   'sd_journal_wait'],
  ''],
 ['sd_journal_get_realtime_usec', '3', ['sd_journal_get_monotonic_usec'], ''],
 ['sd_journal_get_usage', '3', [], ''],
 ['sd_journal_has_runtime_files', '3', ['sd_journal_has_persistent_files'], ''],
 ['sd_journal_next',
  '3',
  ['SD_JOURNAL_FOREACH',
   'SD_JOURNAL_FOREACH_BACKWARDS',
   'sd_journal_next_skip',
   'sd_journal_previous',
   'sd_journal_previous_skip'],
  ''],
 ['sd_journal_open',
  '3',
  ['SD_JOURNAL_CURRENT_USER',
   'SD_JOURNAL_LOCAL_ONLY',
   'SD_JOURNAL_OS_ROOT',
   'SD_JOURNAL_RUNTIME_ONLY',
   'SD_JOURNAL_SYSTEM',
   'sd_journal',
   'sd_journal_close',
   'sd_journal_open_directory',
   'sd_journal_open_directory_fd',
   'sd_journal_open_files',
   'sd_journal_open_files_fd'],
  ''],
 ['sd_journal_print',
  '3',
  ['SD_JOURNAL_SUPPRESS_LOCATION',
   'sd_journal_perror',
   'sd_journal_printv',
   'sd_journal_send',
   'sd_journal_sendv'],
  ''],
 ['sd_journal_query_unique',
  '3',
  ['SD_JOURNAL_FOREACH_UNIQUE',
   'sd_journal_enumerate_unique',
   'sd_journal_restart_unique'],
  ''],
 ['sd_journal_seek_head',
  '3',
  ['sd_journal_seek_cursor',
   'sd_journal_seek_monotonic_usec',
   'sd_journal_seek_realtime_usec',
   'sd_journal_seek_tail'],
  ''],
 ['sd_journal_stream_fd', '3', [], ''],
 ['sd_listen_fds',
  '3',
  ['SD_LISTEN_FDS_START', 'sd_listen_fds_with_names'],
  ''],
 ['sd_login_monitor_new',
  '3',
  ['sd_login_monitor',
   'sd_login_monitor_flush',
   'sd_login_monitor_get_events',
   'sd_login_monitor_get_fd',
   'sd_login_monitor_get_timeout',
   'sd_login_monitor_unref',
   'sd_login_monitor_unrefp'],
  'HAVE_PAM'],
 ['sd_machine_get_class', '3', ['sd_machine_get_ifindices'], ''],
 ['sd_notify',
  '3',
  ['sd_notifyf', 'sd_pid_notify', 'sd_pid_notify_with_fds', 'sd_pid_notifyf'],
  ''],
 ['sd_pid_get_session',
  '3',
  ['sd_peer_get_cgroup',
   'sd_peer_get_machine_name',
   'sd_peer_get_owner_uid',
   'sd_peer_get_session',
   'sd_peer_get_slice',
   'sd_peer_get_unit',
   'sd_peer_get_user_slice',
   'sd_peer_get_user_unit',
   'sd_pid_get_cgroup',
   'sd_pid_get_machine_name',
   'sd_pid_get_owner_uid',
   'sd_pid_get_slice',
   'sd_pid_get_unit',
   'sd_pid_get_user_slice',
   'sd_pid_get_user_unit'],
  'HAVE_PAM'],
 ['sd_seat_get_active',
  '3',
  ['sd_seat_can_graphical',
   'sd_seat_can_multi_session',
   'sd_seat_can_tty',
   'sd_seat_get_sessions'],
  'HAVE_PAM'],
 ['sd_session_is_active',
  '3',
  ['sd_session_get_class',
   'sd_session_get_desktop',
   'sd_session_get_display',
   'sd_session_get_remote_host',
   'sd_session_get_remote_user',
   'sd_session_get_seat',
   'sd_session_get_service',
   'sd_session_get_state',
   'sd_session_get_tty',
   'sd_session_get_type',
   'sd_session_get_uid',
   'sd_session_get_vt',
   'sd_session_is_remote'],
  'HAVE_PAM'],
 ['sd_uid_get_state',
  '3',
  ['sd_uid_get_display',
   'sd_uid_get_seats',
   'sd_uid_get_sessions',
   'sd_uid_is_on_seat'],
  'HAVE_PAM'],
 ['sd_watchdog_enabled', '3', [], ''],
 ['shutdown', '8', [], ''],
 ['sysctl.d', '5', [], ''],
 ['systemctl', '1', [], ''],
 ['systemd-analyze', '1', [], ''],
 ['systemd-ask-password-console.service',
  '8',
  ['systemd-ask-password-console.path',
   'systemd-ask-password-wall.path',
   'systemd-ask-password-wall.service'],
  ''],
 ['systemd-ask-password', '1', [], ''],
 ['systemd-backlight@.service', '8', ['systemd-backlight'], 'ENABLE_BACKLIGHT'],
 ['systemd-binfmt.service', '8', ['systemd-binfmt'], 'ENABLE_BINFMT'],
 ['systemd-cat', '1', [], ''],
 ['systemd-cgls', '1', [], ''],
 ['systemd-cgtop', '1', [], ''],
 ['systemd-coredump',
  '8',
  ['systemd-coredump.socket', 'systemd-coredump@.service'],
  'ENABLE_COREDUMP'],
 ['systemd-cryptsetup-generator', '8', [], 'HAVE_LIBCRYPTSETUP'],
 ['systemd-cryptsetup@.service',
  '8',
  ['systemd-cryptsetup'],
  'HAVE_LIBCRYPTSETUP'],
 ['systemd-debug-generator', '8', [], ''],
 ['systemd-delta', '1', [], ''],
 ['systemd-detect-virt', '1', [], ''],
 ['systemd-environment-d-generator',
  '8',
  ['30-systemd-environment-d-generator'],
  'ENABLE_ENVIRONMENT_D'],
 ['systemd-escape', '1', [], ''],
 ['systemd-firstboot', '1', ['systemd-firstboot.service'], 'ENABLE_FIRSTBOOT'],
 ['systemd-fsck@.service',
  '8',
  ['systemd-fsck', 'systemd-fsck-root.service'],
  ''],
 ['systemd-fstab-generator', '8', [], ''],
 ['systemd-getty-generator', '8', [], ''],
 ['systemd-gpt-auto-generator', '8', [], ''],
 ['systemd-halt.service',
  '8',
  ['systemd-kexec.service',
   'systemd-poweroff.service',
   'systemd-reboot.service',
   'systemd-shutdown'],
  ''],
 ['systemd-hibernate-resume-generator', '8', [], 'ENABLE_HIBERNATE'],
 ['systemd-hibernate-resume@.service',
  '8',
  ['systemd-hibernate-resume'],
  'ENABLE_HIBERNATE'],
 ['systemd-hostnamed.service', '8', ['systemd-hostnamed'], 'ENABLE_HOSTNAMED'],
 ['systemd-hwdb', '8', [], 'ENABLE_HWDB'],
 ['systemd-importd.service', '8', ['systemd-importd'], 'ENABLE_IMPORTD'],
 ['systemd-inhibit', '1', [], ''],
 ['systemd-initctl.service',
  '8',
  ['systemd-initctl', 'systemd-initctl.socket'],
  ''],
 ['systemd-journal-gatewayd.service',
  '8',
  ['systemd-journal-gatewayd', 'systemd-journal-gatewayd.socket'],
  'HAVE_MICROHTTPD'],
 ['systemd-journal-remote', '8', [], 'HAVE_MICROHTTPD'],
 ['systemd-journal-upload', '8', [], 'HAVE_MICROHTTPD'],
 ['systemd-journald.service',
  '8',
  ['systemd-journald',
   'systemd-journald-audit.socket',
   'systemd-journald-dev-log.socket',
   'systemd-journald.socket'],
  ''],
 ['systemd-localed.service', '8', ['systemd-localed'], 'ENABLE_LOCALED'],
 ['systemd-logind.service', '8', ['systemd-logind'], 'ENABLE_LOGIND'],
 ['systemd-machine-id-commit.service', '8', [], ''],
 ['systemd-machine-id-setup', '1', [], ''],
 ['systemd-machined.service', '8', ['systemd-machined'], 'ENABLE_MACHINED'],
 ['systemd-modules-load.service', '8', ['systemd-modules-load'], 'HAVE_KMOD'],
 ['systemd-mount', '1', ['systemd-umount'], ''],
 ['systemd-networkd-wait-online.service',
  '8',
  ['systemd-networkd-wait-online'],
  'ENABLE_NETWORKD'],
 ['systemd-networkd.service', '8', ['systemd-networkd'], 'ENABLE_NETWORKD'],
 ['systemd-notify', '1', [], ''],
 ['systemd-nspawn', '1', [], ''],
 ['systemd-path', '1', [], ''],
 ['systemd-quotacheck.service',
  '8',
  ['systemd-quotacheck'],
  'ENABLE_QUOTACHECK'],
 ['systemd-random-seed.service',
  '8',
  ['systemd-random-seed'],
  'ENABLE_RANDOMSEED'],
 ['systemd-remount-fs.service', '8', ['systemd-remount-fs'], ''],
 ['systemd-resolve', '1', [], 'ENABLE_RESOLVED'],
 ['systemd-resolved.service', '8', ['systemd-resolved'], 'ENABLE_RESOLVED'],
 ['systemd-rfkill.service',
  '8',
  ['systemd-rfkill', 'systemd-rfkill.socket'],
  'ENABLE_RFKILL'],
 ['systemd-run', '1', [], ''],
 ['systemd-sleep.conf', '5', ['sleep.conf.d'], ''],
 ['systemd-socket-activate', '1', [], ''],
 ['systemd-socket-proxyd', '8', [], ''],
 ['systemd-suspend.service',
  '8',
  ['systemd-hibernate.service',
   'systemd-hybrid-sleep.service',
   'systemd-sleep'],
  ''],
 ['systemd-sysctl.service', '8', ['systemd-sysctl'], ''],
 ['systemd-system-update-generator', '8', [], ''],
 ['systemd-system.conf',
  '5',
  ['system.conf.d', 'systemd-user.conf', 'user.conf.d'],
  ''],
 ['systemd-sysusers', '8', ['systemd-sysusers.service'], ''],
 ['systemd-sysv-generator', '8', [], 'HAVE_SYSV_COMPAT'],
 ['systemd-timedated.service', '8', ['systemd-timedated'], 'ENABLE_TIMEDATED'],
 ['systemd-timesyncd.service', '8', ['systemd-timesyncd'], 'ENABLE_TIMESYNCD'],
 ['systemd-tmpfiles',
  '8',
  ['systemd-tmpfiles-clean.service',
   'systemd-tmpfiles-clean.timer',
   'systemd-tmpfiles-setup-dev.service',
   'systemd-tmpfiles-setup.service'],
  ''],
 ['systemd-tty-ask-password-agent', '1', [], ''],
 ['systemd-udevd.service',
  '8',
  ['systemd-udevd',
   'systemd-udevd-control.socket',
   'systemd-udevd-kernel.socket'],
  ''],
 ['systemd-update-done.service', '8', ['systemd-update-done'], ''],
 ['systemd-update-utmp.service',
  '8',
  ['systemd-update-utmp', 'systemd-update-utmp-runlevel.service'],
  'HAVE_UTMP'],
 ['systemd-user-sessions.service', '8', ['systemd-user-sessions'], 'HAVE_PAM'],
 ['systemd-vconsole-setup.service',
  '8',
  ['systemd-vconsole-setup'],
  'ENABLE_VCONSOLE'],
 ['systemd-veritysetup-generator', '8', [], 'HAVE_LIBCRYPTSETUP'],
 ['systemd-veritysetup@.service',
  '8',
  ['systemd-veritysetup'],
  'HAVE_LIBCRYPTSETUP'],
 ['systemd-volatile-root.service', '8', ['systemd-volatile-root'], ''],
 ['systemd', '1', ['init'], ''],
 ['systemd.automount', '5', [], ''],
 ['systemd.device', '5', [], ''],
 ['systemd.environment-generator', '7', [], 'ENABLE_ENVIRONMENT_D'],
 ['systemd.exec', '5', [], ''],
 ['systemd.generator', '7', [], ''],
 ['systemd.journal-fields', '7', [], ''],
 ['systemd.kill', '5', [], ''],
 ['systemd.link', '5', [], ''],
 ['systemd.mount', '5', [], ''],
 ['systemd.netdev', '5', [], 'ENABLE_NETWORKD'],
 ['systemd.network', '5', [], 'ENABLE_NETWORKD'],
 ['systemd.nspawn', '5', [], ''],
 ['systemd.offline-updates', '7', [], ''],
 ['systemd.path', '5', [], ''],
 ['systemd.preset', '5', [], ''],
 ['systemd.resource-control', '5', [], ''],
 ['systemd.scope', '5', [], ''],
 ['systemd.service', '5', [], ''],
 ['systemd.slice', '5', [], ''],
 ['systemd.socket', '5', [], ''],
 ['systemd.special', '7', [], ''],
 ['systemd.swap', '5', [], ''],
 ['systemd.target', '5', [], ''],
 ['systemd.time', '7', [], ''],
 ['systemd.timer', '5', [], ''],
 ['systemd.unit', '5', [], ''],
 ['sysusers.d', '5', [], 'ENABLE_SYSUSERS'],
 ['telinit', '8', [], ''],
 ['timedatectl', '1', [], 'ENABLE_TIMEDATED'],
 ['timesyncd.conf', '5', ['timesyncd.conf.d'], 'ENABLE_TIMESYNCD'],
 ['tmpfiles.d', '5', [], ''],
 ['udev', '7', [], ''],
 ['udev.conf', '5', [], ''],
 ['udev_device_get_syspath',
  '3',
  ['udev_device_get_action',
   'udev_device_get_devnode',
   'udev_device_get_devnum',
   'udev_device_get_devpath',
   'udev_device_get_devtype',
   'udev_device_get_driver',
   'udev_device_get_is_initialized',
   'udev_device_get_parent',
   'udev_device_get_parent_with_subsystem_devtype',
   'udev_device_get_subsystem',
   'udev_device_get_sysname',
   'udev_device_get_sysnum',
   'udev_device_get_udev'],
  ''],
 ['udev_device_has_tag',
  '3',
  ['udev_device_get_devlinks_list_entry',
   'udev_device_get_properties_list_entry',
   'udev_device_get_property_value',
   'udev_device_get_sysattr_list_entry',
   'udev_device_get_sysattr_value',
   'udev_device_get_tags_list_entry',
   'udev_device_set_sysattr_value'],
  ''],
 ['udev_device_new_from_syspath',
  '3',
  ['udev_device_new_from_device_id',
   'udev_device_new_from_devnum',
   'udev_device_new_from_environment',
   'udev_device_new_from_subsystem_sysname',
   'udev_device_ref',
   'udev_device_unref'],
  ''],
 ['udev_enumerate_add_match_subsystem',
  '3',
  ['udev_enumerate_add_match_is_initialized',
   'udev_enumerate_add_match_parent',
   'udev_enumerate_add_match_property',
   'udev_enumerate_add_match_sysattr',
   'udev_enumerate_add_match_sysname',
   'udev_enumerate_add_match_tag',
   'udev_enumerate_add_nomatch_subsystem',
   'udev_enumerate_add_nomatch_sysattr'],
  ''],
 ['udev_enumerate_new',
  '3',
  ['udev_enumerate_ref', 'udev_enumerate_unref'],
  ''],
 ['udev_enumerate_scan_devices',
  '3',
  ['udev_enumerate_add_syspath',
   'udev_enumerate_get_list_entry',
   'udev_enumerate_get_udev',
   'udev_enumerate_scan_subsystems'],
  ''],
 ['udev_list_entry',
  '3',
  ['udev_list_entry_get_by_name',
   'udev_list_entry_get_name',
   'udev_list_entry_get_next',
   'udev_list_entry_get_value'],
  ''],
 ['udev_monitor_filter_update',
  '3',
  ['udev_monitor_filter_add_match_subsystem_devtype',
   'udev_monitor_filter_add_match_tag',
   'udev_monitor_filter_remove'],
  ''],
 ['udev_monitor_new_from_netlink',
  '3',
  ['udev_monitor_ref', 'udev_monitor_unref'],
  ''],
 ['udev_monitor_receive_device',
  '3',
  ['udev_monitor_enable_receiving',
   'udev_monitor_get_fd',
   'udev_monitor_get_udev',
   'udev_monitor_set_receive_buffer_size'],
  ''],
 ['udev_new', '3', ['udev_ref', 'udev_unref'], ''],
 ['udevadm', '8', [], ''],
 ['vconsole.conf', '5', [], 'ENABLE_VCONSOLE']
 ]
 # Really, do not edit.
--- a/man/sd_bus_add_match.xml
+++ b/man/sd_bus_add_match.xml
@ -73,26 +73,34 @@
    <title>Description</title>
    <para>
-      <function>sd_bus_add_match()</function> adds a match rule used to dispatch
+      <function>sd_bus_add_match()</function> installs a match rule for incoming messages received on the specified bus
-      incoming messages. The syntax of the rule passed in
+      connection object <parameter>bus</parameter>. The syntax of the match rule expression passed in
-      <parameter>match</parameter> is described in the
+      <parameter>match</parameter> is described in the <ulink
-      <ulink url="https://dbus.freedesktop.org/doc/dbus-specification.html">D-Bus Specification</ulink>.
+      url="https://dbus.freedesktop.org/doc/dbus-specification.html">D-Bus Specification</ulink>. The specified handler
      function <parameter>callback</parameter> is called for eaching incoming message matching the specified
      expression, the <parameter>userdata</parameter> parameter is passed as-is to the callback function.
    </para>
    <para>
-      The message <parameter>m</parameter> passed to the callback is only
+      On success, and if non-<constant>NULL</constant>, the <parameter>slot</parameter> return parameter will be set to
-      borrowed, that is, the callback should not call
+      a slot object that may be used as a reference to the installed match, and may be utilized to remove it again at a
-      <citerefentry><refentrytitle>sd_bus_message_unref</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+      later time with
-      on it. If the callback wants to hold on to the message beyond the lifetime
+      <citerefentry><refentrytitle>sd_bus_slot_unref</refentrytitle><manvolnum>3</manvolnum></citerefentry>. If
-      of the callback, it needs to call
+      specified as <constant>NULL</constant> the lifetime of the match is bound to the lifetime of the bus object itself, and the match
-      <citerefentry><refentrytitle>sd_bus_message_ref</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+      cannot be removed independently.
      to create a new reference.
    </para>
    <para>
-      If an error occurs during the callback invocation, the callback should
+      The message <parameter>m</parameter> passed to the callback is only borrowed, that is, the callback should not
-      return a negative error number. If it wants other callbacks that match the
+      call <citerefentry><refentrytitle>sd_bus_message_unref</refentrytitle><manvolnum>3</manvolnum></citerefentry> on
-      same rule to be called, it should return 0. Otherwise it should return a
+      it. If the callback wants to hold on to the message beyond the lifetime of the callback, it needs to call
      <citerefentry><refentrytitle>sd_bus_message_ref</refentrytitle><manvolnum>3</manvolnum></citerefentry> to create
      a new reference.
    </para>
    <para>
      If an error occurs during the callback invocation, the callback should return a negative error number. If it
      wants other callbacks that match the same rule to be called, it should return 0. Otherwise it should return a
      positive integer.
    </para>
  </refsect1>
@ -101,9 +109,8 @@
    <title>Return Value</title>
    <para>
-      On success, <function>sd_bus_add_match()</function> returns 0 or a
+      On success, <function>sd_bus_add_match()</function> returns 0 or a positive integer. On failure, it returns a
-      positive integer. On failure, it returns a negative errno-style error
+      negative errno-style error code.
      code.
    </para>
  </refsect1>
@ -112,7 +119,7 @@
    <para>
      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>
    </para>
  </refsect1>
--- a/man/sd_bus_error.xml
+++ b/man/sd_bus_error.xml
@ -265,7 +265,7 @@
    <parameter>dst</parameter> using the values in
    <parameter>e</parameter>. If the strings in
    <parameter>e</parameter> were set using
-    <function>sd_bus_set_error_const()</function>, they will be shared.
+    <function>sd_bus_error_set_const()</function>, they will be shared.
    Otherwise, they will be copied. Returns a converted
    <varname>errno</varname>-like, negative error code.</para>
--- a/man/sd_bus_message_append.xml
+++ b/man/sd_bus_message_append.xml
@ -45,6 +45,7 @@
  <refnamediv>
    <refname>sd_bus_message_append</refname>
    <refname>sd_bus_message_appendv</refname>
    <refpurpose>Attach fields to a D-Bus message based on a type
    string</refpurpose>
@ -60,6 +61,14 @@
        <paramdef>const char *<parameter>types</parameter></paramdef>
        <paramdef>…</paramdef>
      </funcprototype>
      <funcprototype>
          <funcdef>int sd_bus_message_appendv</funcdef>
          <paramdef>sd_bus_message *<parameter>m</parameter></paramdef>
          <paramdef>const char *<parameter>types</parameter></paramdef>
          <paramdef>va_list <parameter>ap</parameter></paramdef>
      </funcprototype>
    </funcsynopsis>
  </refsynopsisdiv>
@ -109,6 +118,14 @@
    values for each entry matching the element type of
    the dictionary entries.</para>
    <para>The <function>sd_bus_message_appendv()</function> is equivalent to
    the function <function>sd_bus_message_append()</function>,
    except that it is called with a <literal>va_list</literal> instead of
    a variable number of arguments. This function does not call the
    <function>va_end()</function> macro. Because it invokes the
    <function>va_arg()</function> macro, the value of ap
    is undefined after the call.</para>
    <para>For further details on the D-Bus type system, please consult
    the <ulink
    url="http://dbus.freedesktop.org/doc/dbus-specification.html#type-system">D-Bus
@ -238,8 +255,8 @@ sd_bus_message_append(m, "ynqiuxtd", y, n, q, i, u, x, t, d);</programlisting>
  <refsect1>
    <title>Return Value</title>
-    <para>On success, this call returns 0 or a positive
+    <para>On success, these functions return 0 or a positive
-    integer. On failure, this call returns a negative
+    integer. On failure, these functions return a negative
    errno-style error code.</para>
  </refsect1>
--- a/man/sd_get_seats.xml
+++ b/man/sd_get_seats.xml
@ -81,8 +81,10 @@
    <title>Description</title>
    <para><function>sd_get_seats()</function> may be used to determine
-    all currently available local seats. Returns a
+    all currently available local seats. Returns the number of seat
-    <constant>NULL</constant> terminated array of seat identifiers.
+    identifiers and if the input pointer is non-NULL, a
    <constant>NULL</constant>-terminated array of seat identifiers
    is stored at the address.
    The returned array and all strings it references need to be freed
    with the libc
    <citerefentry project='man-pages'><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
@ -123,13 +125,6 @@
    <variablelist>
      <varlistentry>
        <term><constant>-EINVAL</constant></term>
        <listitem><para>An input parameter was invalid (out of range,
        or NULL, where that is not accepted).</para></listitem>
      </varlistentry>
      <varlistentry>
        <term><constant>-ENOMEM</constant></term>
--- a/man/sd_id128_randomize.xml
+++ b/man/sd_id128_randomize.xml
@ -77,7 +77,7 @@
    <citerefentry><refentrytitle>sd-id128</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para>
    <para><citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>'s
-    <option>--new-id</option> option may be used as a command line
+    <option>--new-id128</option> option may be used as a command line
    front-end for <function>sd_id128_randomize()</function>.</para>
  </refsect1>
--- a/man/sd_journal_get_catalog.xml
+++ b/man/sd_journal_get_catalog.xml
@ -114,7 +114,7 @@
    <para>Function <function>sd_journal_get_catalog()</function> is thread-agnostic and only a
    single thread may operate on a given <structname>sd_journal</structname> object. Function
-    <function>sd_journal_get_catalog_for_message_id() is thread-safe.</function></para>
+    <function>sd_journal_get_catalog_for_message_id()</function> is thread-safe.</para>
    <para>The <function>sd_journal_get_catalog()</function> and
    <function>sd_journal_get_catalog_for_message_id()</function>
--- a/man/sd_journal_get_fd.xml
+++ b/man/sd_journal_get_fd.xml
@ -146,7 +146,7 @@ if (t == (uint64_t) -1)
 else {
  struct timespec ts;
  uint64_t n;
-  clock_getttime(CLOCK_MONOTONIC, &amp;ts);
+  clock_gettime(CLOCK_MONOTONIC, &amp;ts);
  n = (uint64_t) ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
  msec = t > n ? (int) ((t - n + 999) / 1000) : 0;
 }</programlisting>
@ -304,7 +304,7 @@ int wait_for_changes(sd_journal *j) {
  else {
    struct timespec ts;
    uint64_t n;
-    clock_getttime(CLOCK_MONOTONIC, &amp;ts);
+    clock_gettime(CLOCK_MONOTONIC, &amp;ts);
    n = (uint64_t) ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
    msec = t > n ? (int) ((t - n + 999) / 1000) : 0;
  }
--- a/man/sd_login_monitor_new.xml
+++ b/man/sd_login_monitor_new.xml
@ -203,7 +203,7 @@ if (t == (uint64_t) -1)
 else {
         struct timespec ts;
         uint64_t n;
-         clock_getttime(CLOCK_MONOTONIC, &amp;ts);
+         clock_gettime(CLOCK_MONOTONIC, &amp;ts);
         n = (uint64_t) ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
         msec = t > n ? (int) ((t - n + 999) / 1000) : 0;
 }</programlisting>
--- a/man/sd_notify.xml
+++ b/man/sd_notify.xml
@ -205,25 +205,24 @@
      <varlistentry>
        <term>FDSTORE=1</term>
-        <listitem><para>Stores additional file descriptors in the service manager. File
+        <listitem><para>Stores additional file descriptors in the service manager. File descriptors sent this way will
-        descriptors sent this way will be maintained per-service by the service manager
+        be maintained per-service by the service manager and will later be handed back using the usual file descriptor
-        and will be passed again using the usual file descriptor passing logic on the next
+        passing logic at the next invocation of the service, see
-        invocation of the service, see
+        <citerefentry><refentrytitle>sd_listen_fds</refentrytitle><manvolnum>3</manvolnum></citerefentry>.  This is
-        <citerefentry><refentrytitle>sd_listen_fds</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
+        useful for implementing services that can restart after an explicit request or a crash without losing
-        This is useful for implementing service restart schemes where services serialize
+        state. Any open sockets and other file descriptors which should not be closed during the restart may be stored
-        their state to <filename>/run</filename>, push their file descriptors to the
+        this way. Application state can either be serialized to a file in <filename>/run</filename>, or better, stored
-        system manager, and are then restarted, retrieving their state again via socket
+        in a <citerefentry><refentrytitle>memfd_create</refentrytitle><manvolnum>2</manvolnum></citerefentry> memory
-        passing and <filename>/run</filename>. Note that the service manager will accept
+        file descriptor. Note that the service manager will accept messages for a service only if its
-        messages for a service only if <varname>FileDescriptorStoreMax=</varname> is set
+        <varname>FileDescriptorStoreMax=</varname> setting is non-zero (defaults to zero, see
-        to non-zero for it (defaults to zero, see
+        <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>). If file
-        <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
+        descriptors sent are pollable (see
-        File descriptors must be pollable, see
+        <citerefentry><refentrytitle>epoll_ctl</refentrytitle><manvolnum>2</manvolnum></citerefentry>), then any
-        <citerefentry><refentrytitle>epoll_ctl</refentrytitle><manvolnum>2</manvolnum></citerefentry>.
+        <constant>EPOLLHUP</constant> or <constant>EPOLLERR</constant> event seen on them will result in their
-        Multiple arrays of file descriptors may be sent in separate messages, in which
+        automatic removal from the store. Multiple arrays of file descriptors may be sent in separate messages, in
-        case the arrays are combined.  Note that the service manager removes duplicate
+        which case the arrays are combined. Note that the service manager removes duplicate (pointing to the same
-        file descriptors before passing them to the service. Use
+        object) file descriptors before passing them to the service. Use <function>sd_pid_notify_with_fds()</function>
-        <function>sd_pid_notify_with_fds()</function> to send messages with
+        to send messages with <literal>FDSTORE=1</literal>, see below.</para></listitem>
        <literal>FDSTORE=1</literal>, see below.</para></listitem>
      </varlistentry>
      <varlistentry>
@ -312,13 +311,14 @@
  <refsect1>
    <title>Return Value</title>
-    <para>On failure, these calls return a negative errno-style error
+    <para>On failure, these calls return a negative errno-style error code. If <varname>$NOTIFY_SOCKET</varname> was
-    code. If <varname>$NOTIFY_SOCKET</varname> was not set and hence
+    not set and hence no status message could be sent, 0 is returned. If the status was sent, these functions return a
-    no status data could be sent, 0 is returned. If the status was
+    positive value. In order to support both service managers that implement this scheme and those which do not, it is
-    sent, these functions return with a positive return value. In
+    generally recommended to ignore the return value of this call. Note that the return value simply indicates whether
-    order to support both, init systems that implement this scheme and
+    the notification message was enqueued properly, it does not reflect whether the message could be processed
-    those which do not, it is generally recommended to ignore the
+    successfully. Specifically, no error is returned when a file descriptor is attempted to be stored using
-    return value of this call.</para>
+    <varname>FDSTORE=1</varname> but the service is not actually configured to permit storing of file descriptors (see
    above).</para>
  </refsect1>
  <refsect1>
--- a/man/sd_pid_get_session.xml
+++ b/man/sd_pid_get_session.xml
@ -177,7 +177,7 @@
    processes, user processes that are shared between multiple
    sessions of the same user, or kernel threads). For processes not
    being part of a login session, this function will fail with
-    -ENODATA. The returned string needs to be freed with the libc
+    <constant>-ENODATA</constant>. The returned string needs to be freed with the libc
    <citerefentry
    project='man-pages'><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
    call after use.</para>
@ -189,7 +189,7 @@
    paths. Note that not all processes are part of a system
    unit/service (e.g. user processes, or kernel threads). For
    processes not being part of a systemd system unit, this function
-    will fail with -ENODATA. (More specifically, this call will not
+    will fail with <constant>-ENODATA</constant>. (More specifically, this call will not
    work for kernel threads.) The returned string needs to be freed
    with the libc <citerefentry
    project='man-pages'><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
@ -208,7 +208,7 @@
    multiple login sessions of the same user, whereas
    <function>sd_pid_get_session()</function> will fail. For processes
    not being part of a login session and not being a shared process
-    of a user, this function will fail with -ENODATA.</para>
+    of a user, this function will fail with <constant>-ENODATA</constant>.</para>
    <para><function>sd_pid_get_machine_name()</function> may be used
    to determine the name of the VM or container is a member of. The
@ -217,7 +217,7 @@
    <citerefentry
    project='man-pages'><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
    call after use. For processes not part of a VM or containers, this
-    function fails with -ENODATA.</para>
+    function fails with <constant>-ENODATA</constant>.</para>
    <para><function>sd_pid_get_slice()</function> may be used to
    determine the slice unit the process is a member of. See
@ -285,7 +285,7 @@
      </varlistentry>
      <varlistentry>
-        <term><constant>-BADF</constant></term>
+        <term><constant>-EBADF</constant></term>
        <listitem><para>The specified socket file descriptor was
        invalid.</para></listitem>
--- a/man/sd_seat_get_active.xml
+++ b/man/sd_seat_get_active.xml
@ -105,8 +105,9 @@
    one (<constant>NULL</constant> terminated) with the session
    identifiers of the sessions and one with the user identifiers of
    the Unix users the sessions belong to. An additional parameter may
-    be used to return the number of entries in the latter array. The
+    be used to return the number of entries in the latter array. This
-    two arrays and the latter parameter may be passed as
+    value is the same the return value, if the latter is nonnegative.
    The two arrays and the last parameter may be passed as
    <constant>NULL</constant> in case these values need not to be
    determined. The arrays and the strings referenced by them need to
    be freed with the libc
--- a/man/sd_session_is_active.xml
+++ b/man/sd_session_is_active.xml
@ -184,8 +184,9 @@
    <para><function>sd_session_get_seat()</function> may be used to
    determine the seat identifier of the seat the session identified
    by the specified session identifier belongs to. Note that not all
-    sessions are attached to a seat, this call will fail for them. The
+    sessions are attached to a seat, this call will fail (returning
-    returned string needs to be freed with the libc
+    <constant>-ENODATA</constant>) for them. The returned string needs
    to be freed with the libc
    <citerefentry project='man-pages'><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
    call after use.</para>
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@ -907,7 +907,7 @@ Sun 2017-02-26 20:57:49 EST  2h 3min left  Sun 2017-02-26 11:56:36 EST  6h ago
              <programlisting>$ systemctl status bluetooth
 ● bluetooth.service - Bluetooth service
-   Loaded: loaded (/lib/systemd/system/bluetooth.service; enabled; vendor preset: enabled)
+   Loaded: loaded (/usr/lib/systemd/system/bluetooth.service; enabled; vendor preset: enabled)
   Active: active (running) since Wed 2017-01-04 13:54:04 EST; 1 weeks 0 days ago
     Docs: man:bluetoothd(8)
 Main PID: 930 (bluetoothd)
@ -1495,11 +1495,26 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err
          <term><command>show-environment</command></term>
          <listitem>
-            <para>Dump the systemd manager environment block. The
+            <para>Dump the systemd manager environment block. This is the environment
-            environment block will be dumped in straight-forward form
+            block that is passed to all processes the manager spawns. The environment
-            suitable for sourcing into a shell script. This environment
+            block will be dumped in straight-forward form suitable for sourcing into
-            block will be passed to all processes the manager
+            most shells. If no special characters or whitespace is present in the variable
-            spawns.</para>
+            values, no escaping is performed, and the assignments have the form
            <literal>VARIABLE=value</literal>. If whitespace or characters which have
            special meaning to the shell are present, dollar-single-quote escaping is
            used, and assignments have the form <literal>VARIABLE=$'value'</literal>.
            This syntax is known to be supported by
            <citerefentry project='die-net'><refentrytitle>bash</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
            <citerefentry project='die-net'><refentrytitle>zsh</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
            <citerefentry project='die-net'><refentrytitle>ksh</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
            and
            <citerefentry project='die-net'><refentrytitle>busybox</refentrytitle><manvolnum>1</manvolnum></citerefentry>'s
            <citerefentry project='die-net'><refentrytitle>ash</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
            but not
            <citerefentry project='die-net'><refentrytitle>dash</refentrytitle><manvolnum>1</manvolnum></citerefentry>
            or
            <citerefentry project='die-net'><refentrytitle>fish</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
            </para>
          </listitem>
        </varlistentry>
        <varlistentry>
--- a/man/systemd-ask-password.xml
+++ b/man/systemd-ask-password.xml
@ -230,7 +230,7 @@
    <para>
      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
      <citerefentry><refentrytitle>systemd-ask-password-console.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-tty-ask-password</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>systemd-tty-ask-password-agent</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
      <citerefentry project='die-net'><refentrytitle>keyctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
      <citerefentry project='die-net'><refentrytitle>plymouth</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
      <citerefentry project='man-pages'><refentrytitle>wall</refentrytitle><manvolnum>1</manvolnum></citerefentry>
--- a/man/systemd-coredump.xml
+++ b/man/systemd-coredump.xml
@ -123,7 +123,7 @@
    <para>In order to by used in the <option>--backtrace</option> mode, an appropriate backtrace
    handler must be installed on the sender side. For example, in case of
-    <citerefentry><refentrytitle>python</refentrytitle><manvolnum>1</manvolnum></citerefentry>, this
+    <citerefentry project='die-net'><refentrytitle>python</refentrytitle><manvolnum>1</manvolnum></citerefentry>, this
    means a <varname>sys.excepthook</varname> must installed, see
    <ulink url="https://github.com/keszybz/systemd-coredump-python">systemd-coredump-python</ulink>.
    </para>
--- a/man/systemd-delta.xml
+++ b/man/systemd-delta.xml
@ -63,7 +63,7 @@
    compare configuration files that override other configuration
    files. Files in <filename>/etc</filename> have highest priority,
    files in <filename>/run</filename> have the second highest
-    priority, …, files in <filename>/lib</filename> have lowest
+    priority, …, files in <filename>/usr/lib</filename> have lowest
    priority. Files in a directory with higher priority override files
    with the same name in directories of lower priority. In addition,
    certain configuration files can have <literal>.d</literal>
--- a/man/systemd-environment-d-generator.xml
+++ b/man/systemd-environment-d-generator.xml
@ -23,7 +23,7 @@
  You should have received a copy of the GNU Lesser General Public License
  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
-<refentry id="systemd-environment-d-generator">
+<refentry id="systemd-environment-d-generator" conditional='ENABLE_ENVIRONMENT_D'>
  <refentryinfo>
    <title>systemd-environment-d-generator</title>
--- a/man/systemd-fstab-generator.xml
+++ b/man/systemd-fstab-generator.xml
@ -71,6 +71,14 @@
    for more information about special <filename>/etc/fstab</filename>
    mount options this generator understands.</para>
    <para>One special topic is handling of symbolic links.  Historical init
    implementations supported symlinks in <filename>/etc/fstab</filename>.
    Because mount units will refuse mounts where the target is a symbolic link,
    this generator will resolve any symlinks as far as possible when processing
    <filename>/etc/fstab</filename> in order to enhance backwards compatibility.
    If a symlink target does not exist at the time that this generator runs, it
    is assumed that the symlink target is the final target of the mount.</para>
    <para><filename>systemd-fstab-generator</filename> implements
    <citerefentry><refentrytitle>systemd.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
  </refsect1>
--- a/man/systemd-hibernate-resume-generator.xml
+++ b/man/systemd-hibernate-resume-generator.xml
@ -19,7 +19,7 @@
  You should have received a copy of the GNU Lesser General Public License
  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
-<refentry id="systemd-hibernate-resume-generator">
+<refentry id="systemd-hibernate-resume-generator" conditional='ENABLE_HIBERNATE'>
  <refentryinfo>
    <title>systemd-hibernate-resume-generator</title>
--- a/man/systemd-hibernate-resume@.service.xml
+++ b/man/systemd-hibernate-resume@.service.xml
@ -19,7 +19,7 @@
  You should have received a copy of the GNU Lesser General Public License
  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
-<refentry id="systemd-hibernate-resume@.service">
+<refentry id="systemd-hibernate-resume@.service" conditional='ENABLE_HIBERNATE'>
  <refentryinfo>
    <title>systemd-hibernate-resume@.service</title>
--- a/man/systemd-mount.xml
+++ b/man/systemd-mount.xml
@ -62,9 +62,10 @@
      <arg choice="plain"><option>--list</option></arg>
    </cmdsynopsis>
    <cmdsynopsis>
-      <command>systemd-umount</command>
+      <command>systemd-mount</command>
      <arg choice="opt" rep="repeat"><replaceable>OPTIONS</replaceable></arg>
-      <arg choice="plain" rep="repeat"><replaceable>WHERE</replaceable></arg>
+      <arg choice="plain"><option>--umount</option></arg>
      <arg choice="plain" rep="repeat"><replaceable>WHAT|WHERE</replaceable></arg>
    </cmdsynopsis>
  </refsynopsisdiv>
@ -76,13 +77,14 @@
    <replaceable>WHERE</replaceable>.</para>
    <para>In many ways, <command>systemd-mount</command> is similar to the lower-level
-    <citerefentry><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry> command, however instead
+    <citerefentry project='man-pages'><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry> command, however instead
    of executing the mount operation directly and immediately, <command>systemd-mount</command> schedules it through
    the service manager job queue, so that it may pull in further dependencies (such as parent mounts, or a file system
    checker to execute a priori), and may make use of the auto-mounting logic.</para>
    <para>The command takes either one or two arguments. If only one argument is specified it should refer to a block
-    device containing a file system (e.g. <literal>/dev/sdb1</literal>), which is then probed for a label and other
+    device or regular file containing a file system (e.g. <literal>/dev/sdb1</literal> or
    <literal>/path/to/disk.img</literal>). If it is a block device, which is then probed for a label and other
    metadata, and is mounted to a directory whose name is generated from the label. In this mode the block device must
    exist at the time of invocation of the command, so that it may be probed. If the device is found to be a removable
    block device (e.g. a USB stick) an automount point instead of a regular mount point is created (i.e. the
@ -253,8 +255,13 @@
        <term><option>--umount</option></term>
        <listitem><para>Stop the mount and automount units corresponding to the specified mount points
-        <replaceable>WHERE</replaceable>.</para>
+        <replaceable>WHERE</replaceable> or the devices <replaceable>WHAT</replaceable>.
-        </listitem>
+        <command>systemd-mount</command> with this option or <command>systemd-umount</command> can take multiple arguments
        which can be mount points, devices, <filename>/etc/fstab</filename> style node names, or backing files
        corresponding to loop devices, like
        <command>systemd-mount --umount /path/to/umount /dev/sda1 UUID=xxxxxx-xxxx LABEL=xxxxx /path/to/disk.img</command>.
        Note that when <option>-H</option> or <option>-M</option> is specified, only absolute paths to mount points are
        supported.</para></listitem>
      </varlistentry>
      <xi:include href="user-system-options.xml" xpointer="user" />
@ -301,7 +308,7 @@
    <title>See Also</title>
    <para>
      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+      <citerefentry project='man-pages'><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
      <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
      <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
      <citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@ -398,24 +398,19 @@
      <varlistentry>
        <term><option>--slice=</option></term>
-        <listitem><para>Make the container part of the specified
+        <listitem><para>Make the container part of the specified slice, instead of the default
-        slice, instead of the default
+        <filename>machine.slice</filename>. This applies only if the machine is run in its own scope unit, i.e. if
-        <filename>machine.slice</filename>. This is only applies if
+        <option>--keep-unit</option> isn't used.</para>
        the machine is run in its own scope unit, i.e. if
        <option>--keep-unit</option> is not used.</para>
        </listitem>
      </varlistentry>
      <varlistentry>
        <term><option>--property=</option></term>
-        <listitem><para>Set a unit property on the scope unit to
+        <listitem><para>Set a unit property on the scope unit to register for the machine. This applies only if the
-        register for the machine. This only applies if the machine is
+        machine is run in its own scope unit, i.e. if <option>--keep-unit</option> isn't used. Takes unit property
-        run in its own scope unit, i.e. if
+        assignments in the same format as <command>systemctl set-property</command>. This is useful to set memory
-        <option>--keep-unit</option> is not used. Takes unit property
+        limits and similar for container.</para>
        assignments in the same format as <command>systemctl
        set-property</command>. This is useful to set memory limits
        and similar for machines.</para>
        </listitem>
      </varlistentry>
@ -636,7 +631,7 @@
        broadcast domain, here called a "zone". Each container may only be part of one zone, but each zone may contain
        any number of containers. Each zone is referenced by its name. Names may be chosen freely (as long as they form
        valid network interface names when prefixed with <literal>vz-</literal>), and it is sufficient to pass the same
-        name to the <option>--network-zones=</option> switch of the various concurrently running containers to join
+        name to the <option>--network-zone=</option> switch of the various concurrently running containers to join
        them in one zone.</para>
        <para>Note that
@ -888,18 +883,16 @@
      <varlistentry>
        <term><option>--register=</option></term>
-        <listitem><para>Controls whether the container is registered
+        <listitem><para>Controls whether the container is registered with
-        with
+        <citerefentry><refentrytitle>systemd-machined</refentrytitle><manvolnum>8</manvolnum></citerefentry>.  Takes a
-        <citerefentry><refentrytitle>systemd-machined</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+        boolean argument, which defaults to <literal>yes</literal>.  This option should be enabled when the container
-        Takes a boolean argument, which defaults to <literal>yes</literal>.
+        runs a full Operating System (more specifically: a system and service manager as PID 1), and is useful to
-        This option should be enabled when the container runs a full
+        ensure that the container is accessible via
-        Operating System (more specifically: an init system), and is
+        <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry> and shown by
-        useful to ensure that the container is accessible via
+        tools such as <citerefentry
-        <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+        project='man-pages'><refentrytitle>ps</refentrytitle><manvolnum>1</manvolnum></citerefentry>.  If the container
-        and shown by tools such as
+        does not run a service manager, it is recommended to set this option to
-        <citerefentry project='man-pages'><refentrytitle>ps</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
+        <literal>no</literal>.</para></listitem>
        If the container does not run an init system, it is
        recommended to set this option to <literal>no</literal>.</para></listitem>
      </varlistentry>
      <varlistentry>
@ -916,7 +909,9 @@
        service unit, and the service unit's sole purpose is to run a
        single <command>systemd-nspawn</command> container. This
        option is not available if run from a user
-        session.</para></listitem>
+        session.</para>
        <para>Note that passing <option>--keep-unit</option> disables the effect of <option>--slice=</option> and
        <option>--property=</option>.</para></listitem>
      </varlistentry>
      <varlistentry>
@ -1095,6 +1090,18 @@
      in a namespace container in it.</para>
    </example>
    <example>
      <title>Install the OpenSUSE Tumbleweed rolling distribution</title>
      <programlisting># zypper --root=/var/lib/machines/tumbleweed ar -c \
      https://download.opensuse.org/tumbleweed/repo/oss tumbleweed
 # zypper --root=/var/lib/machines/tumbleweed refresh
 # zypper --root=/var/lib/machines/tumbleweed install --no-recommends \
      systemd shadow zypper openSUSE-release vim
 # systemd-nspawn -M tumbleweed passwd root
 # systemd-nspawn -M tumbleweed -b</programlisting>
    </example>
    <example>
      <title>Boot into an ephemeral snapshot of the host system</title>
@ -1137,6 +1144,7 @@
      <citerefentry project='mankier'><refentrytitle>dnf</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
      <citerefentry project='die-net'><refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
      <citerefentry project='archlinux'><refentrytitle>pacman</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
      <citerefentry project='mankier'><refentrytitle>zypper</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
      <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
      <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
      <citerefentry project='man-pages'><refentrytitle>btrfs</refentrytitle><manvolnum>8</manvolnum></citerefentry>
--- a/man/systemd-resolve.xml
+++ b/man/systemd-resolve.xml
@ -21,7 +21,7 @@
  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
-<refentry id="systemd-resolve"
+<refentry id="systemd-resolve" conditional='ENABLE_RESOLVED'
          xmlns:xi="http://www.w3.org/2001/XInclude">
  <refentryinfo>
--- a/man/systemd-timesyncd.service.xml
+++ b/man/systemd-timesyncd.service.xml
@ -64,6 +64,12 @@
    reboots to ensure it monotonically advances even if the system
    lacks a battery-buffered RTC chip.</para>
    <para>The <filename>systemd-timesyncd</filename> service
    specifically implements only SNTP. This minimalistic
    service will set the system clock for large offsets or
    slowly adjust it for smaller deltas. More complex use
    cases are not covered by <filename>systemd-timesyncd</filename>.</para>
    <para>The NTP servers contacted are determined from the global
    settings in
    <citerefentry><refentrytitle>timesyncd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
--- a/man/systemd-vconsole-setup.service.xml
+++ b/man/systemd-vconsole-setup.service.xml
@ -59,7 +59,7 @@
    <para><filename>systemd-vconsole-setup</filename> is a helper used to prepare either all virtual consoles, or — if
      the optional <replaceable>TTY</replaceable> parameter is provided — a specific one. When the system is booting up
-      it's called by <citerefentry><command>udev</command></citerefentry> during vtconsole subsystem initialization.
+      it's called by <citerefentry><refentrytitle>systemd-udevd</refentrytitle><manvolnum>8</manvolnum></citerefentry> during vtconsole subsystem initialization.
      <productname>Systemd</productname> also calls it internally as needed via
      <filename>systemd-vconsole-setup.service</filename>. The helper calls
      <citerefentry project='mankier'><refentrytitle>loadkeys</refentrytitle><manvolnum>1</manvolnum></citerefentry> and
--- a/man/systemd.environment-generator.xml
+++ b/man/systemd.environment-generator.xml
@ -24,7 +24,8 @@
  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
-<refentry id="systemd.environment-generator" xmlns:xi="http://www.w3.org/2001/XInclude">
+<refentry id="systemd.environment-generator" conditional='ENABLE_ENVIRONMENT_D'
    xmlns:xi="http://www.w3.org/2001/XInclude">
  <refentryinfo>
    <title>systemd.environment-generator</title>
    <productname>systemd</productname>
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@ -138,7 +138,7 @@
      <varlistentry>
        <term><varname>RootImage=</varname></term>
        <listitem><para>Takes a path to a block device node or regular file as argument. This call is similar to
-        <varname>RootDirectory=</varname> however mounts a file system hierarchy from a block device node or loopack
+        <varname>RootDirectory=</varname> however mounts a file system hierarchy from a block device node or loopback
        file instead of a directory. The device node or file system image file needs to contain a file system without a
        partition table, or a file system within an MBR/MS-DOS or GPT partition table with only a single
        Linux-compatible partition, or a set of file systems within a GPT partition table that follows the <ulink
@ -165,13 +165,28 @@
        <term><varname>Group=</varname></term>
        <listitem><para>Set the UNIX user or group that the processes are executed as, respectively. Takes a single
-        user or group name, or numeric ID as argument. For system services (services run by the system service manager,
+        user or group name, or a numeric ID as argument. For system services (services run by the system service manager,
        i.e. managed by PID 1) and for user services of the root user (services managed by root's instance of
        <command>systemd --user</command>), the default is <literal>root</literal>, but <varname>User=</varname> may be
        used to specify a different user. For user services of any other user, switching user identity is not
        permitted, hence the only valid setting is the same user the user's service manager is running as. If no group
        is set, the default group of the user is used. This setting does not affect commands whose command line is
-        prefixed with <literal>+</literal>.</para></listitem>
+        prefixed with <literal>+</literal>.</para>
        <para>Note that restrictions on the user/group name syntax are enforced: the specified name must consist only
        of the characters a-z, A-Z, 0-9, <literal>_</literal> and <literal>-</literal>, except for the first character
        which must be one of a-z, A-Z or <literal>_</literal> (i.e. numbers and <literal>-</literal> are not permitted
        as first character). The user/group name must have at least one character, and at most 31. These restrictions
        are enforced in order to avoid ambiguities and to ensure user/group names and unit files remain portable among
        Linux systems.</para>
        <para>When used in conjunction with <varname>DynamicUser=</varname> the user/group name specified is
        dynamically allocated at the time the service is started, and released at the time the service is stopped —
        unless it is already allocated statically (see below). If <varname>DynamicUser=</varname> is not used the
        specified user and group must have been created statically in the user database no later than the moment the
        service is started, for example using the
        <citerefentry><refentrytitle>sysusers.d</refentrytitle><manvolnum>5</manvolnum></citerefentry> facility, which
        is applied at boot or package install time.</para></listitem>
      </varlistentry>
      <varlistentry>
@ -352,7 +367,7 @@
        assignments have no effect. Variable expansion is not
        performed inside the strings, however, specifier expansion is
        possible. The $ character has no special meaning. If you need
-        to assign a value containing spaces to a variable, use double
+        to assign a value containing spaces or the equals sign to a variable, use double
        quotes (") for the assignment.</para>
        <para>Example:
@ -1038,14 +1053,19 @@
        <varname>After=</varname> dependencies on all mount units necessary to access <filename>/tmp</filename> and
        <filename>/var/tmp</filename>. Moreover an implicitly <varname>After=</varname> ordering on
        <citerefentry><refentrytitle>systemd-tmpfiles-setup.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-        is added.</para></listitem>
+        is added.</para>
        <para>Note that the implementation of this setting might be impossible (for example if mount namespaces
        are not available), and the unit should be written in a way that does not solely rely on this setting for
        security.</para></listitem>
      </varlistentry>
      <varlistentry>
        <term><varname>PrivateDevices=</varname></term>
-        <listitem><para>Takes a boolean argument. If true, sets up a new /dev namespace for the executed processes and
+        <listitem><para>Takes a boolean argument. If true, sets up a new <filename>/dev</filename> mount for the
-        only adds API pseudo devices such as <filename>/dev/null</filename>, <filename>/dev/zero</filename> or
+        executed processes and only adds API pseudo devices such as <filename>/dev/null</filename>,
        <filename>/dev/zero</filename> or
        <filename>/dev/random</filename> (as well as the pseudo TTY subsystem) to it, but no physical devices such as
        <filename>/dev/sda</filename>, system memory <filename>/dev/mem</filename>, system ports
        <filename>/dev/port</filename> and others. This is useful to securely turn off physical device access by the
@ -1056,8 +1076,8 @@
        <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>
        for details). Note that using this setting will disconnect propagation of mounts from the service to the host
        (propagation in the opposite direction continues to work).  This means that this setting may not be used for
-        services which shall be able to install mount points in the main mount namespace. The /dev namespace will be
+        services which shall be able to install mount points in the main mount namespace. The new <filename>/dev</filename>
-        mounted read-only and 'noexec'.  The latter may break old programs which try to set up executable memory by
+        will be mounted read-only and 'noexec'. The latter may break old programs which try to set up executable memory by
        using <citerefentry><refentrytitle>mmap</refentrytitle><manvolnum>2</manvolnum></citerefentry> of
        <filename>/dev/zero</filename> instead of using <constant>MAP_ANON</constant>. This setting is implied if
        <varname>DynamicUser=</varname> is set. For this setting the same restrictions regarding mount propagation and
@ -1065,7 +1085,11 @@
        If turned on and if running in user mode, or in system mode, but without the <constant>CAP_SYS_ADMIN</constant>
        capability (e.g. setting <varname>User=</varname>), <varname>NoNewPrivileges=yes</varname>
        is implied.
-        </para></listitem>
+        </para>
        <para>Note that the implementation of this setting might be impossible (for example if mount namespaces
        are not available), and the unit should be written in a way that does not solely rely on this setting for
        security.</para></listitem>
      </varlistentry>
      <varlistentry>
@ -1076,7 +1100,7 @@
        configures only the loopback network device
        <literal>lo</literal> inside it. No other network devices will
        be available to the executed process. This is useful to
-        securely turn off network access by the executed process.
+        turn off network access by the executed process.
        Defaults to false. It is possible to run two or more units
        within the same private network namespace by using the
        <varname>JoinsNamespaceOf=</varname> directive, see
@ -1086,7 +1110,11 @@
        The latter has the effect that AF_UNIX sockets in the abstract
        socket namespace will become unavailable to the processes
        (however, those located in the file system will continue to be
-        accessible).</para></listitem>
+        accessible).</para>
        <para>Note that the implementation of this setting might be impossible (for example if network namespaces
        are not available), and the unit should be written in a way that does not solely rely on this setting for
        security.</para></listitem>
      </varlistentry>
      <varlistentry>
@ -1108,7 +1136,11 @@
        <para>This setting is particularly useful in conjunction with
        <varname>RootDirectory=</varname>/<varname>RootImage=</varname>, as the need to synchronize the user and group
        databases in the root directory and on the host is reduced, as the only users and groups who need to be matched
-        are <literal>root</literal>, <literal>nobody</literal> and the unit's own user and group.</para></listitem>
+        are <literal>root</literal>, <literal>nobody</literal> and the unit's own user and group.</para>
        <para>Note that the implementation of this setting might be impossible (for example if user namespaces
        are not available), and the unit should be written in a way that does not solely rely on this setting for
        security.</para></listitem>
      </varlistentry>
      <varlistentry>
@ -1580,7 +1612,7 @@
        <listitem><para>Restricts access to Linux namespace functionality for the processes of this unit. For details
        about Linux namespaces, see
-        <citerefentry><refentrytitle>namespaces</refentrytitle><manvolnum>7</manvolnum></citerefentry>. Either takes a
+        <citerefentry project='man-pages'><refentrytitle>namespaces</refentrytitle><manvolnum>7</manvolnum></citerefentry>. Either takes a
        boolean argument, or a space-separated list of namespace type identifiers. If false (the default), no
        restrictions on namespace creation and switching are made. If true, access to any kind of namespacing is
        prohibited. Otherwise, a space-separated list of namespace type identifiers must be specified, consisting of
@ -1597,7 +1629,8 @@
        the specified flags parameters into account. Note that — if this option is used — in addition to restricting
        creation and switching of the specified types of namespaces (or all of them, if true) access to the
        <function>setns()</function> system call with a zero flags parameter is prohibited.  This setting is only
-        supported on x86, x86-64, s390 and s390x, and enforces no restrictions on other architectures. If running in user
+        supported on x86, x86-64, mips, mips-le, mips64, mips64-le, mips64-n32, mips64-le-n32, ppc64, ppc64-le,
        s390 and s390x, and enforces no restrictions on other architectures. If running in user
        mode, or in system mode, but without the <constant>CAP_SYS_ADMIN</constant> capability (e.g. setting
        <varname>User=</varname>), <varname>NoNewPrivileges=yes</varname> is implied.  </para></listitem>
      </varlistentry>
@ -1620,7 +1653,6 @@
      <varlistentry>
        <term><varname>RuntimeDirectory=</varname></term>
        <term><varname>RuntimeDirectoryMode=</varname></term>
        <listitem><para>Takes a list of directory names. If set, one
        or more directories by the specified names will be created
@ -1644,6 +1676,16 @@
        <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para></listitem>
      </varlistentry>
      <varlistentry>
        <term><varname>RuntimeDirectoryMode=</varname></term>
        <listitem><para>Specifies the access mode of the directories specified in
        <varname>RuntimeDirectory=</varname> as an octal number. Defaults to
        <constant>0755</constant>. See "Permissions" in
        <citerefentry project='man-pages'><refentrytitle>path_resolution</refentrytitle><manvolnum>7</manvolnum></citerefentry> for a discussion of the meaning of permission bits.
        </para></listitem>
      </varlistentry>
      <varlistentry>
        <term><varname>MemoryDenyWriteExecute=</varname></term>
@ -1655,8 +1697,8 @@
        <citerefentry><refentrytitle>mprotect</refentrytitle><manvolnum>2</manvolnum></citerefentry> system calls with
        <constant>PROT_EXEC</constant> set and
        <citerefentry><refentrytitle>shmat</refentrytitle><manvolnum>2</manvolnum></citerefentry> system calls with
-        <constant>SHM_EXEC</constant> set. Note that this option is incompatible with programs that generate program
+        <constant>SHM_EXEC</constant> set. Note that this option is incompatible with programs and libraries that
-        code dynamically at runtime, such as JIT execution engines, or programs compiled making use of the code
+        generate program code dynamically at runtime, including JIT execution engines, executable stacks, and code
        "trampoline" feature of various C compilers. This option improves service security, as it makes harder for
        software exploits to change running code dynamically. Note that this feature is fully available on x86-64, and
        partially on x86. Specifically, the <function>shmat()</function> protection is not available on x86. Note that
--- a/man/systemd.journal-fields.xml
+++ b/man/systemd.journal-fields.xml
@ -87,7 +87,7 @@
          recommended to be a UUID-compatible ID, but this is not
          enforced, and formatted differently. Developers can generate
          a new ID for this purpose with <command>journalctl
-          <option>--new-id</option></command>.
+          <option>--new-id128</option></command>.
          </para>
        </listitem>
      </varlistentry>
@ -156,7 +156,9 @@
        <listitem>
          <para>The process, user, and group ID of the process the
          journal entry originates from formatted as a decimal
-          string.</para>
+          string. Note that entries obtained via <literal>stdout</literal> or
          <literal>stderr</literal> of forked processes will contain credentials valid for a parent
          process (that initiated the connection to <command>systemd-journald</command>).</para>
        </listitem>
      </varlistentry>
--- a/man/systemd.link.xml
+++ b/man/systemd.link.xml
@ -401,6 +401,47 @@
          </variablelist>
        </listitem>
      </varlistentry>
      <varlistentry>
        <term><varname>Port=</varname></term>
        <listitem>
          <para>The port option is used to select the device port. The
          supported values are:</para>
          <variablelist>
            <varlistentry>
              <term><literal>tp</literal></term>
              <listitem>
                <para>An Ethernet interface using Twisted-Pair cable as the medium.</para>
              </listitem>
            </varlistentry>
            <varlistentry>
              <term><literal>aui</literal></term>
              <listitem>
                <para>Attachment Unit Interface (AUI). Normally used with hubs.
                </para>
              </listitem>
            </varlistentry>
            <varlistentry>
              <term><literal>bnc</literal></term>
              <listitem>
                <para>An Ethernet interface using BNC connectors and co-axial cable.</para>
              </listitem>
            </varlistentry>
            <varlistentry>
              <term><literal>mii</literal></term>
              <listitem>
                <para>An Ethernet interface using a Media Independent Interface (MII).</para>
              </listitem>
            </varlistentry>
            <varlistentry>
              <term><literal>fibre</literal></term>
              <listitem>
                <para>An Ethernet interface using Optical Fibre as the medium.</para>
              </listitem>
            </varlistentry>
          </variablelist>
        </listitem>
      </varlistentry>
      <varlistentry>
        <term><varname>TCPSegmentationOffload=</varname></term>
        <listitem>
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@ -161,8 +161,15 @@
    <para>The NFS mount option <option>bg</option> for NFS background mounts
    as documented in <citerefentry project='man-pages'><refentrytitle>nfs</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-    is not supported in <filename>/etc/fstab</filename> entries. The systemd mount option <option>nofail</option>
+    is detected by <command>systemd-fstab-generator</command> and the options
-    provides similar functionality and should be used instead.</para>
+    are transformed so that systemd fulfills the job-control implications of
    that option.  Specifically <command>systemd-fstab-generator</command> acts
    as though <literal>x-systemd.mount-timout=infinity,retry=10000</literal> was
    prepended to the option list, and <literal>fg,nofail</literal> was appended.
    Depending on specific requirements, it may be appropriate to provide some of
    these options explicitly, or to make use of the
    <literal>x-systemd.automount</literal> option described below instead
    of using <literal>bg</literal>.</para>
    <para>When reading <filename>/etc/fstab</filename> a few special
    mount options are understood by systemd which influence how
@ -230,7 +237,7 @@
        <listitem><para>The block device backed file system will be upgraded
        to <varname>BindsTo=</varname> dependency. This option is only useful
        when mounting file systems manually with
-        <citerefentry><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+        <citerefentry project='man-pages'><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>
        as the default dependency in this case is <varname>Requires=</varname>.
        This option is already implied by entries in <filename>/etc/fstab</filename>
        or by mount units.
@ -366,8 +373,9 @@
      <varlistentry>
        <term><varname>Where=</varname></term>
-        <listitem><para>Takes an absolute path of a directory of the
+        <listitem><para>Takes an absolute path of a directory for the
-        mount point. If the mount point does not exist at the time of
+        mount point; in particular, the destination cannot be a symbolic
        link.  If the mount point does not exist at the time of
        mounting, it is created. This string must be reflected in the
        unit filename. (See above.) This option is
        mandatory.</para></listitem>
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@ -169,6 +169,9 @@
          <row><entry><varname>vxlan</varname></entry>
          <entry>A virtual extensible LAN (vxlan), for connecting Cloud computing deployments.</entry></row>
          <row><entry><varname>geneve</varname></entry>
          <entry>A GEneric NEtwork Virtualization Encapsulation (GENEVE) netdev driver.</entry></row>
          <row><entry><varname>vrf</varname></entry>
          <entry>A Virtual Routing and Forwarding (<ulink url="https://www.kernel.org/doc/Documentation/networking/vrf.txt">VRF</ulink>) interface to create separate routing and forwarding domains.</entry></row>
@ -341,7 +344,8 @@
        <varlistentry>
          <term><varname>DefaultPVID=</varname></term>
          <listitem>
-            <para>This specifies the default port VLAN ID of a newly attached bridge port.</para>
+            <para>This specifies the default port VLAN ID of a newly attached bridge port.
            Set this to an integer in the range 1–4094 or <literal>none</literal> to disable the PVID.</para>
          </listitem>
        </varlistentry>
        <varlistentry>
@ -399,8 +403,40 @@
            This option is compulsory.</para>
          </listitem>
        </varlistentry>
        <varlistentry>
          <term><varname>GVRP=</varname></term>
          <listitem>
            <para>The Generic VLAN Registration Protocol (GVRP) is a protocol that
            allows automatic learning of VLANs on a network. A boolean. When unset,
            the kernel's default setting applies.</para>
          </listitem>
        </varlistentry>
        <varlistentry>
          <term><varname>MVRP=</varname></term>
          <listitem>
            <para>Multiple VLAN Registration Protocol (MVRP) formerly known as GARP VLAN
            Registration Protocol (GVRP) is a standards-based Layer 2 network protocol,
            for automatic configuration of VLAN information on switches. It was defined
            in the 802.1ak amendment to 802.1Q-2005. A boolean. When unset, the kernel's
            default setting applies.</para>
          </listitem>
        </varlistentry>
        <varlistentry>
          <term><varname>LooseBinding=</varname></term>
          <listitem>
            <para>The VLAN loose binding mode, in which only the operational state is passed
            from the parent to the associated VLANs, but the VLAN device state is not changed.
            A boolean. When unset, the kernel's default setting applies.</para>
          </listitem>
        </varlistentry>
        <varlistentry>
          <term><varname>ReorderHeader=</varname></term>
          <listitem>
            <para>The VLAN reorder header is set VLAN interfaces behave like physical interfaces.
            A boolean. When unset, the kernel's default setting applies.</para>
          </listitem>
        </varlistentry>
      </variablelist>
  </refsect1>
  <refsect1>
@ -590,8 +626,8 @@
      <listitem>
        <para>Configures the default destination UDP port on a per-device basis.
        If destination port is not specified then Linux kernel default will be used.
-        Set destination port 4789 to get the IANA assigned value,
+        Set destination port 4789 to get the IANA assigned value. If not set or if the
-        and destination port 0 to get default values.</para>
+        destination port is assigned the empty string the default port of 4789 is used.</para>
      </listitem>
    </varlistentry>
    <varlistentry>
@ -604,6 +640,78 @@
          ports, and allows overriding via configuration.</para>
        </listitem>
      </varlistentry>
    <varlistentry>
      <term><varname>FlowLabel=</varname></term>
        <listitem>
          <para>Specifies the flow label to use in outgoing packets.
          The valid range is 0-1048575.
          </para>
        </listitem>
      </varlistentry>
    </variablelist>
  </refsect1>
  <refsect1>
    <title>[GENEVE] Section Options</title>
    <para>The <literal>[GENEVE]</literal> section only applies for
    netdevs of kind <literal>geneve</literal>, and accepts the
    following keys:</para>
    <variablelist class='network-directives'>
      <varlistentry>
        <term><varname>Id=</varname></term>
        <listitem>
          <para>Specifies the Virtual Network Identifer (VNI) to use. Ranges [0-16777215].</para>
        </listitem>
      </varlistentry>
      <varlistentry>
        <term><varname>Remote=</varname></term>
        <listitem>
          <para>Specifies the unicast destination IP address to use in outgoing packets.</para>
        </listitem>
      </varlistentry>
      <varlistentry>
        <term><varname>TOS=</varname></term>
        <listitem>
          <para>Specifies the TOS value to use in outgoing packets. Ranges [1-255].</para>
        </listitem>
      </varlistentry>
      <varlistentry>
        <term><varname>TTL=</varname></term>
        <listitem>
          <para>Specifies the TTL value to use in outgoing packets. Ranges [1-255].</para>
        </listitem>
      </varlistentry>
      <varlistentry>
        <term><varname>UDPChecksum=</varname></term>
        <listitem>
          <para>A boolean. When true, specifies if UDP checksum is calculated for transmitted packets over IPv4.</para>
        </listitem>
      </varlistentry>
      <varlistentry>
        <term><varname>UDP6ZeroChecksumTx=</varname></term>
        <listitem>
          <para>A boolean. When true, skip UDP checksum calculation for transmitted packets over IPv6.</para>
        </listitem>
      </varlistentry>
      <varlistentry>
        <term><varname>UDP6ZeroChecksumRx=</varname></term>
        <listitem>
          <para>A boolean. When true, allows incoming UDP packets over IPv6 with zero checksum field.</para>
        </listitem>
      </varlistentry>
    <varlistentry>
      <term><varname>DestinationPort=</varname></term>
      <listitem>
        <para>Specifies destination port. Defaults to 6081. If not set or assigned the empty string, the default
        port of 6081 is used.</para>
      </listitem>
    </varlistentry>
    <varlistentry>
      <term><varname>FlowLabel=</varname></term>
        <listitem>
          <para>Specifies the flow label to use in outgoing packets.</para>
        </listitem>
      </varlistentry>
    </variablelist>
  </refsect1>
  <refsect1>
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@ -507,7 +507,7 @@
            <para>This setting is read by
            <citerefentry><refentrytitle>systemd-resolved.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
            "Search domains" correspond to the <varname>domain</varname> and <varname>search</varname> entries in
-            <citerefentry><refentrytitle>resolv.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+            <citerefentry project='man-pages'><refentrytitle>resolv.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
            Domain name routing has no equivalent in the traditional glibc API, which has no concept of domain
            name servers limited to a specific link.</para>
          </listitem>
@ -612,22 +612,27 @@
        </para></listitem>
        </varlistentry>
        <varlistentry>
-          <term><varname>IPv6ProxyNDPAddress=</varname></term>
+          <term><varname>IPv6ProxyNDP=</varname></term>
-          <listitem><para>An IPv6 address, for which Neighbour Advertisement
+          <listitem><para>A boolean. Configures proxy NDP for IPv6. Proxy NDP (Neighbor Discovery
-          messages will be proxied.
+          Protocol) is a technique for IPv6 to allow routing of addresses to a different
-          Proxy NDP (Neighbor Discovery Protocol) is a technique for IPv6 to
+          destination when peers expect them to be present on a certain physical link.
          allow routing of addresses to a different destination when peers expect them
          to be present on a certain physical link.
          In this case a router answers Neighbour Advertisement messages intended for
          another machine by offering its own MAC address as destination.
-          Unlike proxy ARP for IPv4, is not enabled globally, but will only send Neighbour
+          Unlike proxy ARP for IPv4, it is not enabled globally, but will only send Neighbour
          Advertisement messages for addresses in the IPv6 neighbor proxy table,
-          which can also be shown by <command>ip -6 neighbour show proxy</command>
+          which can also be shown by <command>ip -6 neighbour show proxy</command>.
-          This option may be specified more than once. systemd-networkd will control the
+          systemd-networkd will control the per-interface `proxy_ndp` switch for each configured
-          per-interface `proxy_ndp` switch for each configured interface, depending on whether
+          interface depending on this option.
-          there are <option>IPv6ProxyNDPAddress=</option> entries configured and add these to
+          Defautls to unset.
-          the kernels IPv6 neighbor proxy table.
+        </para></listitem>
-          Defaults to unset.
+        </varlistentry>
        <varlistentry>
          <term><varname>IPv6ProxyNDPAddress=</varname></term>
          <listitem><para>An IPv6 address, for which Neighbour Advertisement messages will be
          proxied. This option may be specified more than once. systemd-networkd will add the
          <option>IPv6ProxyNDPAddress=</option> entries to the kernel's IPv6 neighbor proxy table.
          This option implies <option>IPv6ProxyNDP=true</option> but has no effect if
          <option>IPv6ProxyNDP</option> has been set to false. Defaults to unset.
        </para></listitem>
        </varlistentry>
        <varlistentry>
@ -796,6 +801,33 @@
      </variablelist>
  </refsect1>
    <refsect1>
    <title>[IPv6AddressLabel] Section Options</title>
      <para>An <literal>[IPv6AddressLabel]</literal> section accepts the
      following keys. Specify several <literal>[IPv6AddressLabel]</literal>
      sections to configure several addresse labels. IPv6 address labels are
      used for address selection. See <ulink url="https://tools.ietf.org/html/rfc3484">RFC 3484</ulink>.
      Precedence is managed by userspace, and only the label itself is stored in the kernel</para>
      <variablelist class='network-directives'>
        <varlistentry>
          <term><varname>Label=</varname></term>
          <listitem>
            <para> The label for the prefix (an unsigned integer) ranges 0 to 4294967294.
            0xffffffff is reserved. This key is mandatory.</para>
          </listitem>
        </varlistentry>
        <varlistentry>
          <term><varname>Prefix=</varname></term>
          <listitem>
            <para>IPv6 prefix is an address with a prefix length, separated by a slash <literal>/</literal> character.
            This key is mandatory. </para>
          </listitem>
        </varlistentry>
      </variablelist>
  </refsect1>
  <refsect1>
    <title>[Route] Section Options</title>
      <para>The <literal>[Route]</literal> section accepts the
@ -809,6 +841,16 @@
            <para>As in the <literal>[Network]</literal> section.</para>
          </listitem>
        </varlistentry>
         <varlistentry>
           <term><varname>GatewayOnlink=</varname></term>
           <listitem>
             <para>The <literal>GatewayOnlink</literal> option tells the kernel that it does not have
             to check if the gateway is reachable directly by the current machine (i.e., the kernel does
             not need to check if the gateway is attached to the local network), so that we can insert the
             route in the kernel table without it being complained about. A boolean, defaults to <literal>no</literal>.
             </para>
           </listitem>
         </varlistentry>
        <varlistentry>
          <term><varname>Destination=</varname></term>
          <listitem>
@ -831,6 +873,16 @@
            <para>The metric of the route (an unsigned integer).</para>
          </listitem>
        </varlistentry>
        <varlistentry>
          <term><varname>IPv6Preference=</varname></term>
          <listitem>
            <para>Specifies the route preference as defined in <ulink
            url="https://tools.ietf.org/html/rfc4191">RFC4191</ulink> for Router Discovery messages.
            Which can be one of <literal>low</literal> the route has a lowest priority,
            <literal>medium</literal> the route has a default priority or
            <literal>high</literal> the route has a highest priority.</para>
          </listitem>
        </varlistentry>
        <varlistentry>
          <term><varname>Scope=</varname></term>
          <listitem>
@ -855,6 +907,15 @@
          </para>
          </listitem>
        </varlistentry>
        <varlistentry>
          <term><varname>Protocol=</varname></term>
          <listitem>
            <para>The Protocol identifier for the route. Takes a number between 0 and 255 or the special values
            <literal>kernel</literal>, <literal>boot</literal> and <literal>static</literal>. Defaults to
            <literal>static</literal>.
            </para>
          </listitem>
        </varlistentry>
      </variablelist>
  </refsect1>
@ -937,9 +998,11 @@
        <varlistentry>
          <term><varname>UseRoutes=</varname></term>
          <listitem>
-            <para>When true (the default), the static routes will be
+            <para>When true (the default), the static routes will be requested from the DHCP server and added to the
-            requested from the DHCP server and added to the routing
+              routing table with a metric of 1024, and a scope of "global", "link" or "host", depending on the route's
-            table with a metric of 1024.</para>
+              destination and gateway. If the destination is on the local host, e.g., 127.x.x.x, or the same as the
              link's own address, the scope will be set to "host". Otherwise if the gateway is null (a direct route), a
              "link" scope will be used. For anything else, scope defaults to "global".</para>
          </listitem>
        </varlistentry>
@ -1257,7 +1320,18 @@
            <para>Sets the "cost" of sending packets of this interface.
            Each port in a bridge may have a different speed and the cost
            is used to decide which link to use. Faster interfaces
-            should have lower costs.</para>
+            should have lower costs. It is an interger value between 1 and
            65535.</para>
          </listitem>
        </varlistentry>
        <varlistentry>
          <term><varname>Priority=</varname></term>
          <listitem>
            <para>Sets the "priority" of sending packets on this interface.
            Each port in a bridge may have a different priority which is used
            to decide which link to use. Lower value means higher priority.
            It is an interger value between 0 to 63. Networkd does not set any
            default, meaning the kernel default value of 32 is used.</para>
          </listitem>
        </varlistentry>
      </variablelist>
@ -1513,7 +1587,7 @@ VRF=vrf1
      <title>MacVTap</title>
      <para>This brings up a network interface <literal>macvtap-test</literal>
      and attaches it to <literal>enp0s25</literal>.</para>
-      <programlisting># /lib/systemd/network/25-macvtap.network
+      <programlisting># /usr/lib/systemd/network/25-macvtap.network
 [Match]
 Name=enp0s25
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@ -184,7 +184,7 @@
        process has to exit before systemd starts follow-up units.
        <varname>RemainAfterExit=</varname> is particularly useful for
        this type of service. This is the implied default if neither
-        <varname>Type=</varname> or <varname>ExecStart=</varname> are
+        <varname>Type=</varname> nor <varname>ExecStart=</varname> are
        specified.</para>
        <para>Behavior of <option>dbus</option> is similar to
@ -328,14 +328,13 @@
        all <varname>ExecStartPre=</varname> commands that were not prefixed
        with a <literal>-</literal> exit successfully.</para>
-        <para><varname>ExecStartPost=</varname> commands are only run after
+        <para><varname>ExecStartPost=</varname> commands are only run after the commands specified in
-        the service has started successfully, as determined by <varname>Type=</varname>
+        <varname>ExecStart=</varname> have been invoked successfully, as determined by <varname>Type=</varname>
-        (i.e. the process has been started for <varname>Type=simple</varname>
+        (i.e. the process has been started for <varname>Type=simple</varname> or <varname>Type=idle</varname>, the last
-        or <varname>Type=idle</varname>, the process exits successfully for
+        <varname>ExecStart=</varname> process exited successfully for <varname>Type=oneshot</varname>, the initial
-        <varname>Type=oneshot</varname>, the initial process exits successfully
+        process exited successfully for <varname>Type=forking</varname>, <literal>READY=1</literal> is sent for
-        for <varname>Type=forking</varname>, <literal>READY=1</literal> is sent
+        <varname>Type=notify</varname>, or the <varname>BusName=</varname> has been taken for
-        for <varname>Type=notify</varname>, or the <varname>BusName=</varname>
+        <varname>Type=dbus</varname>).</para>
        has been taken for <varname>Type=dbus</varname>).</para>
        <para>Note that <varname>ExecStartPre=</varname> may not be
        used to start long-running processes. All processes forked
@ -384,7 +383,8 @@
        multiple command lines, following the same scheme as described
        for <varname>ExecStart=</varname> above. Use of this setting
        is optional. After the commands configured in this option are
-        run, all processes remaining for a service are terminated
+        run, it is implied that the service is stopped, and any processes
        remaining for it are terminated
        according to the <varname>KillMode=</varname> setting (see
        <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
        If this option is not specified, the process is terminated by
@ -657,9 +657,10 @@
        <para>As exceptions to the setting above, the service will not
        be restarted if the exit code or signal is specified in
-        <varname>RestartPreventExitStatus=</varname> (see below).
+        <varname>RestartPreventExitStatus=</varname> (see below) or
-        Also, the services will always be restarted if the exit code
+        the service is stopped with <command>systemctl stop</command>
-        or signal is specified in
+        or an equivalent operation. Also, the services will always be
        restarted if the exit code or signal is specified in
        <varname>RestartForceExitStatus=</varname> (see below).</para>
        <para>Note that service restart is subject to unit start rate
@ -780,15 +781,14 @@
      <varlistentry>
        <term><varname>NonBlocking=</varname></term>
-        <listitem><para>Set the <constant>O_NONBLOCK</constant> flag
+        <listitem><para>Set the <constant>O_NONBLOCK</constant> flag for all file descriptors passed via socket-based
-        for all file descriptors passed via socket-based activation.
+        activation. If true, all file descriptors >= 3 (i.e. all except stdin, stdout, stderr), excluding those passed
-        If true, all file descriptors >= 3 (i.e. all except stdin,
+        in via the file descriptor storage logic (see <varname>FileDescriptorStoreMax=</varname> for details), will
-        stdout, and stderr) will have the
+        have the <constant>O_NONBLOCK</constant> flag set and hence are in non-blocking mode. This option is only
-        <constant>O_NONBLOCK</constant> flag set and hence are in
+        useful in conjunction with a socket unit, as described in
-        non-blocking mode. This option is only useful in conjunction
+        <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry> and has no
-        with a socket unit, as described in
+        effect on file descriptors which were previously saved in the file-descriptor store for example.  Defaults to
-        <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+        false.</para></listitem>
        Defaults to false.</para></listitem>
      </varlistentry>
      <varlistentry>
@ -852,21 +852,18 @@
      <varlistentry>
        <term><varname>FileDescriptorStoreMax=</varname></term>
-        <listitem><para>Configure how many file descriptors may be
+        <listitem><para>Configure how many file descriptors may be stored in the service manager for the service using
        stored in the service manager for the service using
        <citerefentry><refentrytitle>sd_pid_notify_with_fds</refentrytitle><manvolnum>3</manvolnum></citerefentry>'s
-        <literal>FDSTORE=1</literal> messages. This is useful for
+        <literal>FDSTORE=1</literal> messages. This is useful for implementing services that can restart after an
-        implementing service restart schemes where the state is
+        explicit request or a crash without losing state. Any open sockets and other file descriptors which should not
-        serialized to <filename>/run</filename> and the file
+        be closed during the restart may be stored this way. Application state can either be serialized to a file in
-        descriptors passed to the service manager, to allow restarts
+        <filename>/run</filename>, or better, stored in a
-        without losing state. Defaults to 0, i.e. no file descriptors
+        <citerefentry><refentrytitle>memfd_create</refentrytitle><manvolnum>2</manvolnum></citerefentry> memory file
-        may be stored in the service manager. All file
+        descriptor. Defaults to 0, i.e. no file descriptors may be stored in the service manager. All file descriptors
-        descriptors passed to the service manager from a specific
+        passed to the service manager from a specific service are passed back to the service's main process on the next
-        service are passed back to the service's main process on the
+        service restart. Any file descriptors passed to the service manager are automatically closed when
-        next service restart. Any file descriptors passed to the
+        <constant>POLLHUP</constant> or <constant>POLLERR</constant> is seen on them, or when the service is fully
-        service manager are automatically closed when POLLHUP or
+        stopped and no job is queued or being executed for it.</para></listitem>
        POLLERR is seen on them, or when the service is fully stopped
        and no job is queued or being executed for it.</para></listitem>
      </varlistentry>
      <varlistentry>
@ -919,17 +916,18 @@
    <para>Each command line is split on whitespace, with the first item being the command to
    execute, and the subsequent items being the arguments. Double quotes ("…") and single quotes
-    ('…') may be used, in which case everything until the next matching quote becomes part of the
+    ('…') may be used to wrap a whole item (the opening quote may appear only at the beginning or
-    same argument. Quotes themselves are removed. C-style escapes are also supported. The table
+    after whitespace that is not quoted, and the closing quote must be followed by whitespace or the
-    below contains the list of known escape patterns. Only escape patterns which match the syntax in
+    end of line), in which case everything until the next matching quote becomes part of the same
-    the table are allowed; other patterns may be added in the future and unknown patterns will
+    argument. Quotes themselves are removed. C-style escapes are also supported. The table below
-    result in a warning. In particular, any backslashes should be doubled. Finally, a trailing
+    contains the list of known escape patterns. Only escape patterns which match the syntax in the
-    backslash (<literal>\</literal>) may be used to merge lines.</para>
+    table are allowed; other patterns may be added in the future and unknown patterns will result in
    a warning. In particular, any backslashes should be doubled. Finally, a trailing backslash
    (<literal>\</literal>) may be used to merge lines.</para>
-    <para>This syntax is intended to be very similar to shell syntax,
+    <para>This syntax is inspired by shell syntax, but only the meta-characters and expansions
-    but only the meta-characters and expansions described in the
+    described in the following paragraphs are understood, and the expansion of variables is
-    following paragraphs are understood. Specifically, redirection
+    different. Specifically, redirection using
    using
    <literal>&lt;</literal>,
    <literal>&lt;&lt;</literal>,
    <literal>&gt;</literal>, and
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@ -901,64 +901,58 @@
  <refsect1>
    <title>Special Passive User Units</title>
-    <refsect2>
+    <variablelist>
-      <title>graphical-session.target</title>
+      <varlistentry>
        <term><filename>graphical-session.target</filename></term>
        <listitem>
          <para>This target is active whenever any graphical session is running. It is used to stop user services which
          only apply to a graphical (X, Wayland, etc.) session when the session is terminated. Such services should
          have <literal>PartOf=graphical-session.target</literal> in their <literal>[Unit]</literal> section. A target
          for a particular session (e. g.  <filename>gnome-session.target</filename>) starts and stops
          <literal>graphical-session.target</literal> with <literal>BindsTo=graphical-session.target</literal>.</para>
-      <para>This target is active whenever any graphical session is running. It
+          <para>Which services are started by a session target is determined by the <literal>Wants=</literal> and
-      is used to stop user services which only apply to a graphical (X,
+          <literal>Requires=</literal> dependencies.  For services that can be enabled independently, symlinks in
-      Wayland, etc.) session when the session is terminated. Such services
+          <literal>.wants/</literal> and <literal>.requires/</literal> should be used, see
-      should have <literal>PartOf=graphical-session.target</literal> in their
+          <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.  Those
-      <literal>[Unit]</literal> section. A target for a particular session
+          symlinks should either be shipped in packages, or should be added dynamically after installation, for example
-      (e. g.  <filename>gnome-session.target</filename>) starts and stops
+          using <literal>systemctl add-wants</literal>, see
-      <literal>graphical-session.target</literal> with
+          <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
-      <literal>BindsTo=graphical-session.target</literal>.</para>
+          </para>
-      <para>Which services are started by a session target is determined by the
+          <example>
-      <literal>Wants=</literal> and <literal>Requires=</literal> dependencies.
+            <title>Nautilus as part of a GNOME session</title>
      For services that can be enabled independently, symlinks in
      <literal>.wants/</literal> and <literal>.requires/</literal> should be
      used, see
      <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
      Those symlinks should either be shipped in packages, or should be added
      dynamically after installation, for example using <literal>systemctl add-wants</literal>, see
      <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
      </para>
-      <example>
+            <para><literal>gnome-session.target</literal> pulls in Nautilus as top-level service:</para>
        <title>Nautilus as part of a GNOME session</title>
-        <para><literal>gnome-session.target</literal> pulls in Nautilus as
+            <programlisting>[Unit]
        top-level service:</para>
        <programlisting>[Unit]
 Description=User systemd services for GNOME graphical session
 Wants=nautilus.service
-BindsTo=graphical-session.target
+BindsTo=graphical-session.target</programlisting>
        </programlisting>
-        <para><literal>nautilus.service</literal> gets stopped when the session stops:</para>
+            <para><literal>nautilus.service</literal> gets stopped when the session stops:</para>
-        <programlisting>[Unit]
+            <programlisting>[Unit]
 Description=Render the desktop icons with Nautilus
 PartOf=graphical-session.target
 [Service]
-…
+…</programlisting>
-        </programlisting>
+          </example>
-      </example>
+        </listitem>
-    </refsect2>
+      </varlistentry>
-    <refsect2>
+      <varlistentry>
-      <title>graphical-session-pre.target</title>
+        <term><filename>graphical-session-pre.target</filename></term>
-
+        <listitem>
-      <para>This target contains services which set up the environment or
+          <para>This target contains services which set up the environment or global configuration of a graphical
-      global configuration of a graphical session, such as SSH/GPG agents
+          session, such as SSH/GPG agents (which need to export an environment variable into all desktop processes) or
-      (which need to export an environment variable into all desktop processes)
+          migration of obsolete d-conf keys after an OS upgrade (which needs to happen before starting any process that
-      or migration of obsolete d-conf keys after an OS upgrade (which needs to
+          might use them). This target must be started before starting a graphical session like
-      happen before starting any process that might use them). This target must
+          <filename>gnome-session.target</filename>.</para>
-      be started before starting a graphical session
+        </listitem>
-      like <filename>gnome-session.target</filename>.</para>
+      </varlistentry>
-    </refsect2>
+    </variablelist>
  </refsect1>
--- a/man/systemd.target.xml
+++ b/man/systemd.target.xml
@ -98,6 +98,43 @@
  </refsect1>
  <refsect1>
    <title>Example</title>
    <example>
      <title>Simple standalone target</title>
      <programlisting># emergency-net.target
 [Unit]
 Description=Emergency Mode with Networking
 Requires=emergency.target systemd-networkd.service
 After=emergency.target systemd-networkd.service
 AllowIsolate=yes</programlisting>
      <para>When adding dependencies to other units, it's important to check if they set
      <varname>DefaultDependencies=</varname>. Service units, unless they set
      <varname>DefaultDependencies=no</varname>, automatically get a dependency on
      <filename>sysinit.target</filename>. In this case, both
      <filename>emergency.target</filename> and <filename>systemd-networkd.service</filename>
      have <varname>DefaultDependencies=no</varname>, so they are suitable for use
      in this target, and do not pull in <filename>sysinit.target</filename>.</para>
      <para>You can now switch into this emergency mode by running <varname>systemctl
      isolate emergency-net.target</varname> or by passing the option
      <varname>systemd.unit=emergency-net.target</varname> on the kernel command
      line.</para>
      <para>Other units can have <varname>WantedBy=emergency-net.target</varname> in the
      <varname>[Install]</varname> section. After they are enabled using
      <command>systemctl enable</command>, they will be started before
      <varname>emergency-net.target</varname> is started. It is also possible to add
      arbitrary units as dependencies of <filename>emergency.target</filename> without
      modifying them by using <command>systemctl add-wants</command>.
      </para>
    </example>
  </refsect1>
  <refsect1>
      <title>See Also</title>
      <para>
--- a/man/systemd.time.xml
+++ b/man/systemd.time.xml
@ -242,23 +242,17 @@
    the local timezone, similar to the supported syntax of timestamps (see above). Non-local timezones except for UTC
    are not supported.</para>
-    <para>The special expressions
+  <para>The following special expressions may be used as shorthands for longer normalized forms:</para>
-    <literal>minutely</literal>,
+
-    <literal>hourly</literal>, <literal>daily</literal>,
+    <programlisting>    minutely → *-*-* *:*:00
-    <literal>monthly</literal>, <literal>weekly</literal>,
+      hourly → *-*-* *:00:00
-    <literal>yearly</literal>,
+       daily → *-*-* 00:00:00
-    <literal>quarterly</literal>,
+     monthly → *-*-01 00:00:00
-    <literal>semiannually</literal> may be used as
+      weekly → Mon *-*-* 00:00:00
-    calendar events which refer to
+      yearly → *-01-01 00:00:00
-    <literal>*-*-* *:*:00</literal>,
+   quarterly → *-01,04,07,10-01 00:00:00
-    <literal>*-*-* *:00:00</literal>,
+semiannually → *-01,07-01 00:00:00
-    <literal>*-*-* 00:00:00</literal>,
+   </programlisting>
    <literal>*-*-01 00:00:00</literal>,
    <literal>Mon *-*-* 00:00:00</literal>,
    <literal>*-01-01 00:00:00</literal>,
    <literal>*-01,04,07,10-01 00:00:00</literal> and
    <literal>*-01,07-01 00:00:00</literal>, respectively.
    </para>
    <para>Examples for valid timestamps and their
    normalized form:</para>
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@ -93,7 +93,7 @@
    on <filename>timers.target</filename>, as well as <varname>Conflicts=</varname> and <varname>Before=</varname> on
    <filename>shutdown.target</filename> to ensure that they are stopped cleanly prior to system shutdown.  Timer units
    with at least one <varname>OnCalendar=</varname> directive will have an additional <varname>After=</varname>
-    dependency on <filename>timer-sync.target</filename> to avoid being started before the system clock has been
+    dependency on <filename>time-sync.target</filename> to avoid being started before the system clock has been
    correctly set. Only timer units involved with early boot or late system shutdown should disable the
    <varname>DefaultDependencies=</varname> option.</para>
  </refsect1>
@ -173,7 +173,9 @@
        <para>Note that timers do not necessarily expire at the
        precise time configured with this setting, as it is subject to
        the <varname>AccuracySec=</varname> setting
-        below.</para></listitem>
+        below.</para>
       <para>May be specified more than once.</para></listitem>
      </varlistentry>
      <varlistentry>
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@ -546,26 +546,29 @@
        <term><varname>Before=</varname></term>
        <term><varname>After=</varname></term>
-        <listitem><para>A space-separated list of unit names.  Configures ordering dependencies between units. If a
+        <listitem><para>These two settings expect a space-separated list of unit names. They configure ordering
-        unit <filename>foo.service</filename> contains a setting <option>Before=bar.service</option> and both units are
+        dependencies between units. If a unit <filename>foo.service</filename> contains a setting
-        being started, <filename>bar.service</filename>'s start-up is delayed until <filename>foo.service</filename> is
+        <option>Before=bar.service</option> and both units are being started, <filename>bar.service</filename>'s
-        started up.  Note that this setting is independent of and orthogonal to the requirement dependencies as
+        start-up is delayed until <filename>foo.service</filename> has finished starting up.  Note that this setting is
-        configured by <varname>Requires=</varname>, <varname>Wants=</varname> or <varname>BindsTo=</varname>. It is a
+        independent of and orthogonal to the requirement dependencies as configured by <varname>Requires=</varname>,
-        common pattern to include a unit name in both the <varname>After=</varname> and <varname>Requires=</varname>
+        <varname>Wants=</varname> or <varname>BindsTo=</varname>. It is a common pattern to include a unit name in both
-        option, in which case the unit listed will be started before the unit that is configured with these
+        the <varname>After=</varname> and <varname>Requires=</varname> options, in which case the unit listed will be
-        options. This option may be specified more than once, in which case ordering dependencies for all listed names
+        started before the unit that is configured with these options. This option may be specified more than once, in
-        are created. <varname>After=</varname> is the inverse of <varname>Before=</varname>, i.e. while
+        which case ordering dependencies for all listed names are created. <varname>After=</varname> is the inverse of
-        <varname>After=</varname> ensures that the configured unit is started after the listed unit finished starting
+        <varname>Before=</varname>, i.e. while <varname>After=</varname> ensures that the configured unit is started
-        up, <varname>Before=</varname> ensures the opposite, i.e. that the configured unit is fully started up before
+        after the listed unit finished starting up, <varname>Before=</varname> ensures the opposite, that the
-        the listed unit is started. Note that when two units with an ordering dependency between them are shut down,
+        configured unit is fully started up before the listed unit is started. Note that when two units with an
-        the inverse of the start-up order is applied. i.e. if a unit is configured with <varname>After=</varname> on
+        ordering dependency between them are shut down, the inverse of the start-up order is applied. i.e. if a unit is
-        another unit, the former is stopped before the latter if both are shut down. Given two units with any ordering
+        configured with <varname>After=</varname> on another unit, the former is stopped before the latter if both are
-        dependency between them, if one unit is shut down and the other is started up, the shutdown is ordered before
+        shut down. Given two units with any ordering dependency between them, if one unit is shut down and the other is
-        the start-up. It doesn't matter if the ordering dependency is <varname>After=</varname> or
+        started up, the shutdown is ordered before the start-up. It doesn't matter if the ordering dependency is
-        <varname>Before=</varname>, in this case. It also doesn't matter which of the two is shut down, as long as one
+        <varname>After=</varname> or <varname>Before=</varname>, in this case. It also doesn't matter which of the two
-        is shut down and the other is started up. The shutdown is ordered before the start-up in all cases. If two
+        is shut down, as long as one is shut down and the other is started up. The shutdown is ordered before the
-        units have no ordering dependencies between them, they are shut down or started up simultaneously, and no
+        start-up in all cases. If two units have no ordering dependencies between them, they are shut down or started
-        ordering takes place.  </para></listitem>
+        up simultaneously, and no ordering takes place. It depends on the unit type when precisely a unit has finished
        starting up. Most importantly, for service units start-up is considered completed for the purpose of
        <varname>Before=</varname>/<varname>After=</varname> when all its configured start-up commands have been
        invoked and they either failed or reported start-up success.</para></listitem>
      </varlistentry>
      <varlistentry>
@ -718,17 +721,20 @@
      <varlistentry>
        <term><varname>JobTimeoutSec=</varname></term>
        <term><varname>JobRunningTimeoutSec=</varname></term>
        <term><varname>JobTimeoutAction=</varname></term>
        <term><varname>JobTimeoutRebootArgument=</varname></term>
-        <listitem><para>When a job for this unit is queued, a time-out may be configured. If this time limit is
+        <listitem><para>When a job for this unit is queued, a time-out <varname>JobTimeoutSec=</varname> may be
-        reached, the job will be cancelled, the unit however will not change state or even enter the
+        configured. Similarly, <varname>JobRunningTimeoutSec=</varname> starts counting when the queued job is actually
-        <literal>failed</literal> mode. This value defaults to <literal>infinity</literal> (job timeouts disabled),
+        started. If either time limit is reached, the job will be cancelled, the unit however will not change state or
-        except for device units. NB: this timeout is independent from any unit-specific timeout (for example, the
+        even enter the <literal>failed</literal> mode. This value defaults to <literal>infinity</literal> (job timeouts
-        timeout set with <varname>TimeoutStartSec=</varname> in service units) as the job timeout has no effect on the
+        disabled), except for device units (<varname>JobRunningTimeoutSec=</varname> defaults to
-        unit itself, only on the job that might be pending for it. Or in other words: unit-specific timeouts are useful
+        <varname>DefaultTimeoutStartSec=</varname>). NB: this timeout is independent from any unit-specific timeout
-        to abort unit state changes, and revert them. The job timeout set with this option however is useful to abort
+        (for example, the timeout set with <varname>TimeoutStartSec=</varname> in service units) as the job timeout has
-        only the job waiting for the unit state to change.</para>
+        no effect on the unit itself, only on the job that might be pending for it. Or in other words: unit-specific
        timeouts are useful to abort unit state changes, and revert them. The job timeout set with this option however
        is useful to abort only the job waiting for the unit state to change.</para>
        <para><varname>JobTimeoutAction=</varname>
        optionally configures an additional
@ -817,6 +823,8 @@
        <term><varname>ConditionDirectoryNotEmpty=</varname></term>
        <term><varname>ConditionFileNotEmpty=</varname></term>
        <term><varname>ConditionFileIsExecutable=</varname></term>
        <term><varname>ConditionUser=</varname></term>
        <term><varname>ConditionGroup=</varname></term>
        <!-- We do not document ConditionNull=
             here, as it is not particularly
@ -859,9 +867,11 @@
        <varname>arm64-be</varname>,
        <varname>sh</varname>,
        <varname>sh64</varname>,
-        <varname>m86k</varname>,
+        <varname>m68k</varname>,
        <varname>tilegx</varname>,
-        <varname>cris</varname> to test
+        <varname>cris</varname>,
        <varname>arc</varname>,
        <varname>arc-be</varname> to test
        against a specific architecture. The architecture is
        determined from the information returned by
        <citerefentry project='man-pages'><refentrytitle>uname</refentrytitle><manvolnum>2</manvolnum></citerefentry>
@ -973,13 +983,11 @@
        to make sure they run before the stamp file's modification
        time gets reset indicating a completed update.</para>
-        <para><varname>ConditionFirstBoot=</varname> takes a boolean
+        <para><varname>ConditionFirstBoot=</varname> takes a boolean argument. This condition may be used to
-        argument. This condition may be used to conditionalize units
+        conditionalize units on whether the system is booting up with an unpopulated <filename>/etc</filename>
-        on whether the system is booting up with an unpopulated
+        directory (specifically: an <filename>/etc</filename> with no <filename>/etc/machine-id</filename>). This may
-        <filename>/etc</filename> directory. This may be used to
+        be used to populate <filename>/etc</filename> on the first boot after factory reset, or when a new system
-        populate <filename>/etc</filename> on the first boot after
+        instance boots up for the first time.</para>
        factory reset, or when a new system instances boots up for the
        first time.</para>
        <para>With <varname>ConditionPathExists=</varname> a file
        existence condition is checked before a unit is started. If
@ -1028,6 +1036,21 @@
        whether a certain path exists, is a regular file and marked
        executable.</para>
        <para><varname>ConditionUser=</varname> takes a numeric
        <literal>UID</literal>, a UNIX user name, or the special value
        <literal>@system</literal>. This condition may be used to check
        whether the service manager is running as the given user. The
        special value <literal>@system</literal> can be used to check
        if the user id is within the system user range. This option is not
        useful for system services, as the system manager exclusively
        runs as the root user, and thus the test result is constant.</para>
        <para><varname>ConditionGroup=</varname> is similar
        to <varname>ConditionUser=</varname> but verifies that the
        service manager's real or effective group, or any of its
        auxiliary groups match the specified group or GID. This setting
        does not have a special value <literal>@system</literal>.</para>
        <para>If multiple conditions are specified, the unit will be
        executed if all of them apply (i.e. a logical AND is applied).
        Condition checks can be prefixed with a pipe symbol (|) in
@ -1064,6 +1087,8 @@
        <term><varname>AssertDirectoryNotEmpty=</varname></term>
        <term><varname>AssertFileNotEmpty=</varname></term>
        <term><varname>AssertFileIsExecutable=</varname></term>
        <term><varname>AssertUser=</varname></term>
        <term><varname>AssertGroup=</varname></term>
        <listitem><para>Similar to the <varname>ConditionArchitecture=</varname>,
        <varname>ConditionVirtualization=</varname>, …, condition settings described above, these settings add
@ -1384,7 +1409,7 @@ WantedBy=multi-user.target</programlisting>
      ordered appropriately (<varname>After=</varname>). Thirdly, in
      order to harden the service a bit more, the administrator would
      like to set the <varname>PrivateTmp=</varname> setting (see
-      <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+      <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>
      for details). And lastly, the administrator would like to reset
      the niceness of the service to its default value of 0.</para>
--- a/man/sysusers.d.xml
+++ b/man/sysusers.d.xml
@ -53,15 +53,11 @@
  <refsect1>
    <title>Description</title>
-    <para><command>systemd-sysusers</command> uses the files from
+    <para><command>systemd-sysusers</command> uses the files from <filename>sysusers.d</filename> directory to create
-    <filename>sysusers.d</filename> directory to create system users
+    system users and groups at package installation or boot time. This tool may be used to allocate system users and
-    and groups at package installation or boot time. This tool may be
+    groups only, it is not useful for creating non-system (i.e. regular, "human") users and groups, as it accesses
-    used to allocate system users and groups only, it is not useful
+    <filename>/etc/passwd</filename> and <filename>/etc/group</filename> directly, bypassing any more complex user
-    for creating non-system users and groups, as it accesses
+    databases, for example any database involving NIS or LDAP.</para>
    <filename>/etc/passwd</filename> and
    <filename>/etc/group</filename> directly, bypassing any more
    complex user databases, for example any database involving NIS or
    LDAP.</para>
  </refsect1>
  <refsect1>
@ -83,6 +79,9 @@ g input - -
 m authd input
 u root 0 "Superuser" /root</programlisting>
    <para>Empty lines and lines beginning with the <literal>#</literal> character are ignored, and may be used for
    commenting.</para>
    <refsect2>
      <title>Type</title>
@ -134,14 +133,14 @@ u root 0 "Superuser" /root</programlisting>
    <refsect2>
      <title>Name</title>
-      <para>The name field specifies the user or group name. It should
+      <para>The name field specifies the user or group name. The specified name must consist only of the characters a-z,
-      be shorter than 31 characters and avoid any non-ASCII
+      A-Z, 0-9, <literal>_</literal> and <literal>-</literal>, except for the first character which must be one of a-z,
-      characters, and not begin with a numeric character. It is
+      A-Z or <literal>_</literal> (i.e. numbers and <literal>-</literal> are not permitted as first character). The
-      strongly recommended to pick user and group names that are
+      user/group name must have at least one character, and at most 31.</para>
-      unlikely to clash with normal users created by the
+
-      administrator. A good scheme to guarantee this is by prefixing
+      <para>It is strongly recommended to pick user and group names that are unlikely to clash with normal users
-      all system and group names with the underscore, and avoiding too
+      created by the administrator. A good scheme to guarantee this is by prefixing all system and group names with the
-      generic names.</para>
+      underscore, and avoiding too generic names.</para>
      <para>For <varname>m</varname> lines, this field should contain
      the user name to add to a group.</para>
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@ -488,14 +488,14 @@
          <term><option>-s</option></term>
          <term><option>--subsystem-match=<replaceable>string[/string]</replaceable></option></term>
          <listitem>
-            <para>Filter events by subsystem[/devtype]. Only udev events with a matching subsystem value will pass.</para>
+            <para>Filter kernel uevents and udev events by subsystem[/devtype]. Only events with a matching subsystem value will pass.</para>
          </listitem>
        </varlistentry>
        <varlistentry>
          <term><option>-t</option></term>
          <term><option>--tag-match=<replaceable>string</replaceable></option></term>
          <listitem>
-            <para>Filter events by property. Only udev events with a given tag attached will pass.</para>
+            <para>Filter udev events by tag. Only udev events with a given tag attached will pass.</para>
          </listitem>
        </varlistentry>
        <varlistentry>
--- a/man/vconsole.conf.xml
+++ b/man/vconsole.conf.xml
@ -78,6 +78,13 @@
    <para>Depending on the operating system other configuration files
    might be checked for configuration of the virtual console as well,
    however only as fallback.</para>
    <para><filename>/etc/vconsole.conf</filename> is usually created and updated
    using
    <citerefentry><refentrytitle>systemd-localed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
    <citerefentry><refentrytitle>localectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
    may be used to instruct <command>systemd-localed.service</command> to
    query or update configuration.</para>
  </refsect1>
  <refsect1>
--- a/meson.build
+++ b/meson.build
--- a/meson_options.txt
+++ b/meson_options.txt
@ -0,0 +1,256 @@
 # -*- mode: meson -*-
 option('split-usr', type : 'boolean', value : false,
       description : '''assume that /bin, /sbin aren't symlinks into /usr''')
 option('rootlibdir', type : 'string',
       description : '''[/usr]/lib/x86_64-linux-gnu or such''')
 option('rootprefix', type : 'string',
       description : '''override the root prefix''')
 option('link-udev-shared', type : 'boolean',
       description : 'link systemd-udev and its helpers to libsystemd-shared.so')
 option('sysvinit-path', type : 'string', value : '/etc/init.d',
       description : 'the directory where the SysV init scripts are located')
 option('sysvrcnd-path', type : 'string', value : '/etc/rc.d',
       description : 'the base directory for SysV rcN.d directories')
 option('telinit-path', type : 'string', description : 'path to telinit')
 option('rc-local', type : 'string',
       value : '/etc/rc.local')
 option('halt-local', type : 'string',
       value : '/usr/sbin/halt.local')
 option('quotaon-path', type : 'string', description : 'path to quotaon')
 option('quotacheck-path', type : 'string', description : 'path to quotacheck')
 option('kill-path', type : 'string', description : 'path to kill')
 option('kmod-path', type : 'string', description : 'path to kmod')
 option('kexec-path', type : 'string', description : 'path to kexec')
 option('sulogin-path', type : 'string', description : 'path to sulogin')
 option('mount-path', type : 'string', description : 'path to mount')
 option('umount-path', type : 'string', description : 'path to umount')
 option('loadkeys-path', type : 'string', description : 'path to loadkeys')
 option('setfont-path', type : 'string', description : 'path to setfont')
 option('debug-shell', type : 'string', value : '/bin/sh',
       description : 'path to debug shell binary')
 option('debug-tty', type : 'string', value : '/dev/tty9',
       description : 'specify the tty device for debug shell')
 option('debug', type : 'string',
       description : 'enable extra debugging (hashmap,mmap-cache)')
 option('utmp', type : 'boolean',
       description : 'support for utmp/wtmp log handling')
 option('hibernate', type : 'boolean',
       description : 'support for hibernation')
 option('ldconfig', type : 'boolean',
       description : 'support for dynamic linker cache creation')
 option('resolve', type : 'boolean',
       description : 'systemd-resolved stack')
 option('efi', type : 'boolean',
       description : 'enable systemd-boot and bootctl')
 option('tpm', type : 'boolean', value : false,
       description : 'TPM should be used to log events and extend the registers')
 option('environment-d', type : 'boolean',
       description : 'support for environment.d')
 option('binfmt', type : 'boolean',
       description : 'support for custom binary formats')
 option('coredump', type : 'boolean',
       description : 'install the coredump handler')
 option('logind', type : 'boolean',
       description : 'install the systemd-logind stack')
 option('hostnamed', type : 'boolean',
       description : 'install the systemd-hostnamed stack')
 option('localed', type : 'boolean',
       description : 'install the systemd-localed stack')
 option('machined', type : 'boolean',
       description : 'install the systemd-machined stack')
 option('networkd', type : 'boolean',
       description : 'install the systemd-networkd stack')
 option('timedated', type : 'boolean',
       description : 'install the systemd-timedated daemon')
 option('timesyncd', type : 'boolean',
       description : 'install the systemd-timesyncd daemon')
 option('remote', type : 'boolean',
       description : 'support for "journal over the network"')
 option('myhostname', type : 'boolean',
       description : 'nss-myhostname support')
 option('firstboot', type : 'boolean',
       description : 'support for firstboot mechanism')
 option('randomseed', type : 'boolean',
       description : 'support for restoring random seed')
 option('backlight', type : 'boolean',
       description : 'support for restoring backlight state')
 option('vconsole', type : 'boolean',
       description : 'support for vconsole configuration')
 option('quotacheck', type : 'boolean',
       description : 'support for the quotacheck tools')
 option('sysusers', type : 'boolean',
       description : 'support for the sysusers configuration')
 option('tmpfiles', type : 'boolean',
       description : 'support for tmpfiles.d')
 option('importd', type : 'boolean',
       description : 'install the systemd-importd daemon')
 option('hwdb', type : 'boolean',
       description : 'support for the hardware database')
 option('rfkill', type : 'boolean',
       description : 'support for the rfkill tools')
 option('man', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'build and install man pages')
 option('html', type : 'combo', choices : ['auto', 'true', 'false'],
       value : 'false',
       description : 'build and install html pages')
 option('certificate-root', type : 'string', value : '/etc/ssl',
       description : 'the prefix for TLS certificates')
 option('dbuspolicydir', type : 'string',
       description : 'D-Bus policy directory')
 option('dbussessionservicedir', type : 'string',
       description : 'D-Bus session service directory')
 option('dbussystemservicedir', type : 'string',
       description : 'D-Bus system service directory')
 option('pkgconfigdatadir', type : 'string', value : 'share/pkgconfig',
       description : 'directory for ')
 option('pkgconfiglibdir', type : 'string', value : '',
       description : 'directory for ')
 option('rpmmacrosdir', type : 'string', value : 'lib/rpm/macros.d',
       description : 'directory for rpm macros ["no" disables]')
 option('pamlibdir', type : 'string',
       description : 'directory for PAM modules')
 option('pamconfdir', type : 'string',
       description : 'directory for PAM configuration ["no" disables]')
 option('fallback-hostname', type : 'string', value : 'localhost',
       description : 'the hostname used if none configured')
 option('default-hierarchy', type : 'combo',
       choices : ['legacy', 'hybrid', 'unified'], value : 'hybrid',
       description : 'default cgroup hierarchy')
 option('time-epoch', type : 'string',
       description : 'time epoch for time clients')
 option('system-uid-max', type : 'string',
       description : 'maximum system UID')
 option('system-gid-max', type : 'string',
       description : 'maximum system GID')
 option('tty-gid', type : 'string',
       description : 'the numeric GID of the "tty" group',
       value : '5')
 option('adm-group', type : 'boolean',
       description : 'the ACL for adm group should be added')
 option('wheel-group', type : 'boolean',
       description : 'the ACL for wheel group should be added')
 option('nobody-user', type : 'string',
       description : 'The name of the nobody user (the one with UID 65534)',
       value : 'nobody')
 option('nobody-group', type : 'string',
       description : 'The name of the nobody group (the one with GID 65534)',
       value : 'nobody')
 option('dev-kvm-mode', type : 'string', value : '0660',
       description : '/dev/kvm access mode')
 option('default-kill-user-processes', type : 'boolean',
       description : 'the default value for KillUserProcesses= setting')
 option('gshadow', type : 'boolean',
       description : 'support for shadow group')
 option('default-dnssec', type : 'combo',
       description : 'default DNSSEC mode',
       choices : ['yes', 'allow-downgrade', 'no'],
       value : 'allow-downgrade')
 option('dns-servers', type : 'string',
       description : 'space-separated list of default DNS servers',
       value : '8.8.8.8 8.8.4.4 2001:4860:4860::8888 2001:4860:4860::8844')
 option('ntp-servers', type : 'string',
       description : 'space-separated list of default NTP servers',
       value : 'time1.google.com time2.google.com time3.google.com time4.google.com')
 option('support-url', type : 'string',
       description : 'the support URL to show in catalog entries included in systemd',
       value : 'https://lists.freedesktop.org/mailman/listinfo/systemd-devel')
 option('www-target', type : 'string',
       description : 'the address and dir to upload docs too',
       value : 'www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd')
 option('seccomp', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'SECCOMP support')
 option('selinux', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'SELinux support')
 option('apparmor', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'AppArmor support')
 option('smack', type : 'boolean',
       description : 'SMACK support')
 option('smack-run-label', type : 'string',
       description : 'run systemd --system itself with a specific SMACK label')
 option('polkit', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'PolicyKit support')
 option('ima', type : 'boolean',
       description : 'IMA support')
 option('acl', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'libacl support')
 option('audit', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'libaudit support')
 option('blkid', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'libblkid support')
 option('kmod', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'support for loadable modules')
 option('pam', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'PAM support')
 option('microhttpd', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'libµhttpd support')
 option('libcryptsetup', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'libcryptsetup support')
 option('libcurl', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'libcurl support')
 option('idn', type : 'boolean',
       description : 'use IDN when printing host names')
 option('libidn2', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'libidn2 support')
 option('libidn', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'libidn support')
 option('nss-systemd', type : 'boolean',
       description : 'enable nss-systemd')
 option('libiptc', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'libiptc support')
 option('qrencode', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'libqrencode support')
 option('gcrypt', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'gcrypt support')
 option('gnutls', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'gnutls support')
 option('elfutils', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'elfutils support')
 option('zlib', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'zlib compression support')
 option('bzip2', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'bzip2 compression support')
 option('xz', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'xz compression support')
 option('lz4', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'lz4 compression support')
 option('xkbcommon', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'xkbcommon keymap support')
 option('glib', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'libglib support (for tests only)')
 option('dbus', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'libdbus support (for tests only)')
 option('gnu-efi', type : 'combo', choices : ['auto', 'true', 'false'],
       description : 'gnu-efi support for sd-boot')
 option('efi-cc', type : 'string', value : 'gcc',
       description : 'the compiler to use for EFI modules')
 option('efi-ld', type : 'string', value : 'ld',
       description : 'the linker to use for EFI modules')
 option('efi-libdir', type : 'string',
       description : 'path to the EFI lib directory')
 option('efi-ldsdir', type : 'string',
       description : 'path to the EFI lds directory')
 option('efi-includedir', type : 'string', value : '/usr/include/efi',
       description : 'path to the EFI header directory')
 option('tpm-pcrindex', type : 'string', value : '8',
       description : 'TPM PCR register number to use')
 option('bashcompletiondir', type : 'string',
       description : 'directory for bash completion scripts ["no" disables]')
 option('zshcompletiondir', type : 'string',
       description : 'directory for zsh completion scripts ["no" disables]')
 option('tests', type : 'combo', choices : ['true', 'unsafe'],
       description : 'enable extra tests with =unsafe')
 option('install-tests', type : 'boolean', value : 'false',
       description : 'install test executables')
--- a/mkosi.build
+++ b/mkosi.build
@ -20,11 +20,11 @@
 # This is a build script for OS image generation using mkosi (https://github.com/systemd/mkosi).
 # Simply invoke "mkosi" in the project directory to build an OS image.
-./autogen.sh c
+export LC_CTYPE=C.UTF-8
-make -j `nproc`
+meson build
-
+ninja -C build all
-make check
+ninja -C build test
-make install
+ninja -C build install
 mkdir -p $DESTDIR/etc
--- a/network/meson.build
+++ b/network/meson.build
@ -0,0 +1,12 @@
 if conf.get('ENABLE_NETWORKD', false)
        install_data('80-container-host0.network',
                     '80-container-ve.network',
                     '80-container-vz.network',
                     install_dir : networkdir)
        meson.add_install_script('sh', '-c',
                                 mkdir_p.format(join_paths(sysconfdir, 'systemd/network')))
 endif
 install_data('99-default.link',
             install_dir : networkdir)
--- a/po/LINGUAS
+++ b/po/LINGUAS
@ -17,6 +17,7 @@ ko
 pl
 pt_BR
 ru
 sk
 sr
 sv
 tr
--- a/po/cs.po
+++ b/po/cs.po
@ -1,15 +1,15 @@
 # Czech translation for systemd.
-# Copyright (C) 2016 systemd's author and translators.
+# Copyright (C) 2016-2017 systemd's author and translators.
 # This file is distributed under the same license as the systemd package.
-# Daniel Maixner <xskipy@gmail.com>, 2016
+# Daniel Maixner <xskipy@gmail.com>, 2016.
-# Daniel Rusek <mail@asciiwolf.com>, 2016
+# Daniel Rusek <mail@asciiwolf.com>, 2016, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: systemd master\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: https://github.com/systemd/systemd/issues\n"
 "POT-Creation-Date: 2016-04-23 14:24+0200\n"
-"PO-Revision-Date: 2017-02-07 18:38+0100\n"
+"PO-Revision-Date: 2017-04-20 23:00+0200\n"
 "Last-Translator: Daniel Rusek <mail@asciiwolf.com>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
@ -26,36 +26,35 @@ msgstr "Odeslat heslo zpět do systému"
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:2
 msgid "Authentication is required to send the entered passphrase back to the system."
-msgstr "Autentizace je vyžadována pro odeslání zadaného hesla do systému."
+msgstr "Pro odeslání zadaného hesla do systému je vyžadováno ověření."
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:3
 msgid "Manage system services or other units"
-msgstr "Správa systémových služeb nebo dalších jednotek"
+msgstr "Spravovat systémové služby nebo další jednotky"
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:4
 msgid "Authentication is required to manage system services or other units."
-msgstr ""
+msgstr "Pro správu systémových služeb nebo dalších jednotek je vyžadováno ověření."
 "Autentizace je vyžadována pro správu systémových služeb nebo dalších jednotek."
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:5
 msgid "Manage system service or unit files"
-msgstr "Správa systémové služby nebo souborů jednotky"
+msgstr "Spravovat systémové služby nebo soubory jednotek"
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:6
 msgid "Authentication is required to manage system service or unit files."
-msgstr "Autentizace je vyžadována pro správu systémové služby nebo souborů jednotky."
+msgstr "Pro správu systémových služeb nebo souborů jednotek je vyžadováno ověření."
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:7
 msgid "Set or unset system and service manager environment variables"
-msgstr "Nastavení nebo rušení proměnných správce systému a služeb"
+msgstr "Nastavit nebo rušit proměnné správce systému a služeb"
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:8
 msgid ""
 "Authentication is required to set or unset system and service manager environment "
 "variables."
 msgstr ""
-"Autentizace je vyžadována pro nastavení nebo rušení proměnných správce systému a "
+"Pro nastavení nebo rušení proměnných správce systému a služeb je vyžadováno "
-"služeb."
+"ověření."
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:9
 msgid "Reload the systemd state"
@ -63,53 +62,51 @@ msgstr "Znovu načíst stav systemd"
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:10
 msgid "Authentication is required to reload the systemd state."
-msgstr "Autentizace je vyžadována pro znovu načtení stavu systemd."
+msgstr "Pro znovu načtení stavu systemd je vyžadováno ověření."
 #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1
 msgid "Set host name"
-msgstr "Nastavení názvu stroje"
+msgstr "Nastavit název stroje"
 #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2
 msgid "Authentication is required to set the local host name."
-msgstr "Autentizace je vyžadována pro nastavení lokálního názvu stroje."
+msgstr "Pro nastavení lokálního názvu stroje je vyžadováno ověření."
 #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3
 msgid "Set static host name"
-msgstr "Nastavení statického názvu stoje"
+msgstr "Nastavit statický název stoje"
 #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4
 msgid ""
 "Authentication is required to set the statically configured local host name, as "
 "well as the pretty host name."
 msgstr ""
-"Autentizace je vyžadována pro nastavení staticky konfigurovaného názvu lokálního "
+"Pro nastavení staticky konfigurovaného názvu lokálního stroje, stejně tak pro "
-"stroje, stejně tak pro změnu uživatelsky přívětivého jména."
+"změnu uživatelsky přívětivého jména je vyžadováno ověření."
 #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:5
 msgid "Set machine information"
-msgstr "Nastavení informací o stroji"
+msgstr "Nastavit informace o stroji"
 #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:6
 msgid "Authentication is required to set local machine information."
-msgstr "Autentizace je vyžadována pro nastavení informací o stroji."
+msgstr "Pro nastavení informací o stroji je vyžadováno ověření."
 #: ../src/import/org.freedesktop.import1.policy.in.h:1
 msgid "Import a VM or container image"
-msgstr "Import obrazu virtuální stroje nebo kontejneru"
+msgstr "Importovat obraz virtuální stroje nebo kontejneru"
 #: ../src/import/org.freedesktop.import1.policy.in.h:2
 msgid "Authentication is required to import a VM or container image"
-msgstr ""
+msgstr "Pro import obrazu virtuálního stroje nebo kontejneru je vyžadováno ověření"
 "Autentizace je vyžadována pro import obrazu virtuálního stroje nebo kontejneru"
 #: ../src/import/org.freedesktop.import1.policy.in.h:3
 msgid "Export a VM or container image"
-msgstr "Export obrazu virtuálního stroje nebo kontejneru"
+msgstr "Exportovat obraz virtuálního stroje nebo kontejneru"
 #: ../src/import/org.freedesktop.import1.policy.in.h:4
 msgid "Authentication is required to export a VM or container image"
-msgstr ""
+msgstr "Pro export obrazu virtuálního stroje nebo kontejneru je vyžadováno ověření"
 "Autentizace je vyžadována pro export obrazu virtuálního stroje nebo kontejneru"
 #: ../src/import/org.freedesktop.import1.policy.in.h:5
 msgid "Download a VM or container image"
@ -117,24 +114,23 @@ msgstr "Stáhnout obraz virtuálního stroje nebo kontejneru"
 #: ../src/import/org.freedesktop.import1.policy.in.h:6
 msgid "Authentication is required to download a VM or container image"
-msgstr ""
+msgstr "Pro stažení obrazu virtuálního stroje nebo kontejneru je vyžadováno ověření"
 "Autentizace je vyžadována pro stažení obrazu virtuálního stroje nebo kontejneru"
 #: ../src/locale/org.freedesktop.locale1.policy.in.h:1
 msgid "Set system locale"
-msgstr "Nastavení lokalizace systému"
+msgstr "Nastavit lokalizaci systému"
 #: ../src/locale/org.freedesktop.locale1.policy.in.h:2
 msgid "Authentication is required to set the system locale."
-msgstr "Autentizace je vyžadována pro nastavení lokalizace systému."
+msgstr "Pro nastavení lokalizace systému je vyžadováno ověření."
 #: ../src/locale/org.freedesktop.locale1.policy.in.h:3
 msgid "Set system keyboard settings"
-msgstr "Nastavení systémové konfigurace klávesnice"
+msgstr "Nastavit systémovou konfiguraci klávesnice"
 #: ../src/locale/org.freedesktop.locale1.policy.in.h:4
 msgid "Authentication is required to set the system keyboard settings."
-msgstr "Autentizace je vyžadována pro nastavení systémové konfigurace klávesnice."
+msgstr "Pro nastavení systémové konfigurace klávesnice je vyžadováno ověření."
 #: ../src/login/org.freedesktop.login1.policy.in.h:1
 msgid "Allow applications to inhibit system shutdown"
@ -142,7 +138,7 @@ msgstr "Povolit aplikacím zakázat vypnutí systému"
 #: ../src/login/org.freedesktop.login1.policy.in.h:2
 msgid "Authentication is required for an application to inhibit system shutdown."
-msgstr "Autentizace je vyžadována pro povolení aplikacím zakázat vypnutí systému."
+msgstr "Pro povolení aplikacím zakázat vypnutí systému je vyžadováno ověření."
 #: ../src/login/org.freedesktop.login1.policy.in.h:3
 msgid "Allow applications to delay system shutdown"
@ -150,7 +146,7 @@ msgstr "Povolit aplikacím odložit vypnutí systému"
 #: ../src/login/org.freedesktop.login1.policy.in.h:4
 msgid "Authentication is required for an application to delay system shutdown."
-msgstr "Autentizace je vyžadována pro povolení aplikacím odložit vypnutí systému."
+msgstr "Pro povolení aplikacím odložit vypnutí systému je vyžadováno ověření."
 #: ../src/login/org.freedesktop.login1.policy.in.h:5
 msgid "Allow applications to inhibit system sleep"
@ -158,7 +154,7 @@ msgstr "Povolit aplikacím zakázat uspání systému"
 #: ../src/login/org.freedesktop.login1.policy.in.h:6
 msgid "Authentication is required for an application to inhibit system sleep."
-msgstr "Autentizace je vyžadována pro povolení aplikacím zakázat uspání systému."
+msgstr "Pro povolení aplikacím zakázat uspání systému je vyžadováno ověření."
 #: ../src/login/org.freedesktop.login1.policy.in.h:7
 msgid "Allow applications to delay system sleep"
@ -166,7 +162,7 @@ msgstr "Povolit aplikacím odložit uspání systému"
 #: ../src/login/org.freedesktop.login1.policy.in.h:8
 msgid "Authentication is required for an application to delay system sleep."
-msgstr "Autentizace je vyžadována pro povolení aplikacím odložit uspání systému."
+msgstr "Pro povolení aplikacím odložit uspání systému je vyžadováno ověření."
 #: ../src/login/org.freedesktop.login1.policy.in.h:9
 msgid "Allow applications to inhibit automatic system suspend"
@ -176,8 +172,7 @@ msgstr "Povolit aplikacím zakázat automatické vypnutí systému"
 msgid ""
 "Authentication is required for an application to inhibit automatic system suspend."
 msgstr ""
-"Autentizace je vyžadována pro povolení aplikacím zakázat automatické vypnutí "
+"Pro povolení aplikacím zakázat automatické vypnutí systému je vyžadováno ověření."
 "systému."
 #: ../src/login/org.freedesktop.login1.policy.in.h:11
 msgid "Allow applications to inhibit system handling of the power key"
@ -188,8 +183,8 @@ msgid ""
 "Authentication is required for an application to inhibit system handling of the "
 "power key."
 msgstr ""
-"Autentizace je vyžadována pro povolení aplikacím zakázat chovaní systému na "
+"Pro povolení aplikacím zakázat chovaní systému na stisknutí vypínacího tlačítka je "
-"stisknutí vypínacího tlačítka."
+"vyžadováno ověření."
 #: ../src/login/org.freedesktop.login1.policy.in.h:13
 msgid "Allow applications to inhibit system handling of the suspend key"
@ -200,8 +195,8 @@ msgid ""
 "Authentication is required for an application to inhibit system handling of the "
 "suspend key."
 msgstr ""
-"Autentizace je vyžadována pro povolení aplikacím zakázat chovaní systému na "
+"Pro povolení aplikacím zakázat chovaní systému na stisknutí uspávacího tlačítka je "
-"stisknutí uspávacího tlačítka."
+"vyžadováno ověření."
 #: ../src/login/org.freedesktop.login1.policy.in.h:15
 msgid "Allow applications to inhibit system handling of the hibernate key"
@ -212,8 +207,8 @@ msgid ""
 "Authentication is required for an application to inhibit system handling of the "
 "hibernate key."
 msgstr ""
-"Autentizace je vyžadována pro povolení aplikacím zakázat chovaní systému na "
+"Pro povolení aplikacím zakázat chovaní systému na stisknutí tlačítka hibernace je "
-"stisknutí tlačítka hibernace."
+"vyžadováno ověření."
 #: ../src/login/org.freedesktop.login1.policy.in.h:17
 msgid "Allow applications to inhibit system handling of the lid switch"
@ -224,8 +219,8 @@ msgid ""
 "Authentication is required for an application to inhibit system handling of the "
 "lid switch."
 msgstr ""
-"Autentizace je vyžadována pro povolení aplikacím zakázat chovaní systému na "
+"Pro povolení aplikacím zakázat chovaní systému na zavření víka je vyžadováno "
-"zavření víka."
+"ověření."
 #: ../src/login/org.freedesktop.login1.policy.in.h:19
 msgid "Allow non-logged-in user to run programs"
@ -234,7 +229,7 @@ msgstr "Povolit nepřihlášenému uživateli spouštět programy"
 #: ../src/login/org.freedesktop.login1.policy.in.h:20
 msgid "Explicit request is required to run programs as a non-logged-in user."
 msgstr ""
-"Speciální požadavek je třeba ke spuštění programů jako nepřihlášený uživatel."
+"Ke spuštění programů jako nepřihlášený uživatel je třeba speciální požadavek."
 #: ../src/login/org.freedesktop.login1.policy.in.h:21
 msgid "Allow non-logged-in users to run programs"
@ -242,33 +237,33 @@ msgstr "Povolit nepřihlášeným uživatelům spouštět programy"
 #: ../src/login/org.freedesktop.login1.policy.in.h:22
 msgid "Authentication is required to run programs as a non-logged-in user."
-msgstr "Autentizace je vyžadována ke spuštění programů jako nepřihlášený uživatel."
+msgstr "Ke spuštění programů jako nepřihlášený uživatel je vyžadováno ověření."
 #: ../src/login/org.freedesktop.login1.policy.in.h:23
 msgid "Allow attaching devices to seats"
-msgstr "Povolit připojování zařízení ke stanovišti"
+msgstr "Povolit připojování zařízení ke stanovištím"
 #: ../src/login/org.freedesktop.login1.policy.in.h:24
 msgid "Authentication is required for attaching a device to a seat."
-msgstr "Autentizace je vyžadována pro připojování zařízení ke stanovišti."
+msgstr "Pro připojování zařízení ke stanovišti je vyžadováno ověření."
 #: ../src/login/org.freedesktop.login1.policy.in.h:25
 msgid "Flush device to seat attachments"
-msgstr "Odstranění přiřazení zařízení ke stanovištím"
+msgstr "Odstranit přiřazení zařízení ke stanovištím"
 #: ../src/login/org.freedesktop.login1.policy.in.h:26
 msgid "Authentication is required for resetting how devices are attached to seats."
 msgstr ""
-"Autentizace je vyžadována pro reset způsobu jak jsou zařízení přiřazována ke "
+"Pro reset způsobu jak jsou zařízení přiřazována ke stanovištím je vyžadováno "
-"stanovištím."
+"ověření."
 #: ../src/login/org.freedesktop.login1.policy.in.h:27
 msgid "Power off the system"
-msgstr "Vypnutí systému"
+msgstr "Vypnout systém"
 #: ../src/login/org.freedesktop.login1.policy.in.h:28
 msgid "Authentication is required for powering off the system."
-msgstr "Autentizace je vyžadována pro vypnutí systému."
+msgstr "Pro vypnutí systému je vyžadováno ověření."
 #: ../src/login/org.freedesktop.login1.policy.in.h:29
 msgid "Power off the system while other users are logged in"
@ -279,8 +274,7 @@ msgid ""
 "Authentication is required for powering off the system while other users are "
 "logged in."
 msgstr ""
-"Autentizace je vyžadována pro vypnutí systému, když jsou přihlášeni další "
+"Pro vypnutí systému, když jsou přihlášeni další uživatelé je vyžadováno ověření."
 "uživatelé."
 #: ../src/login/org.freedesktop.login1.policy.in.h:31
 msgid "Power off the system while an application asked to inhibit it"
@ -291,8 +285,7 @@ msgid ""
 "Authentication is required for powering off the system while an application asked "
 "to inhibit it."
 msgstr ""
-"Autentizace je vyžadována pro vypnutí systému, když aplikace požádala o zákaz "
+"Pro vypnutí systému, když aplikace požádala o zákaz vypnutí je vyžadováno ověření."
 "vypnutí."
 #: ../src/login/org.freedesktop.login1.policy.in.h:33
 msgid "Reboot the system"
@ -300,7 +293,7 @@ msgstr "Restartovat systém"
 #: ../src/login/org.freedesktop.login1.policy.in.h:34
 msgid "Authentication is required for rebooting the system."
-msgstr "Autentizace je vyžadována pro restartovaní systému."
+msgstr "Pro restartování systému je vyžadováno ověření."
 #: ../src/login/org.freedesktop.login1.policy.in.h:35
 msgid "Reboot the system while other users are logged in"
@ -311,8 +304,8 @@ msgid ""
 "Authentication is required for rebooting the system while other users are logged "
 "in."
 msgstr ""
-"Autentizace je vyžadována pro restart systému, když jsou přihlášeni další "
+"Pro restartování systému, když jsou přihlášeni další uživatelé je vyžadováno "
-"uživatelé."
+"ověření."
 #: ../src/login/org.freedesktop.login1.policy.in.h:37
 msgid "Reboot the system while an application asked to inhibit it"
@ -323,16 +316,16 @@ msgid ""
 "Authentication is required for rebooting the system while an application asked to "
 "inhibit it."
 msgstr ""
-"Autentizace je vyžadována pro restart systému, když aplikace požádala o zákaz "
+"Pro restartování systému, když aplikace požádala o zákaz restartu je vyžadováno "
-"restartu."
+"ověření."
 #: ../src/login/org.freedesktop.login1.policy.in.h:39
 msgid "Suspend the system"
-msgstr "Uspání systému"
+msgstr "Uspat systém"
 #: ../src/login/org.freedesktop.login1.policy.in.h:40
 msgid "Authentication is required for suspending the system."
-msgstr "Autentizace je vyžadována pro uspání systému."
+msgstr "Pro uspání systému je vyžadováno ověření."
 #: ../src/login/org.freedesktop.login1.policy.in.h:41
 msgid "Suspend the system while other users are logged in"
@ -343,7 +336,7 @@ msgid ""
 "Authentication is required for suspending the system while other users are logged "
 "in."
 msgstr ""
-"Autentizace je vyžadována pro uspání systému, když jsou přihlášeni další uživatelé."
+"Pro uspání systému, když jsou přihlášeni další uživatelé je vyžadováno ověření."
 #: ../src/login/org.freedesktop.login1.policy.in.h:43
 msgid "Suspend the system while an application asked to inhibit it"
@ -354,16 +347,15 @@ msgid ""
 "Authentication is required for suspending the system while an application asked to "
 "inhibit it."
 msgstr ""
-"Autentizace je vyžadována pro uspání systému, když aplikace požádala o zákaz "
+"Pro uspání systému, když aplikace požádala o zákaz uspání je vyžadováno ověření."
 "uspání."
 #: ../src/login/org.freedesktop.login1.policy.in.h:45
 msgid "Hibernate the system"
-msgstr "Hibernace systému"
+msgstr "Hibernovat systém"
 #: ../src/login/org.freedesktop.login1.policy.in.h:46
 msgid "Authentication is required for hibernating the system."
-msgstr "Autentizace je vyžadována k hibernaci systému."
+msgstr "Pro hibernaci systému je vyžadováno ověření."
 #: ../src/login/org.freedesktop.login1.policy.in.h:47
 msgid "Hibernate the system while other users are logged in"
@ -374,37 +366,35 @@ msgid ""
 "Authentication is required for hibernating the system while other users are logged "
 "in."
 msgstr ""
-"Autentizace je vyžadována pro hibernaci systému, když jsou přihlášeni další "
+"Pro hibernaci systému, když jsou přihlášeni další uživatelé je vyžadováno ověření."
 "uživatelé."
 #: ../src/login/org.freedesktop.login1.policy.in.h:49
 msgid "Hibernate the system while an application asked to inhibit it"
-msgstr "Hibernace systému, i když aplikace požádala o zákaz hibernace"
+msgstr "Hibernovat systém, i když aplikace požádala o zákaz hibernace"
 #: ../src/login/org.freedesktop.login1.policy.in.h:50
 msgid ""
 "Authentication is required for hibernating the system while an application asked "
 "to inhibit it."
 msgstr ""
-"Autentizace je vyžadována pro hibernaci systému, když aplikace požádala o zákaz "
+"Pro hibernaci systému, když aplikace požádala o zákaz hibernace je vyžadováno "
-"hibernace."
+"ověření."
 #: ../src/login/org.freedesktop.login1.policy.in.h:51
 msgid "Manage active sessions, users and seats"
-msgstr "Správa aktivních sezení, uživatelů a stanovišť"
+msgstr "Spravovat aktivní sezení, uživatele a stanoviště"
 #: ../src/login/org.freedesktop.login1.policy.in.h:52
 msgid "Authentication is required for managing active sessions, users and seats."
-msgstr ""
+msgstr "Pro správu aktivních sezení, uživatelů a stanovišť je vyžadováno ověření."
 "Autentizace je vyžadována pro správu aktivních sezení, uživatelů a stanovišť."
 #: ../src/login/org.freedesktop.login1.policy.in.h:53
 msgid "Lock or unlock active sessions"
-msgstr "Zamčení nebo odemčení aktivních sezení"
+msgstr "Zamknout nebo odemknout aktivní sezení"
 #: ../src/login/org.freedesktop.login1.policy.in.h:54
 msgid "Authentication is required to lock or unlock active sessions."
-msgstr "Autentizace je vyžadována pro zamčení nebo odemčení aktivních sezení."
+msgstr "Pro zamčení nebo odemčení aktivních sezení je vyžadováno ověření."
 #: ../src/login/org.freedesktop.login1.policy.in.h:55
 msgid "Allow indication to the firmware to boot to setup interface"
@ -414,8 +404,7 @@ msgstr "Povolit indikaci firmwaru bootovat instalační prostředí"
 msgid ""
 "Authentication is required to indicate to the firmware to boot to setup interface."
 msgstr ""
-"Autentizace je vyžadována k povolení indikace firmwaru bootovat instalační "
+"K povolení indikace firmwaru bootovat instalační prostředí je vyžadováno ověření."
 "prostředí."
 #: ../src/login/org.freedesktop.login1.policy.in.h:57
 msgid "Set a wall message"
@ -423,7 +412,7 @@ msgstr "Nastavit zprávu všem uživatelům"
 #: ../src/login/org.freedesktop.login1.policy.in.h:58
 msgid "Authentication is required to set a wall message"
-msgstr "Autentizace je vyžadována k nastavení zprávy všem uživatelům"
+msgstr "K nastavení zprávy všem uživatelům je vyžadováno ověření"
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:1
 msgid "Log into a local container"
@ -431,7 +420,7 @@ msgstr "Přihlásit se do lokálního kontejneru"
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:2
 msgid "Authentication is required to log into a local container."
-msgstr "Autentizace je vyžadována pro přihlášení do lokálního kontejneru."
+msgstr "Pro přihlášení do lokálního kontejneru je vyžadováno ověření."
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:3
 msgid "Log into the local host"
@ -439,39 +428,39 @@ msgstr "Přihlásit se na lokální stroj"
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:4
 msgid "Authentication is required to log into the local host."
-msgstr "Autentizace je vyžadována pro přihlášení k lokálnímu stroji."
+msgstr "Pro přihlášení k lokálnímu stroji je vyžadováno ověření."
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:5
 msgid "Acquire a shell in a local container"
-msgstr "Získání shellu v lokálním kontejneru"
+msgstr "Získat shell v lokálním kontejneru"
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:6
 msgid "Authentication is required to acquire a shell in a local container."
-msgstr "Autentizace je vyžadována pro získání shellu v lokálním kontejneru."
+msgstr "Pro získání shellu v lokálním kontejneru je vyžadováno ověření."
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:7
 msgid "Acquire a shell on the local host"
-msgstr "Získání shellu na lokálním stroji"
+msgstr "Získat shell na lokálním stroji"
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:8
 msgid "Authentication is required to acquire a shell on the local host."
-msgstr "Autentizace je vyžadována pro získání shellu na lokálním stroji."
+msgstr "Pro získání shellu na lokálním stroji je vyžadováno ověření."
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:9
 msgid "Acquire a pseudo TTY in a local container"
-msgstr "Získání Pseudo TTY v lokálním kontejneru"
+msgstr "Získat pseudo TTY v lokálním kontejneru"
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:10
 msgid "Authentication is required to acquire a pseudo TTY in a local container."
-msgstr "Autentizace je vyžadována pro získání pseudo TTY v lokálním kontejneru."
+msgstr "Pro získání pseudo TTY v lokálním kontejneru je vyžadováno ověření."
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:11
 msgid "Acquire a pseudo TTY on the local host"
-msgstr "Získání pseudo TTY na lokálním stroji"
+msgstr "Získat pseudo TTY na lokálním stroji"
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:12
 msgid "Authentication is required to acquire a pseudo TTY on the local host."
-msgstr "Autentizace je vyžadována pro získání pseudo TTY na lokálním stroji."
+msgstr "Pro získání pseudo TTY na lokálním stroji je vyžadováno ověření."
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:13
 msgid "Manage local virtual machines and containers"
@ -479,8 +468,7 @@ msgstr "Spravovat lokální virtuální stroje a kontejnery"
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:14
 msgid "Authentication is required to manage local virtual machines and containers."
-msgstr ""
+msgstr "Pro správu lokálních virtuálních strojů a kontejnerů je vyžadováno ověření."
 "Autentizace je vyžadována pro správu lokálních virtuálních strojů a kontejnerů."
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:15
 msgid "Manage local virtual machine and container images"
@ -489,7 +477,8 @@ msgstr "Spravovat lokální obrazy virtuálních strojů a kontejnerů"
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:16
 msgid ""
 "Authentication is required to manage local virtual machine and container images."
-msgstr "Autentizace je vyžadována ke správě obrazů virtuálních strojů a kontejnerů."
+msgstr ""
 "Pro správu obrazů lokálních virtuálních strojů a kontejnerů je vyžadováno ověření."
 #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:1
 msgid "Set system time"
@ -497,7 +486,7 @@ msgstr "Nastavit systémový čas"
 #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:2
 msgid "Authentication is required to set the system time."
-msgstr "Autentizace je vyžadována pro nastavení systémového času."
+msgstr "Pro nastavení systémového času je vyžadováno ověření."
 #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:3
 msgid "Set system timezone"
@ -505,7 +494,7 @@ msgstr "Nastavit systémovou časovou zónu"
 #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:4
 msgid "Authentication is required to set the system timezone."
-msgstr "Autentizace je vyžadována pro nastavení systémové časové zóny."
+msgstr "Pro nastavení systémové časové zóny je vyžadováno ověření."
 #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:5
 msgid "Set RTC to local timezone or UTC"
@ -515,8 +504,8 @@ msgstr "Nastavit RTC na lokální časovou zónu nebo UTC"
 msgid ""
 "Authentication is required to control whether the RTC stores the local or UTC time."
 msgstr ""
-"Autentizace je vyžadována pro kontrolu jestli RTC ukládá lokální časovou zónu nebo "
+"Pro kontrolu jestli RTC ukládá lokální časovou zónu nebo UTC čas je vyžadováno "
-"UTC čas."
+"ověření."
 #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:7
 msgid "Turn network time synchronization on or off"
@ -526,32 +515,32 @@ msgstr "Zapnout nebo vypnout synchronizaci s časem ze sítě"
 msgid ""
 "Authentication is required to control whether network time synchronization shall "
 "be enabled."
-msgstr "Autentizace je vyžadována pro kontrolu synchronizace času ze sítě."
+msgstr "Pro kontrolu synchronizace času ze sítě je vyžadováno ověření."
 #: ../src/core/dbus-unit.c:459
 msgid "Authentication is required to start '$(unit)'."
-msgstr "Autentizace je vyžadována pro spuštění „$(unit)”."
+msgstr "Pro spuštění „$(unit)” je vyžadováno ověření."
 #: ../src/core/dbus-unit.c:460
 msgid "Authentication is required to stop '$(unit)'."
-msgstr "Autentizace je vyžadována pro vypnutí „$(unit)”."
+msgstr "Pro vypnutí „$(unit)” je vyžadováno ověření."
 #: ../src/core/dbus-unit.c:461
 msgid "Authentication is required to reload '$(unit)'."
-msgstr "Autentizace je vyžadována pro znovu načtení „$(unit)”."
+msgstr "Pro znovu načtení „$(unit)” je vyžadováno ověření."
 #: ../src/core/dbus-unit.c:462 ../src/core/dbus-unit.c:463
 msgid "Authentication is required to restart '$(unit)'."
-msgstr "Autentizace je vyžadována pro restart „$(unit)”."
+msgstr "Pro restart „$(unit)” je vyžadováno ověření."
 #: ../src/core/dbus-unit.c:570
 msgid "Authentication is required to kill '$(unit)'."
-msgstr "Autentizace je vyžadována pro ukončení „$(unit)”."
+msgstr "Pro ukončení „$(unit)” je vyžadováno ověření."
 #: ../src/core/dbus-unit.c:601
 msgid "Authentication is required to reset the \"failed\" state of '$(unit)'."
-msgstr "Autentizace je vyžadována pro resetování chybného stavu „$(unit)”."
+msgstr "Pro resetování chybného stavu „$(unit)” je vyžadováno ověření."
 #: ../src/core/dbus-unit.c:634
 msgid "Authentication is required to set properties on '$(unit)'."
-msgstr "Autentizace je vyžadována pro nastavení vlastností na „$(unit)”."
+msgstr "Pro nastavení vlastností na „$(unit)” je vyžadováno ověření."
--- a/po/meson.build
+++ b/po/meson.build
@ -0,0 +1,12 @@
 i18n = import('i18n')
 i18n.gettext(meson.project_name())
 #####################################################################
 intltool_merge = find_program('intltool-merge')
 po_dir = meson.current_source_dir()
 intltool_cache = join_paths(meson.current_build_dir(), 'intltool-merge-cache')
 intltool_command = [intltool_merge, '-x', '-u',
                    '-c', intltool_cache,
                    po_dir, '@INPUT@', '@OUTPUT@']
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@ -1,23 +1,22 @@
 # Brazilian Portuguese translation for systemd.
-# Copyright (C) 2015 systemd's COPYRIGHT HOLDER
+# Copyright (C) 2017 systemd's COPYRIGHT HOLDER
 # This file is distributed under the same license as the systemd package.
 # Rafael Ferreira <rafael.f.f1@gmail.com>, 2014.
 # Enrico Nicoletto <liverig@gmail.com>, 2014.
-#
+# Rafael Fontenelle <rafaelff@gnome.org>, 2015, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: systemd master\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: https://github.com/systemd/systemd/issues\n"
-"POT-Creation-Date: 2015-11-22 16:37+0100\n"
+"POT-Creation-Date: 2016-11-17 03:29+0000\n"
-"PO-Revision-Date: 2015-01-10 12:23-0300\n"
+"PO-Revision-Date: 2017-04-03 14:25-0200\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
+"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.7.1\n"
+"X-Generator: Virtaal 1.0.0-beta1\n"
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:1
 msgid "Send passphrase back to system"
@ -31,15 +30,14 @@ msgstr ""
 "sistema."
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:3
 #, fuzzy
 msgid "Manage system services or other units"
-msgstr "Gerenciar unidades e serviços do sistema"
+msgstr "Gerenciar serviços do sistema e outras unidades"
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:4
 #, fuzzy
 msgid "Authentication is required to manage system services or other units."
 msgstr ""
-"É necessária autenticação para gerenciar unidades e serviços do sistema."
+"É necessária autenticação para gerenciar serviços do sistema ou outras "
 "unidades."
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:5
 msgid "Manage system service or unit files"
@ -52,18 +50,18 @@ msgstr ""
 "sistema."
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:7
 #, fuzzy
 msgid "Set or unset system and service manager environment variables"
-msgstr "Acesso privilegiado ao gerenciador de serviço e de sistema"
+msgstr ""
 "Definir ou retirar definição de variáveis de ambiente de gerenciador de "
 "serviço e sistema"
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:8
 #, fuzzy
 msgid ""
 "Authentication is required to set or unset system and service manager "
 "environment variables."
 msgstr ""
-"É necessária autenticação para gerenciar arquivos \"unit\" e \"service\" do "
+"É necessária autenticação para definir ou retirar definição de variáveis de "
-"sistema."
+"ambiente de gerenciador de serviço e sistema."
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:9
 msgid "Reload the systemd state"
@ -103,30 +101,27 @@ msgstr "É necessária autenticação para definir informações de máquina loc
 #: ../src/import/org.freedesktop.import1.policy.in.h:1
 msgid "Import a VM or container image"
-msgstr ""
+msgstr "Importar uma VM ou imagem contêiner"
 #: ../src/import/org.freedesktop.import1.policy.in.h:2
 #, fuzzy
 msgid "Authentication is required to import a VM or container image"
-msgstr "É necessária autenticação para se conectar a um contêiner local."
+msgstr "É necessária autenticação para importar uma VM ou imagem contêiner"
 #: ../src/import/org.freedesktop.import1.policy.in.h:3
 msgid "Export a VM or container image"
-msgstr ""
+msgstr "Exportar uma VM ou imagem contêiner"
 #: ../src/import/org.freedesktop.import1.policy.in.h:4
 #, fuzzy
 msgid "Authentication is required to export a VM or container image"
-msgstr "É necessária autenticação para se conectar a um contêiner local."
+msgstr "É necessária autenticação para exportar uma VM ou imagem contêiner"
 #: ../src/import/org.freedesktop.import1.policy.in.h:5
 msgid "Download a VM or container image"
-msgstr ""
+msgstr "Baixar uma VM ou imagem contêiner"
 #: ../src/import/org.freedesktop.import1.policy.in.h:6
 #, fuzzy
 msgid "Authentication is required to download a VM or container image"
-msgstr "É necessária autenticação para se conectar a um contêiner local."
+msgstr "É necessária autenticação para baixar uma VM ou imagem contêiner"
 #: ../src/locale/org.freedesktop.locale1.policy.in.h:1
 msgid "Set system locale"
@ -254,48 +249,61 @@ msgstr ""
 "sistema sobre o interruptor da tela."
 #: ../src/login/org.freedesktop.login1.policy.in.h:19
 #| msgid "Allow non-logged-in users to run programs"
 msgid "Allow non-logged-in user to run programs"
 msgstr ""
 "Permitir que programas sejam executados por usuário que não possui sessão"
 #: ../src/login/org.freedesktop.login1.policy.in.h:20
 #| msgid "Authentication is required to run programs as a non-logged-in user."
 msgid "Explicit request is required to run programs as a non-logged-in user."
 msgstr ""
 "É necessária requisição explícita para executar programas como usuário sem "
 "sessão aberta."
 #: ../src/login/org.freedesktop.login1.policy.in.h:21
 msgid "Allow non-logged-in users to run programs"
 msgstr ""
 "Permitir que programas sejam executados por usuários que não possuem sessão"
-#: ../src/login/org.freedesktop.login1.policy.in.h:20
+#: ../src/login/org.freedesktop.login1.policy.in.h:22
 msgid "Authentication is required to run programs as a non-logged-in user."
 msgstr ""
 "É necessária autenticação para executar programas como usuário sem sessão "
 "aberta."
-#: ../src/login/org.freedesktop.login1.policy.in.h:21
+#: ../src/login/org.freedesktop.login1.policy.in.h:23
 msgid "Allow attaching devices to seats"
 msgstr "Permitir conectar dispositivos em estações"
-#: ../src/login/org.freedesktop.login1.policy.in.h:22
+#: ../src/login/org.freedesktop.login1.policy.in.h:24
 msgid "Authentication is required for attaching a device to a seat."
 msgstr "É necessária autenticação para conectar um dispositivo em uma estação."
-#: ../src/login/org.freedesktop.login1.policy.in.h:23
+#: ../src/login/org.freedesktop.login1.policy.in.h:25
 msgid "Flush device to seat attachments"
 msgstr "Liberar dispositivo para conexões da estação"
-#: ../src/login/org.freedesktop.login1.policy.in.h:24
+#: ../src/login/org.freedesktop.login1.policy.in.h:26
 msgid ""
 "Authentication is required for resetting how devices are attached to seats."
 msgstr ""
 "É necessária autenticação para redefinir a quantidade de dispositivos "
 "conectados na estação."
-#: ../src/login/org.freedesktop.login1.policy.in.h:25
+#: ../src/login/org.freedesktop.login1.policy.in.h:27
 msgid "Power off the system"
 msgstr "Desligar o sistema"
-#: ../src/login/org.freedesktop.login1.policy.in.h:26
+#: ../src/login/org.freedesktop.login1.policy.in.h:28
 msgid "Authentication is required for powering off the system."
 msgstr "É necessária autenticação para desligar o sistema."
-#: ../src/login/org.freedesktop.login1.policy.in.h:27
+#: ../src/login/org.freedesktop.login1.policy.in.h:29
 msgid "Power off the system while other users are logged in"
 msgstr "Desligar o sistema enquanto outros usuários estão conectados"
-#: ../src/login/org.freedesktop.login1.policy.in.h:28
+#: ../src/login/org.freedesktop.login1.policy.in.h:30
 msgid ""
 "Authentication is required for powering off the system while other users are "
 "logged in."
@ -303,11 +311,11 @@ msgstr ""
 "É necessária autenticação para desligar o sistema enquanto outros usuários "
 "estão conectados."
-#: ../src/login/org.freedesktop.login1.policy.in.h:29
+#: ../src/login/org.freedesktop.login1.policy.in.h:31
 msgid "Power off the system while an application asked to inhibit it"
 msgstr "Desligar o sistema enquanto um aplicativo solicitou inibição"
-#: ../src/login/org.freedesktop.login1.policy.in.h:30
+#: ../src/login/org.freedesktop.login1.policy.in.h:32
 msgid ""
 "Authentication is required for powering off the system while an application "
 "asked to inhibit it."
@ -315,19 +323,19 @@ msgstr ""
 "É necessária autenticação para desligar o sistema enquanto um aplicativo "
 "solicitou inibição."
-#: ../src/login/org.freedesktop.login1.policy.in.h:31
+#: ../src/login/org.freedesktop.login1.policy.in.h:33
 msgid "Reboot the system"
 msgstr "Reiniciar o sistema"
-#: ../src/login/org.freedesktop.login1.policy.in.h:32
+#: ../src/login/org.freedesktop.login1.policy.in.h:34
 msgid "Authentication is required for rebooting the system."
 msgstr "É necessária autenticação para reiniciar o sistema."
-#: ../src/login/org.freedesktop.login1.policy.in.h:33
+#: ../src/login/org.freedesktop.login1.policy.in.h:35
 msgid "Reboot the system while other users are logged in"
 msgstr "Reiniciar o sistema enquanto outros usuários estiverem conectados"
-#: ../src/login/org.freedesktop.login1.policy.in.h:34
+#: ../src/login/org.freedesktop.login1.policy.in.h:36
 msgid ""
 "Authentication is required for rebooting the system while other users are "
 "logged in."
@ -335,11 +343,11 @@ msgstr ""
 "É necessária autenticação para reiniciar o sistema enquanto outros usuários "
 "estiverem conectados."
-#: ../src/login/org.freedesktop.login1.policy.in.h:35
+#: ../src/login/org.freedesktop.login1.policy.in.h:37
 msgid "Reboot the system while an application asked to inhibit it"
 msgstr "Reiniciar o sistema enquanto um aplicativo solicitou inibição"
-#: ../src/login/org.freedesktop.login1.policy.in.h:36
+#: ../src/login/org.freedesktop.login1.policy.in.h:38
 msgid ""
 "Authentication is required for rebooting the system while an application "
 "asked to inhibit it."
@ -347,19 +355,19 @@ msgstr ""
 "É necessária autenticação para reiniciar o sistema enquanto um aplicativo "
 "solicitou inibição."
-#: ../src/login/org.freedesktop.login1.policy.in.h:37
+#: ../src/login/org.freedesktop.login1.policy.in.h:39
 msgid "Suspend the system"
 msgstr "Suspender o sistema"
-#: ../src/login/org.freedesktop.login1.policy.in.h:38
+#: ../src/login/org.freedesktop.login1.policy.in.h:40
 msgid "Authentication is required for suspending the system."
 msgstr "É necessária autenticação para suspender o sistema."
-#: ../src/login/org.freedesktop.login1.policy.in.h:39
+#: ../src/login/org.freedesktop.login1.policy.in.h:41
 msgid "Suspend the system while other users are logged in"
 msgstr "Suspender o sistema enquanto outros usuários estiverem conectados"
-#: ../src/login/org.freedesktop.login1.policy.in.h:40
+#: ../src/login/org.freedesktop.login1.policy.in.h:42
 msgid ""
 "Authentication is required for suspending the system while other users are "
 "logged in."
@ -367,11 +375,11 @@ msgstr ""
 "É necessária autenticação para suspender o sistema enquanto outros usuários "
 "estiverem conectados."
-#: ../src/login/org.freedesktop.login1.policy.in.h:41
+#: ../src/login/org.freedesktop.login1.policy.in.h:43
 msgid "Suspend the system while an application asked to inhibit it"
 msgstr "Suspender o sistema enquanto um aplicativo solicitou inibição"
-#: ../src/login/org.freedesktop.login1.policy.in.h:42
+#: ../src/login/org.freedesktop.login1.policy.in.h:44
 msgid ""
 "Authentication is required for suspending the system while an application "
 "asked to inhibit it."
@ -379,19 +387,19 @@ msgstr ""
 "É necessária autenticação para suspender o sistema enquanto um aplicativo "
 "solicitou inibição."
-#: ../src/login/org.freedesktop.login1.policy.in.h:43
+#: ../src/login/org.freedesktop.login1.policy.in.h:45
 msgid "Hibernate the system"
 msgstr "Hibernar o sistema"
-#: ../src/login/org.freedesktop.login1.policy.in.h:44
+#: ../src/login/org.freedesktop.login1.policy.in.h:46
 msgid "Authentication is required for hibernating the system."
 msgstr "É necessária autenticação para hibernar o sistema."
-#: ../src/login/org.freedesktop.login1.policy.in.h:45
+#: ../src/login/org.freedesktop.login1.policy.in.h:47
 msgid "Hibernate the system while other users are logged in"
 msgstr "Hibernar o sistema enquanto outros usuários estiverem conectados"
-#: ../src/login/org.freedesktop.login1.policy.in.h:46
+#: ../src/login/org.freedesktop.login1.policy.in.h:48
 msgid ""
 "Authentication is required for hibernating the system while other users are "
 "logged in."
@ -399,11 +407,11 @@ msgstr ""
 "É necessária autenticação para hibernar o sistema enquanto outros usuários "
 "estiverem conectados."
-#: ../src/login/org.freedesktop.login1.policy.in.h:47
+#: ../src/login/org.freedesktop.login1.policy.in.h:49
 msgid "Hibernate the system while an application asked to inhibit it"
 msgstr "Hibernar o sistema enquanto um aplicativo solicitou inibição"
-#: ../src/login/org.freedesktop.login1.policy.in.h:48
+#: ../src/login/org.freedesktop.login1.policy.in.h:50
 msgid ""
 "Authentication is required for hibernating the system while an application "
 "asked to inhibit it."
@ -411,123 +419,121 @@ msgstr ""
 "É necessária autenticação para hibernar o sistema enquanto um aplicativo "
 "solicitou inibição."
 #: ../src/login/org.freedesktop.login1.policy.in.h:49
 msgid "Manage active sessions, users and seats"
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:50
 #, fuzzy
 msgid ""
 "Authentication is required for managing active sessions, users and seats."
 msgstr "É necessária autenticação para conectar um dispositivo em uma estação."
 #: ../src/login/org.freedesktop.login1.policy.in.h:51
-msgid "Lock or unlock active sessions"
+msgid "Manage active sessions, users and seats"
-msgstr ""
+msgstr "Gerenciar estações, usuários e sessões ativas"
 #: ../src/login/org.freedesktop.login1.policy.in.h:52
-#, fuzzy
+msgid ""
-msgid "Authentication is required to lock or unlock active sessions."
+"Authentication is required for managing active sessions, users and seats."
-msgstr "É necessária autenticação para se conectar a um contêiner local."
+msgstr ""
 "É necessária autenticação para gerenciar estações, usuários e sessões ativas."
 #: ../src/login/org.freedesktop.login1.policy.in.h:53
-msgid "Allow indication to the firmware to boot to setup interface"
+msgid "Lock or unlock active sessions"
-msgstr ""
+msgstr "Travar ou destravar sessões ativas"
 #: ../src/login/org.freedesktop.login1.policy.in.h:54
-#, fuzzy
+msgid "Authentication is required to lock or unlock active sessions."
 msgstr "É necessária autenticação para travar ou destravar sessões ativas."
 #: ../src/login/org.freedesktop.login1.policy.in.h:55
 msgid "Allow indication to the firmware to boot to setup interface"
 msgstr ""
 "Permitir indicação para o firmware inicializar para a interface de "
 "configuração"
 #: ../src/login/org.freedesktop.login1.policy.in.h:56
 msgid ""
 "Authentication is required to indicate to the firmware to boot to setup "
 "interface."
 msgstr "É necessária autenticação para definir nome de máquina local."
 #: ../src/login/org.freedesktop.login1.policy.in.h:55
 msgid "Set a wall message"
 msgstr ""
 "É necessária autenticação para indicar para o firmware inicializar para a "
 "interface de configuração."
-#: ../src/login/org.freedesktop.login1.policy.in.h:56
+#: ../src/login/org.freedesktop.login1.policy.in.h:57
-#, fuzzy
+msgid "Set a wall message"
 msgstr "Definir uma mensagem de parede"
 #: ../src/login/org.freedesktop.login1.policy.in.h:58
 msgid "Authentication is required to set a wall message"
-msgstr "É necessária autenticação para definir nome de máquina local."
+msgstr "É necessária autenticação para definir uma mensagem de parede"
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:1
 msgid "Log into a local container"
 msgstr "Conectar a um contêiner local"
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:2
 #, fuzzy
 msgid "Authentication is required to log into a local container."
 msgstr "É necessária autenticação para se conectar a um contêiner local."
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:3
 #, fuzzy
 msgid "Log into the local host"
-msgstr "Conectar a um contêiner local"
+msgstr "Conectar a uma máquina local"
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:4
 #, fuzzy
 msgid "Authentication is required to log into the local host."
-msgstr "É necessária autenticação para se conectar a um contêiner local."
+msgstr "É necessária autenticação para se conectar a uma máquina local."
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:5
 #, fuzzy
 msgid "Acquire a shell in a local container"
-msgstr "Conectar a um contêiner local"
+msgstr "Adquirir uma shell em um contêiner local"
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:6
 #, fuzzy
 msgid "Authentication is required to acquire a shell in a local container."
-msgstr "É necessária autenticação para se conectar a um contêiner local."
+msgstr ""
 "É necessária autenticação para adquirir uma shell em um contêiner local."
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:7
 msgid "Acquire a shell on the local host"
-msgstr ""
+msgstr "Adquirir uma shell na máquina local"
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:8
 #, fuzzy
 msgid "Authentication is required to acquire a shell on the local host."
-msgstr "É necessária autenticação para definir nome de máquina local."
+msgstr ""
 "É necessária autenticação para adquirir uma shell em uma máquina local."
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:9
 #, fuzzy
 msgid "Acquire a pseudo TTY in a local container"
-msgstr "Conectar a um contêiner local"
+msgstr "Adquirir um pseudo TTY em um contêiner local"
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:10
 #, fuzzy
 msgid ""
 "Authentication is required to acquire a pseudo TTY in a local container."
-msgstr "É necessária autenticação para se conectar a um contêiner local."
+msgstr ""
 "É necessária autenticação para adquirir um pseudo TTY em um contêiner local."
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:11
 msgid "Acquire a pseudo TTY on the local host"
-msgstr ""
+msgstr "Adquiri um pseudo TTY na máquina local"
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:12
 #, fuzzy
 msgid "Authentication is required to acquire a pseudo TTY on the local host."
-msgstr "É necessária autenticação para definir nome de máquina local."
+msgstr ""
 "É necessária autenticação para adquirir um pseudo TTY em um máquina local."
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:13
 msgid "Manage local virtual machines and containers"
-msgstr ""
+msgstr "Gerenciar máquinas virtuais locais e contêineres"
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:14
 #, fuzzy
 msgid ""
 "Authentication is required to manage local virtual machines and containers."
-msgstr "É necessária autenticação para definir informações de máquina local."
+msgstr ""
 "É necessária autenticação para gerenciar máquinas virtuais locais e "
 "contêineres."
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:15
 msgid "Manage local virtual machine and container images"
-msgstr ""
+msgstr "Gerenciar máquinas virtuais locais e imagens contêineres"
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:16
 #, fuzzy
 msgid ""
 "Authentication is required to manage local virtual machine and container "
 "images."
-msgstr "É necessária autenticação para definir informações de máquina local."
+msgstr ""
 "É necessária autenticação para gerenciar máquinas virtuais locais e imagens "
 "contêineres."
 #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:1
 msgid "Set system time"
@ -569,37 +575,31 @@ msgstr ""
 "É necessária autenticação para controlar se deve ser habilitada, ou não, a "
 "sincronização de horário através de rede."
-#: ../src/core/dbus-unit.c:428
+#: ../src/core/dbus-unit.c:457
 #, fuzzy
 msgid "Authentication is required to start '$(unit)'."
-msgstr "É necessária autenticação para definir o horário do sistema."
+msgstr "É necessária autenticação para iniciar '$(unit)'."
-#: ../src/core/dbus-unit.c:429
+#: ../src/core/dbus-unit.c:458
 #, fuzzy
 msgid "Authentication is required to stop '$(unit)'."
-msgstr "É necessária autenticação para definir o horário do sistema."
+msgstr "É necessária autenticação para parar '$(unit)'."
-#: ../src/core/dbus-unit.c:430
+#: ../src/core/dbus-unit.c:459
 #, fuzzy
 msgid "Authentication is required to reload '$(unit)'."
-msgstr "É necessária autenticação para recarregar o estado do sistema."
+msgstr "É necessária autenticação para recarregar '$(unit)'."
-#: ../src/core/dbus-unit.c:431 ../src/core/dbus-unit.c:432
+#: ../src/core/dbus-unit.c:460 ../src/core/dbus-unit.c:461
 #, fuzzy
 msgid "Authentication is required to restart '$(unit)'."
-msgstr "É necessária autenticação para definir o horário do sistema."
+msgstr "É necessária autenticação para reiniciar '$(unit)'."
-#: ../src/core/dbus-unit.c:535
+#: ../src/core/dbus-unit.c:568
 #, fuzzy
 msgid "Authentication is required to kill '$(unit)'."
-msgstr "É necessária autenticação para se conectar a um contêiner local."
+msgstr "É necessária autenticação para matar '$(unit)'."
-#: ../src/core/dbus-unit.c:565
+#: ../src/core/dbus-unit.c:599
 #, fuzzy
 msgid "Authentication is required to reset the \"failed\" state of '$(unit)'."
-msgstr "É necessária autenticação para definir nome de máquina local."
+msgstr ""
 "É necessária autenticação para reiniciar o estado \"failed\" de '$(unit)'."
-#: ../src/core/dbus-unit.c:597
+#: ../src/core/dbus-unit.c:632
 #, fuzzy
 msgid "Authentication is required to set properties on '$(unit)'."
-msgstr "É necessária autenticação para definir o horário do sistema."
+msgstr "É necessária autenticação para definir propriedades em '$(unit)'."
--- a/po/sk.po
+++ b/po/sk.po
@ -0,0 +1,556 @@
 # Slovak translation for systemd.
 # Copyright (C) 2017 systemd's COPYRIGHT HOLDER
 # This file is distributed under the same license as the systemd package.
 # Dušan Kazik <prescott66@gmail.com>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: systemd master\n"
 "Report-Msgid-Bugs-To: https://github.com/systemd/systemd/issues\n"
 "POT-Creation-Date: 2017-06-24 03:26+0000\n"
 "PO-Revision-Date: 2017-06-25 11:03+0200\n"
 "Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
 "X-Generator: Poedit 2.0.2\n"
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:1
 msgid "Send passphrase back to system"
 msgstr "Odoslanie hesla späť do systému"
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:2
 msgid ""
 "Authentication is required to send the entered passphrase back to the system."
 msgstr ""
 "Vyžaduje sa overenie totožnosti na odoslanie zadaného hesla späť do systému."
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:3
 msgid "Manage system services or other units"
 msgstr "Správa systémových služieb alebo iných jednotiek"
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:4
 msgid "Authentication is required to manage system services or other units."
 msgstr ""
 "Vyžaduje sa overenie totožnosti na správu systémových služieb alebo iných "
 "jednotiek."
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:5
 msgid "Manage system service or unit files"
 msgstr "Správa systémovej služby alebo súborov jednotky"
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:6
 msgid "Authentication is required to manage system service or unit files."
 msgstr ""
 "Vyžaduje sa overenie totožnosti na správu systémovej služby alebo súborov "
 "jednotky."
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:7
 msgid "Set or unset system and service manager environment variables"
 msgstr ""
 "Nastavenie alebo zrušenie nastavenia premenných prostredia systému a správcu "
 "služieb"
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:8
 msgid ""
 "Authentication is required to set or unset system and service manager "
 "environment variables."
 msgstr ""
 "Vyžaduje sa overenie totožnosti na nastavenie alebo zrušenie nastavenia "
 "premenných prostredia systému a správcu služieb."
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:9
 msgid "Reload the systemd state"
 msgstr "Znovu načítanie stavu systému systemd"
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:10
 msgid "Authentication is required to reload the systemd state."
 msgstr ""
 "Vyžaduje sa overenie totožnosti na znovu načítanie stavu systému systemd."
 #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1
 msgid "Set host name"
 msgstr "Nastavenie názvu hostiteľa"
 #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2
 msgid "Authentication is required to set the local host name."
 msgstr "Vyžaduje sa overenie totožnosti na nastavenie názvu hostiteľa."
 #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3
 msgid "Set static host name"
 msgstr "Nastavenie nemenného názvu hostiteľa"
 #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4
 msgid ""
 "Authentication is required to set the statically configured local host name, "
 "as well as the pretty host name."
 msgstr ""
 "Vyžaduje sa overenie totožnosti na nastavenie pevne určeného názvu miestneho "
 "hostiteľa, známeho ako zrozumiteľný názov hostiteľa."
 #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:5
 msgid "Set machine information"
 msgstr "Nastavenie informácií o počítači"
 #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:6
 msgid "Authentication is required to set local machine information."
 msgstr ""
 "Vyžaduje sa overenie totožnosti na nastavenie informácií o miestnom počítači."
 #: ../src/import/org.freedesktop.import1.policy.in.h:1
 msgid "Import a VM or container image"
 msgstr ""
 #: ../src/import/org.freedesktop.import1.policy.in.h:2
 msgid "Authentication is required to import a VM or container image"
 msgstr ""
 #: ../src/import/org.freedesktop.import1.policy.in.h:3
 msgid "Export a VM or container image"
 msgstr ""
 #: ../src/import/org.freedesktop.import1.policy.in.h:4
 msgid "Authentication is required to export a VM or container image"
 msgstr ""
 #: ../src/import/org.freedesktop.import1.policy.in.h:5
 msgid "Download a VM or container image"
 msgstr ""
 #: ../src/import/org.freedesktop.import1.policy.in.h:6
 msgid "Authentication is required to download a VM or container image"
 msgstr ""
 #: ../src/locale/org.freedesktop.locale1.policy.in.h:1
 msgid "Set system locale"
 msgstr "Nastavenie miestnych nastavení"
 #: ../src/locale/org.freedesktop.locale1.policy.in.h:2
 msgid "Authentication is required to set the system locale."
 msgstr "Vyžaduje sa overenie totožnosti na nastavenie miestnych nastavení."
 #: ../src/locale/org.freedesktop.locale1.policy.in.h:3
 msgid "Set system keyboard settings"
 msgstr "Nastavenie nastavení systémovej klávesnice"
 #: ../src/locale/org.freedesktop.locale1.policy.in.h:4
 msgid "Authentication is required to set the system keyboard settings."
 msgstr ""
 "Vyžaduje sa overenie totožnosti na nastavenie nastavení systémovej "
 "klávesnice."
 #: ../src/login/org.freedesktop.login1.policy.in.h:1
 msgid "Allow applications to inhibit system shutdown"
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:2
 msgid ""
 "Authentication is required for an application to inhibit system shutdown."
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:3
 msgid "Allow applications to delay system shutdown"
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:4
 msgid "Authentication is required for an application to delay system shutdown."
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:5
 msgid "Allow applications to inhibit system sleep"
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:6
 msgid "Authentication is required for an application to inhibit system sleep."
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:7
 msgid "Allow applications to delay system sleep"
 msgstr "Umožnenie aplikáciám odložiť spánok systému"
 #: ../src/login/org.freedesktop.login1.policy.in.h:8
 msgid "Authentication is required for an application to delay system sleep."
 msgstr ""
 "Vyžaduje sa overenie totožnosti na odloženie spánku systému aplikáciou."
 #: ../src/login/org.freedesktop.login1.policy.in.h:9
 msgid "Allow applications to inhibit automatic system suspend"
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:10
 msgid ""
 "Authentication is required for an application to inhibit automatic system "
 "suspend."
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:11
 msgid "Allow applications to inhibit system handling of the power key"
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:12
 msgid ""
 "Authentication is required for an application to inhibit system handling of "
 "the power key."
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:13
 msgid "Allow applications to inhibit system handling of the suspend key"
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:14
 msgid ""
 "Authentication is required for an application to inhibit system handling of "
 "the suspend key."
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:15
 msgid "Allow applications to inhibit system handling of the hibernate key"
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:16
 msgid ""
 "Authentication is required for an application to inhibit system handling of "
 "the hibernate key."
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:17
 msgid "Allow applications to inhibit system handling of the lid switch"
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:18
 msgid ""
 "Authentication is required for an application to inhibit system handling of "
 "the lid switch."
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:19
 msgid "Allow non-logged-in user to run programs"
 msgstr "Umožnenie neprihlásenému používateľovi spúšťanie programov"
 #: ../src/login/org.freedesktop.login1.policy.in.h:20
 msgid "Explicit request is required to run programs as a non-logged-in user."
 msgstr ""
 "Vyžaduje sa explicitná požiadavka na spúšťanie programov ako neprihlásený "
 "používateľ."
 #: ../src/login/org.freedesktop.login1.policy.in.h:21
 msgid "Allow non-logged-in users to run programs"
 msgstr "Umožnenie neprihláseným používateľom spúšťanie programov"
 #: ../src/login/org.freedesktop.login1.policy.in.h:22
 msgid "Authentication is required to run programs as a non-logged-in user."
 msgstr ""
 "Vyžaduje sa overenie totožnosti na spúšťanie programov ako neprihlásený "
 "používateľ."
 #: ../src/login/org.freedesktop.login1.policy.in.h:23
 msgid "Allow attaching devices to seats"
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:24
 msgid "Authentication is required for attaching a device to a seat."
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:25
 msgid "Flush device to seat attachments"
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:26
 msgid ""
 "Authentication is required for resetting how devices are attached to seats."
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:27
 msgid "Power off the system"
 msgstr "Vypnutie systému"
 #: ../src/login/org.freedesktop.login1.policy.in.h:28
 msgid "Authentication is required for powering off the system."
 msgstr "Vyžaduje sa overenie totožnosti na vypnutie systému."
 #: ../src/login/org.freedesktop.login1.policy.in.h:29
 msgid "Power off the system while other users are logged in"
 msgstr "Vypnutie systému, pokiaľ sú prihlásení iní používatelia"
 #: ../src/login/org.freedesktop.login1.policy.in.h:30
 msgid ""
 "Authentication is required for powering off the system while other users are "
 "logged in."
 msgstr ""
 "Vyžaduje sa overenie totožnosti na vypnutie systému, pokiaľ sú prihlásení "
 "iní používatelia."
 #: ../src/login/org.freedesktop.login1.policy.in.h:31
 msgid "Power off the system while an application asked to inhibit it"
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:32
 msgid ""
 "Authentication is required for powering off the system while an application "
 "asked to inhibit it."
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:33
 msgid "Reboot the system"
 msgstr "Reštart systému"
 #: ../src/login/org.freedesktop.login1.policy.in.h:34
 msgid "Authentication is required for rebooting the system."
 msgstr "Vyžaduje sa overenie totožnosti na reštartovanie systému."
 #: ../src/login/org.freedesktop.login1.policy.in.h:35
 msgid "Reboot the system while other users are logged in"
 msgstr "Reštart systému, pokiaľ sú prihlásení iní používatelia"
 #: ../src/login/org.freedesktop.login1.policy.in.h:36
 msgid ""
 "Authentication is required for rebooting the system while other users are "
 "logged in."
 msgstr ""
 "Vyžaduje sa overenie totožnosti na reštartovanie systému, pokiaľ sú "
 "prihlásení iní používatelia."
 #: ../src/login/org.freedesktop.login1.policy.in.h:37
 msgid "Reboot the system while an application asked to inhibit it"
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:38
 msgid ""
 "Authentication is required for rebooting the system while an application "
 "asked to inhibit it."
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:39
 msgid "Suspend the system"
 msgstr "Uspanie systému"
 #: ../src/login/org.freedesktop.login1.policy.in.h:40
 msgid "Authentication is required for suspending the system."
 msgstr "Vyžaduje sa overenie totožnosti na uspanie systému."
 #: ../src/login/org.freedesktop.login1.policy.in.h:41
 msgid "Suspend the system while other users are logged in"
 msgstr "Uspanie systému, pokiaľ sú prihlásení iní používatelia"
 #: ../src/login/org.freedesktop.login1.policy.in.h:42
 msgid ""
 "Authentication is required for suspending the system while other users are "
 "logged in."
 msgstr ""
 "Vyžaduje sa overenie totožnosti na uspanie systému, pokiaľ sú prihlásení iní "
 "používatelia."
 #: ../src/login/org.freedesktop.login1.policy.in.h:43
 msgid "Suspend the system while an application asked to inhibit it"
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:44
 msgid ""
 "Authentication is required for suspending the system while an application "
 "asked to inhibit it."
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:45
 msgid "Hibernate the system"
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:46
 msgid "Authentication is required for hibernating the system."
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:47
 msgid "Hibernate the system while other users are logged in"
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:48
 msgid ""
 "Authentication is required for hibernating the system while other users are "
 "logged in."
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:49
 msgid "Hibernate the system while an application asked to inhibit it"
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:50
 msgid ""
 "Authentication is required for hibernating the system while an application "
 "asked to inhibit it."
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:51
 msgid "Manage active sessions, users and seats"
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:52
 msgid ""
 "Authentication is required for managing active sessions, users and seats."
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:53
 msgid "Lock or unlock active sessions"
 msgstr "Zamknutie alebo odomknutie aktívnych relácií"
 #: ../src/login/org.freedesktop.login1.policy.in.h:54
 msgid "Authentication is required to lock or unlock active sessions."
 msgstr ""
 "Vyžaduje sa overenie totožnosti na uzamknutie alebo odomknutie aktívnych "
 "relácií."
 #: ../src/login/org.freedesktop.login1.policy.in.h:55
 msgid "Allow indication to the firmware to boot to setup interface"
 msgstr "Umožnenie indikácie spustenia inštalačného rozhrania pre firmvér"
 #: ../src/login/org.freedesktop.login1.policy.in.h:56
 msgid ""
 "Authentication is required to indicate to the firmware to boot to setup "
 "interface."
 msgstr ""
 "Vyžaduje sa overenie totožnosti na indikáciu spustenia inštalačného "
 "rozhrania pre firmvér."
 #: ../src/login/org.freedesktop.login1.policy.in.h:57
 msgid "Set a wall message"
 msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:58
 msgid "Authentication is required to set a wall message"
 msgstr ""
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:1
 msgid "Log into a local container"
 msgstr "Prihlásenie do miestneho kontajneru"
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:2
 msgid "Authentication is required to log into a local container."
 msgstr ""
 "Vyžaduje sa overenie totožnosti na prihlásenie do miestneho kontajneru."
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:3
 msgid "Log into the local host"
 msgstr ""
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:4
 msgid "Authentication is required to log into the local host."
 msgstr ""
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:5
 msgid "Acquire a shell in a local container"
 msgstr ""
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:6
 msgid "Authentication is required to acquire a shell in a local container."
 msgstr ""
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:7
 msgid "Acquire a shell on the local host"
 msgstr ""
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:8
 msgid "Authentication is required to acquire a shell on the local host."
 msgstr ""
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:9
 msgid "Acquire a pseudo TTY in a local container"
 msgstr ""
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:10
 msgid ""
 "Authentication is required to acquire a pseudo TTY in a local container."
 msgstr ""
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:11
 msgid "Acquire a pseudo TTY on the local host"
 msgstr ""
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:12
 msgid "Authentication is required to acquire a pseudo TTY on the local host."
 msgstr ""
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:13
 msgid "Manage local virtual machines and containers"
 msgstr ""
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:14
 msgid ""
 "Authentication is required to manage local virtual machines and containers."
 msgstr ""
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:15
 msgid "Manage local virtual machine and container images"
 msgstr ""
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:16
 msgid ""
 "Authentication is required to manage local virtual machine and container "
 "images."
 msgstr ""
 #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:1
 msgid "Set system time"
 msgstr ""
 #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:2
 msgid "Authentication is required to set the system time."
 msgstr ""
 #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:3
 msgid "Set system timezone"
 msgstr ""
 #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:4
 msgid "Authentication is required to set the system timezone."
 msgstr ""
 #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:5
 msgid "Set RTC to local timezone or UTC"
 msgstr ""
 #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:6
 msgid ""
 "Authentication is required to control whether the RTC stores the local or "
 "UTC time."
 msgstr ""
 #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:7
 msgid "Turn network time synchronization on or off"
 msgstr "Zapnutie alebo vypnutie sieťovej synchronizácie času"
 #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:8
 msgid ""
 "Authentication is required to control whether network time synchronization "
 "shall be enabled."
 msgstr ""
 "Vyžaduje sa overenie totožnosti na ovládanie, či má byť povolená "
 "synchronizácia času cez sieť."
 #: ../src/core/dbus-unit.c:457
 msgid "Authentication is required to start '$(unit)'."
 msgstr ""
 #: ../src/core/dbus-unit.c:458
 msgid "Authentication is required to stop '$(unit)'."
 msgstr ""
 #: ../src/core/dbus-unit.c:459
 msgid "Authentication is required to reload '$(unit)'."
 msgstr ""
 #: ../src/core/dbus-unit.c:460 ../src/core/dbus-unit.c:461
 msgid "Authentication is required to restart '$(unit)'."
 msgstr ""
 #: ../src/core/dbus-unit.c:568
 msgid "Authentication is required to kill '$(unit)'."
 msgstr ""
 #: ../src/core/dbus-unit.c:599
 msgid "Authentication is required to reset the \"failed\" state of '$(unit)'."
 msgstr ""
 #: ../src/core/dbus-unit.c:632
 msgid "Authentication is required to set properties on '$(unit)'."
 msgstr ""
--- a/po/sv.po
+++ b/po/sv.po
@ -1,24 +1,23 @@
 # Swedish translation for systemd.
 # Copyright © 2015 systemd's COPYRIGHT HOLDER
 # This file is distributed under the same license as the systemd package.
 # Josef Andersson <josef.andersson@fripost.org>, 2015.
 # Sebastian Rasmussen <sebras@gmail.com>, 2015.
 # Andreas Henriksson <andreas@fatal.se>, 2016.
-#
+# Josef Andersson <l10nl18nsweja@gmail.com>, 2015, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: systemd master\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: https://github.com/systemd/systemd/issues\n"
-"POT-Creation-Date: 2015-11-22 16:37+0100\n"
+"POT-Creation-Date: 2017-03-01 15:50+0000\n"
-"PO-Revision-Date: 2016-09-29 11:58+0200\n"
+"PO-Revision-Date: 2017-03-19 21:18+0100\n"
-"Last-Translator: Andreas Henriksson <andreas@fatal.se>\n"
+"Last-Translator: Josef Andersson <l10nl18nsweja@gmail.com>\n"
 "Language-Team: Swedish\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Poedit 1.8.9\n"
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:1
 msgid "Send passphrase back to system"
@ -134,7 +133,8 @@ msgstr "Ange systeminställningar för tangentbord"
 #: ../src/locale/org.freedesktop.locale1.policy.in.h:4
 msgid "Authentication is required to set the system keyboard settings."
-msgstr "Autentisering krävs för att ställa in systeminställningar för tangentbord."
+msgstr ""
 "Autentisering krävs för att ställa in systeminställningar för tangentbord."
 #: ../src/login/org.freedesktop.login1.policy.in.h:1
 msgid "Allow applications to inhibit system shutdown"
@ -237,45 +237,54 @@ msgstr ""
 "av brytaren för datorhöljet."
 #: ../src/login/org.freedesktop.login1.policy.in.h:19
 msgid "Allow non-logged-in user to run programs"
 msgstr "Tillåt ej inloggad användare att köra program"
 #: ../src/login/org.freedesktop.login1.policy.in.h:20
 msgid "Explicit request is required to run programs as a non-logged-in user."
 msgstr ""
 "Uttrycklig begäran krävs för att köra program som en icke inloggad användare."
 #: ../src/login/org.freedesktop.login1.policy.in.h:21
 msgid "Allow non-logged-in users to run programs"
 msgstr "Tillåt ej inloggade användare att köra program"
-#: ../src/login/org.freedesktop.login1.policy.in.h:20
+#: ../src/login/org.freedesktop.login1.policy.in.h:22
 msgid "Authentication is required to run programs as a non-logged-in user."
 msgstr ""
 "Autentisering krävs för att köra program som en icke inloggad användare."
-#: ../src/login/org.freedesktop.login1.policy.in.h:21
+#: ../src/login/org.freedesktop.login1.policy.in.h:23
 msgid "Allow attaching devices to seats"
 msgstr "Tillåt att binda enheter till platser"
-#: ../src/login/org.freedesktop.login1.policy.in.h:22
+#: ../src/login/org.freedesktop.login1.policy.in.h:24
 msgid "Authentication is required for attaching a device to a seat."
 msgstr "Autentisering krävs för att binda en enhet till en plats."
-#: ../src/login/org.freedesktop.login1.policy.in.h:23
+#: ../src/login/org.freedesktop.login1.policy.in.h:25
 msgid "Flush device to seat attachments"
 msgstr "Töm bindningar för enhet-till-plats"
-#: ../src/login/org.freedesktop.login1.policy.in.h:24
+#: ../src/login/org.freedesktop.login1.policy.in.h:26
 msgid ""
 "Authentication is required for resetting how devices are attached to seats."
 msgstr ""
 "Autentisering krävs för att återställa hur enheter är bundna till platser."
-#: ../src/login/org.freedesktop.login1.policy.in.h:25
+#: ../src/login/org.freedesktop.login1.policy.in.h:27
 msgid "Power off the system"
 msgstr "Stäng av systemet"
-#: ../src/login/org.freedesktop.login1.policy.in.h:26
+#: ../src/login/org.freedesktop.login1.policy.in.h:28
 msgid "Authentication is required for powering off the system."
 msgstr "Autentisering krävs för att stänga av systemet."
-#: ../src/login/org.freedesktop.login1.policy.in.h:27
+#: ../src/login/org.freedesktop.login1.policy.in.h:29
 msgid "Power off the system while other users are logged in"
 msgstr "Stäng av systemet medan andra användare är inloggade"
-#: ../src/login/org.freedesktop.login1.policy.in.h:28
+#: ../src/login/org.freedesktop.login1.policy.in.h:30
 msgid ""
 "Authentication is required for powering off the system while other users are "
 "logged in."
@ -283,11 +292,11 @@ msgstr ""
 "Autentisering krävs för att stänga av systemet medan andra användare är "
 "inloggade."
-#: ../src/login/org.freedesktop.login1.policy.in.h:29
+#: ../src/login/org.freedesktop.login1.policy.in.h:31
 msgid "Power off the system while an application asked to inhibit it"
 msgstr "Stäng av systemet även då ett program hindrar det"
-#: ../src/login/org.freedesktop.login1.policy.in.h:30
+#: ../src/login/org.freedesktop.login1.policy.in.h:32
 msgid ""
 "Authentication is required for powering off the system while an application "
 "asked to inhibit it."
@ -295,19 +304,19 @@ msgstr ""
 "Autentisering krävs för att stänga av systemet även då ett program hindrar "
 "det."
-#: ../src/login/org.freedesktop.login1.policy.in.h:31
+#: ../src/login/org.freedesktop.login1.policy.in.h:33
 msgid "Reboot the system"
 msgstr "Starta om systemet"
-#: ../src/login/org.freedesktop.login1.policy.in.h:32
+#: ../src/login/org.freedesktop.login1.policy.in.h:34
 msgid "Authentication is required for rebooting the system."
 msgstr "Autentisering krävs för att starta om systemet."
-#: ../src/login/org.freedesktop.login1.policy.in.h:33
+#: ../src/login/org.freedesktop.login1.policy.in.h:35
 msgid "Reboot the system while other users are logged in"
 msgstr "Starta om systemet medan andra användare är inloggade"
-#: ../src/login/org.freedesktop.login1.policy.in.h:34
+#: ../src/login/org.freedesktop.login1.policy.in.h:36
 msgid ""
 "Authentication is required for rebooting the system while other users are "
 "logged in."
@ -315,11 +324,11 @@ msgstr ""
 "Autentisering krävs för att starta om systemet medan andra användare är "
 "inloggade."
-#: ../src/login/org.freedesktop.login1.policy.in.h:35
+#: ../src/login/org.freedesktop.login1.policy.in.h:37
 msgid "Reboot the system while an application asked to inhibit it"
 msgstr "Starta om systemet även då ett program hindrar det"
-#: ../src/login/org.freedesktop.login1.policy.in.h:36
+#: ../src/login/org.freedesktop.login1.policy.in.h:38
 msgid ""
 "Authentication is required for rebooting the system while an application "
 "asked to inhibit it."
@ -327,19 +336,19 @@ msgstr ""
 "Autentisering krävs för att starta om systemet även då ett program hindrar "
 "det."
-#: ../src/login/org.freedesktop.login1.policy.in.h:37
+#: ../src/login/org.freedesktop.login1.policy.in.h:39
 msgid "Suspend the system"
 msgstr "Försätt system i vänteläge"
-#: ../src/login/org.freedesktop.login1.policy.in.h:38
+#: ../src/login/org.freedesktop.login1.policy.in.h:40
 msgid "Authentication is required for suspending the system."
 msgstr "Autentisering krävs för att försätta system i vänteläge."
-#: ../src/login/org.freedesktop.login1.policy.in.h:39
+#: ../src/login/org.freedesktop.login1.policy.in.h:41
 msgid "Suspend the system while other users are logged in"
 msgstr "Försätt systemet i vänteläge medan andra användare är inloggade"
-#: ../src/login/org.freedesktop.login1.policy.in.h:40
+#: ../src/login/org.freedesktop.login1.policy.in.h:42
 msgid ""
 "Authentication is required for suspending the system while other users are "
 "logged in."
@ -347,11 +356,11 @@ msgstr ""
 "Autentisering krävs för att försätta systemet i vänteläge medan andra "
 "användare är inloggade."
-#: ../src/login/org.freedesktop.login1.policy.in.h:41
+#: ../src/login/org.freedesktop.login1.policy.in.h:43
 msgid "Suspend the system while an application asked to inhibit it"
 msgstr "Försätt systemet i vänteläge även då ett program hindrar det"
-#: ../src/login/org.freedesktop.login1.policy.in.h:42
+#: ../src/login/org.freedesktop.login1.policy.in.h:44
 msgid ""
 "Authentication is required for suspending the system while an application "
 "asked to inhibit it."
@ -359,19 +368,19 @@ msgstr ""
 "Autentisering krävs för att försätta ett program i vänteläge även då ett "
 "program hindrar det."
-#: ../src/login/org.freedesktop.login1.policy.in.h:43
+#: ../src/login/org.freedesktop.login1.policy.in.h:45
 msgid "Hibernate the system"
 msgstr "Försätt systemet i viloläge"
-#: ../src/login/org.freedesktop.login1.policy.in.h:44
+#: ../src/login/org.freedesktop.login1.policy.in.h:46
 msgid "Authentication is required for hibernating the system."
 msgstr "Autentisering krävs för att försätta systemet i viloläge."
-#: ../src/login/org.freedesktop.login1.policy.in.h:45
+#: ../src/login/org.freedesktop.login1.policy.in.h:47
 msgid "Hibernate the system while other users are logged in"
 msgstr "Försätt systemet i viloläge medan andra användare är inloggade"
-#: ../src/login/org.freedesktop.login1.policy.in.h:46
+#: ../src/login/org.freedesktop.login1.policy.in.h:48
 msgid ""
 "Authentication is required for hibernating the system while other users are "
 "logged in."
@ -379,11 +388,11 @@ msgstr ""
 "Autentisering krävs för att försätta systemet i viloläge medan andra "
 "användare är inloggade."
-#: ../src/login/org.freedesktop.login1.policy.in.h:47
+#: ../src/login/org.freedesktop.login1.policy.in.h:49
 msgid "Hibernate the system while an application asked to inhibit it"
 msgstr "Försätt systemet i viloläge även då ett program hindrar det"
-#: ../src/login/org.freedesktop.login1.policy.in.h:48
+#: ../src/login/org.freedesktop.login1.policy.in.h:50
 msgid ""
 "Authentication is required for hibernating the system while an application "
 "asked to inhibit it."
@ -391,30 +400,30 @@ msgstr ""
 "Autentisering krävs för att försätta ett program i viloläge även då ett "
 "program hindrar det."
-#: ../src/login/org.freedesktop.login1.policy.in.h:49
+#: ../src/login/org.freedesktop.login1.policy.in.h:51
 msgid "Manage active sessions, users and seats"
 msgstr "Hantera aktiva sessioner, användare och platser"
-#: ../src/login/org.freedesktop.login1.policy.in.h:50
+#: ../src/login/org.freedesktop.login1.policy.in.h:52
 msgid ""
 "Authentication is required for managing active sessions, users and seats."
 msgstr ""
 "Autentisering krävs för att hantera aktiva sessioner, användare och platser."
-#: ../src/login/org.freedesktop.login1.policy.in.h:51
+#: ../src/login/org.freedesktop.login1.policy.in.h:53
 msgid "Lock or unlock active sessions"
 msgstr "Lås eller lås upp aktiva sessioner"
-#: ../src/login/org.freedesktop.login1.policy.in.h:52
+#: ../src/login/org.freedesktop.login1.policy.in.h:54
 msgid "Authentication is required to lock or unlock active sessions."
 msgstr "Autentisering krävs för att låsa eller låsa upp aktiva sessioner."
-#: ../src/login/org.freedesktop.login1.policy.in.h:53
+#: ../src/login/org.freedesktop.login1.policy.in.h:55
 msgid "Allow indication to the firmware to boot to setup interface"
 msgstr ""
 "Tillåt indikering till firmware att starta upp i inställningsgränssnitt"
-#: ../src/login/org.freedesktop.login1.policy.in.h:54
+#: ../src/login/org.freedesktop.login1.policy.in.h:56
 msgid ""
 "Authentication is required to indicate to the firmware to boot to setup "
 "interface."
@ -422,11 +431,11 @@ msgstr ""
 "Autentisering krävs för att indikera till firmware att starta upp till "
 "inställningsgränssnitt."
-#: ../src/login/org.freedesktop.login1.policy.in.h:55
+#: ../src/login/org.freedesktop.login1.policy.in.h:57
 msgid "Set a wall message"
 msgstr "Ange ett väggmeddelande"
-#: ../src/login/org.freedesktop.login1.policy.in.h:56
+#: ../src/login/org.freedesktop.login1.policy.in.h:58
 msgid "Authentication is required to set a wall message"
 msgstr "Autentisering krävs för att ställa in ett väggmeddelande"
@ -547,33 +556,33 @@ msgstr ""
 "Autentisering krävs för att kontrollera huruvida synkronisering av "
 "nätverkstid ska vara aktiverat."
-#: ../src/core/dbus-unit.c:428
+#: ../src/core/dbus-unit.c:457
 msgid "Authentication is required to start '$(unit)'."
 msgstr "Autentisering krävs för att starta \"$(unit)\"."
-#: ../src/core/dbus-unit.c:429
+#: ../src/core/dbus-unit.c:458
 msgid "Authentication is required to stop '$(unit)'."
 msgstr "Autentisering krävs för att stoppa \"$(unit)\"."
-#: ../src/core/dbus-unit.c:430
+#: ../src/core/dbus-unit.c:459
 msgid "Authentication is required to reload '$(unit)'."
 msgstr "Autentisering krävs för att läsa om tillståndet för \"$(unit)\"."
-#: ../src/core/dbus-unit.c:431 ../src/core/dbus-unit.c:432
+#: ../src/core/dbus-unit.c:460 ../src/core/dbus-unit.c:461
 msgid "Authentication is required to restart '$(unit)'."
 msgstr "Autentisering krävs för att starta om \"$(unit)\"."
-#: ../src/core/dbus-unit.c:535
+#: ../src/core/dbus-unit.c:568
 msgid "Authentication is required to kill '$(unit)'."
 msgstr "Autentisering krävs för att döda \"$(unit)\"."
-#: ../src/core/dbus-unit.c:565
+#: ../src/core/dbus-unit.c:599
 msgid "Authentication is required to reset the \"failed\" state of '$(unit)'."
 msgstr ""
 "Autentisering krävs för att återställa det \"fallerade\" tillståndet för "
 "\"$(unit)\"."
-#: ../src/core/dbus-unit.c:597
+#: ../src/core/dbus-unit.c:632
 msgid "Authentication is required to set properties on '$(unit)'."
 msgstr "Autentisering krävs för att ställa in egenskaper på \"$(unit)\"."
--- a/Show More
+++ b/Show More
`@ -1,4 +1,4 @@`
	`#!/usr/bin/python3`	`#!/usr/bin/env python3`

	`"""`	`"""`