From 03d35b5d185762cd9258de32d91a7d41e498b927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 28 May 2024 12:40:30 +0200 Subject: [PATCH 1/9] man: update links to catalog docs --- NEWS | 2 +- catalog/systemd.be.catalog.in | 2 +- catalog/systemd.be@latin.catalog.in | 2 +- catalog/systemd.bg.catalog.in | 2 +- catalog/systemd.catalog.in | 2 +- catalog/systemd.da.catalog.in | 2 +- catalog/systemd.fr.catalog.in | 2 +- catalog/systemd.hr.catalog.in | 2 +- catalog/systemd.hu.catalog.in | 2 +- catalog/systemd.it.catalog.in | 2 +- catalog/systemd.ko.catalog.in | 2 +- catalog/systemd.pl.catalog.in | 2 +- catalog/systemd.pt_BR.catalog.in | 2 +- catalog/systemd.ru.catalog.in | 2 +- catalog/systemd.sr.catalog.in | 2 +- catalog/systemd.zh_CN.catalog.in | 2 +- catalog/systemd.zh_TW.catalog.in | 2 +- man/journalctl.xml | 3 +-- man/sd_journal_get_catalog.xml | 2 +- test/fuzz/fuzz-catalog/systemd.pl.catalog | 2 +- 20 files changed, 20 insertions(+), 21 deletions(-) diff --git a/NEWS b/NEWS index bcfd402941..b0488b5722 100644 --- a/NEWS +++ b/NEWS @@ -16844,7 +16844,7 @@ CHANGES WITH 196: indexed database to link up additional information with journal entries. For further details please check: - https://www.freedesktop.org/wiki/Software/systemd/catalog + https://systemd.io/CATALOG The indexed message catalog database also needs to be rebuilt after installation of message catalog files. Use diff --git a/catalog/systemd.be.catalog.in b/catalog/systemd.be.catalog.in index 89c82c2e9c..bfbfbfbf95 100644 --- a/catalog/systemd.be.catalog.in +++ b/catalog/systemd.be.catalog.in @@ -4,7 +4,7 @@ # Belarusian translation # Фармат каталога апісаны на старонцы -# https://www.freedesktop.org/wiki/Software/systemd/catalog +# https://systemd.io/CATALOG # For an explanation why we do all this, see https://xkcd.com/1024/ diff --git a/catalog/systemd.be@latin.catalog.in b/catalog/systemd.be@latin.catalog.in index 9b6d346b0d..92ff5bce56 100644 --- a/catalog/systemd.be@latin.catalog.in +++ b/catalog/systemd.be@latin.catalog.in @@ -4,7 +4,7 @@ # Belarusian Latin translation # Farmat kataloha apisany na staroncy -# https://www.freedesktop.org/wiki/Software/systemd/catalog +# https://systemd.io/CATALOG # For an explanation why we do all this, see https://xkcd.com/1024/ diff --git a/catalog/systemd.bg.catalog.in b/catalog/systemd.bg.catalog.in index 9a73aa0a90..e1c32ede78 100644 --- a/catalog/systemd.bg.catalog.in +++ b/catalog/systemd.bg.catalog.in @@ -5,7 +5,7 @@ # Message catalog for systemd's own messages # The catalog format is documented on -# https://www.freedesktop.org/wiki/Software/systemd/catalog +# https://systemd.io/CATALOG # For an explanation why we do all this, see https://xkcd.com/1024/ diff --git a/catalog/systemd.catalog.in b/catalog/systemd.catalog.in index f0fc62dd85..3c9a6860da 100644 --- a/catalog/systemd.catalog.in +++ b/catalog/systemd.catalog.in @@ -3,7 +3,7 @@ # Message catalog for systemd's own messages # The catalog format is documented on -# https://www.freedesktop.org/wiki/Software/systemd/catalog +# https://systemd.io/CATALOG # For an explanation why we do all this, see https://xkcd.com/1024/ diff --git a/catalog/systemd.da.catalog.in b/catalog/systemd.da.catalog.in index 656fb0509b..da265bfd4d 100644 --- a/catalog/systemd.da.catalog.in +++ b/catalog/systemd.da.catalog.in @@ -4,7 +4,7 @@ # Danish translation # The catalog format is documented on -# https://www.freedesktop.org/wiki/Software/systemd/catalog +# https://systemd.io/CATALOG # For an explanation why we do all this, see https://xkcd.com/1024/ diff --git a/catalog/systemd.fr.catalog.in b/catalog/systemd.fr.catalog.in index 53856b3357..6b28ecb779 100644 --- a/catalog/systemd.fr.catalog.in +++ b/catalog/systemd.fr.catalog.in @@ -6,7 +6,7 @@ # French translation # Le format du catalogue de messages est décrit (en anglais) içi : -# https://www.freedesktop.org/wiki/Software/systemd/catalog +# https://systemd.io/CATALOG -- f77379a8490b408bbe5f6940505a777b Subject: Le journal a été démarré diff --git a/catalog/systemd.hr.catalog.in b/catalog/systemd.hr.catalog.in index 20a71a38cb..d8f7e0cd6e 100644 --- a/catalog/systemd.hr.catalog.in +++ b/catalog/systemd.hr.catalog.in @@ -4,7 +4,7 @@ # Croatian translation # Format kataloga je dokumentiran na -# https://www.freedesktop.org/wiki/Software/systemd/catalog +# https://systemd.io/CATALOG # Za pojašnjenje zašto ovo radimo, posjetite https://xkcd.com/1024/ diff --git a/catalog/systemd.hu.catalog.in b/catalog/systemd.hu.catalog.in index d60200b6c4..5f8fc2879a 100644 --- a/catalog/systemd.hu.catalog.in +++ b/catalog/systemd.hu.catalog.in @@ -5,7 +5,7 @@ # Message catalog for systemd's own messages # The catalog format is documented on -# https://www.freedesktop.org/wiki/Software/systemd/catalog +# https://systemd.io/CATALOG # For an explanation why we do all this, see https://xkcd.com/1024/ diff --git a/catalog/systemd.it.catalog.in b/catalog/systemd.it.catalog.in index e66eccdff3..bcbbcc2eb0 100644 --- a/catalog/systemd.it.catalog.in +++ b/catalog/systemd.it.catalog.in @@ -6,7 +6,7 @@ # Italian translation # Il formato dei messaggi di catalogo è descritto (in inglese) qui: -# https://www.freedesktop.org/wiki/Software/systemd/catalog +# https://systemd.io/CATALOG # Subject: The Journal has been started -- f77379a8490b408bbe5f6940505a777b diff --git a/catalog/systemd.ko.catalog.in b/catalog/systemd.ko.catalog.in index 5f8fda002f..c7c07a80e1 100644 --- a/catalog/systemd.ko.catalog.in +++ b/catalog/systemd.ko.catalog.in @@ -4,7 +4,7 @@ # Korean translation # The catalog format is documented on -# https://www.freedesktop.org/wiki/Software/systemd/catalog +# https://systemd.io/CATALOG # For an explanation why we do all this, see https://xkcd.com/1024/ # diff --git a/catalog/systemd.pl.catalog.in b/catalog/systemd.pl.catalog.in index f8db2b2b0b..75039e9fcd 100644 --- a/catalog/systemd.pl.catalog.in +++ b/catalog/systemd.pl.catalog.in @@ -4,7 +4,7 @@ # Polish translation # The catalog format is documented on -# https://www.freedesktop.org/wiki/Software/systemd/catalog +# https://systemd.io/CATALOG # For an explanation why we do all this, see https://xkcd.com/1024/ diff --git a/catalog/systemd.pt_BR.catalog.in b/catalog/systemd.pt_BR.catalog.in index d44c6884db..214050bad5 100644 --- a/catalog/systemd.pt_BR.catalog.in +++ b/catalog/systemd.pt_BR.catalog.in @@ -5,7 +5,7 @@ # Catálogo de mensagens para as mensagens do próprio systemd # O formato do catálogo está documentado em -# https://www.freedesktop.org/wiki/Software/systemd/catalog +# https://systemd.io/CATALOG # Para uma explicação do porquê de fazermos tudo isso, veja # https://xkcd.com/1024/ diff --git a/catalog/systemd.ru.catalog.in b/catalog/systemd.ru.catalog.in index 826f4fbea8..2d0d8c82a0 100644 --- a/catalog/systemd.ru.catalog.in +++ b/catalog/systemd.ru.catalog.in @@ -6,7 +6,7 @@ # Russian translation # Формат каталога сообщений описан по ссылке -# https://www.freedesktop.org/wiki/Software/systemd/catalog +# https://systemd.io/CATALOG # Перед каждым элементом в комментарии указан Subject исходного # сообщения (на английском). diff --git a/catalog/systemd.sr.catalog.in b/catalog/systemd.sr.catalog.in index cbceab8d0d..1cbdfa1b84 100644 --- a/catalog/systemd.sr.catalog.in +++ b/catalog/systemd.sr.catalog.in @@ -4,7 +4,7 @@ # Serbian translation # Формат каталога је документован на -# https://www.freedesktop.org/wiki/Software/systemd/catalog +# https://systemd.io/CATALOG # Да бисте видели зашто ово радимо, погледајте https://xkcd.com/1024/ diff --git a/catalog/systemd.zh_CN.catalog.in b/catalog/systemd.zh_CN.catalog.in index cc6a519710..fb59f44863 100644 --- a/catalog/systemd.zh_CN.catalog.in +++ b/catalog/systemd.zh_CN.catalog.in @@ -6,7 +6,7 @@ # Simplified Chinese translation # 本 catalog 文档格式被记载在 -# https://www.freedesktop.org/wiki/Software/systemd/catalog +# https://systemd.io/CATALOG # 如需了解我们为什么做这些工作，请见 https://xkcd.com/1024/ diff --git a/catalog/systemd.zh_TW.catalog.in b/catalog/systemd.zh_TW.catalog.in index 4720878218..f5b209e28a 100644 --- a/catalog/systemd.zh_TW.catalog.in +++ b/catalog/systemd.zh_TW.catalog.in @@ -6,7 +6,7 @@ # Traditional Chinese translation # Catalog 的格式記錄於 -# https://www.freedesktop.org/wiki/Software/systemd/catalog +# https://systemd.io/CATALOG # For an explanation why we do all this, see https://xkcd.com/1024/ diff --git a/man/journalctl.xml b/man/journalctl.xml index caa10a056b..5fd9263116 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -690,8 +690,7 @@ will explain the context of an error or log event, possible solutions, as well as pointers to support forums, developer documentation, and any other relevant manuals. Note that help texts are not available for all messages, but only for selected ones. For more information on the message catalog, - please refer to the Message - Catalog Developer Documentation. + see Journal Message Catalogs. Note: when attaching journalctl output to bug reports, please do not use . diff --git a/man/sd_journal_get_catalog.xml b/man/sd_journal_get_catalog.xml index 230d6d82ce..6db9b8bf17 100644 --- a/man/sd_journal_get_catalog.xml +++ b/man/sd_journal_get_catalog.xml @@ -62,7 +62,7 @@ For more information about the journal message catalog please refer to the Journal + url="https://systemd.io/CATALOG">Journal Message Catalogs documentation page. diff --git a/test/fuzz/fuzz-catalog/systemd.pl.catalog b/test/fuzz/fuzz-catalog/systemd.pl.catalog index 6e99c04d85..99a62ce5e0 100644 --- a/test/fuzz/fuzz-catalog/systemd.pl.catalog +++ b/test/fuzz/fuzz-catalog/systemd.pl.catalog @@ -4,7 +4,7 @@ # Polish translation # The catalog format is documented on -# https://www.freedesktop.org/wiki/Software/systemd/catalog +# https://systemd.io/CATALOG # For an explanation why we do all this, see https://xkcd.com/1024/ From f81af0b082207f91f5b8d6ac7bd0cb134ee0b87b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 28 May 2024 12:42:18 +0200 Subject: [PATCH 2/9] man: update links to "New Control Group Interfaces" --- man/org.freedesktop.machine1.xml | 2 +- man/org.freedesktop.systemd1.xml | 2 +- man/systemd-machined.service.xml | 2 +- man/systemd.resource-control.xml | 2 +- man/systemd.scope.xml | 2 +- man/systemd.slice.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/man/org.freedesktop.machine1.xml b/man/org.freedesktop.machine1.xml index 24bef6a755..8abef00e53 100644 --- a/man/org.freedesktop.machine1.xml +++ b/man/org.freedesktop.machine1.xml @@ -347,7 +347,7 @@ node /org/freedesktop/machine1 { unit for the calling client (utilizing the passed scope_properties) and move the leader PID into it. The method returns an object path for the registered machine object that implements the org.freedesktop.machine1.Machine interface (see below). Also see the - New Control Group + New Control Group Interfaces for details about scope units and how to alter resource control settings on the created machine at runtime. diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml index 9e29eda4e0..af4eaf1c0e 100644 --- a/man/org.freedesktop.systemd1.xml +++ b/man/org.freedesktop.systemd1.xml @@ -1568,7 +1568,7 @@ node /org/freedesktop/systemd1 { properties contains properties of the unit, specified like in SetUnitProperties(). aux is currently unused and should be passed as an empty array. See the - New Control Group + New Control Group Interface for more information how to make use of this functionality for resource control purposes. diff --git a/man/systemd-machined.service.xml b/man/systemd-machined.service.xml index b2899ff0fd..49ee66d28a 100644 --- a/man/systemd-machined.service.xml +++ b/man/systemd-machined.service.xml @@ -95,7 +95,7 @@ If you are interested in writing a VM or container manager that makes use of machined, please have look at Writing Virtual Machine or Container Managers. Also see the New Control Group + url="https://systemd.io/CONTROL_GROUP_INTERFACE">New Control Group Interfaces. The daemon provides both a C library interface diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml index 8b58cd32d0..3773a38d62 100644 --- a/man/systemd.resource-control.xml +++ b/man/systemd.resource-control.xml @@ -154,7 +154,7 @@ CPUWeight=20 DisableControllers=cpu / \ <para>See the <ulink - url="https://www.freedesktop.org/wiki/Software/systemd/ControlGroupInterface">New + url="https://systemd.io/CONTROL_GROUP_INTERFACE">New Control Group Interfaces</ulink> for an introduction on how to make use of resource control APIs from programs.</para> </refsect2> diff --git a/man/systemd.scope.xml b/man/systemd.scope.xml index 777e11fdab..9590a19815 100644 --- a/man/systemd.scope.xml +++ b/man/systemd.scope.xml @@ -42,7 +42,7 @@ command line.</para> <para>See the <ulink - url="https://www.freedesktop.org/wiki/Software/systemd/ControlGroupInterface">New + url="https://systemd.io/CONTROL_GROUP_INTERFACE">New Control Group Interfaces</ulink> for an introduction on how to make use of scope units from programs.</para> diff --git a/man/systemd.slice.xml b/man/systemd.slice.xml index 630b2024b8..a5987a3a45 100644 --- a/man/systemd.slice.xml +++ b/man/systemd.slice.xml @@ -63,7 +63,7 @@ </para> <para>See the <ulink - url="https://www.freedesktop.org/wiki/Software/systemd/ControlGroupInterface">New + url="https://systemd.io/CONTROL_GROUP_INTERFACE">New Control Group Interfaces</ulink> for an introduction on how to make use of slice units from programs.</para> </refsect1> From b346d72c798f636fcf05895d43729e3faa95bf48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> Date: Tue, 28 May 2024 13:02:25 +0200 Subject: [PATCH 3/9] man: update links to "Compatibility with SysV" --- docs/sysvinit/README.in | 2 +- man/systemd-sysv-generator.xml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/sysvinit/README.in b/docs/sysvinit/README.in index 89effc8e93..ace1abaecf 100644 --- a/docs/sysvinit/README.in +++ b/docs/sysvinit/README.in @@ -24,4 +24,4 @@ Further reading: man:systemctl(1) man:systemd(1) https://0pointer.de/blog/projects/systemd-for-admins-3.html - https://www.freedesktop.org/wiki/Software/systemd/Incompatibilities + https://systemd.io/INCOMPATIBILITIES diff --git a/man/systemd-sysv-generator.xml b/man/systemd-sysv-generator.xml index b13837b9b9..e198c2b7a3 100644 --- a/man/systemd-sysv-generator.xml +++ b/man/systemd-sysv-generator.xml @@ -47,8 +47,7 @@ more details.</para> <para>Note that compatibility is quite comprehensive but not 100%, for more details see <ulink - url="https://www.freedesktop.org/wiki/Software/systemd/Incompatibilities">Incompatibilities with - SysV</ulink>.</para> + url="https://systemd.io/INCOMPATIBILITIES">Compatibility with SysV</ulink>.</para> <para>SysV runlevels have corresponding systemd targets (<filename>runlevel<replaceable>X</replaceable>.target</filename>). The wrapper unit that is generated From 5507480cf44a47bab401a9477ba783ac528bb4e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> Date: Tue, 28 May 2024 13:04:09 +0200 Subject: [PATCH 4/9] man: update links to "Inhibitor Locks" --- man/org.freedesktop.login1.xml | 4 ++-- man/systemd-inhibit.xml | 5 ++--- man/systemd-logind.service.xml | 5 ++--- man/systemd-suspend.service.xml | 6 ++---- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/man/org.freedesktop.login1.xml b/man/org.freedesktop.login1.xml index 20936a6936..aacaa1b952 100644 --- a/man/org.freedesktop.login1.xml +++ b/man/org.freedesktop.login1.xml @@ -715,7 +715,7 @@ node /org/freedesktop/login1 { whether the inhibit shall be consider mandatory or whether it should just delay the operation to a certain maximum time. The method returns a file descriptor. The lock is released the moment this file descriptor and all its duplicates are closed. For more information on the inhibition logic see - <ulink url="https://www.freedesktop.org/wiki/Software/systemd/inhibit">Inhibitor Locks</ulink>. + <ulink url="https://systemd.io/INHIBITOR_LOCKS">Inhibitor Locks</ulink>. </para> </refsect2> @@ -739,7 +739,7 @@ node /org/freedesktop/login1 { that should be done shortly before shutdown/sleep, in conjunction with delay inhibitor locks. After completion of this work they should release their inhibition locks in order to not delay the operation any further. For more information see - <ulink url="https://www.freedesktop.org/wiki/Software/systemd/inhibit">Inhibitor Locks</ulink>. The + <ulink url="https://systemd.io/INHIBITOR_LOCKS">Inhibitor Locks</ulink>. The <function>PrepareForShutdownWithMetadata()</function> signal additionally sends a list of key/value pair metadata fields. Currently it sends a <varname>type</varname> string which defines the type of shutdown. The type can be one of <literal>power-off</literal>, <literal>reboot</literal>, diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml index 87f17be0ed..a6dbb06c36 100644 --- a/man/systemd-inhibit.xml +++ b/man/systemd-inhibit.xml @@ -44,9 +44,8 @@ an optical disc is being recorded, or similar operations that should not be interrupted.</para> - <para>For more information see the <ulink - url="https://www.freedesktop.org/wiki/Software/systemd/inhibit">Inhibitor - Lock Developer Documentation</ulink>.</para> + <para>For more information see + <ulink url="https://systemd.io/INHIBITOR_LOCKS">Inhibitor Locks</ulink>.</para> </refsect1> <refsect1> diff --git a/man/systemd-logind.service.xml b/man/systemd-logind.service.xml index e14d2d2ce2..e9d721823f 100644 --- a/man/systemd-logind.service.xml +++ b/man/systemd-logind.service.xml @@ -84,9 +84,8 @@ <citerefentry><refentrytitle>org.freedesktop.LogControl1</refentrytitle><manvolnum>5</manvolnum></citerefentry> for information about the D-Bus APIs <filename>systemd-logind</filename> provides.</para> - <para>For more information on the inhibition logic see the <ulink - url="https://www.freedesktop.org/wiki/Software/systemd/inhibit">Inhibitor - Lock Developer Documentation</ulink>.</para> + <para>For more information see + <ulink url="https://systemd.io/INHIBITOR_LOCKS">Inhibitor Locks</ulink>.</para> <para>If you are interested in writing a display manager that makes use of logind, please have look at <ulink url="https://www.freedesktop.org/wiki/Software/systemd/writing-display-managers">Writing Display diff --git a/man/systemd-suspend.service.xml b/man/systemd-suspend.service.xml index 9fbca6193f..c5833b2315 100644 --- a/man/systemd-suspend.service.xml +++ b/man/systemd-suspend.service.xml @@ -73,10 +73,8 @@ <para>Note that scripts or binaries dropped in <filename>/usr/lib/systemd/system-sleep/</filename> are intended for local use only and should be considered hacks. If applications - want to react to system suspend/hibernation and resume, - they should rather use the <ulink - url="https://www.freedesktop.org/wiki/Software/systemd/inhibit">Inhibitor - interface</ulink>.</para> + want to react to system suspend/hibernation and resume, they should rather use the + <ulink url="https://systemd.io/INHIBITOR_LOCKS">Inhibitor Locks</ulink>.</para> <para>Note that <filename>systemd-suspend.service</filename>, <filename>systemd-hibernate.service</filename>, <filename>systemd-hybrid-sleep.service</filename>, and From d5c17aceb38912d0b77ed5b8614696b85f1516b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> Date: Tue, 28 May 2024 14:37:23 +0200 Subject: [PATCH 5/9] various: update links to more wiki pages --- TODO | 2 +- man/systemd-logind.service.xml | 4 ++-- man/systemd-machined.service.xml | 2 +- man/systemd.special.xml | 2 +- test/fuzz/fuzz-unit-file/syslog.socket | 4 ++-- test/fuzz/fuzz-unit-file/systemd-resolved.service | 4 ++-- units/syslog.socket | 4 ++-- units/systemd-resolved.service.in | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/TODO b/TODO index c9f8bf9b91..b375327fe0 100644 --- a/TODO +++ b/TODO @@ -1809,7 +1809,7 @@ Features: * fstab-generator: default to tmpfs-as-root if only usr= is specified on the kernel cmdline -* docs: bring https://www.freedesktop.org/wiki/Software/systemd/MyServiceCantGetRealtime up to date +* docs: bring https://systemd.io/MY_SERVICE_CANT_GET_REATLIME up to date * add a job mode that will fail if a transaction would mean stopping running units. Use this in timedated to manage the NTP service diff --git a/man/systemd-logind.service.xml b/man/systemd-logind.service.xml index e9d721823f..4ecd700f8b 100644 --- a/man/systemd-logind.service.xml +++ b/man/systemd-logind.service.xml @@ -88,10 +88,10 @@ <ulink url="https://systemd.io/INHIBITOR_LOCKS">Inhibitor Locks</ulink>.</para> <para>If you are interested in writing a display manager that makes use of logind, please have look at - <ulink url="https://www.freedesktop.org/wiki/Software/systemd/writing-display-managers">Writing Display + <ulink url="https://systemd.io/WRITING_DISPLAY_MANAGERS">Writing Display Managers</ulink>. If you are interested in writing a desktop environment that makes use of logind, please have look at - <ulink url="https://www.freedesktop.org/wiki/Software/systemd/writing-desktop-environments">Writing + <ulink url="https://systemd.io/WRITING_DESKTOP_ENVIRONMENTS">Writing Desktop Environments</ulink>.</para> </refsect1> diff --git a/man/systemd-machined.service.xml b/man/systemd-machined.service.xml index 49ee66d28a..bb931ac50b 100644 --- a/man/systemd-machined.service.xml +++ b/man/systemd-machined.service.xml @@ -93,7 +93,7 @@ for some examples on how to run containers with OS tools.</para> <para>If you are interested in writing a VM or container manager that makes use of machined, please have - look at <ulink url="https://www.freedesktop.org/wiki/Software/systemd/writing-vm-managers">Writing + look at <ulink url="https://systemd.io/WRITING_VM_AND_CONTAINER_MANAGERS">Writing Virtual Machine or Container Managers</ulink>. Also see the <ulink url="https://systemd.io/CONTROL_GROUP_INTERFACE">New Control Group Interfaces</ulink>.</para> diff --git a/man/systemd.special.xml b/man/systemd.special.xml index 415253c3e8..192d09732a 100644 --- a/man/systemd.special.xml +++ b/man/systemd.special.xml @@ -822,7 +822,7 @@ on. All userspace log messages will be made available on this socket. For more information about syslog integration, please consult the <ulink - url="https://www.freedesktop.org/wiki/Software/systemd/syslog">Syslog + url="https://systemd.io/SYSLOG">Syslog Interface</ulink> document.</para> </listitem> </varlistentry> diff --git a/test/fuzz/fuzz-unit-file/syslog.socket b/test/fuzz/fuzz-unit-file/syslog.socket index 969ee428fa..bb046a5c6f 100644 --- a/test/fuzz/fuzz-unit-file/syslog.socket +++ b/test/fuzz/fuzz-unit-file/syslog.socket @@ -11,7 +11,7 @@ socket [Unit] Description=Syslog Socket Documentation=man:systemd.special(7) -Documentation=https://www.freedesktop.org/wiki/Software/systemd/syslog +Documentation=https://systemd.io/SYSLOG DefaultDependencies=no Before=sockets.target @@ -45,7 +45,7 @@ ReceiveBuffer=8M # [Install] # Alias=syslog.service # -# See https://www.freedesktop.org/wiki/Software/systemd/syslog for details. +# See https://systemd.io/SYSLOG for details. [Socket] ListenStream=1.2.3.4:1234 diff --git a/test/fuzz/fuzz-unit-file/systemd-resolved.service b/test/fuzz/fuzz-unit-file/systemd-resolved.service index 49d272b21f..1b7cc15aee 100644 --- a/test/fuzz/fuzz-unit-file/systemd-resolved.service +++ b/test/fuzz/fuzz-unit-file/systemd-resolved.service @@ -12,8 +12,8 @@ service Description=Network Name Resolution Documentation=man:systemd-resolved.service(8) Documentation=man:org.freedesktop.resolve1(5) -Documentation=https://www.freedesktop.org/wiki/Software/systemd/writing-network-configuration-managers -Documentation=https://www.freedesktop.org/wiki/Software/systemd/writing-resolver-clients +Documentation=https://systemd.io/WRITING_NETWORK_CONFIGURATION_MANAGERS +Documentation=https://systemd.io/WRITING_RESOLVER_CLIENTS DefaultDependencies=no After=systemd-sysusers.service systemd-networkd.service Before=network.target nss-lookup.target shutdown.target diff --git a/units/syslog.socket b/units/syslog.socket index ff76bc5a6f..26b691c105 100644 --- a/units/syslog.socket +++ b/units/syslog.socket @@ -10,7 +10,7 @@ [Unit] Description=Syslog Socket Documentation=man:systemd.special(7) -Documentation=https://www.freedesktop.org/wiki/Software/systemd/syslog +Documentation=https://systemd.io/SYSLOG DefaultDependencies=no Before=sockets.target @@ -44,4 +44,4 @@ ReceiveBuffer=8M # [Install] # Alias=syslog.service # -# See https://www.freedesktop.org/wiki/Software/systemd/syslog for details. +# See https://systemd.io/SYSLOG for details. diff --git a/units/systemd-resolved.service.in b/units/systemd-resolved.service.in index 717f572bc5..4aa0788ac4 100644 --- a/units/systemd-resolved.service.in +++ b/units/systemd-resolved.service.in @@ -11,8 +11,8 @@ Description=Network Name Resolution Documentation=man:systemd-resolved.service(8) Documentation=man:org.freedesktop.resolve1(5) -Documentation=https://www.freedesktop.org/wiki/Software/systemd/writing-network-configuration-managers -Documentation=https://www.freedesktop.org/wiki/Software/systemd/writing-resolver-clients +Documentation=https://systemd.io/WRITING_NETWORK_CONFIGURATION_MANAGERS +Documentation=https://systemd.io/WRITING_RESOLVER_CLIENTS DefaultDependencies=no After=systemd-sysctl.service systemd-sysusers.service From a37454bd905e6f75c80896c81c04c602954221d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> Date: Tue, 28 May 2024 14:38:22 +0200 Subject: [PATCH 6/9] man: update links to "API File Systems" --- man/systemd-remount-fs.service.xml | 2 +- man/systemd.mount.xml | 2 +- test/fuzz/fuzz-unit-file/binfmt_misc.automount | 2 +- units/dev-hugepages.mount | 2 +- units/dev-mqueue.mount | 2 +- units/proc-sys-fs-binfmt_misc.automount | 2 +- units/proc-sys-fs-binfmt_misc.mount | 2 +- units/sys-fs-fuse-connections.mount | 2 +- units/sys-kernel-config.mount | 2 +- units/sys-kernel-debug.mount | 2 +- units/sys-kernel-tracing.mount | 2 +- units/systemd-binfmt.service.in | 2 +- units/systemd-remount-fs.service.in | 2 +- units/tmp.mount | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/man/systemd-remount-fs.service.xml b/man/systemd-remount-fs.service.xml index ce391d1710..1a4c4026fd 100644 --- a/man/systemd-remount-fs.service.xml +++ b/man/systemd-remount-fs.service.xml @@ -45,7 +45,7 @@ the partition table does not contain relevant entries).</para> <para>For a longer discussion of kernel API file systems see - <ulink url="https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems">API + <ulink url="https://systemd.io/API_FILE_SYSTEMS">API File Systems</ulink>.</para> <para>Note: <filename>systemd-remount-fs.service</filename> is usually pulled in by diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml index 1b70392813..d061736b73 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.xml @@ -82,7 +82,7 @@ for kernel-to-userspace and userspace-to-userspace interfaces. Some of them may not be changed via mount units, and cannot be disabled. For a longer discussion see <ulink - url="https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems">API + url="https://systemd.io/API_FILE_SYSTEMS">API File Systems</ulink>.</para> <para>The diff --git a/test/fuzz/fuzz-unit-file/binfmt_misc.automount b/test/fuzz/fuzz-unit-file/binfmt_misc.automount index 8d761b01b6..d9fd0f0f6a 100644 --- a/test/fuzz/fuzz-unit-file/binfmt_misc.automount +++ b/test/fuzz/fuzz-unit-file/binfmt_misc.automount @@ -11,7 +11,7 @@ automount [Unit] Description=Arbitrary Executable File Formats File System Automount Point Documentation=https://docs.kernel.org/admin-guide/binfmt-misc.html -Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems +Documentation=https://systemd.io/API_FILE_SYSTEMS DefaultDependencies=no Before=sysinit.target ConditionPathExists=/proc/sys/fs/binfmt_misc/ diff --git a/units/dev-hugepages.mount b/units/dev-hugepages.mount index 88cd89d563..f836282986 100644 --- a/units/dev-hugepages.mount +++ b/units/dev-hugepages.mount @@ -10,7 +10,7 @@ [Unit] Description=Huge Pages File System Documentation=https://docs.kernel.org/admin-guide/mm/hugetlbpage.html -Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems +Documentation=https://systemd.io/API_FILE_SYSTEMS DefaultDependencies=no Before=sysinit.target ConditionPathExists=/sys/kernel/mm/hugepages diff --git a/units/dev-mqueue.mount b/units/dev-mqueue.mount index 02683a9e1e..1fd9cc263c 100644 --- a/units/dev-mqueue.mount +++ b/units/dev-mqueue.mount @@ -10,7 +10,7 @@ [Unit] Description=POSIX Message Queue File System Documentation=man:mq_overview(7) -Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems +Documentation=https://systemd.io/API_FILE_SYSTEMS DefaultDependencies=no Before=sysinit.target ConditionPathExists=/proc/sys/fs/mqueue diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount index 5d212015a5..7ec21e76c9 100644 --- a/units/proc-sys-fs-binfmt_misc.automount +++ b/units/proc-sys-fs-binfmt_misc.automount @@ -10,7 +10,7 @@ [Unit] Description=Arbitrary Executable File Formats File System Automount Point Documentation=https://docs.kernel.org/admin-guide/binfmt-misc.html -Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems +Documentation=https://systemd.io/API_FILE_SYSTEMS ConditionPathExists=/proc/sys/fs/binfmt_misc/ ConditionPathIsReadWrite=/proc/sys/ diff --git a/units/proc-sys-fs-binfmt_misc.mount b/units/proc-sys-fs-binfmt_misc.mount index 88a7748cb2..9518708e73 100644 --- a/units/proc-sys-fs-binfmt_misc.mount +++ b/units/proc-sys-fs-binfmt_misc.mount @@ -10,7 +10,7 @@ [Unit] Description=Arbitrary Executable File Formats File System Documentation=https://docs.kernel.org/admin-guide/binfmt-misc.html -Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems +Documentation=https://systemd.io/API_FILE_SYSTEMS DefaultDependencies=no [Mount] diff --git a/units/sys-fs-fuse-connections.mount b/units/sys-fs-fuse-connections.mount index 929d8e3bf0..bd3f22acae 100644 --- a/units/sys-fs-fuse-connections.mount +++ b/units/sys-fs-fuse-connections.mount @@ -10,7 +10,7 @@ [Unit] Description=FUSE Control File System Documentation=https://docs.kernel.org/filesystems/fuse.html -Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems +Documentation=https://systemd.io/API_FILE_SYSTEMS DefaultDependencies=no ConditionPathExists=/sys/fs/fuse/connections ConditionCapability=CAP_SYS_ADMIN diff --git a/units/sys-kernel-config.mount b/units/sys-kernel-config.mount index dca94a8986..26ee16049e 100644 --- a/units/sys-kernel-config.mount +++ b/units/sys-kernel-config.mount @@ -10,7 +10,7 @@ [Unit] Description=Kernel Configuration File System Documentation=https://docs.kernel.org/filesystems/configfs.html -Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems +Documentation=https://systemd.io/API_FILE_SYSTEMS DefaultDependencies=no ConditionPathExists=/sys/kernel/config ConditionCapability=CAP_SYS_RAWIO diff --git a/units/sys-kernel-debug.mount b/units/sys-kernel-debug.mount index 6c77ef53c9..5f0a75b02a 100644 --- a/units/sys-kernel-debug.mount +++ b/units/sys-kernel-debug.mount @@ -10,7 +10,7 @@ [Unit] Description=Kernel Debug File System Documentation=https://docs.kernel.org/filesystems/debugfs.html -Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems +Documentation=https://systemd.io/API_FILE_SYSTEMS DefaultDependencies=no ConditionPathExists=/sys/kernel/debug ConditionCapability=CAP_SYS_RAWIO diff --git a/units/sys-kernel-tracing.mount b/units/sys-kernel-tracing.mount index f3cd47fb35..ed8f948af9 100644 --- a/units/sys-kernel-tracing.mount +++ b/units/sys-kernel-tracing.mount @@ -10,7 +10,7 @@ [Unit] Description=Kernel Trace File System Documentation=https://docs.kernel.org/trace/ftrace.html -Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems +Documentation=https://systemd.io/API_FILE_SYSTEMS DefaultDependencies=no ConditionVirtualization=!lxc ConditionPathExists=/sys/kernel/tracing diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in index 6861c76674..318bf8efc2 100644 --- a/units/systemd-binfmt.service.in +++ b/units/systemd-binfmt.service.in @@ -11,7 +11,7 @@ Description=Set Up Additional Binary Formats Documentation=man:systemd-binfmt.service(8) man:binfmt.d(5) Documentation=https://docs.kernel.org/admin-guide/binfmt-misc.html -Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems +Documentation=https://systemd.io/API_FILE_SYSTEMS DefaultDependencies=no Conflicts=shutdown.target After=proc-sys-fs-binfmt_misc.automount diff --git a/units/systemd-remount-fs.service.in b/units/systemd-remount-fs.service.in index fe3c31b30c..4ac8978ff2 100644 --- a/units/systemd-remount-fs.service.in +++ b/units/systemd-remount-fs.service.in @@ -10,7 +10,7 @@ [Unit] Description=Remount Root and Kernel File Systems Documentation=man:systemd-remount-fs.service(8) -Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems +Documentation=https://systemd.io/API_FILE_SYSTEMS DefaultDependencies=no After=systemd-fsck-root.service diff --git a/units/tmp.mount b/units/tmp.mount index 734acea237..896040524a 100644 --- a/units/tmp.mount +++ b/units/tmp.mount @@ -11,7 +11,7 @@ Description=Temporary Directory /tmp Documentation=https://systemd.io/TEMPORARY_DIRECTORIES Documentation=man:file-hierarchy(7) -Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems +Documentation=https://systemd.io/API_FILE_SYSTEMS ConditionPathIsSymbolicLink=!/tmp DefaultDependencies=no Conflicts=umount.target From bdc965253c27e94099f7738b428ad8cb11d91307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> Date: Tue, 28 May 2024 14:40:54 +0200 Subject: [PATCH 7/9] docs: drop link to obsolete multiseat page We link to the man page which replaced this historical document right above, so just drop the whole paragraph. --- docs/WRITING_DISPLAY_MANAGERS.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/WRITING_DISPLAY_MANAGERS.md b/docs/WRITING_DISPLAY_MANAGERS.md index 467e8a886a..1fe70d044a 100644 --- a/docs/WRITING_DISPLAY_MANAGERS.md +++ b/docs/WRITING_DISPLAY_MANAGERS.md @@ -33,8 +33,6 @@ Minimal porting (without multi-seat) requires the following: The former should contain "seat0", the latter the VT number your session runs on. pam_systemd can determine these values automatically but it's nice to pass these variables anyway. In summary: porting a display manager from ConsoleKit to systemd primarily means removing code, not necessarily adding any new code. Here, a cheers to simplicity! -Complete porting (with multi-seat) requires the following (Before you continue, make sure to read up on [Multi-Seat on Linux](https://www.freedesktop.org/wiki/Software/systemd/multiseat) first.): - 1. Subscribe to seats showing up and going away, via the systemd-logind D-Bus interface's SeatAdded and SeatRemoved signals. Take possession of each seat by spawning your greeter on it. However, do so exclusively for seats where the boolean CanGraphical property is true. From 75ced6d5ee308afa98453609bffbd6e836f0fbb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> Date: Tue, 28 May 2024 14:43:50 +0200 Subject: [PATCH 8/9] various: update links to usr-merge --- README | 4 ++-- man/org.freedesktop.systemd1.xml | 5 ++--- src/core/main.c | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/README b/README index e41ab1ab7d..ac51b66784 100644 --- a/README +++ b/README @@ -270,8 +270,8 @@ REQUIREMENTS: longer supported, and moving everything under /usr/ is required. Systems with a separate /usr/ partition must mount it before transitioning into it (i.e.: from the initrd). For more information see: - https://www.freedesktop.org/wiki/Software/systemd/separate-usr-is-broken - https://www.freedesktop.org/wiki/Software/systemd/TheCaseForTheUsrMerge + https://systemd.io/SEPARATE_USR_IS_BROKEN + https://systemd.io/THE_CASE_FOR_THE_USR_MERGE Additional packages are necessary to run some tests: - nc (used by test/TEST-12-ISSUE-3171) diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml index af4eaf1c0e..b0b45097e3 100644 --- a/man/org.freedesktop.systemd1.xml +++ b/man/org.freedesktop.systemd1.xml @@ -1660,9 +1660,8 @@ node /org/freedesktop/systemd1 { <listitem><para><filename>/bin</filename>, <filename>/sbin</filename> and <filename>/lib*</filename> are not symlinks to their counterparts under <filename>/usr/</filename>. For more information on this issue consult - <ulink url="https://www.freedesktop.org/wiki/Software/systemd/TheCaseForTheUsrMerge"> - The Case for the /usr Merge - </ulink>.</para> + <ulink url="https://systemd.io/THE_CASE_FOR_THE_USR_MERGE">The Case for the /usr Merge</ulink>. + </para> <xi:include href="version-info.xml" xpointer="v252"/></listitem> </varlistentry> diff --git a/src/core/main.c b/src/core/main.c index db81b2f07e..62e3eb4668 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1371,7 +1371,7 @@ static void test_usr(void) { log_warning("/usr appears to be on its own filesystem and is not already mounted. This is not a supported setup. " "Some things will probably break (sometimes even silently) in mysterious ways. " - "Consult https://www.freedesktop.org/wiki/Software/systemd/separate-usr-is-broken for more information."); + "Consult https://systemd.io/SEPARATE_USR_IS_BROKEN for more information."); } static int enforce_syscall_archs(Set *archs) { From 80cdf708df3c93fed6f5d15ffd7006fa20c76e8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> Date: Tue, 28 May 2024 14:45:08 +0200 Subject: [PATCH 9/9] README: update link for backports --- README | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README b/README index ac51b66784..cd75511323 100644 --- a/README +++ b/README @@ -446,5 +446,4 @@ STABLE BRANCHES AND BACKPORTS: Stable branches are started for certain releases of systemd and named after them, e.g. v238-stable. Stable branches are managed by distribution maintainers on an as needed basis. See - https://www.freedesktop.org/wiki/Software/systemd/Backports for some - more information and examples. + https://systemd.io/BACKPORTS for some more information and examples.