diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 11:26:25 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 11:26:25 +0100 |
| commit | f54a568880bf47c2ea54c9b30d291156b34d6539 (patch) | |
| tree | aab9bb44b306da7651e8caf38bbab5cfeeb81b7d /man/NetworkManager.xml | |
| parent | e8ac7dacdcf4b38addef4f8ac6ab038f9d29582c (diff) | |
| parent | bbae86d3d2997a853ca0365e8eb7a3ca7489ee09 (diff) | |
Update upstream source from tag 'upstream/1.15.2'
Update to upstream version '1.15.2' with Debian dir b4be4b7cfce96679a31cb9d423107789761e3b49
Diffstat (limited to 'man/NetworkManager.xml')
| -rw-r--r-- | man/NetworkManager.xml | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/man/NetworkManager.xml b/man/NetworkManager.xml index f78a44f4..2a13671b 100644 --- a/man/NetworkManager.xml +++ b/man/NetworkManager.xml @@ -55,7 +55,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 @@ -437,16 +437,13 @@ <varlistentry> <term><varname>NM_UNMANAGED</varname></term> <listitem><para> - 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. - </para><para> - Create an udev rule that sets this property to prevent NetworkManager - from interfering with virtual Ethernet device interfaces that are - managed by virtualization tools. - </para></listitem> + If set to <literal>"1"</literal> or <literal>"true"</literal>, the device is + configured as unmanaged by NetworkManager. Note that the user still can + explicitly overrule this configuration via means like + <command>nmcli device set "$DEVICE" managed yes</command> or + <literal>"device*.managed=1"</literal> in NetworkManager.conf. + </para> + </listitem> </varlistentry> </variablelist> </refsect1> |