From 263bf4c0c89bb88dc995acd9a6a2de9095fbd461 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Tue, 23 Aug 2011 19:16:47 +0200
Subject: Imported Upstream version 0.9.0

---
 docs/api/html/NetworkManager.devhelp  | 28 ++++++------
 docs/api/html/NetworkManager.devhelp2 | 28 ++++++------
 docs/api/html/index.html              | 32 ++++++-------
 docs/api/html/ix01.html               |  2 +-
 docs/api/html/ref-migrating.html      | 58 +++++++++++------------
 docs/api/html/ref-settings.html       | 86 +++++++++++++++++++++++++----------
 docs/api/html/spec.html               |  4 +-
 7 files changed, 137 insertions(+), 101 deletions(-)

(limited to 'docs/api/html')

diff --git a/docs/api/html/NetworkManager.devhelp b/docs/api/html/NetworkManager.devhelp
index bf173496..225718a4 100644
--- a/docs/api/html/NetworkManager.devhelp
+++ b/docs/api/html/NetworkManager.devhelp
@@ -4,23 +4,23 @@
   <chapters>
     <sub name="D-Bus API Reference" link="ref-dbus.html"/>
     <sub name="Network Configuration Setting Specification" link="ref-settings.html">
-      <sub name="Configuration Settings" link="ref-settings.html#id384567"/>
+      <sub name="Configuration Settings" link="ref-settings.html#id499631"/>
       <sub name="Secret flag types" link="secrets-flags.html"/>
     </sub>
     <sub name="Migrating from NetworkManager 0.8 to NetworkManager 0.9" link="ref-migrating.html">
-      <sub name="Architecture and D-Bus API Changes in 0.9" link="ref-migrating.html#id368030">
-        <sub name="Elimination of the User Settings Service" link="ref-migrating.html#id381237"/>
-        <sub name="User Secret Agents" link="ref-migrating.html#id363154"/>
-        <sub name="Settings Service Interface Changes" link="ref-migrating.html#id375692"/>
-        <sub name="Connection Object Interface Changes" link="ref-migrating.html#id376241"/>
-        <sub name="Permissions Methods Consolidation" link="ref-migrating.html#id390693"/>
-        <sub name="AddConnection Returns Object Path of New Connection" link="ref-migrating.html#id396820"/>
-        <sub name="Support for WiMAX Devices" link="ref-migrating.html#id353630"/>
-        <sub name="New Device States" link="ref-migrating.html#id395790"/>
-        <sub name="New Active Connection State" link="ref-migrating.html#id364728"/>
-        <sub name="Consolidated Modem Devices" link="ref-migrating.html#id363573"/>
-        <sub name="Secret Property Flags" link="ref-migrating.html#id344431"/>
-        <sub name="Deprecated Methods Removed" link="ref-migrating.html#id359402"/>
+      <sub name="Architecture and D-Bus API Changes in 0.9" link="ref-migrating.html#id515244">
+        <sub name="Elimination of the User Settings Service" link="ref-migrating.html#id506888"/>
+        <sub name="User Secret Agents" link="ref-migrating.html#id490940"/>
+        <sub name="Settings Service Interface Changes" link="ref-migrating.html#id478937"/>
+        <sub name="Connection Object Interface Changes" link="ref-migrating.html#id496154"/>
+        <sub name="Permissions Methods Consolidation" link="ref-migrating.html#id469504"/>
+        <sub name="AddConnection Returns Object Path of New Connection" link="ref-migrating.html#id485456"/>
+        <sub name="Support for WiMAX Devices" link="ref-migrating.html#id490040"/>
+        <sub name="New Device States" link="ref-migrating.html#id507718"/>
+        <sub name="New Active Connection State" link="ref-migrating.html#id515265"/>
+        <sub name="Consolidated Modem Devices" link="ref-migrating.html#id515394"/>
+        <sub name="Secret Property Flags" link="ref-migrating.html#id479874"/>
+        <sub name="Deprecated Methods Removed" link="ref-migrating.html#id474466"/>
       </sub>
     </sub>
     <sub name="Index" link="ix01.html"/>
diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2
index 20f2b147..e5538797 100644
--- a/docs/api/html/NetworkManager.devhelp2
+++ b/docs/api/html/NetworkManager.devhelp2
@@ -4,23 +4,23 @@
   <chapters>
     <sub name="D-Bus API Reference" link="ref-dbus.html"/>
     <sub name="Network Configuration Setting Specification" link="ref-settings.html">
-      <sub name="Configuration Settings" link="ref-settings.html#id384567"/>
+      <sub name="Configuration Settings" link="ref-settings.html#id499631"/>
       <sub name="Secret flag types" link="secrets-flags.html"/>
     </sub>
     <sub name="Migrating from NetworkManager 0.8 to NetworkManager 0.9" link="ref-migrating.html">
-      <sub name="Architecture and D-Bus API Changes in 0.9" link="ref-migrating.html#id368030">
-        <sub name="Elimination of the User Settings Service" link="ref-migrating.html#id381237"/>
-        <sub name="User Secret Agents" link="ref-migrating.html#id363154"/>
-        <sub name="Settings Service Interface Changes" link="ref-migrating.html#id375692"/>
-        <sub name="Connection Object Interface Changes" link="ref-migrating.html#id376241"/>
-        <sub name="Permissions Methods Consolidation" link="ref-migrating.html#id390693"/>
-        <sub name="AddConnection Returns Object Path of New Connection" link="ref-migrating.html#id396820"/>
-        <sub name="Support for WiMAX Devices" link="ref-migrating.html#id353630"/>
-        <sub name="New Device States" link="ref-migrating.html#id395790"/>
-        <sub name="New Active Connection State" link="ref-migrating.html#id364728"/>
-        <sub name="Consolidated Modem Devices" link="ref-migrating.html#id363573"/>
-        <sub name="Secret Property Flags" link="ref-migrating.html#id344431"/>
-        <sub name="Deprecated Methods Removed" link="ref-migrating.html#id359402"/>
+      <sub name="Architecture and D-Bus API Changes in 0.9" link="ref-migrating.html#id515244">
+        <sub name="Elimination of the User Settings Service" link="ref-migrating.html#id506888"/>
+        <sub name="User Secret Agents" link="ref-migrating.html#id490940"/>
+        <sub name="Settings Service Interface Changes" link="ref-migrating.html#id478937"/>
+        <sub name="Connection Object Interface Changes" link="ref-migrating.html#id496154"/>
+        <sub name="Permissions Methods Consolidation" link="ref-migrating.html#id469504"/>
+        <sub name="AddConnection Returns Object Path of New Connection" link="ref-migrating.html#id485456"/>
+        <sub name="Support for WiMAX Devices" link="ref-migrating.html#id490040"/>
+        <sub name="New Device States" link="ref-migrating.html#id507718"/>
+        <sub name="New Active Connection State" link="ref-migrating.html#id515265"/>
+        <sub name="Consolidated Modem Devices" link="ref-migrating.html#id515394"/>
+        <sub name="Secret Property Flags" link="ref-migrating.html#id479874"/>
+        <sub name="Deprecated Methods Removed" link="ref-migrating.html#id474466"/>
       </sub>
     </sub>
     <sub name="Index" link="ix01.html"/>
diff --git a/docs/api/html/index.html b/docs/api/html/index.html
index 091a4290..c734b922 100644
--- a/docs/api/html/index.html
+++ b/docs/api/html/index.html
@@ -22,11 +22,11 @@
 	    <code class="email">&lt;<a class="email" href="mailto:dcbw@redhat.com">dcbw@redhat.com</a>&gt;</code><br>
 	  </p></div></div>
 </div></div></div>
-<div><p class="releaseinfo">Version 0.8.9997
+<div><p class="releaseinfo">Version 0.9.0
 </p></div>
 <div><p class="copyright">Copyright © 2011 The NetworkManager Authors</p></div>
 <div><div class="legalnotice">
-<a name="id314448"></a><p>
+<a name="id429511"></a><p>
 	Permission is granted to copy, distribute and/or modify this
 	document under the terms of the <em class="citetitle">GNU Free
 	Documentation License</em>, Version 1.1 or any later
@@ -61,25 +61,25 @@
 <dt><span class="chapter"><a href="ref-dbus.html">D-Bus API Reference</a></span></dt>
 <dt><span class="chapter"><a href="ref-settings.html">Network Configuration Setting Specification</a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="ref-settings.html#id384567">Configuration Settings</a></span></dt>
+<dt><span class="section"><a href="ref-settings.html#id499631">Configuration Settings</a></span></dt>
 <dt><span class="section"><a href="secrets-flags.html">Secret flag types</a></span></dt>
 </dl></dd>
 <dt><span class="chapter"><a href="ref-migrating.html">Migrating from NetworkManager 0.8 to NetworkManager 0.9</a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="ref-migrating.html#id368030">Architecture and D-Bus API Changes in 0.9</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id515244">Architecture and D-Bus API Changes in 0.9</a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="ref-migrating.html#id381237">Elimination of the User Settings Service</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id363154">User Secret Agents</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id375692">Settings Service Interface Changes</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id376241">Connection Object Interface Changes</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id390693">Permissions Methods Consolidation</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id396820">AddConnection Returns Object Path of New Connection</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id353630">Support for WiMAX Devices</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id395790">New Device States</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id364728">New Active Connection State</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id363573">Consolidated Modem Devices</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id344431">Secret Property Flags</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id359402">Deprecated Methods Removed</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id506888">Elimination of the User Settings Service</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id490940">User Secret Agents</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id478937">Settings Service Interface Changes</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id496154">Connection Object Interface Changes</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id469504">Permissions Methods Consolidation</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id485456">AddConnection Returns Object Path of New Connection</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id490040">Support for WiMAX Devices</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id507718">New Device States</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id515265">New Active Connection State</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id515394">Consolidated Modem Devices</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id479874">Secret Property Flags</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id474466">Deprecated Methods Removed</a></span></dt>
 </dl></dd>
 </dl></dd>
 <dt><span class="index"><a href="ix01.html">Index</a></span></dt>
diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html
index 1387212f..ffcd2110 100644
--- a/docs/api/html/ix01.html
+++ b/docs/api/html/ix01.html
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id344340"></a>Index</h2></div></div></div>
+<a name="id459403"></a>Index</h2></div></div></div>
 <div class="index"></div>
 </div>
 <div class="footer">
diff --git a/docs/api/html/ref-migrating.html b/docs/api/html/ref-migrating.html
index 8324e263..a3221b04 100644
--- a/docs/api/html/ref-migrating.html
+++ b/docs/api/html/ref-migrating.html
@@ -23,20 +23,20 @@
 <div class="titlepage"><div><div><h2 class="title">
 <a name="ref-migrating"></a>Migrating from NetworkManager 0.8 to NetworkManager 0.9</h2></div></div></div>
 <div class="toc"><dl>
-<dt><span class="section"><a href="ref-migrating.html#id368030">Architecture and D-Bus API Changes in 0.9</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id515244">Architecture and D-Bus API Changes in 0.9</a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="ref-migrating.html#id381237">Elimination of the User Settings Service</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id363154">User Secret Agents</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id375692">Settings Service Interface Changes</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id376241">Connection Object Interface Changes</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id390693">Permissions Methods Consolidation</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id396820">AddConnection Returns Object Path of New Connection</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id353630">Support for WiMAX Devices</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id395790">New Device States</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id364728">New Active Connection State</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id363573">Consolidated Modem Devices</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id344431">Secret Property Flags</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id359402">Deprecated Methods Removed</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id506888">Elimination of the User Settings Service</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id490940">User Secret Agents</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id478937">Settings Service Interface Changes</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id496154">Connection Object Interface Changes</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id469504">Permissions Methods Consolidation</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id485456">AddConnection Returns Object Path of New Connection</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id490040">Support for WiMAX Devices</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id507718">New Device States</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id515265">New Active Connection State</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id515394">Consolidated Modem Devices</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id479874">Secret Property Flags</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id474466">Deprecated Methods Removed</a></span></dt>
 </dl></dd>
 </dl></div>
 <p>
@@ -50,14 +50,14 @@
   </p>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id368030"></a>Architecture and D-Bus API Changes in 0.9</h2></div></div></div>
+<a name="id515244"></a>Architecture and D-Bus API Changes in 0.9</h2></div></div></div>
 <p>
       This section details the architectural and D-Bus API changes in
       NetworkManager 0.9.
     </p>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id381237"></a>Elimination of the User Settings Service</h3></div></div></div>
+<a name="id506888"></a>Elimination of the User Settings Service</h3></div></div></div>
 <p>
       Previously there were two "settings services", or D-Bus services that
       provided and saved network configuration information.  NetworkManager
@@ -103,7 +103,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id363154"></a>User Secret Agents</h3></div></div></div>
+<a name="id490940"></a>User Secret Agents</h3></div></div></div>
 <p>
       Even with the elimination of the user settings service, in some cases it
       is still desirable to store secrets in the user's session and not in
@@ -152,7 +152,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id375692"></a>Settings Service Interface Changes</h3></div></div></div>
+<a name="id478937"></a>Settings Service Interface Changes</h3></div></div></div>
 <p>
       With the elimination of the user settings service, the old
       <code class="literal">org.freedesktop.NetworkManagerUserSettings</code> and
@@ -188,7 +188,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id376241"></a>Connection Object Interface Changes</h3></div></div></div>
+<a name="id496154"></a>Connection Object Interface Changes</h3></div></div></div>
 <p>
       Consistent with the interface changes to the Settings object, the
       Connection object's D-Bus interface has changed to
@@ -222,7 +222,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id390693"></a>Permissions Methods Consolidation</h3></div></div></div>
+<a name="id469504"></a>Permissions Methods Consolidation</h3></div></div></div>
 <p>
       Previously there were two D-Bus method calls to retrieve the list of
       operations that a user client could perform, and two signals notifying
@@ -254,7 +254,7 @@
       are now string-based permissions.  The mapping is as follows:
       </p>
 <div class="table">
-<a name="id385374"></a><p class="title"><b>Table 17. </b></p>
+<a name="id502282"></a><p class="title"><b>Table 17. </b></p>
 <div class="table-contents"><table border="1">
 <colgroup>
 <col>
@@ -305,7 +305,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id396820"></a>AddConnection Returns Object Path of New Connection</h3></div></div></div>
+<a name="id485456"></a>AddConnection Returns Object Path of New Connection</h3></div></div></div>
 <p>
       The <a class="ulink" href="spec.html#org.freedesktop.NetworkManager.Settings" target="_top">
       <code class="literal">org.freedesktop.NetworkManager.Settings.AddConnection</code>
@@ -323,7 +323,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id353630"></a>Support for WiMAX Devices</h3></div></div></div>
+<a name="id490040"></a>Support for WiMAX Devices</h3></div></div></div>
 <p>
       NetworkManager now supports Intel WiMAX mobile broadband devices.  A
       corresponding device type (<code class="literal">NM_DEVICE_TYPE_WIMAX</code>) and
@@ -346,7 +346,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id395790"></a>New Device States</h3></div></div></div>
+<a name="id507718"></a>New Device States</h3></div></div></div>
 <p>
       A few <a class="ulink" href="spec.html#type-NM_DEVICE_STATE" target="_top">new device states</a>
       have been added, and all device states have been renumbered for flexibility.
@@ -361,7 +361,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id364728"></a>New Active Connection State</h3></div></div></div>
+<a name="id515265"></a>New Active Connection State</h3></div></div></div>
 <p>
       Along with the new device states, an
       <a class="ulink" href="spec.html#type-NM_ACTIVE_CONNECTION_STATE" target="_top">additional
@@ -377,7 +377,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id363573"></a>Consolidated Modem Devices</h3></div></div></div>
+<a name="id515394"></a>Consolidated Modem Devices</h3></div></div></div>
 <p>
       Many new mobile broadband devices support multiple access families, like
       Qualcomm Gobi cards (CDMA/EVDO and GSM/UMTS), or multi-mode EVDO/LTE
@@ -413,7 +413,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id344431"></a>Secret Property Flags</h3></div></div></div>
+<a name="id479874"></a>Secret Property Flags</h3></div></div></div>
 <p>
       In the Connection object's configuration properties, each setting's secret
       properties (like WiFi passphrases, or public key passwords, etc) now has
@@ -422,7 +422,7 @@
       following values:
       </p>
 <div class="table">
-<a name="id344439"></a><p class="title"><b>Table 18. </b></p>
+<a name="id479882"></a><p class="title"><b>Table 18. </b></p>
 <div class="table-contents"><table border="1">
 <colgroup>
 <col>
@@ -484,7 +484,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id359402"></a>Deprecated Methods Removed</h3></div></div></div>
+<a name="id474466"></a>Deprecated Methods Removed</h3></div></div></div>
 <p>
       A few methods and signals of the <code class="literal">org.freedesktop.NetworkManager</code>
       interface deprecated in version 0.7 have been removed.  All the
@@ -494,7 +494,7 @@
       their replacements:
       </p>
 <div class="table">
-<a name="id359416"></a><p class="title"><b>Table 19. </b></p>
+<a name="id474480"></a><p class="title"><b>Table 19. </b></p>
 <div class="table-contents"><table border="1">
 <colgroup>
 <col>
diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html
index 6f947c7d..5db0ccd8 100644
--- a/docs/api/html/ref-settings.html
+++ b/docs/api/html/ref-settings.html
@@ -23,7 +23,7 @@
 <div class="titlepage"><div><div><h2 class="title">
 <a name="ref-settings"></a>Network Configuration Setting Specification</h2></div></div></div>
 <div class="toc"><dl>
-<dt><span class="section"><a href="ref-settings.html#id384567">Configuration Settings</a></span></dt>
+<dt><span class="section"><a href="ref-settings.html#id499631">Configuration Settings</a></span></dt>
 <dt><span class="section"><a href="secrets-flags.html">Secret flag types</a></span></dt>
 </dl></div>
 <p>
@@ -35,11 +35,11 @@
     </p>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id384567"></a>Configuration Settings</h2></div></div></div>
+<a name="id499631"></a>Configuration Settings</h2></div></div></div>
 <p>
 </p>
 <div class="table">
-<a name="id384575"></a><p class="title"><b>Table 1. 802-1x setting</b></p>
+<a name="id502860"></a><p class="title"><b>Table 1. 802-1x setting</b></p>
 <div class="table-contents"><table summary="802-1x setting" border="1">
 <colgroup>
 <col>
@@ -91,6 +91,18 @@
 <td>UTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the 'ca-cert' property.</td>
 </tr>
 <tr>
+<td><pre class="screen">subject-match</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Substring to be matched against the subject of the certificate presented by the authentication server. When unset, no verification of the authentication server certificate's subject is performed.</td>
+</tr>
+<tr>
+<td><pre class="screen">altsubject-matches</pre></td>
+<td><pre class="screen">array of string</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>List of strings to be matched against the altSubjectName of the certificate presented by the authentication server. If the list is empty, no verification of the server certificate's altSubjectName is performed.</td>
+</tr>
+<tr>
 <td><pre class="screen">client-cert</pre></td>
 <td><pre class="screen">byte array</pre></td>
 <td><pre class="screen">[]</pre></td>
@@ -139,10 +151,22 @@
 <td>UTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the 'phase2-ca-cert' property.</td>
 </tr>
 <tr>
+<td><pre class="screen">phase2-subject-match</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen"></pre></td>
+<td>Substring to be matched against the subject of the certificate presented by the authentication server during the inner 'phase2' authentication. When unset, no verification of the authentication server certificate's subject is performed.</td>
+</tr>
+<tr>
+<td><pre class="screen">phase2-altsubject-matches</pre></td>
+<td><pre class="screen">array of string</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>List of strings to be matched against List of strings to be matched against the altSubjectName of the certificate presented by the authentication server during the inner 'phase 2' authentication. If the list is empty, no verification of the server certificate's altSubjectName is performed.</td>
+</tr>
+<tr>
 <td><pre class="screen">phase2-client-cert</pre></td>
 <td><pre class="screen">byte array</pre></td>
 <td><pre class="screen">[]</pre></td>
-<td>Contains the 'phase 2' client certificate if used by the EAP method specified in the 'phase2-eap' or 'phase2-autheap' properties. Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.</td>
+<td>Contains the 'phase 2' client certificate if used by the EAP method specified in the 'phase2-auth' or 'phase2-autheap' properties. Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.</td>
 </tr>
 <tr>
 <td><pre class="screen">password</pre></td>
@@ -178,7 +202,7 @@
 <td><pre class="screen">phase2-private-key</pre></td>
 <td><pre class="screen">byte array</pre></td>
 <td><pre class="screen">[]</pre></td>
-<td>Contains the 'phase 2' inner private key when the 'phase2-eap' or 'phase2-autheap' property is set to 'tls'.  Key data is specified using a 'scheme'; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and ending with a terminating NULL byte.  When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the 'phase2-private-key-password' property must be set to password used to decrypt the PKCS#12 certificate and key.  When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and and ending with a terminating NULL byte, and as with the blob scheme the 'phase2-private-key-password' property must be set to the password used to decode the PKCS#12 private key and certificate.</td>
+<td>Contains the 'phase 2' inner private key when the 'phase2-auth' or 'phase2-autheap' property is set to 'tls'.  Key data is specified using a 'scheme'; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and ending with a terminating NULL byte.  When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the 'phase2-private-key-password' property must be set to password used to decrypt the PKCS#12 certificate and key.  When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and and ending with a terminating NULL byte, and as with the blob scheme the 'phase2-private-key-password' property must be set to the password used to decode the PKCS#12 private key and certificate.</td>
 </tr>
 <tr>
 <td><pre class="screen">phase2-private-key-password</pre></td>
@@ -204,7 +228,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id371590"></a><p class="title"><b>Table 2. bluetooth setting</b></p>
+<a name="id486852"></a><p class="title"><b>Table 2. bluetooth setting</b></p>
 <div class="table-contents"><table summary="bluetooth setting" border="1">
 <colgroup>
 <col>
@@ -243,7 +267,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id371722"></a><p class="title"><b>Table 3. cdma setting</b></p>
+<a name="id486984"></a><p class="title"><b>Table 3. cdma setting</b></p>
 <div class="table-contents"><table summary="cdma setting" border="1">
 <colgroup>
 <col>
@@ -294,7 +318,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id371921"></a><p class="title"><b>Table 4. connection setting</b></p>
+<a name="id487182"></a><p class="title"><b>Table 4. connection setting</b></p>
 <div class="table-contents"><table summary="connection setting" border="1">
 <colgroup>
 <col>
@@ -363,7 +387,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id372222"></a><p class="title"><b>Table 5. gsm setting</b></p>
+<a name="id487483"></a><p class="title"><b>Table 5. gsm setting</b></p>
 <div class="table-contents"><table summary="gsm setting" border="1">
 <colgroup>
 <col>
@@ -388,7 +412,7 @@
 <td><pre class="screen">number</pre></td>
 <td><pre class="screen">string</pre></td>
 <td><pre class="screen"></pre></td>
-<td>Number to dial when establishing a PPP data session with the GSM-based mobile broadband network.  In most cases, leave the number blank and a number selecting the APN specified in the 'apn' property will be used automatically when required.</td>
+<td>Number to dial when establishing a PPP data session with the GSM-based mobile broadband network.  Many modems do not require PPP for connections to the mobile network and thus this property should be left blank, which allows NetworkManager to select the appropriate settings automatically.</td>
 </tr>
 <tr>
 <td><pre class="screen">username</pre></td>
@@ -456,7 +480,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id372646"></a><p class="title"><b>Table 6. ipv4 setting</b></p>
+<a name="id487908"></a><p class="title"><b>Table 6. ipv4 setting</b></p>
 <div class="table-contents"><table summary="ipv4 setting" border="1">
 <colgroup>
 <col>
@@ -555,7 +579,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id401548"></a><p class="title"><b>Table 7. ipv6 setting</b></p>
+<a name="id516867"></a><p class="title"><b>Table 7. ipv6 setting</b></p>
 <div class="table-contents"><table summary="ipv6 setting" border="1">
 <colgroup>
 <col>
@@ -627,7 +651,7 @@
 <tr>
 <td><pre class="screen">may-fail</pre></td>
 <td><pre class="screen">boolean</pre></td>
-<td><pre class="screen">FALSE</pre></td>
+<td><pre class="screen">TRUE</pre></td>
 <td>If TRUE, allow overall network configuration to proceed even if IPv6 configuration times out. Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv4-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv6 configuration fails but IPv4 configuration completes successfully.</td>
 </tr>
 </tbody>
@@ -636,7 +660,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id401866"></a><p class="title"><b>Table 8. 802-11-olpc-mesh setting</b></p>
+<a name="id517185"></a><p class="title"><b>Table 8. 802-11-olpc-mesh setting</b></p>
 <div class="table-contents"><table summary="802-11-olpc-mesh setting" border="1">
 <colgroup>
 <col>
@@ -681,7 +705,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id402005"></a><p class="title"><b>Table 9. ppp setting</b></p>
+<a name="id517323"></a><p class="title"><b>Table 9. ppp setting</b></p>
 <div class="table-contents"><table summary="ppp setting" border="1">
 <colgroup>
 <col>
@@ -816,7 +840,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id402535"></a><p class="title"><b>Table 10. pppoe setting</b></p>
+<a name="id517853"></a><p class="title"><b>Table 10. pppoe setting</b></p>
 <div class="table-contents"><table summary="pppoe setting" border="1">
 <colgroup>
 <col>
@@ -867,7 +891,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id402700"></a><p class="title"><b>Table 11. serial setting</b></p>
+<a name="id518018"></a><p class="title"><b>Table 11. serial setting</b></p>
 <div class="table-contents"><table summary="serial setting" border="1">
 <colgroup>
 <col>
@@ -924,7 +948,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id402891"></a><p class="title"><b>Table 12. vpn setting</b></p>
+<a name="id518231"></a><p class="title"><b>Table 12. vpn setting</b></p>
 <div class="table-contents"><table summary="vpn setting" border="1">
 <colgroup>
 <col>
@@ -955,7 +979,7 @@
 <td><pre class="screen">user-name</pre></td>
 <td><pre class="screen">string</pre></td>
 <td><pre class="screen"></pre></td>
-<td>User name of the currently logged in user for connections provided by the user settings service.  This name is provided to the VPN plugin to use in lieu of a custom username provided by that VPN plugins specific configuration.  The VPN plugin itself decides which user name to use.</td>
+<td>If the VPN connection requires a user name for authentication, that name should be provided here.  If the connection is available to more than one user, and the VPN requires each user to supply a different name, then leave this property empty.  If this property is empty, NetworkManager will automatically supply the username of the user which requested the VPN connection.</td>
 </tr>
 <tr>
 <td><pre class="screen">data</pre></td>
@@ -975,7 +999,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id403056"></a><p class="title"><b>Table 13. wimax setting</b></p>
+<a name="id518437"></a><p class="title"><b>Table 13. wimax setting</b></p>
 <div class="table-contents"><table summary="wimax setting" border="1">
 <colgroup>
 <col>
@@ -1014,7 +1038,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id403181"></a><p class="title"><b>Table 14. 802-3-ethernet setting</b></p>
+<a name="id518575"></a><p class="title"><b>Table 14. 802-3-ethernet setting</b></p>
 <div class="table-contents"><table summary="802-3-ethernet setting" border="1">
 <colgroup>
 <col>
@@ -1072,6 +1096,12 @@
 <td>If specified, request that the device use this MAC address instead of its permanent MAC address.  This is known as MAC cloning or spoofing.</td>
 </tr>
 <tr>
+<td><pre class="screen">mac-address-blacklist</pre></td>
+<td><pre class="screen">array of string</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>If specified, this connection will never apply to the ethernet device whose permanent MAC address matches an address in the list.  Each MAC address is in the standard hex-digits-and-colons notation (00:11:22:33:44:55).</td>
+</tr>
+<tr>
 <td><pre class="screen">mtu</pre></td>
 <td><pre class="screen">uint32</pre></td>
 <td><pre class="screen">0</pre></td>
@@ -1079,7 +1109,7 @@
 </tr>
 <tr>
 <td><pre class="screen">s390-subchannels</pre></td>
-<td><pre class="screen">GPtrArray_gchararray_</pre></td>
+<td><pre class="screen">array of string</pre></td>
 <td><pre class="screen">[]</pre></td>
 <td>Identifies specific subchannels that this network device uses for communcation with z/VM or s390 host.  Like the 'mac-address' property for non-z/VM devices, this property can be used to ensure this connection only applies to the network device that uses these subchannels. The list should contain exactly 3 strings, and each string may only be composed of hexadecimal characters and the period (.) character.</td>
 </tr>
@@ -1101,7 +1131,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id403587"></a><p class="title"><b>Table 15. 802-11-wireless setting</b></p>
+<a name="id519016"></a><p class="title"><b>Table 15. 802-11-wireless setting</b></p>
 <div class="table-contents"><table summary="802-11-wireless setting" border="1">
 <colgroup>
 <col>
@@ -1177,6 +1207,12 @@
 <td>If specified, request that the WiFi device use this MAC address instead of its permanent MAC address.  This is known as MAC cloning or spoofing.</td>
 </tr>
 <tr>
+<td><pre class="screen">mac-address-blacklist</pre></td>
+<td><pre class="screen">array of string</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>If specified, this connection will never apply to the WiFi device whose permanent MAC address matches an address in the list.  Each MAC address is in the standard hex-digits-and-colons notation (00:11:22:33:44:55).</td>
+</tr>
+<tr>
 <td><pre class="screen">mtu</pre></td>
 <td><pre class="screen">uint32</pre></td>
 <td><pre class="screen">0</pre></td>
@@ -1186,7 +1222,7 @@
 <td><pre class="screen">seen-bssids</pre></td>
 <td><pre class="screen">array of string</pre></td>
 <td><pre class="screen">[]</pre></td>
-<td>A list of BSSIDs (each BSSID formatted as a MAC address like '00:11:22:33:44:55') that have been detected as part of the WiFI network.  The settings service will usually populate this property by periodically asking NetworkManager what the device's current AP is while connected to the network (or monitoring the device's 'active-ap' property) and adding the current AP's BSSID to this list.  This list helps NetworkManager find hidden APs by matching up scan results with the BSSIDs in this list.</td>
+<td>A list of BSSIDs (each BSSID formatted as a MAC address like 00:11:22:33:44:55') that have been detected as part of the WiFI network. NetworkManager internally tracks previously seen BSSIDs so this property is no longer of much use.</td>
 </tr>
 <tr>
 <td><pre class="screen">security</pre></td>
@@ -1200,7 +1236,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id404064"></a><p class="title"><b>Table 16. 802-11-wireless-security setting</b></p>
+<a name="id519524"></a><p class="title"><b>Table 16. 802-11-wireless-security setting</b></p>
 <div class="table-contents"><table summary="802-11-wireless-security setting" border="1">
 <colgroup>
 <col>
diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html
index 4533e786..c8abf6ca 100644
--- a/docs/api/html/spec.html
+++ b/docs/api/html/spec.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ascii" /><title>NetworkManager D-Bus Interface Specification version 0.9</title><style type="text/css">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ascii" /><title>NetworkManager D-Bus Interface Specification version 0.9.0</title><style type="text/css">
 
           body {
             font-family: sans-serif;
@@ -98,7 +98,7 @@
             margin-right: 4em;
           }
 
-        </style></head><body><h1 class="topbox">NetworkManager D-Bus Interface Specification</h1><h2>Version 0.9</h2><div>Copyright (C) 2008 - 2011 Red Hat, Inc.</div><div>Copyright (C) 2008 - 2009 Novell, Inc.</div><div class="license">
+        </style></head><body><h1 class="topbox">NetworkManager D-Bus Interface Specification</h1><h2>Version 0.9.0</h2><div>Copyright (C) 2008 - 2011 Red Hat, Inc.</div><div>Copyright (C) 2008 - 2009 Novell, Inc.</div><div class="license">
 <p>This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
-- 
cgit 1.3.0-6-gf8a5