diff --git a/libnm-core/nm-setting-user.c b/libnm-core/nm-setting-user.c
index 6c1d152aa9..049607e146 100644
--- a/libnm-core/nm-setting-user.c
+++ b/libnm-core/nm-setting-user.c
@@ -597,6 +597,18 @@ nm_setting_user_class_init (NMSettingUserClass *klass)
 	 *
 	 * Since: 1.8
 	 **/
+	/* ---ifcfg-rh---
+	 * property: data
+	 * variable: NM_USER_*
+	 * description: each key/value pair is stored as a separate variable with
+	 *   name composed by concatenating NM_USER_ with the encoded key. The key is
+	 *   encoded by substituting lowercase letters with uppercase and prepending
+	 *   uppercase letters with an underscore. A dot is encoded as a double
+	 *   underscore. Remaining characters are encoded as underscore followed by a
+	 *   3 digit octal representation of the character.
+	 * example: NM_USER_FOO__BAR=something
+	 * ---end---
+	 */
 	obj_properties[PROP_DATA] =
 	    g_param_spec_boxed (NM_SETTING_USER_DATA, "", "",
 	                        G_TYPE_HASH_TABLE,
diff --git a/libnm/generate-plugin-docs.pl b/libnm/generate-plugin-docs.pl
index 405c6e1164..24912a0372 100755
--- a/libnm/generate-plugin-docs.pl
+++ b/libnm/generate-plugin-docs.pl
@@ -75,9 +75,11 @@ write_header();
 foreach my $c_file (@source_files) {
   my $path = "$srcdir/$c_file";
   my $setting_name = get_setting_name($path);
-  write_item("<setting name=\"$setting_name\">");
-  scan_doc_comments($path, $start_tag, $end_tag);
-  write_item("</setting>");
+  if ($setting_name) {
+    write_item("<setting name=\"$setting_name\">");
+    scan_doc_comments($path, $start_tag, $end_tag);
+    write_item("</setting>");
+  }
 }
 
 # write XML footer
diff --git a/man/nm-settings-ifcfg-rh.xsl b/man/nm-settings-ifcfg-rh.xsl
index 0dc5394ee6..aef30fd104 100644
--- a/man/nm-settings-ifcfg-rh.xsl
+++ b/man/nm-settings-ifcfg-rh.xsl
@@ -17,7 +17,6 @@
       />
 
   <xsl:template match="nm-ifcfg-rh-docs">
-    <xsl:variable name="unsupported" select="'adsl, bluetooth, ppp, pppoe, serial, generic, gsm, cdma, 802-11-olpc-mesh, wimax, vpn'"/>
     <refentry id="nm-settings-ifcfg-rh">
       <refentryinfo>
         <title>nm-settings-ifcfg-rh</title>
@@ -328,8 +327,8 @@ DEVICETYPE=TeamPort
 
   <xsl:template match="setting">
     <xsl:variable name="setting_name" select="../@name"/>
-    <xsl:variable name="unsupported" select="'adsl, bluetooth, ppp, pppoe, serial, generic, gsm, cdma, 802-11-olpc-mesh, wimax, vpn, macvlan, vxlan, tun, ip-tunnel'"/>
-      <xsl:if test="not (contains($unsupported, @name))">
+    <xsl:variable name="unsupported" select="'802-11-olpc-mesh, adsl, bluetooth, cdma, dummy, generic, gsm, ip-tunnel, macsec, macvlan, ppp, pppoe, serial, tun, vpn, vxlan, wimax'"/>
+      <xsl:if test="not (contains(concat(' ', $unsupported, ','), concat(' ', @name, ',')))">
         <table>
           <title><xsl:value-of select="@name"/> setting</title>
           <tgroup cols="4">