diff options
| author | Daniel Mack <github@zonque.org> | 2016-01-29 15:51:16 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2016-01-29 15:51:16 +0100 |
| commit | e0d2df39b1a4681b523dba9bfa2d709b2cef07bb (patch) | |
| tree | 15269b528782b09f2e38783566c2c4e8ce8c450e | |
| parent | a5a5f03382ba7733670d7d226ce75f98dd64e554 (diff) | |
| parent | 6c033c34967b6dffb6a4b295c43bd151105e4f1f (diff) | |
Merge pull request #2472 from poettering/mini-fixes
Two mini fixes
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | man/resolved.conf.xml | 2 | ||||
| -rw-r--r-- | man/timesyncd.conf.xml | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 90bc5d7ddc..34b1f1941b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5304,7 +5304,7 @@ nodist_systemd_resolve_SOURCES = \ systemd_resolve_LDADD = \ libshared.la -rootlibexec_PROGRAMS += \ +bin_PROGRAMS += \ systemd-resolve tests += \ diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml index 3aa9c3acb1..f9e4d548e7 100644 --- a/man/resolved.conf.xml +++ b/man/resolved.conf.xml @@ -68,6 +68,8 @@ <refsect1> <title>Options</title> + <para>The following options are available in the <literal>[Resolve]</literal> section:</para> + <variablelist class='network-directives'> <varlistentry> diff --git a/man/timesyncd.conf.xml b/man/timesyncd.conf.xml index 10c2de89f6..8c86fd0074 100644 --- a/man/timesyncd.conf.xml +++ b/man/timesyncd.conf.xml @@ -68,6 +68,8 @@ <refsect1> <title>Options</title> + <para>The following settings are configured in the <literal>[Time]</literal> section:</para> + <variablelist class='network-directives'> <varlistentry> |