New upstream version 1.4.2 upstream/1.4.2

1 files changed, 6 insertions, 3 deletions

diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index db381f07..acb75c2e 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -297,9 +297,9 @@ no-auto-default=*
       <varlistentry>
         <term><varname>rc-manager</varname></term>
         <listitem><para>Set the <filename>resolv.conf</filename>
-        management mode. The default value depends on how NetworkManager
-        was built, whereas this version of NetworkManager was build with
-        a default of "<literal>&NM_CONFIG_DEFAULT_DNS_RC_MANAGER;</literal>".
+        management mode. The default value depends on NetworkManager build
+        options, and this version of NetworkManager was build with a default of
+        "<literal>&NM_CONFIG_DEFAULT_DNS_RC_MANAGER;</literal>".
         Regardless of this setting, NetworkManager will
         always write resolv.conf to its runtime state directory.</para>
         <para><literal>symlink</literal>: NetworkManager will symlink
@@ -1058,6 +1058,9 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16
             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 /sbin/iscsiadm and thus requires CAP_SYS_ADMIN capability.
+          </para>
         </listitem>
       </varlistentry>