summary refs log tree commit diff
path: root/docs/api/html/NetworkManager.html
diff options
context:
space:
mode:
Diffstat (limited to 'docs/api/html/NetworkManager.html')
-rw-r--r--docs/api/html/NetworkManager.html23
1 files changed, 8 insertions, 15 deletions
diff --git a/docs/api/html/NetworkManager.html b/docs/api/html/NetworkManager.html
index fbb7dd99..c30db5e4 100644
--- a/docs/api/html/NetworkManager.html
+++ b/docs/api/html/NetworkManager.html
@@ -38,7 +38,7 @@
       The NetworkManager daemon attempts to make networking
       configuration and operation as painless and automatic as
       possible by managing the primary network connection and other
-      network interfaces, like Ethernet, WiFi, and Mobile Broadband
+      network interfaces, like Ethernet, Wi-Fi, and Mobile Broadband
       devices.  NetworkManager will connect any network device when a
       connection for that device becomes available, unless that
       behavior is disabled.  Information about networking is exported
@@ -436,20 +436,13 @@
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="varname">NM_UNMANAGED</code></span></p></td>
-<td>
-<p>
-          No default connection will be created and automatic activation
-          will not be attempted when this property of a device is set to a
-          true value ("1" or "true"). You will still be able to attach a
-          connection to the device manually or observe externally added
-          configuration such as addresses or routes.
-        </p>
-<p>
-          Create an udev rule that sets this property to prevent NetworkManager
-          from interfering with virtual Ethernet device interfaces that are
-          managed by virtualization tools.
-        </p>
-</td>
+<td><p>
+          If set to <code class="literal">"1"</code> or <code class="literal">"true"</code>, the device is
+          configured as unmanaged by NetworkManager. Note that the user still can
+          explicitly overrule this configuration via means like
+          <span class="command"><strong>nmcli device set "$DEVICE" managed yes</strong></span> or
+          <code class="literal">"device*.managed=1"</code> in NetworkManager.conf.
+        </p></td>
 </tr></tbody>
 </table></div>
 </div>