diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2014-11-29 01:05:43 -0800 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-11-29 13:55:31 -0500 |
| commit | d3fae78fe86f1dfcdb07fd613ccbb3adf547a617 (patch) | |
| tree | 5d69302bf78d904cc5c8e90d21ae76be175ca10d /man/binfmt.d.xml | |
| parent | 02b75c9edd61f47de7940b61b97b071b69f38a11 (diff) | |
| download | systemd-d3fae78fe86f1dfcdb07fd613ccbb3adf547a617.tar.gz | |
man: Factor out a common snippet for .d directories and precedence
Several manpages contain duplicate text describing a standard set of .d
configuration directories, with the usual sorting, precedence,
overrides, and so on. Factor this common text out using XInclude before
proliferating it even further.
Diffstat (limited to 'man/binfmt.d.xml')
| -rw-r--r-- | man/binfmt.d.xml | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml index 227016616a..55a3df0b73 100644 --- a/man/binfmt.d.xml +++ b/man/binfmt.d.xml @@ -19,7 +19,8 @@ You should have received a copy of the GNU Lesser General Public License along with systemd; If not, see <http://www.gnu.org/licenses/>. --> -<refentry id="binfmt.d" conditional='ENABLE_BINFMT'> +<refentry id="binfmt.d" conditional='ENABLE_BINFMT' + xmlns:xi="http://www.w3.org/2001/XInclude"> <refentryinfo> <title>binfmt.d</title> @@ -74,33 +75,10 @@ <para>Empty lines and lines beginning with ; and # are ignored. Note that this means you may not use ; and # as delimiter in binary format rules.</para> - - <para>Each configuration file shall be named in the - style of <filename><replaceable>program</replaceable>.conf</filename>. - Files in <filename>/etc/</filename> override files - with the same name in <filename>/usr/lib/</filename> - and <filename>/run/</filename>. Files in - <filename>/run/</filename> override files with the - same name in <filename>/usr/lib/</filename>. Packages - should install their configuration files in - <filename>/usr/lib/</filename>, files in - <filename>/etc/</filename> are reserved for the local - administrator, who may use this logic to override the - configuration files installed from vendor - packages. All files are sorted by their filename in - lexicographic order, regardless of which of the - directories they reside in. If multiple files specify - the same binary type name, the entry in the file with - the lexicographically latest name will be applied.</para> - - <para>If the administrator wants to disable a - configuration file supplied by the vendor, the - recommended way is to place a symlink to - <filename>/dev/null</filename> in - <filename>/etc/binfmt.d/</filename> bearing the - same filename.</para> </refsect1> + <xi:include href="standard-conf.xml" xpointer="confd" /> + <refsect1> <title>Example</title> <example> |