about summary refs log tree commit diff
path: root/docs/libnm/html/NMSettingWired.html
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2017-09-20 21:04:54 +0200
committerMichael Biebl <biebl@debian.org>2017-09-20 21:04:54 +0200
commit93368eb67cd49313e1e38045010bb7a0bb46e4cf (patch)
treea6741acab28c156e6fde36c06d42262a1f89354b /docs/libnm/html/NMSettingWired.html
parent6591116fbf5ffe613921524c367b475ae0ac9628 (diff)
parentbdb6eeb0670658255c2a4c3c501c0a27fa8cfe55 (diff)
Updated version 1.8.4 from 'upstream/1.8.4'
with Debian dir 9aad7c38bece00cfa4099176de05bcb471d7445d
Diffstat (limited to 'docs/libnm/html/NMSettingWired.html')
-rw-r--r--docs/libnm/html/NMSettingWired.html3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/libnm/html/NMSettingWired.html b/docs/libnm/html/NMSettingWired.html
index e4965e4b..4c943708 100644
--- a/docs/libnm/html/NMSettingWired.html
+++ b/docs/libnm/html/NMSettingWired.html
@@ -1426,7 +1426,8 @@ This is known as MAC cloning or spoofing.</p>
 <p>Beside explicitly specifing a MAC address, the special values "preserve", "permanent",
 "random" and "stable" are supported.
 "preserve" means not to touch the MAC address on activation.
-"permanent" means to use the permanent hardware address of the device.
+"permanent" means to use the permanent hardware address if the device
+has one (otherwise this is treated as "preserve").
 "random" creates a random MAC address on each connect.
 "stable" creates a hashed MAC address based on connection.stable-id and a
 machine dependent key.</p>