Index: gnome/platform/folks.xml
===================================================================
--- gnome/platform/folks.xml	(revision 23213487156def2d55beeda9b8183d7450cedfb1)
+++ gnome/platform/folks.xml	(revision ab14cf7db7193c17167dd8c2436fcd2e5a3ab576)
@@ -79,6 +79,5 @@
     <para role="required">
       <xref linkend="dbus-glib"/>,
-      <xref linkend="libgee"/>,
-      <xref linkend="zeitgeist"/>, and
+      <xref linkend="libgee"/> and
       <xref linkend="telepathy-glib"/>
     </para>
@@ -91,4 +90,6 @@
       <xref linkend="vala"/>
     </para>
+
+<!-- optional zeitgeist, libsocialweb -->
 
     <para condition="html" role="usernotes">User Notes:
Index: gnome/platform/libunwind.xml
===================================================================
--- gnome/platform/libunwind.xml	(revision 23213487156def2d55beeda9b8183d7450cedfb1)
+++ 	(revision )
@@ -1,188 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY libunwind-download-http "http://nongnu.askapache.com/libunwind/libunwind-&libunwind-version;.tar.gz">
-  <!ENTITY libunwind-download-ftp  " ">
-  <!ENTITY libunwind-md5sum        "fb4ea2f6fbbe45bf032cd36e586883ce">
-  <!ENTITY libunwind-size          "1.1 MB">
-  <!ENTITY libunwind-buildsize     "3.5 MB">
-  <!ENTITY libunwind-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libunwind" xreflabel="libunwind-&libunwind-version;">
-  <?dbhtml filename="libunwind.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libunwind-&libunwind-version;</title>
-
-  <indexterm zone="libunwind">
-    <primary sortas="a-libunwind">libunwind</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libunwind</title>
-
-    <para>
-      <application>libunwind</application> is a portable and efficient C programming interface (API) to 
-      determine the call-chain of a program. The API additionally provides 
-      the means to manipulate the preserved (callee-saved) state of each call-frame and 
-      to resume execution at any point in the call-chain (non-local goto). 
-      The API supports both local (same-process) and remote (across-process) operation. 
-      As such, the API is useful in a number of applications.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libunwind-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url=" "/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libunwind-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libunwind-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libunwind-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libunwind-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libunwind Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (to build documentation).
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/libunwind"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libunwind</title>
-
-    <para>
-      Install <application>libunwind</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <xref linkend="doxygen"/>, issue <command>make dox</command>
-      to build documentation.
-    </para>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you have built documentation previously, install it with following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>mkdir -pv /usr/share/doc/libunwind-&libunwind-version; &amp;&amp;
-cp -rv doc/html/* /usr/share/doc/libunwind-&libunwind-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--enable-nss</option>: Use this switch if you want to
-      use Mozilla NSS instead of <application>OpenSSL</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libunwind.so
-        </seg>
-        <seg>
-          /usr/share/doc/libunwind-&libunwind-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libunwind-lib">
-        <term><filename class="libraryfile">libunwind.so</filename></term>
-        <listitem>
-          <para>
-            provides functions to escape and encode stings according to
-            OAuth specifications and offers high-level functionality built
-            on top to sign requests or verify signatures using either NSS or
-            OpenSSL for calculating the hash/signatures.
-          </para>
-          <indexterm zone="libunwind libunwind-lib">
-            <primary sortas="c-libunwind">libunwind.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: gnome/platform/platform.xml
===================================================================
--- gnome/platform/platform.xml	(revision 23213487156def2d55beeda9b8183d7450cedfb1)
+++ gnome/platform/platform.xml	(revision ab14cf7db7193c17167dd8c2436fcd2e5a3ab576)
@@ -39,5 +39,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="folks.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vte.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zeitgeist.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wayland.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxkbcommon.xml"/>
@@ -45,5 +44,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="weston.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="empathy.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libunwind.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="notification-daemon.xml"/>
Index: gnome/platform/weston.xml
===================================================================
--- gnome/platform/weston.xml	(revision 23213487156def2d55beeda9b8183d7450cedfb1)
+++ gnome/platform/weston.xml	(revision ab14cf7db7193c17167dd8c2436fcd2e5a3ab576)
@@ -82,9 +82,7 @@
     </para>
 
-    <bridgehead renderas="sect3">weston Dependencies</bridgehead>
-
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libunwind"/>
+      libunwind
     </para>
 
Index: gnome/platform/zeitgeist.xml
===================================================================
--- gnome/platform/zeitgeist.xml	(revision 23213487156def2d55beeda9b8183d7450cedfb1)
+++ 	(revision )
@@ -1,180 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY zeitgeist-download-http
-           "http://cgit.freedesktop.org/zeitgeist/zeitgeist/snapshot/zeitgeist-&zeitgeist-version;.tar.gz">
-
-  <!ENTITY zeitgeist-download-ftp  " ">
-  <!ENTITY zeitgeist-md5sum        "f71b784bb435278d6117c2da8fbf6cc9">
-  <!ENTITY zeitgeist-size          "300 KB">
-  <!ENTITY zeitgeist-buildsize     "7.0 MB">
-  <!ENTITY zeitgeist-time          "0.1 SBU">
-]>
-
-<sect1 id="zeitgeist" xreflabel="zeitgeist-&zeitgeist-version;">
-  <?dbhtml filename="zeitgeist.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>zeitgeist-&zeitgeist-version;</title>
-
-  <indexterm zone="zeitgeist">
-    <primary sortas="a-zeitgeist">zeitgeist</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to zeitgeist</title>
-
-    <para>
-      The <application>zeitgeist</application> package contains a client
-      library used to access and manage the Zeitgeist event log from
-      languages such as C and Vala. Zeitgeist is a service which logs
-      the user's activities and events (files opened, websites visited,
-      conversations hold with other people, etc.) and makes the relevant
-      information available to other applications.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&zeitgeist-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&zeitgeist-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &zeitgeist-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &zeitgeist-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &zeitgeist-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &zeitgeist-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">zeitgeist Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="sqlite"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="telepathy-glib"/>,
-      <xref linkend="gtk3"/>, and
-      <xref linkend="json-glib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/zeitgeist"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of zeitgeist</title>
-
-    <para>
-      Install <application>zeitgeist</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not have a working testsuite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <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>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libzeitgeist-1.0.so
-        </seg>
-        <seg>
-          /usr/include/libzeitgeist-1.0 and
-          /usr/share/doc/libzeitgeist
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="zeitgeist-1">
-        <term><filename class="libraryfile">libzeitgeist-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>zeitgeist</application> API functions.
-          </para>
-          <indexterm zone="zeitgeist zeitgeist-1">
-            <primary sortas="c-zeitgeist-1">libzeitgeist-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
