Index: general.ent
===================================================================
--- general.ent	(revision 73046e652b5139eb20e102bcc25dcd30aa32cc19)
+++ general.ent	(revision fd42347a8cbae352124e669278966d2ed0640fad)
@@ -52,5 +52,4 @@
 <!ENTITY lxqt-http-repo       "http://downloads.lxqt.org/lxqt">
 <!ENTITY publisher            "Unknown">
-<!--<!ENTITY xorg-download-http   "http://xorg.freedesktop.org/archive/individual">-->
 <!ENTITY xorg-download-http   "http://ftp.x.org/pub/individual">
 <!ENTITY xorg-download-ftp    "ftp://ftp.x.org/pub/individual">
@@ -83,8 +82,4 @@
 <!-- These entities are used to annotate the current status of a package as it
      relates to the version of LFS it will build/work against -->
-<!ENTITY lfs79_checked        "<para>This package is known to build and work
-                              properly using an LFS-7.9 platform.</para>">
-<!ENTITY lfs79_built          "<para>This package is known to build using an LFS
-                              7.9 platform but has not been tested.</para>">
 
 <!ENTITY lfs7a_checked        "<para>This package is known to build and work
@@ -93,5 +88,4 @@
                               7.10 platform but has not been tested.</para>">
 
-<!-- usage: <para>&lfssvn_checked;ccyymmdd&lfssvn_checked2;</para> -->
 <!ENTITY lfssvn_checked       "This package is known to build and work properly
                                using an LFS-SVN-">
@@ -140,10 +134,4 @@
                               installation.</para>">
 
-<!-- Problem with some packages introduced by a given dependency version -->
-<!ENTITY gcc-490                        "gcc-4.9.0">
-
-<!ENTITY gcc6_checked           "<para>This package is known to build 
-                                properly using the gcc-6 compiler.</para>">
-
 <!ENTITY % package-entities SYSTEM      "packages.ent">
 %package-entities;
Index: gnome/applications/gucharmap.xml
===================================================================
--- gnome/applications/gucharmap.xml	(revision 73046e652b5139eb20e102bcc25dcd30aa32cc19)
+++ gnome/applications/gucharmap.xml	(revision fd42347a8cbae352124e669278966d2ed0640fad)
@@ -41,5 +41,4 @@
 
     &lfs7a_checked;
-    &gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/plasma5/plasma-all.xml
===================================================================
--- kde/plasma5/plasma-all.xml	(revision 73046e652b5139eb20e102bcc25dcd30aa32cc19)
+++ kde/plasma5/plasma-all.xml	(revision fd42347a8cbae352124e669278966d2ed0640fad)
@@ -274,6 +274,6 @@
     <para revision="systemd">
       You can start <application>Plasma5</application> from a TTY, using
-      <xref linkend="xinit"/>, or from a graphical display manager, such as
-      <xref linkend="sddm"/>.
+      <xref linkend="xinit"/><!--, or from a graphical display manager, such as
+      <xref linkend="sddm"/>-->.
     </para>
 
Index: lxde/desktop/lxde-common.xml
===================================================================
--- lxde/desktop/lxde-common.xml	(revision 73046e652b5139eb20e102bcc25dcd30aa32cc19)
+++ lxde/desktop/lxde-common.xml	(revision fd42347a8cbae352124e669278966d2ed0640fad)
@@ -146,5 +146,5 @@
       You can start <application>LXDE</application> from runlevel 3, using
       <xref linkend="xinit"/>, or from runlevel 5, using a Display Manager,
-      such as <xref linkend="sddm"/>.
+      such as <xref linkend="lxdm"/>.
     </para>
 
Index: lxqt/desktop/lxqt-common.xml
===================================================================
--- lxqt/desktop/lxqt-common.xml	(revision 73046e652b5139eb20e102bcc25dcd30aa32cc19)
+++ lxqt/desktop/lxqt-common.xml	(revision fd42347a8cbae352124e669278966d2ed0640fad)
@@ -83,8 +83,8 @@
     <para role="recommended">
       <phrase revision="sysv"><xref linkend="consolekit"/> alone or with</phrase>
-      <xref linkend="lxdm"/> or another Display Manager, e.g.
+      <xref linkend="lxdm"/><phrase revision='sysv'> or another Display Manager, e.g.
       <xref linkend="sddm"/> (this has been
       reported as the <quote>recommended <application>LXQt</application>
-      display manager</quote>),
+      display manager</quote>)</phrase>,
       <xref linkend="desktop-file-utils"/>,
       <xref linkend="hicolor-icon-theme"/>, and
Index: lxqt/desktop/post-install.xml
===================================================================
--- lxqt/desktop/post-install.xml	(revision 73046e652b5139eb20e102bcc25dcd30aa32cc19)
+++ lxqt/desktop/post-install.xml	(revision fd42347a8cbae352124e669278966d2ed0640fad)
@@ -38,8 +38,10 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <phrase revision="sysv"><xref linkend="consolekit"/> alone or with</phrase>
-      <xref linkend="sddm"/> (this has been
-      reported as the <quote>recommended <application>LXQt</application>
-      display manager</quote>) or another Display Manager, e.g.
+      <phrase revision="sysv">
+        <xref linkend="consolekit"/> alone or with
+        <xref linkend="sddm"/> (this has been
+        reported as the <quote>recommended <application>LXQt</application>
+        display manager</quote>) or another Display Manager, e.g.
+      </phrase>
       <xref linkend="lxdm"/>, and
       <xref linkend="dbus"/>
@@ -99,8 +101,8 @@
     <para revision="systemd">
       You can start <application>LXQt</application> from a TTY, using
-      <xref linkend="xinit"/>, or by using a graphical display manager such
+      <xref linkend="xinit"/><!--, or by using a graphical display manager such
       as <xref linkend="sddm"/>. The <filename>lxqt.desktop</filename>
       file needs to be fixed, or it will not be listed in <xref linkend="sddm"/>
-      and <xref linkend="lxdm"/>
+      and <xref linkend="lxdm"/>-->.
     </para>
 
Index: multimedia/audioutils/lame.xml
===================================================================
--- multimedia/audioutils/lame.xml	(revision 73046e652b5139eb20e102bcc25dcd30aa32cc19)
+++ multimedia/audioutils/lame.xml	(revision fd42347a8cbae352124e669278966d2ed0640fad)
@@ -92,5 +92,5 @@
     <para>
       First, fix a compiler error introduced by
-      <application>&gcc-490;</application> on 32-bit machines:
+      <application>gcc-4.9.0</application> on 32-bit machines:
     </para>
 
Index: multimedia/libdriv/opal.xml
===================================================================
--- multimedia/libdriv/opal.xml	(revision 73046e652b5139eb20e102bcc25dcd30aa32cc19)
+++ multimedia/libdriv/opal.xml	(revision fd42347a8cbae352124e669278966d2ed0640fad)
@@ -123,6 +123,6 @@
        plugins/video/MPEG4-ffmpeg/mpeg4.cxx   &amp;&amp;
 
-ed -e '/&lt;&lt; mime.PrintContents/ s/mime/(const std::string\&amp;)&amp;/' \
-        -i src/im/msrp.cxx  &amp;&amp;
+sed -e '/&lt;&lt; mime.PrintContents/ s/mime/(const std::string\&amp;)&amp;/' \
+    -i src/im/msrp.cxx  &amp;&amp;
 
 ./configure --prefix=/usr &amp;&amp;
Index: x/dm/sddm.xml
===================================================================
--- x/dm/sddm.xml	(revision 73046e652b5139eb20e102bcc25dcd30aa32cc19)
+++ x/dm/sddm.xml	(revision fd42347a8cbae352124e669278966d2ed0640fad)
@@ -17,5 +17,5 @@
 ]>
 
-<sect1 id="sddm" xreflabel="sddm-&sddm-version;">
+<sect1 id="sddm" xreflabel="sddm-&sddm-version;" revision='sysv'>
   <?dbhtml filename="sddm.html"?>
 
Index: x/lib/gtk-engines.xml
===================================================================
--- x/lib/gtk-engines.xml	(revision 73046e652b5139eb20e102bcc25dcd30aa32cc19)
+++ x/lib/gtk-engines.xml	(revision fd42347a8cbae352124e669278966d2ed0640fad)
@@ -38,5 +38,5 @@
     </para>
 
-    &lfs79_checked;
+    &lfs7a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/wm/icewm.xml
===================================================================
--- x/wm/icewm.xml	(revision 73046e652b5139eb20e102bcc25dcd30aa32cc19)
+++ x/wm/icewm.xml	(revision fd42347a8cbae352124e669278966d2ed0640fad)
@@ -107,5 +107,5 @@
       ships with both icewm,desktop and icewm-xsession.desktop. The former has
       apparently been used in the past, but it will hang if used with a modern
-      desktop-manager such as <xref linkend="sddm"/>.
+      desktop-manager<phrase revision='sysv'> such as <xref linkend="sddm"/></phrase>.
     </para>
 
Index: xfce/core/xfce4-session.xml
===================================================================
--- xfce/core/xfce4-session.xml	(revision 73046e652b5139eb20e102bcc25dcd30aa32cc19)
+++ xfce/core/xfce4-session.xml	(revision fd42347a8cbae352124e669278966d2ed0640fad)
@@ -187,6 +187,6 @@
     <para revision="systemd">
       You can start <application>Xfce4</application> from a TTY using
-      <xref linkend="xinit"/>, or from a graphical display manager, such as
-      <xref linkend="sddm"/>.
+      <xref linkend="xinit"/><!--, or from a graphical display manager, such as
+      <xref linkend="sddm"/>-->.
     </para>
 
Index: xsoft/other/balsa.xml
===================================================================
--- xsoft/other/balsa.xml	(revision 73046e652b5139eb20e102bcc25dcd30aa32cc19)
+++ xsoft/other/balsa.xml	(revision fd42347a8cbae352124e669278966d2ed0640fad)
@@ -33,5 +33,5 @@
     <application>GNOME</application>-2 based mail client.</para>
 
-    &lfs79_checked;
+    &lfs7a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: xsoft/other/ekiga.xml
===================================================================
--- xsoft/other/ekiga.xml	(revision 73046e652b5139eb20e102bcc25dcd30aa32cc19)
+++ xsoft/other/ekiga.xml	(revision fd42347a8cbae352124e669278966d2ed0640fad)
@@ -31,13 +31,14 @@
 
     <para>
-      <application>Ekiga</application> is a VoIP, IP Telephony, and Video Conferencing
-      application that allows you to make audio and video calls to remote users with
-      SIP or H.323 compatible hardware and software.  It supports many audio and video
-      codecs and all modern VoIP features for both SIP and H.323.
-      <application>Ekiga</application> is the first Open Source application to support
-      both H.323 and SIP, as well as audio and video.
-    </para>
-
-    &lfs79_checked;
+      <application>Ekiga</application> is a VoIP, IP Telephony, and Video
+      Conferencing application that allows you to make audio and video calls to
+      remote users with SIP or H.323 compatible hardware and software.  It
+      supports many audio and video codecs and all modern VoIP features for
+      both SIP and H.323.  <application>Ekiga</application> is the first Open
+      Source application to support both H.323 and SIP, as well as audio and
+      video.
+    </para>
+
+    &lfs7a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -81,5 +82,5 @@
       <xref linkend="boost"/>,
       <xref linkend="gnome-icon-theme"/>,
-      <xref linkend="gtk2"/> and
+      <xref linkend="gtk2"/>, and
       <xref linkend="opal"/>
     </para>
@@ -88,5 +89,5 @@
     <para role="recommended">
       <xref linkend="dbus-glib"/>,
-      <xref linkend="GConf"/> and
+      <xref linkend="GConf"/>, and
       <xref linkend="libnotify"/>
     </para>
@@ -98,5 +99,5 @@
       Evolution Data Server</ulink>,
       <ulink url="&gnome-download-http;/gnome-doc-utils/">
-      GNOME Doc Utils</ulink> and
+      GNOME Doc Utils</ulink>, and
       <xref linkend="openldap"/>
     </para>
Index: xsoft/other/hexchat.xml
===================================================================
--- xsoft/other/hexchat.xml	(revision 73046e652b5139eb20e102bcc25dcd30aa32cc19)
+++ xsoft/other/hexchat.xml	(revision fd42347a8cbae352124e669278966d2ed0640fad)
@@ -35,5 +35,5 @@
     also possible.</para>
 
-    &lfs79_checked;&gcc6_checked;
+    &lfs7a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: xsoft/other/pidgin.xml
===================================================================
--- xsoft/other/pidgin.xml	(revision 73046e652b5139eb20e102bcc25dcd30aa32cc19)
+++ xsoft/other/pidgin.xml	(revision fd42347a8cbae352124e669278966d2ed0640fad)
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs79_checked;&gcc6_checked;
+    &lfs7a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: xsoft/other/rox-filer.xml
===================================================================
--- xsoft/other/rox-filer.xml	(revision 73046e652b5139eb20e102bcc25dcd30aa32cc19)
+++ xsoft/other/rox-filer.xml	(revision fd42347a8cbae352124e669278966d2ed0640fad)
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs79_checked;
+    &lfs7a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: xsoft/other/transmission.xml
===================================================================
--- xsoft/other/transmission.xml	(revision 73046e652b5139eb20e102bcc25dcd30aa32cc19)
+++ xsoft/other/transmission.xml	(revision fd42347a8cbae352124e669278966d2ed0640fad)
@@ -37,5 +37,5 @@
     </para>
 
-    &lfs79_checked;&gcc6_checked;
+    &lfs7a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: xsoft/other/xarchiver.xml
===================================================================
--- xsoft/other/xarchiver.xml	(revision 73046e652b5139eb20e102bcc25dcd30aa32cc19)
+++ xsoft/other/xarchiver.xml	(revision fd42347a8cbae352124e669278966d2ed0640fad)
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs79_checked;&gcc6_checked;
+    &lfs7a_checked;
 
     <note>
