Index: gnome/applications/cheese.xml
===================================================================
--- gnome/applications/cheese.xml	(revision eae676e07bb31938f1b2cbf1122484995706a7f5)
+++ gnome/applications/cheese.xml	(revision b1b37da8dfb5bcacf11fb6b5e226d2c8c0771198)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY cheese-download-http "&gnome-download-http;/cheese/3.8/cheese-&cheese-version;.tar.xz">
-  <!ENTITY cheese-download-ftp  "&gnome-download-ftp;/cheese/3.8/cheese-&cheese-version;.tar.xz">
-  <!ENTITY cheese-md5sum        "62f2670fa2c44fb51613ebb8f4d2c07c">
-  <!ENTITY cheese-size          "3.6 MB">
-  <!ENTITY cheese-buildsize     "30 MB">
-  <!ENTITY cheese-time          "0.4 SBU">
+  <!ENTITY cheese-download-http "&gnome-download-http;/cheese/&gnome-minor;/cheese-&cheese-version;.tar.xz">
+  <!ENTITY cheese-download-ftp  "&gnome-download-ftp;/cheese/&gnome-minor;/cheese-&cheese-version;.tar.xz">
+  <!ENTITY cheese-md5sum        "66a138e200988d275f36bfa58e76af1c">
+  <!ENTITY cheese-size          "3.5 MB">
+  <!ENTITY cheese-buildsize     "20 MB">
+  <!ENTITY cheese-time          "0.3 SBU">
 ]>
 
Index: gnome/applications/eog.xml
===================================================================
--- gnome/applications/eog.xml	(revision eae676e07bb31938f1b2cbf1122484995706a7f5)
+++ gnome/applications/eog.xml	(revision b1b37da8dfb5bcacf11fb6b5e226d2c8c0771198)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY eog-download-http "&gnome-download-http;/eog/3.8/eog-&eog-version;.tar.xz">
-  <!ENTITY eog-download-ftp  "&gnome-download-ftp;/eog/3.8/eog-&eog-version;.tar.xz">
-  <!ENTITY eog-md5sum        "84c48f8468b8cee09379091d11b553ca">
-  <!ENTITY eog-size          "3.5 MB">
-  <!ENTITY eog-buildsize     "60 MB">
+  <!ENTITY eog-download-http "&gnome-download-http;/eog/&gnome-minor;/eog-&eog-version;.tar.xz">
+  <!ENTITY eog-download-ftp  "&gnome-download-ftp;/eog/&gnome-minor;/eog-&eog-version;.tar.xz">
+  <!ENTITY eog-md5sum        "fea14d66c2fe9366ef4d6ef003fae6b7">
+  <!ENTITY eog-size          "3.4 MB">
+  <!ENTITY eog-buildsize     "44 MB">
   <!ENTITY eog-time          "0.5 SBU">
 ]>
Index: gnome/applications/epiphany.xml
===================================================================
--- gnome/applications/epiphany.xml	(revision eae676e07bb31938f1b2cbf1122484995706a7f5)
+++ gnome/applications/epiphany.xml	(revision b1b37da8dfb5bcacf11fb6b5e226d2c8c0771198)
@@ -6,10 +6,10 @@
 
   <!ENTITY epiphany-download-http
-           "&gnome-download-http;/epiphany/3.8/epiphany-&epiphany-version;.tar.xz">
+           "&gnome-download-http;/epiphany/&gnome-minor;/epiphany-&epiphany-version;.tar.xz">
   <!ENTITY epiphany-download-ftp
-           "&gnome-download-ftp;/epiphany/3.8/epiphany-&epiphany-version;.tar.xz">
-  <!ENTITY epiphany-md5sum        "5aa6c07fba38a395e5aa94ae7346a9cb">
-  <!ENTITY epiphany-size          "2.4 MB">
-  <!ENTITY epiphany-buildsize     "105 MB">
+           "&gnome-download-ftp;/epiphany/&gnome-minor;/epiphany-&epiphany-version;.tar.xz">
+  <!ENTITY epiphany-md5sum        "009d9ed8ee25885c5539c124f4630072">
+  <!ENTITY epiphany-size          "2.9 MB">
+  <!ENTITY epiphany-buildsize     "107 MB">
   <!ENTITY epiphany-time          "0.6 SBU">
 ]>
@@ -88,5 +88,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="nss"/>,
+      <xref linkend="nss"/> and
       <xref linkend="seahorse"/> (at runtime, for managing stored passwords)
     </para>
Index: gnome/applications/evince.xml
===================================================================
--- gnome/applications/evince.xml	(revision eae676e07bb31938f1b2cbf1122484995706a7f5)
+++ gnome/applications/evince.xml	(revision b1b37da8dfb5bcacf11fb6b5e226d2c8c0771198)
@@ -5,10 +5,12 @@
   %general-entities;
 
-  <!ENTITY evince-download-http "&gnome-download-http;/evince/3.8/evince-&evince-version;.tar.xz">
-  <!ENTITY evince-download-ftp  "&gnome-download-ftp;/evince/3.8/evince-&evince-version;.tar.xz">
-  <!ENTITY evince-md5sum        "81a8b0ffc427f2e3bde4056286e3a27a">
+  <!ENTITY evince-download-http 
+     "&gnome-download-http;/evince/&gnome-minor;/evince-&evince-version;.tar.xz">
+  <!ENTITY evince-download-ftp  
+     "&gnome-download-ftp;/evince/&gnome-minor;/evince-&evince-version;.tar.xz">
+  <!ENTITY evince-md5sum        "155f458eb391d581aaa51582bc11965c">
   <!ENTITY evince-size          "6.2 MB">
-  <!ENTITY evince-buildsize     "100 MB">
-  <!ENTITY evince-time          "0.8 SBU">
+  <!ENTITY evince-buildsize     "68 MB">
+  <!ENTITY evince-time          "0.9 SBU">
 ]>
 
@@ -115,7 +117,7 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>./configure --prefix=/usr                \
             --libexecdir=/usr/lib/evince \
-            --enable-introspection \
+            --enable-introspection       \
             --disable-static &amp;&amp;
 make</userinput></screen>
Index: gnome/applications/file-roller.xml
===================================================================
--- gnome/applications/file-roller.xml	(revision eae676e07bb31938f1b2cbf1122484995706a7f5)
+++ gnome/applications/file-roller.xml	(revision b1b37da8dfb5bcacf11fb6b5e226d2c8c0771198)
@@ -6,11 +6,11 @@
 
   <!ENTITY file-roller-download-http
-           "&gnome-download-http;/file-roller/3.8/file-roller-&file-roller-version;.tar.xz">
+      "&gnome-download-http;/file-roller/&gnome-minor;/file-roller-&file-roller-version;.tar.xz">
   <!ENTITY file-roller-download-ftp
-           "&gnome-download-ftp;/file-roller/3.8/file-roller-&file-roller-version;.tar.xz">
-  <!ENTITY file-roller-md5sum        "daee8374afe23a3c7d83ec42bb84da22">
-  <!ENTITY file-roller-size          "1.5 MB">
-  <!ENTITY file-roller-buildsize     "45 MB">
-  <!ENTITY file-roller-time          "0.4 SBU">
+      "&gnome-download-ftp;/file-roller/&gnome-minor;/file-roller-&file-roller-version;.tar.xz">
+  <!ENTITY file-roller-md5sum        "f630a6c520b1d4aff10b9e7612a31485">
+  <!ENTITY file-roller-size          "1.3 MB">
+  <!ENTITY file-roller-buildsize     "30 MB">
+  <!ENTITY file-roller-time          "0.3 SBU">
 ]>
 
@@ -118,7 +118,7 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>./configure --prefix=/usr         \
             --libexecdir=/usr/lib \
-            --disable-packagekit \
+            --disable-packagekit  \
             --disable-static &amp;&amp;
 make</userinput></screen>
Index: gnome/applications/gedit.xml
===================================================================
--- gnome/applications/gedit.xml	(revision eae676e07bb31938f1b2cbf1122484995706a7f5)
+++ gnome/applications/gedit.xml	(revision b1b37da8dfb5bcacf11fb6b5e226d2c8c0771198)
@@ -5,10 +5,12 @@
   %general-entities;
 
-  <!ENTITY gedit-download-http "&gnome-download-http;/gedit/3.8/gedit-&gedit-version;.tar.xz">
-  <!ENTITY gedit-download-ftp  "&gnome-download-ftp;/gedit/3.8/gedit-&gedit-version;.tar.xz">
-  <!ENTITY gedit-md5sum        "dd81bffac9026854e33ded9e8ed9bf7c">
+  <!ENTITY gedit-download-http 
+     "&gnome-download-http;/gedit/&gnome-minor;/gedit-&gedit-version;.tar.xz">
+  <!ENTITY gedit-download-ftp  
+     "&gnome-download-ftp;/gedit/&gnome-minor;/gedit-&gedit-version;.tar.xz">
+  <!ENTITY gedit-md5sum        "7627e2c6af5d181571005693cd00da47">
   <!ENTITY gedit-size          "3.0 MB">
-  <!ENTITY gedit-buildsize     "110 MB">
-  <!ENTITY gedit-time          "0.6 SBU">
+  <!ENTITY gedit-buildsize     "83 MB">
+  <!ENTITY gedit-time          "0.7 SBU">
 ]>
 
Index: gnome/applications/gnome-calculator.xml
===================================================================
--- gnome/applications/gnome-calculator.xml	(revision eae676e07bb31938f1b2cbf1122484995706a7f5)
+++ gnome/applications/gnome-calculator.xml	(revision b1b37da8dfb5bcacf11fb6b5e226d2c8c0771198)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-calculator-download-http
-           "&gnome-download-http;/gnome-calculator/3.8/gnome-calculator-&gnome-calculator-version;.tar.xz">
+   "&gnome-download-http;/gnome-calculator/&gnome-minor;/gnome-calculator-&gnome-calculator-version;.tar.xz">
   <!ENTITY gnome-calculator-download-ftp
-           "&gnome-download-ftp;/gnome-calculator/3.8/gnome-calculator-&gnome-calculator-version;.tar.xz">
-  <!ENTITY gnome-calculator-md5sum        "1040c061ee791a44a00e1ea7482feb61">
-  <!ENTITY gnome-calculator-size          "1.1 KB">
-  <!ENTITY gnome-calculator-buildsize     "45 MB">
-  <!ENTITY gnome-calculator-time          "0.2 SBU">
+   "&gnome-download-ftp;/gnome-calculator/&gnome-minor;/gnome-calculator-&gnome-calculator-version;.tar.xz">
+  <!ENTITY gnome-calculator-md5sum        "882e0ee761917e8d8f08f1d1e8f8bac9">
+  <!ENTITY gnome-calculator-size          "1.0 MB">
+  <!ENTITY gnome-calculator-buildsize     "36 MB">
+  <!ENTITY gnome-calculator-time          "0.3 SBU">
 ]>
 
Index: gnome/applications/gnome-power-manager.xml
===================================================================
--- gnome/applications/gnome-power-manager.xml	(revision eae676e07bb31938f1b2cbf1122484995706a7f5)
+++ gnome/applications/gnome-power-manager.xml	(revision b1b37da8dfb5bcacf11fb6b5e226d2c8c0771198)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-power-manager-download-http
-           "&gnome-download-http;/gnome-power-manager/3.8/gnome-power-manager-&gnome-power-manager-version;.tar.xz">
+     "&gnome-download-http;/gnome-power-manager/&gnome-minor;/gnome-power-manager-&gnome-power-manager-version;.tar.xz">
   <!ENTITY gnome-power-manager-download-ftp
-           "&gnome-download-ftp;/gnome-power-manager/3.8/gnome-power-manager-&gnome-power-manager-version;.tar.xz">
-  <!ENTITY gnome-power-manager-md5sum        "f6d16edbb5e539a9ba3e66d63e4799d0">
-  <!ENTITY gnome-power-manager-size          "448 KB">
-  <!ENTITY gnome-power-manager-buildsize     "9.0 MB">
+     "&gnome-download-ftp;/gnome-power-manager/&gnome-minor;/gnome-power-manager-&gnome-power-manager-version;.tar.xz">
+  <!ENTITY gnome-power-manager-md5sum        "c3a6a14fe5a98cf8060dd2288f83699a">
+  <!ENTITY gnome-power-manager-size          "440 KB">
+  <!ENTITY gnome-power-manager-buildsize     "8.3 MB">
   <!ENTITY gnome-power-manager-time          "less than 0.1 SBU">
 ]>
Index: gnome/applications/gnome-system-monitor.xml
===================================================================
--- gnome/applications/gnome-system-monitor.xml	(revision eae676e07bb31938f1b2cbf1122484995706a7f5)
+++ gnome/applications/gnome-system-monitor.xml	(revision b1b37da8dfb5bcacf11fb6b5e226d2c8c0771198)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-system-monitor-download-http
-           "&gnome-download-http;/gnome-system-monitor/3.8/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
+     "&gnome-download-http;/gnome-system-monitor/&gnome-minor;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
   <!ENTITY gnome-system-monitor-download-ftp
-           "&gnome-download-ftp;/gnome-system-monitor/3.8/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
-  <!ENTITY gnome-system-monitor-md5sum        "414cfebd9ff4a314692faa78a0a046b5">
-  <!ENTITY gnome-system-monitor-size          "2.8 MB">
-  <!ENTITY gnome-system-monitor-buildsize     "40 MB">
-  <!ENTITY gnome-system-monitor-time          "0.4 SBU">
+     "&gnome-download-ftp;/gnome-system-monitor/&gnome-minor;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
+  <!ENTITY gnome-system-monitor-md5sum        "9ced87a97687c420ea1a82029bf54cbb">
+  <!ENTITY gnome-system-monitor-size          "1.0 MB">
+  <!ENTITY gnome-system-monitor-buildsize     "28 MB">
+  <!ENTITY gnome-system-monitor-time          "0.5 SBU">
 ]>
 
Index: gnome/applications/gnome-terminal.xml
===================================================================
--- gnome/applications/gnome-terminal.xml	(revision eae676e07bb31938f1b2cbf1122484995706a7f5)
+++ gnome/applications/gnome-terminal.xml	(revision b1b37da8dfb5bcacf11fb6b5e226d2c8c0771198)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-terminal-download-http
-           "&gnome-download-http;/gnome-terminal/3.8/gnome-terminal-&gnome-terminal-version;.tar.xz">
+     "&gnome-download-http;/gnome-terminal/&gnome-minor;/gnome-terminal-&gnome-terminal-version;.tar.xz">
   <!ENTITY gnome-terminal-download-ftp
-           "&gnome-download-ftp;/gnome-terminal/3.8/gnome-terminal-&gnome-terminal-version;.tar.xz">
-  <!ENTITY gnome-terminal-md5sum        "43fb1f084bc9c11c6d4a6158b246bede">
+     "&gnome-download-ftp;/gnome-terminal/&gnome-minor;/gnome-terminal-&gnome-terminal-version;.tar.xz">
+  <!ENTITY gnome-terminal-md5sum        "5db57ba8002bb26ba92372ea25c171fd">
   <!ENTITY gnome-terminal-size          "1.6 MB">
-  <!ENTITY gnome-terminal-buildsize     "45 MB">
-  <!ENTITY gnome-terminal-time          "0.3 SBU">
+  <!ENTITY gnome-terminal-buildsize     "36 MB">
+  <!ENTITY gnome-terminal-time          "0.2 SBU">
 ]>
 
Index: gnome/applications/nautilus.xml
===================================================================
--- gnome/applications/nautilus.xml	(revision eae676e07bb31938f1b2cbf1122484995706a7f5)
+++ gnome/applications/nautilus.xml	(revision b1b37da8dfb5bcacf11fb6b5e226d2c8c0771198)
@@ -5,9 +5,11 @@
   %general-entities;
 
-  <!ENTITY nautilus-download-http "&gnome-download-http;/nautilus/3.8/nautilus-&nautilus-version;.tar.xz">
-  <!ENTITY nautilus-download-ftp  "&gnome-download-ftp;/nautilus/3.8/nautilus-&nautilus-version;.tar.xz">
-  <!ENTITY nautilus-md5sum        "3725deae73d9b45f7f69a87c64c29941">
-  <!ENTITY nautilus-size          "4.8 MB">
-  <!ENTITY nautilus-buildsize     "135 MB">
+  <!ENTITY nautilus-download-http 
+     "&gnome-download-http;/nautilus/&gnome-minor;/nautilus-&nautilus-version;.tar.xz">
+  <!ENTITY nautilus-download-ftp  
+     "&gnome-download-ftp;/nautilus/&gnome-minor;/nautilus-&nautilus-version;.tar.xz">
+  <!ENTITY nautilus-md5sum        "7260e6743df36f358aa468bb20f2b8e5">
+  <!ENTITY nautilus-size          "3.2 MB">
+  <!ENTITY nautilus-buildsize     "113 MB">
   <!ENTITY nautilus-time          "0.6 SBU">
 ]>
@@ -162,5 +164,7 @@
       <seglistitem>
         <seg>
-          nautilus, nautilus-autorun-software and nautilus-connect-server
+          nautilus, 
+          nautilus-autorun-software, and 
+          nautilus-connect-server
         </seg>
         <seg>
Index: gnome/applications/seahorse.xml
===================================================================
--- gnome/applications/seahorse.xml	(revision eae676e07bb31938f1b2cbf1122484995706a7f5)
+++ gnome/applications/seahorse.xml	(revision b1b37da8dfb5bcacf11fb6b5e226d2c8c0771198)
@@ -5,9 +5,11 @@
   %general-entities;
 
-  <!ENTITY seahorse-download-http "&gnome-download-http;/seahorse/3.9/seahorse-&seahorse-version;.tar.xz">
-  <!ENTITY seahorse-download-ftp  "&gnome-download-ftp;/seahorse/3.9/seahorse-&seahorse-version;.tar.xz">
-  <!ENTITY seahorse-md5sum        "e7f9de4230446b206bfa292505a5a898">
+  <!ENTITY seahorse-download-http 
+     "&gnome-download-http;/seahorse/&gnome-minor;/seahorse-&seahorse-version;.tar.xz">
+  <!ENTITY seahorse-download-ftp  
+     "&gnome-download-ftp;/seahorse/&gnome-minor;/seahorse-&seahorse-version;.tar.xz">
+  <!ENTITY seahorse-md5sum        "4a4bbc546904908b7a87c9afc6982d50">
   <!ENTITY seahorse-size          "2.0 MB">
-  <!ENTITY seahorse-buildsize     "67 MB">
+  <!ENTITY seahorse-buildsize     "70 MB">
   <!ENTITY seahorse-time          "0.5 SBU">
 ]>
@@ -150,5 +152,5 @@
         <seg>
           /usr/lib/seahorse,
-          /usr/share/help/*/seahorse and
+          /usr/share/help/*/seahorse, and
           /usr/share/seahorse
         </seg>
Index: gnome/applications/totem.xml
===================================================================
--- gnome/applications/totem.xml	(revision eae676e07bb31938f1b2cbf1122484995706a7f5)
+++ gnome/applications/totem.xml	(revision b1b37da8dfb5bcacf11fb6b5e226d2c8c0771198)
@@ -5,10 +5,12 @@
   %general-entities;
 
-  <!ENTITY totem-download-http "&gnome-download-http;/totem/3.8/totem-&totem-version;.tar.xz">
-  <!ENTITY totem-download-ftp  "&gnome-download-ftp;/totem/3.8/totem-&totem-version;.tar.xz">
-  <!ENTITY totem-md5sum        "a7b332a6d3bb475e425fcb3bc45affee">
-  <!ENTITY totem-size          "3.1 MB">
-  <!ENTITY totem-buildsize     "80 MB">
-  <!ENTITY totem-time          "0.8 SBU">
+  <!ENTITY totem-download-http 
+     "&gnome-download-http;/totem/&gnome-minor;/totem-&totem-version;.tar.xz">
+  <!ENTITY totem-download-ftp  
+     "&gnome-download-ftp;/totem/&gnome-minor;/totem-&totem-version;.tar.xz">
+  <!ENTITY totem-md5sum        "e851a1d5eff8aef7d3be703c89e253e1">
+  <!ENTITY totem-size          "3.0 MB">
+  <!ENTITY totem-buildsize     "65 MB">
+  <!ENTITY totem-time          "0.7 SBU">
 ]>
 
@@ -85,5 +87,5 @@
       <xref linkend="gst10-plugins-good"/>,
       <xref linkend="libpeas"/>,
-      <xref linkend="totem-pl-parser"/> and
+      <xref linkend="totem-pl-parser"/>, and
       <xref linkend="yelp-xsl"/>
     </para>
@@ -94,5 +96,5 @@
       <xref linkend="grilo"/>,
       <xref linkend="nautilus"/>,
-      <xref linkend="pygobject3"/> and
+      <xref linkend="pygobject3"/>, and
       <xref linkend="vala"/>
     </para>
@@ -104,5 +106,5 @@
       <xref linkend="libzeitgeist"/>,
       <ulink url="http://www.lirc.org">LIRC</ulink>,
-      <ulink url="http://pypi.python.org/pypi/pylint">pylint</ulink> and
+      <ulink url="http://pypi.python.org/pypi/pylint">pylint</ulink>, and
       <xref linkend="xulrunner"/>
     </para>
@@ -111,5 +113,5 @@
     <para role="recommended">
       <xref linkend="gst10-libav"/>,
-      <xref linkend="gst10-plugins-ugly"/> and
+      <xref linkend="gst10-plugins-ugly"/>, and
       <xref linkend="libdvdcss"/>
     </para>
@@ -128,5 +130,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>./configure --prefix=/usr               \
             --libexecdir=/usr/lib/totem \
             --disable-static &amp;&amp;
@@ -166,5 +168,5 @@
       <seglistitem>
         <seg>
-          totem, totem-audio-preview and totem-video-thumbnailer
+          totem, totem-audio-preview, and totem-video-thumbnailer
         </seg>
         <seg>
@@ -175,5 +177,5 @@
           /usr/lib/totem,
           /usr/share/gtk-doc/html/totem,
-          /usr/share/help/*/totem and
+          /usr/share/help/*/totem, and
           /usr/share/totem
         </seg>
