From bdb6eeb0670658255c2a4c3c501c0a27fa8cfe55 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Wed, 20 Sep 2017 21:04:15 +0200
Subject: New upstream version 1.8.4

---
 docs/libnm/html/NMSettingIP4Config.html | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'docs/libnm/html/NMSettingIP4Config.html')

diff --git a/docs/libnm/html/NMSettingIP4Config.html b/docs/libnm/html/NMSettingIP4Config.html
index 46e11c1a..e83eee7f 100644
--- a/docs/libnm/html/NMSettingIP4Config.html
+++ b/docs/libnm/html/NMSettingIP4Config.html
@@ -311,7 +311,14 @@ through that interface to the default network.</p>
 <a name="NMSettingIP4Config--dhcp-client-id"></a><h3>The <code class="literal">“dhcp-client-id”</code> property</h3>
 <pre class="programlisting">  “dhcp-client-id”           <span class="type">gchar</span> *</pre>
 <p>A string sent to the DHCP server to identify the local machine which the
-DHCP server may use to customize the DHCP lease and options.</p>
+DHCP server may use to customize the DHCP lease and options.
+When the property is a hex string ('aa:bb:cc') it is interpreted as a
+binary client ID, in which case the first byte is assumed to be the
+'type' field as per RFC 2132 section 9.14 and the remaining bytes may be
+an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet
+ARP type and the rest is a MAC address).
+If the property is not a hex string it is considered as a
+non-hardware-address client ID and the 'type' field is set to 0.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
-- 
cgit 1.3.0-6-gf8a5