test/test-functions: avoid stderr noise, only umount on cleanup if mountpoint

[thirdparty/systemd.git] / man / resolvectl.xml

diff --git a/man/resolvectl.xml b/man/resolvectl.xml
index f986e98ba38f423c6e3598ccc45ba30831621e77..ccc1b378f8ceb00e39d595acd602b10c349432ba 100644 (file)
--- a/man/resolvectl.xml
+++ b/man/resolvectl.xml
@@ -200,7 +200,7 @@
       <varlistentry>
         <term><option>status [<replaceable>LINK</replaceable>…]</option></term>
 
-        <listitem><para>Shows the global and per-link DNS settings in currently in effect. If no command is specified,
+        <listitem><para>Shows the global and per-link DNS settings currently in effect. If no command is specified,
         this is the implied default.</para></listitem>
       </varlistentry>
 
@@ -247,15 +247,12 @@
 
         <listitem>
           <para>Get/set per-interface DNS configuration. These commands may be used to configure various DNS settings
-          for network interfaces that aren't managed by
-          <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>. (These
-          commands will fail when used on interfaces that are managed by <command>systemd-networkd</command>, please
-          configure their DNS settings directly inside the <filename>.network</filename> files instead.) These commands
-          may be used to inform <command>systemd-resolved</command> about per-interface DNS configuration determined
+          for network interfaces. These commands may be used to inform <command>systemd-resolved</command> or
+          <command>systemd-networkd</command> about per-interface DNS configuration determined
           through external means. The <option>dns</option> command expects IPv4 or IPv6 address specifications of DNS
           servers to use. The <option>domain</option> command expects valid DNS domains, possibly prefixed with
           <literal>~</literal>, and configures a per-interface search or route-only domain. The
-          <option>default-route</option> command expects a boolean paremeter, and configures whether the link may be
+          <option>default-route</option> command expects a boolean parameter, and configures whether the link may be
           used as default route for DNS lookups, i.e. if it is suitable for lookups on domains no other link explicitly
           is configured for. The <option>llmnr</option>, <option>mdns</option>, <option>dnssec</option> and
           <option>dnsovertls</option> commands may be used to configure the per-interface LLMNR, MulticastDNS, DNSSEC