summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
Diffstat (limited to 'man')
-rw-r--r--man/hwdb.xml8
-rw-r--r--man/sd_bus_creds_get_pid.xml6
-rw-r--r--man/timesyncd.conf.xml4
3 files changed, 9 insertions, 9 deletions
diff --git a/man/hwdb.xml b/man/hwdb.xml
index e6215df738..8a6e26d089 100644
--- a/man/hwdb.xml
+++ b/man/hwdb.xml
@@ -43,15 +43,13 @@
<refsect1><title>Hardware Database Files</title>
<para>The hwdb files are read from the files located in the
- system hwdb directory <filename>&udevlibexecdir;/hwdb.d</filename>,
- the volatile runtime directory <filename>/run/udev/hwdb.d</filename>
+ system hwdb directory <filename>&udevlibexecdir;/hwdb.d</filename>
and the local administration directory <filename>/etc/udev/hwdb.d</filename>.
All hwdb files are collectively sorted and processed in lexical order,
regardless of the directories in which they live. However, files with
identical filenames replace each other. Files in <filename>/etc</filename>
- have the highest priority, files in <filename>/run</filename> take precedence
- over files with the same name in <filename>&rootprefix;/lib</filename>. This can be
- used to override a system-supplied hwdb file with a local file if needed;
+ take precedence over files with the same name in <filename>&rootprefix;/lib</filename>.
+ This can be used to override a system-supplied hwdb file with a local file if needed;
a symlink in <filename>/etc</filename> with the same name as a hwdb file in
<filename>&rootprefix;/lib</filename>, pointing to <filename>/dev/null</filename>,
disables the hwdb file entirely. hwdb files must have the extension
diff --git a/man/sd_bus_creds_get_pid.xml b/man/sd_bus_creds_get_pid.xml
index 54714dea1d..8a193d5a59 100644
--- a/man/sd_bus_creds_get_pid.xml
+++ b/man/sd_bus_creds_get_pid.xml
@@ -299,10 +299,12 @@
identified by the specified PID, with
<citerefentry><refentrytitle>sd_bus_get_name_creds</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
in which case they describe the credentials of a bus peer
- identified by the specified bus name, or with
+ identified by the specified bus name, with
<citerefentry><refentrytitle>sd_bus_get_owner_creds</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
in which case they describe the credentials of the creator of a
- bus.</para>
+ bus, or with
+ <citerefentry><refentrytitle>sd_bus_message_get_creds</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+ in which case they describe the credentials of the sender of the message.</para>
<para><function>sd_bus_creds_get_pid()</function> will retrieve
the PID (process identifier). Similar,
diff --git a/man/timesyncd.conf.xml b/man/timesyncd.conf.xml
index c297d3254c..ee054f9ef1 100644
--- a/man/timesyncd.conf.xml
+++ b/man/timesyncd.conf.xml
@@ -75,13 +75,13 @@
<varlistentry>
<term><varname>NTP=</varname></term>
- <listitem><para>A space separated list of NTP servers host
+ <listitem><para>A space separated list of NTP server host
names or IP addresses. During runtime this list is combined
with any per-interface NTP servers acquired from
<citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
systemd-timesyncd will contact all configured system or
per-interface servers in turn until one is found that
- responds. This setting defaults to the empty
+ responds. This setting defaults to an empty
list.</para></listitem>
</varlistentry>