From 884c10fbec1b8247dc620026b5e1b7a5cac0c2eb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 24 Apr 2015 12:36:12 +0200 Subject: [PATCH] Restore shared XML files. * man/less-variables.xml, man/standard-conf.xml, man/standard-options.xml, man/user-system-options.xml: Restore files from upstream (removed in commit d3ad6bf3). --- man/less-variables.xml | 29 +++++++++++++++ man/standard-conf.xml | 71 +++++++++++++++++++++++++++++++++++++ man/standard-options.xml | 39 ++++++++++++++++++++ man/user-system-options.xml | 50 ++++++++++++++++++++++++++ 4 files changed, 189 insertions(+) create mode 100644 man/less-variables.xml create mode 100644 man/standard-conf.xml create mode 100644 man/standard-options.xml create mode 100644 man/user-system-options.xml diff --git a/man/less-variables.xml b/man/less-variables.xml new file mode 100644 index 000000000..0fb4d7fbc --- /dev/null +++ b/man/less-variables.xml @@ -0,0 +1,29 @@ + + + + + Environment + + + + $SYSTEMD_PAGER + + Pager to use when + is not given; + overrides $PAGER. Setting + this to an empty string or the value + cat is equivalent to passing + . + + + + $SYSTEMD_LESS + + Override the default + options passed to + less + (FRSXMK). + + + diff --git a/man/standard-conf.xml b/man/standard-conf.xml new file mode 100644 index 000000000..004f53f70 --- /dev/null +++ b/man/standard-conf.xml @@ -0,0 +1,71 @@ + + + + + + Configuration Directories and Precedence + + Configuration files are read from directories in + /etc/, /run/, and + /usr/lib/, in order of precedence. + Each configuration file in these configuration directories shall be named in + the style of filename.conf. + Files in /etc/ override files with the same name in + /run/ and /usr/lib/. Files in + /run/ override files with the same name in + /usr/lib/. + + Packages should install their configuration files in + /usr/lib/. Files in /etc/ are + reserved for the local administrator, who may use this logic to override the + configuration files installed by vendor packages. All configuration files + are sorted by their filename in lexicographic order, regardless of which of + the directories they reside in. If multiple files specify the same option, + the entry in the file with the lexicographically latest name will take + precedence. It is recommended to prefix all filenames with a two-digit number + and a dash, to simplify the ordering of the files. + + If the administrator wants to disable a configuration file supplied by + the vendor, the recommended way is to place a symlink to + /dev/null in the configuration directory in + /etc/, with the same filename as the vendor + configuration file. + + + + Configuration Directories and Precedence + + Default configuration is defined during compilation, so a + configuration file is only needed when it is necessary to deviate + from those defaults. By default the configuration file in + /etc/systemd/ contains commented out entries + showing the defaults as a guide to the administrator. This file + can be edited to create local overrides. + + + When packages need to customize the configuration, they can + install configuration snippets in + /usr/lib/systemd/*.conf.d/. Files in + /etc/ are reserved for the local + administrator, who may use this logic to override the + configuration files installed by vendor packages. The main + configuration file is read before any of the configuration + directories, and has the lowest precedence; entries in a file in + any configuration directory override entries in the single + configuration file. Files in the + *.conf.d/ configuration subdirectories + are sorted by their filename in lexicographic order, regardless of + which of the subdirectories they reside in. If multiple files + specify the same option, the entry in the file with the + lexicographically latest name takes precedence. It is recommended + to prefix all filenames in those subdirectories with a two-digit + number and a dash, to simplify the ordering of the files. + + To disable a configuration file supplied by the vendor, the + recommended way is to place a symlink to + /dev/null in the configuration directory in + /etc/, with the same filename as the vendor + configuration file. + + diff --git a/man/standard-options.xml b/man/standard-options.xml new file mode 100644 index 000000000..f21446339 --- /dev/null +++ b/man/standard-options.xml @@ -0,0 +1,39 @@ + + + + + + + + + + Print a short help text and exit. + + + + + + + + Print a short version string and exit. + + + + + + + + Do not pipe output into a pager. + + + + + + + + Do not print the legend, i.e. column headers and the + footer with hints. + + + diff --git a/man/user-system-options.xml b/man/user-system-options.xml new file mode 100644 index 000000000..8616c5424 --- /dev/null +++ b/man/user-system-options.xml @@ -0,0 +1,50 @@ + + + + + + + + + Talk to the service manager of the calling user, + rather than the service manager of the system. + + + + + + + + Talk to the service manager of the system. This is the + implied default. + + + + + + + + + Execute the operation remotely. Specify a hostname, or a + username and hostname separated by @, to + connect to. The hostname may optionally be suffixed by a + container name, separated by :, which + connects directly to a specific container on the specified + host. This will use SSH to talk to the remote machine manager + instance. Container names may be enumerated with + machinectl -H + HOST. + + + + + + + + + Execute operation on a local container. Specify a + container name to connect to. + + + -- 2.30.2