From 270c4830551c9810ad4e83f9a1db2b1cb946208c Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Sat, 1 Oct 2016 00:33:49 +0200
Subject: New upstream version 1.4.2

---
 docs/api/html/NetworkManager.conf.html | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'docs/api/html/NetworkManager.conf.html')

diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html
index f9327a60..5c404c47 100644
--- a/docs/api/html/NetworkManager.conf.html
+++ b/docs/api/html/NetworkManager.conf.html
@@ -288,9 +288,9 @@ no-auto-default=*
 <td><p><span class="term"><code class="varname">rc-manager</code></span></p></td>
 <td>
 <p>Set the <code class="filename">resolv.conf</code>
-        management mode. The default value depends on how NetworkManager
-        was built, whereas this version of NetworkManager was build with
-        a default of "<code class="literal">symlink</code>".
+        management mode. The default value depends on NetworkManager build
+        options, and this version of NetworkManager was build with a default of
+        "<code class="literal">symlink</code>".
         Regardless of this setting, NetworkManager will
         always write resolv.conf to its runtime state directory.</p>
 <p><code class="literal">symlink</code>: NetworkManager will symlink
@@ -361,7 +361,7 @@ no-auto-default=*
 <tr>
 <td><p><span class="term"><code class="varname">path</code></span></p></td>
 <td><p>The location where keyfiles are read and stored.
-            This defaults to "<code class="filename">/etc/NetworkManager/conf.d</code>".
+            This defaults to "<code class="filename">${prefix}/etc/NetworkManager/conf.d</code>".
             </p></td>
 </tr>
 <tr>
@@ -1063,7 +1063,8 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16
 </tr>
 <tr>
 <td><p><span class="term"><code class="varname">ibft</code>, <code class="varname">no-ibft</code></span></p></td>
-<td><p>
+<td>
+<p>
             This plugin allows to read iBFT configuration (iSCSI Boot Firmware Table).
             The configuration is read using /sbin/iscsiadm. Users are expected to
             configure iBFT connections via the firmware interfaces.
@@ -1071,7 +1072,11 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16
             <code class="literal">ifcfg-rh</code>. This can be disabled by <code class="literal">no-ibft</code>.
             You can also explicitly specify <code class="literal">ibft</code> to load the
             plugin without <code class="literal">ifcfg-rh</code> or to change the plugin order.
-          </p></td>
+          </p>
+<p>
+            Note that ibft plugin uses /sbin/iscsiadm and thus requires CAP_SYS_ADMIN capability.
+          </p>
+</td>
 </tr>
 </tbody>
 </table></div>
-- 
cgit 1.3.0-6-gf8a5