From c83347b49de7a8d0cb7d51129b2534aa7e4a2a2e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 30 Apr 2020 12:26:11 +0200 Subject: [PATCH] man: migrate more specifier explanations to standard-specifiers.xml We probably can migrate even more, but for now let's just migrate those which have the 1:1 identical text everywhere. (Also, let's add the % entry to all specifier tables) --- man/standard-specifiers.xml | 25 +++++++++++++++++++++++++ man/systemd.dnssd.xml | 25 +++++-------------------- man/systemd.unit.xml | 25 +++++-------------------- man/sysusers.d.xml | 30 +++++------------------------- man/tmpfiles.d.xml | 30 +++++------------------------- 5 files changed, 45 insertions(+), 90 deletions(-) diff --git a/man/standard-specifiers.xml b/man/standard-specifiers.xml index c5cd6a8862..0c258241df 100644 --- a/man/standard-specifiers.xml +++ b/man/standard-specifiers.xml @@ -4,6 +4,11 @@ + + %b + Boot ID + The boot ID of the running system, formatted as string. See random4 for more information. + %a Architecture @@ -14,11 +19,26 @@ Operating system build ID The operating system build identifier of the running system, as read from the BUILD_ID= field of /etc/os-release. If not set, resolves to an empty string. See os-release5 for more information. + + %H + Host name + The hostname of the running system. + + + %m + Machine ID + The machine ID of the running system, formatted as string. See machine-id5 for more information. + %o Operating system ID The operating system identifier of the running system, as read from the ID= field of /etc/os-release. See os-release5 for more information. + + %v + Kernel release + Identical to uname -r output. + %w Operating system version ID @@ -29,4 +49,9 @@ Operating system variant ID The operating system variant identifier of the running system, as read from the VARIANT_ID= field of /etc/os-release. If not set, resolves to an empty string. See os-release5 for more information. + + %% + Single percent sign + Use %% in place of % to specify a single percent sign. + diff --git a/man/systemd.dnssd.xml b/man/systemd.dnssd.xml index d70cc43944..9e11677bde 100644 --- a/man/systemd.dnssd.xml +++ b/man/systemd.dnssd.xml @@ -90,30 +90,15 @@ - - %b - Boot ID - The boot ID of the running system, formatted as string. See random4 for more information. - + - - %H - Host name - The hostname of the running system. - - - %m - Machine ID - The machine ID of the running system, formatted as string. See machine-id5 for more information. - + + - - %v - Kernel release - Identical to uname -r output. - + + diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index d570016b2f..999a13c560 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -1715,11 +1715,7 @@ Architecture A short string identifying the architecture of the local system. A string such as x86, x86-64 or arm64. See the architectures defined for ConditionArchitecture= above for a full list. - - %b - Boot ID - The boot ID of the running system, formatted as string. See random4 for more information. - + %C @@ -1744,6 +1740,7 @@ Note that this setting is not influenced by the User= setting configurable in the [Service] section of the service unit. + %H Host name The hostname of the running system at the point in time the unit configuration is loaded. @@ -1773,11 +1770,7 @@ Note that this setting is not influenced by the Us Log directory root This is either /var/log (for the system manager) or the path $XDG_CONFIG_HOME resolves to with /log appended (for user managers). - - %m - Machine ID - The machine ID of the running system, formatted as string. See machine-id5 for more information. - + %n @@ -1843,11 +1836,7 @@ Note that this setting is not influenced by the Us Note that this setting is not influenced by the User= setting configurable in the [Service] section of the service unit. - - %v - Kernel release - Identical to uname -r output - + %V Directory for larger and persistent temporary files @@ -1855,11 +1844,7 @@ Note that this setting is not influenced by the Us - - %% - Single percent sign - Use %% in place of % to specify a single percent sign. - + diff --git a/man/sysusers.d.xml b/man/sysusers.d.xml index 2be41c1030..46e860ee50 100644 --- a/man/sysusers.d.xml +++ b/man/sysusers.d.xml @@ -252,33 +252,17 @@ r - 500-900 - - %b - Boot ID - The boot ID of the running system, formatted as string. See random4 for more information. - + - - %H - Host name - The hostname of the running system. - - - %m - Machine ID - The machine ID of the running system, formatted as string. See machine-id5 for more information. - + + %T Directory for temporary files This is either /tmp or the path $TMPDIR, $TEMP or $TMP are set to. - - %v - Kernel release - Identical to uname -r output. - + %V Directory for larger and persistent temporary files @@ -286,11 +270,7 @@ r - 500-900 - - %% - Escaped % - Single percent sign. - + diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml index 79fd6a9921..f45dfe0a53 100644 --- a/man/tmpfiles.d.xml +++ b/man/tmpfiles.d.xml @@ -633,11 +633,7 @@ w- /proc/sys/vm/swappiness - - - - 10 - - %b - Boot ID - The boot ID of the running system, formatted as string. See random4 for more information. - + %C @@ -649,21 +645,13 @@ w- /proc/sys/vm/swappiness - - - - 10 User home directory This is the home directory of the user running the command. In case of the system instance this resolves to /root. - - %H - Host name - The hostname of the running system. - + %L System or user log directory In mode, this is the same as $XDG_CONFIG_HOME with /log appended, and /var/log otherwise. - - %m - Machine ID - The machine ID of the running system, formatted as string. See machine-id5 for more information. - + %S @@ -700,11 +688,7 @@ w- /proc/sys/vm/swappiness - - - - 10 User UID This is the numeric UID of the user running the command. In case of the system instance this resolves to 0. - - %v - Kernel release - Identical to uname -r output. - + %V Directory for larger and persistent temporary files @@ -712,11 +696,7 @@ w- /proc/sys/vm/swappiness - - - - 10 - - %% - Escaped % - Single percent sign. - +