Imported Upstream version 0.9.5.96 upstream/0.9.5.96

10 files changed, 56 insertions, 127 deletions

diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in
index de0a694a..2d444e76 100644
--- a/docs/libnm-util/Makefile.in
+++ b/docs/libnm-util/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -60,11 +60,11 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -434,6 +434,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/gtk-doc.make:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -503,10 +504,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index 339919d2..f83cfc86 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -59,11 +59,6 @@ enum                <a class="link" href="NMSettingConnection.html#NMSettingConn
 #define             <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-TYPE:CAPS" title="NM_SETTING_CONNECTION_TYPE">NM_SETTING_CONNECTION_TYPE</a>
 #define             <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-UUID:CAPS" title="NM_SETTING_CONNECTION_UUID">NM_SETTING_CONNECTION_UUID</a>
 #define             <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE:CAPS" title="NM_SETTING_CONNECTION_ZONE">NM_SETTING_CONNECTION_ZONE</a>
-#define             <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-BLOCK:CAPS" title="NM_SETTING_CONNECTION_ZONE_BLOCK">NM_SETTING_CONNECTION_ZONE_BLOCK</a>
-#define             <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-HOME:CAPS" title="NM_SETTING_CONNECTION_ZONE_HOME">NM_SETTING_CONNECTION_ZONE_HOME</a>
-#define             <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-PUBLIC:CAPS" title="NM_SETTING_CONNECTION_ZONE_PUBLIC">NM_SETTING_CONNECTION_ZONE_PUBLIC</a>
-#define             <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-TRUSTED:CAPS" title="NM_SETTING_CONNECTION_ZONE_TRUSTED">NM_SETTING_CONNECTION_ZONE_TRUSTED</a>
-#define             <a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-WORK:CAPS" title="NM_SETTING_CONNECTION_ZONE_WORK">NM_SETTING_CONNECTION_ZONE_WORK</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="NMSettingConnection.html#nm-setting-connection-add-permission" title="nm_setting_connection_add_permission ()">nm_setting_connection_add_permission</a>
                                                         (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *ptype</code></em>,
@@ -312,46 +307,6 @@ Describes errors that may result from operations involving a
 </div>
 <hr>
 <div class="refsect2">
-<a name="NM-SETTING-CONNECTION-ZONE-BLOCK:CAPS"></a><h3>NM_SETTING_CONNECTION_ZONE_BLOCK</h3>
-<pre class="programlisting">#define NM_SETTING_CONNECTION_ZONE_BLOCK     "block"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-SETTING-CONNECTION-ZONE-HOME:CAPS"></a><h3>NM_SETTING_CONNECTION_ZONE_HOME</h3>
-<pre class="programlisting">#define NM_SETTING_CONNECTION_ZONE_HOME      "home"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-SETTING-CONNECTION-ZONE-PUBLIC:CAPS"></a><h3>NM_SETTING_CONNECTION_ZONE_PUBLIC</h3>
-<pre class="programlisting">#define NM_SETTING_CONNECTION_ZONE_PUBLIC    "public"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-SETTING-CONNECTION-ZONE-TRUSTED:CAPS"></a><h3>NM_SETTING_CONNECTION_ZONE_TRUSTED</h3>
-<pre class="programlisting">#define NM_SETTING_CONNECTION_ZONE_TRUSTED   "trusted"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="NM-SETTING-CONNECTION-ZONE-WORK:CAPS"></a><h3>NM_SETTING_CONNECTION_ZONE_WORK</h3>
-<pre class="programlisting">#define NM_SETTING_CONNECTION_ZONE_WORK      "work"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2">
 <a name="nm-setting-connection-add-permission"></a><h3>nm_setting_connection_add_permission ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_setting_connection_add_permission
                                                         (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index 7ceff0ba..053cb332 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -2261,26 +2261,6 @@ NM_SETTING_ADSL_VPI, macro in NMSettingAdsl
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-BLOCK:CAPS" title="NM_SETTING_CONNECTION_ZONE_BLOCK">NM_SETTING_CONNECTION_ZONE_BLOCK</a>, macro in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-HOME:CAPS" title="NM_SETTING_CONNECTION_ZONE_HOME">NM_SETTING_CONNECTION_ZONE_HOME</a>, macro in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-PUBLIC:CAPS" title="NM_SETTING_CONNECTION_ZONE_PUBLIC">NM_SETTING_CONNECTION_ZONE_PUBLIC</a>, macro in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-TRUSTED:CAPS" title="NM_SETTING_CONNECTION_ZONE_TRUSTED">NM_SETTING_CONNECTION_ZONE_TRUSTED</a>, macro in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-WORK:CAPS" title="NM_SETTING_CONNECTION_ZONE_WORK">NM_SETTING_CONNECTION_ZONE_WORK</a>, macro in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="NMSetting.html#nm-setting-diff" title="nm_setting_diff ()">nm_setting_diff</a>, function in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
 </dt>
 <dd></dd>
@@ -3858,6 +3838,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libnm-util-nm-utils.html#nm-utils-file-is-pkcs12" title="nm_utils_file_is_pkcs12 ()">nm_utils_file_is_pkcs12</a>, function in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libnm-util-nm-utils.html#nm-utils-gvalue-hash-dup" title="nm_utils_gvalue_hash_dup ()">nm_utils_gvalue_hash_dup</a>, function in <a class="link" href="libnm-util-nm-utils.html" title="nm-utils">nm-utils</a>
 </dt>
 <dd></dd>
diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index 1cddc6b2..39768bae 100644
--- a/docs/libnm-util/html/ch01.html
+++ b/docs/libnm-util/html/ch01.html
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id507708"></a>libnm-util API Reference</h2></div></div></div>
+<a name="id397030"></a>libnm-util API Reference</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="NMConnection.html">NMConnection</a></span><span class="refpurpose"> — Describes a connection to specific network or provider</span>
diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml
index c2b27338..e8f2d4ea 100644
--- a/docs/libnm-util/html/index.sgml
+++ b/docs/libnm-util/html/index.sgml
@@ -161,11 +161,6 @@
 <ANCHOR id="NM-SETTING-CONNECTION-TYPE:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-TYPE:CAPS">
 <ANCHOR id="NM-SETTING-CONNECTION-UUID:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-UUID:CAPS">
 <ANCHOR id="NM-SETTING-CONNECTION-ZONE:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE:CAPS">
-<ANCHOR id="NM-SETTING-CONNECTION-ZONE-BLOCK:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-BLOCK:CAPS">
-<ANCHOR id="NM-SETTING-CONNECTION-ZONE-HOME:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-HOME:CAPS">
-<ANCHOR id="NM-SETTING-CONNECTION-ZONE-PUBLIC:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-PUBLIC:CAPS">
-<ANCHOR id="NM-SETTING-CONNECTION-ZONE-TRUSTED:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-TRUSTED:CAPS">
-<ANCHOR id="NM-SETTING-CONNECTION-ZONE-WORK:CAPS" href="libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-WORK:CAPS">
 <ANCHOR id="nm-setting-connection-add-permission" href="libnm-util/NMSettingConnection.html#nm-setting-connection-add-permission">
 <ANCHOR id="nm-setting-connection-error-quark" href="libnm-util/NMSettingConnection.html#nm-setting-connection-error-quark">
 <ANCHOR id="nm-setting-connection-get-autoconnect" href="libnm-util/NMSettingConnection.html#nm-setting-connection-get-autoconnect">
@@ -1261,6 +1256,7 @@
 <ANCHOR id="NM-UTILS-HWADDR-LEN-MAX:CAPS" href="libnm-util/libnm-util-nm-utils.html#NM-UTILS-HWADDR-LEN-MAX:CAPS">
 <ANCHOR id="nm-utils-deinit" href="libnm-util/libnm-util-nm-utils.html#nm-utils-deinit">
 <ANCHOR id="nm-utils-escape-ssid" href="libnm-util/libnm-util-nm-utils.html#nm-utils-escape-ssid">
+<ANCHOR id="nm-utils-file-is-pkcs12" href="libnm-util/libnm-util-nm-utils.html#nm-utils-file-is-pkcs12">
 <ANCHOR id="nm-utils-gvalue-hash-dup" href="libnm-util/libnm-util-nm-utils.html#nm-utils-gvalue-hash-dup">
 <ANCHOR id="nm-utils-hwaddr-atoba" href="libnm-util/libnm-util-nm-utils.html#nm-utils-hwaddr-atoba">
 <ANCHOR id="nm-utils-hwaddr-aton" href="libnm-util/libnm-util-nm-utils.html#nm-utils-hwaddr-aton">
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index a4404b33..92edd6e8 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -47,6 +47,7 @@ enum                <a class="link" href="libnm-util-nm-utils.html#NMUtilsSecuri
 <span class="returnvalue">void</span>                <a class="link" href="libnm-util-nm-utils.html#nm-utils-deinit" title="nm_utils_deinit ()">nm_utils_deinit</a>                     (<em class="parameter"><code><span class="type">void</span></code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="libnm-util-nm-utils.html#nm-utils-escape-ssid" title="nm_utils_escape_ssid ()">nm_utils_escape_ssid</a>                (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> *ssid</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> len</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libnm-util-nm-utils.html#nm-utils-file-is-pkcs12" title="nm_utils_file_is_pkcs12 ()">nm_utils_file_is_pkcs12</a>             (<em class="parameter"><code>const <span class="type">char</span> *filename</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        <a class="link" href="libnm-util-nm-utils.html#nm-utils-gvalue-hash-dup" title="nm_utils_gvalue_hash_dup ()">nm_utils_gvalue_hash_dup</a>            (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *hash</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="returnvalue">GByteArray</span></a> *        <a class="link" href="libnm-util-nm-utils.html#nm-utils-hwaddr-atoba" title="nm_utils_hwaddr_atoba ()">nm_utils_hwaddr_atoba</a>               (<em class="parameter"><code>const <span class="type">char</span> *asc</code></em>,
                                                          <em class="parameter"><code><span class="type">int</span> type</code></em>);
@@ -250,6 +251,27 @@ and will be overwritten by subsequent calls to this function</td>
 </div>
 <hr>
 <div class="refsect2">
+<a name="nm-utils-file-is-pkcs12"></a><h3>nm_utils_file_is_pkcs12 ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_utils_file_is_pkcs12             (<em class="parameter"><code>const <span class="type">char</span> *filename</code></em>);</pre>
+<p>
+Utility function to find out if the <em class="parameter"><code>filename</code></em> is in PKCS<span class="type">12</span> format.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
+<td>name of the file to test</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>TRUE if the file is PKCS<span class="type">12</span>, FALSE if it is not</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="nm-utils-gvalue-hash-dup"></a><h3>nm_utils_gvalue_hash_dup ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        nm_utils_gvalue_hash_dup            (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *hash</code></em>);</pre>
 <p>
diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2
index fb3955a3..93646eec 100644
--- a/docs/libnm-util/html/libnm-util.devhelp2
+++ b/docs/libnm-util/html/libnm-util.devhelp2
@@ -135,11 +135,6 @@
     <keyword type="macro" name="NM_SETTING_CONNECTION_TYPE" link="NMSettingConnection.html#NM-SETTING-CONNECTION-TYPE:CAPS"/>
     <keyword type="macro" name="NM_SETTING_CONNECTION_UUID" link="NMSettingConnection.html#NM-SETTING-CONNECTION-UUID:CAPS"/>
     <keyword type="macro" name="NM_SETTING_CONNECTION_ZONE" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_CONNECTION_ZONE_BLOCK" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-BLOCK:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_CONNECTION_ZONE_HOME" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-HOME:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_CONNECTION_ZONE_PUBLIC" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-PUBLIC:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_CONNECTION_ZONE_TRUSTED" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-TRUSTED:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_CONNECTION_ZONE_WORK" link="NMSettingConnection.html#NM-SETTING-CONNECTION-ZONE-WORK:CAPS"/>
     <keyword type="function" name="nm_setting_connection_add_permission ()" link="NMSettingConnection.html#nm-setting-connection-add-permission"/>
     <keyword type="function" name="nm_setting_connection_error_quark ()" link="NMSettingConnection.html#nm-setting-connection-error-quark"/>
     <keyword type="function" name="nm_setting_connection_get_autoconnect ()" link="NMSettingConnection.html#nm-setting-connection-get-autoconnect"/>
@@ -956,6 +951,7 @@
     <keyword type="macro" name="NM_UTILS_HWADDR_LEN_MAX" link="libnm-util-nm-utils.html#NM-UTILS-HWADDR-LEN-MAX:CAPS"/>
     <keyword type="function" name="nm_utils_deinit ()" link="libnm-util-nm-utils.html#nm-utils-deinit"/>
     <keyword type="function" name="nm_utils_escape_ssid ()" link="libnm-util-nm-utils.html#nm-utils-escape-ssid"/>
+    <keyword type="function" name="nm_utils_file_is_pkcs12 ()" link="libnm-util-nm-utils.html#nm-utils-file-is-pkcs12"/>
     <keyword type="function" name="nm_utils_gvalue_hash_dup ()" link="libnm-util-nm-utils.html#nm-utils-gvalue-hash-dup"/>
     <keyword type="function" name="nm_utils_hwaddr_atoba ()" link="libnm-util-nm-utils.html#nm-utils-hwaddr-atoba"/>
     <keyword type="function" name="nm_utils_hwaddr_aton ()" link="libnm-util-nm-utils.html#nm-utils-hwaddr-aton"/>
diff --git a/docs/libnm-util/libnm-util-sections.txt b/docs/libnm-util/libnm-util-sections.txt
index c55c690f..dceb61b7 100644
--- a/docs/libnm-util/libnm-util-sections.txt
+++ b/docs/libnm-util/libnm-util-sections.txt
@@ -374,11 +374,6 @@ NM_SETTING_CONNECTION_TIMESTAMP
 NM_SETTING_CONNECTION_TYPE
 NM_SETTING_CONNECTION_UUID
 NM_SETTING_CONNECTION_ZONE
-NM_SETTING_CONNECTION_ZONE_BLOCK
-NM_SETTING_CONNECTION_ZONE_HOME
-NM_SETTING_CONNECTION_ZONE_PUBLIC
-NM_SETTING_CONNECTION_ZONE_TRUSTED
-NM_SETTING_CONNECTION_ZONE_WORK
 nm_setting_connection_add_permission
 nm_setting_connection_error_quark
 nm_setting_connection_get_autoconnect
@@ -1074,6 +1069,7 @@ NMUtilsSecurityType
 NM_UTILS_HWADDR_LEN_MAX
 nm_utils_deinit
 nm_utils_escape_ssid
+nm_utils_file_is_pkcs12
 nm_utils_gvalue_hash_dup
 nm_utils_hwaddr_atoba
 nm_utils_hwaddr_aton
diff --git a/docs/libnm-util/tmpl/nm-setting-connection.sgml b/docs/libnm-util/tmpl/nm-setting-connection.sgml
index cee42ea4..751b1a19 100644
--- a/docs/libnm-util/tmpl/nm-setting-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-connection.sgml
@@ -182,41 +182,6 @@ NMSettingConnection
 
 
 
-<!-- ##### MACRO NM_SETTING_CONNECTION_ZONE_BLOCK ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_ZONE_HOME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_ZONE_PUBLIC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_ZONE_TRUSTED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NM_SETTING_CONNECTION_ZONE_WORK ##### -->
-<para>
-
-</para>
-
-
-
 <!-- ##### FUNCTION nm_setting_connection_add_permission ##### -->
 <para>
 
diff --git a/docs/libnm-util/tmpl/nm-utils.sgml b/docs/libnm-util/tmpl/nm-utils.sgml
index 9195b502..f7ee74c1 100644
--- a/docs/libnm-util/tmpl/nm-utils.sgml
+++ b/docs/libnm-util/tmpl/nm-utils.sgml
@@ -60,6 +60,15 @@ nm-utils
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_utils_file_is_pkcs12 ##### -->
+<para>
+
+</para>
+
+@filename: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_utils_gvalue_hash_dup ##### -->
 <para>