Index: gnome/applications/evince.xml
===================================================================
--- gnome/applications/evince.xml	(revision ffe2b457d5baf66c7ff1a54b7add89deef54999b)
+++ gnome/applications/evince.xml	(revision 1c8c15ce9e8f47c495740050b181f29a1526bd90)
@@ -157,13 +157,6 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <note>
-      <para>If you installed the package to your system using a "DESTDIR"
-      method, 
-      <filename>/usr/share/glib-2.0/schemas/gschemas.compiled</filename>
-      was not updated/created. Create (or update) the file using the following
-      command as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>glib-compile-schemas /usr/share/glib-2.0/schemas</userinput></screen></note>
-
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+                href="../../xincludes/gsettings-destdir.xml"/>
 
   </sect2>
Index: gnome/applications/gnome-color-manager.xml
===================================================================
--- gnome/applications/gnome-color-manager.xml	(revision ffe2b457d5baf66c7ff1a54b7add89deef54999b)
+++ gnome/applications/gnome-color-manager.xml	(revision 1c8c15ce9e8f47c495740050b181f29a1526bd90)
@@ -142,7 +142,9 @@
     <title>Command Explanations</title>
 
-    <para><parameter>-Dexiv=false</parameter>: This switch is used to disable
-    using Exiv2 because Exiv2-0.27 changed the API in a way that several
-    applications cannot use.</para>
+    <para>
+      <parameter>-Dexiv=false</parameter>: This switch is used to disable
+      using Exiv2 because Exiv2-0.27 changed the API in a way that several
+      applications cannot use.
+    </para>
     <!- - Please check this at the next version of gnome-color-manager AND/OR
     the next version of Exiv2. No work has been done upstream, but I did file
Index: gnome/applications/gnome-screenshot.xml
===================================================================
--- gnome/applications/gnome-screenshot.xml	(revision ffe2b457d5baf66c7ff1a54b7add89deef54999b)
+++ gnome/applications/gnome-screenshot.xml	(revision 1c8c15ce9e8f47c495740050b181f29a1526bd90)
@@ -90,14 +90,4 @@
     <title>Installation of GNOME Screenshot</title>
 
-<!-- There have been 2 releases since then:
-    <note><para>There is a build problem caused by a file installed by gettext
-    in LFS.  If gettext was installed with instructions before the 
-    April 11, 2018 version of LFS, run the following as the 
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen><userinput>sed -e '/AppData/N;N;p;s/\.appdata\./.metainfo./' \
-    -i /usr/share/gettext-0.19.8/its/appdata.loc</userinput></screen>
-    </note>
--->
     <para>
       Install <application>GNOME Screenshot</application> by running the following
@@ -121,7 +111,10 @@
 <screen role="root"><userinput>ninja install</userinput></screen>
 
-    <note><para>In order to best run <application>GNOME Screenshot</application>
-    from the command line, the --interactive option needs to be specified.
-    </para></note>
+    <note>
+      <para>
+        In order to best run <application>GNOME Screenshot</application>
+        from the command line, the --interactive option needs to be specified.
+      </para>
+    </note>
 
   </sect2>
Index: gnome/applications/gnome-terminal.xml
===================================================================
--- gnome/applications/gnome-terminal.xml	(revision ffe2b457d5baf66c7ff1a54b7add89deef54999b)
+++ gnome/applications/gnome-terminal.xml	(revision 1c8c15ce9e8f47c495740050b181f29a1526bd90)
@@ -133,8 +133,11 @@
 rm -v /usr/lib/systemd/user/gnome-terminal-server.service</userinput></screen>
 
-    <note><para>To run <application>GNOME Terminal</application>, the
-    environment variable <envar>LANG</envar> must be set to a UTF-8
-    locale <emphasis>prior</emphasis> to starting the graphical
-    environment.</para></note>
+    <note>
+      <para>
+        To run <application>GNOME Terminal</application>, the environment
+        variable <envar>LANG</envar> must be set to a UTF-8 locale
+        <emphasis>prior</emphasis> to starting the graphical environment.
+      </para>
+    </note>
 
   </sect2>
Index: gnome/applications/gucharmap.xml
===================================================================
--- gnome/applications/gucharmap.xml	(revision ffe2b457d5baf66c7ff1a54b7add89deef54999b)
+++ gnome/applications/gucharmap.xml	(revision 1c8c15ce9e8f47c495740050b181f29a1526bd90)
@@ -119,6 +119,8 @@
 make</userinput></screen>
 
-    <para>This package&apos;s testsuite is only intended to be used by the
-    maintainer to check the i18n help files.</para>
+    <para>
+      This package&apos;s testsuite is only intended to be used by the
+      maintainer to check the i18n help files.
+    </para>
 
     <para>
Index: gnome/applications/seahorse.xml
===================================================================
--- gnome/applications/seahorse.xml	(revision ffe2b457d5baf66c7ff1a54b7add89deef54999b)
+++ gnome/applications/seahorse.xml	(revision 1c8c15ce9e8f47c495740050b181f29a1526bd90)
@@ -141,6 +141,8 @@
       <title>Command Explanations</title>
 
-      <para><command>sed ... data/*.xml</command>:  This command fixes some
-      deprecated entries in the schema templates.</para>
+      <para>
+        <command>sed ... data/*.xml</command>:  This command fixes some
+        deprecated entries in the schema templates.
+      </para>
 
       <para>
Index: gnome/platform/dconf.xml
===================================================================
--- gnome/platform/dconf.xml	(revision ffe2b457d5baf66c7ff1a54b7add89deef54999b)
+++ gnome/platform/dconf.xml	(revision 1c8c15ce9e8f47c495740050b181f29a1526bd90)
@@ -183,5 +183,7 @@
 <screen role="root"><userinput>ninja install</userinput></screen>
 
-    <para>Now, optionally install the editor:</para>
+    <para>
+      Now, optionally install the editor:
+    </para>
 
 <screen><userinput>cd ..              &amp;&amp;
@@ -206,7 +208,9 @@
     <title>Command Explanations</title>
 
-    <para><option>-Denable-gtk-doc</option>: Use this parameter if
-    <application>GTK-Doc</application> is installed and you wish to rebuild
-    and install the API documentation.</para>
+    <para>
+      <option>-Denable-gtk-doc</option>: Use this parameter if
+      <application>GTK-Doc</application> is installed and you wish to rebuild
+      and install the API documentation.
+    </para>
 
   </sect2>
Index: gnome/platform/folks.xml
===================================================================
--- gnome/platform/folks.xml	(revision ffe2b457d5baf66c7ff1a54b7add89deef54999b)
+++ gnome/platform/folks.xml	(revision 1c8c15ce9e8f47c495740050b181f29a1526bd90)
@@ -137,6 +137,9 @@
       and had 103 test failures in Tracker's section of the test suite.
       This is unacceptable and is why we have it disabled by default. -->
-    <!--<para>This package does not come with a test suite.</para>-->
-
+<!--
+    <para>
+      This package does not come with a test suite.
+    </para>
+-->
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
Index: gnome/platform/gexiv2.xml
===================================================================
--- gnome/platform/gexiv2.xml	(revision ffe2b457d5baf66c7ff1a54b7add89deef54999b)
+++ gnome/platform/gexiv2.xml	(revision 1c8c15ce9e8f47c495740050b181f29a1526bd90)
@@ -123,7 +123,9 @@
     <title>Command Explanations</title>
 
-    <para><option>-Denable-gtk-doc</option>: Use this parameter if
-    <application>GTK-Doc</application> is installed and you wish to rebuild
-    and install the API documentation.</para>
+    <para>
+      <option>-Denable-gtk-doc</option>: Use this parameter if
+      <application>GTK-Doc</application> is installed and you wish to rebuild
+      and install the API documentation.
+    </para>
 
   </sect2>
Index: gnome/platform/grilo.xml
===================================================================
--- gnome/platform/grilo.xml	(revision ffe2b457d5baf66c7ff1a54b7add89deef54999b)
+++ gnome/platform/grilo.xml	(revision 1c8c15ce9e8f47c495740050b181f29a1526bd90)
@@ -30,7 +30,9 @@
     <title>Introduction to Grilo</title>
 
-    <para><application>Grilo</application> is a framework focused on making
-    media discovery and browsing easy for applications and application
-    developers.</para>
+    <para>
+      <application>Grilo</application> is a framework focused on making
+      media discovery and browsing easy for applications and application
+      developers.
+    </para>
 
     &lfs91_checked;
@@ -39,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&grilo-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&grilo-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &grilo-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &grilo-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &grilo-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &grilo-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&grilo-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&grilo-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &grilo-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &grilo-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &grilo-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &grilo-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -91,11 +105,15 @@
     <title>Installation of Grilo</title>
 <!--
-    <para>First, fix a build failure introduced by an API change in
-    <application>totem-pl-parser</application>:</para>
+    <para>
+      First, fix a build failure introduced by an API change in
+      <application>totem-pl-parser</application>:
+    </para>
 
 <screen><userinput remap="pre">sed -i 's/TOTEM_IS_PL_PARSER/TOTEM_PL_IS_PARSER/' libs/pls/grl-pls.c</userinput></screen>
 -->
-    <para>Install <application>Grilo</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>Grilo</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>mkdir build &amp;&amp;
@@ -106,7 +124,11 @@
 ninja</userinput></screen>
 
-	<para>To test the results, issue: <command>ninja test</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      To test the results, issue: <command>ninja test</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>ninja install</userinput></screen>
@@ -148,6 +170,8 @@
         <term><command>grilo-test-ui-0.3</command></term>
         <listitem>
-          <para>is a simple playground application that you can use to test the
-          framework and its plugins.</para>
+          <para>
+            is a simple playground application that you can use to test the
+            framework and its plugins.
+          </para>
           <indexterm zone="grilo grilo-test-ui">
             <primary sortas="b-grilo-test-ui">grilo-test-ui</primary>
@@ -159,6 +183,7 @@
         <term><command>grl-inspect-0.3</command></term>
         <listitem>
-          <para>is a tool that prints out information on available Grilo
-          sources.</para>
+          <para>
+            is a tool that prints out information on available Grilo sources.
+          </para>
           <indexterm zone="grilo grl-inspect">
             <primary sortas="b-grl-inspect">grl-inspect</primary>
@@ -170,6 +195,8 @@
         <term><command>grl-launch-0.3</command></term>
         <listitem>
-          <para>is a tool to run <application>Grilo</application> operations
-          from command line.</para>
+          <para>
+            is a tool to run <application>Grilo</application> operations
+            from command line.
+          </para>
           <indexterm zone="grilo grl-launch">
             <primary sortas="b-grl-launch">grl-launch</primary>
@@ -181,5 +208,7 @@
         <term><filename class='libraryfile'>libgrilo.so</filename></term>
         <listitem>
-          <para>provides the Grilo framework.</para>
+          <para>
+            provides the Grilo framework.
+          </para>
           <indexterm zone="grilo libgrilo">
             <primary sortas="c-libgrilo">libgrilo.so</primary>
@@ -191,5 +220,7 @@
         <term><filename class='libraryfile'>libgrlnet.so</filename></term>
         <listitem>
-          <para>provides Grilo networking helpers for plug-ins.</para>
+          <para>
+            provides Grilo networking helpers for plug-ins.
+          </para>
           <indexterm zone="grilo libgrilo">
             <primary sortas="c-libgrlnet">libgrlnet.so</primary>
@@ -201,5 +232,7 @@
         <term><filename class='libraryfile'>libgrlpls.so</filename></term>
         <listitem>
-          <para>provides playlist handling functions.</para>
+          <para>
+            provides playlist handling functions.
+          </para>
           <indexterm zone="grilo libgrilo">
             <primary sortas="c-libgrlpls">libgrlpls.so</primary>
Index: gnome/platform/gsettings-desktop-schemas.xml
===================================================================
--- gnome/platform/gsettings-desktop-schemas.xml	(revision ffe2b457d5baf66c7ff1a54b7add89deef54999b)
+++ gnome/platform/gsettings-desktop-schemas.xml	(revision 1c8c15ce9e8f47c495740050b181f29a1526bd90)
@@ -121,6 +121,8 @@
       <title>Command Explanations</title>
 
-      <para><command>sed ... schemas/*.in</command>:  This command fixes some
-      deprecated entries in the schema templates.</para>
+      <para>
+        <command>sed ... schemas/*.in</command>:  This command fixes some
+        deprecated entries in the schema templates.
+      </para>
 
       <!-- See about removing this at 8.5-rc1. -->
Index: gnome/platform/libgweather.xml
===================================================================
--- gnome/platform/libgweather.xml	(revision ffe2b457d5baf66c7ff1a54b7add89deef54999b)
+++ gnome/platform/libgweather.xml	(revision 1c8c15ce9e8f47c495740050b181f29a1526bd90)
@@ -137,7 +137,9 @@
     <title>Command Explanations</title>
 
-    <para><option>-Dgtk_doc=true</option>: Use this parameter if
-    <application>GTK-Doc</application> is installed and you wish to rebuild and
-    install the API documentation.</para>
+    <para>
+      <option>-Dgtk_doc=true</option>: Use this parameter if
+      <application>GTK-Doc</application> is installed and you wish to rebuild
+      and install the API documentation.
+    </para>
 
   </sect2>
Index: gnome/platform/tracker.xml
===================================================================
--- gnome/platform/tracker.xml	(revision ffe2b457d5baf66c7ff1a54b7add89deef54999b)
+++ gnome/platform/tracker.xml	(revision 1c8c15ce9e8f47c495740050b181f29a1526bd90)
@@ -130,15 +130,5 @@
 
 <screen role="root"><userinput>ninja install</userinput></screen>
-<!-- It seems fixed in current (2.3.1) version.
-    <para>
-      This package does not compile the settings schema that it installs.
-      This must be done to prevent a runtime error in
-      <command>tracker-store</command> (a dameon which is installed in
-      <filename class="directory">/usr/libexec</filename>). As the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>glib-compile-schemas /usr/share/glib-2.0/schemas</userinput></screen>
--->
+
   </sect2>
 
