Index: gnome-systemd/platform/accountsservice.xml
===================================================================
--- gnome-systemd/platform/accountsservice.xml	(revision ec8f653f67d679cb56d46c107b603e6e8fdde3ba)
+++ gnome-systemd/platform/accountsservice.xml	(revision d1b6f682d5aac7abeb1c9e54bb02d27b978690f6)
@@ -107,5 +107,5 @@
 <screen><userinput>./configure --prefix=/usr            \
             --sysconfdir=/etc        \
-            --localstatedir=/var    \
+            --localstatedir=/var     \
             --enable-admin-group=adm \
             --disable-static         \
Index: gnome-systemd/platform/evolution-data-server.xml
===================================================================
--- gnome-systemd/platform/evolution-data-server.xml	(revision ec8f653f67d679cb56d46c107b603e6e8fdde3ba)
+++ gnome-systemd/platform/evolution-data-server.xml	(revision d1b6f682d5aac7abeb1c9e54bb02d27b978690f6)
@@ -202,12 +202,7 @@
           /usr/lib/evolution-data-server,
           /usr/share/evolution-data-server-3.6,
-          /usr/share/gtk-doc/html/camel,
-          /usr/share/gtk-doc/html/libebackend,
-          /usr/share/gtk-doc/html/libebook,
-          /usr/share/gtk-doc/html/libecal
-          /usr/share/gtk-doc/html/libedata-book,
-          /usr/share/gtk-doc/html/libedata-cal,
-          /usr/share/gtk-doc/html/libedataserver,
-          /usr/share/gtk-doc/html/libedataserverui and
+          /usr/share/gtk-doc/html/{camel,libebackend,libebook},
+          /usr/share/gtk-doc/html/{libecal,libedata-book,libedata-caln,
+          /usr/share/gtk-doc/html/{libedataserver,libedataserverui} and
           /usr/share/pixmaps/evolution-data-server
         </seg>
Index: gnome-systemd/platform/gcr.xml
===================================================================
--- gnome-systemd/platform/gcr.xml	(revision ec8f653f67d679cb56d46c107b603e6e8fdde3ba)
+++ gnome-systemd/platform/gcr.xml	(revision d1b6f682d5aac7abeb1c9e54bb02d27b978690f6)
@@ -138,5 +138,5 @@
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
Index: gnome-systemd/platform/gnome-online-accounts.xml
===================================================================
--- gnome-systemd/platform/gnome-online-accounts.xml	(revision ec8f653f67d679cb56d46c107b603e6e8fdde3ba)
+++ gnome-systemd/platform/gnome-online-accounts.xml	(revision d1b6f682d5aac7abeb1c9e54bb02d27b978690f6)
@@ -130,6 +130,6 @@
 
     <para>
-      <option>--enable-kerberos</option>: Use this switch if you have installed
-      <xref linkend="mitkrb"/> and wish to use it with
+      <option>--enable-kerberos</option>: Use this switch if you have
+      installed <xref linkend="mitkrb"/> and wish to use it with
       <application>GNOME Online Accounts</application>.
     </para>
Index: gnome-systemd/platform/gtkhtml.xml
===================================================================
--- gnome-systemd/platform/gtkhtml.xml	(revision ec8f653f67d679cb56d46c107b603e6e8fdde3ba)
+++ gnome-systemd/platform/gtkhtml.xml	(revision d1b6f682d5aac7abeb1c9e54bb02d27b978690f6)
@@ -118,5 +118,5 @@
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
Index: gnome-systemd/platform/gtksourceview.xml
===================================================================
--- gnome-systemd/platform/gtksourceview.xml	(revision ec8f653f67d679cb56d46c107b603e6e8fdde3ba)
+++ gnome-systemd/platform/gtksourceview.xml	(revision d1b6f682d5aac7abeb1c9e54bb02d27b978690f6)
@@ -139,5 +139,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
Index: gnome-systemd/platform/libgnomekbd.xml
===================================================================
--- gnome-systemd/platform/libgnomekbd.xml	(revision ec8f653f67d679cb56d46c107b603e6e8fdde3ba)
+++ gnome-systemd/platform/libgnomekbd.xml	(revision d1b6f682d5aac7abeb1c9e54bb02d27b978690f6)
@@ -126,5 +126,5 @@
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
Index: gnome-systemd/platform/libgtop.xml
===================================================================
--- gnome-systemd/platform/libgtop.xml	(revision ec8f653f67d679cb56d46c107b603e6e8fdde3ba)
+++ gnome-systemd/platform/libgtop.xml	(revision d1b6f682d5aac7abeb1c9e54bb02d27b978690f6)
@@ -133,5 +133,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
Index: gnome-systemd/platform/libgweather.xml
===================================================================
--- gnome-systemd/platform/libgweather.xml	(revision ec8f653f67d679cb56d46c107b603e6e8fdde3ba)
+++ gnome-systemd/platform/libgweather.xml	(revision d1b6f682d5aac7abeb1c9e54bb02d27b978690f6)
@@ -78,9 +78,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtk3"/>,
-      <xref linkend="libxml2"/>, and
+      <xref linkend="gtk3"/> and
       <xref linkend="libsoup"/>
     </para>
-
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
@@ -135,5 +133,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
Index: gnome-systemd/platform/libpeas.xml
===================================================================
--- gnome-systemd/platform/libpeas.xml	(revision ec8f653f67d679cb56d46c107b603e6e8fdde3ba)
+++ gnome-systemd/platform/libpeas.xml	(revision d1b6f682d5aac7abeb1c9e54bb02d27b978690f6)
@@ -5,5 +5,4 @@
   %general-entities;
 
-<!-- 1.9 needs to be modified when version increases from 1.9.X -->
   <!ENTITY libpeas-download-http "&gnome-download-http;/libpeas/1.10/libpeas-&libpeas-version;.tar.xz">
   <!ENTITY libpeas-download-ftp  "&gnome-download-ftp;/libpeas/1.10/libpeas-&libpeas-version;.tar.xz">
@@ -115,5 +114,5 @@
     <para>
       To test the results, issue: <command>make check</command>. An active
-      graphical session with bus address is necessary to run the tests.
+      graphical session with session bus is necessary to run the tests.
     </para>
 
@@ -138,5 +137,5 @@
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
Index: gnome-systemd/platform/librest.xml
===================================================================
--- gnome-systemd/platform/librest.xml	(revision ec8f653f67d679cb56d46c107b603e6e8fdde3ba)
+++ gnome-systemd/platform/librest.xml	(revision d1b6f682d5aac7abeb1c9e54bb02d27b978690f6)
@@ -31,7 +31,8 @@
 
     <para>
-      <application>librest</application> was designed to make it easier to access
-      web services that claim to be "RESTful". It includes convenience wrappers
-      for libsoup and libxml to ease remote use of the RESTful API.
+      <application>librest</application> was designed to make it easier
+      to access web services that claim to be "RESTful". It includes
+      convenience wrappers for libsoup and libxml to ease remote use of
+      the RESTful API.
     </para>
 
Index: gnome-systemd/platform/libsecret.xml
===================================================================
--- gnome-systemd/platform/libsecret.xml	(revision ec8f653f67d679cb56d46c107b603e6e8fdde3ba)
+++ gnome-systemd/platform/libsecret.xml	(revision d1b6f682d5aac7abeb1c9e54bb02d27b978690f6)
@@ -136,7 +136,7 @@
 
     <para>
-      To test the results, issue: <command>make -k check</command>, after the
-      package is installed. Test suite should be run from a local GUI session
-      started with dbus-launch. Some tests might still fail and hang,
+      To test the results, issue: <command>make -k check</command> after the
+      package has been installed. The test suite should be run from a local
+      GUI session started with dbus-launch. Some tests might still fail
       for unknown reasons.
     </para>
@@ -171,6 +171,6 @@
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
Index: gnome-systemd/platform/libwacom.xml
===================================================================
--- gnome-systemd/platform/libwacom.xml	(revision ec8f653f67d679cb56d46c107b603e6e8fdde3ba)
+++ gnome-systemd/platform/libwacom.xml	(revision d1b6f682d5aac7abeb1c9e54bb02d27b978690f6)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libwacom-download-http "http://sourceforge.net/projects/linuxwacom/files/libwacom/libwacom-&libwacom-version;.tar.bz2">
+  <!ENTITY libwacom-download-http "&sourceforge-repo;/linuxwacom/libwacom-&libwacom-version;.tar.bz2">
   <!ENTITY libwacom-download-ftp  " ">
   <!ENTITY libwacom-md5sum        "7fe2b0ff676fd7a48ebae3b69314eaf7">
@@ -103,4 +103,5 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
   </sect2>
 
@@ -117,6 +118,6 @@
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
Index: gnome-systemd/platform/libwnck.xml
===================================================================
--- gnome-systemd/platform/libwnck.xml	(revision ec8f653f67d679cb56d46c107b603e6e8fdde3ba)
+++ gnome-systemd/platform/libwnck.xml	(revision d1b6f682d5aac7abeb1c9e54bb02d27b978690f6)
@@ -129,6 +129,6 @@
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
Index: gnome-systemd/platform/totem-pl-parser.xml
===================================================================
--- gnome-systemd/platform/totem-pl-parser.xml	(revision ec8f653f67d679cb56d46c107b603e6e8fdde3ba)
+++ gnome-systemd/platform/totem-pl-parser.xml	(revision d1b6f682d5aac7abeb1c9e54bb02d27b978690f6)
@@ -6,7 +6,7 @@
 
   <!ENTITY totem-pl-parser-download-http
-   "&gnome-download-http;/totem-pl-parser/3.10/totem-pl-parser-&totem-pl-parser-version;.tar.xz">
+           "&gnome-download-http;/totem-pl-parser/3.10/totem-pl-parser-&totem-pl-parser-version;.tar.xz">
   <!ENTITY totem-pl-parser-download-ftp
-   "&gnome-download-ftp;/totem-pl-parser/3.10/totem-pl-parser-&totem-pl-parser-version;.tar.xz">
+           "&gnome-download-ftp;/totem-pl-parser/3.10/totem-pl-parser-&totem-pl-parser-version;.tar.xz">
   <!ENTITY totem-pl-parser-md5sum        "554242a4e3e0864e825cdf0ea3720a6d">
   <!ENTITY totem-pl-parser-size          "1.6 MB">
@@ -95,5 +95,5 @@
       <ulink url="http://sourceforge.net/projects/quvi">libquvi (version 0.9) and libquvi-scripts</ulink>
       - if they are installed, then
-      <ulink url="https://github.com/diegonehab/luasocket">lua-socket (git)</ulink>
+      <ulink url="https://github.com/diegonehab/luasocket">lua-socket</ulink>
       is necessary for the tests
     </para>
@@ -112,6 +112,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
Index: gnome-systemd/platform/vte.xml
===================================================================
--- gnome-systemd/platform/vte.xml	(revision ec8f653f67d679cb56d46c107b603e6e8fdde3ba)
+++ gnome-systemd/platform/vte.xml	(revision d1b6f682d5aac7abeb1c9e54bb02d27b978690f6)
@@ -148,11 +148,11 @@
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
-          vte2_90 and gnome-pty-helper
+          vte2_90
         </seg>
         <seg>
Index: gnome-systemd/platform/yelp-xsl.xml
===================================================================
--- gnome-systemd/platform/yelp-xsl.xml	(revision ec8f653f67d679cb56d46c107b603e6e8fdde3ba)
+++ gnome-systemd/platform/yelp-xsl.xml	(revision d1b6f682d5aac7abeb1c9e54bb02d27b978690f6)
@@ -5,8 +5,6 @@
   %general-entities;
 
-<!--  <!ENTITY yelp-xsl-download-http "&gnome-download-http;/yelp-xsl/&gnome-minor;/yelp-xsl-&yelp-xsl-version;.tar.xz">
-  <!ENTITY yelp-xsl-download-ftp  "&gnome-download-ftp;/yelp-xsl/&gnome-minor;/yelp-xsl-&yelp-xsl-version;.tar.xz">-->
-  <!ENTITY yelp-xsl-download-http "&gnome-download-http;/yelp-xsl/3.12/yelp-xsl-&yelp-xsl-version;.tar.xz">
-  <!ENTITY yelp-xsl-download-ftp  "&gnome-download-ftp;/yelp-xsl/3.12/yelp-xsl-&yelp-xsl-version;.tar.xz">
+  <!ENTITY yelp-xsl-download-http "&gnome-download-http;/yelp-xsl/&gnome-minor;/yelp-xsl-&yelp-xsl-version;.tar.xz">
+  <!ENTITY yelp-xsl-download-ftp  "&gnome-download-ftp;/yelp-xsl/&gnome-minor;/yelp-xsl-&yelp-xsl-version;.tar.xz">
   <!ENTITY yelp-xsl-md5sum        "662317dc4f6aeafce0d4ffb2b3766115">
   <!ENTITY yelp-xsl-size          "552 KB">
@@ -116,5 +114,5 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
