6 files changed, 18 insertions, 9 deletions
diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html
index a7372abc..0ec4eca5 100644
--- a/docs/libnm/html/NMSettingConnection.html
+++ b/docs/libnm/html/NMSettingConnection.html
@@ -1791,9 +1791,10 @@ the change takes effect immediately.</p>
 <pre class="programlisting">  “permissions”              <span class="type">GStrv</span></pre>
 <p>An array of strings defining what access a given user has to this
 connection.  If this is <code class="literal">NULL</code> or empty, all users are allowed to access
-this connection.  Otherwise a user is allowed to access this connection
-if and only if they are in this list. Each entry is of the form
-"[type]:[id]:[reserved]"; for example, "user:dcbw:blah".</p>
+this connection; otherwise users are allowed if and only if they are in
+this list.  When this is not empty, the connection can be active only when
+one of the specified users is logged into an active session.  Each entry
+is of the form "[type]:[id]:[reserved]"; for example, "user:dcbw:blah".</p>
 <p>At this time only the "user" [type] is allowed.  Any other values are
 ignored and reserved for future use.  [id] is the username that this
 permission refers to, which may not contain the ":" character. Any
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>
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>
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html
index cf5977db..cac0a3b4 100644
--- a/docs/libnm/html/index.html
+++ b/docs/libnm/html/index.html
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm 1.8.2
+      for libnm 1.8.4
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://developer.gnome.org/libnm/stable/" target="_top">https://developer.gnome.org/libnm/stable/</a>.
diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html
index 10468905..482dd8a0 100644
--- a/docs/libnm/html/libnm-nm-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-dbus-interface.html
@@ -2720,7 +2720,7 @@ VPN plugin authentication dialogs.</p>
 <td class="enum_member_name"><p><a name="NM-CHECKPOINT-CREATE-FLAG-DELETE-NEW-CONNECTIONS:CAPS"></a>NM_CHECKPOINT_CREATE_FLAG_DELETE_NEW_CONNECTIONS</p></td>
 <td class="enum_member_description">
 <p>upon rollback,
-  delete any new connection added after the checkpoint.</p>
+  delete any new connection added after the checkpoint (Since: 1.6)</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
@@ -2728,7 +2728,7 @@ VPN plugin authentication dialogs.</p>
 <td class="enum_member_name"><p><a name="NM-CHECKPOINT-CREATE-FLAG-DISCONNECT-NEW-DEVICES:CAPS"></a>NM_CHECKPOINT_CREATE_FLAG_DISCONNECT_NEW_DEVICES</p></td>
 <td class="enum_member_description">
 <p>upon rollback,
-  disconnect any new device appeared after the checkpoint.</p>
+  disconnect any new device appeared after the checkpoint (Since: 1.6)</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
diff --git a/docs/libnm/html/usage.html b/docs/libnm/html/usage.html
index e4a67a43..d45e8f18 100644
--- a/docs/libnm/html/usage.html
+++ b/docs/libnm/html/usage.html
@@ -96,7 +96,7 @@
         </p>
 <pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>cc $(pkg-config --libs --cflags libnm) -o hello-nm hello-nm.c</code></strong>
   <code class="prompt">$ </code><strong class="userinput"><code>./hello-nm</code></strong>
-  NetworkManager version: 1.8.2
+  NetworkManager version: 1.8.4
 
   <code class="prompt">$ </code></pre>
 <p>