From 709f4c472cd907d0924fdf4982e4a4d49e44ec4d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 29 May 2018 11:13:40 +0200 Subject: [PATCH] man: sort specifier list in systemd.unit(5) alphabetically Usually, we order our settings in our unit files in a logical order, grouping related settings together, and putting more relevant stuff first, instead of following a strictly alphabetical order. For specifiers I think it makes sense to follow an alphabetical order however, since they literally are just characters, and hence I think the concept of alphabetical ordering is much more commanding for them. Also, since specifiers are usually not used in combination, but mostly used indepdently of each other I think it's not that important to group similar ones together. No other changes except the reordering. --- man/systemd.unit.xml | 102 +++++++++++++++++++++---------------------- man/tmpfiles.d.xml | 80 ++++++++++++++++----------------- 2 files changed, 91 insertions(+), 91 deletions(-) diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 73a0462a2b..3d0f0ff87c 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -1537,24 +1537,29 @@ - %n - Full unit name - + %b + Boot ID + The boot ID of the running system, formatted as string. See random4 for more information. - %N - Full unit name - Same as %n, but with the type suffix removed. + %C + Cache directory root + This is either /var/cache (for the system manager) or the path $XDG_CACHE_HOME resolves to (for user managers). - %p - Prefix name - For instantiated units, this refers to the string before the first @ character of the unit name. For non-instantiated units, same as %N. + %f + Unescaped filename + This is either the unescaped instance name (if applicable) with / prepended (if applicable), or the unescaped prefix name prepended with /. This implements unescaping according to the rules for escaping absolute file system paths discussed above. - %P - Unescaped prefix name - Same as %p, but with escaping undone. + %h + User home directory + This is the home directory of the user running the service manager instance. In case of the system manager this resolves to /root. + + + %H + Host name + The hostname of the running system at the point in time the unit configuration is loaded. %i @@ -1577,14 +1582,39 @@ Same as %j, but with escaping undone. - %f - Unescaped filename - This is either the unescaped instance name (if applicable) with / prepended (if applicable), or the unescaped prefix name prepended with /. This implements unescaping according to the rules for escaping absolute file system paths discussed above. + %L + 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). - %t - Runtime directory root - This is either /run (for the system manager) or the path $XDG_RUNTIME_DIR resolves to (for user managers). + %m + Machine ID + The machine ID of the running system, formatted as string. See machine-id5 for more information. + + + %n + Full unit name + + + + %N + Full unit name + Same as %n, but with the type suffix removed. + + + %p + Prefix name + For instantiated units, this refers to the string before the first @ character of the unit name. For non-instantiated units, same as %N. + + + %P + Unescaped prefix name + Same as %p, but with escaping undone. + + + %s + User shell + This is the shell of the user running the service manager instance. In case of the system manager this resolves to /bin/sh. %S @@ -1592,14 +1622,9 @@ This is either /var/lib (for the system manager) or the path $XDG_CONFIG_HOME resolves to (for user managers). - %C - Cache directory root - This is either /var/cache (for the system manager) or the path $XDG_CACHE_HOME resolves to (for user managers). - - - %L - 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). + %t + Runtime directory root + This is either /run (for the system manager) or the path $XDG_RUNTIME_DIR resolves to (for user managers). %u @@ -1611,31 +1636,6 @@ User UID This is the numeric UID of the user running the service manager instance. In case of the system manager this resolves to 0. - - %h - User home directory - This is the home directory of the user running the service manager instance. In case of the system manager this resolves to /root. - - - %s - User shell - This is the shell of the user running the service manager instance. In case of the system manager this resolves to /bin/sh. - - - %m - Machine ID - The machine ID of the running system, formatted as string. See machine-id5 for more information. - - - %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 at the point in time the unit configuration is loaded. - %v Kernel release diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml index ed119ad86a..30809f25f0 100644 --- a/man/tmpfiles.d.xml +++ b/man/tmpfiles.d.xml @@ -611,61 +611,61 @@ r! /tmp/.X[0-9]*-lock - - %m - Machine ID - The machine ID of the running system, formatted as string. See machine-id5 for more information. - %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. - - - %v - Kernel release - Identical to uname -r output. - - - %U - User UID - This is the numeric UID of the user running the service manager instance. In case of the system manager this resolves to 0. - - - %u - User name - This is the name of the user running the service manager instance. In case of the system manager this resolves to root. - - - %h - User home directory - This is the home directory of the user running the service manager instance. In case of the system manager this resolves to /root. - - - %t - System or user runtime directory - In --user mode, this is the same $XDG_RUNTIME_DIR, and /run otherwise. - - - %S - System or user state directory - In mode, this is the same as $XDG_CONFIG_HOME, and /var/lib otherwise. - %C System or user cache directory In mode, this is the same as $XDG_CACHE_HOME, and /var/cache otherwise. + + %h + User home directory + This is the home directory of the user running the service manager instance. In case of the system manager 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 + System or user state directory + In mode, this is the same as $XDG_CONFIG_HOME, and /var/lib otherwise. + + + %t + System or user runtime directory + In --user mode, this is the same $XDG_RUNTIME_DIR, and /run otherwise. + + + %u + User name + This is the name of the user running the service manager instance. In case of the system manager this resolves to root. + + + %U + User UID + This is the numeric UID of the user running the service manager instance. In case of the system manager this resolves to 0. + + + %v + Kernel release + Identical to uname -r output. + %% Escaped %