Index: xfce/apps/midori.xml
===================================================================
--- xfce/apps/midori.xml	(revision dcd16c6bf4b6fded8fe4a372904a1e184c82f51f)
+++ xfce/apps/midori.xml	(revision c53e7e36a164856f297c0ae43a636f43e01d804e)
@@ -6,13 +6,13 @@
 
   <!ENTITY midori-download-http
-    "http://archive.xfce.org/src/apps/midori/0.4/midori-&midori-version;.tar.bz2">
+           "http://archive.xfce.org/src/apps/midori/0.4/midori-&midori-version;.tar.bz2">
   <!ENTITY midori-download-ftp  " ">
-  <!ENTITY midori-md5sum        "14288197a1e2251b7c0803e1448daa0e">
-  <!ENTITY midori-size          "932 KB">
-  <!ENTITY midori-buildsize     "29 MB (5 MB installed)">
-  <!ENTITY midori-time          "0.1 SBU">
+  <!ENTITY midori-md5sum        "d2b3c436c08022f47a0db6bca3772790">
+  <!ENTITY midori-size          "1.1 MB">
+  <!ENTITY midori-buildsize     "50 MB (9 MB installed)">
+  <!ENTITY midori-time          "0.3 SBU">
 ]>
 
-<sect1 id="midori" xreflabel="midori-&midori-version;">
+<sect1 id="midori" xreflabel="Midori-&midori-version;">
   <?dbhtml filename="midori.html"?>
 
@@ -22,8 +22,8 @@
   </sect1info>
 
-  <title>midori-&midori-version;</title>
+  <title>Midori-&midori-version;</title>
 
   <indexterm zone="midori">
-    <primary sortas="a-midori">midori</primary>
+    <primary sortas="a-Midori">Midori</primary>
   </indexterm>
 
@@ -33,5 +33,5 @@
     <para>
       <application>Midori</application> is a lightweight web browser that uses
-      <application>WebKitGTK</application>.
+      <application>WebKitGTK+</application>.
     </para>
 
@@ -76,13 +76,23 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="webkitgtk"/> (configured --with-gtk=2.0) and
-      <xref linkend="vala"/>.
+      <xref linkend="webkitgtk"/> (configured --with-gtk=2.0) or
+      <xref linkend="webkitgtk"/> (configured --with-gtk=3.0) and
+      <xref linkend="vala"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libnotify"/> and
+      <xref linkend="librsvg"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libnotify"/>,
-      <xref linkend="librsvg"/> and
-      <xref linkend="libunique"/>.
+      <ulink url="&gnome-download-http;/gnome-keyring">GNOME Keyring (2.x)</ulink> or
+      <xref linkend="gcr"/>,
+      <xref linkend="gtk-doc"/>,
+      <ulink url="&gnome-download-http;/libunique">libunique (1.x)</ulink> or
+      <xref linkend="libunique"/> and
+      <xref linkend="libzeitgeist"/>
     </para>
 
@@ -100,5 +110,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/midori-&midori-version; &amp;&amp;
 make</userinput></screen>
 
@@ -118,10 +128,24 @@
 
     <para>
-      <command>export NOCOLOR=1</command>: This prevents the build process
-      outputting coloured text. Coloured text is fine if you're running the
-      commands in a terminal, but if you compile it with a script and pipe the
-      output to a log file the control characters that colour the text can make
-      the log file difficult to read with a text editor.
+      <option>--enable-gtk3</option>: Use this switch if you want
+      to build <application>Midori</application> with
+      <application>GTK+ 3</application> dependencies.
     </para>
+
+    <para>
+      <option>--enable-apidocs</option>: Use this switch if
+      <application>GTK-Doc</application> is installed and you
+      wish to build and install the API documentation. 
+    </para>
+
+    <para>
+      <command>export NOCOLOR=1</command>: This prevents the build
+      process outputting colored text. Colored text is fine if
+      you're running the commands in a terminal, but if you compile
+      it with a script and pipe the output to a log file the control
+      characters that color the text can makehe log file difficult
+      to read with a text editor.
+    </para>
+
   </sect2>
 
@@ -135,12 +159,16 @@
 
       <seglistitem>
-        <seg>midori</seg>
-        <seg>None</seg>
+        <seg>
+          midori
+        </seg>
+        <seg>
+          None
+        </seg>
         <seg>
           /etc/xdg/midori,
           /usr/include/midori-0.4,
           /usr/lib/midori,
-          /usr/share/midori and
-          /usr/share/doc/midori
+          /usr/share/doc/midori-&midori-version; and
+          /usr/share/midori
         </seg>
       </seglistitem>
@@ -156,5 +184,5 @@
         <listitem>
           <para>
-            is a lightweight <application>WebKitGTK</application> browser.
+            is a lightweight <application>WebKitGTK+</application> browser.
           </para>
           <indexterm zone="midori midori-prog">
@@ -163,5 +191,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>
Index: xfce/apps/parole.xml
===================================================================
--- xfce/apps/parole.xml	(revision dcd16c6bf4b6fded8fe4a372904a1e184c82f51f)
+++ xfce/apps/parole.xml	(revision c53e7e36a164856f297c0ae43a636f43e01d804e)
@@ -6,13 +6,13 @@
 
   <!ENTITY parole-download-http
-    "http://archive.xfce.org/src/apps/parole/0.2/parole-&parole-version;.tar.bz2">
+           "http://archive.xfce.org/src/apps/parole/0.5/parole-&parole-version;.tar.bz2">
   <!ENTITY parole-download-ftp  " ">
-  <!ENTITY parole-md5sum        "5d7e5ab7535bdf89508a8d7e551f9187">
-  <!ENTITY parole-size          "640 KB">
-  <!ENTITY parole-buildsize     "16 MB">
+  <!ENTITY parole-md5sum        "d8adad20ee95dfca3082812ca44be122">
+  <!ENTITY parole-size          "632 KB">
+  <!ENTITY parole-buildsize     "18 MB">
   <!ENTITY parole-time          "0.3 SBU">
 ]>
 
-<sect1 id="parole" xreflabel="parole-&parole-version;">
+<sect1 id="parole" xreflabel="Parole-&parole-version;">
   <?dbhtml filename="parole.html"?>
 
@@ -22,8 +22,8 @@
   </sect1info>
 
-  <title>parole-&parole-version;</title>
+  <title>Parole-&parole-version;</title>
 
   <indexterm zone="parole">
-    <primary sortas="a-parole">parole</primary>
+    <primary sortas="a-Parole">Parole</primary>
   </indexterm>
 
@@ -32,6 +32,7 @@
 
     <para>
-      <application>Parole</application> is a DVD/CD/music player that uses
-      Gstreamer.
+      <application>Parole</application> is a DVD/CD/music player for
+      <application>Xfce</application> that uses
+      <application>GStreamer</application>.
     </para>
 
@@ -76,13 +77,13 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="gst-plugins-base"/> and
-      <xref linkend="libxfcegui4"/>.
+      <xref linkend="gst-plugins-base"/> or
+      <xref linkend="gst10-plugins-base"/> and
+      <xref linkend="libxfce4ui"/>
     </para>
 
-    <bridgehead renderas="sect4">Recommended (for playing DVDs)</bridgehead>
+    <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="gst-plugins-ugly"/> (with <xref linkend="libdvdcss"/>,
-      <xref linkend="libdvdnav"/> and <xref linkend="libdvdread"/>).
+      <xref linkend="libnotify"/> and
+      <xref linkend="taglib"/>
     </para>
 
@@ -100,6 +101,5 @@
     </para>
 
-<screen><userinput>echo "video/webm" >>data/mime/mime-type-list.txt &amp;&amp;
-LIBS+=-lX11 ./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -113,4 +113,5 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
   </sect2>
 
@@ -118,22 +119,26 @@
     <title>Command Explanations</title>
 
-    <para><parameter>echo "video/webm" >>data/mime/mime-type-list.txt</parameter>:
-    This allows <application>parole</application> to recognize that webm video
-    files can be played (requires Gstreamer Good and Bad plugins).</para>
+    <para>
+      <parameter>--with-gstreamer=1.0</parameter>: Use this switch if
+      you want to use <xref linkend="gst10-plugins-base"/> instead of
+      <xref linkend="gst-plugins-base"/>.
+    </para>
 
   </sect2>
+
   <sect2 role="using">
     <title>Using Parole</title>
 
     <para>
-      If you have installed Gstreamer Plugins Ugly with support for Libdvdnav
-      and Libdvdread and would like to use Parole to play a DVD, click Media&gt;
+      If you have installed Gstreamer Plugins Ugly with support for libdvdnav
+      and libdvdread and would like to use Parole to play a DVD, click Media&gt;
       Open location and enter dvd:// into the box.
     </para>
 
     <para>
-      Similarly, to play a CD,  click Media&gt; Open location and enter cdda://
+      Similarly, to play a CD, click Media&gt; Open location and enter cdda://
       into the box.
     </para>
+
   </sect2>
 
@@ -147,6 +152,10 @@
 
       <seglistitem>
-        <seg>parole</seg>
-        <seg>None</seg>
+        <seg>
+          parole
+        </seg>
+        <seg>
+          None
+        </seg>
         <seg>
           /usr/include/parole,
@@ -166,5 +175,6 @@
         <listitem>
           <para>
-            is a Gtk+ 2 media player that uses Gstreamer.
+            is a <application>GTK+ 2</application> media player that
+            uses <application>GStreamer</application>.
           </para>
           <indexterm zone="parole parole-prog">
@@ -173,5 +183,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>
