diff options
| author | Michael Biebl <biebl@debian.org> | 2019-03-26 23:26:14 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-03-26 23:26:14 +0100 |
| commit | 9bc3ff81969c896f6bf8e1c93f98f43f6ffffaf8 (patch) | |
| tree | 302fce2d1ab3a130ac0b684d168ab6312825fcd2 /man/NetworkManager.xml | |
| parent | f97666c6bd29a3228443acd6401a407a19ec8d25 (diff) | |
| parent | 9a6dcbf895f9da01768e64b73cec88c16157d91e (diff) | |
Update upstream source from tag 'upstream/1.16.0'
Update to upstream version '1.16.0' with Debian dir a0f3ffb137940d423625faae8bedbaced4d34cda
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> |