about summary refs log tree commit diff
path: root/docs/api/html/NetworkManager.html
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2019-01-25 11:26:25 +0100
committerSebastien Bacher <seb128@ubuntu.com>2019-01-25 11:26:25 +0100
commitf54a568880bf47c2ea54c9b30d291156b34d6539 (patch)
treeaab9bb44b306da7651e8caf38bbab5cfeeb81b7d /docs/api/html/NetworkManager.html
parente8ac7dacdcf4b38addef4f8ac6ab038f9d29582c (diff)
parentbbae86d3d2997a853ca0365e8eb7a3ca7489ee09 (diff)
Update upstream source from tag 'upstream/1.15.2'
Update to upstream version '1.15.2'
with Debian dir b4be4b7cfce96679a31cb9d423107789761e3b49
Diffstat (limited to 'docs/api/html/NetworkManager.html')
-rw-r--r--docs/api/html/NetworkManager.html27
1 files changed, 10 insertions, 17 deletions
diff --git a/docs/api/html/NetworkManager.html b/docs/api/html/NetworkManager.html
index 0b0a254e..c30db5e4 100644
--- a/docs/api/html/NetworkManager.html
+++ b/docs/api/html/NetworkManager.html
@@ -8,7 +8,7 @@
 <link rel="up" href="manpages.html" title="Part I. Manual Pages">
 <link rel="prev" href="manpages.html" title="Part I. Manual Pages">
 <link rel="next" href="NetworkManager.conf.html" title="NetworkManager.conf">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -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>
@@ -552,6 +545,6 @@
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file