diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2014-11-29 01:06:20 -0800 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-11-29 13:55:31 -0500 |
| commit | a9edaeff8481573764288ccf7e433a95b6dc7c03 (patch) | |
| tree | 3fe088cac9fd69e73a2f98b9702b6b1c72859c4a /man | |
| parent | 1b907b5c3b11491b790e541dd24255a758511a2f (diff) | |
journald: Support journald.conf.d directories in the usual search paths
Diffstat (limited to 'man')
| -rw-r--r-- | man/journald.conf.xml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/man/journald.conf.xml b/man/journald.conf.xml index 5538b968e7..bf0b944eab 100644 --- a/man/journald.conf.xml +++ b/man/journald.conf.xml @@ -22,7 +22,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. --> -<refentry id="journald.conf"> +<refentry id="journald.conf" + xmlns:xi="http://www.w3.org/2001/XInclude"> <refentryinfo> <title>journald.conf</title> <productname>systemd</productname> @@ -44,22 +45,29 @@ <refnamediv> <refname>journald.conf</refname> - <refpurpose>Journal service configuration file</refpurpose> + <refname>journald.conf.d</refname> + <refpurpose>Journal service configuration files</refpurpose> </refnamediv> <refsynopsisdiv> <para><filename>/etc/systemd/journald.conf</filename></para> + <para><filename>/etc/systemd/journald.conf.d/*.conf</filename></para> + <para><filename>/run/systemd/journald.conf.d/*.conf</filename></para> + <para><filename>/usr/lib/systemd/journald.conf.d/*.conf</filename></para> </refsynopsisdiv> <refsect1> <title>Description</title> - <para>This file configures various parameters of the + <para>These files configure various parameters of the systemd journal service, <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para> </refsect1> + <xi:include href="standard-conf.xml" xpointer="confd" /> + <xi:include href="standard-conf.xml" xpointer="conf" /> + <refsect1> <title>Options</title> |