From 8c98b34228abb4dfde822ad89106b4d8b2287639 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Tue, 7 Aug 2012 22:16:03 +0200
Subject: Imported Upstream version 0.9.6.0

---
 docs/api/html/NetworkManager.devhelp2 | 30 +++++++++---------
 docs/api/html/index.html              | 53 ++++++++++++--------------------
 docs/api/html/ix01.html               |  2 +-
 docs/api/html/ref-migrating.html      | 58 +++++++++++++++++------------------
 docs/api/html/ref-settings.html       | 46 +++++++++++++--------------
 docs/api/html/spec.html               |  4 +--
 docs/api/network-manager-docs.xml     | 25 ++-------------
 docs/api/settings-spec.xml            |  4 +--
 docs/api/spec.html                    |  4 +--
 docs/api/version.xml                  |  2 +-
 10 files changed, 97 insertions(+), 131 deletions(-)

(limited to 'docs/api')

diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2
index afff285e..fc52a922 100644
--- a/docs/api/html/NetworkManager.devhelp2
+++ b/docs/api/html/NetworkManager.devhelp2
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
-<book xmlns="http://www.devhelp.net/book" title="NetworkManager D-Bus Reference Manual" link="index.html" author="Dan Williams" name="NetworkManager" version="2" language="c">
+<book xmlns="http://www.devhelp.net/book" title="NetworkManager D-Bus Reference Manual" link="index.html" author="" name="NetworkManager" version="2" language="c">
   <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#id437745"/>
+      <sub name="Configuration Settings" link="ref-settings.html#id480831"/>
       <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#id449785">
-        <sub name="Elimination of the User Settings Service" link="ref-migrating.html#id446214"/>
-        <sub name="User Secret Agents" link="ref-migrating.html#id429971"/>
-        <sub name="Settings Service Interface Changes" link="ref-migrating.html#id429654"/>
-        <sub name="Connection Object Interface Changes" link="ref-migrating.html#id438294"/>
-        <sub name="Permissions Methods Consolidation" link="ref-migrating.html#id432724"/>
-        <sub name="AddConnection Returns Object Path of New Connection" link="ref-migrating.html#id431666"/>
-        <sub name="Support for WiMAX Devices" link="ref-migrating.html#id413984"/>
-        <sub name="New Device States" link="ref-migrating.html#id444778"/>
-        <sub name="New Active Connection State" link="ref-migrating.html#id448971"/>
-        <sub name="Consolidated Modem Devices" link="ref-migrating.html#id443548"/>
-        <sub name="Secret Property Flags" link="ref-migrating.html#id421190"/>
-        <sub name="Deprecated Methods Removed" link="ref-migrating.html#id420876"/>
+      <sub name="Architecture and D-Bus API Changes in 0.9" link="ref-migrating.html#id473771">
+        <sub name="Elimination of the User Settings Service" link="ref-migrating.html#id488881"/>
+        <sub name="User Secret Agents" link="ref-migrating.html#id459804"/>
+        <sub name="Settings Service Interface Changes" link="ref-migrating.html#id471077"/>
+        <sub name="Connection Object Interface Changes" link="ref-migrating.html#id492108"/>
+        <sub name="Permissions Methods Consolidation" link="ref-migrating.html#id477672"/>
+        <sub name="AddConnection Returns Object Path of New Connection" link="ref-migrating.html#id483262"/>
+        <sub name="Support for WiMAX Devices" link="ref-migrating.html#id450653"/>
+        <sub name="New Device States" link="ref-migrating.html#id456786"/>
+        <sub name="New Active Connection State" link="ref-migrating.html#id486946"/>
+        <sub name="Consolidated Modem Devices" link="ref-migrating.html#id455331"/>
+        <sub name="Secret Property Flags" link="ref-migrating.html#id451364"/>
+        <sub name="Deprecated Methods Removed" link="ref-migrating.html#id456844"/>
       </sub>
     </sub>
     <sub name="Index" link="ix01.html"/>
diff --git a/docs/api/html/index.html b/docs/api/html/index.html
index 573f364f..f1188e1a 100644
--- a/docs/api/html/index.html
+++ b/docs/api/html/index.html
@@ -14,19 +14,11 @@
 <div class="titlepage">
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">NetworkManager D-Bus Reference Manual</p></th></tr></table></div>
-<div><div class="authorgroup"><div class="author">
-<h3 class="author">
-<span class="firstname">Dan</span> <span class="surname">Williams</span>
-</h3>
-<div class="affiliation"><div class="address"><p><br>
-	    <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.9.5.96
+<div><p class="releaseinfo">Version 0.9.6.0
 </p></div>
-<div><p class="copyright">Copyright © 2011 The NetworkManager Authors</p></div>
+<div><p class="copyright">Copyright © 2012 The NetworkManager Authors</p></div>
 <div><div class="legalnotice">
-<a name="id368526"></a><p>
+<a name="id409989"></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
@@ -40,19 +32,12 @@
 	</p>
 <div class="address"><p><br>
 	  The Free Software Foundation, Inc.,<br>
-	  <span class="street">59 Temple Place</span> - Suite 330,<br>
-	  <span class="city">Boston</span>, <span class="state">MA</span> <span class="postcode">02111-1307</span>,<br>
+	  <span class="street">51 Franklin Street</span> - Fifth Floor,<br>
+	  <span class="city">Boston</span>, <span class="state">MA</span> <span class="postcode">02110-1301</span>,<br>
 	  <span class="country">USA</span><br>
 	</p></div>
 <p>
       </p>
-<p>
-	Many of the names used by companies to distinguish their
-	products and services are claimed as trademarks. Where those
-	names appear in any GNOME documentation, and those trademarks
-	are made aware to the members of the GNOME Documentation
-	Project, the names have been printed in caps or initial caps.
-      </p>
 </div></div>
 </div>
 <hr>
@@ -61,25 +46,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#id437745">Configuration Settings</a></span></dt>
+<dt><span class="section"><a href="ref-settings.html#id480831">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#id449785">Architecture and D-Bus API Changes in 0.9</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id473771">Architecture and D-Bus API Changes in 0.9</a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="ref-migrating.html#id446214">Elimination of the User Settings Service</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id429971">User Secret Agents</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id429654">Settings Service Interface Changes</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id438294">Connection Object Interface Changes</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id432724">Permissions Methods Consolidation</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id431666">AddConnection Returns Object Path of New Connection</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id413984">Support for WiMAX Devices</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id444778">New Device States</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id448971">New Active Connection State</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id443548">Consolidated Modem Devices</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id421190">Secret Property Flags</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id420876">Deprecated Methods Removed</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id488881">Elimination of the User Settings Service</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id459804">User Secret Agents</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id471077">Settings Service Interface Changes</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id492108">Connection Object Interface Changes</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id477672">Permissions Methods Consolidation</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id483262">AddConnection Returns Object Path of New Connection</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id450653">Support for WiMAX Devices</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id456786">New Device States</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id486946">New Active Connection State</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id455331">Consolidated Modem Devices</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id451364">Secret Property Flags</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id456844">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 81608829..9101be21 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="id398420"></a>Index</h2></div></div></div>
+<a name="id406805"></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 3dbedb5e..9db380b9 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#id449785">Architecture and D-Bus API Changes in 0.9</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id473771">Architecture and D-Bus API Changes in 0.9</a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="ref-migrating.html#id446214">Elimination of the User Settings Service</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id429971">User Secret Agents</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id429654">Settings Service Interface Changes</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id438294">Connection Object Interface Changes</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id432724">Permissions Methods Consolidation</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id431666">AddConnection Returns Object Path of New Connection</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id413984">Support for WiMAX Devices</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id444778">New Device States</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id448971">New Active Connection State</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id443548">Consolidated Modem Devices</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id421190">Secret Property Flags</a></span></dt>
-<dt><span class="section"><a href="ref-migrating.html#id420876">Deprecated Methods Removed</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id488881">Elimination of the User Settings Service</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id459804">User Secret Agents</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id471077">Settings Service Interface Changes</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id492108">Connection Object Interface Changes</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id477672">Permissions Methods Consolidation</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id483262">AddConnection Returns Object Path of New Connection</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id450653">Support for WiMAX Devices</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id456786">New Device States</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id486946">New Active Connection State</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id455331">Consolidated Modem Devices</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id451364">Secret Property Flags</a></span></dt>
+<dt><span class="section"><a href="ref-migrating.html#id456844">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="id449785"></a>Architecture and D-Bus API Changes in 0.9</h2></div></div></div>
+<a name="id473771"></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="id446214"></a>Elimination of the User Settings Service</h3></div></div></div>
+<a name="id488881"></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="id429971"></a>User Secret Agents</h3></div></div></div>
+<a name="id459804"></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="id429654"></a>Settings Service Interface Changes</h3></div></div></div>
+<a name="id471077"></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
@@ -190,7 +190,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id438294"></a>Connection Object Interface Changes</h3></div></div></div>
+<a name="id492108"></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
@@ -224,7 +224,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id432724"></a>Permissions Methods Consolidation</h3></div></div></div>
+<a name="id477672"></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
@@ -256,7 +256,7 @@
       are now string-based permissions.  The mapping is as follows:
       </p>
 <div class="table">
-<a name="id433760"></a><p class="title"><b>Table 20. </b></p>
+<a name="id482461"></a><p class="title"><b>Table 20. </b></p>
 <div class="table-contents"><table border="1">
 <colgroup>
 <col>
@@ -307,7 +307,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id431666"></a>AddConnection Returns Object Path of New Connection</h3></div></div></div>
+<a name="id483262"></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>
@@ -325,7 +325,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id413984"></a>Support for WiMAX Devices</h3></div></div></div>
+<a name="id450653"></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
@@ -348,7 +348,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id444778"></a>New Device States</h3></div></div></div>
+<a name="id456786"></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.
@@ -363,7 +363,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id448971"></a>New Active Connection State</h3></div></div></div>
+<a name="id486946"></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
@@ -379,7 +379,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id443548"></a>Consolidated Modem Devices</h3></div></div></div>
+<a name="id455331"></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
@@ -415,7 +415,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id421190"></a>Secret Property Flags</h3></div></div></div>
+<a name="id451364"></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
@@ -424,7 +424,7 @@
       following values:
       </p>
 <div class="table">
-<a name="id421198"></a><p class="title"><b>Table 21. </b></p>
+<a name="id451372"></a><p class="title"><b>Table 21. </b></p>
 <div class="table-contents"><table border="1">
 <colgroup>
 <col>
@@ -486,7 +486,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id420876"></a>Deprecated Methods Removed</h3></div></div></div>
+<a name="id456844"></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
@@ -496,7 +496,7 @@
       their replacements:
       </p>
 <div class="table">
-<a name="id420890"></a><p class="title"><b>Table 22. </b></p>
+<a name="id456858"></a><p class="title"><b>Table 22. </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 abdef1d7..45929d62 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#id437745">Configuration Settings</a></span></dt>
+<dt><span class="section"><a href="ref-settings.html#id480831">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="id437745"></a>Configuration Settings</h2></div></div></div>
+<a name="id480831"></a>Configuration Settings</h2></div></div></div>
 <p>
 </p>
 <div class="table">
-<a name="id439177"></a><p class="title"><b>Table 1. 802-1x setting</b></p>
+<a name="id455861"></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>
@@ -246,7 +246,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id425896"></a><p class="title"><b>Table 2. bluetooth setting</b></p>
+<a name="id464508"></a><p class="title"><b>Table 2. bluetooth setting</b></p>
 <div class="table-contents"><table summary="bluetooth setting" border="1">
 <colgroup>
 <col>
@@ -285,7 +285,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id426028"></a><p class="title"><b>Table 3. bond setting</b></p>
+<a name="id464640"></a><p class="title"><b>Table 3. bond setting</b></p>
 <div class="table-contents"><table summary="bond setting" border="1">
 <colgroup>
 <col>
@@ -324,7 +324,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id426161"></a><p class="title"><b>Table 4. cdma setting</b></p>
+<a name="id464773"></a><p class="title"><b>Table 4. cdma setting</b></p>
 <div class="table-contents"><table summary="cdma setting" border="1">
 <colgroup>
 <col>
@@ -375,7 +375,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id426359"></a><p class="title"><b>Table 5. connection setting</b></p>
+<a name="id464971"></a><p class="title"><b>Table 5. connection setting</b></p>
 <div class="table-contents"><table summary="connection setting" border="1">
 <colgroup>
 <col>
@@ -462,7 +462,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id426751"></a><p class="title"><b>Table 6. gsm setting</b></p>
+<a name="id465363"></a><p class="title"><b>Table 6. gsm setting</b></p>
 <div class="table-contents"><table summary="gsm setting" border="1">
 <colgroup>
 <col>
@@ -555,7 +555,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id456458"></a><p class="title"><b>Table 7. infiniband setting</b></p>
+<a name="id495059"></a><p class="title"><b>Table 7. infiniband setting</b></p>
 <div class="table-contents"><table summary="infiniband setting" border="1">
 <colgroup>
 <col>
@@ -600,7 +600,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id456596"></a><p class="title"><b>Table 8. ipv4 setting</b></p>
+<a name="id495198"></a><p class="title"><b>Table 8. ipv4 setting</b></p>
 <div class="table-contents"><table summary="ipv4 setting" border="1">
 <colgroup>
 <col>
@@ -699,7 +699,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id456993"></a><p class="title"><b>Table 9. ipv6 setting</b></p>
+<a name="id495594"></a><p class="title"><b>Table 9. ipv6 setting</b></p>
 <div class="table-contents"><table summary="ipv6 setting" border="1">
 <colgroup>
 <col>
@@ -786,7 +786,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id457340"></a><p class="title"><b>Table 10. 802-11-olpc-mesh setting</b></p>
+<a name="id495941"></a><p class="title"><b>Table 10. 802-11-olpc-mesh setting</b></p>
 <div class="table-contents"><table summary="802-11-olpc-mesh setting" border="1">
 <colgroup>
 <col>
@@ -831,7 +831,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id457478"></a><p class="title"><b>Table 11. ppp setting</b></p>
+<a name="id496079"></a><p class="title"><b>Table 11. ppp setting</b></p>
 <div class="table-contents"><table summary="ppp setting" border="1">
 <colgroup>
 <col>
@@ -966,7 +966,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id458143"></a><p class="title"><b>Table 12. pppoe setting</b></p>
+<a name="id496747"></a><p class="title"><b>Table 12. pppoe setting</b></p>
 <div class="table-contents"><table summary="pppoe setting" border="1">
 <colgroup>
 <col>
@@ -1017,7 +1017,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id458349"></a><p class="title"><b>Table 13. serial setting</b></p>
+<a name="id496953"></a><p class="title"><b>Table 13. serial setting</b></p>
 <div class="table-contents"><table summary="serial setting" border="1">
 <colgroup>
 <col>
@@ -1074,7 +1074,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id458588"></a><p class="title"><b>Table 14. vlan setting</b></p>
+<a name="id497192"></a><p class="title"><b>Table 14. vlan setting</b></p>
 <div class="table-contents"><table summary="vlan setting" border="1">
 <colgroup>
 <col>
@@ -1099,13 +1099,13 @@
 <td><pre class="screen">interface-name</pre></td>
 <td><pre class="screen">string</pre></td>
 <td><pre class="screen"></pre></td>
-<td>If given, specifies the kernel name of the VLAN interface. If not given, a default name will be constructed from the interface described by the parent interface and the 'id' property, ex 'eth2.1'. The parent interface may be given by the 'parent' property or by a hardware address property, eg the 'wired' or 'infiniband' settings' 'mac-address' property.</td>
+<td>If given, specifies the kernel name of the VLAN interface. If not given, a default name will be constructed from the interface described by the parent interface and the 'id' property, ex 'eth2.1'. The parent interface may be given by the 'parent' property or by a hardware address property, eg the 'wired' settings' 'mac-address' property.</td>
 </tr>
 <tr>
 <td><pre class="screen">parent</pre></td>
 <td><pre class="screen">string</pre></td>
 <td><pre class="screen"></pre></td>
-<td>If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created.  If this property is not specified, the connection must contain a hardware address in a hardware-specific setting, like the 'wired' or 'infiniband' settings' 'mac-address' property.</td>
+<td>If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created.  If this property is not specified, the connection must contain a hardware address in a hardware-specific setting, like the 'wired' settings' 'mac-address' property.</td>
 </tr>
 <tr>
 <td><pre class="screen">id</pre></td>
@@ -1137,7 +1137,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id458863"></a><p class="title"><b>Table 15. vpn setting</b></p>
+<a name="id497467"></a><p class="title"><b>Table 15. vpn setting</b></p>
 <div class="table-contents"><table summary="vpn setting" border="1">
 <colgroup>
 <col>
@@ -1188,7 +1188,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id459068"></a><p class="title"><b>Table 16. wimax setting</b></p>
+<a name="id497672"></a><p class="title"><b>Table 16. wimax setting</b></p>
 <div class="table-contents"><table summary="wimax setting" border="1">
 <colgroup>
 <col>
@@ -1227,7 +1227,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id459207"></a><p class="title"><b>Table 17. 802-3-ethernet setting</b></p>
+<a name="id497811"></a><p class="title"><b>Table 17. 802-3-ethernet setting</b></p>
 <div class="table-contents"><table summary="802-3-ethernet setting" border="1">
 <colgroup>
 <col>
@@ -1320,7 +1320,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id459647"></a><p class="title"><b>Table 18. 802-11-wireless setting</b></p>
+<a name="id498251"></a><p class="title"><b>Table 18. 802-11-wireless setting</b></p>
 <div class="table-contents"><table summary="802-11-wireless setting" border="1">
 <colgroup>
 <col>
@@ -1431,7 +1431,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id460191"></a><p class="title"><b>Table 19. 802-11-wireless-security setting</b></p>
+<a name="id498795"></a><p class="title"><b>Table 19. 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 4796dfd1..a6c8ca5b 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.5.96</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.6.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.5.96</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.6.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
diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml
index 885ff7f1..fadc8862 100644
--- a/docs/api/network-manager-docs.xml
+++ b/docs/api/network-manager-docs.xml
@@ -7,20 +7,9 @@
   <bookinfo>
     <title>NetworkManager D-Bus Reference Manual</title>
     <releaseinfo>Version &version;</releaseinfo>
-    <authorgroup>
-      <author>
-	<firstname>Dan</firstname>
-	<surname>Williams</surname>
-	<affiliation>
-	  <address>
-	    <email>dcbw@redhat.com</email>
-	  </address>
-	</affiliation>
-      </author>
-    </authorgroup>
 
     <copyright>
-      <year>2011</year>
+      <year>2012</year>
       <holder>The NetworkManager Authors</holder>
     </copyright>
 
@@ -39,19 +28,11 @@
 
 	<address>
 	  The Free Software Foundation, Inc.,
-	  <street>59 Temple Place</street> - Suite 330,
-	  <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>,
+	  <street>51 Franklin Street</street> - Fifth Floor,
+	  <city>Boston</city>, <state>MA</state> <postcode>02110-1301</postcode>,
 	  <country>USA</country>
 	</address>
       </para>
-
-      <para>
-	Many of the names used by companies to distinguish their
-	products and services are claimed as trademarks. Where those
-	names appear in any GNOME documentation, and those trademarks
-	are made aware to the members of the GNOME Documentation
-	Project, the names have been printed in caps or initial caps.
-      </para>
     </legalnotice>
   </bookinfo>
 
diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml
index d90814d7..1e7eead4 100644
--- a/docs/api/settings-spec.xml
+++ b/docs/api/settings-spec.xml
@@ -983,13 +983,13 @@
         <entry><screen>interface-name</screen></entry>
         <entry><screen>string</screen></entry>
         <entry><screen></screen></entry>
-        <entry>If given, specifies the kernel name of the VLAN interface. If not given, a default name will be constructed from the interface described by the parent interface and the 'id' property, ex 'eth2.1'. The parent interface may be given by the 'parent' property or by a hardware address property, eg the 'wired' or 'infiniband' settings' 'mac-address' property.</entry>
+        <entry>If given, specifies the kernel name of the VLAN interface. If not given, a default name will be constructed from the interface described by the parent interface and the 'id' property, ex 'eth2.1'. The parent interface may be given by the 'parent' property or by a hardware address property, eg the 'wired' settings' 'mac-address' property.</entry>
       </row>
       <row>
         <entry><screen>parent</screen></entry>
         <entry><screen>string</screen></entry>
         <entry><screen></screen></entry>
-        <entry>If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created.  If this property is not specified, the connection must contain a hardware address in a hardware-specific setting, like the 'wired' or 'infiniband' settings' 'mac-address' property.</entry>
+        <entry>If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created.  If this property is not specified, the connection must contain a hardware address in a hardware-specific setting, like the 'wired' settings' 'mac-address' property.</entry>
       </row>
       <row>
         <entry><screen>id</screen></entry>
diff --git a/docs/api/spec.html b/docs/api/spec.html
index 4796dfd1..a6c8ca5b 100644
--- a/docs/api/spec.html
+++ b/docs/api/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.5.96</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.6.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.5.96</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.6.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
diff --git a/docs/api/version.xml b/docs/api/version.xml
index b8a4eaee..c318497f 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-0.9.5.96
+0.9.6.0
-- 
cgit 1.3.0-6-gf8a5