Index: gnome/add/totem.xml
===================================================================
--- gnome/add/totem.xml	(revision 2001b3ef9a8f670c3ed1c6680d45faff142482b5)
+++ gnome/add/totem.xml	(revision ef6d24975f5c9700fe7bba0bfb4e98a811fb5fda)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY totem-download-http "&gnome-download-http;/totem/&gnome-version;/totem-&totem-version;.tar.xz">
-  <!ENTITY totem-download-ftp  "&gnome-download-ftp;/totem/&gnome-version;/totem-&totem-version;.tar.xz">
-  <!ENTITY totem-md5sum        "6a7911b45f908fd8237ba1217d0fded3">
-  <!ENTITY totem-size          "3.0 MB">
-  <!ENTITY totem-buildsize     "98 MB">
-  <!ENTITY totem-time          "2.9 SBU">
+  <!ENTITY totem-download-http "&gnome-download-http;/totem/3.4/totem-&totem-version;.tar.xz">
+  <!ENTITY totem-download-ftp  "&gnome-download-ftp;/totem/3.4/totem-&totem-version;.tar.xz">
+  <!ENTITY totem-md5sum        "e74a2ce5399cce760fb60adcf1f5b835">
+  <!ENTITY totem-size          "3.1 MB">
+  <!ENTITY totem-buildsize     "70 MB">
+  <!ENTITY totem-time          "2.5 SBU">
 ]>
 
@@ -37,7 +37,4 @@
     DVD, VCD or digital CD.</para>
 
-    <para>Now that this package uses the <application>clutter</application> toolkit,
-    it is only useful if you have hardware accelerated video.</para>
-
     &lfs70_checked;
 
@@ -67,11 +64,14 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="GConf"/>,
-    <xref linkend="gnome-doc-utils"/>,
-    <xref linkend="gst-plugins-good"/>,
-    <xref linkend="libunique"/>,
-    <xref linkend="shared-mime-info"/>,
-    <xref linkend="totem-pl-parser"/>, and
-    <xref linkend="which"/></para>
+    <para role="required">
+      <xref linkend="clutter-gtk"/>,
+      <xref linkend="gnome-doc-utils"/>,
+      <xref linkend="gnome-icon-theme"/>,
+      <xref linkend="gst-plugins-good"/>,
+      <xref linkend="iso-codes"/>,
+      <xref linkend="libpeas"/>,
+      <xref linkend="shared-mime-info"/> and
+      <xref linkend="totem-pl-parser"/>
+    </para>
 
     <para>Ensure you built <application>GStreamer Good Plugins</application>
@@ -79,27 +79,23 @@
     <command>configure</command> script will fail.</para>
 
-    <!-- commenting, I can find no references to PyGTK or pygtk in the package, except
-    for old ChangeLog entries.
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="pygtk"/> (Required for various plugins)</para>-->
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="nautilus"/>,
+      <xref linkend="pygobject3"/>,
+      <xref linkend="rarian"/> and
+      <xref linkend="vala"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><ulink url="http://www.bluez.org/">BlueZ</ulink>,
-    <ulink url="http://gmyth.sourceforge.net">GMyth</ulink>,
-    <ulink url="http://gmyth.sourceforge.net">GMyth-upnp</ulink>,
-    <ulink url="http://www.home.unix-ag.org/simon/gromit/">Gromit</ulink>
-    (required for the telestrator mode),
-    <ulink url="http://live.gnome.org/libepc/">libepc</ulink>,
-    <ulink url="http://www.galago-project.org/">libgalago</ulink>,
-    <ulink url="http://live.gnome.org/libgdata/">libgdata</ulink>,
-    <ulink url="http://www.lirc.org">LIRC</ulink>,
-    <xref linkend="nautilus"/>,
-    <xref linkend="pygobject2"/>,
-    <ulink url="http://pypi.python.org/pypi/pylint"/> (required, with its dependencies,
-    to run the testsuite),
-    <ulink url="http://live.gnome.org/Tracker/">Tracker</ulink>,
-    <ulink url="http://live.gnome.org/Vala/">Vala</ulink>, and
-    <xref linkend="firefox"/> or <xref linkend="xulrunner"/>
-    (to build the browser plug-in)</para>
+    <para role="optional">
+      <ulink url="http://live.gnome.org/Grilo/">Grilo</ulink>,
+      <xref linkend="gtk-doc"/>,
+      <ulink url="http://live.gnome.org/libepc/">libepc</ulink>,
+      <ulink url="http://www.lirc.org">LIRC</ulink>,
+      <ulink url="http://pypi.python.org/pypi/pylint"/>pylint</ulink> and
+      <xref linkend="firefox"/> or <xref linkend="xulrunner"/>
+      (to build the browser plug-ins)
+    </para>
 
     <para>Note: <xref linkend="libdvdcss"/> is a run-time requirement if you
@@ -117,6 +113,7 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX \
-            --libexecdir=$GNOME_PREFIX/lib/totem &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --libexecdir=/usr/lib/totem \
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -133,20 +130,18 @@
     <title>Command Explanations</title>
 
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/> -->
+
+    <para><parameter>--libexecdir=/usr/lib/totem</parameter>: This
+    parameter is used so that the plugin viewer is installed in
+    the preferred location of <filename
+    class='directory'>/usr/lib/totem</filename> instead of <filename
+    class='directory'>/usr/libexec</filename>.</para>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <para><parameter>--libexecdir=$GNOME_PREFIX/lib/totem</parameter>: This
-    parameter is used so that the movie player browser plugin is installed in
-    the preferred location of <filename
-    class='directory'>$GNOME_PREFIX/lib/totem</filename> instead of <filename
-    class='directory'>$GNOME_PREFIX/libexec</filename>.</para>
-
-    <para><option>--enable-static=no</option>: This switch prevents the static
-    libraries being installed.</para>
-
-    <!-- This is broken now so disabling the comment
-    <para><option>-enable-vanity</option>: Using this parameter will build the
-    webcam utility (still in development).</para>
-    -->
+    href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -170,21 +165,19 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>totem, totem-audio-preview,
-        totem-video-thumbnailer, and totem-plugin-viewer</seg>
-        <seg>libtotem.{so,a}, libtotem-properties-page.{so,a}, libbrasero-disc-recorder.{so,a},
-        libgromit.{so,a}, libmedia_player_keys.{so,a}, libontop.{so,a},
-        libmovie-properties.{so,a}, libscreensaver.{so,a}, libscreenshot.{so,a},
-        libskipto.{so,a}, libthumbnail.{so,a}, libtotem-cone-plugin.{so,a},
-        libtotem-gmp-plugin.{so,a}, libtotem-mully-plugin.{so,a}, and
-        libtotem-narrowspace-plugin.{so,a}</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{lib/totem/{plugins/{brasero-disc-recorder,
-        coherence_upnp,dbus,gromit,iplayer,jamendo,media-player-keys,ontop,
-        opensubtitles,properties,pythonconsole,screensaver,screenshot,skipto,
-        thumbnail,totem},totem},share/{gnome/help/totem/*,gtk-doc/html/totem,
-        omf/totem,totem}}</seg>
+        <seg>
+          totem, totem-audio-preview and totem-video-thumbnailer
+        </seg>
+        <seg>
+          libtotem.so
+        </seg>
+        <seg>
+          /usr/include/totem, /usr/lib/totem, /usr/share/gnome/help/totem,
+          /usr/share/gtk-doc/html/totem, /usr/share/omf/totem and
+          /usr/share/totem
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -219,4 +212,15 @@
         </listitem>
       </varlistentry>
+
+      <varlistentry id="libtotem">
+        <term><filename class='libraryfile'>libtotem.so</filename></term>
+        <listitem>
+          <para>contains the Totem API functions.</para>
+          <indexterm zone="totem libtotem">
+            <primary sortas="c-libtotem">libtotem.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
