Merge 2a0814759c into 12e58ab18d

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -18,7 +18,7 @@ body:
         If a distro build is used, please just paste the package version, e.g. `systemd-254.7-1.fc39.x86_64`.
         See https://github.com/systemd/systemd-stable/tags for the list of most recent releases.
         For older version please use distribution trackers (see https://systemd.io/CONTRIBUTING#filing-issues).
-      placeholder: '256.x'
+      placeholder: '255'
     validations:
       required: true
 

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -121,6 +121,6 @@ body:
     attributes:
       label: The systemd version you checked that didn't have the feature you are asking for
       description: If this is not the most recently released upstream version, then please check first if it has that feature already.
-      placeholder: '256.x'
+      placeholder: '255'
     validations:
       required: false

.github/workflows/build_test.sh

@@ -3,8 +3,6 @@
 
 set -ex
 
-shopt -s nullglob
-
 info() { echo -e "\033[33;1m$1\033[0m"; }
 fatal() { echo >&2 -e "\033[31;1m$1\033[0m"; exit 1; }
 success() { echo >&2 -e "\033[32;1m$1\033[0m"; }
@@ -14,7 +12,7 @@ ARGS=(
     "--optimization=s -Dutmp=false"
     "--optimization=2 -Dc_args=-Wmaybe-uninitialized -Ddns-over-tls=openssl"
     "--optimization=3 -Db_lto=true -Ddns-over-tls=false"
-    "--optimization=3 -Db_lto=false -Dtpm2=disabled -Dlibfido2=disabled -Dp11kit=disabled -Defi=false -Dbootloader=disabled"
+    "--optimization=3 -Db_lto=false -Dtpm2=disabled -Dlibfido2=disabled -Dp11kit=disabled"
     "--optimization=3 -Dfexecve=true -Dstandalone-binaries=true -Dstatic-libsystemd=true -Dstatic-libudev=true"
     "-Db_ndebug=true"
 )
@@ -47,7 +45,7 @@ PACKAGES=(
     libxkbcommon-dev
     libxtables-dev
     libzstd-dev
-    mold
+    # mold
     mount
     net-tools
     python3-evdev
@@ -70,6 +68,14 @@ LINKER="${LINKER:?}"
 CRYPTOLIB="${CRYPTOLIB:?}"
 RELEASE="$(lsb_release -cs)"
 
+# mold-2.2.0+ fixes some bugs breaking bootloader builds.
+# TODO: Switch to distro mold with ubuntu-24.04
+if [[ "$LINKER" == mold ]]; then
+    wget https://github.com/rui314/mold/releases/download/v2.2.0/mold-2.2.0-x86_64-linux.tar.gz
+    echo "d66e0230c562c2ba0e0b789cc5034e0fa2369cc843d0154920de4269cd94afeb  mold-2.2.0-x86_64-linux.tar.gz" | sha256sum -c
+    sudo tar -xz -C /usr --strip-components=1 -f mold-2.2.0-x86_64-linux.tar.gz
+fi
+
 # Note: As we use postfixed clang/gcc binaries, we need to override $AR
 #       as well, otherwise meson falls back to ar from binutils which
 #       doesn't work with LTO

.github/workflows/build_test.yml

@@ -33,6 +33,6 @@ jobs:
     env: ${{ matrix.env }}
     steps:
       - name: Repository checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
       - name: Build check
         run: .github/workflows/build_test.sh

.github/workflows/codeql.yml

@@ -42,7 +42,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@e2b3eafc8d227b0241d48be5f425d47c2d750a13

.github/workflows/coverity.yml

@@ -22,7 +22,7 @@ jobs:
       COVERITY_SCAN_NOTIFICATION_EMAIL: "${{ secrets.COVERITY_SCAN_NOTIFICATION_EMAIL }}"
     steps:
       - name: Repository checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
       # Reuse the setup phase of the unit test script to avoid code duplication
       - name: Install build dependencies
         run: sudo -E .github/workflows/unit_tests.sh SETUP

.github/workflows/development_freeze.yml

@@ -30,7 +30,7 @@ jobs:
           name: Pull Request Metadata
 
       - name: Repository checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
         with:
           fetch-depth: 0
 

.github/workflows/differential-shellcheck.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Repository checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
         with:
           fetch-depth: 0
 

.github/workflows/gather-pr-metadata.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Repository checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
 
       - id: metadata
         name: Gather Pull Request Metadata

.github/workflows/issue_labeler.yml

@@ -20,7 +20,7 @@ jobs:
         template: [ bug_report.yml, feature_request.yml ]
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
 
       - name: Parse issue form
         uses: stefanbuck/github-issue-parser@1e5bdee70d4b3e066a33aa0669ab782943825f94

.github/workflows/labeler.yml

@@ -30,7 +30,7 @@ jobs:
 
     steps:
     - name: Repository checkout
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
       if: github.event_name == 'pull_request'
 
     - name: Label PR based on policy in labeler.yml

.github/workflows/linter.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Repo checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
         with:
           # We need a full repo clone
           fetch-depth: 0

.github/workflows/mkosi.yml

@@ -104,8 +104,8 @@ jobs:
             relabel: yes
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
-      - uses: systemd/mkosi@8976a0abb19221e65300222f2d33067970cca0f1
+      - uses: systemd/mkosi@2a35f9958bc6b82d95d1eac02dc245e9bb068765
 
       # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
       # immediately, we remove the files in the background. However, we first move them to a different location

.github/workflows/requirements.txt

@@ -1,6 +1,6 @@
-meson==1.6.0 \
+meson==1.5.2 \
-    --hash=sha256:234a45f9206c6ee33b473ec1baaef359d20c0b89a71871d58c65a6db6d98fe74 \
+    --hash=sha256:77706e2368a00d789c097632ccf4fc39251fba56d03e1e1b262559a3c7a08f5b \
-    --hash=sha256:999b65f21c03541cf11365489c1fad22e2418bb0c3d50ca61139f2eec09d5496
+    --hash=sha256:f955e09ab0d71ef180ae85df65991d58ed8430323de7d77a37e11c9ea630910b
 ninja==1.11.1.1 \
     --hash=sha256:18302d96a5467ea98b68e1cae1ae4b4fb2b2a56a82b955193c637557c7273dbd \
     --hash=sha256:185e0641bde601e53841525c4196278e9aaf4463758da6dd1e752c0a0f54136a \

.github/workflows/scorecards.yml

@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
         with:
           persist-credentials: false
 

.github/workflows/unit_tests.yml

@@ -30,7 +30,7 @@ jobs:
             cryptolib: gcrypt
     steps:
       - name: Repository checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
       - name: Install build dependencies
         run: |
           # Drop XDG_* stuff from /etc/environment, so we don't get the user

LICENSES/README.md

@@ -69,9 +69,6 @@ The following exceptions apply:
  * the following sources are under **Public Domain** (LicenseRef-alg-sha1-public-domain):
    - src/fundamental/sha1-fundamental.c
    - src/fundamental/sha1-fundamental.h
- * the following files are licensed under **BSD-3-Clause** license:
-   - src/boot/efi/chid.c
-   - src/boot/efi/chid.h
  * Heebo fonts under docs/fonts/ are licensed under the **SIL Open Font License 1.1**,
  * any files under test/ without an explicit license we assume non-copyrightable
    (eg: computer-generated fuzzer data)

TODO

@@ -129,61 +129,6 @@ Deprecations and removals:
 
 Features:
 
-* Teach systemd-ssh-generator to generated an /run/issue.d/ drop-in telling
-  users how to connect to the system via the AF_VSOCK, as per:
-  https://github.com/systemd/systemd/issues/35071#issuecomment-2462803142
-
-* maybe introduce an OSC sequence that signals when we ask for a password, so
-  that terminal emulators can maybe connect a password manager or so, and
-  highlight things specially.
-
-* Port pidref_namespace_open() to use PIDFD_GET_MNT_NAMESPACE and related
-  ioctls to get nsfds directly from pidfds.
-
-* start using STATX_SUBVOL in btrfs_is_subvol(). Also, make use of it
-  generically, so that image discovery recognizes bcachefs subvols too.
-
-* format-table: introduce new cell type for strings with ansi sequences in
-  them. display them in regular output mode (via strip_tab_ansi()), but
-  suppress them in json mode.
-
-* machined: when registering a machine, also take a relative cgroup path,
-  relative to the machine's unit. This is useful when registering unpriv
-  machines, as they might sit down the cgroup tree, below a cgroup delegation
-  boundary. Then, install an inotify watch on that cgroup to track when the
-  machine's local cgroup goes down.
-
-* resolved: report ttl in resolution replies if we know it. This data is useful
-  for tools such as wireguard which want to periodically re-resolve DNS names,
-  and might want to use the TTL has hint for that.
-
-* journald: beef up ClientContext logic to store pidfd_id of peer, to validate
-  we really use the right cache entry
-
-* journald: log client's pidfd id as a new automatic field _PIDFDID= or so.
-
-* journald: split up ClientContext cache in two: one cache keyed by pid/pidfdid
-  with process information, and another one keyed by cgroup path/cgroupid with
-  cgroup information. This way if a service consisting of many logging
-  processes can take benefit of the cgroup caching.
-
-* system lsmbpf policy that prohibits creating files owned by "nobody"
-  system-wide
-
-* system lsmpbf policy that prohibits creating or opening device nodes outside
-  of devtmpfs/tmpfs, except if they are the pseudo-devices /dev/null,
-  /dev/zero, /dev/urandom and so on.
-
-* system lsmbpf policy that enforces that block device backed mounts may only
-  be established on top of dm-crypt or dm-verity devices, or an allowlist of
-  file systems (which should probably include vfat, for compat with the ESP)
-
-* $LISTEN_PID, $MAINPID and $SYSTEMD_EXECPID env vars that the service manager
-  sets should be augmented with $LISTEN_PIDFDID, $MAINPIDFDID and
-  $SYSTEMD_EXECPIDFD (and similar for other env vars we might send).
-
-* port copy.c over to use LabelOps for all labelling.
-
 * port remaining getmntent() users over to libmount. There are subtle
   differences in the parsers (see #25371 for example), and it hence makes sense
   if we stick to one set of parsers on this, not mix both.
@@ -210,6 +155,9 @@ Features:
   sd_event_add_child(), and then get rid of many more explicit sigprocmask()
   calls.
 
+* maybe set shell.prompt.prefix credential in run0 to some warning emoji,
+  i.e. ⚠️ or ☢️ or ⚡ or 👊 or 🧑‍🔧 or so.
+
 * introduce new structure Tpm2CombinedPolicy, that combines the various TPm2
   policy bits into one structure, i.e. public key info, pcr masks, pcrlock
   stuff, pin and so on. Then pass that around in tpm2_seal() and tpm2_unseal().
@@ -235,8 +183,12 @@ Features:
   services where mount propagation from the root fs is off, an still have
   confext/sysext propagated in.
 
+* support F_DUDFD_QUERY for comparing fds in same_fd (requires kernel 6.10)
+
 * generic interface for varlink for setting log level and stuff that all our daemons can implement
 
+* use pty ioctl to get peer wherever possible (TIOCGPTPEER)
+
 * maybe teach repart.d/ dropins a new setting MakeMountNodes= or so, which is
   just like MakeDirectories=, but uses an access mode of 0000 and sets the +i
   chattr bit. This is useful as protection against early uses of /var/ or /tmp/
@@ -267,6 +219,8 @@ Features:
 * initrd: when transitioning from initrd to host, validate that
   /lib/modules/`uname -r` exists, refuse otherwise
 
+* tmpfiles: add "owning" flag for lines that limits effect of --purge
+
 * signed bpf loading: to address need for signature verification for bpf
   programs when they are loaded, and given the bpf folks don't think this is
   realistic in kernel space, maybe add small daemon that facilitates this
@@ -470,6 +424,9 @@ Features:
 * introduce mntid_t, and make it 64bit, as apparently the kernel switched to
   64bit mount ids
 
+* use udev rule networkd ownership property to take ownership of network
+  interfaces nspawn creates
+
 * mountfsd/nsresourced
   - userdb: maybe allow callers to map one uid to their own uid
   - bpflsm: allow writes if resulting UID on disk would be userns' owner UID
@@ -656,7 +613,6 @@ Features:
   - openpt_allocate_in_namespace()
   - unit_attach_pid_to_cgroup_via_bus()
   - cg_attach() – requires new kernel feature
-  - journald's process cache
 
 * ddi must be listed as block device fstype
 
@@ -1473,6 +1429,9 @@ Features:
   - "systemd-sysupdate update --all" support, that iterates through all components
     defined on the host, plus all images installed into /var/lib/machines/,
     /var/lib/portable/ and so on.
+  - figure out what to do about system extensions (i.e. they need to imply an
+    update component, since otherwise sysupdate.d/ files would override the
+    host's update files.)
   - Allow invocation with a single transfer definition, i.e. with
     --definitions= pointing to a file rather than a dir.
   - add ability to disable implicit decompression of downloaded artifacts,
@@ -1480,6 +1439,9 @@ Features:
 
 * in sd-id128: also parse UUIDs in RFC4122 URN syntax (i.e. chop off urn:uuid: prefix)
 
+* DynamicUser= + StateDirectory= → use uid mapping mounts, too, in order to
+  make dirs appear under right UID.
+
 * systemd-sysext: optionally, run it in initrd already, before transitioning
   into host, to open up possibility for services shipped like that.
 
@@ -1651,6 +1613,14 @@ Features:
 
 * maybe add kernel cmdline params: to force random seed crediting
 
+* introduce a new per-process uuid, similar to the boot id, the machine id, the
+  invocation id, that is derived from process creds, specifically a hashed
+  combination of AT_RANDOM + getpid() + the starttime from
+  /proc/self/status. Then add these ids implicitly when logging. Deriving this
+  uuid from these three things has the benefit that it can be derived easily
+  from /proc/$PID/ in a stable, and unique way that changes on both fork() and
+  exec().
+
 * let's not GC a unit while its ratelimits are still pending
 
 * when killing due to service watchdog timeout maybe detect whether target
@@ -2064,7 +2034,7 @@ Features:
     with other units https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/admin-guide/hw-vuln/core-scheduling.rst
   - ExtensionImages= deduplication for services is currently only applied to disk images without GPT envelope.
     This should be extended to work with proper DDIs too, as well as directory confext/sysext. Moreover,
-    system-wide confext/sysext should support this too.
+    system-wide confex/sysext should support this too.
   - Pin the mount namespace via FD by sending it back from sd-exec to the manager, and use it
     for live mounting, instead of doing it via PID
 

docs/ENVIRONMENT.md

@@ -735,16 +735,3 @@ Tools using the Varlink protocol (such as `varlinkctl`) or sd-bus (such as
 
 * `SYSTEMD_EXIT_ON_IDLE` – Takes a boolean. When false, the exit-on-idle logic
   of these services is disabled, making it easier to debug them.
-
-`systemd-ask-password`:
-
-* `$SYSTEMD_ASK_PASSWORD_KEYRING_TIMEOUT_SEC` - takes a timespan, which controls
-  the expiration time of keys stored in the kernel keyring by `systemd-ask-password`.
-  If unset, the default expiration of 150 seconds is used. If set to `0`, keys are
-  not cached in the kernel keyring. If set to `infinity`, keys are cached without an
-  expiration time in the kernel keyring.
-
-* `SYSTEMD_ASK_PASSWORD_KEYRING_TYPE` - takes a keyring ID or one of `thread`,
-  `process`, `session`, `user`, `user-session`, or `group`. Controls the kernel
-  keyring in which `systemd-ask-password` caches the queried password. Defaults
-  to `user`.

docs/HACKING.md

@@ -44,37 +44,9 @@ or:
 $ mkosi qemu
 ```
 
-By default, the tools from your host system are used to build the image.
+By default, the tools from your host system are used to build the image. To have
-Sometimes we start using mkosi features that rely on functionality in systemd
+`mkosi` use the systemd tools from the `build/` directory, add the following to
-tools that's not in an official release yet. In that case, you'll need to build
+`mkosi.local.conf`:
-systemd from source on the host and configure mkosi to use the tools from the
-systemd build directory.
-
-To do a local build, most distributions provide very simple and convenient ways
-to install most development packages necessary to build systemd:
-
-```sh
-# Fedora
-$ sudo dnf builddep systemd
-# Debian/Ubuntu
-$ sudo apt-get build-dep systemd
-# Arch
-$ sudo pacman -S devtools
-$ pkgctl repo clone --protocol=https systemd
-$ cd systemd
-$ makepkg -seoc
-```
-
-After installing the development packages, systemd can be built from source as follows:
-
-```sh
-$ meson setup build <options>
-$ ninja -C build
-$ meson test -C build
-```
-
-To have `mkosi` use the systemd tools from the `build/` directory, add the
-following to `mkosi.local.conf`:
 
 ```conf
 [Host]
@@ -97,9 +69,9 @@ another terminal on your host (choose the right one depending on the
 distribution of the container or virtual machine):
 
 ```sh
-mkosi -t none && mkosi ssh dnf upgrade --disablerepo="*" --assumeyes "/work/build/*.rpm"             # CentOS/Fedora
+mkosi -t none && mkosi ssh dnf upgrade --disablerepo="*" --assumeyes "/work/build/*.rpm" # CentOS/Fedora
-mkosi -t none && mkosi ssh apt-get install "/work/build/*.deb"                                       # Debian/Ubuntu
+mkosi -t none && mkosi ssh apt-get install "/work/build/*.deb" # Debian/Ubuntu
-mkosi -t none && mkosi ssh pacman --upgrade --needed --noconfirm "/work/build/*.pkg.tar"             # Arch Linux
+mkosi -t none && mkosi ssh pacman --upgrade --needed --noconfirm "/work/build/*.pkg.tar" # Arch Linux
 mkosi -t none && mkosi ssh zypper --non-interactive install --allow-unsigned-rpm "/work/build/*.rpm" # OpenSUSE
 ```
 
@@ -125,6 +97,29 @@ $ git push -u <REMOTE>            # where REMOTE is your "fork" on GitHub
 
 And after that, head over to your repo on GitHub and click "Compare & pull request"
 
+If you want to do a local build without mkosi,
+most distributions also provide very simple and convenient ways to install most development packages necessary to build systemd:
+
+```sh
+# Fedora
+$ sudo dnf builddep systemd
+# Debian/Ubuntu
+$ sudo apt-get build-dep systemd
+# Arch
+$ sudo pacman -S devtools
+$ pkgctl repo clone --protocol=https systemd
+$ cd systemd
+$ makepkg -seoc
+```
+
+After installing the development packages, systemd can be built from source as follows:
+
+```sh
+$ meson setup build <options>
+$ ninja -C build
+$ meson test -C build
+```
+
 Happy hacking!
 
 ## Building distribution packages with mkosi
@@ -133,25 +128,22 @@ To build distribution packages for a specific distribution and release without
 building an actual image, the following command can be used:
 
 ```sh
-mkosi -d <distribution> -r <release> -t none
+mkosi -d <distribution> -r <release> -t none -f
 ```
 
-Afterwards the distribution packages will be located in
+Afterwards the distribution packages will be located in `build/mkosi.output`. To
-`build/mkosi.builddir/<distribution>~<release>~<architecture>/`. To also build
+also build debuginfo packages, the following command can be used:
-debuginfo packages, the following command can be used:
 
 ```sh
-mkosi -d <distribution> -r <release> -E WITH_DEBUG=1 -t none
+mkosi -d <distribution> -r <release> -E WITH_DEBUG=1 -t none -f
 ```
 
 To upgrade the systemd packages on the host system to the newer versions built
 by mkosi, run the following:
 
 ```sh
-dnf upgrade build/mkosi.builddir/<distribution>~<release>~<architecture>/*.rpm                                           # Fedora/CentOS
+dnf upgrade build/mkosi.output/*.rpm # Fedora/CentOS
-apt-get install build/mkosi.builddir/<distribution>~<release>~<architecture>/*.deb                                       # Debian/Ubuntu
+# TODO: Other distributions
-pacman --upgrade --needed --noconfirm build/mkosi.builddir/<distribution>~<release>~<architecture>/*.pkg.tar             # Arch Linux
-zypper --non-interactive install --allow-unsigned-rpm build/mkosi.builddir/<distribution>~<release>~<architecture>/*.rpm # OpenSUSE
 ```
 
 To downgrade back to the old version shipped by the distribution, run the

docs/INHIBITOR_LOCKS.md

@@ -42,8 +42,8 @@ If such a lock is taken the operation will fail (but still may be overridden if
 The InhibitDelayMaxSec= setting in [logind.conf(5)](http://www.freedesktop.org/software/systemd/man/logind.conf.html) controls the timeout for this. This is intended to be used by applications which need a synchronous way to execute actions before system suspend but shall not be allowed to block suspend indefinitely.
 This mode is only available for _sleep_ and _shutdown_ locks.
 
-3. _block-weak_ that works as its non-weak counterpart, but that in addition may be ignored
+3. _block-weak_ and _delay-weak_ that work as the non-weak counterparts, but that in addition may be ignored
-automatically and silently under certain circumstances, unlike the former which is always respected.
+automatically and silently under certain circumstances, unlike the formers which are always respected.
 
 Inhibitor locks are taken via the Inhibit() D-Bus call on the logind Manager object:
 

docs/PASSWORD_AGENTS.md

@@ -7,30 +7,25 @@ SPDX-License-Identifier: LGPL-2.1-or-later
 
 # Password Agents
 
-systemd 12 and newer support lightweight password agents which can be used to
+systemd 12 and newer support lightweight password agents which can be used to query the user for system-level passwords or passphrases.
-query the user for system-level passwords or passphrases.  These are
+These are passphrases that are not related to a specific user, but to some kind of hardware or service.
-passphrases that are not related to a specific user, but to some kind of
+Right now this is used exclusively for encrypted hard-disk passphrases but later on this is likely to be used to query passphrases of SSL certificates at Apache startup time as well.
-hardware or service.  This is used for encrypted hard-disk passphrases or to
+The basic idea is that a system component requesting a password entry can simply drop a simple .ini-style file into `/run/systemd/ask-password` which multiple different agents may watch via `inotify()`, and query the user as necessary.
-query passphrases of SSL certificates at web server start-up time.  The basic
+The answer is then sent back to the querier via an `AF_UNIX`/`SOCK_DGRAM` socket.
-idea is that a system component requesting a password entry can simply drop a
+Multiple agents might be running at the same time in which case they all should query the user and the agent which answers first wins.
-simple .ini-style file into `/run/systemd/ask-password/` which multiple
+Right now systemd ships with the following passphrase agents:
-different agents may watch via `inotify()`, and query the user as necessary.
-The answer is then sent back to the querier via an `AF_UNIX`/`SOCK_DGRAM`
-socket.  Multiple agents might be running at the same time in which case they
-all should query the user and the agent which answers first wins.  Right now
-systemd ships with the following passphrase agents:
 
 * A Plymouth agent used for querying passwords during boot-up
 * A console agent used in similar situations if Plymouth is not available
+* A GNOME agent which can be run as part of the normal user session which pops up a notification message and icon which when clicked receives the passphrase from the user.
+  This is useful and necessary in case an encrypted system hard-disk is plugged in when the machine is already up.
 * A [`wall(1)`](https://man7.org/linux/man-pages/man1/wall.1.html) agent which sends wall messages as soon as a password shall be entered.
 * A simple tty agent which is built into "`systemctl start`" (and similar commands) and asks passwords to the user during manual startup of a service
 * A simple tty agent which can be run manually to respond to all queued passwords
 
-## Implementing Agents
-
 It is easy to write additional agents. The basic algorithm to follow looks like this:
 
-* Create an inotify watch on `/run/systemd/ask-password/`, watch for `IN_CLOSE_WRITE|IN_MOVED_TO`
+* Create an inotify watch on /run/systemd/ask-password, watch for `IN_CLOSE_WRITE|IN_MOVED_TO`
 * Ignore all events on files in that directory that do not start with "`ask.`"
 * As soon as a file named "`ask.xxxx`" shows up, read it. It's a simple `.ini` file that may be parsed with the usual parsers. The `xxxx` suffix is randomized.
 * Make sure to ignore unknown `.ini` file keys in those files, so that we can easily extend the format later on.
@@ -47,57 +42,23 @@ It is easy to write additional agents. The basic algorithm to follow looks like
 * Make sure to hide a password query dialog as soon as a) the `ask.xxxx` file is deleted, watch this with inotify. b) the `NotAfter=` time elapses, if it is set `!= 0`.
 * Access to the socket is restricted to privileged users.
   To acquire the necessary privileges to send the answer back, consider using PolicyKit.
-  For convenience, a reference implementation is provided: "`/usr/bin/pkexec /usr/lib/systemd/systemd-reply-password 1 /path/to/socket`" or "`/usr/bin/pkexec /usr/lib/systemd/systemd-reply-password 0 /path/to/socket`" and writing the password to its standard input.
+  In fact, the GNOME agent we ship does that, and you may simply piggyback on that, by executing "`/usr/bin/pkexec /usr/lib/systemd/systemd-reply-password 1 /path/to/socket`" or "`/usr/bin/pkexec /usr/lib/systemd/systemd-reply-password 0 /path/to/socket`" and writing the password to its standard input.
   Use '`1`' as argument if a password was entered by the user, or '`0`' if the user canceled the request.
 * If you do not want to use PK ensure to acquire the necessary privileges in some other way and send a single datagram
   to the socket consisting of the password string either prefixed with "`+`" or with "`-`" depending on whether the password entry was successful or not.
   You may but don't have to include a final `NUL` byte in your message.
 
-Again, it is essential that you stop showing the password
+Again, it is essential that you stop showing the password box/notification/status icon if the `ask.xxx` file is removed or when `NotAfter=` elapses (if it is set `!= 0`)!
-box/notification/status icon if the `ask.xxxx` file is removed or when
-`NotAfter=` elapses (if it is set `!= 0`)!
 
 It may happen that multiple password entries are pending at the same time.
-Your agent needs to be able to deal with that. Depending on your environment
+Your agent needs to be able to deal with that. Depending on your environment you may either choose to show all outstanding passwords at the same time or instead only one and as soon as the user has replied to that one go on to the next one.
-you may either choose to show all outstanding passwords at the same time or
-instead only one and as soon as the user has replied to that one go on to the
-next one.
 
-If you write a system level agent, a smart way to activate it is using systemd
+You may test this all with manually invoking the "`systemd-ask-password`" tool on the command line.
-`.path` units.  This will ensure that systemd will watch the
+Pass `--no-tty` to ensure the password is asked via the agent system.
-`/run/systemd/ask-password/` directory and spawn the agent as soon as that
+Note that only privileged users may use this tool (after all this is intended purely for system-level passwords).
-directory becomes non-empty.  In fact, the console, wall and Plymouth agents
-are started like this.  If systemd is used to maintain user sessions as well
-you can use a similar scheme to automatically spawn your user password agent as
-well.
 
-## Implementing Queriers
+If you write a system level agent a smart way to activate it is using systemd `.path` units.
-
+This will ensure that systemd will watch the `/run/systemd/ask-password` directory and spawn the agent as soon as that directory becomes non-empty.
-It's also easy to implement applications that want to query passwords this way
+In fact, the console, wall and Plymouth agents are started like this.
-(i.e. client for the agents above). Simply bind an `AF_UNIX`/`SOCK_DGRAM`
+If systemd is used to maintain user sessions as well you can use a similar scheme to automatically spawn your user password agent as well.
-socket somewhere (suggestion: you can do this in `/run/systemd/ask-password/`
+(As of this moment we have not switched any DE over to use systemd for session management, however.)
-under a randomized socket name, not beginning with `ask.`). Then, create an
-`/run/systemd/ask-password/ask.xxxx` (replace the `xxxx` by some randomized
-string) file, with the appropriate `Message=`, `PID=`, `Icon=`, `Echo=`,
-`NotAfter=` fields in the `[Ask]` section. Most importantly, include `Socket=`
-pointing to your socket entrypoint. Then, just wait until the password is
-delivered to you on the socket. Finally, don't forget to remove the file and
-the socket once done.
-
-## Testing
-
-You may test agents by manually invoking the "`systemd-ask-password`" tool from
-a shell.  Pass `--no-tty` to ensure the password is asked via the agent system.
-
-You may test queriers by manually invoking the
-"`systemd-tty-ask-password-agent`" from a shell.
-
-## Unprivileged Per-User Password Agents
-
-Starting with systemd v257 the scheme is extended to per-user password
-agents. A second per-user directory `$XDG_RUNTIME_DIR/systemd/ask-password/` is
-now available, with the same protocol as the system-wide
-counterpart. Unprivileged, per-directory agents should watch this directory in
-parallel to the system-wide one. Unprivileged queriers (i.e. clients to these
-agents) should pick the per-user directory to place their password request
-files in.

docs/RELEASE.md

@@ -15,19 +15,18 @@ SPDX-License-Identifier: LGPL-2.1-or-later
 6. [RC1] Update library numbers in `meson.build`
 7. Update version number in `meson.version` (e.g. from `256~devel` to `256~rc1` or from `256~rc3` to `256`). Note that this uses a tilde (\~) instead of a hyphen (-) because tildes sort lower in version comparisons according to the [version format specification](https://uapi-group.org/specifications/specs/version_format_specification/), and we want `255~rc1` to sort lower than `255`.
 8. Check dbus docs with `ninja -C build update-dbus-docs`
-9. Check manpages list with `ninja -C build update-man-rules`
+9. Update translation strings (`ninja -C build systemd-pot`, `ninja -C build systemd-update-po`) - drop the header comments from `systemd.pot` + re-add SPDX before committing. If the only change in a file is the 'POT-Creation-Date' field, then ignore that file.
-10. Update translation strings (`ninja -C build systemd-pot`, `ninja -C build systemd-update-po`) - drop the header comments from `systemd.pot` + re-add SPDX before committing. If the only change in a file is the 'POT-Creation-Date' field, then ignore that file.
+10. Tag the release: `version="v$(sed 's/~/-/g' meson.version)" && git tag -s "${version}" -m "systemd ${version}"` (tildes are replaced with hyphens, because git doesn't accept the former).
-11. Tag the release: `version="v$(sed 's/~/-/g' meson.version)" && git tag -s "${version}" -m "systemd ${version}"` (tildes are replaced with hyphens, because git doesn't accept the former).
+11. Do `ninja -C build`
-12. Do `ninja -C build`
+12. Make sure that the version string and package string match: `build/systemctl --version`
-13. Make sure that the version string and package string match: `build/systemctl --version`
+13. [FINAL] Close the github milestone and open a new one (https://github.com/systemd/systemd/milestones)
-14. [FINAL] Close the github milestone and open a new one (https://github.com/systemd/systemd/milestones)
+14. "Draft" a new release on github (https://github.com/systemd/systemd/releases/new), mark "This is a pre-release" if appropriate.
-15. "Draft" a new release on github (https://github.com/systemd/systemd/releases/new), mark "This is a pre-release" if appropriate.
+15. Check that announcement to systemd-devel, with a copy&paste from NEWS, was sent. This should happen automatically.
-16. Check that announcement to systemd-devel, with a copy&paste from NEWS, was sent. This should happen automatically.
+16. Update IRC topic (`/msg chanserv TOPIC #systemd Version NNN released | Online resources https://systemd.io/`)
-17. Update IRC topic (`/msg chanserv TOPIC #systemd Version NNN released | Online resources https://systemd.io/`)
+17. [FINAL] Create an empty -stable branch: `git push systemd origin/main:refs/heads/v${version}-stable`.
-18. [FINAL] Create an empty -stable branch: `git push systemd origin/main:refs/heads/v${version}-stable`.
+18. [FINAL] Build and upload the documentation (on the -stable branch): `ninja -C build doc-sync`
-19. [FINAL] Build and upload the documentation (on the -stable branch): `ninja -C build doc-sync`
 20. [FINAL] Change the Github Pages branch to the newly created branch (https://github.com/systemd/systemd/settings/pages) and set the 'Custom domain' to 'systemd.io'
-21. [FINAL] Update version number in `meson.version` to the devel version of the next release (e.g. from `256` to `257~devel`)
+21. [FINAL] Update version number in `meson.version` to the devel version of the next release (e.g. from `v256` to `v257~devel`)
 
 # Steps to a Successful Stable Release
 

docs/TPM2_PCR_MEASUREMENTS.md

@@ -41,7 +41,7 @@ used for new, additional measurements.
 
 ## PCR Measurements Made by `systemd-boot` (UEFI)
 
-### PCS 5, `EV_EVENT_TAG`, `loader.conf`
+### PCS 5, `EV_EVENT_TAG`, "loader.conf"
 
 The content of `systemd-boot`'s configuration file, `loader/loader.conf`, is
 measured as a tagged event.
@@ -52,7 +52,7 @@ measured as a tagged event.
 
 → **Measured hash** covers the content of `loader.conf` as it is read from the ESP.
 
-### PCR 12, `EV_IPL`, kernel command line
+### PCR 12, `EV_IPL`, "Kernel Command Line"
 
 If the kernel command line was specified explicitly (by the user or in a Boot
 Loader Specification Type #1 file), the kernel command line passed to the
@@ -70,7 +70,7 @@ trailing NUL bytes).
 
 ## PCR Measurements Made by `systemd-stub` (UEFI)
 
-### PCR 11, `EV_IPL`, PE section name
+### PCR 11, `EV_IPL`, "PE Section Name"
 
 A measurement is made for each PE section of the UKI that is defined by the
 [UKI
@@ -87,7 +87,7 @@ both types of records appear interleaved in the event log.
 
 → **Measured hash** covers the PE section name in ASCII (*including* a trailing NUL byte!).
 
-### PCR 11, `EV_IPL`, PE section data
+### PCR 11, `EV_IPL`, "PE Section Data"
 
 Happens once for each UKI-defined PE section of the UKI, in the canonical UKI
 PE section order, as per the UKI specification, see above.
@@ -96,7 +96,7 @@ PE section order, as per the UKI specification, see above.
 
 → **Measured hash** covers the (binary) PE section contents.
 
-### PCR 12, `EV_IPL`, kernel command line
+### PCR 12, `EV_IPL`, "Kernel Command Line"
 
 Might happen up to three times, for kernel command lines from:
 
@@ -110,37 +110,37 @@ UTF-16.
 → **Measured hash** covers the literal kernel command line in UTF-16 (without any
 trailing NUL bytes).
 
-### PCR 12, `EV_EVENT_TAG`, DeviceTrees
+### PCR 12, `EV_EVENT_TAG`, "Devicetrees"
 
-DeviceTree addons are measured individually as a tagged event.
+Devicetree addons are measured individually as a tagged event.
 
 → **Event Tag** `0x6c46f751`
 
-→ **Description** is the addon filename.
+→ **Description** the addon filename.
 
-→ **Measured hash** covers the content of the DeviceTree.
+→ **Measured hash** covers the content of the Devicetree.
 
-### PCR 12, `EV_EVENT_TAG`, initrd addons
+### PCR 12, `EV_EVENT_TAG`, "Initrd addons"
 
 Initrd addons are measured individually as a tagged event.
 
 → **Event Tag** `0x49dffe0f`
 
-→ **Description** is the addon filename.
+→ **Description** the addon filename.
 
 → **Measured hash** covers the contents of the initrd.
 
-### PCR 12, `EV_EVENT_TAG`, ucode addons
+### PCR 12, `EV_EVENT_TAG`, "Ucode addons"
 
 Ucode addons are measured individually as a tagged event.
 
 → **Event Tag** `0xdac08e1a`
 
-→ **Description** is the addon filename.
+→ **Description** the addon filename.
 
 → **Measured hash** covers the contents of the ucode initrd.
 
-### PCR 12, `EV_IPL`, per-uki credentials initrd
+### PCR 12, `EV_IPL`, "Per-UKI Credentials initrd"
 
 → **Description** in the event log record is the constant string "Credentials
 initrd" in UTF-16.
@@ -148,7 +148,7 @@ initrd" in UTF-16.
 → **Measured hash** covers the per-UKI credentials cpio archive (which is generated
  on-the-fly by `systemd-stub`).
 
-### PCR 12, `EV_IPL`, global credentials initrd
+### PCR 12, `EV_IPL`, "Global Credentials initrd"
 
 → **Description** in the event log record is the constant string "Global
 credentials initrd" in UTF-16.
@@ -156,7 +156,7 @@ credentials initrd" in UTF-16.
 → **Measured hash** covers the global credentials cpio archive (which is generated
 on-the-fly by `systemd-stub`).
 
-### PCR 13, `EV_IPL`, sysext initrd
+### PCR 13, `EV_IPL`, "sysext initrd"
 
 → **Description** in the event log record is the constant string "System extension
 initrd" in UTF-16.
@@ -166,7 +166,7 @@ on-the-fly by `systemd-stub`).
 
 ## PCR Measurements Made by `systemd-pcrextend` (Userspace)
 
-### PCR 11, boot phases
+### PCR 11, "Boot Phases"
 
 The `systemd-pcrphase.service`, `systemd-pcrphase-initrd.service`,
 `systemd-pcrphase-sysinit.service` services will measure the boot phase reached
@@ -178,7 +178,7 @@ choose to define additional/different phases.)
 → **Measured hash** covers the phase string (in UTF-8, without trailing NUL
 bytes).
 
-### PCR 15, machine ID
+### PCR 15, "Machine ID"
 
 The `systemd-pcrmachine.service` service will measure the machine ID (as read
 from `/etc/machine-id`) during boot.
@@ -187,7 +187,7 @@ from `/etc/machine-id`) during boot.
 formatted in hexadecimal lowercase characters (in UTF-8, without trailing NUL
 bytes).
 
-### PCR 15, file system
+### PCR 15, "File System"
 
 The `systemd-pcrfs-root.service` and `systemd-pcrfs@.service` services will
 measure a string identifying a specific file system, typically covering the
@@ -200,7 +200,7 @@ without trailing NUL bytes).
 
 ## PCR Measurements Made by `systemd-cryptsetup` (Userspace)
 
-### PCR 15, volume key
+### PCR 15, "Volume Key"
 
 The `systemd-cryptsetup@.service` service will measure a key derived from the
 LUKS volume key of a specific encrypted volume, typically covering the backing

docs/USER_RECORD.md

@@ -597,17 +597,6 @@ The salt to pass to the FIDO2 device is found in `fido2HmacSalt`.
 The only supported recovery key type at the moment is `modhex64`, for details see the description of `recoveryKey` below.
 An account may have any number of recovery keys defined, and the array should have one entry for each.
 
-`selfModifiableFields` → An array of strings, each corresponding to a field name that can appear
-in the `regular` or `perMachine` sections. The user may be allowed to edit any field in this list
-without authenticating as an administrator. Note that the user will only be allowed to edit fields
-in `perMachine` sections that match the machine the user is performing the edit from.
-
-`selfModifiableBlobs` → Similar to `selfModifiableFields`, but it lists blobs that the user
-is allowed to edit.
-
-`selfModifiablePrivileged` →  Similar to `selfModifiableFields`, but it lists fields in
-the `privileged` section that the user is allowed to edit.
-
 `privileged` → An object, which contains the fields of the `privileged` section
 of the user record, see below.
 
@@ -765,7 +754,7 @@ All other fields that may be used in this section are identical to the equally n
 `autoLogin`, `preferredSessionType`, `preferredSessionLauncher`, `stopDelayUSec`, `killProcesses`,
 `passwordChangeMinUSec`, `passwordChangeMaxUSec`, `passwordChangeWarnUSec`,
 `passwordChangeInactiveUSec`, `passwordChangeNow`, `pkcs11TokenUri`,
-`fido2HmacCredential`, `selfModifiableFields`, `selfModifiableBlobs`, `selfModifiablePrivileged`.
+`fido2HmacCredential`.
 
 ## Fields in the `binding` section
 

hwdb.d/20-acpi-vendor.hwdb

@@ -102,9 +102,6 @@ acpi:DMST*:
 acpi:DNBK*:
  ID_VENDOR_FROM_DATABASE=Dynabook Inc.
 
-acpi:DSHR*:
- ID_VENDOR_FROM_DATABASE=3mdeb
-
 acpi:DSUO*:
  ID_VENDOR_FROM_DATABASE=Shenzhen DSO Microelectronics Co.,Ltd.
 
@@ -192,9 +189,6 @@ acpi:ILIT*:
 acpi:IMPJ*:
  ID_VENDOR_FROM_DATABASE=Impinj
 
-acpi:INIT*:
- ID_VENDOR_FROM_DATABASE=INIT - Innovative Informatikanwendungen GmbH
-
 acpi:INSY*:
  ID_VENDOR_FROM_DATABASE=Insyde Software
 
@@ -315,9 +309,6 @@ acpi:RKCP*:
 acpi:RPIL*:
  ID_VENDOR_FROM_DATABASE=Raspberry Pi
 
-acpi:RSCV*:
- ID_VENDOR_FROM_DATABASE=RISC-V International
-
 acpi:RVOS*:
  ID_VENDOR_FROM_DATABASE=Rivos Inc.
 
@@ -327,9 +318,6 @@ acpi:RZSN*:
 acpi:SECC*:
  ID_VENDOR_FROM_DATABASE=Seiko Epson Corporation
 
-acpi:SGSN*:
- ID_VENDOR_FROM_DATABASE=SigmaSense, LLC
-
 acpi:SHRP*:
  ID_VENDOR_FROM_DATABASE=Sharp Corporation
 
@@ -372,9 +360,6 @@ acpi:VAIO*:
 acpi:VFSI*:
  ID_VENDOR_FROM_DATABASE=Validity Sensors, Inc
 
-acpi:VNTN*:
- ID_VENDOR_FROM_DATABASE=Ventana Micro Systems
-
 acpi:VSHY*:
  ID_VENDOR_FROM_DATABASE=Vishay Intertechnology, Inc.
 
@@ -504,9 +489,6 @@ acpi:ADD*:
 acpi:ADE*:
  ID_VENDOR_FROM_DATABASE=Arithmos, Inc.
 
-acpi:ADG*:
- ID_VENDOR_FROM_DATABASE=Airdrop Gaming LLC
-
 acpi:ADH*:
  ID_VENDOR_FROM_DATABASE=Aerodata Holdings Ltd
 
@@ -1542,9 +1524,6 @@ acpi:CHY*:
 acpi:CIC*:
  ID_VENDOR_FROM_DATABASE=Comm. Intelligence Corporation
 
-acpi:CID*:
- ID_VENDOR_FROM_DATABASE=Indicates an identity defined by CTS/DID Standards other than EDID
-
 acpi:CIE*:
  ID_VENDOR_FROM_DATABASE=Convergent Engineering, Inc.
 
@@ -2019,6 +1998,9 @@ acpi:DEL*:
 acpi:DEM*:
  ID_VENDOR_FROM_DATABASE=DemoPad Software Ltd
 
+acpi:DEM*:
+ ID_VENDOR_FROM_DATABASE=DemoPad Software Ltd
+
 acpi:DEN*:
  ID_VENDOR_FROM_DATABASE=Densitron Computers Ltd
 
@@ -2268,9 +2250,6 @@ acpi:DTK*:
 acpi:DTL*:
  ID_VENDOR_FROM_DATABASE=e-Net Inc
 
-acpi:DTM*:
- ID_VENDOR_FROM_DATABASE=Daten Tecnologia
-
 acpi:DTN*:
  ID_VENDOR_FROM_DATABASE=Datang  Telephone Co
 
@@ -4161,9 +4140,6 @@ acpi:LAS*:
 acpi:LAV*:
  ID_VENDOR_FROM_DATABASE=Lava Computer MFG Inc
 
-acpi:LBC*:
- ID_VENDOR_FROM_DATABASE=LABAU Technology Corp.
-
 acpi:LBO*:
  ID_VENDOR_FROM_DATABASE=Lubosoft
 
@@ -6441,9 +6417,6 @@ acpi:SHR*:
 acpi:SHT*:
  ID_VENDOR_FROM_DATABASE=Shin Ho Tech
 
-acpi:SHU*:
- ID_VENDOR_FROM_DATABASE=Shure Inc.
-
 acpi:SIA*:
  ID_VENDOR_FROM_DATABASE=SIEMENS AG
 
@@ -7971,9 +7944,6 @@ acpi:XIT*:
 acpi:XLX*:
  ID_VENDOR_FROM_DATABASE=Xilinx, Inc.
 
-acpi:XMI*:
- ID_VENDOR_FROM_DATABASE=Xiaomi Corporation
-
 acpi:XMM*:
  ID_VENDOR_FROM_DATABASE=C3PO S.L.
 

hwdb.d/20-acpi-vendor.hwdb.patch

@@ -1,5 +1,5 @@
---- 20-acpi-vendor.hwdb.base	2024-11-15 17:16:38.971258201 +0000
+--- 20-acpi-vendor.hwdb.base	2024-06-11 18:28:44.326630949 +0100
-+++ 20-acpi-vendor.hwdb	2024-11-15 17:16:38.979258339 +0000
++++ 20-acpi-vendor.hwdb	2024-06-11 18:28:44.334631113 +0100
 @@ -3,6 +3,8 @@
  # Data imported from:
  #     https://uefi.org/uefi-pnp-export
@@ -19,7 +19,7 @@
  acpi:AMDI*:
   ID_VENDOR_FROM_DATABASE=AMD
  
-@@ -394,6 +393,9 @@
+@@ -379,6 +378,9 @@
  acpi:AAA*:
   ID_VENDOR_FROM_DATABASE=Avolites Ltd
  
@@ -29,7 +29,7 @@
  acpi:AAE*:
   ID_VENDOR_FROM_DATABASE=Anatek Electronics Inc.
  
-@@ -421,6 +423,9 @@
+@@ -406,6 +408,9 @@
  acpi:ABO*:
   ID_VENDOR_FROM_DATABASE=D-Link Systems Inc
  
@@ -39,7 +39,7 @@
  acpi:ABS*:
   ID_VENDOR_FROM_DATABASE=Abaco Systems, Inc.
  
-@@ -466,7 +471,7 @@
+@@ -451,7 +456,7 @@
  acpi:ACO*:
   ID_VENDOR_FROM_DATABASE=Allion Computer Inc.
  
@@ -48,7 +48,7 @@
   ID_VENDOR_FROM_DATABASE=Aspen Tech Inc
  
  acpi:ACR*:
-@@ -745,6 +750,9 @@
+@@ -727,6 +732,9 @@
  acpi:AMT*:
   ID_VENDOR_FROM_DATABASE=AMT International Industry
  
@@ -58,7 +58,7 @@
  acpi:AMX*:
   ID_VENDOR_FROM_DATABASE=AMX LLC
  
-@@ -793,6 +801,9 @@
+@@ -775,6 +783,9 @@
  acpi:AOA*:
   ID_VENDOR_FROM_DATABASE=AOpen Inc.
  
@@ -68,7 +68,7 @@
  acpi:AOE*:
   ID_VENDOR_FROM_DATABASE=Advanced Optics Electronics, Inc.
  
-@@ -802,6 +813,9 @@
+@@ -784,6 +795,9 @@
  acpi:AOT*:
   ID_VENDOR_FROM_DATABASE=Alcatel
  
@@ -78,7 +78,7 @@
  acpi:APC*:
   ID_VENDOR_FROM_DATABASE=American Power Conversion
  
-@@ -983,7 +997,7 @@
+@@ -965,7 +979,7 @@
   ID_VENDOR_FROM_DATABASE=ALPS ALPINE CO., LTD.
  
  acpi:AUO*:
@@ -87,7 +87,7 @@
  
  acpi:AUR*:
   ID_VENDOR_FROM_DATABASE=Aureal Semiconductor
-@@ -1063,6 +1077,9 @@
+@@ -1045,6 +1059,9 @@
  acpi:AXE*:
   ID_VENDOR_FROM_DATABASE=Axell Corporation
  
@@ -97,7 +97,7 @@
  acpi:AXI*:
   ID_VENDOR_FROM_DATABASE=American Magnetics
  
-@@ -1219,6 +1236,9 @@
+@@ -1201,6 +1218,9 @@
  acpi:BML*:
   ID_VENDOR_FROM_DATABASE=BIOMED Lab
  
@@ -107,7 +107,7 @@
  acpi:BMS*:
   ID_VENDOR_FROM_DATABASE=BIOMEDISYS
  
-@@ -1231,6 +1251,9 @@
+@@ -1213,6 +1233,9 @@
  acpi:BNO*:
   ID_VENDOR_FROM_DATABASE=Bang & Olufsen
  
@@ -117,7 +117,7 @@
  acpi:BNS*:
   ID_VENDOR_FROM_DATABASE=Boulder Nonlinear Systems
  
-@@ -1477,6 +1500,9 @@
+@@ -1459,6 +1482,9 @@
  acpi:CHA*:
   ID_VENDOR_FROM_DATABASE=Chase Research PLC
  
@@ -127,7 +127,7 @@
  acpi:CHD*:
   ID_VENDOR_FROM_DATABASE=ChangHong Electric Co.,Ltd
  
-@@ -1642,6 +1668,9 @@
+@@ -1621,6 +1647,9 @@
  acpi:COD*:
   ID_VENDOR_FROM_DATABASE=CODAN Pty. Ltd.
  
@@ -137,7 +137,7 @@
  acpi:COI*:
   ID_VENDOR_FROM_DATABASE=Codec Inc.
  
-@@ -2060,7 +2089,7 @@
+@@ -2042,7 +2071,7 @@
   ID_VENDOR_FROM_DATABASE=Dragon Information Technology
  
  acpi:DJE*:
@@ -146,7 +146,7 @@
  
  acpi:DJP*:
   ID_VENDOR_FROM_DATABASE=Maygay Machines, Ltd
-@@ -2413,6 +2442,9 @@
+@@ -2392,6 +2421,9 @@
  acpi:EIN*:
   ID_VENDOR_FROM_DATABASE=Elegant Invention
  
@@ -156,7 +156,7 @@
  acpi:EKA*:
   ID_VENDOR_FROM_DATABASE=MagTek Inc.
  
-@@ -2683,6 +2715,9 @@
+@@ -2662,6 +2694,9 @@
  acpi:FCG*:
   ID_VENDOR_FROM_DATABASE=First International Computer Ltd
  
@@ -166,7 +166,7 @@
  acpi:FCS*:
   ID_VENDOR_FROM_DATABASE=Focus Enhancements, Inc.
  
-@@ -3059,7 +3094,7 @@
+@@ -3038,7 +3073,7 @@
   ID_VENDOR_FROM_DATABASE=General Standards Corporation
  
  acpi:GSM*:
@@ -175,7 +175,7 @@
  
  acpi:GSN*:
   ID_VENDOR_FROM_DATABASE=Grandstream Networks, Inc.
-@@ -3169,6 +3204,9 @@
+@@ -3148,6 +3183,9 @@
  acpi:HEC*:
   ID_VENDOR_FROM_DATABASE=Hisense Electric Co., Ltd.
  
@@ -185,7 +185,7 @@
  acpi:HEL*:
   ID_VENDOR_FROM_DATABASE=Hitachi Micro Systems Europe Ltd
  
-@@ -3304,6 +3342,9 @@
+@@ -3283,6 +3321,9 @@
  acpi:HSD*:
   ID_VENDOR_FROM_DATABASE=HannStar Display Corp
  
@@ -195,7 +195,7 @@
  acpi:HSM*:
   ID_VENDOR_FROM_DATABASE=AT&T Microelectronics
  
-@@ -3430,6 +3471,9 @@
+@@ -3409,6 +3450,9 @@
  acpi:ICI*:
   ID_VENDOR_FROM_DATABASE=Infotek Communication Inc
  
@@ -205,7 +205,7 @@
  acpi:ICM*:
   ID_VENDOR_FROM_DATABASE=Intracom SA
  
-@@ -3526,6 +3570,9 @@
+@@ -3505,6 +3549,9 @@
  acpi:IKE*:
   ID_VENDOR_FROM_DATABASE=Ikegami Tsushinki Co. Ltd.
  
@@ -215,7 +215,7 @@
  acpi:IKS*:
   ID_VENDOR_FROM_DATABASE=Ikos Systems Inc
  
-@@ -3574,6 +3621,9 @@
+@@ -3553,6 +3600,9 @@
  acpi:IMX*:
   ID_VENDOR_FROM_DATABASE=arpara Technology Co., Ltd.
  
@@ -225,7 +225,7 @@
  acpi:INA*:
   ID_VENDOR_FROM_DATABASE=Inventec Corporation
  
-@@ -4102,6 +4152,9 @@
+@@ -4081,6 +4131,9 @@
  acpi:LAN*:
   ID_VENDOR_FROM_DATABASE=Sodeman Lancom Inc
  
@@ -235,7 +235,7 @@
  acpi:LAS*:
   ID_VENDOR_FROM_DATABASE=LASAT Comm. A/S
  
-@@ -4153,6 +4206,9 @@
+@@ -4129,6 +4182,9 @@
  acpi:LED*:
   ID_VENDOR_FROM_DATABASE=Long Engineering Design Inc
  
@@ -245,7 +245,7 @@
  acpi:LEG*:
   ID_VENDOR_FROM_DATABASE=Legerity, Inc
  
-@@ -4171,6 +4227,9 @@
+@@ -4147,6 +4203,9 @@
  acpi:LGD*:
   ID_VENDOR_FROM_DATABASE=LG Display
  
@@ -255,7 +255,7 @@
  acpi:LGI*:
   ID_VENDOR_FROM_DATABASE=Logitech Inc
  
-@@ -4237,6 +4296,9 @@
+@@ -4213,6 +4272,9 @@
  acpi:LND*:
   ID_VENDOR_FROM_DATABASE=Land Computer Company Ltd
  
@@ -265,7 +265,7 @@
  acpi:LNK*:
   ID_VENDOR_FROM_DATABASE=Link Tech Inc
  
-@@ -4271,7 +4333,7 @@
+@@ -4247,7 +4309,7 @@
   ID_VENDOR_FROM_DATABASE=Design Technology
  
  acpi:LPL*:
@@ -274,7 +274,7 @@
  
  acpi:LSC*:
   ID_VENDOR_FROM_DATABASE=LifeSize Communications
-@@ -4447,6 +4509,9 @@
+@@ -4423,6 +4485,9 @@
  acpi:MCX*:
   ID_VENDOR_FROM_DATABASE=Millson Custom Solutions Inc.
  
@@ -284,7 +284,7 @@
  acpi:MDA*:
   ID_VENDOR_FROM_DATABASE=Media4 Inc
  
-@@ -4693,6 +4758,9 @@
+@@ -4669,6 +4734,9 @@
  acpi:MOM*:
   ID_VENDOR_FROM_DATABASE=Momentum Data Systems
  
@@ -294,7 +294,7 @@
  acpi:MOS*:
   ID_VENDOR_FROM_DATABASE=Moses Corporation
  
-@@ -4933,6 +5001,9 @@
+@@ -4909,6 +4977,9 @@
  acpi:NAL*:
   ID_VENDOR_FROM_DATABASE=Network Alchemy
  
@@ -304,7 +304,7 @@
  acpi:NAT*:
   ID_VENDOR_FROM_DATABASE=NaturalPoint Inc.
  
-@@ -5473,6 +5544,9 @@
+@@ -5449,6 +5520,9 @@
  acpi:PCX*:
   ID_VENDOR_FROM_DATABASE=PC Xperten
  
@@ -314,7 +314,7 @@
  acpi:PDM*:
   ID_VENDOR_FROM_DATABASE=Psion Dacom Plc.
  
-@@ -5536,9 +5610,6 @@
+@@ -5512,9 +5586,6 @@
  acpi:PHE*:
   ID_VENDOR_FROM_DATABASE=Philips Medical Systems Boeblingen GmbH
  
@@ -324,7 +324,7 @@
  acpi:PHL*:
   ID_VENDOR_FROM_DATABASE=Philips Consumer Electronics Company
  
-@@ -5629,9 +5700,6 @@
+@@ -5605,9 +5676,6 @@
  acpi:PNL*:
   ID_VENDOR_FROM_DATABASE=Panelview, Inc.
  
@@ -334,7 +334,7 @@
  acpi:PNR*:
   ID_VENDOR_FROM_DATABASE=Planar Systems, Inc.
  
-@@ -6109,9 +6177,6 @@
+@@ -6085,9 +6153,6 @@
  acpi:RTI*:
   ID_VENDOR_FROM_DATABASE=Rancho Tech Inc
  
@@ -344,7 +344,7 @@
  acpi:RTL*:
   ID_VENDOR_FROM_DATABASE=Realtek Semiconductor Company Ltd
  
-@@ -6286,9 +6351,6 @@
+@@ -6262,9 +6327,6 @@
  acpi:SEE*:
   ID_VENDOR_FROM_DATABASE=SeeColor Corporation
  
@@ -354,7 +354,7 @@
  acpi:SEI*:
   ID_VENDOR_FROM_DATABASE=Seitz & Associates Inc
  
-@@ -6772,6 +6834,9 @@
+@@ -6745,6 +6807,9 @@
  acpi:SVD*:
   ID_VENDOR_FROM_DATABASE=SVD Computer
  
@@ -364,7 +364,7 @@
  acpi:SVI*:
   ID_VENDOR_FROM_DATABASE=Sun Microsystems
  
-@@ -6856,6 +6921,9 @@
+@@ -6829,6 +6894,9 @@
  acpi:SZM*:
   ID_VENDOR_FROM_DATABASE=Shenzhen MTC Co., Ltd
  
@@ -374,7 +374,7 @@
  acpi:TAA*:
   ID_VENDOR_FROM_DATABASE=Tandberg
  
-@@ -6946,6 +7014,9 @@
+@@ -6919,6 +6987,9 @@
  acpi:TDG*:
   ID_VENDOR_FROM_DATABASE=Six15 Technologies
  
@@ -384,7 +384,7 @@
  acpi:TDM*:
   ID_VENDOR_FROM_DATABASE=Tandem Computer Europe Inc
  
-@@ -6988,6 +7059,9 @@
+@@ -6961,6 +7032,9 @@
  acpi:TEV*:
   ID_VENDOR_FROM_DATABASE=Televés, S.A.
  
@@ -394,7 +394,7 @@
  acpi:TEZ*:
   ID_VENDOR_FROM_DATABASE=Tech Source Inc.
  
-@@ -7117,9 +7191,6 @@
+@@ -7090,9 +7164,6 @@
  acpi:TNC*:
   ID_VENDOR_FROM_DATABASE=TNC Industrial Company Ltd
  
@@ -404,7 +404,7 @@
  acpi:TNM*:
   ID_VENDOR_FROM_DATABASE=TECNIMAGEN SA
  
-@@ -7429,14 +7500,14 @@
+@@ -7402,14 +7473,14 @@
  acpi:UNC*:
   ID_VENDOR_FROM_DATABASE=Unisys Corporation
  
@@ -425,7 +425,7 @@
  
  acpi:UNI*:
   ID_VENDOR_FROM_DATABASE=Uniform Industry Corp.
-@@ -7471,6 +7542,9 @@
+@@ -7444,6 +7515,9 @@
  acpi:USA*:
   ID_VENDOR_FROM_DATABASE=Utimaco Safeware AG
  
@@ -435,7 +435,7 @@
  acpi:USD*:
   ID_VENDOR_FROM_DATABASE=U.S. Digital Corporation
  
-@@ -7732,9 +7806,6 @@
+@@ -7705,9 +7779,6 @@
  acpi:WAL*:
   ID_VENDOR_FROM_DATABASE=Wave Access
  
@@ -445,7 +445,7 @@
  acpi:WAV*:
   ID_VENDOR_FROM_DATABASE=Wavephore
  
-@@ -7862,7 +7933,7 @@
+@@ -7835,7 +7906,7 @@
   ID_VENDOR_FROM_DATABASE=WyreStorm Technologies LLC
  
  acpi:WYS*:
@@ -454,7 +454,7 @@
  
  acpi:WYT*:
   ID_VENDOR_FROM_DATABASE=Wooyoung Image & Information Co.,Ltd.
-@@ -7876,9 +7947,6 @@
+@@ -7849,9 +7920,6 @@
  acpi:XDM*:
   ID_VENDOR_FROM_DATABASE=XDM Ltd.
  
@@ -464,7 +464,7 @@
  acpi:XES*:
   ID_VENDOR_FROM_DATABASE=Extreme Engineering Solutions, Inc.
  
-@@ -7912,9 +7980,6 @@
+@@ -7882,9 +7950,6 @@
  acpi:XNT*:
   ID_VENDOR_FROM_DATABASE=XN Technologies, Inc.
  
@@ -474,7 +474,7 @@
  acpi:XQU*:
   ID_VENDOR_FROM_DATABASE=SHANGHAI SVA-DAV ELECTRONICS CO., LTD
  
-@@ -7981,6 +8046,9 @@
+@@ -7951,6 +8016,9 @@
  acpi:ZBX*:
   ID_VENDOR_FROM_DATABASE=Zebax Technologies
  

hwdb.d/20-usb-vendor-model.hwdb

@@ -7142,9 +7142,6 @@ usb:v045Ep02E6*
 usb:v045Ep02EA*
  ID_MODEL_FROM_DATABASE=Xbox One Controller
 
-usb:v045Ep02F3*
- ID_MODEL_FROM_DATABASE=Xbox One Chatpad
-
 usb:v045Ep02FD*
  ID_MODEL_FROM_DATABASE=Xbox One S Controller [Bluetooth]
 
@@ -14922,7 +14919,7 @@ usb:v04BFp1302*
  ID_MODEL_FROM_DATABASE=i3 Gateway
 
 usb:v04BFp1303*
- ID_MODEL_FROM_DATABASE=i3 Micro Module
+ ID_MODEL_FROM_DATABASE=3 Micro Module
 
 usb:v04BFp1304*
  ID_MODEL_FROM_DATABASE=i3 Module
@@ -19244,9 +19241,6 @@ usb:v04F9p2061*
 usb:v04F9p2064*
  ID_MODEL_FROM_DATABASE=PT-P700 P-touch Label Printer RemovableDisk
 
-usb:v04F9p2065*
- ID_MODEL_FROM_DATABASE=PT-P750W P-Touch Label Writer
-
 usb:v04F9p2074*
  ID_MODEL_FROM_DATABASE=PT-D600 P-touch Label Printer
 
@@ -22265,9 +22259,6 @@ usb:v056Ap03EC*
 usb:v056Ap03ED*
  ID_MODEL_FROM_DATABASE=DTC121 [DTC121] touchscreen
 
-usb:v056Ap03F0*
- ID_MODEL_FROM_DATABASE=DTH135 [Movink 13]
-
 usb:v056Ap0400*
  ID_MODEL_FROM_DATABASE=PenPartner 4x5
 
@@ -27098,9 +27089,6 @@ usb:v05E3p0760*
 usb:v05E3p0761*
  ID_MODEL_FROM_DATABASE=Genesys Mass Storage Device
 
-usb:v05E3p0769*
- ID_MODEL_FROM_DATABASE=SPR2801S [Lightspeeur 2801]
-
 usb:v05E3p0780*
  ID_MODEL_FROM_DATABASE=USBFS DFU Adapter
 
@@ -32646,7 +32634,7 @@ usb:v079Bp005F*
  ID_MODEL_FROM_DATABASE=Laser Pro LL [MFPrinter]
 
 usb:v079Bp0062*
- ID_MODEL_FROM_DATABASE=XG-76NA / XG-760N 802.11b/g Wireless adapter
+ ID_MODEL_FROM_DATABASE=XG-76NA 802.11bg
 
 usb:v079Bp0078*
  ID_MODEL_FROM_DATABASE=Laser Pro Monochrome MFP
@@ -33458,9 +33446,6 @@ usb:v07CAp1830*
 usb:v07CAp1871*
  ID_MODEL_FROM_DATABASE=TD310 DVB-T/T2/C dongle
 
-usb:v07CAp2553*
- ID_MODEL_FROM_DATABASE=Live Gamer Ultra 2.1
-
 usb:v07CAp3835*
  ID_MODEL_FROM_DATABASE=AVerTV Volar Green HD (A835B)
 
@@ -33494,9 +33479,6 @@ usb:v07CApB800*
 usb:v07CApC039*
  ID_MODEL_FROM_DATABASE=DVD EZMaker 7
 
-usb:v07CApD553*
- ID_MODEL_FROM_DATABASE=Live Gamer Ultra Pro-RGB
-
 usb:v07CApE880*
  ID_MODEL_FROM_DATABASE=MPEG-2 Capture Device (E880)
 
@@ -36816,7 +36798,7 @@ usb:v0930p0B05*
  ID_MODEL_FROM_DATABASE=PX1220E-1G25 External hard drive
 
 usb:v0930p0B09*
- ID_MODEL_FROM_DATABASE=PX139xE 3.5 External HDD
+ ID_MODEL_FROM_DATABASE=PX1396E-3T01 External hard drive
 
 usb:v0930p0B1A*
  ID_MODEL_FROM_DATABASE=STOR.E ALU 2S
@@ -37217,9 +37199,6 @@ usb:v0944p0117*
 usb:v0944p012F*
  ID_MODEL_FROM_DATABASE=SQ-1
 
-usb:v0944p0154*
- ID_MODEL_FROM_DATABASE=NTS-1 digital kit mkII
-
 usb:v0944p0203*
  ID_MODEL_FROM_DATABASE=KRONOS
 
@@ -38972,9 +38951,6 @@ usb:v0A5Cp5804*
 usb:v0A5Cp5832*
  ID_MODEL_FROM_DATABASE=BCM5880 Secure Applications Processor Smartcard reader
 
-usb:v0A5Cp5843*
- ID_MODEL_FROM_DATABASE=BCM58200 ControlVault 3 (FingerPrint sensor + Contacted SmartCard)
-
 usb:v0A5Cp6300*
  ID_MODEL_FROM_DATABASE=Pirelli Remote NDIS Device
 
@@ -39023,12 +38999,6 @@ usb:v0A5Fp0027*
 usb:v0A5Fp0050*
  ID_MODEL_FROM_DATABASE=P120i / WM120i
 
-usb:v0A5Fp0062*
- ID_MODEL_FROM_DATABASE=GK420d Label Printer
-
-usb:v0A5Fp0065*
- ID_MODEL_FROM_DATABASE=ZM400 Label Printer
-
 usb:v0A5Fp0080*
  ID_MODEL_FROM_DATABASE=GK420d Label Printer
 
@@ -39044,9 +39014,6 @@ usb:v0A5Fp008B*
 usb:v0A5Fp008C*
  ID_MODEL_FROM_DATABASE=ZP 450 Printer
 
-usb:v0A5Fp00A1*
- ID_MODEL_FROM_DATABASE=TLP2824 Plus
-
 usb:v0A5Fp00D1*
  ID_MODEL_FROM_DATABASE=GC420d Label Printer
 
@@ -39077,9 +39044,6 @@ usb:v0A66*
 usb:v0A67*
  ID_VENDOR_FROM_DATABASE=Medeli Electronics Co., Ltd
 
-usb:v0A67pFFFF*
- ID_MODEL_FROM_DATABASE=LCS Audio
-
 usb:v0A68*
  ID_VENDOR_FROM_DATABASE=Comaide Corp.
 
@@ -39714,7 +39678,7 @@ usb:v0AC9p0001*
  ID_MODEL_FROM_DATABASE=BACKPACK  2 Cable
 
 usb:v0AC9p0010*
- ID_MODEL_FROM_DATABASE=BACKPACK CD Drive
+ ID_MODEL_FROM_DATABASE=BACKPACK
 
 usb:v0AC9p0011*
  ID_MODEL_FROM_DATABASE=Backpack 40GB Hard Drive
@@ -39725,9 +39689,6 @@ usb:v0AC9p0110*
 usb:v0AC9p0111*
  ID_MODEL_FROM_DATABASE=BackPack
 
-usb:v0AC9p10FF*
- ID_MODEL_FROM_DATABASE=BACKPACK
-
 usb:v0AC9p1234*
  ID_MODEL_FROM_DATABASE=BACKPACK
 
@@ -39903,7 +39864,7 @@ usb:v0AECp3216*
  ID_MODEL_FROM_DATABASE=HS Card Reader
 
 usb:v0AECp3260*
- ID_MODEL_FROM_DATABASE=ND3260 7-in-1 Card Reader
+ ID_MODEL_FROM_DATABASE=7-in-1 Card Reader
 
 usb:v0AECp5010*
  ID_MODEL_FROM_DATABASE=ND5010 Card Reader
@@ -40124,9 +40085,6 @@ usb:v0B05p17A1*
 usb:v0B05p17AB*
  ID_MODEL_FROM_DATABASE=USB-N13 802.11n Network Adapter (rev. B1) [Realtek RTL8192CU]
 
-usb:v0B05p17B5*
- ID_MODEL_FROM_DATABASE=Broadcom BCM20702A0 Bluetooth
-
 usb:v0B05p17BA*
  ID_MODEL_FROM_DATABASE=N10 Nano 802.11n Network Adapter [Realtek RTL8192CU]
 

hwdb.d/60-autosuspend-fingerprint-reader.hwdb

@@ -83,9 +83,6 @@ usb:v1C7Ap0571*
 
 # Supported by libfprint driver egismoc
 usb:v1C7Ap0582*
-usb:v1C7Ap0583*
-usb:v1C7Ap0586*
-usb:v1C7Ap0587*
 usb:v1C7Ap05A1*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0
@@ -163,7 +160,6 @@ usb:v04F3p0C88*
 usb:v04F3p0C8C*
 usb:v04F3p0C8D*
 usb:v04F3p0C99*
-usb:v04F3p0C9F*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0
 
@@ -185,8 +181,6 @@ usb:v10A5pA305*
 usb:v10A5pDA04*
 usb:v10A5pD805*
 usb:v10A5pD205*
-usb:v10A5p9524*
-usb:v10A5p9544*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0
 
@@ -210,7 +204,6 @@ usb:v27C6p63AC*
 usb:v27C6p63BC*
 usb:v27C6p63CC*
 usb:v27C6p6496*
-usb:v27C6p650A*
 usb:v27C6p650C*
 usb:v27C6p6582*
 usb:v27C6p6584*
@@ -220,8 +213,6 @@ usb:v27C6p6594*
 usb:v27C6p659A*
 usb:v27C6p659C*
 usb:v27C6p6A94*
-usb:v27C6p6512*
-usb:v27C6p689A*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0
 
@@ -232,7 +223,6 @@ usb:v298Dp1010*
 
 # Supported by libfprint driver realtek
 usb:v0BDAp5813*
-usb:v0BDAp5816*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0
 
@@ -242,7 +232,6 @@ usb:v06CBp00DF*
 usb:v06CBp00F9*
 usb:v06CBp00FC*
 usb:v06CBp00C2*
-usb:v06CBp00C4*
 usb:v06CBp0100*
 usb:v06CBp00F0*
 usb:v06CBp0103*
@@ -255,8 +244,6 @@ usb:v06CBp015F*
 usb:v06CBp0104*
 usb:v06CBp0173*
 usb:v06CBp0106*
-usb:v06CBp019D*
-usb:v06CBp00C6*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0
 
@@ -353,6 +340,7 @@ usb:v06CBp00A8*
 usb:v06CBp00B7*
 usb:v06CBp00BB*
 usb:v06CBp00BE*
+usb:v06CBp00C4*
 usb:v06CBp00CB*
 usb:v06CBp00C9*
 usb:v06CBp00D8*

hwdb.d/60-keyboard.hwdb

@@ -1149,11 +1149,6 @@ evdev:name:SIPODEV Lenovo HID Device:dmi:*:svnLENOVO:*:pvrLenovoideapadD330-10IG
 evdev:name:SIPODEV Lenovo HID Device Consumer Control:dmi:*:svnLENOVO:*:pvrLenovoideapadD330-10IGM:*
  KEYBOARD_KEY_c00ff=fn_esc                              # Fn+Tab (FnLk toggle)
 
-# Lenovo Thinkbook 16 G6+ 2024
-evdev:atkbd:dmi:bvn*:bvr*:bd*:svnLENOVO:pn21LG:pvr*
- KEYBOARD_KEY_0a=!9
- KEYBOARD_KEY_0b=!0
-
 ###########################################################
 # LG
 ###########################################################
@@ -1438,11 +1433,6 @@ evdev:input:b0003v046DpC309*
  KEYBOARD_KEY_c01b6=images                              # My Pictures (F11)
  KEYBOARD_KEY_c01b7=audio                               # My Music (F12)
 
-# Logitech MX Keys for Mac
-evdev:input:b0003v046Dp4092*
- KEYBOARD_KEY_70035=102nd                               # '<' key
- KEYBOARD_KEY_70064=grave                               # '^' key
-
 ###########################################################
 # Maxdata
 ###########################################################

hwdb.d/60-sensor.hwdb

@@ -376,12 +376,11 @@ sensor:modalias:acpi:KIOX000A*:dmi:*:svncube:pni1-TF:*
 sensor:modalias:acpi:SMO8500*:dmi:*:svncube:pni7:*
  ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1
 
-# Cube i7 Stylus, i7 Stylus I8L Model, i7 Book (i16) and Mix Plus (i18B/i18D)
+# Cube i7 Stylus, i7 Stylus I8L Model, i7 Book (i16) and Mix Plus (i18B)
 sensor:modalias:acpi:KIOX000A*:dmi:*:svnCube:pni7Stylus:*
 sensor:modalias:acpi:KIOX000A*:dmi:*:svnCube:pni8-L:*
 sensor:modalias:acpi:KIOX000A*:dmi:*:svnCube:pni16:*
 sensor:modalias:acpi:KIOX000A*:dmi:*:svnCube:pni18B:*
-sensor:modalias:acpi:KIOX000A*:dmi:*:svnALLDOCUBE:pni18D:*
  ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, 1, 0; 0, 0, 1
 
 # Cube iWork 10 Flagship
@@ -953,15 +952,6 @@ sensor:modalias:acpi:MXC6655*:dmi:*:svnDefaultstring*:pnP612F:*
 sensor:modalias:acpi:SMO8500*:dmi:*:svnPEAQ:pnPEAQPMMC1010MD99187:*
  ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, 1, 0; 0, 0, 1
 
-#########################################
-# Pine64
-#########################################
-
-# PineTab2
-
-sensor:modalias:of:NaccelerometerT_null_Csilan,sc7a20:*
- ACCEL_MOUNT_MATRIX=0, 0, -1; 1, 0, 0; 0, -1, 0
-
 #########################################
 # Pipo
 #########################################

hwdb.d/70-av-production.hwdb

@@ -71,10 +71,6 @@ usb:v0FD9p006D*
 usb:v0FD9p0080*
  ID_AV_PRODUCTION_CONTROLLER=1
 
-# Stream Deck Neo
-usb:v0FD9p009A*
- ID_AV_PRODUCTION_CONTROLLER=1
-
 # Stream Deck Plus
 usb:v0FD9p0084*
  ID_AV_PRODUCTION_CONTROLLER=1

hwdb.d/acpi_id_registry.csv

@@ -122,9 +122,4 @@ IDEMIA,IDEM,06/26/2018
 "ILI Technology Corp",ILIT,06/20/2023
 "Hangzhou hj-micro Technology Co., Ltd",HJMC,07/31/2023
 "Vervent Audio Group",NAIM,01/04/2024
-"Das U-Boot",UBOO,02/14/2024
+"Das U-Boot",UBOO,02/14/2024
-3mdeb,DSHR,06/13/2024
-"SigmaSense, LLC",SGSN,06/13/2024
-"INIT - Innovative Informatikanwendungen GmbH",INIT,08/28/2024
-"RISC-V International",RSCV,10/23/2023
-"Ventana Micro Systems",VNTN,09/16/2024

hwdb.d/pnp_id_registry.csv

@@ -2540,6 +2540,7 @@ AVARRO,RRO,08/07/2023
 "LUMINO Licht Elektronik GmbH",LLT,11/07/2023
 "Reonel Oy",RNL,01/04/2024
 DemoPad Software Ltd,DEM,01/04/2024
+DemoPad Software Ltd,DEM,01/04/2024
 "TeamViewer Germany GmbH",TMV,01/04/2024
 "Pixio USA",PXO,02/14/2024
 "ELARABY COMPANY FOR ENGINEERING INDUSTRIES",EEI,02/14/2024
@@ -2547,10 +2548,4 @@ DemoPad Software Ltd,DEM,01/04/2024
 "Somnium Space Ltd.",SMN,02/29/2024
 "Raspberry PI",RPL,05/07/2024
 "DEIF A/S",DEF,05/10/2024
-"Moka International limited",MOK,05/23/2024
+"Moka International limited",MOK,05/23/2024
-"Shure Inc.",SHU,06/13/2024
-"Indicates an identity defined by CTS/DID Standards other than EDID",CID,06/28/2024
-"Daten Tecnologia",DTM,06/15/2024
-"LABAU Technology Corp.",LBC,08/05/2024
-"Xiaomi Corporation",XMI,08/05/2024
-"Airdrop Gaming LLC",ADG,09/03/2024

hwdb.d/usb.ids

@@ -9,8 +9,8 @@
 #	The latest version can be obtained from
 #		http://www.linux-usb.org/usb.ids
 #
-# Version: 2024.07.04
+# Version: 2024.03.18
-# Date:    2024-07-04 20:34:02
+# Date:    2024-03-18 20:34:02
 #
 
 # Vendors, devices and interfaces. Please keep sorted.
@@ -2400,7 +2400,6 @@
 	02e3  Xbox One Elite Controller
 	02e6  Xbox Wireless Adapter for Windows
 	02ea  Xbox One Controller
-	02f3  Xbox One Chatpad
 	02fd  Xbox One S Controller [Bluetooth]
 	02fe  Xbox Wireless Adapter for Windows
 	0306  Surface Pro 7 SD Card Reader
@@ -4993,7 +4992,7 @@
 	0a28  INDI AV-IN Device
 	1301  Network Controller
 	1302  i3 Gateway
-	1303  i3 Micro Module
+	1303  3 Micro Module
 	1304  i3 Module
 	1305  i3 Multi Sensing Module
 04c1  U.S. Robotics (3Com)
@@ -6434,7 +6433,6 @@
 	2060  PT-E550W P-touch Label Printer
 	2061  PT-P700 P-touch Label Printer
 	2064  PT-P700 P-touch Label Printer RemovableDisk
-	2065  PT-P750W P-Touch Label Writer
 	2074  PT-D600 P-touch Label Printer
 	209b  QL-800 Label Printer
 	209c  QL-810W Label Printer
@@ -7441,7 +7439,6 @@
 	03dd  PTH-460 [Intuos Pro BT (S)] tablet
 	03ec  DTH134 [DTH134] touchscreen
 	03ed  DTC121 [DTC121] touchscreen
-	03f0  DTH135 [Movink 13]
 	0400  PenPartner 4x5
 	4001  TPC4001
 	4004  TPC4004
@@ -9052,7 +9049,6 @@
 	0752  micros Reader
 	0760  USB 2.0 Card Reader/Writer
 	0761  Genesys Mass Storage Device
-	0769  SPR2801S [Lightspeeur 2801]
 	0780  USBFS DFU Adapter
 	07a0  Pen Flash
 	0880  Wasp (SL-6612)
@@ -10902,7 +10898,7 @@
 	0056  Agfa AP1100 Photo Printer
 	005d  Mobile Mass Storage
 	005f  Laser Pro LL [MFPrinter]
-	0062  XG-76NA / XG-760N 802.11b/g Wireless adapter
+	0062  XG-76NA 802.11bg
 	0078  Laser Pro Monochrome MFP
 079d  Alfadata Computer Corp.
 	0201  GamePort Adapter
@@ -11173,7 +11169,6 @@
 	1228  MPEG-2 Capture Device (M038)
 	1830  AVerTV Volar Video Capture (H830)
 	1871  TD310 DVB-T/T2/C dongle
-	2553  Live Gamer Ultra 2.1
 	3835  AVerTV Volar Green HD (A835B)
 	850a  AverTV Volar Black HD (A850)
 	850b  AverTV Red HD+ (A850T)
@@ -11185,7 +11180,6 @@
 	b300  A300 DVB-T TV receiver
 	b800  MR800 FM Radio
 	c039  DVD EZMaker 7
-	d553  Live Gamer Ultra Pro-RGB
 	e880  MPEG-2 Capture Device (E880)
 	e882  MPEG-2 Capture Device (E882)
 07cb  Kingmax Technology, Inc.
@@ -12292,7 +12286,7 @@
 	0a0b  WLU5053 802.11abgn Wireless Module [Broadcom BCM43236B]
 	0a13  AX88179 Gigabit Ethernet [Toshiba]
 	0b05  PX1220E-1G25 External hard drive
-	0b09  PX139xE 3.5 External HDD
+	0b09  PX1396E-3T01 External hard drive
 	0b1a  STOR.E ALU 2S
 	1300  Wireless Broadband (CDMA EV-DO) SM-Bus Minicard Status Port
 	1301  Wireless Broadband (CDMA EV-DO) Minicard Status Port
@@ -12426,7 +12420,6 @@
 	010f  nanoKONTROL studio controller
 	0117  nanoKONTROL2 MIDI Controller
 	012f  SQ-1
-	0154  NTS-1 digital kit mkII
 	0203  KRONOS
 	0f03  K-Series K61P MIDI studio controller
 0945  Pasco Scientific
@@ -13011,7 +13004,6 @@
 	5803  BCM5880 Secure Applications Processor with secure keyboard
 	5804  BCM5880 Secure Applications Processor with fingerprint swipe sensor
 	5832  BCM5880 Secure Applications Processor Smartcard reader
-	5843  BCM58200 ControlVault 3 (FingerPrint sensor + Contacted SmartCard)
 	6300  Pirelli Remote NDIS Device
 	6410  BCM20703A1 Bluetooth 4.1 + LE
 	bd11  BCM4320 802.11bg Wireless Adapter
@@ -13028,14 +13020,11 @@
 	0009  LP2844 Printer
 	0027  ZTC LP2844-Z-200dpi
 	0050  P120i / WM120i
-	0062  GK420d Label Printer
-	0065  ZM400 Label Printer
 	0080  GK420d Label Printer
 	0081  GK420t Label Printer
 	0084  GX420d Desktop Label Printer
 	008b  HC100 wristbands Printer
 	008c  ZP 450 Printer
-	00a1  TLP2824 Plus
 	00d1  GC420d Label Printer
 	0110  ZD500 Desktop Label Printer
 	011c  ZD410 Direct Thermal Label Printer
@@ -13046,7 +13035,6 @@
 	0010  MPMan MP-F40 MP3 Player
 0a66  ClearCube Technology
 0a67  Medeli Electronics Co., Ltd
-	ffff  LCS Audio
 0a68  Comaide Corp.
 0a69  Chroma ate, Inc.
 0a6b  Green House Co., Ltd
@@ -13258,11 +13246,10 @@
 0ac9  Micro Solutions, Inc.
 	0000  Backpack CD-ReWriter
 	0001  BACKPACK  2 Cable
-	0010  BACKPACK CD Drive
+	0010  BACKPACK
 	0011  Backpack 40GB Hard Drive
 	0110  BACKPACK
 	0111  BackPack
-	10ff  BACKPACK
 	1234  BACKPACK
 0aca  OPEN Networks Ltd
 	1060  OPEN NT1 Plus II
@@ -13321,7 +13308,7 @@
 	3102  MemoryStick Card Reader
 	3201  MMC/SD+MemoryStick Card Reader
 	3216  HS Card Reader
-	3260  ND3260 7-in-1 Card Reader
+	3260  7-in-1 Card Reader
 	5010  ND5010 Card Reader
 0af0  Option
 	5000  UMTS Card
@@ -13395,7 +13382,6 @@
 	17a0  Xonar U3 sound card
 	17a1  Eee Note EA800 (mass storage mode)
 	17ab  USB-N13 802.11n Network Adapter (rev. B1) [Realtek RTL8192CU]
-	17b5  Broadcom BCM20702A0 Bluetooth
 	17ba  N10 Nano 802.11n Network Adapter [Realtek RTL8192CU]
 	17c2  ROG Spitfire
 	17c7  WL-330NUL

man/bootctl.xml

@@ -526,35 +526,6 @@
         <xi:include href="version-info.xml" xpointer="v253"/></listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><option>--secure-boot-auto-enroll=yes|no</option></term>
-        <term><option>--private-key=<replaceable>PATH/URI</replaceable></option></term>
-        <term><option>--private-key-source=<replaceable>TYPE</replaceable>[:<replaceable>NAME</replaceable>]</option></term>
-        <term><option>--certificate=<replaceable>PATH</replaceable></option></term>
-        <term><option>--certificate-source=<replaceable>TYPE</replaceable>[:<replaceable>NAME</replaceable>]</option></term>
-
-        <listitem><para>Configure the ESP for secure boot auto-enrollment when invoking the
-        <command>install</command> command. Takes a boolean argument. Disabled by default. Enabling this
-        option will make <command>bootctl</command> populate the ESP with signed <literal>PK</literal>,
-        <literal>KEK</literal> and <literal>db</literal> signature databases, each containing the given
-        certificate in <literal>DER</literal> format as their only entry. These secure boot signature
-        databases will be picked up and enrolled by <command>systemd-boot</command> if secure boot is in
-        setup mode and secure boot auto-enrollment is enabled.</para>
-
-        <para>When specifying this option, a certificate and private key have to be provided as well using
-        the <option>--certificate=</option> and <option>--private-key=</option> options. The
-        <option>--certificate=</option> option takes a path to a PEM encoded X.509 certificate or a URI
-        that's passed to the OpenSSL provider configured with <option>--certificate-source</option> which
-        takes one of <literal>file</literal> or <literal>provider</literal>, with the latter being followed
-        by a specific provider identifier, separated with a colon, e.g. <literal>provider:pkcs11</literal>.
-        The <option>--private-key=</option> option can take a path or a URI that will be passed to the
-        OpenSSL engine or provider, as specified by <option>--private-key-source=</option> as a
-        <literal>type:name</literal> tuple, such as <literal>engine:pkcs11</literal>. The specified OpenSSL
-        signing engine or provider will be used to sign the EFI signature lists.</para>
-
-        <xi:include href="version-info.xml" xpointer="v257"/></listitem>
-      </varlistentry>
-
       <xi:include href="standard-options.xml" xpointer="no-pager"/>
       <xi:include href="standard-options.xml" xpointer="json" />
       <xi:include href="standard-options.xml" xpointer="help"/>

man/busctl.xml

@@ -417,8 +417,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><option>--limit-messages=<replaceable>NUMBER</replaceable></option></term>
+        <term><option>--num-matches=<replaceable>NUMBER</replaceable></option></term>
-        <term><option>-N <replaceable>NUMBER</replaceable></option></term>
 
         <listitem>
           <para>When used with the <command>monitor</command> command, if enabled will make

man/capsule@.service.xml

@@ -106,17 +106,17 @@
 
   <refsect1>
     <title>See Also</title>
-    <para><simplelist type="inline">
+    <para>
-      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <member><citerefentry><refentrytitle>user@.service</refentrytitle><manvolnum>5</manvolnum></citerefentry></member>
+      <citerefentry><refentrytitle>user@.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <member><citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry></member>
+      <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <member><citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry></member>
+      <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <member><citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry></member>
+      <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <member><citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry></member>
+      <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-      <member><citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+      <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <member><citerefentry><refentrytitle>systemd-run</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+      <citerefentry><refentrytitle>systemd-run</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <member><citerefentry><refentrytitle>busctl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+      <citerefentry><refentrytitle>busctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <member><citerefentry project='man-pages'><refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+      <citerefentry project='man-pages'><refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-    </simplelist></para>
+    </para>
   </refsect1>
 </refentry>

man/coredump.conf.xml

@@ -110,14 +110,14 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>EnterNamespace=</varname></term>
+        <term><varname>AccessContainer=</varname></term>
 
         <listitem><para>Controls whether <command>systemd-coredump</command> will attempt to use the mount tree of
-        a process that crashed in PID namespace. Access to the namespace's mount tree might be necessary to generate
+        a process that crashed within a container. Access to the container's filesystem might be necessary to generate
         a fully symbolized backtrace. If set to <literal>yes</literal>, then <command>systemd-coredump</command> will
         obtain the mount tree from corresponding mount namespace and will try to generate the stack trace using the
-        binary and libraries from the mount namespace. Note that the coredump of the namespaced process might
+        binary and libraries from the mount namespace. Note that the coredump of the containerized process might
-        still be saved in <filename>/var/lib/systemd/coredump/</filename> even if <varname>EnterNamespace=</varname>
+        still be saved in <filename>/var/lib/systemd/coredump/</filename> even if <varname>AccessContainer=</varname>
         is set to <literal>no</literal>. Defaults to <literal>no</literal>.</para>
 
         <xi:include href="version-info.xml" xpointer="v257"/>

man/crypttab.xml

@@ -903,7 +903,7 @@
         <term><option>tpm2-pcrlock=</option></term>
 
         <listitem><para>Takes an absolute path to a TPM2 pcrlock policy file, as produced by the
-        <citerefentry><refentrytitle>systemd-pcrlock</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+        <citerefentry><refentrytitle>systemd-pcrlock</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         tool. This permits locking LUKS2 volumes to a local policy of allowed PCR values with
         variants. See
         <citerefentry><refentrytitle>systemd-cryptenroll</refentrytitle><manvolnum>1</manvolnum></citerefentry>
@@ -950,7 +950,7 @@
         for supported formats). Defaults to 30s. Once the specified timeout elapsed authentication via
         password is attempted. Note that this timeout applies to waiting for the security device to show up —
         it does not apply to the PIN prompt for the device (should one be needed) or similar. Pass 0 to turn
-        off the timeout and wait forever.</para>
+        off the time-out and wait forever.</para>
 
         <xi:include href="version-info.xml" xpointer="v250"/></listitem>
       </varlistentry>

man/custom-entities.ent.in

@@ -18,5 +18,5 @@
 <!ENTITY DEFAULT_TIMEOUT "{{DEFAULT_TIMEOUT_SEC}} s">
 <!ENTITY DEFAULT_USER_TIMEOUT "{{DEFAULT_USER_TIMEOUT_SEC}} s">
 <!ENTITY DEFAULT_KEYMAP "{{SYSTEMD_DEFAULT_KEYMAP}}">
-<!ENTITY fedora_latest_version "41">
+<!ENTITY fedora_latest_version "40">
-<!ENTITY fedora_cloud_release "1.4">
+<!ENTITY fedora_cloud_release "1.10">

man/environment.d.xml

@@ -86,7 +86,7 @@
         PATH=/opt/foo/bin:$PATH
         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>
+        </programlisting>
       </example>
     </refsect2>
   </refsect1>

man/hwdb.xml

@@ -145,8 +145,10 @@ PROPERTY_WITH_SPACES=some string</programlisting>
 
   <refsect1>
     <title>See Also</title>
-    <para><simplelist type="inline">
+    <para>
-      <member><citerefentry><refentrytitle>systemd-hwdb</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+      <citerefentry>
-    </simplelist></para>
+        <refentrytitle>systemd-hwdb</refentrytitle><manvolnum>8</manvolnum>
+      </citerefentry>
+    </para>
   </refsect1>
 </refentry>

man/journal-upload.conf.xml

@@ -91,7 +91,7 @@
         configures the time to wait for the connectivity to get restored. If the server is
         not reachable over the network for the configured time, <command>systemd-journal-upload</command>
         exits. Takes a value in seconds (or in other time units if suffixed with "ms", "min", "h", etc).
-        For details, see <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
+        For details, see <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
         </para>
 
         <xi:include href="version-info.xml" xpointer="v249"/></listitem>

man/kernel-command-line.xml

@@ -421,7 +421,7 @@
         <term><varname>rd.systemd.verity=</varname></term>
         <term><varname>systemd.verity_root_data=</varname></term>
         <term><varname>systemd.verity_root_hash=</varname></term>
-        <term><varname>systemd.verity_root_options=</varname></term>
+        <term><varname>systemd.verity.root_options=</varname></term>
         <term><varname>usrhash=</varname></term>
         <term><varname>systemd.verity_usr_data=</varname></term>
         <term><varname>systemd.verity_usr_hash=</varname></term>

man/libsystemd.xml

@@ -35,8 +35,7 @@
 #include <systemd/sd-login.h>
 #include <systemd/sd-messages.h>
 #include <systemd/sd-path.h>
-#include <systemd/sd-varlink.h>
+    </programlisting>
-</programlisting>
 
     <cmdsynopsis>
       <command>pkg-config --cflags --libs libsystemd</command>
@@ -62,9 +61,8 @@
     <citerefentry><refentrytitle>sd-id128</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
     <citerefentry><refentrytitle>sd-journal</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
     <citerefentry><refentrytitle>sd-json</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-    <citerefentry><refentrytitle>sd-login</refentrytitle><manvolnum>3</manvolnum></citerefentry>
     and
-    <citerefentry><refentrytitle>sd-varlink</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+    <citerefentry><refentrytitle>sd-login</refentrytitle><manvolnum>3</manvolnum></citerefentry>
     for information about different parts of the library interface.</para>
   </refsect1>
 
@@ -82,7 +80,7 @@
     <title>See Also</title>
     <para><simplelist type="inline">
       <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>libudev</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>libudev</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
       <member><citerefentry project='die-net'><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
       <member><ulink url="https://systemd.io/PORTABILITY_AND_STABILITY/">Interface Portability and Stability Promise</ulink></member>
     </simplelist></para>

man/loader.conf.xml

@@ -362,7 +362,7 @@ attr=NON_VOLATILE,RUNTIME_ACCESS,BOOTSERVICE_ACCESS,TIME_BASED_AUTHENTICATED_WRI
 sbvarsign --attr "${attr}" --key PK.key --cert PK.pem --output PK.auth PK PK.esl
 sbvarsign --attr "${attr}" --key PK.key --cert PK.pem --output KEK.auth KEK KEK.esl
 sbvarsign --attr "${attr}" --key KEK.key --cert KEK.pem --output db.auth db db.esl
-</programlisting>
+        </programlisting>
 
         <para>This feature is considered dangerous because even if all the required files are signed with the
         keys being loaded, some files necessary for the system to function properly still won't be. This
@@ -409,7 +409,7 @@ sbvarsign --attr "${attr}" --key KEK.key --cert KEK.pem --output db.auth db db.e
 timeout 0
 default 01234567890abcdef1234567890abdf0-*
 editor no
-</programlisting>
+    </programlisting>
 
     <para>The menu will not be shown by default (the menu can still be shown by
     pressing and holding a key during boot). One of the entries with files with a

man/networkctl.xml

@@ -413,23 +413,14 @@ s - Service VLAN, m - Two-port MAC Relay (TPMR)
         <term>
           <command>reload</command>
         </term>
-        <listitem>
+        <listitem><para>Reload <filename>.netdev</filename> and <filename>.network</filename> files.
-          <para>Reload <filename>.netdev</filename> and <filename>.network</filename> files.</para>
+        If a new <filename>.netdev</filename> file is found, then the corresponding netdev is created.
+        Note that even if an existing <filename>.netdev</filename> is modified or removed,
+        <command>systemd-networkd</command> does not update or remove the netdev.
+        If a new, modified or removed <filename>.network</filename> file is found, then all interfaces
+        which match the file are reconfigured.</para>
 
-          <para>If a new or modified <filename>.netdev</filename> file is found, then the corresponding
+        <xi:include href="version-info.xml" xpointer="v244"/></listitem>
-          netdev is created or updated, respectively. Note, if the corresponding interface already exists,
-          then some of new settings may not be applied. E.g., VLAN ID cannot be changed after the interface
-          was created, so changing [VLAN] <varname>Id=</varname> will not take effect if the matching VLAN
-          interface already exists. To apply such settings, the interfaces need to be removed manually before
-          reload. Also note that even if a <filename>.netdev</filename> file is removed,
-          <command>systemd-networkd</command> does not remove the existing netdev corresponding to the file.
-          </para>
-
-          <para>If a new, modified, or removed <filename>.network</filename> file is found, then all
-          interfaces that matched the file are reconfigured.</para>
-
-          <xi:include href="version-info.xml" xpointer="v244"/>
-        </listitem>
       </varlistentry>
 
       <varlistentry>

man/nss-resolve.xml

@@ -175,7 +175,7 @@ netgroup:       nis</programlisting>
       <member><citerefentry><refentrytitle>nss-myhostname</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>nss-mymachines</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
       <member><citerefentry project='man-pages'><refentrytitle>nsswitch.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>systemd.syntax</refentrytitle><manvolnum>7</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd.syntax</refentrytitle><manvolnum>5</manvolnum></citerefentry></member>
     </simplelist></para>
   </refsect1>
 

man/org.freedesktop.LogControl1.xml

@@ -55,7 +55,7 @@ node /org/freedesktop/LogControl1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -89,9 +89,7 @@ node /org/freedesktop/LogControl1 {
       <citerefentry project="man-pages"><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry> call).
       </para>
 
-      <caution><title>Write Access</title><para>The <varname>LogLevel</varname> and
+      <para>Those two properties are writable, so they may be set by sufficiently privileged users.</para>
-      <varname>LogTarget</varname> properties are supposed to be writable. Care should be taken to ensure
-      that only appropriately privileged clients can modify them.</para></caution>
 
       <para><varname>SyslogIdentifier</varname> is a read-only property that shows the "syslog identifier".
       It is a short string that identifies the program that is the source of log messages that is passed to
@@ -129,11 +127,6 @@ node /org/freedesktop/LogControl1 {
       <para>This creates a simple server on the bus. It implements the LogControl1 interface by providing
       the required properties and allowing to set the writable ones. It logs at the configured log level using
       <citerefentry><refentrytitle>sd_journal_print</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para>
-
-      <para>Note that when porting this example to other D-Bus libraries it might be necessary to add manual
-      client privilege checks, as they typically do not default to the restrictive defaults of sd-bus, where
-      unprivileged access to properties is controlled via the <constant>SD_BUS_VTABLE_UNPRIVILEGED</constant>
-      flag that is opt-in rather than opt-out.</para>
     </example>
   </refsect1>
 

man/org.freedesktop.home1.xml

@@ -125,7 +125,7 @@ node /org/freedesktop/home1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -337,7 +337,7 @@ node /org/freedesktop/home1 {
       can be used to further customize the behavior of this method via flags defined as follows:</para>
       <programlisting>
 #define SD_HOMED_UPDATE_OFFLINE (UINT64_C(1) &lt;&lt; 0)
-</programlisting>
+      </programlisting>
       <para>When <constant>SD_HOMED_UPDATE_OFFLINE</constant> (0x01) is set, no attempt is made to update the copies
       of the user record and blob directory that are embedded into the home directory. Changes will be stored, however,
       and may be propagated into the home directory the next time it is reconciled (most likely when the user next logs in).
@@ -495,7 +495,7 @@ node /org/freedesktop/home1/home {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.DBus.ObjectManager { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 

man/org.freedesktop.hostname1.xml

@@ -106,7 +106,7 @@ node /org/freedesktop/hostname1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -259,7 +259,7 @@ node /org/freedesktop/hostname1 {
     are not necessary. Use
     <citerefentry project="man-pages"><refentrytitle>gethostname</refentrytitle><manvolnum>2</manvolnum></citerefentry>,
     <filename>/etc/hostname</filename> (possibly with per-distribution fallbacks), and
-    <citerefentry><refentrytitle>machine-info</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+    <citerefentry><refentrytitle>machine-info</refentrytitle><manvolnum>3</manvolnum></citerefentry>
     for that. For more information on these files and syscalls see the respective man pages.</para>
 
     <para><varname>KernelName</varname>, <varname>KernelRelease</varname>, and
@@ -376,7 +376,7 @@ node /org/freedesktop/hostname1 {
 
     <para>To properly handle name lookups with changing local hostnames without having to edit
     <filename>/etc/hosts</filename>, we recommend using <filename>systemd-hostnamed</filename> in combination
-    with <citerefentry><refentrytitle>nss-myhostname</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+    with <citerefentry><refentrytitle>nss-myhostname</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
     </para>
 
     <para>Here are some recommendations to follow when generating a static (internet) hostname from a pretty
@@ -427,6 +427,8 @@ node /org/freedesktop/hostname1 {
     name.</para>
   </refsect1>
 
+  <xi:include href="org.freedesktop.locale1.xml" xpointer="versioning"/>
+
   <refsect1>
     <title>Examples</title>
 
@@ -436,11 +438,16 @@ node /org/freedesktop/hostname1 {
       <programlisting>$ gdbus introspect --system \
   --dest org.freedesktop.hostname1 \
   --object-path /org/freedesktop/hostname1
-</programlisting>
+      </programlisting>
     </example>
   </refsect1>
 
-  <xi:include href="org.freedesktop.locale1.xml" xpointer="versioning"/>
+  <refsect1>
+    <title>See Also</title>
+
+    <para>David Zeuthen's original Fedora
+    <ulink url="https://fedoraproject.org/wiki/Features/BetterHostname">Feature page about xdg-hostname</ulink></para>
+  </refsect1>
 
   <refsect1>
     <title>History</title>
@@ -455,16 +462,4 @@ node /org/freedesktop/hostname1 {
       <varname>VSockCID</varname> were added in version 256.</para>
     </refsect2>
   </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-
-    <para><simplelist type="inline">
-      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>systemd-hostnamed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>hostnamectl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member>David Zeuthen's original Fedora
-      <ulink url="https://fedoraproject.org/wiki/Features/BetterHostname">Feature page about xdg-hostname</ulink></member>
-    </simplelist></para>
-  </refsect1>
 </refentry>

man/org.freedesktop.import1.xml

@@ -155,7 +155,7 @@ node /org/freedesktop/import1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -362,7 +362,7 @@ node /org/freedesktop/import1/transfer/_1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -439,7 +439,7 @@ node /org/freedesktop/import1/transfer/_1 {
       <programlisting>$ gdbus introspect --system \
   --dest org.freedesktop.import1 \
   --object-path /org/freedesktop/import1
-</programlisting>
+      </programlisting>
     </example>
 
     <example>
@@ -448,12 +448,11 @@ node /org/freedesktop/import1/transfer/_1 {
       <programlisting>$ gdbus introspect --system \
   --dest org.freedesktop.import1 \
   --object-path /org/freedesktop/import1/transfer/_1
-</programlisting>
+      </programlisting>
     </example>
   </refsect1>
 
   <xi:include href="org.freedesktop.locale1.xml" xpointer="versioning"/>
-
   <refsect1>
     <title>History</title>
     <refsect2>
@@ -470,13 +469,4 @@ node /org/freedesktop/import1/transfer/_1 {
     </refsect2>
   </refsect1>
 
-  <refsect1>
-    <title>See Also</title>
-    <para><simplelist type="inline">
-      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>systemd-importd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>importctl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-    </simplelist></para>
-  </refsect1>
-
 </refentry>

man/org.freedesktop.locale1.xml

@@ -63,7 +63,7 @@ node /org/freedesktop/locale1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -175,7 +175,7 @@ node /org/freedesktop/locale1 {
 $ gdbus introspect --system \
   --dest org.freedesktop.locale1 \
   --object-path /org/freedesktop/locale1
-</programlisting>
+      </programlisting>
     </example>
   </refsect1>
 
@@ -185,14 +185,4 @@ $ gdbus introspect --system \
     <para>These D-Bus interfaces follow <ulink url="https://0pointer.de/blog/projects/versioning-dbus.html">
     the usual interface versioning guidelines</ulink>.</para>
   </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-    <para><simplelist type="inline">
-      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>systemd-localed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>localectl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-    </simplelist></para>
-  </refsect1>
-
 </refentry>

man/org.freedesktop.login1.xml

@@ -216,7 +216,6 @@ node /org/freedesktop/login1 {
       readonly t IdleSinceHint = ...;
       readonly t IdleSinceHintMonotonic = ...;
       readonly s BlockInhibited = '...';
-      readonly s BlockWeakInhibited = '...';
       readonly s DelayInhibited = '...';
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly t InhibitDelayMaxUSec = ...;
@@ -289,7 +288,7 @@ node /org/freedesktop/login1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--property SleepOperation is not documented!-->
 
@@ -489,8 +488,6 @@ node /org/freedesktop/login1 {
 
     <variablelist class="dbus-property" generated="True" extra-ref="BlockInhibited"/>
 
-    <variablelist class="dbus-property" generated="True" extra-ref="BlockWeakInhibited"/>
-
     <variablelist class="dbus-property" generated="True" extra-ref="DelayInhibited"/>
 
     <variablelist class="dbus-property" generated="True" extra-ref="InhibitDelayMaxUSec"/>
@@ -673,20 +670,18 @@ node /org/freedesktop/login1 {
 #define SD_LOGIND_SOFT_REBOOT                    (UINT64_C(1) &lt;&lt; 2)
 #define SD_LOGIND_SOFT_REBOOT_IF_NEXTROOT_SET_UP (UINT64_C(1) &lt;&lt; 3)
 #define SD_LOGIND_SKIP_INHIBITORS                (UINT64_C(1) &lt;&lt; 4)
-</programlisting>
+      </programlisting>
       <para>When the <varname>flags</varname> is 0 then these methods behave just like the versions without
-      flags. Since systemd version 257 active inhibitors are honoured by default for privileged users too.
+      flags. Since systemd version 256 <constant>SD_LOGIND_ROOT_CHECK_INHIBITORS</constant> (0x01) is deprecated,
-      <constant>SD_LOGIND_ROOT_CHECK_INHIBITORS</constant> (0x01) now only applies to weak inhibitors, to
+      and active inhibitors are always honoured by default for privileged users too, and a new flag
-      request that they honoured for privileged users too, since they ignore them by default. A new flag
+      <constant>SD_LOGIND_SKIP_INHIBITORS</constant> (0x04) can be specified to bypass inhibitors. When
-      <constant>SD_LOGIND_SKIP_INHIBITORS</constant> (0x04) can be specified to bypass all types of
+      <constant>SD_LOGIND_KEXEC_REBOOT</constant> (0x02) is set, then <function>RebootWithFlags()</function>
-      inhibitors. When <constant>SD_LOGIND_KEXEC_REBOOT</constant> (0x02) is set, then
+      performs a kexec reboot if kexec kernel is loaded. When <constant>SD_LOGIND_SOFT_REBOOT</constant>
-      <function>RebootWithFlags()</function> performs a kexec reboot if kexec kernel is loaded. When
+      (0x04) is set, or <constant>SD_LOGIND_SOFT_REBOOT_IF_NEXTROOT_SET_UP</constant> (0x08) is set and a
-      <constant>SD_LOGIND_SOFT_REBOOT</constant> (0x04) is set, or
+      new root file system has been set up on <literal>/run/nextroot/</literal>, then
-      <constant>SD_LOGIND_SOFT_REBOOT_IF_NEXTROOT_SET_UP</constant> (0x08) is set and a new root file system
+      <function>RebootWithFlags()</function> performs a userspace reboot only.
-      has been set up on <literal>/run/nextroot/</literal>, then <function>RebootWithFlags()</function>
+      <constant>SD_LOGIND_SOFT_REBOOT_IF_NEXTROOT_SET_UP</constant> and
-      performs a userspace reboot only. <constant>SD_LOGIND_SOFT_REBOOT_IF_NEXTROOT_SET_UP</constant> and
+      <constant>SD_LOGIND_KEXEC_REBOOT</constant> can be combined, with soft-reboot having precedence.</para>
-      <constant>SD_LOGIND_KEXEC_REBOOT</constant> can be combined, with soft-reboot having precedence.
-      </para>
 
       <para><function>SetRebootParameter()</function> sets a parameter for a subsequent reboot operation.
       See the description of <command>reboot</command> in
@@ -743,10 +738,11 @@ node /org/freedesktop/login1 {
       should be a short human readable string identifying the reason why the lock is taken. Finally,
       <varname>mode</varname> is either <literal>block</literal> or <literal>delay</literal> which encodes
       whether the inhibit shall be consider mandatory or whether it should just delay the operation to a
-      certain maximum time, while the <literal>block-weak</literal> and variants will create an inhibitor
+      certain maximum time, while the <literal>block-weak</literal> and <literal>delay-weak</literal>
-      that is automatically ignored in some circumstances. The method returns a file descriptor. The lock is
+      variants will create an inhibitor that is automatically ignored in some circumstances. The method
-      released the moment this file descriptor and all its duplicates are closed. For more information on
+      returns a file descriptor. The lock is released the moment this file descriptor and all its duplicates
-      the inhibition logic see <ulink url="https://systemd.io/INHIBITOR_LOCKS">Inhibitor Locks</ulink>.
+      are closed. For more information on the inhibition logic see
+      <ulink url="https://systemd.io/INHIBITOR_LOCKS">Inhibitor Locks</ulink>.
       </para>
     </refsect2>
 
@@ -808,10 +804,9 @@ node /org/freedesktop/login1 {
       timestamps of the last change of the idle hint boolean, in <constant>CLOCK_REALTIME</constant> and
       <constant>CLOCK_MONOTONIC</constant> timestamps, respectively, in microseconds since the epoch.</para>
 
-      <para>The <varname>BlockInhibited</varname>, <varname>BlockWeakInhibited</varname>, and
+      <para>The <varname>BlockInhibited</varname> and <varname>DelayInhibited</varname> properties encode
-      <varname>DelayInhibited</varname> properties encode the currently active locks of the respective
+      the currently active locks of the respective modes. They are colon separated lists of
-      modes. They are colon separated lists of <literal>shutdown</literal>, <literal>sleep</literal>, and
+      <literal>shutdown</literal>, <literal>sleep</literal>, and <literal>idle</literal> (see above).</para>
-      <literal>idle</literal> (see above).</para>
 
       <para><varname>NCurrentSessions</varname> and <varname>NCurrentInhibitors</varname> contain the number
       of currently registered sessions and inhibitors.</para>
@@ -945,7 +940,7 @@ node /org/freedesktop/login1/seat/seat0 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -1065,7 +1060,7 @@ node /org/freedesktop/login1/user/_1000 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -1250,17 +1245,13 @@ node /org/freedesktop/login1/session/1 {
       readonly b IdleHint = ...;
       readonly t IdleSinceHint = ...;
       readonly t IdleSinceHintMonotonic = ...;
-      @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
-      readonly b CanIdle = ...;
-      @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
-      readonly b CanLock = ...;
       readonly b LockedHint = ...;
   };
   interface org.freedesktop.DBus.Peer { ... };
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -1358,10 +1349,6 @@ node /org/freedesktop/login1/session/1 {
 
     <variablelist class="dbus-property" generated="True" extra-ref="IdleSinceHintMonotonic"/>
 
-    <variablelist class="dbus-property" generated="True" extra-ref="CanIdle"/>
-
-    <variablelist class="dbus-property" generated="True" extra-ref="CanLock"/>
-
     <variablelist class="dbus-property" generated="True" extra-ref="LockedHint"/>
 
     <!--End of Autogenerated section-->
@@ -1551,10 +1538,6 @@ node /org/freedesktop/login1/session/1 {
 
       <para><varname>LockedHint</varname> shows the locked hint state of this session, as set by the
       <function>SetLockedHint()</function> method described above.</para>
-
-      <para><varname>CanIdle</varname> indicates whether the session supports the idle hint
-      concept. Similarly, <varname>CanLock</varname> indicates whether the session supports the screen lock
-      concept.</para>
     </refsect2>
   </refsect1>
 
@@ -1566,12 +1549,12 @@ node /org/freedesktop/login1/session/1 {
 
       <programlisting>$ gdbus introspect --system --dest org.freedesktop.login1 \
   --object-path /org/freedesktop/login1
-</programlisting>
+      </programlisting>
 
       <para>or</para>
 
       <programlisting>$ busctl introspect org.freedesktop.login1 /org/freedesktop/login1
-</programlisting>
+      </programlisting>
     </example>
 
     <example>
@@ -1579,12 +1562,12 @@ node /org/freedesktop/login1/session/1 {
 
       <programlisting>$ gdbus introspect --system --dest org.freedesktop.login1 \
  --object-path /org/freedesktop/login1/seat/seat0
-</programlisting>
+      </programlisting>
 
       <para>or</para>
 
       <programlisting>$ busctl introspect org.freedesktop.login1 /org/freedesktop/login1/seat/seat0
-</programlisting>
+      </programlisting>
 
       <para>Seat <literal>seat0</literal> is the default seat, so it'll be present unless local configuration
       is made to reassign all devices to a different seat. The list of seats and users can be acquired with
@@ -1596,12 +1579,12 @@ node /org/freedesktop/login1/session/1 {
 
       <programlisting>$ gdbus introspect --system --dest org.freedesktop.login1 \
   --object-path /org/freedesktop/login1/user/_1000
-</programlisting>
+      </programlisting>
 
       <para>or</para>
 
       <programlisting>$ busctl introspect org.freedesktop.login1 /org/freedesktop/login1/user/_1000
-</programlisting>
+      </programlisting>
     </example>
 
     <example>
@@ -1609,12 +1592,12 @@ node /org/freedesktop/login1/session/1 {
 
       <programlisting>$ gdbus introspect --system --dest org.freedesktop.login1 \
   --object-path /org/freedesktop/login1/session/45
-</programlisting>
+      </programlisting>
 
       <para>or</para>
 
       <programlisting>$ busctl introspect org.freedesktop.login1 /org/freedesktop/login1/session/45
-</programlisting>
+      </programlisting>
     </example>
   </refsect1>
 
@@ -1636,10 +1619,10 @@ node /org/freedesktop/login1/session/1 {
       <function>CanSleep()</function>,
       <varname>SleepOperation</varname>, and
       <function>ListSessionsEx()</function> were added in version 256.</para>
-      <para><varname>HandleSecureAttentionKey</varname>, <function>SecureAttentionKey()</function>,
+      <para><varname>HandleSecureAttentionKey</varname>,
-      <varname>PreparingForShutdownWithMetadata</varname>, <varname>DesignatedMaintenanceTime</varname>,
+      <function>SecureAttentionKey()</function>,
-      <varname>CanIdle</varname>, <varname>CanLock</varname>,
+      <varname>PreparingForShutdownWithMetadata</varname>, and
-      and <varname>BlockWeakInhibited</varname> were added in version 257.</para>
+      <varname>DesignatedMaintenanceTime</varname> were added in version 257.</para>
     </refsect2>
     <refsect2>
       <title>Session Objects</title>
@@ -1648,13 +1631,4 @@ node /org/freedesktop/login1/session/1 {
       <para><function>SetClass()</function> was added in version 256.</para>
     </refsect2>
   </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-    <para><simplelist type="inline">
-      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>systemd-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>loginctl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-    </simplelist></para>
-  </refsect1>
 </refentry>

man/org.freedesktop.machine1.xml

@@ -183,7 +183,7 @@ node /org/freedesktop/machine1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--method UnregisterMachine is not documented!-->
 
@@ -531,7 +531,7 @@ node /org/freedesktop/machine1/machine/rawhide {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--method GetUIDShift is not documented!-->
 
@@ -687,7 +687,7 @@ node /org/freedesktop/machine1/machine/rawhide {
 $ gdbus introspect --system \
   --dest org.freedesktop.machine1 \
   --object-path /org/freedesktop/machine1
-</programlisting>
+      </programlisting>
     </example>
 
     <example>
@@ -697,7 +697,7 @@ $ gdbus introspect --system \
 $ gdbus introspect --system \
   --dest org.freedesktop.machine1 \
   --object-path /org/freedesktop/machine1/machine/rawhide
-</programlisting>
+      </programlisting>
     </example>
   </refsect1>
 
@@ -719,13 +719,4 @@ $ gdbus introspect --system \
       and <varname>SSHPrivateKeyPath</varname> were added in version 256.</para>
     </refsect2>
   </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-    <para><simplelist type="inline">
-      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>systemd-machined.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-    </simplelist></para>
-  </refsect1>
 </refentry>

man/org.freedesktop.network1.xml

@@ -94,7 +94,7 @@ node /org/freedesktop/network1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--method ListLinks is not documented!-->
 
@@ -270,7 +270,7 @@ node /org/freedesktop/network1/link/_1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--method SetNTP is not documented!-->
 
@@ -407,7 +407,7 @@ node /org/freedesktop/network1/network/_1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--property Description is not documented!-->
 
@@ -464,7 +464,7 @@ node /org/freedesktop/network1/link/_1 {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.network1.Link { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--property Leases is not documented!-->
 
@@ -501,7 +501,7 @@ node /org/freedesktop/network1/link/_1 {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.network1.Link { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--property State is not documented!-->
 
@@ -538,7 +538,7 @@ node /org/freedesktop/network1/link/_1 {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.network1.Link { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--property State is not documented!-->
 
@@ -571,7 +571,7 @@ node /org/freedesktop/network1/link/_1 {
 $ gdbus introspect --system \
   --dest org.freedesktop.network1 \
   --object-path /org/freedesktop/network1
-</programlisting>
+      </programlisting>
     </example>
 
     <example>
@@ -581,7 +581,7 @@ $ gdbus introspect --system \
 $ gdbus introspect --system \
   --dest org.freedesktop.network1 \
   --object-path /org/freedesktop/network1/link/_11
-</programlisting>
+      </programlisting>
     </example>
   </refsect1>
 
@@ -602,13 +602,4 @@ $ gdbus introspect --system \
       <para><varname>NamespaceNSID</varname> was added in version 256.</para>
     </refsect2>
   </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-    <para><simplelist type="inline">
-      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>networkctl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-    </simplelist></para>
-  </refsect1>
 </refentry>

man/org.freedesktop.oom1.xml

@@ -47,7 +47,7 @@ node /org/freedesktop/oom1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--method DumpByFileDescriptor is not documented!-->
 
@@ -103,14 +103,4 @@ node /org/freedesktop/oom1 {
       <para><function>Killed()</function> was added in version 252.</para>
     </refsect2>
   </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-    <para><simplelist type="inline">
-      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>systemd-oomd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>oomctl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-    </simplelist></para>
-  </refsect1>
-
 </refentry>

man/org.freedesktop.portable1.xml

@@ -117,7 +117,7 @@ node /org/freedesktop/portable1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -329,7 +329,7 @@ node /org/freedesktop/portable1 {
 #define SD_SYSTEMD_PORTABLE_RUNTIME            (UINT64_C(1) &lt;&lt; 0)
 #define SD_SYSTEMD_PORTABLE_FORCE_ATTACH       (UINT64_C(1) &lt;&lt; 1)
 #define SD_SYSTEMD_PORTABLE_FORCE_EXTENSION    (UINT64_C(1) &lt;&lt; 2)
-</programlisting>
+      </programlisting>
     </refsect2>
 
     <refsect2>
@@ -428,7 +428,7 @@ node /org/freedesktop/portable1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--method GetOSRelease is not documented!-->
 
@@ -591,13 +591,4 @@ node /org/freedesktop/portable1 {
       <para><function>ReattachWithExtensions()</function> was added in version 254.</para>
     </refsect2>
   </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-    <para><simplelist type="inline">
-      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>systemd-portabled.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>portablectl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-    </simplelist></para>
-  </refsect1>
 </refentry>

man/org.freedesktop.resolve1.xml

@@ -154,7 +154,7 @@ node /org/freedesktop/resolve1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -705,7 +705,7 @@ node /org/freedesktop/resolve1/link/_1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -920,7 +920,7 @@ node /org/freedesktop/resolve1/link/_1 {
 $ gdbus introspect --system \
   --dest org.freedesktop.resolve1 \
   --object-path /org/freedesktop/resolve1
-</programlisting>
+      </programlisting>
     </example>
 
     <example>
@@ -930,18 +930,9 @@ $ gdbus introspect --system \
 $ gdbus introspect --system \
   --dest org.freedesktop.resolve1 \
   --object-path /org/freedesktop/resolve1/link/_11
-</programlisting>
+      </programlisting>
     </example>
   </refsect1>
 
   <xi:include href="org.freedesktop.locale1.xml" xpointer="versioning"/>
-
-  <refsect1>
-    <title>See Also</title>
-    <para><simplelist type="inline">
-      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>systemd-resolved.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>resolvectl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-    </simplelist></para>
-  </refsect1>
 </refentry>

man/org.freedesktop.systemd1.xml

@@ -568,7 +568,7 @@ node /org/freedesktop/systemd1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--method GetUnitByInvocationID is not documented!-->
 
@@ -1532,7 +1532,7 @@ node /org/freedesktop/systemd1 {
 #define SD_SYSTEMD_UNIT_RUNTIME  (UINT64_C(1) &lt;&lt; 0)
 #define SD_SYSTEMD_UNIT_FORCE    (UINT64_C(1) &lt;&lt; 1)
 #define SD_SYSTEMD_UNIT_PORTABLE (UINT64_C(1) &lt;&lt; 2)
-</programlisting>
+      </programlisting>
 
       <para><varname>SD_SYSTEMD_UNIT_RUNTIME</varname> will enable or disable the unit for runtime only,
       <varname>SD_SYSTEMD_UNIT_FORCE</varname> controls whether symlinks pointing to other units shall be
@@ -1553,7 +1553,7 @@ node /org/freedesktop/systemd1 {
 
       <para>Similarly, <function>PresetUnitFiles()</function> enables/disables one or more unit files
       according to the preset policy. See
-      <citerefentry><refentrytitle>systemd.preset</refentrytitle><manvolnum>5</manvolnum></citerefentry> for more
+      <citerefentry><refentrytitle>systemd.preset</refentrytitle><manvolnum>7</manvolnum></citerefentry> for more
       information.</para>
 
       <para>Similarly, <function>MaskUnitFiles()</function> masks unit files and
@@ -2140,7 +2140,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--method EnqueueJob is not documented!-->
 
@@ -3251,8 +3251,6 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly b ProtectControlGroups = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
-      readonly s ProtectControlGroupsEx = '...';
-      @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly b PrivateNetwork = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly b PrivateUsers = ...;
@@ -3263,8 +3261,6 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly b PrivateIPC = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
-      readonly s PrivatePIDs = '...';
-      @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly s ProtectHome = '...';
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly s ProtectSystem = '...';
@@ -3390,7 +3386,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.systemd1.Unit { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--method GetProcesses is not documented!-->
 
@@ -3872,6 +3868,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
 
     <!--property ProtectKernelLogs is not documented!-->
 
+    <!--property ProtectControlGroups is not documented!-->
+
     <!--property PrivateNetwork is not documented!-->
 
     <!--property PrivateUsers is not documented!-->
@@ -4574,8 +4572,6 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
 
     <variablelist class="dbus-property" generated="True" extra-ref="ProtectControlGroups"/>
 
-    <variablelist class="dbus-property" generated="True" extra-ref="ProtectControlGroupsEx"/>
-
     <variablelist class="dbus-property" generated="True" extra-ref="PrivateNetwork"/>
 
     <variablelist class="dbus-property" generated="True" extra-ref="PrivateUsers"/>
@@ -4586,8 +4582,6 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
 
     <variablelist class="dbus-property" generated="True" extra-ref="PrivateIPC"/>
 
-    <variablelist class="dbus-property" generated="True" extra-ref="PrivatePIDs"/>
-
     <variablelist class="dbus-property" generated="True" extra-ref="ProtectHome"/>
 
     <variablelist class="dbus-property" generated="True" extra-ref="ProtectSystem"/>
@@ -4740,7 +4734,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
       <para><varname>TimeoutStartUSec</varname>, <varname>TimeoutStopUSec</varname> and
       <varname>TimeoutAbortUSec</varname> contain the start, stop and abort timeouts, in microseconds. Note
       the slight difference in naming when compared to the matching unit file settings (see
-      <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>):
+      <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>7</manvolnum></citerefentry>):
       these bus properties strictly use microseconds (and thus are suffixed <varname>…USec</varname>) while
       the unit file settings default to a time unit of seconds (and thus are suffixed
       <varname>…Sec</varname>), unless a different unit is explicitly specified. This reflects that fact that
@@ -4851,12 +4845,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
       <varname>CacheDirectorySymlink</varname> and  <varname>LogsDirectorySymlink</varname> respectively
       implement the destination parameter of the unit files settings <varname>RuntimeDirectory</varname>,
       <varname>StateDirectory</varname>, <varname>CacheDirectory</varname> and <varname>LogsDirectory</varname>,
-      which will create a symlink of the given name to the respective directory. The messages take a
+      which will create a symlink of the given name to the respective directory. The messages take an unused
-      <varname>flags</varname> parameter that make the directory read only:</para>
+      <varname>flags</varname> parameter, reserved for future backward-compatible changes.</para>
-
-      <programlisting>
-#define SD_EXEC_DIRECTORY_READ_ONLY            (UINT64_C(1) &lt;&lt; 0)
-</programlisting>
 
       <para><varname>ExtraFileDescriptorNames</varname> contains file descriptor names passed to the service via
       the <varname>ExtraFileDescriptors</varname> property in the <function>StartTransientUnit()</function>
@@ -4868,17 +4858,6 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
       unit file setting <varname>ManagedOOMMemoryPressureDurationSec=</varname> listed in
       <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
       Note the time unit is expressed in <literal>μs</literal>.</para>
-
-      <para><varname>ProtectControlGroupsEx</varname> implement the destination parameter of the
-      unit file setting <varname>ProtectControlGroups=</varname> listed in
-      <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
-      Unlike boolean <varname>ProtectControlGroups</varname>, <varname>ProtectControlGroupsEx</varname>
-      is a string type.</para>
-
-      <para><varname>PrivatePIDs</varname> implements the destination parameter of the
-      unit file setting <varname>PrivatePIDs=</varname> listed in
-      <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
-      Note <varname>PrivatePIDs</varname> is a string type to allow adding more values in the future.</para>
     </refsect2>
   </refsect1>
 
@@ -5436,8 +5415,6 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2esocket {
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly b ProtectControlGroups = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
-      readonly s ProtectControlGroupsEx = '...';
-      @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly b PrivateNetwork = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly b PrivateUsers = ...;
@@ -5448,8 +5425,6 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2esocket {
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly b PrivateIPC = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
-      readonly s PrivatePIDs = '...';
-      @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly s ProtectHome = '...';
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly s ProtectSystem = '...';
@@ -5575,7 +5550,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2esocket {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.systemd1.Unit { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--method GetProcesses is not documented!-->
 
@@ -6069,6 +6044,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2esocket {
 
     <!--property ProtectKernelLogs is not documented!-->
 
+    <!--property ProtectControlGroups is not documented!-->
+
     <!--property PrivateNetwork is not documented!-->
 
     <!--property PrivateUsers is not documented!-->
@@ -6743,8 +6720,6 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2esocket {
 
     <variablelist class="dbus-property" generated="True" extra-ref="ProtectControlGroups"/>
 
-    <variablelist class="dbus-property" generated="True" extra-ref="ProtectControlGroupsEx"/>
-
     <variablelist class="dbus-property" generated="True" extra-ref="PrivateNetwork"/>
 
     <variablelist class="dbus-property" generated="True" extra-ref="PrivateUsers"/>
@@ -6755,8 +6730,6 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2esocket {
 
     <variablelist class="dbus-property" generated="True" extra-ref="PrivateIPC"/>
 
-    <variablelist class="dbus-property" generated="True" extra-ref="PrivatePIDs"/>
-
     <variablelist class="dbus-property" generated="True" extra-ref="ProtectHome"/>
 
     <variablelist class="dbus-property" generated="True" extra-ref="ProtectSystem"/>
@@ -6927,7 +6900,7 @@ node /org/freedesktop/systemd1/unit/basic_2etarget {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.systemd1.Unit { ... };
 };
-</programlisting>
+    </programlisting>
 
     <para>Target units have neither type-specific methods nor properties.</para>
   </refsect1>
@@ -6950,7 +6923,7 @@ node /org/freedesktop/systemd1/unit/dev_2dttyS0_2edevice {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.systemd1.Unit { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -7443,8 +7416,6 @@ node /org/freedesktop/systemd1/unit/home_2emount {
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly b ProtectControlGroups = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
-      readonly s ProtectControlGroupsEx = '...';
-      @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly b PrivateNetwork = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly b PrivateUsers = ...;
@@ -7455,8 +7426,6 @@ node /org/freedesktop/systemd1/unit/home_2emount {
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly b PrivateIPC = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
-      readonly s PrivatePIDs = '...';
-      @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly s ProtectHome = '...';
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly s ProtectSystem = '...';
@@ -7582,7 +7551,7 @@ node /org/freedesktop/systemd1/unit/home_2emount {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.systemd1.Unit { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--method GetProcesses is not documented!-->
 
@@ -8002,6 +7971,8 @@ node /org/freedesktop/systemd1/unit/home_2emount {
 
     <!--property ProtectKernelLogs is not documented!-->
 
+    <!--property ProtectControlGroups is not documented!-->
+
     <!--property PrivateNetwork is not documented!-->
 
     <!--property PrivateUsers is not documented!-->
@@ -8588,8 +8559,6 @@ node /org/freedesktop/systemd1/unit/home_2emount {
 
     <variablelist class="dbus-property" generated="True" extra-ref="ProtectControlGroups"/>
 
-    <variablelist class="dbus-property" generated="True" extra-ref="ProtectControlGroupsEx"/>
-
     <variablelist class="dbus-property" generated="True" extra-ref="PrivateNetwork"/>
 
     <variablelist class="dbus-property" generated="True" extra-ref="PrivateUsers"/>
@@ -8600,8 +8569,6 @@ node /org/freedesktop/systemd1/unit/home_2emount {
 
     <variablelist class="dbus-property" generated="True" extra-ref="PrivateIPC"/>
 
-    <variablelist class="dbus-property" generated="True" extra-ref="PrivatePIDs"/>
-
     <variablelist class="dbus-property" generated="True" extra-ref="ProtectHome"/>
 
     <variablelist class="dbus-property" generated="True" extra-ref="ProtectSystem"/>
@@ -8771,7 +8738,7 @@ node /org/freedesktop/systemd1/unit/proc_2dsys_2dfs_2dbinfmt_5fmisc_2eautomount
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.systemd1.Unit { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--property Where is not documented!-->
 
@@ -8862,7 +8829,7 @@ node /org/freedesktop/systemd1/unit/systemd_2dtmpfiles_2dclean_2etimer {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.systemd1.Unit { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--property OnClockChange is not documented!-->
 
@@ -9417,8 +9384,6 @@ node /org/freedesktop/systemd1/unit/dev_2dsda3_2eswap {
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly b ProtectControlGroups = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
-      readonly s ProtectControlGroupsEx = '...';
-      @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly b PrivateNetwork = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly b PrivateUsers = ...;
@@ -9429,8 +9394,6 @@ node /org/freedesktop/systemd1/unit/dev_2dsda3_2eswap {
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly b PrivateIPC = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
-      readonly s PrivatePIDs = '...';
-      @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly s ProtectHome = '...';
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly s ProtectSystem = '...';
@@ -9556,7 +9519,7 @@ node /org/freedesktop/systemd1/unit/dev_2dsda3_2eswap {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.systemd1.Unit { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--method GetProcesses is not documented!-->
 
@@ -9962,6 +9925,8 @@ node /org/freedesktop/systemd1/unit/dev_2dsda3_2eswap {
 
     <!--property ProtectKernelLogs is not documented!-->
 
+    <!--property ProtectControlGroups is not documented!-->
+
     <!--property PrivateNetwork is not documented!-->
 
     <!--property PrivateUsers is not documented!-->
@@ -10534,8 +10499,6 @@ node /org/freedesktop/systemd1/unit/dev_2dsda3_2eswap {
 
     <variablelist class="dbus-property" generated="True" extra-ref="ProtectControlGroups"/>
 
-    <variablelist class="dbus-property" generated="True" extra-ref="ProtectControlGroupsEx"/>
-
     <variablelist class="dbus-property" generated="True" extra-ref="PrivateNetwork"/>
 
     <variablelist class="dbus-property" generated="True" extra-ref="PrivateUsers"/>
@@ -10546,8 +10509,6 @@ node /org/freedesktop/systemd1/unit/dev_2dsda3_2eswap {
 
     <variablelist class="dbus-property" generated="True" extra-ref="PrivateIPC"/>
 
-    <variablelist class="dbus-property" generated="True" extra-ref="PrivatePIDs"/>
-
     <variablelist class="dbus-property" generated="True" extra-ref="ProtectHome"/>
 
     <variablelist class="dbus-property" generated="True" extra-ref="ProtectSystem"/>
@@ -10721,7 +10682,7 @@ node /org/freedesktop/systemd1/unit/cups_2epath {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.systemd1.Unit { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--property MakeDirectory is not documented!-->
 
@@ -10983,7 +10944,7 @@ node /org/freedesktop/systemd1/unit/system_2eslice {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.systemd1.Unit { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--method GetProcesses is not documented!-->
 
@@ -11615,7 +11576,7 @@ node /org/freedesktop/systemd1/unit/session_2d1_2escope {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.systemd1.Unit { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--method GetProcesses is not documented!-->
 
@@ -12114,7 +12075,7 @@ node /org/freedesktop/systemd1/job/666 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--method GetAfter is not documented!-->
 
@@ -12186,7 +12147,7 @@ node /org/freedesktop/systemd1/job/666 {
 $ gdbus introspect --system \
         --dest org.freedesktop.systemd1 \
         --object-path /org/freedesktop/systemd1
-</programlisting>
+      </programlisting>
     </example>
 
     <example>
@@ -12198,7 +12159,7 @@ $ busctl introspect org.freedesktop.systemd1 \
      /org/freedesktop/systemd1 \
      org.freedesktop.systemd1.Manager \
      GetUnit s systemd-resolved.service | cut -d'"' -f2)
-</programlisting>
+      </programlisting>
     </example>
 
     <example>
@@ -12207,7 +12168,7 @@ $ busctl introspect org.freedesktop.systemd1 \
       <programlisting>
 $ gdbus introspect --system --dest org.freedesktop.systemd1 \
   --object-path /org/freedesktop/systemd1/job/1292
-</programlisting>
+      </programlisting>
     </example>
   </refsect1>
 
@@ -12301,10 +12262,8 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
       <varname>ImportCredentialEx</varname>,
       <varname>ExtraFileDescriptorNames</varname>,
       <varname>ManagedOOMMemoryPressureDurationUSec</varname>,
-      <varname>BindLogSockets</varname>,
+      <varname>BindLogSockets</varname>, and
-      <varname>ProtectControlGroupsEx</varname>,
+      <varname>PrivateUsersEx</varname> were added in version 257.</para>
-      <varname>PrivateUsersEx</varname>, and
-      <varname>PrivatePIDs</varname> were added in version 257.</para>
     </refsect2>
     <refsect2>
       <title>Socket Unit Objects</title>
@@ -12343,11 +12302,8 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
       <varname>PassFileDescriptorsToExec</varname> were added in version 256.</para>
       <para><varname>PrivateTmpEx</varname>,
       <varname>ImportCredentialEx</varname>,
-      <varname>BindLogSockets</varname>,
+      <varname>BindLogSockets</varname>, and
-      <varname>PrivateUsersEx</varname>,
+      <varname>PrivateUsersEx</varname> were added in version 257.</para>
-      <varname>ManagedOOMMemoryPressureDurationUSec</varname>,
-      <varname>ProtectControlGroupsEx</varname>, and
-      <varname>PrivatePIDs</varname> were added in version 257.</para>
     </refsect2>
     <refsect2>
       <title>Mount Unit Objects</title>
@@ -12383,11 +12339,8 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
       <varname>MemoryZSwapWriteback</varname> were added in version 256.</para>
       <para><varname>PrivateTmpEx</varname>,
       <varname>ImportCredentialEx</varname>,
-      <varname>BindLogSockets</varname>,
+      <varname>BindLogSockets</varname>, and
-      <varname>PrivateUsersEx</varname>,
+      <varname>PrivateUsersEx</varname> were added in version 257.</para>
-      <varname>ManagedOOMMemoryPressureDurationUSec</varname>,
-      <varname>ProtectControlGroupsEx</varname>, and
-      <varname>PrivatePIDs</varname> were added in version 257.</para>
     </refsect2>
     <refsect2>
       <title>Swap Unit Objects</title>
@@ -12423,11 +12376,8 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
       <varname>MemoryZSwapWriteback</varname> were added in version 256.</para>
       <para><varname>PrivateTmpEx</varname>,
       <varname>ImportCredentialEx</varname>,
-      <varname>BindLogSockets</varname>,
+      <varname>BindLogSockets</varname>, and
-      <varname>PrivateUsersEx</varname>,
+      <varname>PrivateUsersEx</varname> were added in version 257.</para>
-      <varname>ManagedOOMMemoryPressureDurationUSec</varname>,
-      <varname>ProtectControlGroupsEx</varname>, and
-      <varname>PrivatePIDs</varname> were added in version 257.</para>
     </refsect2>
     <refsect2>
       <title>Slice Unit Objects</title>
@@ -12489,13 +12439,4 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
       <para><varname>DeferReactivation</varname> was added in version 257.</para>
     </refsect2>
   </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-    <para><simplelist type="inline">
-      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-    </simplelist></para>
-  </refsect1>
-
 </refentry>

man/org.freedesktop.sysupdate1.xml

@@ -3,7 +3,7 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" >
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
 
-<refentry id="org.freedesktop.sysupdate1" conditional='ENABLE_SYSUPDATED'
+<refentry id="org.freedesktop.sysupdate1" conditional='ENABLE_SYSUPDATE'
     xmlns:xi="http://www.w3.org/2001/XInclude">
   <refentryinfo>
     <title>org.freedesktop.sysupdate1</title>
@@ -27,9 +27,6 @@
     <citerefentry><refentrytitle>systemd-sysupdated.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
     is a system service that allows unprivileged clients to update the system. This page describes the D-Bus
     interface.</para>
-
-    <para><emphasis>WARNING!</emphasis> This API is currently <emphasis>unstable</emphasis> and is thus subject
-    to breaking changes between versions of systemd.</para>
   </refsect1>
 
   <refsect1>
@@ -53,7 +50,7 @@ node /org/freedesktop/sysupdate1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -125,18 +122,9 @@ node /org/freedesktop/sysupdate1/target/host {
              out s new_version,
              out t job_id,
              out o job_path);
-      Vacuum(out u instances,
+      Vacuum(out u count);
-             out u disabled_transfers);
       GetAppStream(out as appstream);
       GetVersion(out s version);
-      ListFeatures(in  t flags,
-                   out as features);
-      DescribeFeature(in  s feature,
-                      in  t flags,
-                      out s json);
-      SetFeatureEnabled(in  s feature,
-                        in  i enabled,
-                        in  t flags);
     properties:
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly s Class = '...';
@@ -149,7 +137,7 @@ node /org/freedesktop/sysupdate1/target/host {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -171,12 +159,6 @@ node /org/freedesktop/sysupdate1/target/host {
 
     <variablelist class="dbus-method" generated="True" extra-ref="GetVersion()"/>
 
-    <variablelist class="dbus-method" generated="True" extra-ref="ListFeatures()"/>
-
-    <variablelist class="dbus-method" generated="True" extra-ref="DescribeFeature()"/>
-
-    <variablelist class="dbus-method" generated="True" extra-ref="SetFeatureEnabled()"/>
-
     <variablelist class="dbus-property" generated="True" extra-ref="Class"/>
 
     <variablelist class="dbus-property" generated="True" extra-ref="Name"/>
@@ -194,7 +176,7 @@ node /org/freedesktop/sysupdate1/target/host {
 
       <programlisting>
 #define SD_SYSUPDATE_OFFLINE    (UINT64_C(1) &lt;&lt; 0)
-</programlisting>
+      </programlisting>
 
       <para>When <constant>SD_SYSUPDATE_OFFLINE</constant> is set, this method returns only the versions
       installed locally. Otherwise, this method pulls metadata from the network and returns all versions
@@ -249,12 +231,12 @@ node /org/freedesktop/sysupdate1/target/host {
         </varlistentry>
 
         <varlistentry>
-          <term><literal>changelogUrls</literal></term>
+          <term><literal>changelog_urls</literal></term>
-          <listitem><para>A list of strings that contain user-presentable URLs to change logs associated with
+          <listitem><para>A list of strings that contain user-presentable URLs to ChangeLogs associated with
           this version.</para></listitem>
         </varlistentry>
       </variablelist>
-
+      
       <para><function>CheckNew()</function> checks if a newer version is available for this target. This
       method pulls metadata from the network. If a newer version is found, this method returns the
       version number. If no newer version is found, this method returns an empty string. Use
@@ -291,68 +273,6 @@ node /org/freedesktop/sysupdate1/target/host {
       <varname>IMAGE_VERSION</varname> in <filename>/etc/os-release</filename>. If the target has no current
       version, the function will return an empty string.</para>
 
-      <para><function>ListFeatures()</function> returns a list of this target's optional features, by ID.
-      The <varname>flags</varname> argument is added for future extensibility, and must be set to 0.
-      If the target has no optional features, the method returns an empty array.</para>
-
-      <para><function>DescribeFeature()</function> returns all known information about a given optional feature.
-      The <varname>feature</varname> argument is used to pass the ID of the feature to be described.
-      The <varname>flags</varname> argument is added for future extensibility, and must be set to 0.
-      The returned JSON object contains several known keys. More keys may be added in the future.
-      The currently known keys are as follows:</para>
-
-      <variablelist>
-        <varlistentry>
-          <term><literal>name</literal></term>
-          <listitem><para>A string containing the feature's name.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><literal>description</literal></term>
-          <listitem><para>An optional string that contains a user-presentable description that identifies
-          this feature</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><literal>enabled</literal></term>
-          <listitem><para>A boolean indicating whether this feature is enabled.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><literal>documentationUrl</literal></term>
-          <listitem><para>An optional string that contains a user-presentable HTTP/HTTPS URL to documentation
-          about this feature.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><literal>appstreamUrl</literal></term>
-          <listitem><para>An optional string that contains an HTTP/HTTPS URL to an
-          <ulink url="https://wwww.freedesktop.org/software/appstream/docs/chap-CatalogData.html">appstream
-          catalog</ulink> XML file containing metadata about this feature.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><literal>transfers</literal></term>
-          <listitem><para>An optional array of strings that list which transfer definitions belong to this
-          feature.</para></listitem>
-        </varlistentry>
-      </variablelist>
-
-      <para><function>SetFeatureEnabled()</function> writes an appropriate drop-in file to enable or disable
-      the specified optional feature.
-      If <varname>enable</varname> is zero, the feature is disabled. When greater than zero, the feature is
-      enabled. When less than zero, the feature is reset to the distribution's default.
-      The <varname>flags</varname> argument is added for future extensibility, and must be set to 0.
-      The feature does not have to exist; this allows for graceful handling of masked features, and for
-      preemptive decisions to be made about features that are planned to appear in future releases of the OS.
-      The drop-in will have a filename of <literal>50-systemd-sysupdate-enabled.conf</literal>.
-      This method only changes configuration files; to actually apply the changes, clients will need to
-      call <function>Update()</function>.
-      Depending on the exact needs of the client, it can choose to update the system to the latest available
-      version, or it can extend the newest existing installation in-place (by passing in the version returned
-      by <varname>GetVersion()</varname>).
-      For now, this method only works with the <literal>host</literal> target.</para>
-
     </refsect2>
 
     <refsect2>
@@ -407,13 +327,8 @@ node /org/freedesktop/sysupdate1/target/host {
       <interfacename>org.freedesktop.sysupdate1.vacuum</interfacename>. By default, this action requires
       administrator authentication.</para>
 
-      <para><function>SetFeatureEnabled()</function> uses the polkit action
+      <para><function>GetAppStream()</function> and <function>GetVersion()</function> are unauthenticated and
-      <interfacename>org.freedesktop.sysupdate1.manage-features</interfacename>. By default, this action
+      may be called by anybody.</para>
-      requires administrator authentication.</para>
-
-      <para><function>GetAppStream()</function>, <function>GetVersion()</function>,
-      <function>ListFeatures()</function>, and <function>DescribeFeature()</function>
-      are unauthenticated and may be called by anybody.</para>
 
       <para>All methods called on this interface expose additional variables to the polkit rules.
       <literal>class</literal> contains the class of the Target being acted upon, and <literal>name</literal>
@@ -452,7 +367,7 @@ node /org/freedesktop/sysupdate1/job/_1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
@@ -494,9 +409,9 @@ node /org/freedesktop/sysupdate1/job/_1 {
 
       <para>The <varname>Id</varname> property exposes the numeric job ID of the job object.</para>
 
-      <para>The <varname>Type</varname> property exposes the type of operation (one of:
+      <para>The <varname>Type</varname> property exposes the type of operation (one of: <literal>list</literal>,
-      <literal>list</literal>, <literal>describe</literal>, <literal>check-new</literal>,
+      <literal>describe</literal>, <literal>check-new</literal>, <literal>update</literal>, or <literal>vacuum</literal>).
-      <literal>update</literal>, <literal>vacuum</literal>, or <literal>describe-feature</literal>).</para>
+      </para>
 
       <para>The <varname>Offline</varname> property exposes whether the job is permitted to access
       the network or not.</para>
@@ -525,7 +440,7 @@ node /org/freedesktop/sysupdate1/job/_1 {
       <programlisting>$ gdbus introspect --system \
   --dest org.freedesktop.sysupdate1 \
   --object-path /org/freedesktop/sysupdate1
-</programlisting>
+      </programlisting>
     </example>
 
     <example>
@@ -534,7 +449,7 @@ node /org/freedesktop/sysupdate1/job/_1 {
       <programlisting>$ gdbus introspect --system \
   --dest org.freedesktop.sysupdate1 \
   --object-path /org/freedesktop/sysupdate1/target/host
-</programlisting>
+      </programlisting>
     </example>
 
     <example>
@@ -543,7 +458,7 @@ node /org/freedesktop/sysupdate1/job/_1 {
       <programlisting>$ gdbus introspect --system \
   --dest org.freedesktop.sysupdate1 \
   --object-path /org/freedesktop/sysupdate1/job/_1
-</programlisting>
+      </programlisting>
     </example>
   </refsect1>
 
@@ -566,9 +481,6 @@ node /org/freedesktop/sysupdate1/job/_1 {
       <function>Vacuum()</function>,
       <function>GetAppStream()</function>,
       <function>GetVersion()</function>,
-      <function>ListFeatures()</function>,
-      <function>DescribeFeature()</function>,
-      <function>SetFeatureEnabled()</function>,
       <varname>Class</varname>,
       <varname>Name</varname>, and
       <varname>Path</varname> were added in version 257.</para>
@@ -582,13 +494,4 @@ node /org/freedesktop/sysupdate1/job/_1 {
       <varname>Progress</varname> were added in version 257.</para>
     </refsect2>
   </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-    <para><simplelist type="inline">
-      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>systemd-sysupdated.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>updatectl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-    </simplelist></para>
-  </refsect1>
 </refentry>

man/org.freedesktop.timedate1.xml

@@ -66,7 +66,7 @@ node /org/freedesktop/timedate1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -186,7 +186,7 @@ node /org/freedesktop/timedate1 {
 $ gdbus introspect --system \
   --dest org.freedesktop.timedate1 \
   --object-path /org/freedesktop/timedate1
-</programlisting>
+      </programlisting>
     </example>
   </refsect1>
 
@@ -194,11 +194,7 @@ $ gdbus introspect --system \
 
   <refsect1>
     <title>See Also</title>
-    <para><simplelist type="inline">
+
-      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+      <para><ulink url="https://lists.freedesktop.org/archives/systemd-devel/2011-May/002526.html">More information on how the system clock and RTC interact</ulink></para>
-      <member><citerefentry><refentrytitle>systemd-timedate.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>timedatectl.service</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><ulink url="https://lists.freedesktop.org/archives/systemd-devel/2011-May/002526.html">More information on how the system clock and RTC interact</ulink></member>
-    </simplelist></para>
   </refsect1>
 </refentry>

man/org.freedesktop.timesync1.xml

@@ -68,7 +68,7 @@ node /org/freedesktop/timesync1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-</programlisting>
+    </programlisting>
 
     <!--method SetRuntimeNTPServers is not documented!-->
 
@@ -146,18 +146,11 @@ node /org/freedesktop/timesync1 {
 $ gdbus introspect --system \
   --dest org.freedesktop.timesync1 \
   --object-path /org/freedesktop/timesync1
-</programlisting>
+      </programlisting>
     </example>
 
   </refsect1>
 
   <xi:include href="org.freedesktop.locale1.xml" xpointer="versioning"/>
 
-  <refsect1>
-    <title>See Also</title>
-    <para><simplelist type="inline">
-      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>systemd-timesync.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
-    </simplelist></para>
-  </refsect1>
 </refentry>

man/pam_systemd.xml

@@ -409,7 +409,7 @@ pam_set_data(handle, "systemd.tasks_max",  (void *)"50",   cleanup);
 pam_set_data(handle, "systemd.cpu_weight", (void *)"100",  cleanup);
 pam_set_data(handle, "systemd.io_weight",  (void *)"340",  cleanup);
 pam_set_data(handle, "systemd.runtime_max_sec", (void *)"3600", cleanup);
-</programlisting>
+      </programlisting>
     </para>
 
   </refsect1>

man/pam_systemd_loadkey.xml

@@ -119,14 +119,14 @@
 -auth       optional    pam_gnome_keyring.so
 -session    optional    pam_gnome_keyring.so auto_start
 -session    optional    pam_kwallet5.so auto_start
-</programlisting>
+    </programlisting>
 
     <para>And add the following lines to your display manager's systemd service file, so it can access root's keyring:</para>
 
     <programlisting>
 [Service]
 KeyringMode=inherit
-</programlisting>
+    </programlisting>
 
     <para>In this setup, early during the boot process,
     <citerefentry><refentrytitle>systemd-cryptsetup@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>

man/pstore.conf.xml

@@ -91,9 +91,9 @@
 
   <refsect1>
     <title>See Also</title>
-    <para><simplelist type="inline">
+    <para>
-      <member><citerefentry><refentrytitle>systemd-pstore.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+      <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-    </simplelist></para>
+    </para>
   </refsect1>
 
 </refentry>

man/rules/meson.build

@@ -65,7 +65,7 @@ manpages = [
  ['org.freedesktop.portable1', '5', [], 'ENABLE_PORTABLED'],
  ['org.freedesktop.resolve1', '5', [], 'ENABLE_RESOLVE'],
  ['org.freedesktop.systemd1', '5', [], ''],
- ['org.freedesktop.sysupdate1', '5', [], 'ENABLE_SYSUPDATED'],
+ ['org.freedesktop.sysupdate1', '5', [], 'ENABLE_SYSUPDATE'],
  ['org.freedesktop.timedate1', '5', [], 'ENABLE_TIMEDATED'],
  ['org.freedesktop.timesync1', '5', [], 'ENABLE_TIMESYNCD'],
  ['os-release', '5', ['extension-release', 'initrd-release'], ''],
@@ -155,7 +155,6 @@ manpages = [
  ['sd-journal', '3', [], ''],
  ['sd-json', '3', [], ''],
  ['sd-login', '3', [], 'HAVE_PAM'],
- ['sd-varlink', '3', [], ''],
  ['sd_booted', '3', [], ''],
  ['sd_bus_add_match',
   '3',
@@ -992,7 +991,6 @@ manpages = [
    'systemd-journald@.service',
    'systemd-journald@.socket'],
   ''],
- ['systemd-keyutil', '1', [], ''],
  ['systemd-localed.service', '8', ['systemd-localed'], 'ENABLE_LOCALED'],
  ['systemd-logind.service', '8', ['systemd-logind'], 'ENABLE_LOGIND'],
  ['systemd-machine-id-commit.service', '8', [], ''],
@@ -1070,7 +1068,6 @@ manpages = [
   'ENABLE_RFKILL'],
  ['systemd-run-generator', '8', [], ''],
  ['systemd-run', '1', [], ''],
- ['systemd-sbsign', '1', [], ''],
  ['systemd-sleep.conf', '5', ['sleep.conf.d'], ''],
  ['systemd-socket-activate', '1', [], ''],
  ['systemd-socket-proxyd', '8', [], ''],
@@ -1110,7 +1107,7 @@ manpages = [
  ['systemd-sysupdated.service',
   '8',
   ['systemd-sysupdated'],
-  'ENABLE_SYSUPDATED'],
+  'ENABLE_SYSUPDATE'],
  ['systemd-sysusers', '8', ['systemd-sysusers.service'], ''],
  ['systemd-sysv-generator', '8', [], 'HAVE_SYSV_COMPAT'],
  ['systemd-time-wait-sync.service',
@@ -1195,7 +1192,6 @@ manpages = [
  ['systemd.unit', '5', [], ''],
  ['systemd.v', '7', [], ''],
  ['sysupdate.d', '5', [], 'ENABLE_SYSUPDATE'],
- ['sysupdate.features', '5', [], 'ENABLE_SYSUPDATE'],
  ['sysusers.d', '5', [], 'ENABLE_SYSUSERS'],
  ['telinit', '8', [], 'HAVE_SYSV_COMPAT'],
  ['timedatectl', '1', [], 'ENABLE_TIMEDATECTL'],
@@ -1289,7 +1285,7 @@ manpages = [
  ['udev_new', '3', ['udev_ref', 'udev_unref'], ''],
  ['udevadm', '8', [], ''],
  ['ukify', '1', [], 'ENABLE_UKIFY'],
- ['updatectl', '1', [], 'ENABLE_SYSUPDATED'],
+ ['updatectl', '1', [], 'ENABLE_SYSUPDATE'],
  ['user@.service',
   '5',
   ['systemd-user-runtime-dir', 'user-runtime-dir@.service'],

man/run0.xml

@@ -192,35 +192,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><option>--pty</option></term>
-        <term><option>--pipe</option></term>
-
-        <listitem><para>Request allocation of a pseudo TTY for the <command>run0</command> session (in case
-        of <option>--pty</option>), or request passing the caller's STDIO file descriptors directly through
-        (in case of <option>--pipe</option>). If neither switch is specified, or if both switches are
-        specified, the mode will be picked automatically: if standard input, standard output and standard
-        error output are all connected to a TTY then a pseudo TTY is allocated, otherwise the relevant file
-        descriptors are passed through directly.</para>
-
-        <xi:include href="version-info.xml" xpointer="v257"/>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--shell-prompt-prefix=<replaceable>STRING</replaceable></option></term>
-
-        <listitem><para>Set a shell prompt prefix string. This ultimately controls the
-        <varname>$SHELL_PROMPT_PREFIX</varname> environment variable for the invoked program, which is
-        typically imported into the shell prompt. By default – if emojis are supported – a superhero emoji is
-        shown (🦸). This default may also be changed (or turned off) by passing the
-        <varname>$SYSTEMD_RUN_SHELL_PROMPT_PREFIX</varname> environment variable to <varname>run0</varname>,
-        see below. Set to an empty string to disable shell prompt prefixing.</para>
-
-        <xi:include href="version-info.xml" xpointer="v257"/>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><option>--machine=</option></term>
 
@@ -285,30 +256,7 @@
 
         <xi:include href="version-info.xml" xpointer="v256"/></listitem>
       </varlistentry>
-
-      <varlistentry>
-        <term><varname>$SHELL_PROMPT_PREFIX</varname></term>
-        <listitem><para>By default set to the superhero emoji (if supported), but may be overridden with the
-        <varname>$SYSTEMD_RUN_SHELL_PROMPT_PREFIX</varname> environment variable (see below), or the
-        <option>--shell-prompt-prefix=</option> switch (see above).</para>
-
-        <xi:include href="version-info.xml" xpointer="v257"/></listitem>
-      </varlistentry>
     </variablelist>
-
-    <para>The following variables may be passed to <command>run0</command>:</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><varname>$SYSTEMD_RUN_SHELL_PROMPT_PREFIX</varname></term>
-        <listitem><para>If set, overrides the default shell prompt prefix that <command>run0</command> sets
-        for the invoked shell (the superhero emoji). Set to an empty string to disable shell prompt
-        prefixing.</para>
-
-        <xi:include href="version-info.xml" xpointer="v257"/></listitem>
-      </varlistentry>
-    </variablelist>
-
   </refsect1>
 
   <refsect1>

man/sd-bus.xml

@@ -179,9 +179,6 @@
       <member><citerefentry><refentrytitle>sd_bus_track_new</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
     </simplelist>
     for more information about the functions available.</para>
-
-    <para>The <citerefentry><refentrytitle>busctl</refentrytitle><manvolnum>1</manvolnum></citerefentry> tool
-    makes the functionality implemented by sd-bus available from the command line.</para>
   </refsect1>
 
   <xi:include href="libsystemd-pkgconfig.xml" />
@@ -192,10 +189,9 @@
       <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>sd-event</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>busctl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>sd-varlink</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
       <member><citerefentry project='man-pages'><refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
       <member><citerefentry project='man-pages'><refentrytitle>dbus-send</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry project='die-net'><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
     </simplelist></para>
   </refsect1>
+
 </refentry>

man/sd-id128.xml

@@ -289,7 +289,7 @@ int main(int argc, char **argv) {
       <member><citerefentry><refentrytitle>sd_id128_get_machine</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
       <member><citerefentry project='man-pages'><refentrytitle>printf</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>sd-journal</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>sd-journal</refentrytitle><manvolnum>7</manvolnum></citerefentry></member>
       <member><citerefentry project='die-net'><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry></member>
     </simplelist></para>

man/sd-json.xml

@@ -84,8 +84,7 @@
   <refsect1>
     <title>See Also</title>
     <para><simplelist type="inline">
-      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>,
-      <member><citerefentry><refentrytitle>sd-varlink</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
       <member><citerefentry project='die-net'><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
     </simplelist></para>
   </refsect1>

man/sd-varlink.xml

@@ -1,64 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
-
-<refentry id="sd-varlink"
-  xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <refentryinfo>
-    <title>sd-varlink</title>
-    <productname>systemd</productname>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>sd-varlink</refentrytitle>
-    <manvolnum>3</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>sd-varlink</refname>
-    <refpurpose>APIs for Varlink IPC</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <funcsynopsis>
-      <funcsynopsisinfo>#include &lt;systemd/sd-varlink.h&gt;</funcsynopsisinfo>
-    </funcsynopsis>
-
-    <cmdsynopsis>
-      <command>pkg-config --cflags --libs libsystemd</command>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para><filename>sd-varlink.h</filename> is part of
-    <citerefentry><refentrytitle>libsystemd</refentrytitle><manvolnum>3</manvolnum></citerefentry> and
-    provides APIs for implementing Varlink IPC clients and services. See <ulink url="https://varlink.org/"/>
-    for more information about Varlink IPC.</para>
-
-    <para>Varlink IPC uses <ulink url="https://json.org/">JSON</ulink> as marshalling format. The sd-varlink
-    API relies on the
-    <citerefentry><refentrytitle>sd-json</refentrytitle><manvolnum>3</manvolnum></citerefentry> API for JSON
-    serialization, deserialization and manipulation.</para>
-
-    <para>The <citerefentry><refentrytitle>varlinkctl</refentrytitle><manvolnum>1</manvolnum></citerefentry> tool
-    makes the functionality implemented by sd-varlink available from the command line.</para>
-  </refsect1>
-
-  <xi:include href="libsystemd-pkgconfig.xml" />
-
-  <refsect1>
-    <title>See Also</title>
-    <para><simplelist type="inline">
-      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>sd-event</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>sd-json</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>varlinkctl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
-      <member><citerefentry project='die-net'><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-    </simplelist></para>
-  </refsect1>
-</refentry>

man/sd_bus_creds_get_pid.xml

@@ -562,7 +562,7 @@
     <para><simplelist type="inline">
       <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>sd_bus_creds_new_from_pid</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>sd_bus_creds_new_from_pid</refentrytitle><manvolnum>2</manvolnum></citerefentry></member>
       <member><citerefentry project='man-pages'><refentrytitle>fork</refentrytitle><manvolnum>2</manvolnum></citerefentry></member>
       <member><citerefentry project='man-pages'><refentrytitle>execve</refentrytitle><manvolnum>2</manvolnum></citerefentry></member>
       <member><citerefentry project='man-pages'><refentrytitle>credentials</refentrytitle><manvolnum>7</manvolnum></citerefentry></member>

man/sd_bus_get_fd.xml

@@ -66,8 +66,8 @@
     <constant>POLLIN</constant>, <constant>POLLOUT</constant>, … events, or negative on error.
     </para>
 
-    <para><function>sd_bus_get_timeout()</function> returns the <emphasis>absolute</emphasis> timeout in μs,
+    <para><function>sd_bus_get_timeout()</function> returns the <emphasis>absolute</emphasis> time-out in μs,
-    from which the relative timeout to pass to <function>poll()</function> (or a similar call) can be
+    from which the relative time-out to pass to <function>poll()</function> (or a similar call) can be
     derived, when waiting for events on the specified bus connection. The returned timeout may be zero, in
     which case a subsequent I/O polling call should be invoked in non-blocking mode. The returned timeout may
     be <constant>UINT64_MAX</constant> in which case the I/O polling call may block indefinitely, without any

man/sd_bus_message_append.xml

@@ -194,12 +194,12 @@ sd_bus_message_append(m, "ynqiuxtd", y, n, q, i, u, x, t, d);</programlisting>
      <para>Append a structure composed of a string and a D-Bus path:</para>
 
      <programlisting>sd_bus_message_append(m, "(so)", "a string", "/a/path");
-</programlisting>
+    </programlisting>
 
      <para>Append an array of UNIX file descriptors:</para>
 
      <programlisting>sd_bus_message_append(m, "ah", 3, STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO);
-</programlisting>
+    </programlisting>
 
      <para>Append a variant, with the real type "g" (signature),
      and value "sdbusisgood":</para>
@@ -210,7 +210,7 @@ sd_bus_message_append(m, "ynqiuxtd", y, n, q, i, u, x, t, d);</programlisting>
      </para>
 
      <programlisting>sd_bus_message_append(m, "a{is}", 3, 1, "a", 2, "b", 3, NULL);
-</programlisting>
+     </programlisting>
   </refsect1>
 
   <refsect1>

man/sd_bus_message_dump.xml

@@ -83,7 +83,7 @@
                   STRING "AnExplicitProperty";
           };
   };
-</programlisting>
+    </programlisting>
     </para>
   </refsect1>
 

man/sd_bus_message_new_signal.xml

@@ -56,7 +56,7 @@
     parameter. The signal will be sent to path <parameter>path</parameter>, on the interface
     <parameter>interface</parameter>, member <parameter>member</parameter>. When this message is
     sent, no reply is expected. See
-    <citerefentry><refentrytitle>sd_bus_message_new_method_call</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+    <citerefentry><refentrytitle>sd_bus_message_new_method_call</refentrytitle><manvolnum>1</manvolnum></citerefentry>
     for a short description of the meaning of the <parameter>path</parameter>,
     <parameter>interface</parameter>, and <parameter>member</parameter> parameters.
     </para>

man/sd_bus_message_read.xml

@@ -249,7 +249,7 @@ sd_bus_message_read(m, "v", "gt", &amp;s, &amp;v);</programlisting>
 const char *s, *t, *u;
 
 sd_bus_message_read(m, "a{is}", 3, &amp;i, &amp;s, &amp;j, &amp;t, &amp;k, &amp;u);
-</programlisting>
+     </programlisting>
 
      <para>Read a single file descriptor, and duplicate it in order to keep it open after the message is
      freed.</para>

man/sd_bus_message_verify_type.xml

@@ -40,7 +40,7 @@
     current location in the message <parameter>m</parameter> matches the specified
     <parameter>type</parameter> and <parameter>contents</parameter>. If non-zero, parameter
     <parameter>type</parameter> must be one of the types specified in
-    <citerefentry><refentrytitle>sd_bus_message_append</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
+    <citerefentry><refentrytitle>sd_bus_message_append</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
     If non-null, parameter <parameter>contents</parameter> must be a valid sequence of complete
     types. If both <parameter>type</parameter> and <parameter>contents</parameter> are specified
     <parameter>type</parameter> must be a container type.</para>

man/sd_bus_pending_method_calls.xml

@@ -40,7 +40,7 @@
     <para><function>sd_bus_pending_method_calls()</function> returns the number of currently pending outgoing
     method calls, i.e. method calls enqueued with
     <citerefentry><refentrytitle>sd_bus_call_async</refentrytitle><manvolnum>3</manvolnum></citerefentry> for
-    which no reply has been received yet, and which have not reached a timeout yet.</para>
+    which no reply has been received yet, and which have not reached a time-out yet.</para>
 
     <para>The <parameter>bus</parameter> argument may be <constant>NULL</constant>, in which case zero is
     returned.</para>

man/sd_bus_reply_method_error.xml

@@ -156,7 +156,7 @@
       </variablelist>
 
       <para>In addition, any error returned by
-      <citerefentry><refentrytitle>sd_bus_send</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+      <citerefentry><refentrytitle>sd_bus_send</refentrytitle><manvolnum>1</manvolnum></citerefentry>
       may be returned.</para>
     </refsect2>
   </refsect1>

man/sd_bus_reply_method_return.xml

@@ -111,7 +111,7 @@
       </variablelist>
 
       <para>In addition, any error returned by
-      <citerefentry><refentrytitle>sd_bus_send</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+      <citerefentry><refentrytitle>sd_bus_send</refentrytitle><manvolnum>1</manvolnum></citerefentry>
       may be returned.</para>
     </refsect2>
   </refsect1>

man/sd_device_get_syspath.xml

@@ -113,7 +113,7 @@
       <funcprototype>
         <funcdef>int <function>sd_device_get_device_id</function></funcdef>
         <paramdef>sd_device *<parameter>device</parameter></paramdef>
-        <paramdef>const char **<parameter>ret</parameter></paramdef>
+        <paramdef>uint64_t *<parameter>ret</parameter></paramdef>
       </funcprototype>
 
     </funcsynopsis>
@@ -191,7 +191,7 @@
     <literal>+drivers:</literal> followed by its driver subsystem and sysfs name separated with a colon.
     Example: <literal>+drivers:pci:iwlwifi</literal> for a driver device record whose driver subsystem is
     <literal>pci</literal> and sysfs name is <literal>iwlwifi</literal>,
-    When another type of device is specified, this function returns <literal>+</literal> followed by its
+    When an other type of device is specified, this function returns <literal>+</literal> followed by its
     subsystem and sysfs name separated with a colon. Example: <literal>+acpi:ACPI0003:00</literal>,
     <literal>+input:input16</literal>, or <literal>+pci:0000:00:1f.6</literal>.</para>
   </refsect1>
@@ -250,10 +250,9 @@
   <refsect1>
     <title>See Also</title>
 
-    <para><simplelist type="inline">
+    <para>
-      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-      <member><citerefentry><refentrytitle>sd-device</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
+    </para>
-    </simplelist></para>
   </refsect1>
 
 </refentry>

man/sd_event_exit.xml

@@ -83,7 +83,7 @@
     <citerefentry><refentrytitle>sd_event_add_signal</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
     …) has the effect of <function>sd_event_exit()</function> being invoked once the event source triggers,
     with the specified userdata pointer cast to an integer as the exit code parameter. This is useful to
-    automatically terminate an event loop after some condition, such as a timeout or reception of
+    automatically terminate an event loop after some condition, such as a time-out or reception of
     <constant>SIGTERM</constant> or similar. See the documentation for the respective constructor call for
     details.</para>
   </refsect1>

man/sd_event_wait.xml

@@ -262,7 +262,7 @@
              |
              v
           FINISHED
-</programlisting>
+    </programlisting>
   </refsect1>
 
   <refsect1>

man/sd_hwdb_new.xml

@@ -138,7 +138,7 @@
       <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>systemd-udevd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>sd-hwdb</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>systemd-hwdb</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd-hwdb</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
     </simplelist></para>
   </refsect1>
 

man/sd_journal_has_runtime_files.xml

@@ -77,10 +77,9 @@
 
   <refsect1>
     <title>See Also</title>
-    <para><simplelist type="inline">
+    <para>
-      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+      <citerefentry><refentrytitle>sd-journal</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-      <member><citerefentry><refentrytitle>sd-journal</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
+    </para>
-    </simplelist></para>
   </refsect1>
 
 </refentry>

man/sd_notify.xml

@@ -291,35 +291,12 @@
       <varlistentry>
         <term>MAINPID=…</term>
 
-        <listitem><para>Change the main process ID (PID) of the service. This is especially useful in the case
+        <listitem><para>The main process ID (PID) of the service, in case the service manager did not fork
-        where the real main process isn't directly forked off by the service manager.
+        off the process itself. Example: <literal>MAINPID=4711</literal>.</para>
-        Example: <literal>MAINPID=4711</literal>.</para>
 
         <xi:include href="version-info.xml" xpointer="v233"/></listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term>MAINPIDFDID=…</term>
-
-        <listitem><para>The pidfd inode number of the new main process (specified through <varname>MAINPID=</varname>).
-        This information can be acquired through
-        <citerefentry project='man-pages'><refentrytitle>fstat</refentrytitle><manvolnum>2</manvolnum></citerefentry>
-        on the pidfd and is used to identify the process in a race-free fashion. Alternatively,
-        a pidfd can be sent directly to the service manager (see <varname>MAINPIDFD=1</varname> below).</para>
-
-        <xi:include href="version-info.xml" xpointer="v257"/></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>MAINPIDFD=1</term>
-
-        <listitem><para>Similar to <varname>MAINPID=</varname> with <varname>MAINPIDFDID=</varname>, but
-        the process is referenced directly by the pidfd passed to the service manager. This is useful
-        if pidfd id is not supported on the system. Exactly one fd is expected for this notification.</para>
-
-        <xi:include href="version-info.xml" xpointer="v257"/></listitem>
-      </varlistentry>
-
       <varlistentry>
         <term>WATCHDOG=1</term>
 
@@ -499,26 +476,6 @@
     successfully. Specifically, no error is returned when a file descriptor is attempted to be stored using
     <varname>FDSTORE=1</varname> but the service is not actually configured to permit storing of file
     descriptors (see above).</para>
-
-    <refsect2 id='errors'>
-      <title>Errors</title>
-
-      <para>Returned errors may indicate the following problems:</para>
-
-      <variablelist>
-        <varlistentry>
-          <term><constant>-E2BIG</constant></term>
-
-          <listitem><para>More file descriptors passed at once than the system allows. On Linux the number of
-          file descriptors that may be passed across <constant>AF_UNIX</constant> sockets at once is 253, see
-          <citerefentry
-          project='man-pages'><refentrytitle>unix</refentrytitle><manvolnum>7</manvolnum></citerefentry> for
-          details.</para>
-
-          <xi:include href="version-info.xml" xpointer="v257"/></listitem>
-        </varlistentry>
-      </variablelist>
-    </refsect2>
   </refsect1>
 
   <refsect1>
@@ -632,7 +589,7 @@ sd_notifyf(0, "STATUS=Failed to start up: %s\n"
 sd_notify(0, "READY=1");
 /* set timeout to 5 seconds */
 sd_notify_barrier(0, 5 * 1000000);
-</programlisting>
+      </programlisting>
     </example>
   </refsect1>
 

man/sd_path_lookup.xml

@@ -226,11 +226,10 @@
 
   <refsect1>
     <title>See Also</title>
-    <para><simplelist type="inline">
+
-      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+    <para>
-      <member><citerefentry><refentrytitle>sd-path</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
+      <citerefentry><refentrytitle>systemd-path</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-      <member><citerefentry><refentrytitle>systemd-path</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+    </para>
-    </simplelist></para>
   </refsect1>
 
 </refentry>

man/smbios-type-11.xml

@@ -29,7 +29,7 @@
 
     <para>Various OS components process SMBIOS Type 11 vendor strings that a virtual machine manager (VMM)
     may set and a virtual machine (VM) receives. SMBIOS Type 11 vendor strings may play a similar role as
-    <citerefentry><refentrytitle>kernel-command-line</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+    <citerefentry><refentrytitle>kernel-command-line</refentrytitle><manvolnum>1</manvolnum></citerefentry>
     parameters but generally are under control of the VMM rather than the boot loader or UKI.</para>
 
     <para>For details on SMBIOS Type 11 see the <ulink url="https://www.dmtf.org/standards/smbios/">System
@@ -60,7 +60,7 @@
 
         <listitem><para>This allows configuration of additional kernel command line options, and is read by
         the kernel UEFI stub. For details see
-        <citerefentry><refentrytitle>systemd-stub</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
+        <citerefentry><refentrytitle>systemd-stub</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
 
         <xi:include href="version-info.xml" xpointer="v254"/></listitem>
       </varlistentry>
@@ -70,7 +70,7 @@
 
         <listitem><para>This allows configuration of additional kernel command line options for Boot Loader
         Specification Type 1 entries, and is read by <command>systemd-boot</command>. For details see
-        <citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
+        <citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
 
         <xi:include href="version-info.xml" xpointer="v256"/></listitem>
       </varlistentry>

man/systemctl.xml

@@ -192,7 +192,7 @@ NEXT                         LEFT          LAST                         PASSED
 Sun 2017-02-26 18:55:42 EST  1min 14s left Thu 2017-02-23 13:54:44 EST  3 days ago systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.service
 Sun 2017-02-26 20:37:16 EST  1h 42min left Sun 2017-02-26 11:56:36 EST  6h ago     apt-daily.timer              apt-daily.service
 Sun 2017-02-26 20:57:49 EST  2h 3min left  Sun 2017-02-26 11:56:36 EST  6h ago     snapd.refresh.timer          snapd.refresh.service
-</programlisting>
+            </programlisting>
             </para>
 
             <para><emphasis>NEXT</emphasis> shows the next time the timer will run.</para>
@@ -2867,7 +2867,7 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err
 [Unit]
 AllowedCPUs=7,11
 EOF
-</programlisting>
+          </programlisting>
 
           <para>Multiple drop-ins may be "edited" in this mode; the same contents will be written to all of
           them.</para>

man/systemd-ac-power.xml

@@ -75,9 +75,9 @@
 
   <refsect1>
     <title>See Also</title>
-    <para><simplelist type="inline">
+    <para>
-      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    </simplelist></para>
+    </para>
   </refsect1>
 
 </refentry>