Index: gnome/core/gnome-online-accounts.xml
===================================================================
--- gnome/core/gnome-online-accounts.xml	(revision dcda92454b5c4009fd36752b5783c344a0831e0d)
+++ gnome/core/gnome-online-accounts.xml	(revision 7bdbf359d41a78052028c4035c4384a623a91067)
@@ -5,8 +5,10 @@
   %general-entities;
 
-  <!ENTITY gnome-online-accounts-download-http "&gnome-download-http;/gnome-online-accounts/3.2/gnome-online-accounts-&gnome-online-accounts-version;.tar.xz">
-  <!ENTITY gnome-online-accounts-download-ftp  "&gnome-download-ftp;/gnome-online-accounts/3.2/gnome-online-accounts-&gnome-online-accounts-version;.tar.xz">
-  <!ENTITY gnome-online-accounts-md5sum        "54ca322afd4c899238460baba4fad7db">
-  <!ENTITY gnome-online-accounts-size          "448 KB">
+  <!ENTITY gnome-online-accounts-download-http 
+           "&gnome-download-http;/gnome-online-accounts/3.4/gnome-online-accounts-&gnome-online-accounts-version;.tar.xz">
+  <!ENTITY gnome-online-accounts-download-ftp  
+           "&gnome-download-ftp;/gnome-online-accounts/3.4/gnome-online-accounts-&gnome-online-accounts-version;.tar.xz">
+  <!ENTITY gnome-online-accounts-md5sum        "dd1632ab23dc1af5ece70444d486ba84">
+  <!ENTITY gnome-online-accounts-size          "476 KB">
   <!ENTITY gnome-online-accounts-buildsize     "17 MB">
   <!ENTITY gnome-online-accounts-time          "0.3 SBU">
@@ -33,5 +35,5 @@
     framework used to access the user&apos;s online accounts.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -60,10 +62,22 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gtk3"/>,
-    <xref linkend="webkitgtk"/>,
-    <xref linkend="gnome-keyring"/>,
-    <xref linkend="libnotify"/>,
-    <xref linkend="librest"/>, and
-    <xref linkend="json-glib"/></para>
+    <para role="required">
+      <xref linkend="libgnome-keyring"/>,
+      <xref linkend="libnotify"/>,
+      <xref linkend="librest"/>,
+      <xref linkend="json-glib"/> and
+      <xref linkend="webkitgtk"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
+      (Required if building GNOME)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -78,6 +92,7 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX \
-            --libexecdir=$GNOME_PREFIX/lib/gnome-online-accounts &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --libexecdir=/usr/lib/gnome-online-accounts \
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -94,11 +109,14 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--libexecdir=$GNOME_PREFIX/lib/gnome-online-accounts</parameter>:
+    <para><parameter>--libexecdir=/usr/lib/gnome-online-accounts</parameter>:
     This parameter ensures the <command>goa-demon</command> program is installed in
     <filename class="directory">/usr/lib/gnome-online-accounts</filename> for
     conformance with the FHS.</para>
 
-    <para><option>--enable-static=no</option>: This switch prevents the static
-    libraries being installed.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -113,7 +131,14 @@
 
       <seglistitem>
-        <seg>goa-daemon</seg>
-        <seg>libgoa-1.0.{so,a} and libgoa-backend-1.0.{so,a}</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/goa-1.0/goabackend,lib/gnome-online-accounts,share/icons/hicolor/256x256/apps}</seg>
+        <seg>
+          goa-daemon
+        </seg>
+        <seg>
+          libgoa-1.0.so and libgoa-backend-1.0.so
+        </seg>
+        <seg>
+          /usr/include/goa-1.0, /usr/lib/gnome-online-accounts and
+          /usr/share/gtk-doc/html/goa
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -127,5 +152,5 @@
         <term><command>goa-daemon</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>is gnome-online-accounts daemon.</para>
           <indexterm zone="gnome-online-accounts goa-daemon">
             <primary sortas="b-goa-daemon">goa-daemon</primary>
@@ -135,9 +160,9 @@
 
       <varlistentry id="libgoa-1">
-        <term><filename class='libraryfile'>libgoa-1.0.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libgoa-1.0.so</filename></term>
         <listitem>
-          <para>contains functions that .....</para>
+          <para>contains gnome-online-accounts API functions.</para>
           <indexterm zone="gnome-online-accounts libgoa-1">
-            <primary sortas="c-libgoa-1">libgoa-1.0.{so,a}</primary>
+            <primary sortas="c-libgoa-1">libgoa-1.0.so</primary>
           </indexterm>
         </listitem>
@@ -145,9 +170,9 @@
 
       <varlistentry id="libgoa-backend-1">
-        <term><filename class='libraryfile'>libgoa-backend-1.0.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libgoa-backend-1.0.so</filename></term>
         <listitem>
-          <para>contains functions that .....</para>
+          <para>contains functions used by gnome-online-accounts backends.</para>
           <indexterm zone="gnome-online-accounts libgoa-backend-1">
-            <primary sortas="c-libgoa-backend-1">libgoa-backend-1.0.{so,a}</primary>
+            <primary sortas="c-libgoa-backend-1">libgoa-backend-1.0.so</primary>
           </indexterm>
         </listitem>
