1 files changed, 7 insertions, 38 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 28934247..e56de210 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -153,29 +153,7 @@ plugins-=remove-me
       </varlistentry>
       <varlistentry>
         <term><varname>monitor-connection-files</varname></term>
-        <listitem><para>Whether the configured settings plugin(s)
-        should set up file monitors and immediately pick up changes
-        made to connection files while NetworkManager is running. This
-        is disabled by default; NetworkManager will only read
-        the connection files at startup, and when explicitly requested
-        via the ReloadConnections D-Bus call. If this key is set to
-        '<literal>true</literal>', then NetworkManager will reload
-        connection files any time they changed.
-        Automatic reloading is not advised because there are race conditions
-        involved and it depends on the way how the editor updates the file.
-        In some situations, NetworkManager might first delete and add the
-        connection anew, instead of updating the existing one. Also, NetworkManager
-        might pick up incomplete settings while the user is still editing the files.
-        </para><para>
-        Note that neither this setting nor restarting the NetworkManager daemon
-        is the advised way to reload connection profiles from disk. Instead, after
-        modifying the files reload them with <command>nmcli connection reload</command>
-        or <command>nmcli connection load "$FILENAME"</command>. Even better,
-        instead of modifying files directly, use NetworkManager tools like
-        <command>nmcli</command>, <command>nmtui</command> or the GUI.
-        </para><para>
-        This setting is deprecated and will have no effect in the future.
-        </para></listitem>
+        <listitem><para>This setting is deprecated and has no effect.</para></listitem>
       </varlistentry>
       <varlistentry>
         <term><varname>auth-polkit</varname></term>
@@ -328,8 +306,8 @@ no-auto-default=*
         <filename>/etc/resolv.conf</filename> to reflect the nameservers
         provided by currently active connections.</para>
         <para><literal>dnsmasq</literal>: NetworkManager will run
-        dnsmasq as a local caching nameserver, using a "split DNS"
-        configuration if you are connected to a VPN, and then update
+        dnsmasq as a local caching nameserver, using "Conditional Forwarding"
+        if you are connected to a VPN, and then update
         <filename>resolv.conf</filename> to point to the local
         nameserver. It is possible to pass custom options to the
         dnsmasq instance by adding them to files in the
@@ -343,8 +321,8 @@ no-auto-default=*
         <para><literal>systemd-resolved</literal>: NetworkManager will
         push the DNS configuration to systemd-resolved</para>
         <para><literal>unbound</literal>: NetworkManager will talk
-        to unbound and dnssec-triggerd, providing a "split DNS"
-        configuration with DNSSEC support. <filename>/etc/resolv.conf</filename>
+        to unbound and dnssec-triggerd, using "Conditional Forwarding"
+        with DNSSEC support. <filename>/etc/resolv.conf</filename>
         will be managed by dnssec-trigger daemon.</para>
         <para><literal>none</literal>: NetworkManager will not
         modify resolv.conf. This implies
@@ -1345,17 +1323,8 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16
         <term><varname>ibft</varname>, <varname>no-ibft</varname></term>
         <listitem>
           <para>
-            This plugin allows to read iBFT configuration (iSCSI Boot Firmware Table).
-            The configuration is read using <filename>/sbin/iscsiadm</filename>. Users are
-            expected to configure iBFT connections via the firmware interfaces.
-            If ibft support is available, it is automatically enabled after
-            <literal>ifcfg-rh</literal>. This can be disabled by <literal>no-ibft</literal>.
-            You can also explicitly specify <literal>ibft</literal> to load the
-            plugin without <literal>ifcfg-rh</literal> or to change the plugin order.
-          </para>
-          <para>
-            Note that ibft plugin uses <filename>/sbin/iscsiadm</filename> and thus requires
-            CAP_SYS_ADMIN capability.
+            These plugins are deprecated and their selection has no effect.
+            This is now handled by nm-initrd-generator.
           </para>
         </listitem>
       </varlistentry>