Index: gnome/applications/applications.xml
===================================================================
--- gnome/applications/applications.xml	(revision c828e9cbb419d84edc748a281dc316423e1f22b1)
+++ gnome/applications/applications.xml	(revision 70567248e4c8d35edfbafb7776124346d705d332)
@@ -31,12 +31,19 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="epiphany.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evince.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evolution.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="file-roller.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gedit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-calculator.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-color-manager.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-disk-utility.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-logs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-maps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-nettool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-power-manager.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-screenshot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-system-monitor.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-terminal.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-tweak-tool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-weather.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gucharmap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network-manager-applet.xml"/>
Index: gnome/applications/evolution.xml
===================================================================
--- gnome/applications/evolution.xml	(revision 70567248e4c8d35edfbafb7776124346d705d332)
+++ gnome/applications/evolution.xml	(revision 70567248e4c8d35edfbafb7776124346d705d332)
@@ -0,0 +1,272 @@
+<?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 evolution-download-http "&gnome-download-http;/evolution/&gnome-minor-20;/evolution-&evolution-version;.tar.xz">
+  <!ENTITY evolution-download-ftp  "&gnome-download-ftp;/evolution/&gnome-minor-20;/evolution-&evolution-version;.tar.xz">
+  <!ENTITY evolution-md5sum        "219e25e945ffec9d7125e2f679990342">
+  <!ENTITY evolution-size          "12 MB">
+  <!ENTITY evolution-buildsize     "592 MB">
+  <!ENTITY evolution-time          "18 SBU">
+]>
+
+<sect1 id="evolution" xreflabel="Evolution-&evolution-version;" revision="systemd">
+  <?dbhtml filename="evolution.html" ?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Evolution-&evolution-version;</title>
+
+  <indexterm zone="evolution">
+    <primary sortas="a-Evolution">Evolution</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Evolution</title>
+
+    <para>
+      The <application>Evolution</application> package contains an
+      integrated mail, calendar and address book suite designed for the
+      <application>GNOME</application> environment.
+    </para>
+
+    &lfs79_checked;&gcc6_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&evolution-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&evolution-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &evolution-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &evolution-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &evolution-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &evolution-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Evolution Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="adwaita-icon-theme"/>,
+      <xref linkend="evolution-data-server"/>,
+      <xref linkend="gtkhtml"/>,
+      <xref linkend="itstool"/>,
+      <xref linkend="libgdata"/>,
+      <xref linkend="shared-mime-info"/>, and
+      <xref linkend="webkitgtk2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="bogofilter"/>,
+      <xref linkend="enchant"/>,
+      <xref linkend="gnome-desktop"/>,
+      <xref linkend="highlight"/>,
+      <xref linkend="libcanberra"/>,
+      <xref linkend="libgweather"/>,
+      <xref linkend="libnotify"/>, and
+      <xref linkend="seahorse"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="clutter-gtk"/>,
+      <xref linkend="geoclue"/>,
+      <xref linkend="geocode-glib"/>, and
+      <xref linkend="libchamplain"/> (Contact Maps plugin),
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="openldap"/>,
+      <ulink url="https://wiki.gnome.org/Projects/GTK%2B/GtkImageView/">GtkImageView</ulink>,
+      <ulink url="http://gtkspell.sourceforge.net/">GtkSpell3</ulink>,
+      <ulink url="https://github.com/GNOME/gnome-autoar/">gnome-autoar</ulink>,
+      <ulink url="&gnome-download-http;/libcryptui/">libcryptui</ulink>,
+      <ulink url="http://www.five-ten-sg.com/libpst/">libpst</ulink>,
+      <ulink url="https://github.com/Yeraze/ytnef">libytnef</ulink>, and
+      <ulink url="https://spamassassin.apache.org/">SpamAssassin</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/evolution"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Evolution</title>
+
+    <para>
+      Install <application>Evolution</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>sed -i "/seems to be moved/s/^/#/" ltmain.sh &amp;&amp;
+./configure --prefix=/usr         \
+            --sysconfdir=/etc     \
+            --disable-gtkspell    \
+            --disable-pst-import  \
+            --disable-autoar      \
+            --disable-libcryptui  \
+            --disable-spamassassin &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </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>
+
+    <para>
+      <command>sed -i ... ltmain.sh</command>: This command prevents the build
+      procedure from outputting a lot of invalid warnings.
+    </para>
+
+    <para>
+      <parameter>--disable-autoar</parameter>: This switch disables
+      automatic archiving support. Omit if you have 
+      <application>gnome-autoar</application> installed and wish to use it.
+    </para>
+
+    <para>
+      <parameter>--disable-libcryptui</parameter>: This switch disables
+      the usage of libcryptui because it is not part of BLFS. Omit
+      this switch if you have it installed and wish to use it.
+    </para>
+
+    <para>
+      <parameter>--disable-gtkspell</parameter>: This switch is used to
+      disable the gtkspell plugin because
+      <application>GtkSpell</application> is not part of BLFS.
+    </para>
+
+    <para>
+      <parameter>--disable-pst-import</parameter>: This switch is
+      used to disable the pst-import plugin because
+      <application>libpst</application> is not part of BLFS.
+    </para>
+
+    <para>
+      <parameter>--disable-spamassassin</parameter>: This switch is
+      used to disable the spamassassin plugin because
+      <application>SpamAssassin</application> is not part of BLFS.
+    </para>
+
+    <para>
+      <option>--with-openldap</option>: This switch will enable
+      <application>OpenLDAP</application> support in
+      <application>Evolution</application>.
+    </para>
+
+    <para>
+      <option>--enable-contact-maps</option>: Use this switch if you
+      have installed the necessary dependencies and wish to build the
+      Contact Maps plugin.
+    </para>
+
+    <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 Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          evolution
+        </seg>
+        <seg>
+          libeabutil.so,
+          libecontacteditor.so,
+          libecontactlisteditor.so,
+          libemail-engine.so,
+          libessmime.so,
+          libevolution-addressbook-importers.so,
+          libevolution-calendar-importers.so,
+          libevolution-calendar.so,
+          libevolution-mail-composer.so,
+          libevolution-mail-formatter.so,
+          libevolution-mail-importers.so,
+          libevolution-mail.so,
+          libevolution-shell.so,
+          libevolution-smime.so,
+          libgnomecanvas.so,
+          and several modules and plugins in 
+          /usr/lib/evolution/{modules,plugins}
+        </seg>
+        <seg>
+          /usr/include/evolution,
+          /usr/lib/evolution,
+          /usr/libexec/evolution,
+          /usr/share/evolution,
+          /usr/share/gtk-doc/html/{evolution-mail-composer,evolution-mail-engine},
+          /usr/share/gtk-doc/html/{evolution-mail-formatter,evolution-shell},
+          /usr/share/gtk-doc/html/evolution-util, and
+          /usr/share/help/*/evolution
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="evolution-prog">
+        <term><command>evolution</command></term>
+        <listitem>
+          <para>
+            is an email, calendar and address book suite for
+            the <application>GNOME</application> Desktop.
+          </para>
+          <indexterm zone="evolution evolution-prog">
+            <primary sortas="b-evolution">evolution</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome/applications/file-roller.xml
===================================================================
--- gnome/applications/file-roller.xml	(revision c828e9cbb419d84edc748a281dc316423e1f22b1)
+++ gnome/applications/file-roller.xml	(revision 70567248e4c8d35edfbafb7776124346d705d332)
@@ -93,4 +93,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
+      <xref linkend="desktop-file-utils"/>,
       <xref linkend="json-glib"/>,
       <xref linkend="libarchive"/>,
@@ -167,4 +168,5 @@
         <seg>
           /usr/lib/nautilus/extensions-3.0/libnautilus-fileroller.so
+          (Nautilus module)
         </seg>
         <seg>
Index: gnome/applications/gedit.xml
===================================================================
--- gnome/applications/gedit.xml	(revision c828e9cbb419d84edc748a281dc316423e1f22b1)
+++ gnome/applications/gedit.xml	(revision 70567248e4c8d35edfbafb7776124346d705d332)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs79_checked;
+    &lfs79_checked;&gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: gnome/applications/gnome-calculator.xml
===================================================================
--- gnome/applications/gnome-calculator.xml	(revision c828e9cbb419d84edc748a281dc316423e1f22b1)
+++ gnome/applications/gnome-calculator.xml	(revision 70567248e4c8d35edfbafb7776124346d705d332)
@@ -39,5 +39,5 @@
     </para>
 
-    &lfs79_checked;
+    &lfs79_checked;&gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: gnome/applications/gnome-disk-utility.xml
===================================================================
--- gnome/applications/gnome-disk-utility.xml	(revision 70567248e4c8d35edfbafb7776124346d705d332)
+++ gnome/applications/gnome-disk-utility.xml	(revision 70567248e4c8d35edfbafb7776124346d705d332)
@@ -0,0 +1,181 @@
+<?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 gnome-disk-utility-download-http
+           "&gnome-download-http;/gnome-disk-utility/&gnome-minor-20;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
+  <!ENTITY gnome-disk-utility-download-ftp
+           "&gnome-download-ftp;/gnome-disk-utility/&gnome-minor-20;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
+  <!ENTITY gnome-disk-utility-md5sum        "4cae57c846d451644e796f3ea496b07f">
+  <!ENTITY gnome-disk-utility-size          "1.4 MB">
+  <!ENTITY gnome-disk-utility-buildsize     "41 MB">
+  <!ENTITY gnome-disk-utility-time          "0.2 SBU">
+]>
+
+<sect1 id="gnome-disk-utility" xreflabel="gnome-disk-utility-&gnome-disk-utility-version;" revision="systemd">
+  <?dbhtml filename="gnome-disk-utility.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>gnome-disk-utility-&gnome-disk-utility-version;</title>
+
+  <indexterm zone="gnome-disk-utility">
+    <primary sortas="a-gnome-disk-utility">gnome-disk-utility</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to GNOME Disk Utility</title>
+
+    <para>
+      The <application>GNOME Disk Utility</application> package provides
+      applications used for dealing with storage devices.
+    </para>
+
+    &lfs79_checked;&gcc6_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gnome-disk-utility-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gnome-disk-utility-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gnome-disk-utility-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gnome-disk-utility-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gnome-disk-utility-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gnome-disk-utility-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GNOME Disk Utility Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="appstream-glib"/>,
+      <xref linkend="gnome-settings-daemon"/>,
+      <xref linkend="itstool"/>,
+      <xref linkend="libdvdread"/>,
+      <xref linkend="libpwquality"/>,
+      <xref linkend="libsecret"/>, and
+      <xref linkend="udisks2"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/gnome-disk-utility"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GNOME Disk Utility</title>
+
+    <para>
+      Install <application>GNOME Disk Utility</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </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"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          gnome-disk-image-mounter and gnome-disks
+        </seg>
+        <seg>
+          libgdu-sd.so
+          (<application>GNOME Settings Daemon</application>
+          Plugin)
+        </seg>
+        <seg>
+          None
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gnome-disk-image-mounter">
+        <term><command>gnome-disk-image-mounter</command></term>
+        <listitem>
+          <para>
+            is used to set up disk images.
+          </para>
+          <indexterm zone="gnome-disk-utility gnome-disk-image-mounter">
+            <primary sortas="b-gnome-disk-image-mounter">gnome-disk-image-mounter</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gnome-disks">
+        <term><command>gnome-disks</command></term>
+        <listitem>
+          <para>
+            is used to to inspect, format, partition and configure disks
+            and block devices.
+          </para>
+          <indexterm zone="gnome-disk-utility gnome-disks">
+            <primary sortas="b-gnome-disks">gnome-disks</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome/applications/gnome-logs.xml
===================================================================
--- gnome/applications/gnome-logs.xml	(revision 70567248e4c8d35edfbafb7776124346d705d332)
+++ gnome/applications/gnome-logs.xml	(revision 70567248e4c8d35edfbafb7776124346d705d332)
@@ -0,0 +1,164 @@
+<?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 gnome-logs-download-http
+           "&gnome-download-http;/gnome-logs/&gnome-minor-20;/gnome-logs-&gnome-logs-version;.tar.xz">
+  <!ENTITY gnome-logs-download-ftp
+           "&gnome-download-ftp;/gnome-logs/&gnome-minor-20;/gnome-logs-&gnome-logs-version;.tar.xz">
+  <!ENTITY gnome-logs-md5sum        "f09713af568d5e45aa66090d114764c5">
+  <!ENTITY gnome-logs-size          "932 KB">
+  <!ENTITY gnome-logs-buildsize     "14 MB (with tests)">
+  <!ENTITY gnome-logs-time          "less than 0.1 SBU (with tests)">
+]>
+
+<sect1 id="gnome-logs" xreflabel="gnome-logs-&gnome-logs-version;" revision="systemd">
+  <?dbhtml filename="gnome-logs.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>gnome-logs-&gnome-logs-version;</title>
+
+  <indexterm zone="gnome-logs">
+    <primary sortas="a-gnome-logs">gnome-logs</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to GNOME Logs</title>
+
+    <para>
+      The <application>GNOME Logs</application> package contains a log viewer
+      for the systemd journal.
+    </para>
+
+    &lfs79_checked;&gcc6_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gnome-logs-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gnome-logs-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gnome-logs-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gnome-logs-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gnome-logs-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gnome-logs-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GNOME Logs Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gtk3"/>,
+      <xref linkend="gsettings-desktop-schemas"/> and
+      <xref linkend="itstool"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="Optional">
+      <xref linkend="appstream-glib"/>,
+      <xref linkend="desktop-file-utils"/> (for the test suite), and
+      <xref linkend="DocBook"/>,
+      <xref linkend="docbook-xsl"/>, and
+      <xref linkend="libxslt"/> (to build manual pages)
+    </para>
+    
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/gnome-logs"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GNOME Logs</title>
+
+    <para>
+      Install <application>GNOME Logs</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <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>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          gnome-logs
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/share/help/*/gnome-logs
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gnome-logs-prog">
+        <term><command>gnome-logs</command></term>
+        <listitem>
+          <para>
+            is the <application>GNOME</application> log viewer for the
+            systemd journal.
+          </para>
+          <indexterm zone="gnome-logs gnome-logs-prog">
+            <primary sortas="b-gnome-logs">gnome-logs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome/applications/gnome-maps.xml
===================================================================
--- gnome/applications/gnome-maps.xml	(revision 70567248e4c8d35edfbafb7776124346d705d332)
+++ gnome/applications/gnome-maps.xml	(revision 70567248e4c8d35edfbafb7776124346d705d332)
@@ -0,0 +1,160 @@
+<?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 gnome-maps-download-http
+           "&gnome-download-http;/gnome-maps/&gnome-minor-20;/gnome-maps-&gnome-maps-version;.tar.xz">
+  <!ENTITY gnome-maps-download-ftp
+           "&gnome-download-ftp;/gnome-maps/&gnome-minor-20;/gnome-maps-&gnome-maps-version;.tar.xz">
+  <!ENTITY gnome-maps-md5sum        "b5857ffedf11fb1272d394e3fcf1a5a2">
+  <!ENTITY gnome-maps-size          "1.0 MB">
+  <!ENTITY gnome-maps-buildsize     "13 MB">
+  <!ENTITY gnome-maps-time          "0.1 SBU">
+]>
+
+<sect1 id="gnome-maps" xreflabel="gnome-maps-&gnome-maps-version;" revision="systemd">
+  <?dbhtml filename="gnome-maps.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>gnome-maps-&gnome-maps-version;</title>
+
+  <indexterm zone="gnome-maps">
+    <primary sortas="a-gnome-maps">gnome-maps</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to GNOME Maps</title>
+
+    <para>
+      <application>GNOME Maps</application> is a map application for
+      <application>GNOME</application>.
+    </para>
+
+    &lfs79_checked;&gcc6_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gnome-maps-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gnome-maps-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gnome-maps-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gnome-maps-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gnome-maps-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gnome-maps-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GNOME Maps Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="clutter-gtk"/>,
+      <xref linkend="folks"/>,
+      <xref linkend="geoclue2"/>,
+      <xref linkend="geocode-glib"/>,
+      <xref linkend="gfbgraph"/>,
+      <xref linkend="gjs"/>, and
+      <xref linkend="libchamplain"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/gnome-maps"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GNOME Maps</title>
+
+    <para>
+      Install <application>GNOME Maps</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          gnome-maps
+        </seg>
+        <seg>
+          libgnome-maps.so
+        </seg>
+        <seg>
+          /usr/lib/gnome-maps and
+          /usr/share/gnome-maps
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gnome-maps-prog">
+        <term><command>gnome-maps</command></term>
+        <listitem>
+          <para>
+            is a map application for <application>GNOME</application>.
+          </para>
+          <indexterm zone="gnome-maps gnome-maps-prog">
+            <primary sortas="b-gnome-maps">gnome-maps</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome/applications/gnome-nettool.xml
===================================================================
--- gnome/applications/gnome-nettool.xml	(revision c828e9cbb419d84edc748a281dc316423e1f22b1)
+++ gnome/applications/gnome-nettool.xml	(revision 70567248e4c8d35edfbafb7776124346d705d332)
@@ -38,5 +38,5 @@
     </para>
 
-    &lfs79_checked;
+    &lfs79_checked;&gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: gnome/applications/gnome-power-manager.xml
===================================================================
--- gnome/applications/gnome-power-manager.xml	(revision 70567248e4c8d35edfbafb7776124346d705d332)
+++ gnome/applications/gnome-power-manager.xml	(revision 70567248e4c8d35edfbafb7776124346d705d332)
@@ -0,0 +1,160 @@
+<?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 gnome-power-manager-download-http
+           "&gnome-download-http;/gnome-power-manager/&gnome-minor-20;/gnome-power-manager-&gnome-power-manager-version;.tar.xz">
+  <!ENTITY gnome-power-manager-download-ftp
+           "&gnome-download-ftp;/gnome-power-manager/&gnome-minor-20;/gnome-power-manager-&gnome-power-manager-version;.tar.xz">
+  <!ENTITY gnome-power-manager-md5sum        "ea81d7e93acfdeb37f6627e3b3f6bdfc">
+  <!ENTITY gnome-power-manager-size          "428 KB">
+  <!ENTITY gnome-power-manager-buildsize     "9.2 MB">
+  <!ENTITY gnome-power-manager-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="gnome-power-manager" xreflabel="gnome-power-manager-&gnome-power-manager-version;" revision="systemd">
+  <?dbhtml filename="gnome-power-manager.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>gnome-power-manager-&gnome-power-manager-version;</title>
+
+  <indexterm zone="gnome-power-manager">
+    <primary sortas="a-gnome-power-manager">gnome-power-manager</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to GNOME Power Manager</title>
+
+    <para>
+      The <application>GNOME Power Manager</application> package contains
+      a tool used to report on power management on the system.
+    </para>
+
+    &lfs79_checked;&gcc6_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gnome-power-manager-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gnome-power-manager-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gnome-power-manager-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gnome-power-manager-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gnome-power-manager-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gnome-power-manager-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GNOME Power Manager Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="appstream-glib"/>,
+      <xref linkend="gtk3"/>, and
+      <xref linkend="upower"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="docbook-utils"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/gnome-power-manager"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GNOME Power Manager</title>
+
+    <para>
+      Install <application>GNOME Power Manager</application> by
+      running the following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <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>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          gnome-power-statistics
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gnome-power-statistics">
+        <term><command>gnome-power-statistics</command></term>
+        <listitem>
+          <para>
+            is used to visualize the power consumption of laptop hardware.
+          </para>
+          <indexterm zone="gnome-power-manager gnome-power-statistics">
+            <primary
+            sortas="b-gnome-power-statistics">gnome-power-statistics</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome/applications/gnome-system-monitor.xml
===================================================================
--- gnome/applications/gnome-system-monitor.xml	(revision c828e9cbb419d84edc748a281dc316423e1f22b1)
+++ gnome/applications/gnome-system-monitor.xml	(revision 70567248e4c8d35edfbafb7776124346d705d332)
@@ -38,5 +38,5 @@
     </para>
 
-    &lfs79_checked;
+    &lfs79_checked;&gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -79,4 +79,5 @@
     <para role="required">
       <xref linkend="adwaita-icon-theme"/>,
+      <phrase revision="systemd"><xref linkend="appstream-glib"/>,</phrase>
       <xref linkend="gtkmm3"/>,
       <xref linkend="itstool"/>,
@@ -92,6 +93,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="desktop-file-utils"/> and
-      <ulink url="http://people.freedesktop.org/~hughsient/appstream-glib/releases">appstream-glib</ulink>
+      <xref linkend="desktop-file-utils"/>
+      <phrase revision="sysv"><ulink url="http://people.freedesktop.org/~hughsient/appstream-glib/releases">and appstream-glib</ulink></phrase>
     </para>
 
@@ -109,5 +110,10 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr --enable-wnck &amp;&amp;
+<screen revision="sysv"><userinput>./configure --prefix=/usr --enable-wnck &amp;&amp;
+make</userinput></screen>
+
+<screen revision="systemd"><userinput>./configure --prefix=/usr    \
+            --enable-wnck    \
+            --enable-systemd &amp;&amp;
 make</userinput></screen>
 
@@ -130,4 +136,9 @@
       <parameter>--enable-wnck</parameter>: This switch adds support for the
       Window Navigator Construction Kit libraries.
+    </para>
+
+    <para revision="systemd">
+      <parameter>--enable-systemd</parameter>: This switch ensures that
+      gnome-system-monitor uses the systemd process monitoring framework.
     </para>
 
Index: gnome/applications/gnome-terminal.xml
===================================================================
--- gnome/applications/gnome-terminal.xml	(revision c828e9cbb419d84edc748a281dc316423e1f22b1)
+++ gnome/applications/gnome-terminal.xml	(revision 70567248e4c8d35edfbafb7776124346d705d332)
@@ -78,5 +78,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+      <phrase revision="systemd"><xref linkend="appstream-glib"/>,</phrase>
       <xref linkend="dconf"/>,
+      <phrase revision="systemd"><xref linkend="gnome-shell"/>,</phrase>
       <xref linkend="gsettings-desktop-schemas"/>,
       <xref linkend="itstool"/>, and
@@ -91,6 +93,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="desktop-file-utils"/> and
-      <ulink url="http://people.freedesktop.org/~hughsient/appstream-glib/releases">appstream-glib</ulink>
+      <xref linkend="desktop-file-utils"/>
+      <phrase revision="sysv"><ulink url="http://people.freedesktop.org/~hughsient/appstream-glib/releases">and appstream-glib</ulink></phrase>
     </para>
 
@@ -109,5 +111,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr             \
+<screen revision="sysv"><userinput>./configure --prefix=/usr             \
             --disable-static          \
             --disable-migration       \
@@ -115,4 +117,9 @@
 make</userinput></screen>
 
+<screen revision="systemd"><userinput>./configure --prefix=/usr
+            --disable-migration
+            --disable-static &amp;&amp;
+make</userinput></screen>
+
     <para>
       This package does not come with a test suite.
@@ -135,5 +142,5 @@
     <title>Command Explanations</title>
 
-    <para>
+    <para revision="sysv">
       <parameter>--disable-search-provider</parameter>: This switch disables
       <quote>search <application>gnome-shell</application></quote> provider.
@@ -168,4 +175,5 @@
        <seg>
           /usr/lib/nautilus/extensions-3.0/libterminal-nautilus.so
+          (Nautilus Extension)
         </seg>
         <seg>
Index: gnome/applications/gnome-tweak-tool.xml
===================================================================
--- gnome/applications/gnome-tweak-tool.xml	(revision 70567248e4c8d35edfbafb7776124346d705d332)
+++ gnome/applications/gnome-tweak-tool.xml	(revision 70567248e4c8d35edfbafb7776124346d705d332)
@@ -0,0 +1,155 @@
+<?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 gnome-tweak-tool-download-http
+           "&gnome-download-http;/gnome-tweak-tool/&gnome-minor-20;/gnome-tweak-tool-&gnome-tweak-tool-version;.tar.xz">
+  <!ENTITY gnome-tweak-tool-download-ftp
+           "&gnome-download-ftp;/gnome-tweak-tool/&gnome-minor-20;/gnome-tweak-tool-&gnome-tweak-tool-version;.tar.xz">
+  <!ENTITY gnome-tweak-tool-md5sum        "2348fdd04a993dddb9a0bc9f42e497a3">
+  <!ENTITY gnome-tweak-tool-size          "252 KB">
+  <!ENTITY gnome-tweak-tool-buildsize     "5.2 MB">
+  <!ENTITY gnome-tweak-tool-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="gnome-tweak-tool" xreflabel="gnome-tweak-tool-&gnome-tweak-tool-version;" revision="systemd">
+  <?dbhtml filename="gnome-tweak-tool.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>gnome-tweak-tool-&gnome-tweak-tool-version;</title>
+
+  <indexterm zone="gnome-tweak-tool">
+    <primary sortas="a-gnome-tweak-tool">gnome-tweak-tool</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to GNOME Tweak Tool</title>
+
+    <para>
+      <application>GNOME Tweak Tool</application> is a simple program used
+      to tweak advanced <application>GNOME</application> settings.
+    </para>
+
+    &lfs79_checked;&gcc6_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gnome-tweak-tool-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gnome-tweak-tool-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gnome-tweak-tool-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gnome-tweak-tool-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gnome-tweak-tool-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gnome-tweak-tool-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GNOME Tweak Tool Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gtk3"/>,
+      <xref linkend="gsettings-desktop-schemas"/>, and
+      <xref linkend="pygobject3"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/gnome-tweak-tool"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GNOME Tweak Tool</title>
+
+    <para>
+      Install <application>GNOME Tweak Tool</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          gnome-tweak-tool
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/lib/python&python2-majorver;/site-packages/gtweak and
+          /usr/share/gnome-tweak-tool
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gnome-tweak-tool-prog">
+        <term><command>gnome-tweak-tool</command></term>
+        <listitem>
+          <para>
+            is used to tweak advanced <application>GNOME</application>
+            settings.
+          </para>
+          <indexterm zone="gnome-tweak-tool gnome-tweak-tool-prog">
+            <primary sortas="b-gnome-tweak-tool">gnome-tweak-tool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome/applications/gnome-weather.xml
===================================================================
--- gnome/applications/gnome-weather.xml	(revision 70567248e4c8d35edfbafb7776124346d705d332)
+++ gnome/applications/gnome-weather.xml	(revision 70567248e4c8d35edfbafb7776124346d705d332)
@@ -0,0 +1,161 @@
+<?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 gnome-weather-download-http
+           "&gnome-download-http;/gnome-weather/&gnome-minor-20;/gnome-weather-&gnome-weather-version;.tar.xz">
+  <!ENTITY gnome-weather-download-ftp
+           "&gnome-download-ftp;/gnome-weather/&gnome-minor-20;/gnome-weather-&gnome-weather-version;.tar.xz">
+  <!ENTITY gnome-weather-md5sum        "4cad765499c4de3f0cb320aca5b3677a">
+  <!ENTITY gnome-weather-size          "5.1 MB">
+  <!ENTITY gnome-weather-buildsize     "19 MB">
+  <!ENTITY gnome-weather-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="gnome-weather" xreflabel="gnome-weather-&gnome-weather-version;" revision="systemd">
+  <?dbhtml filename="gnome-weather.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>gnome-weather-&gnome-weather-version;</title>
+
+  <indexterm zone="gnome-weather">
+    <primary sortas="a-gnome-weather">gnome-weather</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to GNOME Weather</title>
+
+    <para>
+      <application>GNOME Weather</application> is a small application that allows
+      you to monitor the current weather conditions for your city, or anywhere
+      in the world, and to access updated forecasts provided by various internet
+      services.
+    </para>
+
+    &lfs79_checked;&gcc6_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gnome-weather-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gnome-weather-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gnome-weather-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gnome-weather-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gnome-weather-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gnome-weather-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GNOME Weather Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gjs"/> and
+      <xref linkend="libgweather"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="appstream-glib"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/gnome-weather"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GNOME Weather</title>
+
+    <para>
+      Install <application>GNOME Weather</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          gnome-weather
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/share/org.gnome.Weather.Application
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gnome-weather-prog">
+        <term><command>gnome-weather</command></term>
+        <listitem>
+          <para>
+            is a small application that allows  you to monitor the
+            current weather conditions anywhere in the world.
+          </para>
+          <indexterm zone="gnome-weather gnome-weather-prog">
+            <primary sortas="b-gnome-weather">gnome-weather</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome/applications/gucharmap.xml
===================================================================
--- gnome/applications/gucharmap.xml	(revision c828e9cbb419d84edc748a281dc316423e1f22b1)
+++ gnome/applications/gucharmap.xml	(revision 70567248e4c8d35edfbafb7776124346d705d332)
@@ -81,4 +81,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+      <phrase revision="systemd"><xref linkend="appstream-glib"/>,</phrase>
       <xref linkend="desktop-file-utils"/>,
       <xref linkend="gtk3"/>,
