Index: itattributes
===================================================================
--- .gitattributes	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,1 +1,0 @@
-*.xml filter=dater
Index: itignore
===================================================================
--- .gitignore	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,4 +1,0 @@
-version.ent
-blfs-bootscripts*
-xxx
-*.swp
Index: INSTALL
===================================================================
--- INSTALL	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ INSTALL	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,2 +1,6 @@
+$LastChangedBy$
+$Date$
+
+
 Ok, so you have downloaded the XML source. Now what? You are probably
 wanting to convert these XML files to easier to read HTML.
@@ -13,4 +17,4 @@
 The installation instructions for all these packages are available
 in the BLFS book from one of the mirrors found at
-https://www.linuxfromscratch.org/blfs.
+http://www.linuxfromscratch.org/blfs.
 
Index: Makefile
===================================================================
--- Makefile	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ Makefile	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -2,4 +2,6 @@
 # By Tushar Teredesai <tushar@linuxfromscratch.org>
 # 2004-01-31
+# $LastChangedBy$
+# $Date$
 
 # Adjust these to suit your installation
@@ -50,55 +52,9 @@
 blfs: html wget-list
 
-help:
-	@echo ""
-	@echo "make <parameters> <targets>"
-	@echo ""
-	@echo "Parameters:"
-	@echo "  REV=<rev>            Build variation of book"
-	@echo "                       Valid values for REV are:"
-	@echo "                       * sysv    - Build book for SysV"
-	@echo "                       * systemd - Build book for systemd"
-	@echo "                       Defaults to 'sysv'"
-	@echo ""
-	@echo "  BASEDIR=<dir>        Put the output in directory <dir>."
-	@echo "                       Defaults to"
-	@echo "                       'HOME/public_html/blfs-book' if REV=sysv (or unset)"
-	@echo "                       or to"
-	@echo "                       'HOME/public_html/blfs-book-systemd' if REV=systemd"
-	@echo ""
-	@echo "  V=<val>              If <val> is a non-empty value, all"
-	@echo "                       steps to produce the output is shown."
-	@echo "                       Default is unset."
-	@echo ""
-	@echo "Targets:"
-	@echo "  help                 Show this help text."
-	@echo ""
-	@echo "  blfs                 Builds targets 'html' and 'wget-list'."
-	@echo ""
-	@echo "  html                 Builds the HTML pages of the book."
-	@echo ""
-	@echo "  wget-list            Produces a list of all packages to download."
-	@echo "                       Output is BASEDIR/wget-list"
-	@echo ""
-	@echo "  nochunks             Builds the book as a one-pager. The output"
-	@echo "                       is a large single HTML page containing the"
-	@echo "                       whole book."
-	@echo ""
-	@echo "                       Parameter NOCHUNKS_OUTPUT=<filename> controls"
-	@echo "                       the name of the HTML file."
-	@echo ""
-	@echo "  validate             Runs validation checks on the XML files."
-	@echo ""
-	@echo "  test-links           Runs validation checks on URLs in the book."
-	@echo "                       Produces a file named BASEDIR/bad_urls containing"
-	@echo "                       URLS which are invalid and a BASEDIR/good_urls"
-	@echo "                       containing all valid URLs."
-	@echo ""
-
 all: blfs nochunks
 world: all blfs-patch-list dump-commands test-links
 
 html: $(BASEDIR)/index.html
-$(BASEDIR)/index.html: $(RENDERTMP)/$(BLFSHTML) version
+$(BASEDIR)/index.html: $(RENDERTMP)/$(BLFSHTML)
 	@echo "Generating chunked XHTML files..."
 	$(Q)xsltproc --nonet                                    \
@@ -115,5 +71,4 @@
 
 	$(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
-	$(Q)sed -i 's|../stylesheet|stylesheet|' $(BASEDIR)/index.html
 
 	$(Q)if [ ! -e $(BASEDIR)/images ]; then \
@@ -130,9 +85,9 @@
       true;                                                       \
       bash obfuscate.sh $$filename;                               \
-      sed -i -e "1,20s@text/html@application/xhtml+xml@g" $$filename; \
+      sed -i -e "s@text/html@application/xhtml+xml@g" $$filename; \
    done;
 
 nochunks: $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-$(BASEDIR)/$(NOCHUNKS_OUTPUT): $(RENDERTMP)/$(BLFSHTML) version
+$(BASEDIR)/$(NOCHUNKS_OUTPUT): $(RENDERTMP)/$(BLFSHTML)
 	@echo "Generating non-chunked XHTML file..."
 	$(Q)xsltproc --nonet                                \
@@ -145,5 +100,5 @@
 	$(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
 	$(Q)bash obfuscate.sh $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-	$(Q)sed -i -e "1,20s@text/html@application/xhtml+xml@g" $(BASEDIR)/$(NOCHUNKS_OUTPUT)
+	$(Q)sed -i -e "s@text/html@application/xhtml+xml@g" $(BASEDIR)/$(NOCHUNKS_OUTPUT)
 
 tmpdir: $(RENDERTMP)
@@ -157,5 +112,5 @@
 
 validate: $(RENDERTMP)/$(BLFSFULL)
-$(RENDERTMP)/$(BLFSFULL): general.ent packages.ent $(ALLXML) $(ALLXSL) version
+$(RENDERTMP)/$(BLFSFULL): general.ent packages.ent $(ALLXML) $(ALLXSL)
 	$(Q)[ -d $(RENDERTMP) ] || mkdir -p $(RENDERTMP)
 
@@ -176,5 +131,5 @@
 
 profile-html: $(RENDERTMP)/$(BLFSHTML)
-$(RENDERTMP)/$(BLFSHTML): $(RENDERTMP)/$(BLFSFULL) version
+$(RENDERTMP)/$(BLFSHTML): $(RENDERTMP)/$(BLFSFULL)
 	@echo "Generating profiled XML for XHTML..."
 	$(Q)xsltproc --nonet                              \
@@ -189,5 +144,5 @@
 	  blfs-patches.sh > blfs-patch-list
 
-blfs-patches.sh: $(RENDERTMP)/$(BLFSFULL) version
+blfs-patches.sh: $(RENDERTMP)/$(BLFSFULL)
 	@echo "Generating blfs patch script..."
 	$(Q)xsltproc --nonet                     \
@@ -197,5 +152,5 @@
 
 wget-list: $(BASEDIR)/wget-list
-$(BASEDIR)/wget-list: $(RENDERTMP)/$(BLFSFULL) version
+$(BASEDIR)/wget-list: $(RENDERTMP)/$(BLFSFULL)
 	@echo "Generating wget list for $(REV) at $(BASEDIR)/wget-list ..."
 	$(Q)mkdir -p $(BASEDIR)
@@ -206,5 +161,5 @@
 
 test-links: $(BASEDIR)/test-links
-$(BASEDIR)/test-links: $(RENDERTMP)/$(BLFSFULL) version
+$(BASEDIR)/test-links: $(RENDERTMP)/$(BLFSFULL)
 	@echo "Generating test-links file..."
 	$(Q)mkdir -p $(BASEDIR)
@@ -258,5 +213,5 @@
 
 dump-commands: $(DUMPDIR)
-$(DUMPDIR): $(RENDERTMP)/$(BLFSFULL) version
+$(DUMPDIR): $(RENDERTMP)/$(BLFSFULL)
 	@echo "Dumping book commands..."
 	$(Q)xsltproc --output $(DUMPDIR)/          \
@@ -267,6 +222,5 @@
 .PHONY: blfs all world html nochunks tmpdir clean  \
    validate profile-html blfs-patch-list wget-list test-links \
-   dump-commands  bootscripts systemd-units version
-
-version:
-	$(Q)./git-version.sh
+   dump-commands  bootscripts systemd-units
+
+
Index: README
===================================================================
--- README	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ README	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,2 +1,5 @@
+$LastChangedBy$
+$Date$
+
 How do I convert these XML files to HTML? You need to have some software
 installed that deal with these conversions. Please read the INSTALL file to
Index: appendices/creat-comm.xml
===================================================================
--- appendices/creat-comm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ appendices/creat-comm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <appendixinfo>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </appendixinfo>
Index: appendices/glossary.xml
===================================================================
--- appendices/glossary.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ appendices/glossary.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,4 +8,5 @@
 <glossary id="appendices-glossary">
   <glossaryinfo>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </glossaryinfo>
Index: appendices/mit-lic.xml
===================================================================
--- appendices/mit-lic.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ appendices/mit-lic.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <appendixinfo>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </appendixinfo>
Index: archive/DeviceKit.xml
===================================================================
--- archive/DeviceKit.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/DeviceKit.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/a2ps.xml
===================================================================
--- archive/a2ps.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/a2ps.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/accountsservice.xml
===================================================================
--- archive/accountsservice.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/accountsservice.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/acl.xml
===================================================================
--- archive/acl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/acl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/add/add-pkgs.xml
===================================================================
--- archive/add/add-pkgs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/add/add-pkgs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/add/add.xml
===================================================================
--- archive/add/add.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/add/add.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
  %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="kde-add">
Index: archive/add/ark.xml
===================================================================
--- archive/add/ark.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/add/ark.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/add/gwenview.xml
===================================================================
--- archive/add/gwenview.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/add/gwenview.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/add/kate.xml
===================================================================
--- archive/add/kate.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/add/kate.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/add/kdepim-runtime.xml
===================================================================
--- archive/add/kdepim-runtime.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/add/kdepim-runtime.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/add/kdepim.xml
===================================================================
--- archive/add/kdepim.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/add/kdepim.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/add/kdeplasma-addons.xml
===================================================================
--- archive/add/kdeplasma-addons.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/add/kdeplasma-addons.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/add/kmix.xml
===================================================================
--- archive/add/kmix.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/add/kmix.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/add/konsole.xml
===================================================================
--- archive/add/konsole.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/add/konsole.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/add/libkdcraw.xml
===================================================================
--- archive/add/libkdcraw.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/add/libkdcraw.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/add/libkexiv2.xml
===================================================================
--- archive/add/libkexiv2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/add/libkexiv2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/add/okular.xml
===================================================================
--- archive/add/okular.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/add/okular.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/agg.xml
===================================================================
--- archive/agg.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/agg.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -20,4 +20,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/alpine.xml
===================================================================
--- archive/alpine.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/alpine.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/amarok.xml
===================================================================
--- archive/amarok.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/amarok.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/appdata-tools.xml
===================================================================
--- archive/appdata-tools.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/appdata-tools.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/appstream-glib-new.xml
===================================================================
--- archive/appstream-glib-new.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/appstream-glib-new.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/appstream-glib.xml
===================================================================
--- archive/appstream-glib.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/appstream-glib.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -23,4 +23,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/arts.xml
===================================================================
--- archive/arts.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/arts.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/ash.xml
===================================================================
--- archive/ash.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/ash.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/attr.xml
===================================================================
--- archive/attr.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/attr.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/autogen.xml
===================================================================
--- archive/autogen.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/autogen.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/avifile.xml
===================================================================
--- archive/avifile.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/avifile.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -23,4 +23,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/bazaar.xml
===================================================================
--- archive/bazaar.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/bazaar.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/bc.xml
===================================================================
--- archive/bc.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/bc.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -29,4 +29,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/blueman.xml
===================================================================
--- archive/blueman.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/blueman.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: chive/cairomm.xml
===================================================================
--- archive/cairomm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,189 +1,0 @@
-<?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 cairomm-download-http "https://www.cairographics.org/releases/cairomm-&cairomm-version;.tar.xz">
-  <!ENTITY cairomm-download-ftp  " ">
-  <!ENTITY cairomm-md5sum        "7b5c3d7ca5578f0de7d05aef756f97f1">
-  <!ENTITY cairomm-size          "568 KB">
-  <!ENTITY cairomm-buildsize     "29 MB (with tests)">
-  <!ENTITY cairomm-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="cairomm" xreflabel="Cairomm-&cairomm-version;">
-  <?dbhtml filename="cairomm.html"?>
-
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Cairomm-&cairomm-version;</title>
-
-  <indexterm zone="cairomm">
-    <primary sortas="a-Cairomm">Cairomm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Cairomm</title>
-
-    <para>
-      The <application>Cairomm</application> package provides a C++
-      interface to <application>Cairo</application>.
-    </para>
-
-    &lfs10_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cairomm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cairomm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cairomm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cairomm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cairomm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cairomm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Cairomm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cairo"/> and
-      <xref linkend="libsigc3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="boost"/> (for tests)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/cairomm"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Cairomm</title>
-
-    <para>
-      Install <application>Cairomm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir bld &amp;&amp;
-cd    bld &amp;&amp;
-
-meson --prefix=/usr       \
-      -Dbuild-tests=true  \
-      -Dboost-shared=true \
-      ..                  &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To run the test suite, run: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-Dbuild-tests=true</parameter>: This switch is for building
-      the unit tests. Remove if you have not installed <xref linkend="boost"/>.
-    </para>
-
-    <para>
-      <parameter>-Dboost-shared=true</parameter>: This switch has the package
-      use the shared version of boost libraries. It is required if you have
-      not installed the boost static libraries, and you have passed
-      <parameter>-Dbuild-tests=true</parameter>.
-    </para>
-
-    <para>
-      <option>-Dbuild-documentation=true</option>: This switch builds the
-      html documentation if doxygen is installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libcairomm-1.16.so
-        </seg>
-        <seg>
-          /usr/{lib,include}/cairomm-1.16 and
-          /usr/share/{devhelp/books,doc}/cairomm-1.16 (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libcairomm-1.16">
-        <term><filename class="libraryfile">libcairomm-1.16.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Cairo</application> API classes
-          </para>
-          <indexterm zone="cairomm libcairomm-1.16">
-            <primary sortas="c-libcairomm-1.16">libcairomm-1.16.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: archive/cargo.xml
===================================================================
--- archive/cargo.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/cargo.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -31,4 +31,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/celt051.xml
===================================================================
--- archive/celt051.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/celt051.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/check.xml
===================================================================
--- archive/check.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/check.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/chromium.xml
===================================================================
--- archive/chromium.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/chromium.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -23,4 +23,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/chrpath.xml
===================================================================
--- archive/chrpath.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/chrpath.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/colord.xml
===================================================================
--- archive/colord.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/colord.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/compressdoc.xml
===================================================================
--- archive/compressdoc.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/compressdoc.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -149,5 +150,5 @@
   See the original post from Mickael A. Peters, titled
   "Bootable Utility CD", dated 20030409.1816(+0200), and subsequent posts:
-  https://&lfs-domainname;/pipermail/blfs-support/2003-April/038817.html
+  http://&lfs-domainname;/pipermail/blfs-support/2003-April/038817.html
 
   On my system (x86, ext3), man pages were 35564KB before compression.
Index: archive/config.xml
===================================================================
--- archive/config.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/config.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/consolekit.xml
===================================================================
--- archive/consolekit.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/consolekit.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/core/akonadi.xml
===================================================================
--- archive/core/akonadi.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/core/akonadi.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/core/attica.xml
===================================================================
--- archive/core/attica.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/core/attica.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/core/automoc4.xml
===================================================================
--- archive/core/automoc4.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/core/automoc4.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/core/baloo-widgets.xml
===================================================================
--- archive/core/baloo-widgets.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/core/baloo-widgets.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/core/baloo.xml
===================================================================
--- archive/core/baloo.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/core/baloo.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/core/config.xml
===================================================================
--- archive/core/config.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/core/config.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/core/core.xml
===================================================================
--- archive/core/core.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/core/core.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
  %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="kde4-core">
Index: archive/core/kactivities.xml
===================================================================
--- archive/core/kactivities.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/core/kactivities.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/core/kde-base-artwork.xml
===================================================================
--- archive/core/kde-base-artwork.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/core/kde-base-artwork.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/core/kde-baseapps.xml
===================================================================
--- archive/core/kde-baseapps.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/core/kde-baseapps.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/core/kde-runtime.xml
===================================================================
--- archive/core/kde-runtime.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/core/kde-runtime.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/core/kde-workspace.xml
===================================================================
--- archive/core/kde-workspace.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/core/kde-workspace.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/core/kdelibs.xml
===================================================================
--- archive/core/kdelibs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/core/kdelibs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/core/kdepimlibs.xml
===================================================================
--- archive/core/kdepimlibs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/core/kdepimlibs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/core/kfilemetadata.xml
===================================================================
--- archive/core/kfilemetadata.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/core/kfilemetadata.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/core/polkit-kde-agent.xml
===================================================================
--- archive/core/polkit-kde-agent.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/core/polkit-kde-agent.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/core/pre-install-config.xml
===================================================================
--- archive/core/pre-install-config.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/core/pre-install-config.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/core/qimageblitz.xml
===================================================================
--- archive/core/qimageblitz.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/core/qimageblitz.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/courier.xml
===================================================================
--- archive/courier.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/courier.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -29,4 +29,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/curlftpfs.xml
===================================================================
--- archive/curlftpfs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/curlftpfs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/cvs.xml
===================================================================
--- archive/cvs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/cvs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/cvsserver.xml
===================================================================
--- archive/cvsserver.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/cvsserver.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -11,4 +11,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/dbus-bindings.xml
===================================================================
--- archive/dbus-bindings.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/dbus-bindings.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,4 +26,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/dejagnu.xml
===================================================================
--- archive/dejagnu.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/dejagnu.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/deprecated/deprecated.xml
===================================================================
--- archive/deprecated/deprecated.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/deprecated/deprecated.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
  %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="gnome-legacy">
Index: archive/deprecated/dummy-deprecated.xml
===================================================================
--- archive/deprecated/dummy-deprecated.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/deprecated/dummy-deprecated.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,4 +6,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/deprecated/gnome-mime-data.xml
===================================================================
--- archive/deprecated/gnome-mime-data.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/deprecated/gnome-mime-data.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/deprecated/gnome-vfs.xml
===================================================================
--- archive/deprecated/gnome-vfs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/deprecated/gnome-vfs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/deprecated/libbonobo.xml
===================================================================
--- archive/deprecated/libbonobo.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/deprecated/libbonobo.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/deprecated/libbonoboui.xml
===================================================================
--- archive/deprecated/libbonoboui.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/deprecated/libbonoboui.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/deprecated/libgnome.xml
===================================================================
--- archive/deprecated/libgnome.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/deprecated/libgnome.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/deprecated/libgnomecanvas.xml
===================================================================
--- archive/deprecated/libgnomecanvas.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/deprecated/libgnomecanvas.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/deprecated/libgnomeui.xml
===================================================================
--- archive/deprecated/libgnomeui.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/deprecated/libgnomeui.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/deprecated/orbit2.xml
===================================================================
--- archive/deprecated/orbit2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/deprecated/orbit2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/dhcp-client.xml
===================================================================
--- archive/dhcp-client.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/dhcp-client.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/dillo.xml
===================================================================
--- archive/dillo.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/dillo.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/dvb-apps.xml
===================================================================
--- archive/dvb-apps.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/dvb-apps.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/eject.xml
===================================================================
--- archive/eject.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/eject.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/ekiga.xml
===================================================================
--- archive/ekiga.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/ekiga.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/elfutils.xml
===================================================================
--- archive/elfutils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/elfutils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/esound.xml
===================================================================
--- archive/esound.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/esound.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/espgs.xml
===================================================================
--- archive/espgs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/espgs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -25,4 +25,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/etcshells.xml
===================================================================
--- archive/etcshells.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/etcshells.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/expat.xml
===================================================================
--- archive/expat.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/expat.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/expect.xml
===================================================================
--- archive/expect.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/expect.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/farsight2.xml
===================================================================
--- archive/farsight2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/farsight2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/farstream.xml
===================================================================
--- archive/farstream.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/farstream.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: chive/firewalld.xml
===================================================================
--- archive/firewalld.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,335 +1,0 @@
-<?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 firewalld-download-http "https://github.com/firewalld/firewalld/releases/download/v&firewalld-version;/firewalld-&firewalld-version;.tar.gz">
-  <!ENTITY firewalld-download-ftp  " ">
-  <!ENTITY firewalld-md5sum        "644a8970b43fcf875178ae3bec640db4">
-  <!ENTITY firewalld-size          "1.6 MB">
-  <!ENTITY firewalld-buildsize     "19 MB (additionall 2 MB for tests)">
-  <!ENTITY firewalld-time          "less than 0.1 SBU (add 6.2 SBU for tests)">
-]>
-
-<sect1 id="firewalld" xreflabel="firewalld-&firewalld-version;">
-  <?dbhtml filename="firewalld.html"?>
-
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>firewalld-&firewalld-version;</title>
-
-  <indexterm zone="firewalld">
-    <primary sortas="a-firewalld">firewalld</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to firewalld</title>
-
-    <para>
-      The <application>firewalld</application> package provides a dynamically
-      managed firewall with support for network or firewall zones to define the
-      trust level of network connections or interfaces. It has support for
-      IPv4, IPv6 firewall settings and for ethernet bridges and a separation of
-      runtime and permanent configuration options. It also provides an
-      interface for services or applications to add nftables or iptables and
-      ebtables rules directly.
-    </para>
-
-    &lfs90_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&firewalld-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&firewalld-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &firewalld-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &firewalld-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &firewalld-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &firewalld-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">firewalld Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="nftables"/>,
-      and <xref linkend="python-slip"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="DocBook"/>,
-      <xref linkend="iptables"/>, and
-      <xref linkend="libxslt"/> (for building the manual pages)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk3" role="runtime"/> (runtime only, required for
-      <application>fireall-config</application>),
-      <xref linkend="qt5" role="runtime"/> (runtime only, required for 
-      <application>fireall-applet</application>), and
-      <ulink url="https://netfilter.org/projects/ipset/index.html">ipset</ulink>
-      for ipset support (only when used with iptables)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/firewalld"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of firewalld</title>
-
-    <para>
-      Install <application>firewalld</application> by
-      running the following commands:
-    </para>
-
-<screen revision="systemd"><userinput>PYTHON=/usr/bin/python3           \
-    ./configure --sysconfdir=/etc \
-                --without-ipset   &amp;&amp;
-make</userinput></screen>
-
-<screen revision="sysv"><userinput>PYTHON=/usr/bin/python3           \
-    ./configure --sysconfdir=/etc \
-                --without-ipset   \
-                --disable-systemd &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      The testsuite for <application>firewalld</application> is very dependent
-      on the running kernel and system configuration. It requires
-      <application>ipset</application> as well as both backends, and all
-      supported kernel options available.
-    </para>
-
-    <para>
-      If the above conditions are met, run the testsuite as the
-      <systemitem class="username">root</systemitem> user with the command
-      <command>make -C src check</command>. Any test failures are likely the
-      result of an incomplete configuration. Failed tests will give a detailed
-      failure status at
-      <filename>src/test/testsuite.dir/&lt;###&gt;/testsuite.log</filename>.
-    </para>
-
-    <para revision="sysv">
-      Prevent installation of the distributed firewalld init script with the
-      following command:
-    </para>
-
-<screen revision="sysv"><userinput>sed '/^am__append_3/,+1d' -i config/Makefile</userinput></screen>
-
-    <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>
-      <parameter>--without-ipset</parameter>: This switch disables use of the
-      <command>ipset</command> utility. Omit if it is installed.
-    </para>
-
-    <para revision="sysv">
-      <parameter>--disable-systemd</parameter>: This command prevents
-      installation of <application>systemd</application> services.
-    </para>
-
-    <para>
-      <option>--without-{ip{,6},eb}tables{,-restore}</option>: These switches
-      disable <application>iptables</application> support and are required if
-      you wish to build without iptables support.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring firewalld</title>
-
-    <sect3 id="firewalld-conf">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/firewall/applet.conf</filename>,
-        <filename>/etc/firewalld/firewalld.conf</filename>,
-        and <filename>/etc/sysconfig/firewalld</filename>
-      </para>
-
-      <indexterm zone="firewalld firewalld-conf">
-        <primary sortas="e-etc-firewalld.conf">/etc/firewalld/firewalld.conf</primary>
-      </indexterm>
-
-      <para>
-        Configuration of <application>firewalld</application> is generally done
-        without modification of the above configuration files using the
-        <command>firewall-cmd</command> command. Within the above configuration
-        files you can set daemon behavior only. E.g.: whether runtime rules are
-        retained on restart, which firewall backend to use (default is
-        nftables), or whether to turn on debugging.
-      </para>
-
-      <para>
-        Detailed documentation is provided by the
-        <application>firewalld</application> developers at
-        <ulink url="https://firewalld.org/documentation/"/>.
-      </para>
-
-    </sect3>
-
-    <sect3 id="firewalld-init">
-      <title><phrase revision="sysv">Init Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">
-        If you need to run the <command>firewalld</command> daemon at system
-        startup, install the <filename>/etc/rc.d/init.d/firewalld</filename>
-        init script included in the
-        <xref linkend="bootscripts"/> package using the following command:
-      </para>
-
-      <para revision="systemd">
-        If you need to run the <command>firewalld</command> daemon at system
-        startup, enable the previously installed
-        <filename>firewalld.service</filename> unit with the following command:
-      </para>
-
-      <indexterm zone="firewalld firewalld-init">
-        <primary sortas="f-firewalld">firewalld</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-firewalld</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable firewalld</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          firewall-applet, firewall-cmd, firewall-config, firewall-offline-cmd,
-          and firewalld
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /etc/firewalld,
-          /etc/firewall,
-          /usr/lib/firewalld, and
-          /usr/lib/python-&python3-version;/site-packages/firewall
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="firewall-applet">
-        <term><command>firewall-applet</command></term>
-        <listitem>
-          <para>
-            is a tray applet using QSettings backend.
-          </para>
-          <indexterm zone="firewalld firewall-applet">
-            <primary sortas="b-firewall-applet">firwall-applet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="firewall-cmd">
-        <term><command>firewall-cmd</command></term>
-        <listitem>
-          <para>
-            is the primary command line frontend.
-          </para>
-          <indexterm zone="firewalld firewall-cmd">
-            <primary sortas="b-firewall-cmd">firewall-cmd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="firewall-config">
-        <term><command>firewall-config</command></term>
-        <listitem>
-          <para>
-            is a GUI configuration tool using GTK+-3.
-          </para>
-          <indexterm zone="firewalld firewall-config">
-            <primary sortas="b-firewall-config">firewall-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="firewall-offline-cmd">
-        <term><command>firewall-offline-cmd</command></term>
-        <listitem>
-          <para>
-            is a command line client used for permanent configuration while
-            firewalld is not running.
-          </para>
-          <indexterm zone="firewalld firewall-offline-cmd">
-            <primary sortas="b-firewall-offline-cmd">firewall-offline-cmd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="firewalld-daemon">
-        <term><command>firewalld</command></term>
-        <listitem>
-          <para>
-            is the Dynamic Firewall Manager daemon.
-          </para>
-          <indexterm zone="firewalld firewalld-daemon">
-            <primary sortas="b-firewalld">firewalld</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: archive/flashplayer.xml
===================================================================
--- archive/flashplayer.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/flashplayer.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -30,4 +30,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/freetts.xml
===================================================================
--- archive/freetts.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/freetts.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -22,4 +22,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/fuse2.xml
===================================================================
--- archive/fuse2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/fuse2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/galeon.xml
===================================================================
--- archive/galeon.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/galeon.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gamin.xml
===================================================================
--- archive/gamin.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gamin.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gcab.xml
===================================================================
--- archive/gcab.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gcab.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gcc-ada.xml
===================================================================
--- archive/gcc-ada.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gcc-ada.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -28,4 +28,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gcc-java.xml
===================================================================
--- archive/gcc-java.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gcc-java.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -23,4 +23,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/geoclue.xml
===================================================================
--- archive/geoclue.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/geoclue.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/ggz-client-libs.xml
===================================================================
--- archive/ggz-client-libs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/ggz-client-libs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gimp-print.xml
===================================================================
--- archive/gimp-print.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gimp-print.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gmime.xml
===================================================================
--- archive/gmime.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gmime.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnash.xml
===================================================================
--- archive/gnash.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnash.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnet.xml
===================================================================
--- archive/gnet.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnet.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/at-spi.xml
===================================================================
--- archive/gnome-obsolete/at-spi.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/at-spi.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/bug-buddy.xml
===================================================================
--- archive/gnome-obsolete/bug-buddy.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/bug-buddy.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/dasher.xml
===================================================================
--- archive/gnome-obsolete/dasher.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/dasher.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/deskbar-applet.xml
===================================================================
--- archive/gnome-obsolete/deskbar-applet.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/deskbar-applet.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/dummy-accessibility.xml
===================================================================
--- archive/gnome-obsolete/dummy-accessibility.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/dummy-accessibility.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,4 +6,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/eel.xml
===================================================================
--- archive/gnome-obsolete/eel.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/eel.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/gail.xml
===================================================================
--- archive/gnome-obsolete/gail.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/gail.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/gal.xml
===================================================================
--- archive/gnome-obsolete/gal.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/gal.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/gconf-editor.xml
===================================================================
--- archive/gnome-obsolete/gconf-editor.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/gconf-editor.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/ggv.xml
===================================================================
--- archive/gnome-obsolete/ggv.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/ggv.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/gnome-audio.xml
===================================================================
--- archive/gnome-obsolete/gnome-audio.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/gnome-audio.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/gnome-hicolor-icon-theme.xml
===================================================================
--- archive/gnome-obsolete/gnome-hicolor-icon-theme.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/gnome-hicolor-icon-theme.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/gnome-keyring-manager.xml
===================================================================
--- archive/gnome-obsolete/gnome-keyring-manager.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/gnome-keyring-manager.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/gnome-mag.xml
===================================================================
--- archive/gnome-obsolete/gnome-mag.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/gnome-mag.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/gnome-mount.xml
===================================================================
--- archive/gnome-obsolete/gnome-mount.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/gnome-mount.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/gnome-netstatus.xml
===================================================================
--- archive/gnome-obsolete/gnome-netstatus.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/gnome-netstatus.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/gnome-speech.xml
===================================================================
--- archive/gnome-obsolete/gnome-speech.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/gnome-speech.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/gnome-system-tools.xml
===================================================================
--- archive/gnome-obsolete/gnome-system-tools.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/gnome-system-tools.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/gnome-themes.xml
===================================================================
--- archive/gnome-obsolete/gnome-themes.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/gnome-themes.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/gnome-vfs-monikers.xml
===================================================================
--- archive/gnome-obsolete/gnome-vfs-monikers.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/gnome-vfs-monikers.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/gnome-volume-manager.xml
===================================================================
--- archive/gnome-obsolete/gnome-volume-manager.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/gnome-volume-manager.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/gnopernicus.xml
===================================================================
--- archive/gnome-obsolete/gnopernicus.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/gnopernicus.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/gok.xml
===================================================================
--- archive/gnome-obsolete/gok.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/gok.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/gpdf.xml
===================================================================
--- archive/gnome-obsolete/gpdf.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/gpdf.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/hamster-applet.xml
===================================================================
--- archive/gnome-obsolete/hamster-applet.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/hamster-applet.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/java-access-bridge.xml
===================================================================
--- archive/gnome-obsolete/java-access-bridge.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/java-access-bridge.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/libgail-gnome.xml
===================================================================
--- archive/gnome-obsolete/libgail-gnome.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/libgail-gnome.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/libgnomecups.xml
===================================================================
--- archive/gnome-obsolete/libgnomecups.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/libgnomecups.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/libgnomeprint.xml
===================================================================
--- archive/gnome-obsolete/libgnomeprint.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/libgnomeprint.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/libgnomeprintui.xml
===================================================================
--- archive/gnome-obsolete/libgnomeprintui.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/libgnomeprintui.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/liboobs.xml
===================================================================
--- archive/gnome-obsolete/liboobs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/liboobs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/nautilus-cd-burner.xml
===================================================================
--- archive/gnome-obsolete/nautilus-cd-burner.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/nautilus-cd-burner.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/nautilus-media.xml
===================================================================
--- archive/gnome-obsolete/nautilus-media.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/nautilus-media.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -15,4 +15,5 @@
 <sect1 id="nautilus-media" xreflabel="Nautilus Media-&nautilus-media-version;">
 <sect1info>
+<othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
Index: archive/gnome-obsolete/seahorse-plugins.xml
===================================================================
--- archive/gnome-obsolete/seahorse-plugins.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/seahorse-plugins.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-obsolete/system-tools-backends.xml
===================================================================
--- archive/gnome-obsolete/system-tools-backends.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-obsolete/system-tools-backends.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome-tweak-tool.xml
===================================================================
--- archive/gnome-tweak-tool.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome-tweak-tool.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/accerciser.xml
===================================================================
--- archive/gnome/accerciser.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/accerciser.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/aisleriot.xml
===================================================================
--- archive/gnome/aisleriot.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/aisleriot.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/alacarte.xml
===================================================================
--- archive/gnome/alacarte.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/alacarte.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/anjuta.xml
===================================================================
--- archive/gnome/anjuta.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/anjuta.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/cantarell-fonts.xml
===================================================================
--- archive/gnome/cantarell-fonts.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/cantarell-fonts.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/caribou-new.xml
===================================================================
--- archive/gnome/caribou-new.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/caribou-new.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/caribou.xml
===================================================================
--- archive/gnome/caribou.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/caribou.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/colord-gtk.xml
===================================================================
--- archive/gnome/colord-gtk.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/colord-gtk.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/devhelp.xml
===================================================================
--- archive/gnome/devhelp.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/devhelp.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/dummy-additional.xml
===================================================================
--- archive/gnome/dummy-additional.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/dummy-additional.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,4 +6,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/dummy-applications.xml
===================================================================
--- archive/gnome/dummy-applications.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/dummy-applications.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,4 +6,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/dummy-desktop.xml
===================================================================
--- archive/gnome/dummy-desktop.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/dummy-desktop.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,4 +6,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/dummy-other.xml
===================================================================
--- archive/gnome/dummy-other.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/dummy-other.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,4 +6,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/dummy-runtime.xml
===================================================================
--- archive/gnome/dummy-runtime.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/dummy-runtime.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,4 +6,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/dummy-services.xml
===================================================================
--- archive/gnome/dummy-services.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/dummy-services.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,4 +6,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/empathy.xml
===================================================================
--- archive/gnome/empathy.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/empathy.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/epiphany-extensions.xml
===================================================================
--- archive/gnome/epiphany-extensions.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/epiphany-extensions.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/evolution-data-server.xml
===================================================================
--- archive/gnome/evolution-data-server.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/evolution-data-server.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -20,4 +20,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/evolution.xml
===================================================================
--- archive/gnome/evolution.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/evolution.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/folks.xml
===================================================================
--- archive/gnome/folks.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/folks.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gdl.xml
===================================================================
--- archive/gnome/gdl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gdl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gdlmm.xml
===================================================================
--- archive/gnome/gdlmm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gdlmm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gdm.xml
===================================================================
--- archive/gnome/gdm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gdm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/geocode-glib.xml
===================================================================
--- archive/gnome/geocode-glib.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/geocode-glib.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/ghex.xml
===================================================================
--- archive/gnome/ghex.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/ghex.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/glade.xml
===================================================================
--- archive/gnome/glade.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/glade.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-applets.xml
===================================================================
--- archive/gnome/gnome-applets.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-applets.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-backgrounds.xml
===================================================================
--- archive/gnome/gnome-backgrounds.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-backgrounds.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-bluetooth.xml
===================================================================
--- archive/gnome/gnome-bluetooth.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-bluetooth.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-boxes.xml
===================================================================
--- archive/gnome/gnome-boxes.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-boxes.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-color-manager.xml
===================================================================
--- archive/gnome/gnome-color-manager.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-color-manager.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-contacts.xml
===================================================================
--- archive/gnome/gnome-contacts.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-contacts.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-control-center.xml
===================================================================
--- archive/gnome/gnome-control-center.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-control-center.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-dbus-python.xml
===================================================================
--- archive/gnome/gnome-dbus-python.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-dbus-python.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-desktop-file-utils.xml
===================================================================
--- archive/gnome/gnome-desktop-file-utils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-desktop-file-utils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-devel-docs.xml
===================================================================
--- archive/gnome/gnome-devel-docs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-devel-docs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-dictionary.xml
===================================================================
--- archive/gnome/gnome-dictionary.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-dictionary.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-disk-utility.xml
===================================================================
--- archive/gnome/gnome-disk-utility.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-disk-utility.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-doc-utils.xml
===================================================================
--- archive/gnome/gnome-doc-utils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-doc-utils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-documents.xml
===================================================================
--- archive/gnome/gnome-documents.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-documents.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-font-viewer.xml
===================================================================
--- archive/gnome/gnome-font-viewer.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-font-viewer.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-games.xml
===================================================================
--- archive/gnome/gnome-games.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-games.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-gvfs.xml
===================================================================
--- archive/gnome/gnome-gvfs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-gvfs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-intro.xml
===================================================================
--- archive/gnome/gnome-intro.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-intro.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <partintro>
Index: archive/gnome/gnome-js-common.xml
===================================================================
--- archive/gnome/gnome-js-common.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-js-common.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-media.xml
===================================================================
--- archive/gnome/gnome-media.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-media.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-menus.xml
===================================================================
--- archive/gnome/gnome-menus.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-menus.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-online-accounts.xml
===================================================================
--- archive/gnome/gnome-online-accounts.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-online-accounts.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-panel.xml
===================================================================
--- archive/gnome/gnome-panel.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-panel.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-power-manager.xml
===================================================================
--- archive/gnome/gnome-power-manager.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-power-manager.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-screensaver.xml
===================================================================
--- archive/gnome/gnome-screensaver.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-screensaver.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-search-tool.xml
===================================================================
--- archive/gnome/gnome-search-tool.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-search-tool.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-session.xml
===================================================================
--- archive/gnome/gnome-session.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-session.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-settings-daemon.xml
===================================================================
--- archive/gnome/gnome-settings-daemon.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-settings-daemon.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-shared-mime-info.xml
===================================================================
--- archive/gnome/gnome-shared-mime-info.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-shared-mime-info.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-shell.xml
===================================================================
--- archive/gnome/gnome-shell.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-shell.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-system-log.xml
===================================================================
--- archive/gnome/gnome-system-log.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-system-log.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-tweak-tool.xml
===================================================================
--- archive/gnome/gnome-tweak-tool.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-tweak-tool.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-user-docs.xml
===================================================================
--- archive/gnome/gnome-user-docs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-user-docs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gnome-user-share.xml
===================================================================
--- archive/gnome/gnome-user-share.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gnome-user-share.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/grilo-plugins.xml
===================================================================
--- archive/gnome/grilo-plugins.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/grilo-plugins.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/grilo.xml
===================================================================
--- archive/gnome/grilo.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/grilo.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gssdp.xml
===================================================================
--- archive/gnome/gssdp.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gssdp.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gtk-vnc.xml
===================================================================
--- archive/gnome/gtk-vnc.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gtk-vnc.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gtkhtml.xml
===================================================================
--- archive/gnome/gtkhtml.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gtkhtml.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gtksourceviewmm.xml
===================================================================
--- archive/gnome/gtksourceviewmm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gtksourceviewmm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gupnp-av.xml
===================================================================
--- archive/gnome/gupnp-av.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gupnp-av.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gupnp-dlna.xml
===================================================================
--- archive/gnome/gupnp-dlna.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gupnp-dlna.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gupnp-vala.xml
===================================================================
--- archive/gnome/gupnp-vala.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gupnp-vala.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/gupnp.xml
===================================================================
--- archive/gnome/gupnp.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/gupnp.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/libchamplain.xml
===================================================================
--- archive/gnome/libchamplain.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/libchamplain.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/libgda.xml
===================================================================
--- archive/gnome/libgda.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/libgda.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/libgdata.xml
===================================================================
--- archive/gnome/libgdata.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/libgdata.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/libgnomekbd.xml
===================================================================
--- archive/gnome/libgnomekbd.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/libgnomekbd.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/libgweather.xml
===================================================================
--- archive/gnome/libgweather.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/libgweather.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/libgxps.xml
===================================================================
--- archive/gnome/libgxps.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/libgxps.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/liboauth.xml
===================================================================
--- archive/gnome/liboauth.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/liboauth.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/libpwquality.xml
===================================================================
--- archive/gnome/libpwquality.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/libpwquality.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/librest.xml
===================================================================
--- archive/gnome/librest.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/librest.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/libunique3.xml
===================================================================
--- archive/gnome/libunique3.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/libunique3.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/libwacom.xml
===================================================================
--- archive/gnome/libwacom.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/libwacom.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/metacity.xml
===================================================================
--- archive/gnome/metacity.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/metacity.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/mobile-broadband-provider-info.xml
===================================================================
--- archive/gnome/mobile-broadband-provider-info.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/mobile-broadband-provider-info.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/mousetweaks.xml
===================================================================
--- archive/gnome/mousetweaks.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/mousetweaks.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/mutter.xml
===================================================================
--- archive/gnome/mutter.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/mutter.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/nautilus-sendto.xml
===================================================================
--- archive/gnome/nautilus-sendto.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/nautilus-sendto.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/nemiver.xml
===================================================================
--- archive/gnome/nemiver.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/nemiver.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/orca.xml
===================================================================
--- archive/gnome/orca.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/orca.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/rygel.xml
===================================================================
--- archive/gnome/rygel.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/rygel.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/seed.xml
===================================================================
--- archive/gnome/seed.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/seed.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/sound-juicer.xml
===================================================================
--- archive/gnome/sound-juicer.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/sound-juicer.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/sushi.xml
===================================================================
--- archive/gnome/sushi.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/sushi.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/telepathy-farstream.xml
===================================================================
--- archive/gnome/telepathy-farstream.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/telepathy-farstream.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/telepathy-glib.xml
===================================================================
--- archive/gnome/telepathy-glib.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/telepathy-glib.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/telepathy-logger.xml
===================================================================
--- archive/gnome/telepathy-logger.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/telepathy-logger.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/telepathy-mission-control.xml
===================================================================
--- archive/gnome/telepathy-mission-control.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/telepathy-mission-control.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/totem.xml
===================================================================
--- archive/gnome/totem.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/totem.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: chive/gnome/tracker-miners.xml
===================================================================
--- archive/gnome/tracker-miners.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,181 +1,0 @@
-<?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 tracker-miners-download-http "&gnome-download-http;/tracker-miners/2.3/tracker-miners-&tracker-miners-version;.tar.xz">
-  <!ENTITY tracker-miners-download-ftp  "&gnome-download-ftp;/tracker-miners/2.3/tracker-miners-&tracker-miners-version;.tar.xz">
-  <!ENTITY tracker-miners-md5sum        "0bbcab133ed33ccbf65923020f99e1cc">
-  <!ENTITY tracker-miners-size          "3.0 MB">
-  <!ENTITY tracker-miners-buildsize     "28 MB (with tests)">
-  <!ENTITY tracker-miners-time          "1.0 SBU (with tests)">
-]>
-
-<sect1 id="tracker-miners" xreflabel="tracker-miners-&tracker-miners-version;">
-  <?dbhtml filename="tracker-miners.html"?>
-
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Tracker-miners-&tracker-miners-version;</title>
-
-  <indexterm zone="tracker-miners">
-    <primary sortas="a-tracker-miners">tracker-miners</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Tracker-miners</title>
-
-    <para>
-      The <application>Tracker-miners</application> package contains a set of
-      data extractors for Tracker.
-    </para>
-
-    &lfs101_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&tracker-miners-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&tracker-miners-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &tracker-miners-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &tracker-miners-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &tracker-miners-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &tracker-miners-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-           
-    <bridgehead renderas="sect3">Tracker-miners Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gst10-plugins-base"/>,
-      <xref linkend="tracker"/>,
-      <xref linkend="exempi"/>, and
-      <xref linkend="gexiv2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="ffmpeg"/>,
-      <xref linkend="flac"/>,
-      <xref linkend="giflib"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="libexif"/>,
-      <xref linkend="libgrss"/>,
-      <xref linkend="libgxps"/>, and
-      <xref linkend="poppler"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cmake"/>,
-      <xref linkend="dconf"/>,
-      <xref linkend="libgsf"/>,
-      <xref linkend="libseccomp"/>,
-      <xref linkend="taglib"/>,
-      <xref linkend="totem-pl-parser"/>,
-      <xref linkend="upower"/>,
-      <ulink url="https://github.com/lipnitsk/libcue">libcue</ulink>,
-      <ulink url="https://libosinfo.org">libosinfo</ulink>, and
-      <ulink url="https://gitlab.gnome.org/GNOME/gupnp">gupnp</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/tracker-miners"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tracker-miners</title>
-
-    <para>
-      Install <application>Tracker-miners</application> by running the following
-      commands:
-    </para>
-
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson --prefix=/usr .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, as the <systemitem class="username">root</systemitem>
-      user, issue: <command>ninja test</command>.
-      Eight tests, test-image-1, 300-miner-basic-ops, 310-fts-basic,
-      310-fts-basic, 311-fts-file-operations, 401-extractor-flac-cuesheet,
-      500-writeback-images, 501-writeback-image-details, and
-      502-writeback-audio are known to fail due to internal test
-      suite problems.
-      <!--Two tests, test-image-1 and functional-401-extractor-flac-cuesheet, 
-      are known to fail.-->
-      <!-- flac cuesheet is due to libcue not being installed. -->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-Dminer_rss=false</option>: Use this option if you have not
-      installed the recommended dependency libgrss.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libtracker-extract.so, and
-          several modules under /usr/lib/tracker-miners-2.0.
-        </seg>
-        <seg>
-          /usr/lib/tracker-miners-2.0 and
-          /usr/share/tracker-miners
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-  </sect2>
-
-</sect1>
Index: archive/gnome/tracker.xml
===================================================================
--- archive/gnome/tracker.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/tracker.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: chive/gnome/tracker2.xml
===================================================================
--- archive/gnome/tracker2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,228 +1,0 @@
-<?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 tracker-download-http
-           "&gnome-download-http;/tracker/2.3/tracker-&tracker-version;.tar.xz">
-  <!ENTITY tracker-download-ftp
-           "&gnome-download-ftp;/tracker/2.3/tracker-&tracker-version;.tar.xz">
-  <!ENTITY tracker-md5sum        "f3c8baac2a3089f1c7af1dcb00547c97">
-  <!ENTITY tracker-size          "1.5 MB">
-  <!ENTITY tracker-buildsize     "262 MB (with tests)">
-  <!ENTITY tracker-time          "1.3 SBU (with tests)">
-]>
-
-<!-- Tracker2 + Tracker-Miners2 is needed for Brasero.
-     For Brasero, look for BRASERO_SEARCH in the configure output. -->
-
-<sect1 id="tracker" xreflabel="Tracker-&tracker-version;">
-  <?dbhtml filename="tracker.html"?>
-
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Tracker-&tracker-version;</title>
-
-  <indexterm zone="tracker">
-    <primary sortas="a-Tracker">Tracker</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Tracker</title>
-
-    <para>
-      <application>Tracker</application> is the file indexing and search
-      provider used in the <application>GNOME</application> desktop environment.
-    </para>
-
-    &lfs101_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&tracker-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&tracker-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &tracker-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &tracker-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &tracker-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &tracker-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Tracker Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="json-glib"/>,
-      <xref linkend="libseccomp"/>,
-      <xref linkend="libsoup"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="NetworkManager"/>,
-      <xref linkend="sqlite"/>, and
-      <xref linkend="upower"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <ulink url="https://github.com/scop/bash-completion/">bash-completion</ulink>, and
-      <ulink url="https://github.com/snowballstem/snowball/">libstemmer</ulink>
-      <!-- Python2 used to be a dependency until 2.2.1 -->
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/tracker"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tracker</title>
-
-    <para>
-      Install <application>Tracker</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson --prefix=/usr .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>. The tests
-      should be run from a graphical session. The test named steroids may
-      get skipped and cause Meson to report that the tests failed.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-    <para>
-      <command>glib-compile-schemas ...</command>:  Compiles the settings
-      schema installed by this package to prevent a runtime error in
-      tracker-store.
-    </para>
-  </sect2>
--->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          tracker
-        </seg>
-        <seg>
-          libtracker-control-2.0.so, libtracker-miner-2.0.so, and 
-          libtracker-sparql-2.0.so
-        </seg>
-        <seg>
-          /usr/{include,lib}/tracker-2.0, /usr/share/tracker, and
-          /usr/share/gtk-doc/libtracker-{control,miner,sparql}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tracker-prog">
-        <term><command>tracker</command></term>
-        <listitem>
-          <para>
-            is a control program for the indexer
-          </para>
-          <indexterm zone="tracker tracker-prog">
-            <primary sortas="b-tracker">tracker</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtracker-control">
-        <term><filename class="libraryfile">libtracker-control-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains control and monitoring functions for miners
-          </para>
-          <indexterm zone="tracker libtracker-control">
-            <primary sortas="c-libtracker-control">libtracker-control-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtracker-miner">
-        <term><filename class="libraryfile">libtracker-miner-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains data mining functions
-          </para>
-          <indexterm zone="tracker libtracker-miner">
-            <primary sortas="c-libtracker-miner">libtracker-miner-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtracker-sparql">
-        <term><filename class="libraryfile">libtracker-sparql-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains resource management and database functions
-          </para>
-          <indexterm zone="tracker libtracker-sparql">
-            <primary sortas="c-libtracker-sparql">libtracker-sparql-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: archive/gnome/vinagre.xml
===================================================================
--- archive/gnome/vinagre.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/vinagre.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/vino.xml
===================================================================
--- archive/gnome/vino.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/vino.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/yelp-tools.xml
===================================================================
--- archive/gnome/yelp-tools.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/yelp-tools.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnome/zenity.xml
===================================================================
--- archive/gnome/zenity.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnome/zenity.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnucash.xml
===================================================================
--- archive/gnucash.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnucash.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,4 +26,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gnupg.xml
===================================================================
--- archive/gnupg.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gnupg.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/goffice.xml
===================================================================
--- archive/goffice.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/goffice.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gperf.xml
===================================================================
--- archive/gperf.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gperf.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gst-ffmpeg.xml
===================================================================
--- archive/gst-ffmpeg.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gst-ffmpeg.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gst-plugins-bad.xml
===================================================================
--- archive/gst-plugins-bad.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gst-plugins-bad.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gst-plugins-base.xml
===================================================================
--- archive/gst-plugins-base.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gst-plugins-base.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gst-plugins-good.xml
===================================================================
--- archive/gst-plugins-good.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gst-plugins-good.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gst-plugins-ugly.xml
===================================================================
--- archive/gst-plugins-ugly.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gst-plugins-ugly.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gstreamer.xml
===================================================================
--- archive/gstreamer.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gstreamer.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gsview.xml
===================================================================
--- archive/gsview.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gsview.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gtk-xfce-engine.xml
===================================================================
--- archive/gtk-xfce-engine.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gtk-xfce-engine.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gtkhtml.xml
===================================================================
--- archive/gtkhtml.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gtkhtml.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gtksourceview2.xml
===================================================================
--- archive/gtksourceview2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gtksourceview2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gvolwheel.xml
===================================================================
--- archive/gvolwheel.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gvolwheel.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/gwrap.xml
===================================================================
--- archive/gwrap.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/gwrap.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/hal.xml
===================================================================
--- archive/hal.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/hal.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -23,4 +23,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/hdwids.xml
===================================================================
--- archive/hdwids.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/hdwids.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/heimdal.xml
===================================================================
--- archive/heimdal.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/heimdal.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/ibus.xml
===================================================================
--- archive/ibus.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/ibus.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/icedtea-sound.xml
===================================================================
--- archive/icedtea-sound.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/icedtea-sound.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/icedtea-web.xml
===================================================================
--- archive/icedtea-web.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/icedtea-web.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/ijs.xml
===================================================================
--- archive/ijs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/ijs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/imagemagick6.xml
===================================================================
--- archive/imagemagick6.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/imagemagick6.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -62,4 +62,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/inetutils.xml
===================================================================
--- archive/inetutils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/inetutils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/initdtools.xml
===================================================================
--- archive/initdtools.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/initdtools.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -16,4 +16,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/inputrc.xml
===================================================================
--- archive/inputrc.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/inputrc.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/intltool.xml
===================================================================
--- archive/intltool.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/intltool.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/ispell.xml
===================================================================
--- archive/ispell.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/ispell.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -29,4 +29,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/jadetex.xml
===================================================================
--- archive/jadetex.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/jadetex.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/jdk.SAVE
===================================================================
--- archive/jdk.SAVE	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/jdk.SAVE	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -34,5 +34,6 @@
 
   <sect1info>
-    <date>$Date$</date>
+    <othername>$LastChangedBy: randy $</othername>
+    <date>$Date: 2008-05-10 13:50:47 -0500 (Sat, 10 May 2008) $</date>
   </sect1info>
 
Index: archive/jdk.xml
===================================================================
--- archive/jdk.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/jdk.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/js.xml
===================================================================
--- archive/js.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/js.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/js2.xml
===================================================================
--- archive/js2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/js2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/js38.xml
===================================================================
--- archive/js38.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/js38.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/js52.xml
===================================================================
--- archive/js52.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/js52.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/js60.xml
===================================================================
--- archive/js60.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/js60.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/js68.xml
===================================================================
--- archive/js68.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/js68.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/juffed.xml
===================================================================
--- archive/juffed.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/juffed.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/junit.xml
===================================================================
--- archive/junit.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/junit.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde-apidocs-xinclude.xml
===================================================================
--- archive/kde-apidocs-xinclude.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde-apidocs-xinclude.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -2,4 +2,7 @@
 <!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
+
+    <!-- $LastChangedBy$
+         $Date$ -->
 
 <note>
Index: archive/kde-sysconfdir-xinclude.xml
===================================================================
--- archive/kde-sysconfdir-xinclude.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde-sysconfdir-xinclude.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -2,4 +2,7 @@
 <!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
+
+    <!-- $LastChangedBy$
+         $Date$ -->
 
 <note>
Index: archive/kde/add/add.xml
===================================================================
--- archive/kde/add/add.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/add/add.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="kde-add">
Index: archive/kde/add/kde-i18n.xml
===================================================================
--- archive/kde/add/kde-i18n.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/add/kde-i18n.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde/add/kdeaccessibility.xml
===================================================================
--- archive/kde/add/kdeaccessibility.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/add/kdeaccessibility.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -16,4 +16,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde/add/kdeaddons.xml
===================================================================
--- archive/kde/add/kdeaddons.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/add/kdeaddons.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -16,4 +16,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde/add/kdeadmin.xml
===================================================================
--- archive/kde/add/kdeadmin.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/add/kdeadmin.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -16,4 +16,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde/add/kdeakode.xml
===================================================================
--- archive/kde/add/kdeakode.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/add/kdeakode.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde/add/kdeartwork.xml
===================================================================
--- archive/kde/add/kdeartwork.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/add/kdeartwork.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -16,4 +16,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde/add/kdeedu.xml
===================================================================
--- archive/kde/add/kdeedu.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/add/kdeedu.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -16,4 +16,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde/add/kdegames.xml
===================================================================
--- archive/kde/add/kdegames.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/add/kdegames.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -16,4 +16,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde/add/kdegraphics.xml
===================================================================
--- archive/kde/add/kdegraphics.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/add/kdegraphics.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -16,4 +16,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde/add/kdemultimedia.xml
===================================================================
--- archive/kde/add/kdemultimedia.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/add/kdemultimedia.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde/add/kdenetwork.xml
===================================================================
--- archive/kde/add/kdenetwork.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/add/kdenetwork.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -16,4 +16,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde/add/kdepim.xml
===================================================================
--- archive/kde/add/kdepim.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/add/kdepim.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -16,4 +16,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde/add/kdetoys.xml
===================================================================
--- archive/kde/add/kdetoys.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/add/kdetoys.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -16,4 +16,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde/add/kdeutils.xml
===================================================================
--- archive/kde/add/kdeutils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/add/kdeutils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -16,4 +16,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde/core/arts.xml
===================================================================
--- archive/kde/core/arts.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/core/arts.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde/core/config.xml
===================================================================
--- archive/kde/core/config.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/core/config.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde/core/core.xml
===================================================================
--- archive/kde/core/core.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/core/core.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="kde-core">
Index: archive/kde/core/kdebase.xml
===================================================================
--- archive/kde/core/kdebase.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/core/kdebase.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde/core/kdelibs.xml
===================================================================
--- archive/kde/core/kdelibs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/core/kdelibs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde/core/pre-install-config.xml
===================================================================
--- archive/kde/core/pre-install-config.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/core/pre-install-config.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde/core/tqtinterface.xml
===================================================================
--- archive/kde/core/tqtinterface.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/core/tqtinterface.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde/devel/devel.xml
===================================================================
--- archive/kde/devel/devel.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/devel/devel.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="kde-devel">
Index: archive/kde/devel/kdebindings.xml
===================================================================
--- archive/kde/devel/kdebindings.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/devel/kdebindings.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -16,4 +16,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde/devel/kdesdk.xml
===================================================================
--- archive/kde/devel/kdesdk.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/devel/kdesdk.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -16,4 +16,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde/devel/kdevelop.xml
===================================================================
--- archive/kde/devel/kdevelop.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/devel/kdevelop.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -16,4 +16,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde/devel/kdewebdev.xml
===================================================================
--- archive/kde/devel/kdewebdev.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/devel/kdewebdev.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -16,4 +16,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/kde/kde-intro.xml
===================================================================
--- archive/kde/kde-intro.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/kde-intro.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <partintro>
Index: archive/kde/kde.xml
===================================================================
--- archive/kde/kde.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/kde/kde.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
  %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <part id="kde" xreflabel="Trinity/KDE3">
Index: archive/konq.xml
===================================================================
--- archive/konq.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/konq.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/ksh.xml
===================================================================
--- archive/ksh.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/ksh.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -23,4 +23,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/leafnode.xml
===================================================================
--- archive/leafnode.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/leafnode.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lesstif.xml
===================================================================
--- archive/lesstif.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lesstif.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -30,5 +31,5 @@
 
     <para>The <application>LessTif</application> package contains an Open
-    Source version of <application>OSF/Motif</application>.</para>
+    Source version of <application>OSF/Motif®</application>.</para>
 
     &lfs65_checked;
@@ -307,5 +308,5 @@
         <term><filename class='libraryfile'>libXm.so</filename></term>
         <listitem>
-          <para>is an <application>OSF/Motif</application> source code
+          <para>is an <application>OSF/Motif®</application> source code
           compatible library for the <application>X Window
           System</application>. You can download an excellent reference
Index: archive/libXp.xml
===================================================================
--- archive/libXp.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libXp.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libart_lgpl.xml
===================================================================
--- archive/libart_lgpl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libart_lgpl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libcroco.xml
===================================================================
--- archive/libcroco.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libcroco.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libelf.xml
===================================================================
--- archive/libelf.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libelf.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libesmtp.xml
===================================================================
--- archive/libesmtp.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libesmtp.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libfame.xml
===================================================================
--- archive/libfame.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libfame.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libffi.xml
===================================================================
--- archive/libffi.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libffi.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libgee.xml
===================================================================
--- archive/libgee.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libgee.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libggz.xml
===================================================================
--- archive/libggz.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libggz.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libgnome-keyring.xml
===================================================================
--- archive/libgnome-keyring.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libgnome-keyring.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libgtkhtml.xml
===================================================================
--- archive/libgtkhtml.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libgtkhtml.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libhandy.xml
===================================================================
--- archive/libhandy.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libhandy.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libidl.xml
===================================================================
--- archive/libidl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libidl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libjpeg.xml
===================================================================
--- archive/libjpeg.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libjpeg.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+  <othername>$LastChangedBy$</othername>
   <date>$Date$</date>
   </sect1info>
Index: archive/libmikmod.xml
===================================================================
--- archive/libmikmod.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libmikmod.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -29,4 +29,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libmpeg3.xml
===================================================================
--- archive/libmpeg3.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libmpeg3.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libmusicbrainz3.xml
===================================================================
--- archive/libmusicbrainz3.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libmusicbrainz3.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: chive/libnfsidmap.xml
===================================================================
--- archive/libnfsidmap.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,170 +1,0 @@
-<?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;
-
-  <!-- official upstream is at http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/
-       but doesn't contain 0.26. -->
-  <!ENTITY libnfsidmap-download-http "https://fedorapeople.org/~steved/libnfsidmap/&libnfsidmap-version;/libnfsidmap-&libnfsidmap-version;.tar.bz2">
-  <!ENTITY libnfsidmap-download-ftp  " ">
-  <!ENTITY libnfsidmap-md5sum        "2c0cf0e2b1665d51fa9a783679494888">
-  <!ENTITY libnfsidmap-size          "260 KB">
-  <!ENTITY libnfsidmap-buildsize     "3.3 MB">
-  <!ENTITY libnfsidmap-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libnfsidmap" xreflabel="libnfsidmap-&libnfsidmap-version;">
-  <?dbhtml filename="libnfsidmap.html"?>
-
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libnfsidmap-&libnfsidmap-version;</title>
-
-  <indexterm zone="libnfsidmap">
-    <primary sortas="a-libnfsidmap">libnfsidmap</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libnfsidmap</title>
-
-    <para>
-      The <application>libnfsidmap</application> package contains a
-      library to help with mapping id's, mainly for NFSv4.
-    </para>
-
-    &lfs10_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libnfsidmap-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libnfsidmap-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libnfsidmap-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libnfsidmap-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libnfsidmap-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libnfsidmap-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libnfsidmap Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="openldap"/> (client only)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/libnfsidmap"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libnfsidmap</title>
-
-    <para>
-      Install <application>libnfsidmap</application> by running the following
-      commands:
-    </para>
-
-<!-- sysconfdir=/etc is used because the config file /etc/idmapd.conf
-     is installed by nfs-utils -->
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --disable-static  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a testsuite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install                         &amp;&amp;
-mv -v /usr/lib/libnfsidmap.so.* /lib &amp;&amp;
-ln -sfv ../../lib/$(readlink /usr/lib/libnfsidmap.so) /usr/lib/libnfsidmap.so</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"/>
-
-    <para>
-      <command>mv -v /usr/lib/libnfsidmap.so.* ...</command>: Move shared
-      libraries into /lib so they are available before /usr is mounted.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libnfsidmap.so
-        </seg>
-        <seg>
-          /usr/lib/libnfsidmap
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libnfsidmap-lib">
-        <term><filename class="libraryfile">libnfsidmap.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libnfsidmap</application> API functions.
-          </para>
-          <indexterm zone="libnfsidmap libnfsidmap-lib">
-            <primary sortas="c-libnfsidmap">libnfsidmap.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: archive/libnftnl.xml
===================================================================
--- archive/libnftnl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libnftnl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libnice.xml
===================================================================
--- archive/libnice.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libnice.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/liboil.xml
===================================================================
--- archive/liboil.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/liboil.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libosinfo.xml
===================================================================
--- archive/libosinfo.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libosinfo.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libproxy.xml
===================================================================
--- archive/libproxy.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libproxy.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libsexy.xml
===================================================================
--- archive/libsexy.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libsexy.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libusb-compat.xml
===================================================================
--- archive/libusb-compat.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libusb-compat.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libvirt-glib.xml
===================================================================
--- archive/libvirt-glib.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libvirt-glib.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libvirt.xml
===================================================================
--- archive/libvirt.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libvirt.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libxfcegui4.xml
===================================================================
--- archive/libxfcegui4.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libxfcegui4.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libzeitgeist-2019.xml
===================================================================
--- archive/libzeitgeist-2019.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libzeitgeist-2019.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/libzeitgeist.xml
===================================================================
--- archive/libzeitgeist.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/libzeitgeist.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/llvm3.xml
===================================================================
--- archive/llvm3.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/llvm3.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lprng.xml
===================================================================
--- archive/lprng.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lprng.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lsb-release.xml
===================================================================
--- archive/lsb-release.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lsb-release.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxde/lxpolkit.xml
===================================================================
--- archive/lxde/lxpolkit.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxde/lxpolkit.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt-old/desktop/liblxqt-mount.xml
===================================================================
--- archive/lxqt-old/desktop/liblxqt-mount.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt-old/desktop/liblxqt-mount.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/apps/apps.xml
===================================================================
--- archive/lxqt/apps/apps.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/apps/apps.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="lxqt-apps">
Index: archive/lxqt/apps/lximage-qt.xml
===================================================================
--- archive/lxqt/apps/lximage-qt.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/apps/lximage-qt.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/apps/obconf-qt.xml
===================================================================
--- archive/lxqt/apps/obconf-qt.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/apps/obconf-qt.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/apps/pavucontrol-qt.xml
===================================================================
--- archive/lxqt/apps/pavucontrol-qt.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/apps/pavucontrol-qt.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/apps/qterminal.xml
===================================================================
--- archive/lxqt/apps/qterminal.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/apps/qterminal.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/apps/qtermwidget.xml
===================================================================
--- archive/lxqt/apps/qtermwidget.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/apps/qtermwidget.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/desktop.xml
===================================================================
--- archive/lxqt/desktop/desktop.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/desktop.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="lxqt-desktop">
Index: archive/lxqt/desktop/libfm-qt.xml
===================================================================
--- archive/lxqt/desktop/libfm-qt.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/libfm-qt.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/liblxqt.xml
===================================================================
--- archive/lxqt/desktop/liblxqt.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/liblxqt.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/libqtxdg.xml
===================================================================
--- archive/lxqt/desktop/libqtxdg.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/libqtxdg.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/libsysstat.xml
===================================================================
--- archive/lxqt/desktop/libsysstat.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/libsysstat.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/lxqt-about.xml
===================================================================
--- archive/lxqt/desktop/lxqt-about.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/lxqt-about.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/lxqt-admin.xml
===================================================================
--- archive/lxqt/desktop/lxqt-admin.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/lxqt-admin.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/lxqt-build-tools.xml
===================================================================
--- archive/lxqt/desktop/lxqt-build-tools.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/lxqt-build-tools.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/lxqt-config.xml
===================================================================
--- archive/lxqt/desktop/lxqt-config.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/lxqt-config.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/lxqt-globalkeys.xml
===================================================================
--- archive/lxqt/desktop/lxqt-globalkeys.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/lxqt-globalkeys.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/lxqt-kguiaddons.xml
===================================================================
--- archive/lxqt/desktop/lxqt-kguiaddons.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/lxqt-kguiaddons.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/lxqt-kidletime.xml
===================================================================
--- archive/lxqt/desktop/lxqt-kidletime.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/lxqt-kidletime.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/lxqt-kwayland.xml
===================================================================
--- archive/lxqt/desktop/lxqt-kwayland.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/lxqt-kwayland.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/lxqt-kwindowsystem.xml
===================================================================
--- archive/lxqt/desktop/lxqt-kwindowsystem.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/lxqt-kwindowsystem.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/lxqt-l10n.xml
===================================================================
--- archive/lxqt/desktop/lxqt-l10n.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/lxqt-l10n.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/lxqt-libkscreen.xml
===================================================================
--- archive/lxqt/desktop/lxqt-libkscreen.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/lxqt-libkscreen.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/lxqt-notificationd.xml
===================================================================
--- archive/lxqt/desktop/lxqt-notificationd.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/lxqt-notificationd.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/lxqt-panel.xml
===================================================================
--- archive/lxqt/desktop/lxqt-panel.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/lxqt-panel.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/lxqt-policykit.xml
===================================================================
--- archive/lxqt/desktop/lxqt-policykit.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/lxqt-policykit.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/lxqt-powermanagement.xml
===================================================================
--- archive/lxqt/desktop/lxqt-powermanagement.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/lxqt-powermanagement.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/lxqt-qtplugin.xml
===================================================================
--- archive/lxqt/desktop/lxqt-qtplugin.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/lxqt-qtplugin.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/lxqt-runner.xml
===================================================================
--- archive/lxqt/desktop/lxqt-runner.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/lxqt-runner.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/lxqt-session.xml
===================================================================
--- archive/lxqt/desktop/lxqt-session.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/lxqt-session.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/lxqt-solid.xml
===================================================================
--- archive/lxqt/desktop/lxqt-solid.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/lxqt-solid.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/lxqt-themes.xml
===================================================================
--- archive/lxqt/desktop/lxqt-themes.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/lxqt-themes.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,5 +21,6 @@
 
   <sect1info>
-    <date>$Date$</date>
+    <othername>$LastChangedBy: pierre $</othername>
+    <date>$Date: 2017-09-15 18:43:01 +0200 (ven. 15 sept. 2017) $</date>
   </sect1info>
 
Index: archive/lxqt/desktop/pcmanfm-qt.xml
===================================================================
--- archive/lxqt/desktop/pcmanfm-qt.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/pcmanfm-qt.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/post-install.xml
===================================================================
--- archive/lxqt/desktop/post-install.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/post-install.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/desktop/pre-install.xml
===================================================================
--- archive/lxqt/desktop/pre-install.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/desktop/pre-install.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/lxqt/lxqt.xml
===================================================================
--- archive/lxqt/lxqt.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxqt/lxqt.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <part id="lxqt" xreflabel="LXQt">
Index: archive/lxshortcut.xml
===================================================================
--- archive/lxshortcut.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/lxshortcut.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/makedepend.xml
===================================================================
--- archive/makedepend.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/makedepend.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/maven.xml
===================================================================
--- archive/maven.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/maven.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,5 +19,6 @@
 
   <sect1info>
-    <date>$Date$</date>
+    <othername>$LastChangedBy: pierre $</othername>
+    <date>$Date: 2017-09-11 12:14:03 +0200 (lun. 11 sept. 2017) $</date>
   </sect1info>
 
Index: archive/midori.xml
===================================================================
--- archive/midori.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/midori.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/mod_dnssd.xml
===================================================================
--- archive/mod_dnssd.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/mod_dnssd.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/mx.xml
===================================================================
--- archive/mx.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/mx.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/mysql.xml
===================================================================
--- archive/mysql.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/mysql.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/nas.xml
===================================================================
--- archive/nas.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/nas.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/ncpfs.xml
===================================================================
--- archive/ncpfs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/ncpfs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -29,4 +29,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/nepomuk-core.xml
===================================================================
--- archive/nepomuk-core.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/nepomuk-core.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/nepomuk-widgets.xml
===================================================================
--- archive/nepomuk-widgets.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/nepomuk-widgets.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/nfs-utils-client.xml
===================================================================
--- archive/nfs-utils-client.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/nfs-utils-client.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: chive/nftables.xml
===================================================================
--- archive/nftables.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,433 +1,0 @@
-<?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 nftables-download-http "https://netfilter.org/projects/nftables/files/nftables-&nftables-version;.tar.bz2">
-  <!ENTITY nftables-download-ftp  " ">
-  <!ENTITY nftables-md5sum        "9913b2b46864394d41916b74638e0875">
-  <!ENTITY nftables-size          "772 KB">
-  <!ENTITY nftables-buildsize     "34 MB">
-  <!ENTITY nftables-time          "0.2 SBU">
-]>
-
-<sect1 id="nftables" xreflabel="nftables-&nftables-version;">
-  <?dbhtml filename="nftables.html"?>
-
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>nftables-&nftables-version;</title>
-
-  <indexterm zone="nftables">
-    <primary sortas="a-nftables">nftables</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to nftables</title>
-
-    <para>
-      The <application>nftables</application> package, intended to be the
-      successor to <xref linkend="iptables"/>,  provides a low-level netlink
-      programming interface (API), and userspace uitlities for the in-kernel
-      nf_tables subsystem.
-    </para>
-
-    &lfs90_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&nftables-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&nftables-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &nftables-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &nftables-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &nftables-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &nftables-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">nftables Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libnftnl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-        <xref linkend="jansson"/> (for JSON rules table support)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="iptables"/> and
-      <xref linkend="docbook-utils"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
-
-    <para role="optional">
-      <ulink url="https://netfilter.org/projects/conntrack-tools/index.html">
-      contrack-tools</ulink>
-      <ulink url="https://netfilter.org/projects/nfacct/index.html">
-      nfacct</ulink>
-      <ulink url="https://netfilter.org/projects/ulogd/index.html">
-      ulogd</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/nftables"/>
-    </para>
-  </sect2>
-
-    <sect2 role="kernel">
-      <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary (add any additional nf_tables features as needed):
-    </para>
-
-<screen><literal>[*] Networking support [CONFIG_NET] ---&gt;
-    Networking options ---&gt;
-    [*] Network packet filtering framework (Netfilter) [CONFIG_NETFILTER] ---&gt;
-        Core Netfilter Configuration ---&gt;
-          &lt;*&gt; * protocol support [CONFIG_NF_CONNTRACK_*]
-          &lt;*&gt; Netfilter nf_tables support [CONFIG_NF_TABLES]
-          [*]   Netfilter nf_tables * support [CONFIG_NF_TABLES_*]</literal></screen>
-
-    <para>
-      Include any connection tracking protocols that will be used, and
-      any protocols that you wish to use for match suppport under the
-      "Core Netfilter Configuration" section. Additionally, include any
-      "Netfilter nf_tables * module" that will be used under the
-      "Netfilter nf_tables support" section.
-    </para>
-
-
-    </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of nftables</title>
-
-    <para>
-      Install <application>nftables</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sbindir=/sbin   \
-            --sysconfdir=/etc \
-            --with-json       \
-            --with-python-bin=/usr/bin/python3 &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                   &amp;&amp;
-mv /usr/lib/libnftables.so.* /lib &amp;&amp;
-ln -sfv ../../lib/$(readlink /usr/lib/libnftables.so) /usr/lib/libnftables.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-<!-- there is no disable-static option in the configure string
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
--->
-    <para>
-      <parameter>--with-json</parameter>: build with support for JSON rules.
-      Omit if <xref linkend="jansson"/> is not available.
-    </para>
-
-    <para>
-      <parameter>--with-python-bin=/usr/bin/python3</parameter>: force use of
-      <application>Python3</application>.
-    </para>
-
-    <para>
-      <option>--enable-man-doc</option>: build man pages if
-      <xref linkend="asciidoc"/> is installed (required if adding
-      json support).
-    </para>
-
-    <para>
-      <option>--with-xtables</option>: build with
-      <xref linkend="iptables"/> libxtables support.
-    </para>
-
-    <para>
-      <command>mv -v /usr/lib/nftables.so.* ...</command>: Move shared
-      libraries into /lib so they are available before /usr is mounted.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring nftables</title>
-
-    <note>
-      <para>
-        If you intend to use <xref linkend="firewalld"/> to configure your
-        firewall rules, you should not use the example configuration provided
-        here, nor should you enable the
-        <phrase revision="sysv">bootscript.</phrase>
-        <phrase revision="systemd">systemd unit.</phrase>
-      </para>
-    </note>
-
-    <sect3 id="fw-masqRouter-nft"
-     xreflabel="Creating a Masquerading Router With nftables">
-      <title>Masquerading Router</title>
-
-      <para>
-        A network Firewall has two interfaces, one connected to an
-        intranet, in this example <emphasis role="strong">LAN1</emphasis>,
-        and one connected to the Internet, here <emphasis
-        role="strong">WAN1</emphasis>. You will need to adjust these value to
-        match your particular system. To provide the maximum security
-        for the firewall itself, make sure that there are no unnecessary
-        servers running on it such as <application>X11</application> et al.
-        As a general principle, the firewall itself should not access
-        any untrusted service (think of a remote server giving answers that
-        makes a daemon on your system crash, or even worse, that implements
-        a worm via a buffer-overflow).
-      </para>
-
-    <note>
-      <para>
-        In the following example configuration, <emphasis
-        role="strong">LAN1</emphasis> is used for the internal LAN interface,
-        and <emphasis role="strong">WAN1</emphasis> is used for the external
-        interface connected to the Internet. You will need to replace these
-        values with appropriate interface names for your system.
-      </para>
-    </note>
-
-
-<screen role="root"><?dbfo keep-together="auto"?><userinput>cat &gt; /etc/nftables/nftables.conf &lt;&lt; "EOF"
-<literal>#!/sbin/nft -f
-
-# You're using the example configuration for a setup of a firewall
-# from Beyond Linux From Scratch.
-#
-# This example is far from being complete, it is only meant
-# to be a reference.
-#
-# Firewall security is a complex issue, that exceeds the scope
-# of the configuration rules below.
-#
-# You can find additional information
-# about firewalls in Chapter 4 of the BLFS book.
-# https://www.&lfs-domainname;/blfs
-
-# Drop all existing rules
-flush ruleset
-
-# Filter for both ip4 and ip6 (inet)
-table inet filter {
-
-        # filter incomming packets
-        chain input {
-
-                # Drop everything that doesn't match policy
-                type filter hook input priority 0; policy drop;
-
-                # accept packets for established connections
-                ct state { established, related } accept
-
-                # Drop packets that have a connection state of invalid
-                ct state invalid drop
-
-                # Allow connections to the loopback adapter
-                iifname "lo" accept
-
-                # Allow connections to the LAN1 interface
-                iifname "LAN1" accept
-
-                # Accept icmp requests
-                ip protocol icmp accept
-
-                # Allow ssh connections on LAN1
-                iifname "LAN1" tcp dport ssh accept
-
-                # Drop everything else
-                drop
-        }
-
-        # Allow forwarding for external connections to WAN1
-        chain forward {
-
-                # Drop if it doesn't match policy
-                type filter hook forward priority 0; policy drop;
-
-                # Accept connections on WAN1
-                oifname "WAN1" accept
-
-                # Allow forwarding to another host via this interface
-                # Uncomment the following line to allow connections
-                # ip daddr 192.168.0.2 ct status dnat accept
-
-                # Allow established and related connections
-                iifname "WAN1" ct state { established, related } accept
-        }
-
-        # Filter output traffic
-        chain output {
-
-                # Allow everything outbound
-                type filter hook output priority 0; policy accept;
-        }
-}
-
-# Allow NAT for ip protocol (both ip4 and ip6)
-table ip nat {
-
-        chain prerouting {
-
-                # Accept on inbound interface for policy match
-                type nat hook prerouting priority 0; policy accept;
-
-                # Accept http and https on 192.168.0.2
-                # Uncomment the following line to allow http and https
-                #iifname "WAN1" tcp dport { http, https } dnat to 192.168.0.2
-        }
-
-        chain postrouting {
-
-                # accept outbound
-                type nat hook postrouting priority 0; policy accept;
-
-                # Masquerade on WAN1 outbound
-                oifname "WAN1" masquerade
-        }
-}</literal>
-EOF</userinput></screen>
-
-      <para>
-        With this configuration your intranet should be reasonably secure
-        against external attacks. No one should be able to setup a new
-        connection to any internal service not configured above.
-      </para>
-
-      <para>
-        There are several other examples in the
-        <filename class="directory">/etc/nftables</filename> directory.
-      </para>
-
-    </sect3>
-
-    <sect3  id="nftables-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">
-        To set up the nftables firewall at boot, install the
-        <filename>/etc/rc.d/init.d/nftables</filename> init script included
-        in the <xref linkend="bootscripts"/> package.
-      </para>
-
-      <para revision="systemd">
-        To set up the nftables firewall at boot, install the
-        <filename>nftables.service</filename> unit included in the
-        <xref linkend="systemd-units"/> package.
-      </para>
-
-      <indexterm zone="nftables nftables-init">
-        <primary sortas="f-nftables">nftables</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-nftables</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          nft
-        </seg>
-        <seg>
-          libnftables.{a,so}
-        </seg>
-        <seg>
-          /etc/nftables
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="nft">
-        <term><filename>nft</filename></term>
-        <listitem>
-          <para>
-            command line interface for the nf_tables subsystem.
-          </para>
-          <indexterm zone="nftables nft">
-            <primary sortas="a-nft">nft</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnftables">
-        <term><filename class="libraryfile">libnftables.{a,so}</filename></term>
-        <listitem>
-          <para>
-            provides functions for manipulating the nf_tables subsystem.
-          </para>
-          <indexterm zone="nftables libnftables">
-            <primary sortas="c-libnftables">libnftables.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: archive/ninja.xml
===================================================================
--- archive/ninja.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/ninja.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/noto-fonts.xml
===================================================================
--- archive/noto-fonts.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/noto-fonts.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/npapi-sdk.xml
===================================================================
--- archive/npapi-sdk.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/npapi-sdk.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/obex-data-server.xml
===================================================================
--- archive/obex-data-server.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/obex-data-server.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/obexd.xml
===================================================================
--- archive/obexd.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/obexd.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/opal.xml
===================================================================
--- archive/opal.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/opal.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/openjpeg.xml
===================================================================
--- archive/openjpeg.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/openjpeg.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/openobex.xml
===================================================================
--- archive/openobex.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/openobex.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/openquicktime.xml
===================================================================
--- archive/openquicktime.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/openquicktime.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/openssl.xml
===================================================================
--- archive/openssl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/openssl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/openssl10.xml
===================================================================
--- archive/openssl10.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/openssl10.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/other-tools.xml
===================================================================
--- archive/other-tools.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/other-tools.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/other-wms.xml
===================================================================
--- archive/other-wms.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/other-wms.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+  <othername>$LastChangedBy$</othername>
   <date>$Date$</date>
   </sect1info>
Index: archive/other.xml
===================================================================
--- archive/other.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/other.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/othernetprogs.xml
===================================================================
--- archive/othernetprogs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/othernetprogs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/others.xml
===================================================================
--- archive/others.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/others.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/oxygen-fonts.xml
===================================================================
--- archive/oxygen-fonts.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/oxygen-fonts.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/oxygen-icons.xml
===================================================================
--- archive/oxygen-icons.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/oxygen-icons.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/pan.xml
===================================================================
--- archive/pan.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/pan.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/pdl.xml
===================================================================
--- archive/pdl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/pdl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -29,4 +29,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/perl-modules.xml
===================================================================
--- archive/perl-modules.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/perl-modules.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -183,4 +183,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/pilot-link.xml
===================================================================
--- archive/pilot-link.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/pilot-link.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/pine.xml
===================================================================
--- archive/pine.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/pine.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/pkgconfig.xml
===================================================================
--- archive/pkgconfig.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/pkgconfig.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/poppler-014.xml
===================================================================
--- archive/poppler-014.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/poppler-014.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/portmap.xml
===================================================================
--- archive/portmap.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/portmap.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -29,4 +29,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/ppp.xml
===================================================================
--- archive/ppp.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/ppp.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/pre-install-config.xml
===================================================================
--- archive/pre-install-config.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/pre-install-config.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/printproto.xml
===================================================================
--- archive/printproto.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/printproto.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/psutils.xml
===================================================================
--- archive/psutils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/psutils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/ptlib.xml
===================================================================
--- archive/ptlib.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/ptlib.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/qjson.xml
===================================================================
--- archive/qjson.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/qjson.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/qpopper.xml
===================================================================
--- archive/qpopper.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/qpopper.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/qscintilla.xml
===================================================================
--- archive/qscintilla.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/qscintilla.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/qt-alternatives.xml
===================================================================
--- archive/qt-alternatives.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/qt-alternatives.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,7 @@
    %general-entities;
 ]>
+
+<!-- $LastChangedBy$
+     $Date$ -->
 
 <sect2>
Index: archive/qt4.8.xml
===================================================================
--- archive/qt4.8.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/qt4.8.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,4 +27,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/qt4.xml
===================================================================
--- archive/qt4.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/qt4.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/qtchooser.xml
===================================================================
--- archive/qtchooser.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/qtchooser.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/qtwebkit5.xml
===================================================================
--- archive/qtwebkit5.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/qtwebkit5.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -20,4 +20,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/qupzilla.xml
===================================================================
--- archive/qupzilla.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/qupzilla.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -20,4 +20,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/re-alpine.xml
===================================================================
--- archive/re-alpine.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/re-alpine.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/recode.xml
===================================================================
--- archive/recode.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/recode.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/rman.xml
===================================================================
--- archive/rman.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/rman.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/rsync-client.xml
===================================================================
--- archive/rsync-client.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/rsync-client.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/samba3-client.xml
===================================================================
--- archive/samba3-client.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/samba3-client.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/scrollkeeper.xml
===================================================================
--- archive/scrollkeeper.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/scrollkeeper.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/sddm.xml
===================================================================
--- archive/sddm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/sddm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/setqt.xml
===================================================================
--- archive/setqt.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/setqt.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,7 @@
    %general-entities;
 ]>
+
+<!-- $LastChangedBy$
+     $Date$ -->
 
 <sect3>
Index: archive/shrdesktopontologies.xml
===================================================================
--- archive/shrdesktopontologies.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/shrdesktopontologies.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/simpleburn.xml
===================================================================
--- archive/simpleburn.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/simpleburn.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/slib.xml
===================================================================
--- archive/slib.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/slib.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/slrn.xml
===================================================================
--- archive/slrn.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/slrn.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/soprano.xml
===================================================================
--- archive/soprano.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/soprano.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/sound-theme-freedesktop.xml
===================================================================
--- archive/sound-theme-freedesktop.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/sound-theme-freedesktop.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/spice-gtk.xml
===================================================================
--- archive/spice-gtk.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/spice-gtk.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/strigi.xml
===================================================================
--- archive/strigi.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/strigi.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/suites/koffice.xml
===================================================================
--- archive/suites/koffice.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/suites/koffice.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -16,4 +16,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/suites/openoffice.xml
===================================================================
--- archive/suites/openoffice.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/suites/openoffice.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -23,4 +23,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/suites/suites.xml
===================================================================
--- archive/suites/suites.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/suites/suites.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="xsoft-suites">
Index: archive/tcl.xml
===================================================================
--- archive/tcl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/tcl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -28,4 +28,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/tcpwrappers.xml
===================================================================
--- archive/tcpwrappers.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/tcpwrappers.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/tetex.xml
===================================================================
--- archive/tetex.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/tetex.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -38,4 +38,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/texlive-source-full.xml
===================================================================
--- archive/texlive-source-full.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/texlive-source-full.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/tin.xml
===================================================================
--- archive/tin.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/tin.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/udev-extras-old.xml
===================================================================
--- archive/udev-extras-old.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/udev-extras-old.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/udev-extras.xml
===================================================================
--- archive/udev-extras.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/udev-extras.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/udev.xml
===================================================================
--- archive/udev.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/udev.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/udftools.xml
===================================================================
--- archive/udftools.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/udftools.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -29,4 +29,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/udisks.xml
===================================================================
--- archive/udisks.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/udisks.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/vino.xml
===================================================================
--- archive/vino.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/vino.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/virtuoso.xml
===================================================================
--- archive/virtuoso.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/virtuoso.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/w3m.xml
===================================================================
--- archive/w3m.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/w3m.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,5 +17,6 @@
 
   <sect1info>
-    <date>$Date$</date>
+    <othername>$LastChangedBy: dj $</othername>
+    <date>$Date: 2019-06-09 07:27:41 -0500 (Sun, 09 Jun 2019) $</date>
   </sect1info>
 
Index: archive/webkitgtk.xml
===================================================================
--- archive/webkitgtk.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/webkitgtk.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/webkitgtk2.xml
===================================================================
--- archive/webkitgtk2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/webkitgtk2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/weston.xml
===================================================================
--- archive/weston.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/weston.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/wicd.xml
===================================================================
--- archive/wicd.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/wicd.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/x-config.xml
===================================================================
--- archive/x-config.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/x-config.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/x-setup.xml
===================================================================
--- archive/x-setup.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/x-setup.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/x7driver-vmmouse.xml
===================================================================
--- archive/x7driver-vmmouse.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/x7driver-vmmouse.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect2info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect2info>
Index: archive/x7proto.xml
===================================================================
--- archive/x7proto.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/x7proto.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -95,4 +95,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/xchat.xml
===================================================================
--- archive/xchat.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/xchat.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/xconfig-dummy.xml
===================================================================
--- archive/xconfig-dummy.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/xconfig-dummy.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,4 +6,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: chive/xfce4-dev-tools.xml
===================================================================
--- archive/xfce4-dev-tools.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,155 +1,0 @@
-<?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 xfce4-dev-tools-download-http
-           "http://archive.xfce.org/src/xfce/xfce4-dev-tools/4.14/xfce4-dev-tools-&xfce4-dev-tools-version;.tar.bz2">
-  <!ENTITY xfce4-dev-tools-download-ftp  " ">
-  <!ENTITY xfce4-dev-tools-md5sum        "5f8fc8af73819c08d9e4c26a3ac457e7">
-  <!ENTITY xfce4-dev-tools-size          "288 KB">
-  <!ENTITY xfce4-dev-tools-buildsize     "3.3 MB">
-  <!ENTITY xfce4-dev-tools-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xfce4-dev-tools" xreflabel="xfce4-dev-tools-&xfce4-dev-tools-version;">
-  <?dbhtml filename="xfce4-dev-tools.html"?>
-
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>xfce4-dev-tools-&xfce4-dev-tools-version;</title>
-
-  <indexterm zone="xfce4-dev-tools">
-    <primary sortas="a-xfce4-dev-tools">xfce4-dev-tools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to the Xfce4 Development Tools</title>
-
-    <para>
-      The <application>Xfce4 Development Tools</application> are a collection of 
-      tools and macros for building some Xfce aplications.
-    </para>
-
-    &lfs10_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xfce4-dev-tools-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xfce4-dev-tools-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xfce4-dev-tools-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xfce4-dev-tools-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xfce4-dev-tools-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xfce4-dev-tools-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">The Xfce4 Development Tools Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/xfce4-dev-tools"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of the Xfce4 Development Tools</title>
-
-    <para>
-      Install the <application>Xfce4 Development Tools</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 Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xdt-autogen and
-          xdt-csource
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/xfce4/dev-tools
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xfce4-dev-tools-config">
-        <term><command>xfce4-dev-tools-config</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+</application> GUI that allows you to
-            change some of your preferences (theme and screen position)
-            for the notifications that the
-            <application>Xfce4 Notification Daemon</application> displays.
-          </para>
-          <indexterm zone="xfce4-dev-tools xfce4-dev-tools-config">
-            <primary sortas="b-xfce4-dev-tools-config">xfce4-dev-tools-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: archive/xfce4-mixer.xml
===================================================================
--- archive/xfce4-mixer.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/xfce4-mixer.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/xfce4-xkb-plugin.xml
===================================================================
--- archive/xfce4-xkb-plugin.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/xfce4-xkb-plugin.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/xinetd.xml
===================================================================
--- archive/xinetd.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/xinetd.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/xpdf.xml
===================================================================
--- archive/xpdf.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/xpdf.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: archive/xulrunner.xml
===================================================================
--- archive/xulrunner.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ archive/xulrunner.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -22,4 +22,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: book/bookinfo.xml
===================================================================
--- book/bookinfo.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ book/bookinfo.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,4 +8,5 @@
 <bookinfo>
 
+  <othername>$LastChangedBy$</othername>
   <date>$Date$</date>
 
@@ -51,16 +52,4 @@
       <date>&pubdate;</date>
       <revremark>Ongoing Release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>11.0</revnumber>
-      <date>2021-09-01</date>
-      <revremark>Twenty-fourth Release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>10.1</revnumber>
-      <date>2021-03-01</date>
-      <revremark>Twenty-third Release</revremark>
     </revision>
 
Index: book/dedication.xml
===================================================================
--- book/dedication.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ book/dedication.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,4 +6,9 @@
 ]>
 
+<!--
+$LastChangedBy$
+$Date$
+-->
+
 <dedication>
   <title>Dedication</title>
Index: book/errata.xml
===================================================================
--- book/errata.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ book/errata.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: book/foreword.xml
===================================================================
--- book/foreword.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ book/foreword.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: book/organization.xml
===================================================================
--- book/organization.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ book/organization.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: book/preface.xml
===================================================================
--- book/preface.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ book/preface.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,7 @@
   %general-entities;
 ]>
+
+<!-- $LastChangedBy$
+   $Date$ -->
 
 <preface id="preface" xreflabel="Preface">
@@ -39,5 +42,5 @@
     Finally, we encourage you to become involved in the community; ask
     questions on the mailing list or news gateway and join in the fun on #lfs
-    and #lfs-support at Libera. You can find more details about all of these
+    and #lfs-support at freenode. You can find more details about all of these
     in the <xref linkend="introduction"/> section of the book.
   </para>
Index: book/whoread.xml
===================================================================
--- book/whoread.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ book/whoread.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: pand_date
===================================================================
--- expand_date	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,20 +1,0 @@
-#!/usr/bin/env python3
-
-from os import getcwd
-from subprocess import check_output, DEVNULL
-from sys import stdin, stdout, argv
-
-content = stdin.read()
-
-# To editors:
-# The usage of FETCH_HEAD here is very tricky.  This is only intended for
-# the cron job running "git pull" periodically.  Humans should NOT rely on
-# this script at all.  Do NOT add "dater" filter into your .git/config.
-# For editors, just use `git log ${path}` to show the history of a file.
-cmd = [ 'git', 'log', '-1', '--pretty=%ad', 'FETCH_HEAD', '--', argv[1] ]
-try:
-    date = check_output(cmd, cwd = getcwd(), stderr=DEVNULL).decode().rstrip()
-    content = content.replace('$Date$', '$Date: %s$' % date)
-except Exception:
-    pass
-stdout.write(content)
Index: general.ent
===================================================================
--- general.ent	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general.ent	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,23 +1,16 @@
-<!-- version info generated from git commit,
-     comment out the following two lines for release. -->
-<!ENTITY % version-entities SYSTEM "version.ent">
-%version-entities;
+<!-- $LastChangedBy$ $Date$ -->
 
-<!-- uncomment the following entities and modify them for release,
-     month and year should be always 2 digits. -->
-<!--
-<!ENTITY day            "01">
-<!ENTITY month          "09">
-<!ENTITY year           "2021">
-<!ENTITY copyrightdate  "2001-2021">
-<!ENTITY version        "11.0">
-<!ENTITY releasedate    "September 1st, &year;">
-<!ENTITY pubdate        "&year;-&month;-&day;">
--->
-
+<!ENTITY day          "03">                   <!-- Always 2 digits -->
+<!ENTITY month        "01">                   <!-- Always 2 digits -->
+<!ENTITY year         "2021">
+<!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
+<!ENTITY version      "&year;-&month;-&day;">
+<!ENTITY releasedate  "January 3rd, &year;">
+<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development -->
 <!ENTITY lfs-versiond "systemd">              <!-- x.y-systemd|systemd -->
+<!ENTITY last-commit  "$Date$"> <!-- Automatic update -->
 <!ENTITY lfs-domainname       "linuxfromscratch.org">
 
@@ -27,21 +20,21 @@
 
 
-<!ENTITY lfs-website          "https://www.&lfs-domainname;">
+<!ENTITY lfs-website          "http://www.&lfs-domainname;">
 <!-- downloads_root must have an entity because it is needed for scripts
      change svn to x.y for release. Note:  s/_/-/ in comment to avoid grep error 
      Update 'downloads-root-systemd' to x.y-systemd
      -->
-<!ENTITY downloads-root       "https://www.linuxfromscratch.org/blfs/downloads/svn">
-<!ENTITY downloads-root-systemd "https://www.linuxfromscratch.org/blfs/downloads/systemd">
-<!ENTITY downloads-project    "https://downloads.&lfs-domainname;">
+<!ENTITY downloads-root       "http://www.linuxfromscratch.org/blfs/downloads/svn">
+<!ENTITY downloads-root-systemd "http://www.linuxfromscratch.org/blfs/downloads/systemd">
+<!ENTITY downloads-project    "http://downloads.&lfs-domainname;">
 
-<!ENTITY sources-anduin-http  "https://anduin.linuxfromscratch.org/BLFS">
+<!ENTITY sources-anduin-http  "http://anduin.linuxfromscratch.org/BLFS">
 <!ENTITY sources-anduin-ftp   "ftp://anduin.linuxfromscratch.org/BLFS">
 
-<!ENTITY hints-root           "https://www.&lfs-domainname;/hints">
-<!ENTITY patch-downloads      "https://www.linuxfromscratch.org/patches/downloads">
-<!ENTITY patch-root           "https://www.&lfs-domainname;/patches/blfs/svn">
-<!ENTITY errata               "https://www.&lfs-domainname;/blfs/errata/&blfs-version;/">
-<!ENTITY blfs-ticket-root     "https://wiki.&lfs-domainname;/blfs/ticket/">
+<!ENTITY hints-root           "http://www.&lfs-domainname;/hints">
+<!ENTITY patch-downloads      "http://www.linuxfromscratch.org/patches/downloads">
+<!ENTITY patch-root           "http://www.&lfs-domainname;/patches/blfs/svn">
+<!ENTITY errata               "http://www.&lfs-domainname;/blfs/errata/&blfs-version;/">
+<!ENTITY blfs-ticket-root     "http://wiki.&lfs-domainname;/blfs/ticket/">
 
 <!ENTITY lfs-root             "../../../../lfs/view/&lfs-version;">
@@ -82,9 +75,5 @@
 <!ENTITY lfs-gdbm-version             "1.11">
 <!ENTITY lfs-m4-version               "1.4.17">
-<!-- FIXME - please check the included version of
- List/Utils when upgrading the perl version.
- Scalar-List-Utils is in perl-deps because List-AllUtils
- needs a newer version at runtime than is in 5.34.0 -->
-<!ENTITY lfs-perl-version             "5.34"> <!-- used in git -->
+<!ENTITY lfs-perl-version             "5.32"> <!-- used in git -->
 <!-- this was originally the perl version used by the corresponding
  version of lfs, in those days always for i686, but now BLFS is a rolling
@@ -95,18 +84,18 @@
 <!-- End LFS versions -->
 
-<!ENTITY blfs-bootscripts-version     "20210826">
-<!ENTITY systemd-units-version        "20210819">
+<!ENTITY blfs-bootscripts-version     "20201002">
+<!ENTITY systemd-units-version        "20200828">
 
-<!ENTITY blfs-wiki                    "https://wiki.&lfs-domainname;/blfs/wiki">
+
+<!ENTITY blfs-wiki                    "http://wiki.&lfs-domainname;/blfs/wiki">
 
 <!-- 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 lfs110a_checked       "<para>This package is known to build and work
-                              properly using an LFS-11.0 platform.</para>">
-<!--
-<!ENTITY lfs110a_built         "<para>This package is known to build using an LFS
-                              11.0 platform but has not been tested.</para>">
--->
+<!ENTITY lfs10_checked        "<para>This package is known to build and work
+                              properly using an LFS-10.0 platform.</para>">
+<!ENTITY lfs10_built          "<para>This package is known to build using an LFS
+                              10.0 platform but has not been tested.</para>">
+
 <!-- End special entities about LFS compatibility -->
 
Index: general/general.xml
===================================================================
--- general/general.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/general.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
  %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <part id="general" xreflabel="General Libraries and Utilities">
Index: general/genlib/apr-util.xml
===================================================================
--- general/genlib/apr-util.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/apr-util.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -188,5 +189,5 @@
           <para>
             is an APR-util script designed to allow easy command line access to
-            APR-util configuration parameters
+            APR-util configuration parameters.
           </para>
           <indexterm zone="apr-util apu-1-config">
@@ -201,5 +202,5 @@
           <para>
             contains functions that provide a predictable and consistent
-            interface to underlying client library interfaces
+            interface to underlying client library interfaces.
           </para>
           <indexterm zone="apr-util libaprutil-1">
Index: general/genlib/apr.xml
===================================================================
--- general/genlib/apr.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/apr.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -83,17 +84,4 @@
   <sect2 role="installation">
     <title>Installation of Apr</title>
-
-    <para>
-      First, fix a security issue:
-    </para>
-<!--
-<screen><userinput>sed '/{306/a \
-\
-    if (xt-&gt;tm_mon &lt; 0 || xt-&gt;tm_mon &gt;= 12) \
-        return APR_EBADDATE;' -i time/unix/time.c</userinput></screen>
--->
-<screen><userinput>sed -e "/shift/i \
-\    if (xt-&gt;tm_mon &lt; 0 || xt-&gt;tm_mon &gt;= 12) return APR_EBADDATE;" \
-    -i time/unix/time.c</userinput></screen>
 
     <para>
@@ -159,5 +147,5 @@
             is a shell script used to retrieve information about the apr
             library in the system. It is typically used to compile and link
-            against the library
+            against the library.
           </para>
           <indexterm zone="apr apr-1-config">
@@ -171,5 +159,5 @@
         <listitem>
           <para>
-            is the Apache Portable Runtime library
+            is the Apache Portable Runtime library.
           </para>
           <indexterm zone="apr libapr-1">
@@ -181,4 +169,3 @@
 
   </sect2>
-
 </sect1>
Index: general/genlib/aspell.xml
===================================================================
--- general/genlib/aspell.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/aspell.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -214,5 +215,5 @@
             replacement, as an independent spell checker, as a test utility to
             test out <application>Aspell</application> features, and as a
-            utility for managing dictionaries
+            utility for managing dictionaries.
           </para>
           <indexterm zone="aspell aspell-prog">
@@ -227,5 +228,5 @@
           <para>
             is a wrapper around <command>aspell</command> to invoke it in
-            <command>ispell</command> compatible mode
+            <command>ispell</command> compatible mode.
           </para>
           <indexterm zone="aspell aspell-ispell">
@@ -240,5 +241,5 @@
           <para>
             is a wrapper around <command>aspell</command> to invoke it in
-            <command>spell</command> compatible mode
+            <command>spell</command> compatible mode.
           </para>
           <indexterm zone="aspell aspell-spell">
@@ -253,5 +254,5 @@
           <para>
             imports old personal dictionaries into
-            <application>Aspell</application>
+            <application>Aspell</application>.
           </para>
           <indexterm zone="aspell aspell-import">
@@ -265,5 +266,5 @@
         <listitem>
           <para>
-            decompresses a <command>prezip</command>ped file to stdout
+            decompresses a <command>prezip</command>ped file to stdout.
           </para>
           <indexterm zone="aspell precat">
@@ -277,5 +278,5 @@
         <listitem>
           <para>
-            decompresses a <command>prezip</command>ped file
+            decompresses a <command>prezip</command>ped file.
           </para>
           <indexterm zone="aspell preunzip">
@@ -290,5 +291,5 @@
           <para>
             is a prefix delta compressor, used to compress sorted word lists or
-            other similar text files
+            other similar text files.
           </para>
           <indexterm zone="aspell prezip">
@@ -303,5 +304,5 @@
           <para>
             is called by the various wrapper scripts to perform the actual
-            compressing and decompressing
+            compressing and decompressing.
           </para>
           <indexterm zone="aspell prezip-bin">
@@ -317,5 +318,5 @@
             displays information about the
             <filename class="libraryfile">libpspell</filename> installation,
-            mostly for use in build scripts
+            mostly for use in build scripts.
           </para>
           <indexterm zone="aspell pspell-config">
@@ -330,5 +331,5 @@
           <para>
             is a script to help use <application>Aspell</application> as an
-            <command>ispell</command> replacement
+            <command>ispell</command> replacement.
           </para>
           <indexterm zone="aspell run-with-aspell">
@@ -343,5 +344,5 @@
           <para>
             compresses or decompresses sorted word lists for use with the
-            <application>Aspell</application> spell checker
+            <application>Aspell</application> spell checker.
           </para>
           <indexterm zone="aspell word-list-compress">
@@ -355,5 +356,5 @@
         <listitem>
           <para>
-            contains spell checking API functions
+            contains spell checking API functions.
           </para>
           <indexterm zone="aspell libaspell">
@@ -371,5 +372,5 @@
             spell checking functionality is now in
             <filename class="libraryfile">libaspell</filename> but this library
-            is included for backward compatibility
+            is included for backward compatibility.
           </para>
           <indexterm zone="aspell libpspell">
@@ -380,4 +381,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/genlib/boost.xml
===================================================================
--- general/genlib/boost.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/boost.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY boost-download-http "https://boostorg.jfrog.io/artifactory/main/release/&boost-version;/source/boost_&boost-dl-version;.tar.bz2">
+  <!ENTITY boost-download-http "https://dl.bintray.com/boostorg/release/&boost-version;/source/boost_&boost-dl-version;.tar.bz2">
   <!ENTITY boost-download-ftp  " ">
-  <!ENTITY boost-md5sum        "09dc857466718f27237144c6f2432d86">
-  <!ENTITY boost-size          "105 MB">
-  <!ENTITY boost-buildsize     "1.0 GB (189 MB installed)">
-  <!ENTITY boost-time          "1.7 SBU (Using parallelism=4; add 1.3 SBU for tests)">
+  <!ENTITY boost-md5sum        "ea217ed7c4414e93d44106c316966ae1">
+  <!ENTITY boost-size          "116 MB">
+  <!ENTITY boost-buildsize     "1.1 GB (175 MB installed)">
+  <!ENTITY boost-time          "1.3 SBU (Using parallelism=4; add 1.3 SBU for tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -103,5 +104,12 @@
   <sect2 role="installation">
     <title>Installation of Boost</title>
-
+<!--
+    <para>
+      First, apply a patch wwhich allows to build libreoffice with GCC 10
+      and later:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../boost-&boost-version;-gcc_10-1.patch</userinput></screen>
+-->
     <para>
       This package can be built with several jobs running in parallel. In
@@ -116,7 +124,8 @@
 
     <para>
-      To run the Boost.Build's regression test, issue 
-      <command>pushd tools/build/test; python3 test_all.py; popd</command>. 
-      All 154 tests should pass.
+      To run the Boost.Build's regression test,
+      issue <command>pushd tools/build/test; 
+      python3 test_all.py; popd</command>. 
+      All 153 tests should pass.
     </para>
 
@@ -135,5 +144,5 @@
 <!-- dev note: ./b2 - -prefix=<DESTDIR>/usr install threading=multi link=shared -->
 
-<screen role="root"><userinput>./b2 install threading=multi link=shared   <!--      &amp;&amp;
+<screen role="root"><userinput>./b2 install threading=multi link=shared           <!--      &amp;&amp;
 	ln -svf detail/sha1.hpp /usr/include/boost/uuid/sha1.hpp--></userinput></screen>
 
@@ -155,4 +164,15 @@
       <application>Boost</application> only use the headers. Omit
       this parameter if you do need static libraries.
+    </para>
+
+    <para>
+      <parameter>ln -svf detail/sha1.hpp ...</parameter>: The
+      <filename>uuid/sha1.hpp</filename> used to be a regular header, but by
+      boost_1_66_0 it had been changed to load the similar
+      <filename>detail/sha1.hpp</filename> header, with a message that it had
+      been deprecated. It has now been removed, but not every package which uses
+      it has been changed. An example is one of the libraries downloaded as a
+      git version by libreoffice. The symlink enables this and similar packages
+      to build.
     </para>
 
@@ -188,12 +208,12 @@
           libboost_context.so, libboost_contract.so, libboost_coroutine.so,
           libboost_date_time.so, libboost_exception.a, libboost_fiber.so,
-          libboost_filesystem.so, libboost_graph.so, libboost_iostreams.so,
-          libboost_json.so, libboost_locale.so,
+          libboost_filesystem.so,
+          libboost_graph.so, libboost_iostreams.so, libboost_locale.so,
           libboost_log_setup.so, libboost_log.so, libboost_math_c99.so,
           libboost_math_c99f.so, libboost_math_c99l.so, libboost_math_tr1.so,
           libboost_math_tr1f.so, libboost_math_tr1l.so,
-          libboost_nowide.so, libboost_numpy39.so,
+          libboost_nowide.so,
           libboost_prg_exec_monitor.so, libboost_program_options.so,
-          libboost_python3&python3-minor;.so, libboost_random.so,
+          libboost_python38.so, libboost_random.so,
           libboost_regex.so, libboost_serialization.so,
           libboost_stacktrace_addr2line.so, libboost_stacktrace_basic.so,
Index: general/genlib/brotli.xml
===================================================================
--- general/genlib/brotli.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/brotli.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -81,12 +82,11 @@
     </para>
 
-<!-- Brotli doesn't have any lua bindings, at least not with 1.0.7.
-         Do not advertise python2 as python3 should be used instead
+    <!-- Brotli doesn't have any lua bindings, at least not with 1.0.7. -->
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="lua"/> (to create Lua bindings) and
+    <!--<xref linkend="lua"/> (to create Lua bindings) and -->
       <xref linkend="python2"/> (to create python2 bindings)
     </para>
--->
+
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/brotli"/>
@@ -119,10 +119,13 @@
 
     <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-    <para>
-      If desired, build the <application>Python3</application>
-      bindings:
+      To test the results, issue: <command>make test</command>
+    </para>
+
+    <para>
+      If desired, either or both sets of python bindings can be built and
+      installed without any conflicts. If you need the
+      <application>Python2</application> bindings, add or substitute
+      <command>python2</command> for <command>python3</command> in the
+      following instructions:
     </para>
 
@@ -138,5 +141,4 @@
       issue: <command>python3 setup.py test</command>.
     </para>
-
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
@@ -147,7 +149,8 @@
 
     <para>
-      If you have built the <application>python</application> bindings,
-      install them as the <systemitem class="username">root</systemitem>
-      user:
+      If you have built either or both sets of <application>python</application>
+      bindings, install them as the <systemitem class="username">root</systemitem>
+      user (as before, use the appropriate version(s) of
+      <application>python</application>:
     </para>
 
@@ -191,5 +194,5 @@
           <para>
             can compress or decompress files, or test the integrity of
-            compressed files
+            compressed files.
           </para>
           <indexterm zone="brotli brotli-prog">
@@ -203,5 +206,5 @@
         <listitem>
           <para>
-            is the Brotli common dictionary library
+            is the Brotli common dictionary library.
           </para>
           <indexterm zone="brotli libbrotlicommon">
@@ -215,5 +218,5 @@
         <listitem>
           <para>
-            is the Brotli decoder library
+            is the Brotli decoder library.
           </para>
           <indexterm zone="brotli libbrotlidec">
@@ -227,5 +230,5 @@
         <listitem>
           <para>
-            is the Brotli common encoder library
+            is the Brotli common encoder library.
           </para>
           <indexterm zone="brotli libbrotlienc">
@@ -237,4 +240,3 @@
 
   </sect2>
-
 </sect1>
Index: general/genlib/clucene.xml
===================================================================
--- general/genlib/clucene.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/clucene.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/genlib/dbus-glib.xml
===================================================================
--- general/genlib/dbus-glib.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/dbus-glib.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY dbus-glib-download-http "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-&dbus-glib-version;.tar.gz">
   <!ENTITY dbus-glib-download-ftp  " ">
-  <!ENTITY dbus-glib-md5sum        "021e6c8a288df02c227e4aafbf7e7527">
-  <!ENTITY dbus-glib-size          "700 KB">
-  <!ENTITY dbus-glib-buildsize     "12 MB (with tests)">
+  <!ENTITY dbus-glib-md5sum        "d7cebf1d69445cbd28b4983392145192">
+  <!ENTITY dbus-glib-size          "820 KB">
+  <!ENTITY dbus-glib-buildsize     "10 MB (with tests)">
   <!ENTITY dbus-glib-time          "0.1 SBU (with tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -143,5 +144,6 @@
         </seg>
         <seg>
-          /usr/share/gtk-doc/html/dbus-glib
+          /usr/share/gtk-doc/html/dbus-glib and
+          /usr/share/doc/dbus-glib-&dbus-glib-version;
         </seg>
       </seglistitem>
@@ -157,5 +159,5 @@
         <listitem>
           <para>
-            is a tool used to interface with the D-Bus API
+            is a tool used to interface with the D-Bus API.
           </para>
           <indexterm zone="dbus-glib glib-dbus-binding-tool">
@@ -170,5 +172,5 @@
           <para>
             contains <application>GLib</application> interface functions
-            to the <application>D-Bus</application> API
+            to the <application>D-Bus</application> API.
           </para>
           <indexterm zone="dbus-glib libdbus-glib-1">
Index: general/genlib/double-conversion.xml
===================================================================
--- general/genlib/double-conversion.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/double-conversion.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -156,5 +157,5 @@
         <listitem>
           <para>
-            provides binary-to-decimal and decimal-to-binary routines for IEEE doubles
+            provides binary-to-decimal and decimal-to-binary routines for IEEE doubles.
           </para>
           <indexterm zone="double-conversion libdouble-conversion">
@@ -165,4 +166,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/genlib/enchant.xml
===================================================================
--- general/genlib/enchant.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/enchant.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY enchant-download-http "https://github.com/AbiWord/enchant/releases/download/v&enchant-version;/enchant-&enchant-version;.tar.gz">
   <!ENTITY enchant-download-ftp  " ">
-  <!ENTITY enchant-md5sum        "0b9b60da3bf595ff07547c40668a7373">
+  <!ENTITY enchant-md5sum        "9b27f815ee35ff12b5b870c2d04361c6">
   <!ENTITY enchant-size          "968 KB">
-  <!ENTITY enchant-buildsize     "7.3 MB (add 100 MB for tests)">
+  <!ENTITY enchant-buildsize     "6.9 MB (add 100 MB for tests)">
   <!ENTITY enchant-time          "0.2 SBU (add 0.5 SBU for tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -30,9 +31,9 @@
 
     <para>
-      The <application>enchant</application> package provides a generic
+      The <application>enchant</application> package provide a generic
       interface into various existing spell checking libraries.
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -121,5 +122,10 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install                                   &amp;&amp;
+rm -rf /usr/include/enchant                    &amp;&amp;
+ln -sfv enchant-2       /usr/include/enchant   &amp;&amp;
+ln -sfv enchant-2       /usr/bin/enchant       &amp;&amp;
+ln -sfv libenchant-2.so /usr/lib/libenchant.so &amp;&amp;
+ln -sfv enchant-2.pc    /usr/lib/pkgconfig/enchant.pc</userinput></screen>
 
   </sect2>
@@ -130,4 +136,10 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
+
+    <para>
+      <command>rm -rf /usr/include/enchant</command>; 
+      <command>ln -sfn ...</command>: Create symlinks for this package
+      version so that other other packages can find it using the old name.
+    </para>
 
   </sect2>
@@ -177,6 +189,6 @@
 EOF
 
-enchant-2 -d en_GB -l /tmp/test-enchant.txt &amp;&amp;
-enchant-2 -d en_GB -a /tmp/test-enchant.txt</userinput></screen>
+enchant -d en_GB -l /tmp/test-enchant.txt &amp;&amp;
+enchant -d en_GB -a /tmp/test-enchant.txt</userinput></screen>
 
       <para>
@@ -202,7 +214,8 @@
 
       <seglistitem>
-        <seg>enchant-2 and enchant-lsmod-2</seg>
-        <seg>libenchant-2.so</seg>
-        <seg>/usr/include/enchant-2, /usr/lib/enchant-2, and
+        <seg>enchant (symbolic link to enchant-2) and enchant-lsmod-2</seg>
+        <seg>libenchant-2.so and libenchant.so (symbolic link to
+        libenchant-2.so)</seg>
+        <seg>/usr/include/enchant{,-2}, /usr/lib/enchant-2, and
         /usr/share/enchant</seg>
       </seglistitem>
@@ -214,12 +227,12 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="enchant-2">
-        <term><command>enchant-2</command></term>
+      <varlistentry id="enchant-prog">
+        <term><command>enchant</command></term>
         <listitem>
           <para>
             is a spellchecker
           </para>
-          <indexterm zone="enchant enchant-2">
-            <primary sortas="b-enchant-2">enchant-2</primary>
+          <indexterm zone="enchant enchant-prog">
+            <primary sortas="b-enchant">enchant</primary>
           </indexterm>
         </listitem>
@@ -230,5 +243,5 @@
         <listitem>
           <para>
-            lists available backends, languages, and dictionaries
+            lists available backends, languages, and dictionaries.
           </para>
           <indexterm zone="enchant enchant-lsmod-2">
@@ -238,12 +251,12 @@
       </varlistentry>
 
-      <varlistentry id="libenchant-2">
-        <term><filename class="libraryfile">libenchant-2.so</filename></term>
+      <varlistentry id="libenchant">
+        <term><filename class='libraryfile'>libenchant.so</filename></term>
         <listitem>
           <para>
-            contains spell checking interface API functions
+            contains spell checking interface API functions.
           </para>
-          <indexterm zone="enchant libenchant-2">
-            <primary sortas="c-libenchant-2">libenchant-2.so</primary>
+          <indexterm zone="enchant libenchant">
+            <primary sortas="c-libenchant">libenchant.{so,a}</primary>
           </indexterm>
         </listitem>
Index: general/genlib/exempi.xml
===================================================================
--- general/genlib/exempi.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/exempi.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -153,5 +154,5 @@
         <listitem>
           <para>
-            is a command line tool to manipulate XMP metadata
+            is a command line tool to manipulate XMP metadata.
           </para>
           <indexterm zone="exempi exempi-prog">
@@ -165,5 +166,5 @@
         <listitem>
           <para>
-            is a library used to parse XMP metadata
+            is a library used to parse XMP metadata.
           </para>
           <indexterm zone="exempi libexempi">
Index: general/genlib/fftw.xml
===================================================================
--- general/genlib/fftw.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/fftw.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -223,5 +224,5 @@
             is a utility to generate FFTW wisdom files, which contain saved
             information about how to optimally compute (Fourier) transforms  of
-            various sizes
+            various sizes.
           </para>
           <indexterm zone="fftw fftw-wisdom">
@@ -237,5 +238,5 @@
             is a utility to generate C configuration routines from FFTW wisdom
             files, where the latter contain saved information about  how  to
-            optimally  compute  (Fourier)  transforms of various sizes
+            optimally  compute  (Fourier)  transforms of various sizes.
           </para>
           <indexterm zone="fftw fftw-wisdom-to-conf">
@@ -249,5 +250,5 @@
         <listitem>
           <para>
-            is the Fast Fourier Transform library
+            is the Fast Fourier Transform library.
           </para>
           <indexterm zone="fftw libfftw3">
@@ -261,5 +262,5 @@
         <listitem>
           <para>
-            is the threaded Fast Fourier Transform library
+            is the threaded Fast Fourier Transform library.
           </para>
           <indexterm zone="fftw libfftw3_threads">
@@ -274,5 +275,5 @@
           <para>
             is the single-precision Fast Fourier Transform library, described
-            as <quote>float</quote> for historic reasons
+            as <quote>float</quote> for historic reasons.
           </para>
           <indexterm zone="fftw libfftw3f">
@@ -286,5 +287,5 @@
         <listitem>
           <para>
-            is the threaded single-precision Fast Fourier Transform library
+            is the threaded single-precision Fast Fourier Transform library.
           </para>
           <indexterm zone="fftw libfftw3f_threads">
@@ -298,5 +299,5 @@
         <listitem>
           <para>
-            is the long double Fast Fourier Transform library
+            is the long double Fast Fourier Transform library.
           </para>
           <indexterm zone="fftw libfftw3l">
@@ -310,5 +311,5 @@
         <listitem>
           <para>
-            is the threaded long double Fast Fourier Transform library
+            is the threaded long double Fast Fourier Transform library.
           </para>
           <indexterm zone="fftw libfftw3l_threads">
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/genlib.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
  %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="general-genlib">
@@ -111,5 +116,5 @@
 
    <!-- systemd only -->
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnfsidmap.xml"/>-->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnfsidmap.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpaper.xml"/>
@@ -134,5 +139,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxslt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwacom.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwpe.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libyaml.xml"/>
 
@@ -159,5 +163,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wayland.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wayland-protocols.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wpebackend-fdo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xapian.xml"/>
Index: general/genlib/glib2.xml
===================================================================
--- general/genlib/glib2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/glib2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY glib2-download-http "&gnome-download-http;/glib/&glib2-minor;/glib-&glib2-version;.tar.xz">
   <!ENTITY glib2-download-ftp  "&gnome-download-ftp;/glib/&glib2-minor;/glib-&glib2-version;.tar.xz">
-  <!ENTITY glib2-md5sum        "07ba0e946bf6dcad36388675d2f2876f">
-  <!ENTITY glib2-size          "4.8 MB">
-  <!ENTITY glib2-buildsize     "104 MB (add 6 MB for tests)">
-  <!ENTITY glib2-time          "0.6 SBU (add 1.0 SBU for tests; both using parallelism=4)">
+  <!ENTITY glib2-md5sum        "2df4576b1e4acfd118867eebb41d9956">
+  <!ENTITY glib2-size          "4.6 MB">
+  <!ENTITY glib2-buildsize     "205 MB (add 10 MB for tests)">
+  <!ENTITY glib2-time          "0.5 SBU (add 1.0 SBU for tests; both using parallelism=4)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -98,8 +99,7 @@
       <xref linkend="DocBook"/>,
       <xref linkend="docbook-xsl"/>, 
-      <xref linkend="gtk-doc"/> (to build API documentation),
+      <xref linkend="gtk-doc"/> (to build API documentation), and
       <xref linkend="glib-networking"/> (for some tests, but this is a circular
-      dependency), and
-      <xref linkend="sysprof"/>
+          dependency)
     </para>
 
@@ -160,8 +160,5 @@
       </para>
 
-<screen role="root"><userinput remap="pre">if [ -e /usr/include/glib-2.0 ]; then
-    rm -rf /usr/include/glib-2.0.old &amp;&amp;
-    mv -vf /usr/include/glib-2.0{,.old}
-fi</userinput></screen>
+<screen><userinput remap="pre">[ -e /usr/include/glib-2.0 ] &amp;&amp; mv -vf /usr/include/glib-2.0{,.old}</userinput></screen>
 
     </warning>
@@ -175,8 +172,8 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr       \
-      --buildtype=release \
-      -Dman=true          \
-      ..                  &amp;&amp;
+meson --prefix=/usr      \
+      -Dman=true         \
+      -Dselinux=disabled \
+      ..                 &amp;&amp;
 ninja</userinput></screen>
 
@@ -213,7 +210,5 @@
     <para>
       To test the results, after having installed the package, issue:
-      <command>ninja test</command>. One test named
-      <literal>gio / file</literal> is known to fail if the test is ran as
-      the <systemitem class="username">root</systemitem> user.
+      <command>ninja test</command>.
       <!-- glib issue #1954: -->
       <!-- One test named gdbus-server-auth sometimes fails.-->
@@ -237,5 +232,5 @@
     </para>
 
-<screen role="nodump"><userinput>rm -f /usr/include/glib-2.0/glib/gurifuncs.h</userinput></screen>
+<screen role="root rebuild"><userinput>rm -f /usr/include/glib-2.0/glib/gurifuncs.h</userinput></screen>
 
   </sect2>
@@ -244,10 +239,12 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
     <para>
       <parameter>-Dman=true</parameter>: This switch causes the
       build to create and install the package man pages.
+    </para>
+
+    <para>
+      <parameter>-Dselinux=disabled</parameter>: This switch disables
+      support for selinux which is not supported in BLFS.
     </para>
 
@@ -305,5 +302,5 @@
           <para>
             can be used to start applications and to send
-            messages to already-running instances of other applications
+            messages to already-running instances of other applications.
           </para>
           <indexterm zone="glib2 gapplication">
@@ -317,5 +314,5 @@
           <para>
             is a simple tool used for working with
-            <application>D-Bus</application> objects
+            <application>D-Bus</application> objects.
           </para>
           <indexterm zone="glib2 gdbus">
@@ -330,5 +327,5 @@
           <para>
             is used to generate code and/or documentation for one or
-            more <application>D-Bus</application> interfaces
+            more <application>D-Bus</application> interfaces.
           </para>
           <indexterm zone="glib2 gdbus-codegen">
@@ -343,5 +340,5 @@
           <para>
             is a utility that makes many <application>GIO</application>
-            features available from the command line
+            features available from the command line.
           </para>
           <indexterm zone="glib2 gio">
@@ -357,5 +354,5 @@
             is used to create a <filename>giomodule.cache</filename> file in 
             the listed directories. This file lists the implemented extension 
-            points for each module that has been found
+            points for each module that has been found.
           </para>
           <indexterm zone="glib2 gio-querymodules">
@@ -371,5 +368,5 @@
             is used to read the resource description from a file and
             the files that it references to create a binary resource
-            bundle that is suitable for use with the GResource API
+            bundle that is suitable for use with the GResource API.
           </para>
           <indexterm zone="glib2 glib-compile-resources">
@@ -385,5 +382,5 @@
             is used to compile all the GSettings XML schema files
             in a directory into a binary file with the name 
-            <filename>gschemas.compiled</filename> that can be used by GSettings
+            <filename>gschemas.compiled</filename> that can be used by GSettings.
           </para>
           <indexterm zone="glib2 glib-compile-schemas">
@@ -397,5 +394,5 @@
         <listitem>
           <para>
-            is a C code marshaller generation utility for GLib closures
+            is a C code marshaller generation utility for GLib closures.
           </para>
           <indexterm zone="glib2 glib-genmarshal">
@@ -410,5 +407,5 @@
           <para>
             is a variant of the <application>gettext</application>
-            internationalization utility
+            internationalization utility.
           </para>
           <indexterm zone="glib2 glib-gettextize">
@@ -422,5 +419,5 @@
         <listitem>
           <para>
-            is a C language enum description generation utility
+            is a C language enum description generation utility.
           </para>
           <indexterm zone="glib2 glib-mkenums">
@@ -434,5 +431,5 @@
         <listitem>
           <para>
-            is a small utility that draws a tree of types
+            is a small utility that draws a tree of types.
           </para>
           <indexterm zone="glib2 gobject-query">
@@ -446,5 +443,5 @@
         <listitem>
           <para>
-            offers a simple command line interface to GResource
+            offers a simple command line interface to GResource.
           </para>
           <indexterm zone="glib2 gresource">
@@ -458,5 +455,5 @@
         <listitem>
           <para>
-            offers a simple command line interface to GSettings
+            offers a simple command line interface to GSettings.
           </para>
           <indexterm zone="glib2 gsettings">
@@ -470,5 +467,5 @@
         <listitem>
           <para>
-            is a test running utility
+            is a test running utility.
           </para>
           <indexterm zone="glib2 gtester">
@@ -482,5 +479,5 @@
         <listitem>
           <para>
-            is a test report formatting utility
+            is a test report formatting utility.
           </para>
           <indexterm zone="glib2 gtester-report">
@@ -495,5 +492,5 @@
           <para>
             contain low-level core libraries for the
-            <application>GIMP</application> Toolkit
+            <application>GIMP</application> Toolkit.
           </para>
           <indexterm zone="glib2 GLib-libraries">
Index: general/genlib/glibmm.xml
===================================================================
--- general/genlib/glibmm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/glibmm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY glibmm-download-http "&gnome-download-http;/glibmm/2.66/glibmm-&glibmm-version;.tar.xz">
-  <!ENTITY glibmm-download-ftp  "&gnome-download-ftp;/glibmm/2.66/glibmm-&glibmm-version;.tar.xz">
-  <!ENTITY glibmm-md5sum        "ee8c00fd7f08ae59f6af38dfa599194a">
-  <!ENTITY glibmm-size          "7.2 MB">
-  <!ENTITY glibmm-buildsize     "88 MB (with tests)">
-  <!ENTITY glibmm-time          "0.5 SBU (Using parallelism=4; with tests)">
+  <!ENTITY glibmm-download-http "&gnome-download-http;/glibmm/2.64/glibmm-&glibmm-version;.tar.xz">
+  <!ENTITY glibmm-download-ftp  "&gnome-download-ftp;/glibmm/2.64/glibmm-&glibmm-version;.tar.xz">
+  <!ENTITY glibmm-md5sum        "02c40e6bc0721c564e4b033a18cb3a8e">
+  <!ENTITY glibmm-size          "7.1 MB">
+  <!ENTITY glibmm-buildsize     "173 MB (with tests)">
+  <!ENTITY glibmm-time          "0.6 SBU (Using parallelism=4; with tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -103,5 +104,5 @@
 cd    bld &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -150,5 +151,5 @@
         <listitem>
           <para>
-            contains the GIO API classes
+            contains the GIO API classes.
           </para>
           <indexterm zone="glibmm libgiomm-2">
@@ -162,5 +163,5 @@
         <listitem>
           <para>
-            contains the <application>GLib</application> API classes
+            contains the <application>GLib</application> API classes.
           </para>
           <indexterm zone="glibmm libglibmm-2">
Index: general/genlib/gmime3.xml
===================================================================
--- general/genlib/gmime3.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/gmime3.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -94,5 +95,4 @@
       <xref linkend="gpgme"/>,
       <xref linkend="gtk-doc"/>,
-      <xref linkend="libnsl"/>,
       <xref linkend="vala"/>, and 
       <ulink url="http://download.mono-project.com/sources/gtk-sharp/">Gtk#</ulink> (requires
@@ -171,5 +171,5 @@
           <para>
             contains API functions used by programs that need to comply to
-            the MIME standards
+            the MIME standards.
           </para>
           <indexterm zone="gmime3 libgmime-3">
Index: general/genlib/gobject-introspection.xml
===================================================================
--- general/genlib/gobject-introspection.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/gobject-introspection.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,10 +6,10 @@
 
   <!ENTITY gobject-introspection-download-http
-    "&gnome-download-http;/gobject-introspection/1.68/gobject-introspection-&gobject-introspection-version;.tar.xz">
+    "&gnome-download-http;/gobject-introspection/1.66/gobject-introspection-&gobject-introspection-version;.tar.xz">
   <!ENTITY gobject-introspection-download-ftp
-    "&gnome-download-ftp;/gobject-introspection/1.68/gobject-introspection-&gobject-introspection-version;.tar.xz">
-  <!ENTITY gobject-introspection-md5sum        "b106680b153bebb67c8987e64bbafcc6">
-  <!ENTITY gobject-introspection-size          "996 KB">
-  <!ENTITY gobject-introspection-buildsize     "64 MB (with tests)">
+    "&gnome-download-ftp;/gobject-introspection/1.66/gobject-introspection-&gobject-introspection-version;.tar.xz">
+  <!ENTITY gobject-introspection-md5sum        "f43d661d39ff52d33622cb1854aaaf76">
+  <!ENTITY gobject-introspection-size          "992 KB">
+  <!ENTITY gobject-introspection-buildsize     "55 MB (with tests)">
   <!ENTITY gobject-introspection-time          "0.2 SBU (Using parallelism=4; with tests)">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -107,12 +108,11 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
     <para>
-      To test the results, issue: <command>ninja test</command>.
-      If <xref linkend="Mako"/> is installed but the Python 3 module named
-      Markdown (not in BLFS) is not, one test named test_docwriter.py will
-      fail.
+      To test the results, issue: <command>ninja test -k0</command>.
+      One test (test_docwriter) fails if the optional Markdown module is 
+      not installed.
     </para>
 
@@ -127,7 +127,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -184,5 +181,5 @@
         <listitem>
           <para>
-            creates or extracts annotation data from GI typelibs
+            creates or extracts annotation data from GI typelibs.
           </para>
           <indexterm zone="gobject-introspection g-ir-annotation-tool">
@@ -196,5 +193,5 @@
         <listitem>
           <para>
-            converts one or more GIR files into one or more typelib
+            converts one or more GIR files into one or more typelib.
           </para>
           <indexterm zone="gobject-introspection g-ir-compiler">
@@ -210,6 +207,6 @@
             generates Mallard files that can be viewed with
             <command>yelp</command> or rendered to HTML with
-            <command>yelp-build</command> from
-            <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/yelp-tools">yelp-tools</ulink>
+            <command>yelp-build</command> from <ulink
+            url="http://ftp.acc.umu.se/pub/gnome/sources/yelp-tools">yelp-tools</ulink>.
           </para>
           <indexterm zone="gobject-introspection g-ir-doc-tool">
@@ -223,5 +220,5 @@
         <listitem>
           <para>
-            is a utility that gives information about a GI typelib
+            is a utility that gives information about a GI typelib.
           </para>
           <indexterm zone="gobject-introspection g-ir-inspect">
@@ -235,5 +232,5 @@
         <listitem>
           <para>
-            is a GIR generator that uses the repository API
+            is a GIR generator that uses the repository API.
           </para>
           <indexterm zone="gobject-introspection g-ir-generate">
@@ -248,5 +245,5 @@
           <para>
             is a tool which generates GIR XML files by parsing headers and
-            introspecting GObject based libraries
+            introspecting GObject based libraries.
           </para>
           <indexterm zone="gobject-introspection g-ir-scanner">
@@ -260,5 +257,5 @@
         <listitem>
           <para>
-            provides an API to access the typelib metadata
+            provides an API to access the typelib metadata.
           </para>
           <indexterm zone="gobject-introspection libgirepository-1.0">
Index: general/genlib/grantlee.xml
===================================================================
--- general/genlib/grantlee.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/grantlee.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/genlib/gsl.xml
===================================================================
--- general/genlib/gsl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/gsl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY gsl-download-http "&gnu-http;/gsl/gsl-&gsl-version;.tar.gz">
   <!ENTITY gsl-download-ftp  "&gnu-ftp;/gsl/gsl-&gsl-version;.tar.gz">
-  <!ENTITY gsl-md5sum        "9e47e81caaebcd92b7aca27a5348df74">
-  <!ENTITY gsl-size          "7.2 MB">
-  <!ENTITY gsl-buildsize     "256 MB (with tests, without docs)">
-  <!ENTITY gsl-time          "1.4 SBU (Using parallelism=4; with tests, without docs)">
+  <!ENTITY gsl-md5sum        "bda73a3dd5ff2f30b5956764399db6e7">
+  <!ENTITY gsl-size          "7.1 MB">
+  <!ENTITY gsl-buildsize     "275 MB (with tests, without docs)">
+  <!ENTITY gsl-time          "1.7 SBU (with tests, without docs)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -161,5 +162,5 @@
           <para>
             is a shell script to get the version number and compiler flags of
-            the installed <application>Gsl</application> library
+            the installed <application>Gsl</application> library.
           </para>
           <indexterm zone="gsl gsl-config">
@@ -174,5 +175,5 @@
           <para>
             is a demonstration program for the GNU Scientific Library that
-            computes a histogram from data taken from stdin
+            computes a histogram from data taken from stdin.
           </para>
           <indexterm zone="gsl gsl-histogram">
@@ -187,5 +188,5 @@
           <para>
             is a demonstration program for the GNU Scientific Library that
-            generates random samples from various distributions
+            generates random samples from various distributions.
           </para>
           <indexterm zone="gsl gsl-randist">
@@ -200,5 +201,5 @@
           <para>
             contains functions that implement a C interface to Basic Linear
-            Algebra Subprograms
+            Algebra Subprograms.
           </para>
           <indexterm zone="gsl libgslcblas">
@@ -213,5 +214,5 @@
           <para>
             contains functions that provide a collection of numerical routines
-            for scientific computing
+            for scientific computing.
           </para>
           <indexterm zone="gsl libgsl.so">
@@ -222,4 +223,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/genlib/gspell.xml
===================================================================
--- general/genlib/gspell.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/gspell.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -144,5 +145,5 @@
         <listitem>
           <para>
-            checks the spelling of a text entered in a window
+            checks the spelling of a text entered in a window.
           </para>
           <indexterm zone="gspell gspell-app1">
@@ -156,5 +157,5 @@
         <listitem>
           <para>
-            is the <application>gspell</application> API library
+            is the <application>gspell</application> API library.
           </para>
           <indexterm zone="gspell libgspell">
@@ -166,4 +167,3 @@
 
   </sect2>
-
 </sect1>
Index: general/genlib/icu.xml
===================================================================
--- general/genlib/icu.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/icu.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,10 +6,10 @@
 
   <!ENTITY icu-download-http
-           "https://github.com/unicode-org/icu/releases/download/release-&icu-major;-&icu-minor;/icu4c-&icu-major;_&icu-minor;-src.tgz">
+           "http://github.com/unicode-org/icu/releases/download/release-&icu-major;-&icu-minor;/icu4c-&icu-major;_&icu-minor;-src.tgz">
   <!ENTITY icu-download-ftp  " ">
-  <!ENTITY icu-md5sum        "9403db682507369d0f60a25ea67014c4">
+  <!ENTITY icu-md5sum        "c21cbdfe31a1e325afe765a16f907d20">
   <!ENTITY icu-size          "24 MB">
-  <!ENTITY icu-buildsize     "354 MB (add 36 MB for tests)">
-  <!ENTITY icu-time          "0.9 SBU (Using parallelism=4; add 2.0 SBU for tests)">
+  <!ENTITY icu-buildsize     "312 MB (add 37 MB for tests)">
+  <!ENTITY icu-time          "0.7 SBU (Using parallelism=4; add 2.2 SBU for tests)">
 ]>
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -178,5 +179,5 @@
         <listitem>
           <para>
-            disassembles a resource bundle
+            disassembles a resource bundle.
           </para>
           <indexterm zone="icu derb">
@@ -191,5 +192,5 @@
           <para>
             converts <quote>\u</quote> escaped characters into unicode
-            characters
+            characters.
           </para>
           <indexterm zone="icu escapesrc">
@@ -204,5 +205,5 @@
           <para>
             compiles ICU break iteration rules source files into binary data
-            files
+            files.
           </para>
           <indexterm zone="icu genbrk">
@@ -217,5 +218,5 @@
           <para>
             generates C or platform specific assembly code from an ICU data
-            file
+            file.
           </para>
           <indexterm zone="icu genccode">
@@ -230,5 +231,5 @@
           <para>
             reads in Unicode confusable character definitions and writes out the
-            binary data
+            binary data.
           </para>
           <indexterm zone="icu gencfu">
@@ -242,5 +243,5 @@
         <listitem>
           <para>
-            generates an ICU memory-mappable data file
+            generates an ICU memory-mappable data file.
           </para>
           <indexterm zone="icu gencmn">
@@ -254,5 +255,5 @@
         <listitem>
           <para>
-            compiles the converter's aliases file
+            compiles the converter's aliases file.
           </para>
           <indexterm zone="icu gencnval">
@@ -266,5 +267,5 @@
         <listitem>
           <para>
-            compiles word lists into ICU string trie dictionaries
+            compiles word lists into ICU string trie dictionaries.
           </para>
           <indexterm zone="icu gendict">
@@ -278,5 +279,5 @@
         <listitem>
           <para>
-            builds binary data files with Unicode normalization data
+            builds binary data files with Unicode normalization data.
           </para>
           <indexterm zone="icu gennorm2">
@@ -290,5 +291,5 @@
         <listitem>
           <para>
-            compiles a resource bundle
+            compiles a resource bundle.
           </para>
           <indexterm zone="icu genrb">
@@ -302,5 +303,5 @@
         <listitem>
           <para>
-            compiles StringPrep data from filtered RFC 3454 files
+            compiles StringPrep data from filtered RFC 3454 files.
           </para>
           <indexterm zone="icu gensprep">
@@ -314,5 +315,5 @@
         <listitem>
           <para>
-            outputs ICU build options
+            outputs ICU build options.
           </para>
           <indexterm zone="icu icu-config">
@@ -326,5 +327,5 @@
         <listitem>
           <para>
-            outputs configuration information about the current ICU
+            outputs configuration information about the current ICU.
           </para>
           <indexterm zone="icu icuinfo">
@@ -338,5 +339,5 @@
         <listitem>
           <para>
-            extracts or modifies an ICU .dat archive
+            extracts or modifies an ICU .dat archive.
           </para>
           <indexterm zone="icu icupkg">
@@ -350,5 +351,5 @@
         <listitem>
           <para>
-            compiles a converter table
+            compiles a converter table.
           </para>
           <indexterm zone="icu makeconv">
@@ -362,5 +363,5 @@
         <listitem>
           <para>
-            packages data for use by ICU
+            packages data for use by ICU.
           </para>
           <indexterm zone="icu pkgdata">
@@ -374,5 +375,5 @@
         <listitem>
           <para>
-            converts data from one encoding to another
+            converts data from one encoding to another.
           </para>
           <indexterm zone="icu uconv">
@@ -386,5 +387,5 @@
         <listitem>
           <para>
-            is the data library
+            is the data library.
           </para>
           <indexterm zone="icu libicudata">
@@ -398,5 +399,5 @@
         <listitem>
           <para>
-            is the internationalization (i18n) library
+            is the internationalization (i18n) library.
           </para>
           <indexterm zone="icu libicui18n">
@@ -410,5 +411,5 @@
         <listitem>
           <para>
-            is the ICU I/O (unicode stdio) library
+            is the ICU I/O (unicode stdio) library.
           </para>
           <indexterm zone="icu libicuio">
@@ -446,5 +447,5 @@
         <listitem>
           <para>
-            is the test library
+            is the test library.
           </para>
           <indexterm zone="icu libicutest">
@@ -458,5 +459,5 @@
         <listitem>
           <para>
-            is the tool utility library
+            is the tool utility library.
           </para>
           <indexterm zone="icu libicutu">
@@ -470,5 +471,5 @@
         <listitem>
           <para>
-            is the common library
+            is the common library.
           </para>
           <indexterm zone="icu libicuuc">
Index: general/genlib/inih.xml
===================================================================
--- general/genlib/inih.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/inih.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,11 +5,11 @@
   %general-entities;
 
-  <!ENTITY inih-download-http
+  <!ENTITY gobject-introspection-download-http
     "https://github.com/benhoyt/inih/archive/r&inih-version;/inih-r&inih-version;.tar.gz">
-  <!ENTITY inih-download-ftp  " ">
-  <!ENTITY inih-md5sum        "8b52bf308de2ad1eab94fad64c116610">
-  <!ENTITY inih-size          "17 KB">
-  <!ENTITY inih-buildsize     "0.6 MB">
-  <!ENTITY inih-time          "less than 0.1 SBU">
+  <!ENTITY gobject-introspection-download-ftp  " ">
+  <!ENTITY gobject-introspection-md5sum        "dc8b8638b84d990faa75b8558b34a68d">
+  <!ENTITY gobject-introspection-size          "20 KB">
+  <!ENTITY gobject-introspection-buildsize     "604 KB">
+  <!ENTITY gobject-introspection-time          "less than 0.1 SBU">
 ]>
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -40,30 +41,30 @@
       <listitem>
         <para>
-          Download (HTTP): <ulink url="&inih-download-http;"/>
+          Download (HTTP): <ulink url="&gobject-introspection-download-http;"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          Download (FTP): <ulink url="&inih-download-ftp;"/>
+          Download (FTP): <ulink url="&gobject-introspection-download-ftp;"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          Download MD5 sum: &inih-md5sum;
+          Download MD5 sum: &gobject-introspection-md5sum;
         </para>
       </listitem>
       <listitem>
         <para>
-          Download size: &inih-size;
+          Download size: &gobject-introspection-size;
         </para>
       </listitem>
       <listitem>
         <para>
-          Estimated disk space required: &inih-buildsize;
+          Estimated disk space required: &gobject-introspection-buildsize;
         </para>
       </listitem>
       <listitem>
         <para>
-          Estimated build time: &inih-time;
+          Estimated build time: &gobject-introspection-time;
         </para>
       </listitem>
@@ -86,5 +87,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr -Ddefault_library=shared -Ddistro_install=true .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -114,5 +115,5 @@
         </seg>
         <seg>
-          libinih.so, libINIReader.so
+          libinih.so
         </seg>
         <seg>
Index: general/genlib/jansson.xml
===================================================================
--- general/genlib/jansson.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/jansson.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY jansson-download-http "https://digip.org/jansson/releases/jansson-&jansson-version;.tar.gz">
+  <!ENTITY jansson-download-http "http://www.digip.org/jansson/releases/jansson-&jansson-version;.tar.gz">
   <!ENTITY jansson-download-ftp  " ">
   <!ENTITY jansson-md5sum        "570af45b8203e95876d71fecd56cee20">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -33,5 +34,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -128,5 +129,5 @@
         <listitem>
           <para>
-            contains an API for encoding, decoding, and manipulating JSON data
+            contains an API for encoding, decoding, and manipulating JSON data.
           </para>
           <indexterm zone="jansson libjansson">
@@ -137,4 +138,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/genlib/js78.xml
===================================================================
--- general/genlib/js78.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/js78.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,27 +5,22 @@
   %general-entities;
 
-<!-- for when firefox and js78 use same version
   <!ENTITY ff78-version       "&firefox-version;">
-  and when they are on different versions - keep this for when
-  we have moved to next firefox-esr (ff-91) and JS  has not moved 
-  <!ENTITY ff78-version       "&JS78-version;"> -->
-
-<!-- <!ENTITY ff78-version       "&firefox-version;">-->
-  <!ENTITY js78-download-http "&mozilla-http;/firefox/releases/&JS78-version;esr/source/firefox-&JS78-version;esr.source.tar.xz">
+  <!ENTITY js78-download-http "&mozilla-http;/firefox/releases/&ff78-version;esr/source/firefox-&ff78-version;esr.source.tar.xz">
   <!ENTITY js78-download-ftp  " ">
-  <!ENTITY js78-md5sum        "872623fc9f93ea8d3f3290024f0c0925">
-  <!ENTITY js78-size          "319 MB">
-  <!ENTITY js78-buildsize     "3.0 GB (36 MB installed after removing 34MB static lib)">
-  <!ENTITY js78-time          "2.4 SBU (on a 4-core machine with parallelism=4)">
+  <!ENTITY js78-md5sum        "2df7dcedba6229f243dcf327ad3e7306">
+  <!ENTITY js78-size          "323 MB">
+  <!ENTITY js78-buildsize     "3.0 GB (36 MB installed after removing 35MB static lib)">
+  <!ENTITY js78-time          "2.5 SBU (with parallelism = 4)">
 ]>
 
-<sect1 id="js78" xreflabel="js78-&JS78-version;">
+<sect1 id="js78" xreflabel="js78-&ff78-version;">
   <?dbhtml filename="js78.html"?>
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
 
-  <title>JS-&JS78-version;</title>
+  <title>JS-&ff78-version;</title>
 
   <indexterm zone="js78">
@@ -40,6 +35,4 @@
       written in C. JS78 is taken from Firefox.
     </para>
-
-    &lfs110a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -112,9 +105,20 @@
     <title>Installation of JS</title>
 
+    <caution>
+      <para>
+        If you are upgrading JS78 from a previously installed old version,
+        save all work and exit your GNOME Session if you have one running.
+        Replacing the JS78 binary will cause the GNOME Shell to crash and
+        return you to your display manager or TTY. After installing the new
+        version, if GNOME Shell still doesn't work, reinstall
+        <xref linkend="gjs"/>.
+      </para>
+    </caution>
+
     <note>
       <para>
         Unlike most other packages in BLFS, the instructions below require you
-        to untar <filename>firefox-&JS78-version;esr.tar.xz</filename> and
-        change into the <filename>firefox-&JS78-version;</filename> folder.
+        to untar <filename>firefox-&ff78-version;esr.tar.xz</filename> and
+        change into the <filename>firefox-&ff78-version;</filename> folder.
       </para>
 
@@ -160,9 +164,4 @@
         <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
          href="../../xincludes/mozconfigure.xml"/>
-
-        <para>
-          Compiling the C++ code respects $MAKEFLAGS and defaults to 'j1',
-          the rust code will use all processors.
-        </para>
      </note>
 
@@ -182,5 +181,5 @@
 
     <para>
-      To run the JS test suite, issue:
+      To run JS test suite, issue:
       <command>make -C js/src check-jstests
       JSTESTS_EXTRA_ARGS="--timeout 300 --wpt=disabled"</command>.
@@ -195,22 +194,10 @@
       Depending on the machine, either
       ten or fourteen JS tests related to locale and timezone fail,
-      because of an issue with recent versions of <xref linkend="icu"/>.
-    </para>
-    <para>
+      because of an issue in <xref linkend="icu"/>.
       To run the JIT test suite, issue:
       <command>make -C js/src check-jit-test
-      JITTEST_EXTRA_ARGS="--timeout 300"</command>. One test may fail.
-    </para>
-
-    <caution>
-      <para>
-        An issue in the installation process causes any running program which
-        links to JS78 shared library (for example, GNOME Shell) to crash if
-        JS78 is upgraded or reinstalled.  To work around this issue, remove
-        the old version of the JS78 shared library before installation:
-      </para>
-
-<screen role="root"><userinput>rm -fv /usr/lib/libmozjs-78.so</userinput></screen>
-    </caution>
+      JITTEST_EXTRA_ARGS="--timeout 300"</command>. Again, a few tests
+      may show as unexpected failures.
+    </para>
 
     <para>
@@ -304,5 +291,5 @@
           <para>
             provides a command line interface to the
-            <application>JavaScript</application> engine
+            <application>JavaScript</application> engine.
           </para>
           <indexterm zone="js78 js78">
@@ -316,5 +303,5 @@
         <listitem>
           <para>
-            is used to find the JS compiler and linker flags
+            is used to find the JS compiler and linker flags.
           </para>
           <indexterm zone="js78 js78-config">
@@ -328,5 +315,5 @@
         <listitem>
           <para>
-            contains the Mozilla JavaScript API functions
+            contains the Mozilla JavaScript API functions.
           </para>
           <indexterm zone="js78 libmozjs-78">
@@ -337,4 +324,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/genlib/json-c.xml
===================================================================
--- general/genlib/json-c.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/json-c.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -165,5 +166,5 @@
         <listitem>
           <para>
-            contains the <application>JSON-C</application> API functions
+            contains the <application>JSON-C</application> API functions.
           </para>
           <indexterm zone="json-c libjson-c">
Index: general/genlib/json-glib.xml
===================================================================
--- general/genlib/json-glib.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/json-glib.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY json-glib-download-http "&gnome-download-http;/json-glib/1.6/json-glib-&json-glib-version;.tar.xz">
   <!ENTITY json-glib-download-ftp  "&gnome-download-ftp;/json-glib/1.6/json-glib-&json-glib-version;.tar.xz">
-  <!ENTITY json-glib-md5sum        "9c40fcd8cdbf484dd1704480afefae14">
-  <!ENTITY json-glib-size          "1.2 MB">
-  <!ENTITY json-glib-buildsize     "6.6 MB (with tests)">
-  <!ENTITY json-glib-time          "less than 0.1 SBU (with tests)">
+  <!ENTITY json-glib-md5sum        "b0046d7de4c0fcbb3c71650527330fa6">
+  <!ENTITY json-glib-size          "168 KB">
+  <!ENTITY json-glib-buildsize     "12 MB (with tests)">
+  <!ENTITY json-glib-time          "0.2 SBU (with tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -104,5 +105,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -117,11 +118,4 @@
 <screen role="root"><userinput>ninja install</userinput></screen>
 
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
   </sect2>
 
@@ -158,5 +152,5 @@
         <listitem>
           <para>
-            is a simple command line interface to format JSON data
+            is a simple command line interface to format JSON data.
           </para>
           <indexterm zone="json-glib json-glib-format">
@@ -170,5 +164,5 @@
         <listitem>
           <para>
-            is a simple command line interface to validate JSON data
+            is a simple command line interface to validate JSON data.
           </para>
           <indexterm zone="json-glib json-glib-validate">
@@ -182,5 +176,5 @@
         <listitem>
           <para>
-            contains the <application>JSON GLib</application> API functions
+            contains the <application>JSON GLib</application> API functions.
           </para>
           <indexterm zone="json-glib libjson-glib-1">
Index: general/genlib/keyutils.xml
===================================================================
--- general/genlib/keyutils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/keyutils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY keyutils-download-http "https://people.redhat.com/~dhowells/keyutils/keyutils-&keyutils-version;.tar.bz2">
+  <!ENTITY keyutils-download-http "http://people.redhat.com/~dhowells/keyutils/keyutils-&keyutils-version;.tar.bz2">
   <!ENTITY keyutils-download-ftp  " ">
   <!ENTITY keyutils-md5sum        "919af7f33576816b423d537f8a8692e8">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -102,5 +103,7 @@
     </para>
 
-<screen role="root" remap="test"><userinput>make -k test</userinput></screen>
+<screen role="root"
+        remap="test"><userinput>sed -i '/find/s:/usr/bin/::' tests/Makefile &amp;&amp;
+make -k test </userinput></screen> 
 
     <para>
@@ -114,5 +117,5 @@
     </para>
 
-<screen role="root"><userinput>make NO_ARLIB=1 LIBDIR=/usr/lib BINDIR=/usr/bin SBINDIR=/usr/sbin install</userinput></screen>
+<screen role="root"><userinput>make NO_ARLIB=1 install</userinput></screen>
 
   </sect2>
@@ -180,5 +183,5 @@
         <listitem>
           <para>
-            controls the key management facility with a variety of subcommands
+            controls the key management facility with a variety of subcommands.
           </para>
           <indexterm zone="keyutils keyctl">
@@ -195,5 +198,5 @@
             kernel when kernel services (such as NFS, CIFS and AFS) need to
             perform a hostname lookup and the kernel does not have the key
-            cached.  It is not ordinarily intended to be called directly
+            cached.  It is not ordinarily intended to be called directly.
           </para>
           <indexterm zone="keyutils key.dns_resolver">
@@ -210,5 +213,5 @@
             doesn't have immediately available. The kernel creates a temporary
             key and then calls out to this program to instantiate it.  It is
-            not intended to be called directly
+            not intended to be called directly.
           </para>
           <indexterm zone="keyutils request-key">
@@ -219,8 +222,8 @@
 
       <varlistentry id="libkeyutils">
-        <term><filename class="libraryfile">libkeyutils.so</filename></term>
-        <listitem>
-          <para>
-            contains the keyutils library API instantiation
+        <term><filename class='libraryfile'>libkeyutils.so</filename></term>
+        <listitem>
+          <para>
+            contains the keyutils library API instantiation.
           </para>
           <indexterm zone="keyutils libkeyutils">
Index: general/genlib/libaio.xml
===================================================================
--- general/genlib/libaio.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libaio.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libaio-download-http "https://ftp.debian.org/debian/pool/main/liba/libaio/libaio_&libaio-version;.orig.tar.xz">
+  <!ENTITY libaio-download-http "http://ftp.de.debian.org/debian/pool/main/liba/libaio/libaio_&libaio-version;.orig.tar.xz">
   <!ENTITY libaio-download-ftp  " ">
   <!ENTITY libaio-md5sum        "66e3b7dd255581a73542ee851f8cd737">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -97,11 +98,4 @@
 
     <para>
-      If you want to run the testsuite, fix an issue with Glibc-2.34 or
-      later:
-    </para>
-
-<screen><userinput>sed 's/-Werror//' -i harness/Makefile</userinput></screen>
-
-    <para>
       To test the results, issue: <command>make partcheck</command>.
     </para>
@@ -151,8 +145,8 @@
 
       <varlistentry id="libaio-lib">
-        <term><filename class="libraryfile">libaio.so</filename></term>
+        <term><filename class='libraryfile'>libaio.so</filename></term>
         <listitem>
           <para>
-            is the libaio library
+            is the libaio library. 
           </para>
           <indexterm zone="libaio libaio-lib">
Index: general/genlib/libarchive.xml
===================================================================
--- general/genlib/libarchive.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libarchive.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY libarchive-download-http "https://github.com/libarchive/libarchive/releases/download/v&libarchive-version;/libarchive-&libarchive-version;.tar.xz">
+  <!ENTITY libarchive-download-http "https://github.com/libarchive/libarchive/releases/download/&libarchive-version;/libarchive-&libarchive-version;.tar.xz">
   <!ENTITY libarchive-download-ftp  " ">
-  <!ENTITY libarchive-md5sum        "2ba9f1f8c169aa9caf8e2d34dde323be">
+  <!ENTITY libarchive-md5sum        "1f8c29149832baff8bae232fd2f9b0ec">
   <!ENTITY libarchive-size          "4.7 MB">
-  <!ENTITY libarchive-buildsize     "40 MB (add 28 MB for tests)">
+  <!ENTITY libarchive-buildsize     "40 MB (add 29 MB for tests)">
   <!ENTITY libarchive-time          "0.3 SBU (add 1.0 SBU for tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -175,5 +176,5 @@
         <listitem>
           <para>
-            expands files to standard output
+            expands files to standard output.
           </para>
           <indexterm zone="libarchive bsdcat">
@@ -187,5 +188,5 @@
         <listitem>
           <para>
-            is a tool similar to <command>cpio</command>
+            is a tool similar to <command>cpio</command>.
           </para>
           <indexterm zone="libarchive bsdcpio">
@@ -199,5 +200,5 @@
         <listitem>
           <para>
-            is a tool similar to GNU <command>tar</command>
+            is a tool similar to GNU <command>tar</command>.
           </para>
           <indexterm zone="libarchive bsdtar">
@@ -212,5 +213,5 @@
           <para>
             is a library that can create and read several streaming
-            archive formats
+            archive formats.
           </para>
           <indexterm zone="libarchive libarchive-lib">
Index: general/genlib/libassuan.xml
===================================================================
--- general/genlib/libassuan.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libassuan.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,8 +8,8 @@
   <!ENTITY libassuan-download-ftp  "&gnupg-ftp;/libassuan/libassuan-&libassuan-version;.tar.bz2">
   <!ENTITY libassuan-download-ftp  " ">
-  <!ENTITY libassuan-md5sum        "7194453152bb67e3d45da698762b5d6f">
-  <!ENTITY libassuan-size          "559 KB">
-  <!ENTITY libassuan-buildsize     "7.4 MB (with tests, add 3.4 MB for documentation)">
-  <!ENTITY libassuan-time          "0.1 SBU (with tests and documentation)">
+  <!ENTITY libassuan-md5sum        "d5cee3492f0e0c4fd537af798621dd5b">
+  <!ENTITY libassuan-size          "564 KB">
+  <!ENTITY libassuan-buildsize     "6.7 MB (with tests)">
+  <!ENTITY libassuan-time          "0.1 SBU (with tests)">
 ]>
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -42,5 +43,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -178,5 +179,5 @@
         <listitem>
           <para>
-            is a <filename class="libraryfile">libassuan</filename> build information script
+            is a <filename class="libraryfile">libassuan</filename> build information script.
           </para>
           <indexterm zone="libassuan libassuan-config">
@@ -191,5 +192,5 @@
           <para>
             is an inter process communication library which
-            implements the Assuan protocol
+            implements the Assuan protocol.
           </para>
           <indexterm zone="libassuan libassuan-lib">
Index: general/genlib/libatasmart.xml
===================================================================
--- general/genlib/libatasmart.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libatasmart.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -136,5 +137,5 @@
         <listitem>
           <para>
-            is a utility that reports on the status of the disk
+            is a utility that reports on the status of the disk.
           </para>
           <indexterm zone="libatasmart skdump">
@@ -148,5 +149,5 @@
         <listitem>
           <para>
-            is a utility to issue disks tests
+            is a utility to issue disks tests.
           </para>
           <indexterm zone="libatasmart sktest">
@@ -157,8 +158,8 @@
 
       <varlistentry id="libatasmart-lib">
-        <term><filename class="libraryfile">libatasmart.so</filename></term>
+        <term><filename class='libraryfile'>libatasmart.so</filename></term>
         <listitem>
           <para>
-            contains the ATA S.M.A.R.T API functions
+            contains the ATA S.M.A.R.T API functions.
           </para>
           <indexterm zone="libatasmart libatasmart-lib">
Index: general/genlib/libatomic_ops.xml
===================================================================
--- general/genlib/libatomic_ops.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libatomic_ops.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -149,5 +150,5 @@
         <listitem>
           <para>
-            contains functions for atomic memory operations
+            contains functions for atomic memory operations.
           </para>
           <indexterm zone="libatomic_ops libatomic_ops-lib">
Index: general/genlib/libblockdev.xml
===================================================================
--- general/genlib/libblockdev.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libblockdev.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,6 +8,6 @@
     "https://github.com/storaged-project/libblockdev/releases/download/&libblockdev-version;-1/libblockdev-&libblockdev-version;.tar.gz">
   <!ENTITY libblockdev-download-ftp " ">
-  <!ENTITY libblockdev-md5sum        "d022c1ebb9b9a838c1a8c8b2b781b69d">
-  <!ENTITY libblockdev-size          "912 KB">
+  <!ENTITY libblockdev-md5sum        "266275451c743852ffe995aeec2e1791">
+  <!ENTITY libblockdev-size          "888 KB">
   <!ENTITY libblockdev-buildsize     "12 MB">
   <!ENTITY libblockdev-time          "0.2 SBU">
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -90,5 +91,5 @@
       <xref linkend="gtk-doc"/>,
       <xref linkend="mdadm"/>,
-      <ulink url="https://people.redhat.com/~heinzm/sw/dmraid/">dmraid</ulink>,
+      <ulink url="http://people.redhat.com/~heinzm/sw/dmraid/">dmraid</ulink>,
       <ulink url="http://bcachefs.org/">bcachefs</ulink>, and
       <ulink url="https://github.com/pmem/ndctl">ndctl</ulink>
@@ -102,13 +103,5 @@
   <sect2 role="installation">
     <title>Installation of libblockdev</title>
-<!--
-    <para>
-      Fix the usage of a glib function deprecated for security:
-    </para>
 
-<screen><userinput>sed 's/g_memdup/&amp;2/' -i             \
-    src/lib/plugin_apis/vdo.{c,api} \
-    src/plugins/vdo.c</userinput></screen>
--->
     <para>
       Install <application>libblockdev</application> by running
@@ -188,5 +181,5 @@
         <listitem>
           <para>
-            prints statistics on caches on LVM Logical Volumes
+            prints statistics on caches on LVM Logical Volumes.
           </para>
           <indexterm zone="libblockdev lvm-cache-stats">
Index: general/genlib/libbytesize.xml
===================================================================
--- general/genlib/libbytesize.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libbytesize.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY libbytesize-download-http "https://github.com/storaged-project/libbytesize/releases/download/&libbytesize-version;/libbytesize-&libbytesize-version;.tar.gz">
   <!ENTITY libbytesize-download-ftp  " ">
-  <!ENTITY libbytesize-md5sum        "2c1d253452fd6610b5857add0195698f">
-  <!ENTITY libbytesize-size          "436 KB">
-  <!ENTITY libbytesize-buildsize     "3.4 MB">
+  <!ENTITY libbytesize-md5sum        "86013104fb48422f6030a02532e038a1">
+  <!ENTITY libbytesize-size          "427 KB">
+  <!ENTITY libbytesize-buildsize     "3.9 MB">
   <!ENTITY libbytesize-time          "less than 0.1 SBU (including tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -74,5 +75,6 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="pcre2"/>
+      <xref linkend="pcre2"/> and
+      <xref linkend="pygments"/>
     </para>
 
@@ -160,5 +162,5 @@
           <para>
             converts from a larger unit, such as MB or TB,
-            back to a value in bytes
+            back to a value in bytes.
           </para>
           <indexterm zone="libbytesize bscalc">
@@ -169,9 +171,9 @@
 
       <varlistentry id="libbytesize-lib">
-        <term><filename class="libraryfile">libbytesize.so</filename></term>
+        <term><filename class='libraryfile'>libbytesize.so</filename></term>
         <listitem>
           <para>
             contains functions used to handle common read/write operations
-            with sizes in bytes
+            with sizes in bytes.
           </para>
           <indexterm zone="libbytesize libbytesize-lib">
Index: general/genlib/libdaemon.xml
===================================================================
--- general/genlib/libdaemon.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libdaemon.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -160,8 +161,8 @@
 
       <varlistentry id="libdaemon-lib">
-        <term><filename class="libraryfile">libdaemon.so</filename></term>
+        <term><filename class='libraryfile'>libdaemon.so</filename></term>
         <listitem>
           <para>
-            contains the <application>libdaemon</application> API functions
+            contains the <application>libdaemon</application> API functions.
           </para>
           <indexterm zone="libdaemon libdaemon-lib">
Index: general/genlib/libgcrypt.xml
===================================================================
--- general/genlib/libgcrypt.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libgcrypt.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,8 +8,8 @@
   <!ENTITY libgcrypt-download-ftp  "&gnupg-ftp;/libgcrypt/libgcrypt-&libgcrypt-version;.tar.bz2">
   <!ENTITY libgcrypt-download-ftp  " ">
-  <!ENTITY libgcrypt-md5sum        "edc7becfe09c75d8f95ff7623e40c52e">
-  <!ENTITY libgcrypt-size          "3.1 MB">
-  <!ENTITY libgcrypt-buildsize     "135 MB (with tests and pdf documentation)">
-  <!ENTITY libgcrypt-time          "0.4 SBU (with documentation; add 0.5 SBU for tests)">
+  <!ENTITY libgcrypt-md5sum        "291c40a06d6fc2f285a34f0f0e846325">
+  <!ENTITY libgcrypt-size          "2.8 MB">
+  <!ENTITY libgcrypt-buildsize     "52 MB (with tests; add 4 MB for documentation)">
+  <!ENTITY libgcrypt-time          "0.3 SBU (with documentation; add 0.4 SBU for tests)">
 ]>
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -190,5 +191,5 @@
         <listitem>
           <para>
-            is a debug tool for S-expressions
+            is a debug tool for S-expressions.
           </para>
           <indexterm zone="libgcrypt dumpsexp">
@@ -203,5 +204,5 @@
           <para>
             is a standalone HMAC-SHA-256 implementation used to compute
-            an HMAC-SHA-256 authentication code
+            an HMAC-SHA-256 authentication code.
           </para>
           <indexterm zone="libgcrypt hmac256">
@@ -216,5 +217,5 @@
           <para>
             determines the compile and linker flags that should be used to
-            compile and link programs that use <filename class="libraryfile">libgcrypt</filename>
+            compile and link programs that use <filename class="libraryfile">libgcrypt</filename>.
           </para>
           <indexterm zone="libgcrypt libgcrypt-config">
@@ -228,5 +229,5 @@
         <listitem>
           <para>
-            is a RPN (Reverse Polish Notation) calculator
+            is a RPN (Reverse Polish Notation) calculator.
           </para>
           <indexterm zone="libgcrypt mpicalc">
@@ -240,5 +241,5 @@
         <listitem>
           <para>
-            contains the cryptographic API functions
+            contains the cryptographic API functions.
           </para>
           <indexterm zone="libgcrypt libgcrypt-lib">
Index: general/genlib/libgpg-error.xml
===================================================================
--- general/genlib/libgpg-error.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libgpg-error.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,7 +8,7 @@
   <!ENTITY libgpg-error-download-ftp  "&gnupg-ftp;/libgpg-error/libgpg-error-&libgpg-error-version;.tar.bz2">
   <!ENTITY libgpg-error-download-ftp  " ">
-  <!ENTITY libgpg-error-md5sum        "133fed221ba8f63f5842858a1ff67cb3">
-  <!ENTITY libgpg-error-size          "951 KB">
-  <!ENTITY libgpg-error-buildsize     "13 MB (with tests)">
+  <!ENTITY libgpg-error-md5sum        "36e9e7e6fffefac1eae5a1a49f14ac4f">
+  <!ENTITY libgpg-error-size          "948 KB">
+  <!ENTITY libgpg-error-buildsize     "10 MB (with tests)">
   <!ENTITY libgpg-error-time          "0.1 SBU (with tests)">
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -134,5 +135,5 @@
           <para>
             is used to determine <application>libgpg-error</application>
-            error codes
+            error codes.
           </para>
           <indexterm zone="libgpg-error gpg-error">
@@ -150,5 +151,5 @@
             to query the C compiler and linker flags which are required to
             correctly compile and link the application against the
-            <application>libgpg-error</application> library
+            <application>libgpg-error</application> library.
           </para>
           <indexterm zone="libgpg-error gpg-error-config">
@@ -162,5 +163,5 @@
         <listitem>
           <para>
-            is the same script as <command>gpg-error-config</command>
+            is the same script as <command>gpg-error-config</command>.
           </para>
           <indexterm zone="libgpg-error gpgrt-config">
@@ -174,5 +175,5 @@
         <listitem>
           <para>
-            extracts man pages from a Texinfo source
+            extracts man pages from a Texinfo source.
           </para>
           <indexterm zone="libgpg-error yat2m">
@@ -187,5 +188,5 @@
           <para>
             contains the <application>libgpg-error</application> API
-            functions
+            functions.
           </para>
           <indexterm zone="libgpg-error libgpg-error-lib">
Index: general/genlib/libgrss.xml
===================================================================
--- general/genlib/libgrss.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libgrss.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -87,9 +88,4 @@
     </para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/libgrss"/>
@@ -107,5 +103,5 @@
 
 <screen><userinput>patch -Np1 -i ../libgrss-&libgrss-version;-bugfixes-1.patch &amp;&amp;
-autoreconf -fv &amp;&amp;
+autoreconf -fiv &amp;&amp;
 ./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
@@ -164,5 +160,5 @@
         <listitem>
           <para>
-            provides API functions for handling RSS feeds
+            provides API functions for handling RSS feeds.
           </para>
           <indexterm zone="libgrss libgrss-lib">
@@ -173,4 +169,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/genlib/libgsf.xml
===================================================================
--- general/genlib/libgsf.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libgsf.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -108,5 +109,7 @@
 
     <para>
-      To test the results, issue: <command>make check</command>.
+      To test the results, issue: <command>make check</command>. Two
+      tests, t1004-zip-zip64.pl and t1005-zip-nonseekable.pl, 
+      are known to fail.
     </para>
 
@@ -162,5 +165,5 @@
         <listitem>
           <para>
-            is a simple archive utility, somewhat similar to tar(1)
+            is a simple archive utility, somewhat similar to tar(1).
           </para>
           <indexterm zone="libgsf gsf">
@@ -176,5 +179,5 @@
             is used internally by <application>GNOME</application> applications
             such as <application>Nautilus</application> to generate
-            thumbnails of several types of office application files
+            thumbnails of several types of office application files.
           </para>
           <indexterm zone="libgsf gsf-office-thumbnailer">
@@ -188,5 +191,5 @@
         <listitem>
           <para>
-            is used to extract Visual Basic for Applications macros from files
+            is used to extract Visual Basic for Applications macros from files.
           </para>
           <indexterm zone="libgsf gsf-vba-dump">
@@ -200,5 +203,5 @@
         <listitem>
           <para>
-            contains the <application>libgsf</application> API functions
+            contains the <application>libgsf</application> API functions.
           </para>
           <indexterm zone="libgsf libgsf-1">
Index: general/genlib/libgudev.xml
===================================================================
--- general/genlib/libgudev.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libgudev.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -9,7 +9,7 @@
   <!ENTITY libgudev-download-ftp
            "&gnome-download-ftp;/libgudev/&libgudev-version;/libgudev-&libgudev-version;.tar.xz">
-  <!ENTITY libgudev-md5sum        "a7783083cd74957d3a727ddc4737ee84">
-  <!ENTITY libgudev-size          "32 KB">
-  <!ENTITY libgudev-buildsize     "1.8 MB">
+  <!ENTITY libgudev-md5sum        "386889d460003a4242a64cb47244a39a">
+  <!ENTITY libgudev-size          "268 KB">
+  <!ENTITY libgudev-buildsize     "4.1 MB">
   <!ENTITY libgudev-time          "less than 0.1 SBU">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -97,12 +98,10 @@
     </para>
 
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
+<screen><userinput>./configure --prefix=/usr --disable-umockdev &amp;&amp;
+make</userinput></screen>
 
     <para>
-      To test the results, issue: <command>ninja test</command>.
+      If you wish to run the test suite, omit "--disable-umockdev" from the
+      configure command and then issue: <command>make check</command>.
     </para>
 
@@ -111,5 +110,5 @@
     </para>
 
-<screen role="root"><userinput>ninja install</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
@@ -119,21 +118,12 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
 
     <para>
-      <option>-Dgtk_doc=true</option>: Use this option if GTK-Doc is installed
-      and you wish to build and install the API documentation.
-    </para>
-
-    <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>-->
-
-<!-- With meson, the tests will be disabled automatically without umockdev present.
-    <para>
-      <parameter>- -disable-umockdev</parameter>: Disables the usage of
+      <parameter>--disable-umockdev</parameter>: Disables the usage of
       <xref role="nodep" linkend="umockdev"/>. Omit this switch if you
       wish to run the test suite.
     </para>
--->
+
   </sect2>
 
@@ -169,5 +159,5 @@
         <listitem>
           <para>
-            is a GObject-based wrapper library for libudev
+            is a GObject-based wrapper library for libudev.
           </para>
           <indexterm zone="libgudev libgudev-1.0">
Index: general/genlib/libgusb.xml
===================================================================
--- general/genlib/libgusb.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libgusb.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY libgusb-download-http "https://github.com/hughsie/libgusb/archive/&libgusb-version;/libgusb-&libgusb-version;.tar.gz">
+  <!ENTITY libgusb-download-http "https://people.freedesktop.org/~hughsient/releases/libgusb-&libgusb-version;.tar.xz">
   <!ENTITY libgusb-download-ftp  " ">
-  <!ENTITY libgusb-md5sum        "b980fe26244b108db6692b00865af1b4">
-  <!ENTITY libgusb-size          "52 KB">
-  <!ENTITY libgusb-buildsize     "1.9 MB (with tests)">
+  <!ENTITY libgusb-md5sum        "61022fb9abf16804ed3541a67af7d695">
+  <!ENTITY libgusb-size          "44 KB">
+  <!ENTITY libgusb-buildsize     "2.3 MB (with tests)">
   <!ENTITY libgusb-time          "less than 0.1 SBU (with tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -81,5 +82,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="gtk-doc"/>,
+      <xref linkend="gtk-doc"/>
       <xref linkend="gobject-introspection"/>,
       <xref linkend="usbutils"/> (for <filename>usb.ids</filename> data file,
@@ -104,5 +105,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release -Ddocs=false .. &amp;&amp;
+meson --prefix=/usr -Ddocs=false .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -120,7 +121,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -163,5 +161,5 @@
         <listitem>
           <para>
-            is a debugging tool for the libgusb library
+            is a debugging tool for the libgusb library.
           </para>
           <indexterm zone="libgusb gusbcmd">
@@ -175,5 +173,5 @@
         <listitem>
           <para>
-            contains the <application>libgusb</application> API functions
+            contains the <application>libgusb</application> API functions.
           </para>
           <indexterm zone="libgusb libgusb-lib">
Index: general/genlib/libical.xml
===================================================================
--- general/genlib/libical.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libical.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY libical-download-http "https://github.com/libical/libical/releases/download/v&libical-version;/libical-&libical-version;.tar.gz">
   <!ENTITY libical-download-ftp  " ">
-  <!ENTITY libical-md5sum        "0992e55d8408783a3c63d6000ed802d2">
-  <!ENTITY libical-size          "872 KB">
-  <!ENTITY libical-buildsize     "22 MB (with tests)">
-  <!ENTITY libical-time          "0.1 SBU (Using parallelism=4; with tests)">
+  <!ENTITY libical-md5sum        "41bd1f1fcdcb4779cea478bb55cf07bf">
+  <!ENTITY libical-size          "864 KB">
+  <!ENTITY libical-buildsize     "21 MB (with tests)">
+  <!ENTITY libical-time          "0.2 SBU (Using parallelism=4; with tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -81,5 +82,5 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/> and 
-      <xref linkend="vala"/> (both required for GNOME)
+      <xref linkend="vala"/>(both required for Gnome)
     </para>
 
@@ -88,5 +89,4 @@
       <xref linkend="db"/>,
       <xref linkend="doxygen"/> (for the API documentation),
-      <xref linkend="gtk-doc"/> (for the API documentation),
       <xref linkend="icu"/>, and
       <xref linkend="pygobject3"/> (for some tests)
@@ -101,5 +101,4 @@
     <title>Installation of libical</title>
 
-<!-- Not needed with 3.0.9
     <para>First make some fixes for the latest versions of icu and Python:</para>
 
@@ -107,5 +106,4 @@
 sed -i 's/array/arraytest/'       src/test/libical-glib/CMakeLists.txt &amp;&amp;
 mv src/test/libical-glib/array.py src/test/libical-glib/arraytest.py</userinput></screen>
--->
 
     <para>
@@ -129,12 +127,14 @@
       .. &amp;&amp;
 make</userinput></screen>
-
-    <para>
-      If you have <xref linkend="doxygen"/> and <xref linkend="gtk-doc"/> 
-      installed and wish to build the API documentation, issue:
+<!-- DEVS: the ICAL_BUILD_DOCS=false switch is needed because gtk-doc-1.30 is
+     broken. Unfortunately, it also prevents running make docs. When gtk-doc
+     is fixed, remove the switch and uncomment this.
+    <para>
+      If you have <xref linkend="doxygen"/> installed and wish to build the API
+      documentation, issue:
     </para>
 
 <screen remap="doc"><userinput>make docs</userinput></screen>
-
+-->
     <para>
       To test the results, issue: <command>make test</command>.
@@ -150,5 +150,5 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-
+<!-- see above:
     <para>
       If you have built the API documentation, install by issuing, as
@@ -159,5 +159,5 @@
         remap="doc"><userinput>install -vdm755 /usr/share/doc/libical-&libical-version;/html &amp;&amp;
 cp -vr apidocs/html/* /usr/share/doc/libical-&libical-version;/html</userinput></screen>
-
+-->
   </sect2>
 
@@ -175,10 +175,10 @@
     </para>
 
-    <!--
     <para>
       <parameter>-DICAL_BUILD_DOCS=false</parameter>: This switch prevents
-      building the <application>GTK</application> documentation.
-    </para>
-    -->
+      building the <application>GTK</application> documentation, because
+      gtk-doc-1.30 is broken. Unfortunately, it also prevents building the
+      API documentation.
+    </para>
 
     <para>
@@ -223,17 +223,10 @@
         </seg>
         <seg>
-          libical_cxx.so, 
-          libical.so, 
-          libical-glib.so, 
-          libicalss_cxx.so, 
-          libicalss.so,
+          libical_cxx.so, libical.so, libicalss_cxx.so, libicalss.so,
           and libicalvcal.so
         </seg>
         <seg>
-          /usr/include/libical, 
-          /usr/include/libical-glib, 
-          /usr/lib/cmake/LibIcal, 
-          /usr/libexec/libical, 
-          and /usr/share/doc/libical-&libical-version;/html
+          /usr/include/libical, /usr/lib/cmake/LibIcal and
+          /usr/share/doc/libical-&libical-version;/html
         </seg>
       </seglistitem>
@@ -250,5 +243,5 @@
           <para>
             contains the <application>libical</application> API
-            functions
+            functions.
           </para>
           <indexterm zone="libical libical-lib">
@@ -262,5 +255,5 @@
         <listitem>
           <para>
-            contains the <application>libical</application> C++ bindings
+            contains the <application>libical</application> C++ bindings.
           </para>
           <indexterm zone="libical libical_cxx-lib">
@@ -270,16 +263,4 @@
       </varlistentry>
 
-      <varlistentry id="libical-glib">
-        <term><filename class="libraryfile">libical-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libical</application> glib bindings
-          </para>
-          <indexterm zone="libical libical-glib">
-            <primary sortas="c-libical-glib">libical-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libicalss">
         <term><filename class="libraryfile">libicalss.so</filename></term>
@@ -287,5 +268,5 @@
           <para>
             is a library that allows you to store iCal component data
-            to disk in a variety of ways
+            to disk in a variety of ways.
           </para>
           <indexterm zone="libical libicalss">
@@ -300,5 +281,5 @@
           <para>
             contains the <application>libicalss</application> C++
-            bindings
+            bindings.
           </para>
           <indexterm zone="libical libicalss_cxx">
@@ -312,5 +293,5 @@
         <listitem>
           <para>
-            is a vCard/vCalendar C interface
+            is a vCard/vCalendar C interface.
           </para>
           <indexterm zone="libical libicalvcal">
Index: general/genlib/libidn.xml
===================================================================
--- general/genlib/libidn.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libidn.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY libidn-download-http "&gnu-http;/libidn/libidn-&libidn-version;.tar.gz">
   <!ENTITY libidn-download-ftp  "&gnu-ftp;/libidn/libidn-&libidn-version;.tar.gz">
-  <!ENTITY libidn-md5sum        "718ff3700dd71f830c592ebe97249193">
-  <!ENTITY libidn-size          "2.6 MB">
-  <!ENTITY libidn-buildsize     "18 MB (with tests)">
-  <!ENTITY libidn-time          "0.2 SBU (with tests)">
+  <!ENTITY libidn-md5sum        "813c7b268d1051ca02c3610986126f38">
+  <!ENTITY libidn-size          "4.3 MB">
+  <!ENTITY libidn-buildsize     "28 MB (add 13 MB for tests)">
+  <!ENTITY libidn-time          "0.2 SBU (using parallelim=4; add 0.6 SBU for tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -45,5 +46,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -110,10 +111,7 @@
 
     <para>
-      To test the results, run:
-    </para>
-
-<screen remap="test"><userinput>pushd tests  &amp;&amp;
-  make check &amp;&amp;
-popd </userinput></screen>
+<!--      This package does not come with a functional test suite. -->
+      To test the results, issue: <command>make check</command>.
+    </para>
 
     <para>
@@ -173,5 +171,5 @@
           <para>
             is a command line interface to the internationalized domain
-            name library
+            name library.
           </para>
           <indexterm zone="libidn idn">
@@ -182,5 +180,5 @@
 
       <varlistentry id="libidn-lib">
-        <term><filename class="libraryfile">libidn.so</filename></term>
+        <term><filename class='libraryfile'>libidn.so</filename></term>
         <listitem>
           <para>
@@ -192,5 +190,5 @@
             Domain (TLD) specific validation tables, and to compare strings
             against those tables, as well as default tables for some TLDs are
-            included
+            included.
           </para>
           <indexterm zone="libidn libidn-lib">
Index: general/genlib/libidn2.xml
===================================================================
--- general/genlib/libidn2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libidn2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY libidn2-download-http "&gnu-http;/libidn/libidn2-&libidn2-version;.tar.gz">
   <!ENTITY libidn2-download-ftp  "&gnu-ftp;/libidn/libidn2-&libidn2-version;.tar.gz">
-  <!ENTITY libidn2-md5sum        "fb54962eb68cf22d47a4ae61f0aba993">
+  <!ENTITY libidn2-md5sum        "01c5084995295e519f95978ae9785ee0">
   <!ENTITY libidn2-size          "2.1 MB">
   <!ENTITY libidn2-buildsize     "21 MB (with tests)">
-  <!ENTITY libidn2-time          "0.2 SBU (with tests)">
+  <!ENTITY libidn2-time          "0.1 SBU (with tests)">
 ]>
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -135,5 +136,5 @@
       <seglistitem>
         <seg>
-          idn2
+          libidn2
         </seg>
         <seg>
@@ -160,5 +161,5 @@
           <para>
             is a command line interface to the internationalized domain
-            library
+            library.
           </para>
           <indexterm zone="libidn2 idn2">
@@ -173,5 +174,5 @@
           <para>
             contains a generic Stringprep implementation used for
-            internationalized string handling
+            internationalized string handling.
           </para>
           <indexterm zone="libidn2 libidn2-lib">
@@ -182,4 +183,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/genlib/libiodbc.xml
===================================================================
--- general/genlib/libiodbc.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libiodbc.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY libiodbc-download-http "&sourceforge-dl;/iodbc/libiodbc-&libiodbc-version;.tar.gz">
   <!ENTITY libiodbc-download-ftp  " ">
-  <!ENTITY libiodbc-md5sum        "89949a41e542bb1b880d7fcc4987dad2">
-  <!ENTITY libiodbc-size          "1.0 MB">
+  <!ENTITY libiodbc-md5sum        "c76cab12a642a024bd1a262615a1a4a8">
+  <!ENTITY libiodbc-size          "1.1 MB">
   <!ENTITY libiodbc-buildsize     "26 MB">
-  <!ENTITY libiodbc-time          "0.2 SBU">
+  <!ENTITY libiodbc-time          "0.3 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -160,5 +161,5 @@
         <listitem>
           <para>
-            is a utility for retrieving the installation options of libiodbc
+            is a utility for retrieving the installation options of libiodbc.
           </para>
           <indexterm zone="libiodbc iodbc-config">
@@ -172,5 +173,5 @@
         <listitem>
           <para>
-            are interactive SQL processors
+            are interactive SQL processors.
           </para>
           <indexterm zone="libiodbc iodbctest">
@@ -184,5 +185,5 @@
         <listitem>
           <para>
-            is a graphical administration utility
+            is a graphical administration utility.
           </para>
           <indexterm zone="libiodbc iodbcadm">
Index: general/genlib/libksba.xml
===================================================================
--- general/genlib/libksba.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libksba.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,7 +8,7 @@
   <!ENTITY libksba-download-ftp  "&gnupg-ftp;/libksba/libksba-&libksba-version;.tar.bz2">
   <!ENTITY libksba-download-ftp  " ">
-  <!ENTITY libksba-md5sum        "d333b2e1381068d4f9a328240f062f0f">
-  <!ENTITY libksba-size          "648 KB">
-  <!ENTITY libksba-buildsize     "9.3 MB (with tests)">
+  <!ENTITY libksba-md5sum        "a43bc51bd1bf13295623398d0f2d88b4">
+  <!ENTITY libksba-size          "644 KB">
+  <!ENTITY libksba-buildsize     "11 MB (with tests)">
   <!ENTITY libksba-time          "0.1 SBU (with tests)">
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -169,5 +170,5 @@
             the libksba(3) library. It can be used to query the C compiler and
             linker flags which are required to correctly compile and link the
-            application against the libksba(3) library
+            application against the libksba(3) library.
           </para>
           <indexterm zone="libksba ksba-config">
@@ -178,8 +179,8 @@
 
       <varlistentry id="libksba-lib">
-        <term><filename class="libraryfile">libksba.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libksba.{so,a}</filename></term>
         <listitem>
           <para>
-            contains the cryptographic API functions
+            contains the cryptographic API functions.
           </para>
           <indexterm zone="libksba libksba-lib">
Index: general/genlib/liblinear.xml
===================================================================
--- general/genlib/liblinear.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/liblinear.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY liblinear-download-http "https://github.com/cjlin1/liblinear/archive/v&liblinear-version;/liblinear-&liblinear-version;.tar.gz">
   <!ENTITY liblinear-download-ftp  " ">
-  <!ENTITY liblinear-md5sum        "7f42a8b5656aeb9209c04b8840206825">
-  <!ENTITY liblinear-size          "556 KB">
-  <!ENTITY liblinear-buildsize     "1.5 MB">
+  <!ENTITY liblinear-md5sum        "dabdfcd5ad6aa4fc706b7d5df452a9c0">
+  <!ENTITY liblinear-size          "552 KB">
+  <!ENTITY liblinear-buildsize     "1.6 MB">
   <!ENTITY liblinear-time          "less than 0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <note>
@@ -140,5 +141,5 @@
         <listitem>
           <para>
-            is a large linear classification library
+            is a large linear classification library.
           </para>
           <indexterm zone="liblinear liblinear-lib">
Index: general/genlib/libmbim.xml
===================================================================
--- general/genlib/libmbim.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libmbim.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY libmbim-download-http "https://www.freedesktop.org/software/libmbim/libmbim-&libmbim-version;.tar.xz">
   <!ENTITY libmbim-download-ftp  " ">
-  <!ENTITY libmbim-md5sum        "552d498d891c93ee9ed2684a8a6a723e">
-  <!ENTITY libmbim-size          "544 KB">
-  <!ENTITY libmbim-buildsize     "32 MB (with tests)">
+  <!ENTITY libmbim-md5sum        "4b4b12ab7153d7c999289b5dfc2d25db">
+  <!ENTITY libmbim-size          "504 KB">
+  <!ENTITY libmbim-buildsize     "29 MB (with tests)">
   <!ENTITY libmbim-time          "0.2 SBU (with tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -73,10 +74,8 @@
     <bridgehead renderas="sect3">libmbim Dependencies</bridgehead>
 
-    <!-- not needed anymore with 1.26.0
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="libgudev"/>
     </para>
-    -->
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
@@ -162,5 +161,5 @@
         <listitem>
           <para>
-            is an utility used to control MBIM devices
+            is an utility used to control MBIM devices.
           </para>
           <indexterm zone="libmbim mbimcli">
@@ -175,5 +174,5 @@
           <para>
             is an utility used for simple network management
-            of MBIM devices
+            of MBIM devices.
           </para>
           <indexterm zone="libmbim mbim-network">
@@ -189,5 +188,5 @@
             contains API functions for talking to WWAN modems and devices
             which speak the Mobile Interface Broadband Model (MBIM)
-            protocol
+            protocol.
           </para>
           <indexterm zone="libmbim libmbim-glib">
Index: general/genlib/libnfsidmap.xml
===================================================================
--- general/genlib/libnfsidmap.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
+++ general/genlib/libnfsidmap.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -0,0 +1,171 @@
+<?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;
+
+  <!-- official upstream is at http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/
+       but doesn't contain 0.26. -->
+  <!ENTITY libnfsidmap-download-http "https://fedorapeople.org/~steved/libnfsidmap/&libnfsidmap-version;/libnfsidmap-&libnfsidmap-version;.tar.bz2">
+  <!ENTITY libnfsidmap-download-ftp  " ">
+  <!ENTITY libnfsidmap-md5sum        "2c0cf0e2b1665d51fa9a783679494888">
+  <!ENTITY libnfsidmap-size          "260 KB">
+  <!ENTITY libnfsidmap-buildsize     "3.3 MB">
+  <!ENTITY libnfsidmap-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="libnfsidmap" xreflabel="libnfsidmap-&libnfsidmap-version;">
+  <?dbhtml filename="libnfsidmap.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libnfsidmap-&libnfsidmap-version;</title>
+
+  <indexterm zone="libnfsidmap">
+    <primary sortas="a-libnfsidmap">libnfsidmap</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libnfsidmap</title>
+
+    <para>
+      The <application>libnfsidmap</application> package contains a
+      library to help with mapping id's, mainly for NFSv4.
+    </para>
+
+    &lfs10_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libnfsidmap-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libnfsidmap-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libnfsidmap-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libnfsidmap-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libnfsidmap-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libnfsidmap-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libnfsidmap Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="openldap"/> (client only)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/libnfsidmap"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libnfsidmap</title>
+
+    <para>
+      Install <application>libnfsidmap</application> by running the following
+      commands:
+    </para>
+
+<!-- sysconfdir=/etc is used because the config file /etc/idmapd.conf
+     is installed by nfs-utils -->
+<screen><userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --disable-static  &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a testsuite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install                         &amp;&amp;
+mv -v /usr/lib/libnfsidmap.so.* /lib &amp;&amp;
+ln -sfv ../../lib/$(readlink /usr/lib/libnfsidmap.so) /usr/lib/libnfsidmap.so</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"/>
+
+    <para>
+      <command>mv -v /usr/lib/libnfsidmap.so.* ...</command>: Move shared
+      libraries into /lib so they are available before /usr is mounted.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libnfsidmap.so
+        </seg>
+        <seg>
+          /usr/lib/libnfsidmap
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libnfsidmap-lib">
+        <term><filename class="libraryfile">libnfsidmap.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>libnfsidmap</application> API functions.
+          </para>
+          <indexterm zone="libnfsidmap libnfsidmap-lib">
+            <primary sortas="c-libnfsidmap">libnfsidmap.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genlib/libpaper.xml
===================================================================
--- general/genlib/libpaper.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libpaper.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libpaper-download-http "https://ftp.debian.org/debian/pool/main/libp/libpaper/libpaper_&libpaper-version;.tar.gz">
+  <!ENTITY libpaper-download-http "http://ftp.debian.org/debian/pool/main/libp/libpaper/libpaper_&libpaper-version;.tar.gz">
   <!ENTITY libpaper-download-ftp  " ">
   <!ENTITY libpaper-md5sum        "38bc55688c0fc5544edaa5a951a45fbd">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -239,5 +240,5 @@
         <listitem>
           <para>
-            prints paper configuration information
+            prints paper configuration information.
           </para>
           <indexterm zone="libpaper paperconf">
@@ -251,5 +252,5 @@
         <listitem>
           <para>
-            configures the system default paper size
+            configures the system default paper size.
           </para>
           <indexterm zone="libpaper paperconfig">
@@ -275,5 +276,5 @@
         <listitem>
           <para>
-            contains functions for interrogating the paper library
+            contains functions for interrogating the paper library.
           </para>
           <indexterm zone="libpaper libpaper-lib">
Index: general/genlib/libportal.xml
===================================================================
--- general/genlib/libportal.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libportal.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY libportal-download-http "https://github.com/flatpak/libportal/releases/download/&libportal-version;/libportal-&libportal-version;.tar.xz">
   <!ENTITY libportal-download-ftp  " ">
-  <!ENTITY libportal-md5sum        "2ca3806e18e2197dd87d22379405a624">
+  <!ENTITY libportal-md5sum        "dffd58a937dfbabc873e51029dc587f3">
   <!ENTITY libportal-size          "52 KB">
-  <!ENTITY libportal-buildsize     "3.6 MB">
-  <!ENTITY libportal-time          "0.1 SBU">
+  <!ENTITY libportal-buildsize     "3.5 MB">
+  <!ENTITY libportal-time          "less than 0.1 SBU">
 
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -75,12 +76,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="glib2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
+      <xref linkend="glib2"/> and
       <xref linkend="gtk-doc"/>
     </para>
-
 
     <para condition="html" role="usernotes">
@@ -100,5 +96,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release -Dgtk_doc=false .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -114,17 +110,4 @@
   </sect2>
 
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dgtk_doc=false</parameter>: Remove this parameter if
-      <application>GTK-Doc</application> is installed and you wish to rebuild
-      and install the API documentation.
-    </para>
-
-  </sect2>
   <sect2 role="content">
     <title>Contents</title>
@@ -158,5 +141,5 @@
         <listitem>
           <para>
-            provides GIO-style async APIs for most Flatpak portals
+            provides GIO-style async APIs for most Flatpak portals.
           </para>
           <indexterm zone="libportal libportal-lib">
@@ -167,4 +150,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/genlib/libqmi.xml
===================================================================
--- general/genlib/libqmi.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libqmi.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY libqmi-download-http "https://www.freedesktop.org/software/libqmi/libqmi-&libqmi-version;.tar.xz">
   <!ENTITY libqmi-download-ftp  " ">
-  <!ENTITY libqmi-md5sum        "1a30e5304d01e72845bd3e9c353c8ded">
-  <!ENTITY libqmi-size          "1.2 MB">
-  <!ENTITY libqmi-buildsize     "150 MB (with tests)">
-  <!ENTITY libqmi-time          "0.3 SBU (Using parallelism=4; with tests)">
+  <!ENTITY libqmi-md5sum        "e444e5a5176e1ec763c0bfaa74b93997">
+  <!ENTITY libqmi-size          "1.1 MB">
+  <!ENTITY libqmi-buildsize     "138 MB (with tests)">
+  <!ENTITY libqmi-time          "0.2 SBU (Using parallelism=4; with tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -75,6 +76,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="libgudev"/>
+      <xref linkend="glib2"/>
     </para>
 
@@ -87,7 +87,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <ulink url="https://ftpmirror.gnu.org/gnu/help2man/">help2man</ulink>, and
-      <ulink url="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib">libqrtr-glib</ulink>
+      <xref linkend="gtk-doc"/> and
+      <ulink url="https://ftpmirror.gnu.org/gnu/help2man/">help2man</ulink>
     </para>
 
@@ -105,5 +104,5 @@
     </para>
 
-<screen><userinput>PYTHON=python3 ./configure --prefix=/usr --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -171,5 +170,5 @@
         <listitem>
           <para>
-            is an utility used to control QMI devices
+            is an utility used to control QMI devices.
           </para>
           <indexterm zone="libqmi qmicli">
@@ -183,5 +182,5 @@
         <listitem>
           <para>
-            is an utility used to perform firmware updates on QMI devices
+            is an utility used to perform firmware updates on QMI devices.
           </para>
           <indexterm zone="libqmi qmi-firmware-update">
@@ -196,5 +195,5 @@
           <para>
             is an utility used for simple network management
-            of QMI devices
+            of QMI devices.
           </para>
           <indexterm zone="libqmi qmi-network">
@@ -209,5 +208,5 @@
           <para>
             contains API functions for talking to WWAN modems and devices
-            which speak the Qualcomm MSM Interface (QMI) protocol
+            which speak the Qualcomm MSM Interface (QMI) protocol.
           </para>
           <indexterm zone="libqmi libqmi-glib">
Index: general/genlib/libseccomp.xml
===================================================================
--- general/genlib/libseccomp.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libseccomp.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -22,4 +22,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -151,5 +152,5 @@
         <listitem>
           <para>
-            is used to resolve system calls for applications
+            is used to resolve system calls for applications.
           </para>
           <indexterm zone="libseccomp scmp_sys_resolver">
@@ -163,5 +164,5 @@
         <listitem>
           <para>
-            contains API functions for translating syscalls
+            contains API functions for translating syscalls.
           </para>
           <indexterm zone="libseccomp libseccomp-lib">
@@ -172,4 +173,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/genlib/libsigc++.xml
===================================================================
--- general/genlib/libsigc++.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libsigc++.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY libsigc-download-http "&gnome-download-http;/libsigc++/2.10/libsigc++-&libsigc-version;.tar.xz">
   <!ENTITY libsigc-download-ftp  "&gnome-download-ftp;/libsigc++/2.10/libsigc++-&libsigc-version;.tar.xz">
-  <!ENTITY libsigc-md5sum        "9e1e9a9796987cbbbc6563c732c723d1">
+  <!ENTITY libsigc-md5sum        "34fdf5910c32763e5fbe61ac2a37cec2">
   <!ENTITY libsigc-size          "4.6 MB">
-  <!ENTITY libsigc-buildsize     "25 MB (with tests)">
+  <!ENTITY libsigc-buildsize     "39 MB (with tests)">
   <!ENTITY libsigc-time          "0.2 SBU (with tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -93,4 +94,12 @@
     <title>Installation of libsigc++</title>
 
+<!--
+    <para>
+      First, fix the documentation directory name:
+    </para>
+
+<screen><userinput>sed -e '/^libdocdir =/ s/$(book_name)/libsigc++-&libsigc-version;/' -i docs/Makefile.in</userinput></screen>
+-->
+
     <para>
       Install <application>libsigc++</application> by running the following
@@ -101,10 +110,9 @@
 cd    bld &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
     <para>
-      <!--To test the results, issue: <command>ninja test</command>.-->
-      This package does not come with a test suite.
+      To test the results, issue: <command>ninja test</command>.
     </para>
 
@@ -159,5 +167,5 @@
         <listitem>
           <para>
-            contains the <application>libsigc++</application> API functions
+            contains the <application>libsigc++</application> API functions.
           </para>
           <indexterm zone="libsigc libsigc-2">
Index: general/genlib/libsigc3.xml
===================================================================
--- general/genlib/libsigc3.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libsigc3.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY libsigc3-download-http "&gnome-download-http;/libsigc++/3.0/libsigc++-&libsigc3-version;.tar.xz">
   <!ENTITY libsigc3-download-ftp  "&gnome-download-ftp;/libsigc++/3.0/libsigc++-&libsigc3-version;.tar.xz">
-  <!ENTITY libsigc3-md5sum        "7eda63038a9b2073cb5b1c9adf2187b2">
-  <!ENTITY libsigc3-size          "776 KB">
-  <!ENTITY libsigc3-buildsize     "9.2 MB (with tests)">
+  <!ENTITY libsigc3-md5sum        "8cc0c1df6b7d9c466555f4a2963ab06a">
+  <!ENTITY libsigc3-size          "772 KB">
+  <!ENTITY libsigc3-buildsize     "33 MB (with tests)">
   <!ENTITY libsigc3-time          "0.4 SBU (with tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -102,5 +103,5 @@
 cd    bld &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -159,5 +160,5 @@
         <listitem>
           <para>
-            contains the <application>libsigc++3</application> API functions
+            contains the <application>libsigc++3</application> API functions.
           </para>
           <indexterm zone="libsigc3 libsigc-3">
Index: general/genlib/libsigsegv.xml
===================================================================
--- general/genlib/libsigsegv.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libsigsegv.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY libsigsegv-download-http "&gnu-http;/libsigsegv/libsigsegv-&libsigsegv-version;.tar.gz">
   <!ENTITY libsigsegv-download-ftp  "&gnu-ftp;/libsigsegv/libsigsegv-&libsigsegv-version;.tar.gz">
-  <!ENTITY libsigsegv-md5sum        "cf4a5fdc95e5494eaa190825af11f3be">
-  <!ENTITY libsigsegv-size          "452 KB">
-  <!ENTITY libsigsegv-buildsize     "3.8 MB (with tests)">
-  <!ENTITY libsigsegv-time          "less than 0.1 SBU (with tests)">
+  <!ENTITY libsigsegv-md5sum        "58a6db48f79f5c735a9dce3a37c52779">
+  <!ENTITY libsigsegv-size          "444 KB">
+  <!ENTITY libsigsegv-buildsize     "3.5 MB (with checks)">
+  <!ENTITY libsigsegv-time          "less than 0.1 SBU (with checks)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -147,5 +148,5 @@
         <listitem>
           <para>
-            is a library for handling page faults in user mode
+            is a library for handling page faults in user mode.
           </para>
           <indexterm zone="libsigsegv libsigsegv-lib">
Index: general/genlib/libssh2.xml
===================================================================
--- general/genlib/libssh2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libssh2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -70,14 +71,4 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libssh2-&libssh2-version;-security_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">libssh2 Dependencies</bridgehead>
 
@@ -102,6 +93,5 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../libssh2-&libssh2-version;-security_fixes-1.patch &amp;&amp;
-./configure --prefix=/usr --disable-static            &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -156,5 +146,5 @@
         <listitem>
           <para>
-            contains functions to use the SSH2 protocol
+            contains functions to use the SSH2 protocol.
           </para>
           <indexterm zone="libssh2 libssh2-lib">
@@ -165,4 +155,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/genlib/libstatgrab.xml
===================================================================
--- general/genlib/libstatgrab.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libstatgrab.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY libstatgrab-download-http "https://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/libstatgrab-&libstatgrab-version;.tar.gz">
+  <!ENTITY libstatgrab-download-http "http://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/libstatgrab-&libstatgrab-version;.tar.gz">
   <!ENTITY libstatgrab-download-ftp  "ftp://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/libstatgrab-&libstatgrab-version;.tar.gz">
-  <!ENTITY libstatgrab-md5sum        "af685494e985229e0ac46365bc0cd50e">
+  <!ENTITY libstatgrab-md5sum        "5362b2ddbec54b3901e7d70c22cda249">
   <!ENTITY libstatgrab-size          "800 KB">
-  <!ENTITY libstatgrab-buildsize     "7.6 MB (with tests)">
-  <!ENTITY libstatgrab-time          "0.1 SBU (add 1.5 SBU for tests)">
+  <!ENTITY libstatgrab-buildsize     "7.4 MB (with tests)">
+  <!ENTITY libstatgrab-time          "0.1 SBU (add 1.6 SBU for tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -143,5 +144,5 @@
         <listitem>
           <para>
-            is a curses-based tool for viewing system statistics
+            is a curses-based tool for viewing system statistics.
           </para>
           <indexterm zone="libstatgrab saidar">
@@ -155,5 +156,5 @@
         <listitem>
           <para>
-            is a sysctl-style interface to system statistics
+            is a sysctl-style interface to system statistics.
           </para>
           <indexterm zone="libstatgrab statgrab">
@@ -167,5 +168,5 @@
         <listitem>
           <para>
-            generates MRTG configuration
+            generates MRTG configuration.
           </para>
           <indexterm zone="libstatgrab statgrab-make-mrtg-config">
@@ -180,5 +181,5 @@
           <para>
             generates an XHTML index page from MRTG configuration files or
-            stdin
+            stdin.
           </para>
           <indexterm zone="libstatgrab statgrab-make-mrtg-index">
@@ -192,5 +193,5 @@
         <listitem>
           <para>
-            contains the <application>libstatgrab</application> API functions
+            contains the <application>libstatgrab</application> API functions.
           </para>
           <indexterm zone="libstatgrab libstatgrab-lib">
Index: general/genlib/libtasn1.xml
===================================================================
--- general/genlib/libtasn1.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libtasn1.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY libtasn1-download-http "&gnu-http;/libtasn1/libtasn1-&libtasn1-version;.tar.gz">
   <!ENTITY libtasn1-download-ftp  "&gnu-ftp;/libtasn1/libtasn1-&libtasn1-version;.tar.gz">
-  <!ENTITY libtasn1-md5sum        "c46f6eb3bd1287031ae5d36465094402">
-  <!ENTITY libtasn1-size          "1.8 MB">
-  <!ENTITY libtasn1-buildsize     "12 MB (with tests)">
-  <!ENTITY libtasn1-time          "0.4 SBU (with tests)">
+  <!ENTITY libtasn1-md5sum        "531208de3729d42e2af0a32890f08736">
+  <!ENTITY libtasn1-size          "1.7 MB">
+  <!ENTITY libtasn1-buildsize     "11 MB (with tests)">
+  <!ENTITY libtasn1-time          "0.2 SBU (with tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-     &lfs110a_checked;
+     &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -163,5 +164,5 @@
         <listitem>
           <para>
-            is an ASN.1 DER encoder
+            is an ASN.1 DER encoder.
           </para>
           <indexterm zone="libtasn1 asn1Coding">
@@ -175,5 +176,5 @@
         <listitem>
           <para>
-            is an ASN.1 DER decoder
+            is an ASN.1 DER decoder.
           </para>
           <indexterm zone="libtasn1 asn1Decoding">
@@ -188,5 +189,5 @@
           <para>
             is an ASN.1 syntax tree generator for
-            <application>libtasn1</application>
+            <application>libtasn1</application>.
           </para>
           <indexterm zone="libtasn1 asn1Parser">
@@ -201,5 +202,5 @@
           <para>
             is a library for Abstract Syntax Notation One (ASN.1) and
-            Distinguish Encoding Rules (DER) manipulation
+            Distinguish Encoding Rules (DER) manipulation.
           </para>
           <indexterm zone="libtasn1 libtasn1-lib">
Index: general/genlib/libuninameslist.xml
===================================================================
--- general/genlib/libuninameslist.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libuninameslist.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY libuninameslist-download-http "https://github.com/fontforge/libuninameslist/releases/download/&libuninameslist-version;/libuninameslist-dist-&libuninameslist-version;.tar.gz">
   <!ENTITY libuninameslist-download-ftp  " ">
-  <!ENTITY libuninameslist-md5sum        "d4fa781488763c7d5623a59da0e99452">
+  <!ENTITY libuninameslist-md5sum        "f4235a4c3532a2f31989ca68cf6d3df4">
   <!ENTITY libuninameslist-size          "1.2 MB">
-  <!ENTITY libuninameslist-buildsize     "14 MB (with tests)">
-  <!ENTITY libuninameslist-time          "less than 0.1 SBU (with tests)">
+  <!ENTITY libuninameslist-buildsize     "17 MB">
+  <!ENTITY libuninameslist-time          "less than 0.1 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -135,5 +136,5 @@
         <listitem>
           <para>
-            provides a library of Unicode names and annotation data
+            provides a library of Unicode names and annotation data.
           </para>
           <indexterm zone="libuninameslist libuninameslist-lib">
@@ -145,4 +146,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/genlib/libunique.xml
===================================================================
--- general/genlib/libunique.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libunique.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -84,12 +85,11 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtk2"/>, also
-      <xref linkend="gtk-doc"/> (for autoreconf)
+      <xref linkend="gtk2"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gobject-introspection"/> <!--and
-      <xref linkend="gtk-doc"/>-->
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="gtk-doc"/>
     </para>
 
@@ -176,5 +176,5 @@
           <para>
             contains the <application>libunique</application> API functions
-            for single instance support
+            for single instance support.
           </para>
           <indexterm zone="libunique libunique-1">
Index: general/genlib/libunistring.xml
===================================================================
--- general/genlib/libunistring.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libunistring.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -144,5 +145,5 @@
         <listitem>
           <para>
-            provides the unicode string library API
+            provides the unicode string library API.
           </para>
           <indexterm zone="libunistring libunistring-lib">
Index: general/genlib/libusb.xml
===================================================================
--- general/genlib/libusb.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libusb.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -124,5 +125,5 @@
 <screen role="root"
         remap="doc"><userinput>install -v -d -m755 /usr/share/doc/libusb-&libusb-version;/apidocs &amp;&amp;
-install -v -m644    doc/api-1.0/* \
+install -v -m644    doc/html/* \
                     /usr/share/doc/libusb-&libusb-version;/apidocs</userinput></screen>
 
@@ -191,8 +192,8 @@
 
       <varlistentry id="libusb-lib">
-        <term><filename class="libraryfile">libusb-1.0.so</filename></term>
+        <term><filename class='libraryfile'>libusb-1.0.so</filename></term>
         <listitem>
           <para>
-            contains API functions used for accessing USB hardware
+            contains API functions used for accessing USB hardware.
           </para>
           <indexterm zone="libusb libusb-lib">
Index: general/genlib/libuv.xml
===================================================================
--- general/genlib/libuv.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libuv.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY libuv-download-http "https://dist.libuv.org/dist/v&libuv-version;/libuv-v&libuv-version;.tar.gz">
   <!ENTITY libuv-download-ftp  " ">
-  <!ENTITY libuv-md5sum        "484dec4a06e183c20be815019ce9ddd0">
+  <!ENTITY libuv-md5sum        "7cb2fdadb61a76fc55cbbe928e322862">
   <!ENTITY libuv-size          "1.2 MB">
-  <!ENTITY libuv-buildsize     "13 MB (add 12 MB for tests)">
-  <!ENTITY libuv-time          "less than 0.1 SBU (Using parallelism=4; add 0.5 SBU for tests)">
+  <!ENTITY libuv-buildsize     "14 MB (add 12 MB for tests)">
+  <!ENTITY libuv-time          "0.1 SBU (Using parallelism=4; add 0.4 SBU for tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -128,8 +129,6 @@
     <para>
       If you want to run the tests, run: <command>make check</command>.
-<!-- as of version 1.42.0 - all tests passed
-      One test, ipc_closed_handle, is known to fail.
--->
     </para>
+
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
Index: general/genlib/libwacom.xml
===================================================================
--- general/genlib/libwacom.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libwacom.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY libwacom-download-http "https://github.com/linuxwacom/libwacom/releases/download/libwacom-&libwacom-version;/libwacom-&libwacom-version;.tar.bz2">
   <!ENTITY libwacom-download-ftp  " ">
-  <!ENTITY libwacom-md5sum        "03a360811b094ab97b3e2c1feb1db599">
-  <!ENTITY libwacom-size          "507 KB">
-  <!ENTITY libwacom-buildsize     "6.2 MB (with tests)">
+  <!ENTITY libwacom-md5sum        "364bd470a35334b1a7fce70a359796d5">
+  <!ENTITY libwacom-size          "504 KB">
+  <!ENTITY libwacom-buildsize     "7.1 MB (with tests)">
   <!ENTITY libwacom-time          "less than 0.1 SBU (with tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -115,5 +116,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release -Dtests=disabled .. &amp;&amp;
+meson --prefix=/usr -Dudev-dir=/lib/udev -Dtests=disabled .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -136,6 +137,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
+    <para>
+      <parameter>-Dudev-dir=/lib/udev</parameter>: This parameter sets the
+      proper installation directory for udev rules.
+    </para>
 
     <para>
@@ -158,8 +161,5 @@
       <seglistitem>
         <seg>
-          libwacom-list-devices,
-          libwacom-list-local-devices,
-          libwacom-show-stylus, and
-          libwacom-update-db
+          libwacom-list-local-devices
         </seg>
         <seg>
@@ -178,21 +178,9 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="libwacom-list-devices">
-        <term><command>libwacom-list-devices</command></term>
-        <listitem>
-          <para>
-            lists all tablet devices that are supported by libwacom
-          </para>
-          <indexterm zone="libwacom libwacom-list-devices">
-            <primary sortas="b-libwacom-list-devices">libwacom-list-devices</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libwacom-list-local-devices">
         <term><command>libwacom-list-local-devices</command></term>
         <listitem>
           <para>
-            lists tablet devices that are connected to the system
+            lists tablet devices that are connected to the system.
           </para>
           <indexterm zone="libwacom libwacom-list-local-devices">
@@ -202,33 +190,9 @@
       </varlistentry>
 
-      <varlistentry id="libwacom-show-stylus">
-        <term><command>libwacom-show-stylus</command></term>
-        <listitem>
-          <para>
-            lists tablet stylus IDs
-          </para>
-          <indexterm zone="libwacom libwacom-show-stylus">
-            <primary sortas="b-libwacom-show-stylus">libwacom-show-stylus</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwacom-update-db">
-        <term><command>libwacom-update-db</command></term>
-        <listitem>
-          <para>
-            updates the system according to the current set of tablet data files
-          </para>
-          <indexterm zone="libwacom libwacom-update-db">
-            <primary sortas="b-libwacom-update-db">libwacom-update-db</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libwacom-lib">
         <term><filename class="libraryfile">libwacom.so</filename></term>
         <listitem>
           <para>
-            contains functions used for accessing Wacom information
+            contains functions used for accessing Wacom information.
           </para>
           <indexterm zone="libwacom libwacom-lib">
Index: neral/genlib/libwpe.xml
===================================================================
--- general/genlib/libwpe.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,164 +1,0 @@
-<?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 libwpe-download-http "https://wpewebkit.org/releases/libwpe-&libwpe-version;.tar.xz">
-  <!ENTITY libwpe-download-ftp  " ">
-  <!ENTITY libwpe-md5sum        "f60fc13b519a66d262afb76c77441870">
-  <!ENTITY libwpe-size          "52 KB">
-  <!ENTITY libwpe-buildsize     "2.0 MB">
-  <!ENTITY libwpe-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libwpe" xreflabel="libwpe-&libwpe-version;">
-  <?dbhtml filename="libwpe.html"?>
-
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libwpe-&libwpe-version;</title>
-
-  <indexterm zone="libwpe">
-    <primary sortas="a-libwpe">libwpe</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libwpe</title>
-
-    <para>
-      The <application>libwpe</application> package contains a general purpose
-      library for WPE WebKit and the WPE Renderer.
-    </para>
-
-    &lfs110a_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libwpe-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libwpe-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libwpe-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libwpe-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libwpe-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libwpe-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libwpe Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxkbcommon"/> and
-      <xref linkend="mesa"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://pypi.org/project/hotdoc/">hotdoc</ulink>
-      <!-- FIXME - meson_options.txt mentions using hotdoc if you pass a switch
-           to generate documentation. -->
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/libwpe"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libwpe</title>
-
-    <para>
-      Install <application>libwpe</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</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>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libwpe-1.0.so
-        </seg>
-        <seg>
-          /usr/include/wpe-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libwpe-1.0">
-        <term><filename class="libraryfile">libwpe-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide a general purpose library for 
-            WPEWebKit and the WPE Renderer
-          </para>
-          <indexterm zone="libwpe libwpe-1.0">
-            <primary sortas="c-libwpe-1.0">libwpe-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/genlib/libxkbcommon.xml
===================================================================
--- general/genlib/libxkbcommon.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libxkbcommon.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY libxkbcommon-download-http "https://xkbcommon.org/download/libxkbcommon-&libxkbcommon-version;.tar.xz">
   <!ENTITY libxkbcommon-download-ftp  " ">
-  <!ENTITY libxkbcommon-md5sum        "00b5275ec1309a1d427a645de5861605">
-  <!ENTITY libxkbcommon-size          "444 KB">
-  <!ENTITY libxkbcommon-buildsize     "27 MB (with tests)">
-  <!ENTITY libxkbcommon-time          "0.1 SBU (with tests)">
+  <!ENTITY libxkbcommon-md5sum        "bd0ff892fe937e39ec3bb4daeb348f76">
+  <!ENTITY libxkbcommon-size          "424 KB">
+  <!ENTITY libxkbcommon-buildsize     "25 MB (with tests)">
+  <!ENTITY libxkbcommon-time          "less than 0.1 SBU (with tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -80,7 +81,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-       <xref linkend="libxcb"/>,
-       <xref linkend="wayland"/>, and
-       <xref linkend="wayland-protocols"/>
+       <xref linkend="libxcb"/> and
+       <xref linkend="wayland"/>
     </para>
 
@@ -106,5 +106,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release -Denable-docs=false .. &amp;&amp;
+meson --prefix=/usr -Denable-docs=false .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -124,7 +124,4 @@
     <title>Command Explanations</title>
         
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
     <!--
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -187,5 +184,5 @@
         <listitem>
           <para>
-            provides a debugger and compiler for XKB keymaps
+            provides a debugger and compiler for XKB keymaps.
           </para>
           <indexterm zone="libxkbcommon xkbcli">
@@ -199,5 +196,5 @@
         <listitem>
           <para>
-            contains the <application>libxkbcommon</application> API functions
+            contains the <application>libxkbcommon</application> API functions.
           </para>
           <indexterm zone="libxkbcommon libxkbcommon-lib">
@@ -212,5 +209,5 @@
           <para>
             contains the <application>libxkbcommon</application> X11 specific API
-            functions
+            functions.
           </para>
           <indexterm zone="libxkbcommon libxkbcommon-x11">
@@ -225,5 +222,5 @@
          <para>
            contains a list of available XKB models, layouts, and variants for a
-           given ruleset
+           given ruleset.
          </para>
          <indexterm zone="libxkbcommon libxkbregistry">
Index: general/genlib/libxml2.xml
===================================================================
--- general/genlib/libxml2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libxml2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,8 +8,8 @@
   <!ENTITY libxml2-download-http "http://xmlsoft.org/sources/libxml2-&libxml2-version;.tar.gz">
   <!ENTITY libxml2-download-ftp  "ftp://xmlsoft.org/libxml2/libxml2-&libxml2-version;.tar.gz">
-  <!ENTITY libxml2-md5sum        "f433a39be087a9f0b197eb2307ad9f75">
+  <!ENTITY libxml2-md5sum        "10942a1dc23137a8aa07f0639cbfece5">
   <!ENTITY libxml2-size          "5.4 MB">
-  <!ENTITY libxml2-buildsize     "116 MB (with tests)">
-  <!ENTITY libxml2-time          "0.4 SBU (with tests)">
+  <!ENTITY libxml2-buildsize     "87 MB (add 15 MB for tests)">
+  <!ENTITY libxml2-time          "0.2 SBU (add 0.3 SBU for tests)">
   <!ENTITY testsuite-version     "20130923">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -76,6 +77,12 @@
       <listitem>
         <para>
+          Required patch:
+          <ulink url="&patch-root;/libxml2-&libxml2-version;-security_fixes-1.patch"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           Optional Testsuite:
-          <ulink url="https://www.w3.org/XML/Test/xmlts&testsuite-version;.tar.gz"/> - This
+          <ulink url="http://www.w3.org/XML/Test/xmlts&testsuite-version;.tar.gz"/> - This
           enables <command>make check</command> to do complete testing.
         </para>
@@ -84,17 +91,22 @@
 
     <bridgehead renderas="sect3">libxml2 Dependencies</bridgehead>
-<!-- do not advertize python2 here, except in the note below
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="python2"/>
-    </para>
--->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="icu"/> (see below) and
-      <xref linkend="valgrind"/> (may be used in the tests)
+      <xref linkend="python2"/> <!--or <xref linkend="python3"/> (to build and
+      install a <application>Python</application> library module, additionally
+      it is required to run the full suite of tests)-->
+      <!-- As discovered by Bruce, itstool needs this module. -->
     </para>
 
     <note>
+      <para>
+        Some packages which utilize <application>libxml2</application> (such as
+        <application>GNOME Doc Utils</application>) need the
+        <application>Python3</application> module installed to function properly
+        and some packages will not build properly if the
+        <application>Python3</application> module is not available.
+      </para>
+
       <para>
         The old <application>Python2</application> module can be built after
@@ -104,4 +116,10 @@
     </note>
 
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="icu"/> (see below) and
+      <xref linkend="valgrind"/> (may be used in the tests)
+    </para>
+
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/libxml2"/>
@@ -111,4 +129,37 @@
   <sect2 role="installation">
     <title>Installation of libxml2</title>
+
+    <para>
+      Apply a patch to fix various errors:
+    </para>
+
+<screen><userinput remap="pre">patch -p1 -i ../libxml2-&libxml2-version;-security_fixes-1.patch</userinput></screen>
+
+    <para>
+      First fix a problem generating the Python3 module with Python-3.9.0 and later:
+    </para>
+
+<screen><userinput>sed -i '/if Py/{s/Py/(Py/;s/)/))/}' python/{types.c,libxml.c}</userinput></screen>
+
+<!--<para>
+      To ensure that the <application>Python</application> module can be
+      built by <xref linkend="python3"/>, run:
+    </para>
+
+<screen><userinput>sed -i '/_PyVerify_fd/,+1d' python/types.c</userinput></screen>-->
+
+    <para>
+      If you are going to run the tests, disable one test that causes the Python
+      tests to terminate early with an error:
+    </para>
+
+<screen><userinput>sed -i 's/test.test/#&amp;/' python/tests/tstLastError.py</userinput></screen>
+
+    <para>
+      If, and only if, you are using <xref linkend="icu"/>, fix a
+      build breakage caused by that version by running the following command:
+    </para>
+
+<screen><userinput>sed -i 's/ TRUE/ true/' encoding.c</userinput></screen>
 
     <para>
@@ -133,5 +184,5 @@
       A summary of the results can be obtained with <command>grep -E
       '^Total|expected' check.log</command>. If <xref linkend="valgrind"/> is
-      installed and you want to check for memory leaks, replace
+      installed and you want to check memory leaks, replace
       <command>check</command> with <command>check-valgrind</command>.
     </para>
@@ -151,5 +202,4 @@
 
     </note>
-
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
@@ -164,5 +214,11 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
-
+<!--
+    <para>
+      <parameter>sed -i '/_PyVerify_fd/,+1d' python/types.c</parameter>: This
+      fixes the <application>Python3</application> code to build with
+      <application>gcc-7</application>.
+    </para>
+-->
     <para>
       <parameter>--with-history</parameter>: This switch enables
@@ -229,5 +285,5 @@
             determines the compile and linker flags that should be used to
             compile and link programs that use
-            <filename class="libraryfile">libxml2</filename>
+            <filename class='libraryfile'>libxml2</filename>.
           </para>
           <indexterm zone="libxml2 xml2-config">
@@ -241,5 +297,5 @@
         <listitem>
           <para>
-            is used to monitor and manipulate XML and SGML catalogs
+            is used to monitor and manipulate XML and SGML catalogs.
           </para>
           <indexterm zone="libxml2 xmlcatalog">
@@ -254,5 +310,5 @@
           <para>
             parses XML files and outputs reports (based upon options) to detect
-            errors in XML coding
+            errors in XML coding.
           </para>
           <indexterm zone="libxml2 xmllint">
@@ -291,5 +347,5 @@
           <para>
             provides functions for programs to parse files that use the XML
-            format
+            format.
           </para>
           <indexterm zone="libxml2 libxml2-lib">
@@ -304,5 +360,5 @@
           <para>
             is the interface for <application>Python3</application>
-            to use <filename class="libraryfile">libxml2.so</filename>
+            to use <filename class="libraryfile">libxml2.so</filename>.
           </para>
           <indexterm zone="libxml2 libxml2mod3">
Index: general/genlib/libxslt.xml
===================================================================
--- general/genlib/libxslt.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libxslt.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -138,5 +139,4 @@
 
 <screen><userinput>sed -i s/3000/5000/ libxslt/transform.c doc/xsltproc.{1,xml} &amp;&amp;
-sed -i -r '/max(Parser)?Depth/d' ./tests/fuzz/fuzz.c &amp;&amp;
 ./configure --prefix=/usr --disable-static --without-python  &amp;&amp;
 make</userinput></screen>
@@ -169,9 +169,4 @@
       <command>sed -i s/3000/5000/ ...</command>: this increases the recursion
       limit in libxslt. This is needed by some packages for their documentation.
-    </para>
-
-    <para>
-      <command>sed -i -r '/max(Parser)?Depth/d' ...</command>: this works
-      around an issue running test suite of libxslt with libxml-2.9.12.
     </para>
 
@@ -224,5 +219,5 @@
             is used to find out the pre-processor, linking and
             compiling flags necessary to use the <application>libxslt</application>
-            libraries in 3rd-party programs
+            libraries in 3rd-party programs.
           </para>
           <indexterm zone="libxslt xslt-config">
@@ -236,5 +231,5 @@
         <listitem>
           <para>
-            is used to apply XSLT stylesheets to XML documents
+            is used to apply XSLT stylesheets to XML documents.
           </para>
           <indexterm zone="libxslt xsltproc">
@@ -248,5 +243,5 @@
         <listitem>
           <para>
-            is used to provide extensions to XSLT functions
+            is used to provide extensions to XSLT functions.
           </para>
           <indexterm zone="libxslt libexslt">
@@ -262,5 +257,5 @@
             provides extensions to the
             <filename class="libraryfile">libxml2</filename>
-            libraries to parse files that use the XSLT format
+            libraries to parse files that use the XSLT format.
           </para>
           <indexterm zone="libxslt libxslt-lib">
Index: general/genlib/libyaml.xml
===================================================================
--- general/genlib/libyaml.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/libyaml.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY yaml-download-http "https://github.com/yaml/libyaml/archive/&yaml-version;/libyaml-&yaml-version;.tar.gz">
+  <!ENTITY yaml-download-http "https://github.com/yaml/libyaml/archive/&yaml-version;/libyaml-dist-&yaml-version;.tar.gz">
   <!ENTITY yaml-download-ftp  " ">
-  <!ENTITY yaml-md5sum        "163fc1e22153d3e2cebfe5cbb43a1769">
+  <!ENTITY yaml-md5sum        "64219701e897efb467d95123a165ca01">
   <!ENTITY yaml-size          "84 KB">
-  <!ENTITY yaml-buildsize     "6.7 MB (with tests)">
+  <!ENTITY yaml-buildsize     "6.6 MB (with tests)">
   <!ENTITY yaml-time          "0.1 SBU (with tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -154,5 +155,5 @@
         <listitem>
           <para>
-            contains API functions for parsing and emitting YAML code
+            contains API functions for parsing and emitting YAML code.
           </para>
           <indexterm zone="libyaml libyaml-lib">
Index: general/genlib/lzo.xml
===================================================================
--- general/genlib/lzo.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/lzo.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY lzo-download-http "https://www.oberhumer.com/opensource/lzo/download/lzo-&lzo-version;.tar.gz">
+  <!ENTITY lzo-download-http "http://www.oberhumer.com/opensource/lzo/download/lzo-&lzo-version;.tar.gz">
   <!ENTITY lzo-download-ftp  " ">
   <!ENTITY lzo-md5sum        "39d3f3f9c55c87b1e5d6888e1420f4b5">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -140,8 +141,8 @@
 
       <varlistentry id="liblzo2">
-        <term><filename class="libraryfile">liblzo2.so</filename></term>
+        <term><filename class='libraryfile'>liblzo2.so</filename></term>
         <listitem>
           <para>
-            is a data compression and decompression library
+            is a data compression and decompression library.
           </para>
           <indexterm zone="lzo liblzo2">
Index: general/genlib/mtdev.xml
===================================================================
--- general/genlib/mtdev.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/mtdev.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY mtdev-download-http "https://bitmath.org/code/mtdev/mtdev-&mtdev-version;.tar.bz2">
+  <!ENTITY mtdev-download-http "http://bitmath.org/code/mtdev/mtdev-&mtdev-version;.tar.bz2">
   <!ENTITY mtdev-download-ftp  " ">
   <!ENTITY mtdev-md5sum        "bf8ef2482e84a00b5db8fbd3ce00e249">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -137,5 +138,5 @@
         <listitem>
           <para>
-            is a tool to test <filename class="libraryfile">libmtdev</filename>
+            is a tool to test <filename class="libraryfile">libmtdev</filename>.
           </para>
           <indexterm zone="mtdev mtdev-test">
@@ -149,5 +150,5 @@
         <listitem>
           <para>
-            contains Multitouch Protocol Translation API functions
+            contains Multitouch Protocol Translation API functions.
           </para>
           <indexterm zone="mtdev libmtdev">
Index: general/genlib/nodejs.xml
===================================================================
--- general/genlib/nodejs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/nodejs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,9 @@
   <!ENTITY nodejs-download-http "https://nodejs.org/dist/v&nodejs-version;/node-v&nodejs-version;.tar.xz">
   <!ENTITY nodejs-download-ftp  " ">
-  <!ENTITY nodejs-md5sum        "8ec7b05141efe9de286a78506e116735">
+  <!ENTITY nodejs-md5sum        "63fdbe8d8b1b0cb795a49d6fc2ecfb48">
   <!ENTITY nodejs-size          "32 MB">
-  <!ENTITY nodejs-buildsize     "751 MB">
-  <!ENTITY nodejs-time          "11 SBU (using parallelism=4; add 2.6 SBU for tests)">
+  <!ENTITY nodejs-buildsize     "744 MB (add 20 MB for tests)">
+  <!ENTITY nodejs-time          "8.2 SBU (using parallelism=4; add 2.1 SBU for tests)">
+  <!-- timing may be shorter on intel -->
 ]>
 
@@ -17,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -70,16 +72,4 @@
       </listitem>
     </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/node-v&nodejs-version;-icu_69-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
 
 <!--<note>
@@ -123,12 +113,4 @@
     <title>Installation of Node.js</title>
 
-<!--
-    <para>
-      First, apply a patch to fix building Node.js against ICU-69.1:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../node-v&nodejs-version;-icu_69-1.patch</userinput></screen>
--->
-
     <para>
       Build <application>Node.js</application> by running the following
@@ -136,6 +118,5 @@
     </para>
 
-<screen><userinput>sed -i 's|ares_nameser.h|arpa/nameser.h|' src/cares_wrap.h &amp;&amp;
-./configure --prefix=/usr                  \
+<screen><userinput>./configure --prefix=/usr                  \
             --shared-cares                 \
             --shared-libuv                 \
@@ -148,6 +129,9 @@
     <para>
       To test the results, issue: <command>make test-only</command>.
-      One test in test/parallel/test-uv-errno.js is known to fail with
-      libuv-1.42.0.
+      <!--One test, test-dns, is known to fail.-->
+      <!-- When using make check, a module is used that wasn't shipped properly
+           with the 12.16.2 release. See Ticket #13379 for details. We should
+           probably restore "make check" after the next version of Node.js.
+           This new command skips the documentation and lint checks. -renodr-->
     </para>
 
@@ -164,10 +148,5 @@
 
     <para>
-      <parameter>sed -i 's%ares_\(nameser.h\)%arpa/\1%' ...</parameter>:
-      This fixes building with the system version of c-ares.
-    </para>
-
-    <para>
-      <parameter>--with-intl=system-icu</parameter>: use the system version
+      <parameter>- -with-intl=system-icu</parameter>: use the system version
       of <application>icu</application>. Other values are
       <option>full-icu</option> (to build a local, full
@@ -230,5 +209,5 @@
         <listitem>
           <para>
-            is the server-side JavaScript runtime
+            is the server-side JavaScript runtime.
           </para>
           <indexterm zone="nodejs node">
@@ -242,5 +221,5 @@
         <listitem>
           <para>
-            is the <application>Node.js</application> package manager
+            is the <application>Node.js</application> package manager.
           </para>
           <indexterm zone="nodejs npm">
@@ -251,10 +230,8 @@
 
       <varlistentry>
-        <term>
-          <filename class="directory">/usr/lib/node_modules/npm/</filename>
-        </term>
+        <term><filename class='directory'>/usr/lib/node_modules/npm/</filename></term>
         <listitem>
           <para>
-            is the installation root for Node.js executables and libraries
+            is the installation root for Node.js executables and libraries.
           </para>
         </listitem>
Index: general/genlib/npth.xml
===================================================================
--- general/genlib/npth.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/npth.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -151,5 +152,5 @@
             the npth library. It can be used to query the C compiler and
             linker flags which are required to correctly compile and link the
-            application against the npth library
+            application against the npth library.
           </para>
           <indexterm zone="npth npth-config">
@@ -164,5 +165,5 @@
           <para>
             contains the API functions used by the New Portable Threads
-            Library
+            Library.
           </para>
           <indexterm zone="npth libnpth">
@@ -173,4 +174,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/genlib/nspr.xml
===================================================================
--- general/genlib/nspr.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/nspr.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,8 +6,8 @@
 
   <!ENTITY nspr-download-http "&mozilla-http;/nspr/releases/v&nspr-version;/src/nspr-&nspr-version;.tar.gz">
-  <!ENTITY nspr-download-ftp  " ">
-  <!ENTITY nspr-md5sum        "493d0e2284f873681c089cd503b99bf0">
+  <!ENTITY nspr-download-ftp " ">
+  <!ENTITY nspr-md5sum        "a546926d3c8e887be02c668c1293da92">
   <!ENTITY nspr-size          "1.0 MB">
-  <!ENTITY nspr-buildsize     "11 MB">
+  <!ENTITY nspr-buildsize     "9.5 MB">
   <!ENTITY nspr-time          "less than 0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -83,6 +84,6 @@
 
 <screen><userinput>cd nspr                                                     &amp;&amp;
-sed -ri '/^RELEASE/s/^/#/' pr/src/misc/Makefile.in &amp;&amp;
-sed -i 's#$(LIBRARY) ##'   config/rules.mk         &amp;&amp;
+sed -ri 's#^(RELEASE_BINS =).*#\1#' pr/src/misc/Makefile.in &amp;&amp;
+sed -i 's#$(LIBRARY) ##'            config/rules.mk         &amp;&amp;
 
 ./configure --prefix=/usr \
@@ -111,6 +112,7 @@
 
     <para>
-      <command>sed -ri '/^RELEASE/s/^/#/' pr/src/misc/Makefile.in</command>: 
-      This sed disables installing two unneeded scripts.
+      <command>sed -ri 's#^(RELEASE_BINS =).*#\1#'
+      pr/src/misc/Makefile.in</command>: This sed disables installing two unneeded
+      scripts.
     </para>
 
@@ -173,5 +175,5 @@
           <para>
             provides compiler and linker options to other packages that use
-            <application>NSPR</application>
+            <application>NSPR</application>.
           </para>
           <indexterm zone="nspr nspr-config">
@@ -182,5 +184,5 @@
 
       <varlistentry id="libnspr4">
-        <term><filename class="libraryfile">libnspr4.so</filename></term>
+        <term><filename class='libraryfile'>libnspr4.so</filename></term>
         <listitem>
           <para>
@@ -188,5 +190,5 @@
             operating system facilities such as threads, thread synchronization,
             normal file and network I/O, interval timing and calendar time,
-            basic memory management and shared library linking
+            basic memory management and shared library linking.
           </para>
           <indexterm zone="nspr libnspr4">
@@ -197,5 +199,5 @@
 
       <varlistentry id="libplc4">
-        <term><filename class="libraryfile">libplc4.so</filename></term>
+        <term><filename class='libraryfile'>libplc4.so</filename></term>
         <listitem>
           <para>
@@ -210,8 +212,8 @@
 
       <varlistentry id="libplds4">
-        <term><filename class="libraryfile">libplds4.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide data structures
+        <term><filename class='libraryfile'>libplds4.so</filename></term>
+        <listitem>
+          <para>
+            contains functions that provide data structures.
           </para>
           <indexterm zone="nspr libplds4">
Index: general/genlib/pcre.xml
===================================================================
--- general/genlib/pcre.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/pcre.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY pcre-download-http "https://ftp.pcre.org/pub/pcre/pcre-&pcre-version;.tar.bz2">
   <!ENTITY pcre-download-ftp  "ftp://ftp.pcre.org/pub/pcre/pcre-&pcre-version;.tar.bz2">
-  <!ENTITY pcre-md5sum        "4452288e6a0eefb2ab11d36010a1eebb">
+  <!ENTITY pcre-md5sum        "cf7326204cc46c755b5b2608033d9d24">
   <!ENTITY pcre-size          "1.5 MB">
-  <!ENTITY pcre-buildsize     "23 MB (with tests)">
+  <!ENTITY pcre-buildsize     "20 MB (with tests)">
   <!ENTITY pcre-time          "0.3 SBU (with tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -112,5 +113,7 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install                     &amp;&amp;
+mv -v /usr/lib/libpcre.so.* /lib &amp;&amp;
+ln -sfv ../../lib/$(readlink /usr/lib/libpcre.so) /usr/lib/libpcre.so</userinput></screen>
 
   </sect2>
@@ -157,5 +160,4 @@
       href="../../xincludes/static-libraries.xml"/>
 
-    <!-- FIXME: Removed due to merged-/usr setup
     <para>
       <command>mv -v /usr/lib/libpcre.so.* /lib</command>: Moves the
@@ -164,5 +166,4 @@
       gets reinstalled with <application>PCRE</application> support.
     </para>
-    -->
 
     <para>
@@ -205,5 +206,5 @@
           <para>
             is a <command>grep</command> that understands
-            <application>Perl</application> compatible regular expressions
+            <application>Perl</application> compatible regular expressions.
           </para>
           <indexterm zone="pcre pcregrep">
@@ -218,5 +219,5 @@
           <para>
             can test a <application>Perl</application> compatible
-            regular expression
+            regular expression.
           </para>
           <indexterm zone="pcre pcretest">
@@ -231,5 +232,5 @@
           <para>
             is used during the compile process of programs linking to
-            the <application>PCRE</application> libraries
+            the <application>PCRE</application> libraries.
           </para>
           <indexterm zone="pcre pcre-config">
Index: general/genlib/pcre2.xml
===================================================================
--- general/genlib/pcre2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/pcre2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY pcre2-download-http "https://ftp.pcre.org/pub/pcre/pcre2-&pcre2-version;.tar.bz2">
   <!ENTITY pcre2-download-ftp  "ftp://ftp.pcre.org/pub/pcre/pcre2-&pcre2-version;.tar.bz2">
-  <!ENTITY pcre2-md5sum        "85dc7f2233491b4b6ec6115220da99c6">
-  <!ENTITY pcre2-size          "1.7 MB">
-  <!ENTITY pcre2-buildsize     "18 MB (with tests)">
+  <!ENTITY pcre2-md5sum        "bd7e7421ff3fa2e2d5429229ecfad095">
+  <!ENTITY pcre2-size          "1.6 MB">
+  <!ENTITY pcre2-buildsize     "23 MB (with tests)">
   <!ENTITY pcre2-time          "0.5 SBU (with tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -199,5 +200,5 @@
             is a version of <application>grep</application>
             that understands 
-            <application>Perl compatible regular expressions.</application>
+            <application>Perl compatible regular expressions.</application>.
           </para>
           <indexterm zone="pcre2 pcre2grep">
@@ -225,5 +226,5 @@
           <para>
             outputs compilation information to programs linking against the
-            <application>PCRE2</application> libraries
+            <application>PCRE2</application> libraries.
           </para>
           <indexterm zone="pcre2 pcre2-config">
Index: general/genlib/popt.xml
===================================================================
--- general/genlib/popt.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/popt.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -70,11 +71,4 @@
       </listitem>
     </itemizedlist>
-
-    <bridgehead renderas="sect3">popt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (for generating documentation)
-    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -130,14 +124,4 @@
       href="../../xincludes/static-libraries.xml"/>
 
-    <!-- FIXME Removed due to merged-/usr changes
-    <para>
-      <command>mv /usr/lib/libpopt.so.* /lib</command> and
-      <command>ln -sfv ...</command>: Moves the popt library on the root
-      filesystem, so it is avaliable in case
-      <systemitem class="filesystem">/usr</systemitem> is offline and
-      <xref linkend="efibootmgr"/> is installed and linked to popt.
-    </para>
-    -->
-
   </sect2>
 
@@ -163,8 +147,8 @@
 
       <varlistentry id="libpopt">
-      <term><filename class="libraryfile">libpopt.so</filename></term>
+      <term><filename role='library'>libpopt.so</filename></term>
       <listitem>
         <para>
-          is used to parse command-line options
+          is used to parse command-line options.
         </para>
         <indexterm zone="popt libpopt">
Index: general/genlib/pth.xml
===================================================================
--- general/genlib/pth.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/pth.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -74,12 +75,4 @@
       </listitem>
     </itemizedlist>
-
-    <bridgehead renderas="sect3">Pth Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gcc"/> (for gfortran) and
-      <xref linkend="libnsl"/> 
-    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -174,5 +167,5 @@
             the pth(3) library. It can be used to query the C compiler and
             linker flags which are required to correctly compile and link the
-            application against the pth(3) library
+            application against the pth(3) library.
           </para>
           <indexterm zone="pth pth-config">
@@ -187,5 +180,5 @@
           <para>
             contains the API functions used by the GNU Portable Threads
-            Library
+            Library.
           </para>
           <indexterm zone="pth libpth">
@@ -196,4 +189,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/genlib/qca.xml
===================================================================
--- general/genlib/qca.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/qca.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY qca-download-http "https://download.kde.org/stable/qca/&qca-version;/qca-&qca-version;.tar.xz">
+  <!ENTITY qca-download-http "http://download.kde.org/stable/qca/&qca-version;/qca-&qca-version;.tar.xz">
   <!ENTITY qca-download-ftp  " ">
-  <!ENTITY qca-md5sum        "22d9aad50442168911d442792c047266">
-  <!ENTITY qca-size          "720 KB">
+  <!ENTITY qca-md5sum        "3799abe75500b19f5f18b4eb7bb831f5">
+  <!ENTITY qca-size          "712 KB">
   <!ENTITY qca-buildsize     "42 MB">
-  <!ENTITY qca-time          "0.5 SBU (using parallelism=4; add 0.7 SBU for tests)">
+  <!ENTITY qca-time          "0.6 SBU (using parallelism=4; add 0.6 SBU for tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -201,5 +202,5 @@
           <para>
             is a command line tool for converting certdata.txt into
-            outfile.pem files
+            outfile.pem files.
           </para>
           <indexterm zone="qca mozcerts">
@@ -214,5 +215,5 @@
           <para>
             is a command line tool for performing various cryptographic
-            operations with Qca
+            operations with Qca.
           </para>
           <indexterm zone="qca qcatool">
@@ -223,8 +224,8 @@
 
       <varlistentry id="libqca">
-        <term><filename class="libraryfile">libqca-qt5.so</filename></term>
+        <term><filename class='libraryfile'>libqca-qt5.so</filename></term>
         <listitem>
           <para>
-            is the Qt Cryptography Architecture (Qca) library
+            is the Qt Cryptography Architecture (Qca) library.
           </para>
           <indexterm zone="qca libqca">
Index: general/genlib/talloc.xml
===================================================================
--- general/genlib/talloc.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/talloc.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY talloc-download-http "https://www.samba.org/ftp/talloc/talloc-&talloc-version;.tar.gz">
   <!ENTITY talloc-download-ftp  " ">
-  <!ENTITY talloc-md5sum        "b9a334039dd24bed8ea546c71cb3d196">
-  <!ENTITY talloc-size          "636 KB">
-  <!ENTITY talloc-buildsize     "9.9 MB (with tests)">
-  <!ENTITY talloc-time          "0.3 SBU (with tests)">
+  <!ENTITY talloc-md5sum        "ce40593428c0de6b85946189dcc37b5e">
+  <!ENTITY talloc-size          "624 KB">
+  <!ENTITY talloc-buildsize     "9.8 MB (with tests)">
+  <!ENTITY talloc-time          "0.4 SBU (with tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -77,12 +78,10 @@
       <xref linkend="docbook-xsl"/> and
       <xref linkend="libxslt"/> (To generate man pages),
-<!-- not accepted anymore
       <xref linkend="python2"/> (To build Python-2 module),
--->   <xref linkend="gdb"/>,
+      <xref linkend="gdb"/>,
       <xref linkend="git"/>,
-      <xref linkend="libnsl"/>,
-      <xref linkend="libtirpc"/>,
-      <xref linkend="valgrind"/>, and
-      <xref linkend="xfsprogs"/>
+      <xref linkend="xfsprogs"/>,
+      <xref linkend="libtirpc"/>, and
+      <xref linkend="valgrind"/>
       <!-- These are all looked for at build time, but might not actually be used.-->
     </para>
@@ -137,5 +136,5 @@
         <seg>
           libpytalloc-util.&python3-lib-suffix;.so,
-          <!--libpytalloc-util.so,-->
+          libpytalloc-util.so,
           libtalloc.so,
           <!-- NOTE: The below is Optional now. -->
@@ -159,5 +158,5 @@
           <para>
             contains a replacement for the <application>Glibc</application>
-            malloc function
+            malloc function.
           </para>
           <indexterm zone="talloc libtalloc">
Index: general/genlib/telepathy-glib.xml
===================================================================
--- general/genlib/telepathy-glib.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/telepathy-glib.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,7 +8,7 @@
            "https://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-&telepathy-glib-version;.tar.gz">
   <!ENTITY telepathy-glib-download-ftp  " ">
-  <!ENTITY telepathy-glib-md5sum        "7be2e1fc78f932a215f177994fe37d67">
-  <!ENTITY telepathy-glib-size          "3.7 MB">
-  <!ENTITY telepathy-glib-buildsize     "256 MB">
+  <!ENTITY telepathy-glib-md5sum        "cbeb0a24acc26e7f095be281c324da69">
+  <!ENTITY telepathy-glib-size          "3.8 MB">
+  <!ENTITY telepathy-glib-buildsize     "222 MB">
   <!ENTITY telepathy-glib-time          "1.2 SBU">
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -75,5 +76,4 @@
     </itemizedlist>
 
-<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -85,5 +85,4 @@
       </listitem>
     </itemizedlist>
--->
 
     <bridgehead renderas="sect3">Telepathy GLib Dependencies</bridgehead>
@@ -91,6 +90,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="gtk-doc"/> (required for autoreconf) and
+      <xref linkend="dbus-glib"/> and
       <xref linkend="libxslt"/>
     </para>
@@ -103,8 +101,8 @@
     </para>
 
-<!--<bridgehead renderas="sect4">Optional</bridgehead>
+    <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="gtk-doc"/>
-    </para>-->
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -116,5 +114,4 @@
     <title>Installation of Telepathy Glib</title>
 
-<!--
     <para>
       First, apply a patch to fix several bugs discovered after
@@ -123,15 +120,4 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../telepathy-glib-&telepathy-glib-version;-consolidated_fixes-1.patch</userinput></screen>
--->
-
-    <para>
-      If you intend to run the tests, one of them defaults to invoking
-      <filename>/usr/bin/python</filename> and fails if it is absent, causing
-      the second batch of tests to not run - unlike the other tests which can be
-      overridden from the environment. Fix it with the following command:
-    </para>
-    <!-- Still needed with 0.24.2 -->
-
-<screen><userinput>sed -i 's%/usr/bin/python%&amp;3%' tests/all-errors-documented.py</userinput></screen>
 
     <para>
@@ -140,5 +126,7 @@
     </para>
 
-<screen><userinput>PYTHON=/usr/bin/python3 ./configure --prefix=/usr          \
+<screen><userinput>autoreconf -fiv &amp;&amp;
+
+PYTHON=/usr/bin/python3 ./configure --prefix=/usr          \
                                     --enable-vala-bindings \
                                     --disable-static       &amp;&amp;
@@ -208,5 +196,5 @@
         <listitem>
           <para>
-            contains the <application>Telepathy GLib</application> API functions
+            contains the <application>Telepathy GLib</application> API functions.
           </para>
           <indexterm zone="telepathy-glib libtelepathy-glib">
Index: general/genlib/uchardet.xml
===================================================================
--- general/genlib/uchardet.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/uchardet.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -155,5 +156,5 @@
         <listitem>
           <para>
-            detects what character set is used inside of a file
+            detects what character set is used inside of a file.
           </para>
           <indexterm zone="uchardet uchardet-prog">
@@ -167,5 +168,5 @@
         <listitem>
           <para>
-            provides an API for detecting the encoding of text in a file
+            provides an API for detecting the encoding of text in a file.
           </para>
           <indexterm zone="uchardet libuchardet">
@@ -176,4 +177,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/genlib/umockdev.xml
===================================================================
--- general/genlib/umockdev.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/umockdev.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY umockdev-download-http "https://github.com/martinpitt/umockdev/releases/download/&umockdev-version;/umockdev-&umockdev-version;.tar.xz">
   <!ENTITY umockdev-download-ftp  " ">
-  <!ENTITY umockdev-md5sum        "2470fe134b1ae4c6dde5c93e88f51596">
-  <!ENTITY umockdev-size          "468 KB">
-  <!ENTITY umockdev-buildsize     "6.3 MB (with tests)">
-  <!ENTITY umockdev-time          "0.1 SBU (with tests)">
+  <!ENTITY umockdev-md5sum        "f81bd54acb3f14830e4f7e3d5c6edfc8">
+  <!ENTITY umockdev-size          "448 KB">
+  <!ENTITY umockdev-buildsize     "7.1 MB (with tests)">
+  <!ENTITY umockdev-time          "0.2 SBU (with tests)">
 
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -75,6 +76,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="libgudev"/>,
-      <xref linkend="libpcap"/>, and
+      <xref linkend="libgudev"/> and
       <xref linkend="vala"/>
     </para>
@@ -102,13 +102,13 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
     <para>
-      To test the results, issue: <command>PATH=$PATH:/usr/sbin ninja
+      To test the results, issue: <command>PATH=$PATH:/sbin:/usr/sbin ninja
       test</command>. The addition to <envar>PATH</envar> is needed if you
       use the starting scripts in <xref linkend="postlfs-config-profile"/>,
       because some tests need to run <command>udevadm</command>. One test
-      needs to be run in an X session. 
+      needs to be run in an X session.
     </para>
 
@@ -173,5 +173,5 @@
           <para>
             records Linux devices and their ancestors from sysfs/udev or
-            records ioctls for a device
+            records ioctls for a device.
           </para>
           <indexterm zone="umockdev umockdev-record">
@@ -186,5 +186,5 @@
           <para>
             runs a program under an <application>umockdev</application>
-            testbed
+            testbed.
           </para>
           <indexterm zone="umockdev umockdev-run">
@@ -200,5 +200,5 @@
             wraps a program around 
             <filename class="libraryfile">libumockdev-preload.so.0</filename>
-            through LD_PRELOAD
+            through LD_PRELOAD.
           </para>
           <indexterm zone="umockdev umockdev-wrapper">
@@ -213,5 +213,5 @@
           <para>
             provides API functions that allow mocking hardware devices for unit
-            testing
+            testing.
           </para>
           <indexterm zone="umockdev libumockdev">
@@ -222,4 +222,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/genlib/wayland-protocols.xml
===================================================================
--- general/genlib/wayland-protocols.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/wayland-protocols.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,6 +7,6 @@
   <!ENTITY wayland-protocols-download-http "https://wayland.freedesktop.org/releases/wayland-protocols-&wayland-protocols-version;.tar.xz">
   <!ENTITY wayland-protocols-download-ftp  " ">
-  <!ENTITY wayland-protocols-md5sum        "8196416baac07cd833bcb86b69da41a7">
-  <!ENTITY wayland-protocols-size          "116 KB">
+  <!ENTITY wayland-protocols-md5sum        "b0836533a3f2dc6585b1dae00341157f">
+  <!ENTITY wayland-protocols-size          "112 KB">
   <!ENTITY wayland-protocols-buildsize     "1.2 MB (with tests)">
   <!ENTITY wayland-protocols-time          "less than 0.1 SBU (with tests)">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy: dj $</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -91,12 +92,9 @@
     </para>
 
-<screen><userinput>mkdir build &amp;&amp; 
-cd    build &amp;&amp;
-
-meson --prefix=/usr --buildtype=release &amp;&amp;
-ninja</userinput></screen>
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
 
     <para>
-      To test the results, issue: <command>ninja test</command>.
+      To test the results, issue: <command>make check</command>.
     </para>
 
@@ -105,5 +103,5 @@
     </para>
 
-<screen role="root"><userinput>ninja install</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
   </sect2>
 
@@ -129,4 +127,3 @@
     </segmentedlist>
   </sect2>
-
 </sect1>
Index: general/genlib/wayland.xml
===================================================================
--- general/genlib/wayland.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/wayland.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY wayland-download-http "https://wayland.freedesktop.org/releases/wayland-&wayland-version;.tar.xz">
   <!ENTITY wayland-download-ftp  " ">
-  <!ENTITY wayland-md5sum        "5d59ac3d8a8f4e42de2ceb8bb19dfca9">
-  <!ENTITY wayland-size          "448 KB">
-  <!ENTITY wayland-buildsize     "15 MB (with tests)">
+  <!ENTITY wayland-md5sum        "23317697b6e3ff2e1ac8c5ba3ed57b65">
+  <!ENTITY wayland-size          "444 KB">
+  <!ENTITY wayland-buildsize     "14 MB (with tests)">
   <!ENTITY wayland-time          "0.2 SBU (with tests)">
 ]>
@@ -17,5 +17,6 @@
 
   <sect1info>
-    <date>$Date$</date>
+    <othername>$LastChangedBy: renodr $</othername>
+    <date>$Date: 2015-07-31 23:26:22 -0500 (Fri, 31 Jul 2015) $</date>
   </sect1info>
 
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -101,14 +102,11 @@
     </para>
 
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson --prefix=/usr       \
-      --buildtype=release \
-      -Ddocumentation=false &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>. 
+<screen><userinput>./configure --prefix=/usr    \
+            --disable-static \
+            --disable-documentation &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>. 
       <!-- Seems to work without X installed
       
@@ -123,5 +121,5 @@
     </para>
 
-<screen role="root"><userinput>ninja install</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
@@ -154,8 +152,5 @@
         </seg>
         <seg>
-          libwayland-client.so, 
-          libwayland-cursor.so,
-          libwayland-egl.so, 
-          and libwayland-server.so
+          libwayland-client.so, libwayland-cursor.so, and libwayland-server.so
         </seg>
         <seg>
@@ -188,5 +183,5 @@
           <para>
             contains API functions for writing <application>Wayland</application>
-            applications
+            applications.
           </para>
           <indexterm zone="wayland libwayland-client">
@@ -201,5 +196,5 @@
           <para>
             contains API functions for managing cursors in <application>Wayland</application>
-            applications
+            applications.
           </para>
           <indexterm zone="wayland libwayland-cursor">
@@ -209,17 +204,4 @@
       </varlistentry>
 
-      <varlistentry id="libwayland-egl">
-        <term><filename class="libraryfile">libwayland-egl.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for handling OpenGL calls in
-            <application>Wayland</application> applications
-          </para>
-          <indexterm zone="wayland libwayland-egl">
-            <primary sortas="c-libwayland-egl">libwayland-egl.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libwayland-server">
         <term><filename class="libraryfile">libwayland-server.so</filename></term>
@@ -227,5 +209,5 @@
           <para>
             contains API functions for writing <application>Wayland</application>
-            compositors
+            compositors.
           </para>
           <indexterm zone="wayland libwayland-server">
Index: neral/genlib/wpebackend-fdo.xml
===================================================================
--- general/genlib/wpebackend-fdo.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,154 +1,0 @@
-<?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 wpebackend-fdo-download-http "https://wpewebkit.org/releases/wpebackend-fdo-&wpebackend-fdo-version;.tar.xz">
-  <!ENTITY wpebackend-fdo-download-ftp  " ">
-  <!ENTITY wpebackend-fdo-md5sum        "306adbb0c66dc753e1794c83b7a2682b">
-  <!ENTITY wpebackend-fdo-size          "40 KB">
-  <!ENTITY wpebackend-fdo-buildsize     "6.7 MB">
-  <!ENTITY wpebackend-fdo-time          "0.1 SBU">
-]>
-
-<sect1 id="wpebackend-fdo" xreflabel="wpebackend-fdo-&wpebackend-fdo-version;">
-  <?dbhtml filename="wpebackend-fdo.html"?>
-
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>wpebackend-fdo-&wpebackend-fdo-version;</title>
-
-  <indexterm zone="wpebackend-fdo">
-    <primary sortas="a-wpebackend-fdo">wpebackend-fdo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to wpebackend-fdo</title>
-
-    <para>
-      The <application>wpebackend-fdo</application> package contains the
-      Freedesktop.org backend for WPE WebKit and the WPE renderer.
-    </para>
-
-    &lfs110a_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&wpebackend-fdo-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&wpebackend-fdo-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &wpebackend-fdo-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &wpebackend-fdo-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &wpebackend-fdo-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &wpebackend-fdo-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">wpebackend-fdo Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libepoxy"/>,
-      <xref linkend="libwpe"/>, and
-      <xref linkend="wayland-protocols"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/wpebackend-fdo"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of wpebackend-fdo</title>
-
-    <para>
-      Install <application>wpebackend-fdo</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson --prefix=/usr --buildtype=release ..
-ninja</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-  
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libWPEBackend-fdo-1.0.so
-        </seg>
-        <seg>
-          /usr/include/wpe-fdo-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libWPEBackend-fdo">
-        <term><filename class="libraryfile">libWPEBackend-fdo-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide the freedesktop.org backend for WPE
-            WebKit and the WPE renderer
-          </para>
-          <indexterm zone="wpebackend-fdo libWPEBackend-fdo">
-            <primary sortas="c-libWPEBackend-fdo">libWPEBackend-fdo-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/genlib/wv.xml
===================================================================
--- general/genlib/wv.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/wv.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -84,5 +85,5 @@
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/wv"/></para>
+    <ulink url='&blfs-wiki;/wv'/></para>
 
   </sect2>
@@ -129,5 +130,5 @@
         <seg>wvSummary and several other wv* programs which are deprecated in
         favour of abiword: see
-        <ulink url="http://wvware.sourceforge.net/"/></seg>
+        <ulink url="http://wvware.sourceforge.net/"></ulink></seg>
         <seg>libwv-1.2.so</seg>
         <seg>/usr/share/wv</seg>
@@ -144,5 +145,5 @@
         <listitem>
           <para>
-            displays the summary information from an MS Word document
+            displays the summary information from an MS Word document.
           </para>
           <indexterm zone="wv wv-prog">
@@ -153,8 +154,8 @@
 
       <varlistentry id="libwv-1.2">
-        <term><filename class="libraryfile">libwv-1.2.so</filename></term>
+        <term><filename class='libraryfile'>libwv-1.2.so</filename></term>
         <listitem>
           <para>
-            provides functions to access MS Word documents
+            provides functions to access MS Word documents.
           </para>
           <indexterm zone="wv libwv-1.2">
Index: general/genlib/xapian.xml
===================================================================
--- general/genlib/xapian.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genlib/xapian.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,9 +6,9 @@
 
   <!ENTITY xapian-download-http
-           "https://oligarchy.co.uk/xapian/&xapian-version;/xapian-core-&xapian-version;.tar.xz">
+           "http://oligarchy.co.uk/xapian/&xapian-version;/xapian-core-&xapian-version;.tar.xz">
   <!ENTITY xapian-download-ftp  " ">
-  <!ENTITY xapian-md5sum        "dd1b30f9b307b06fab319d3258fe65ee">
-  <!ENTITY xapian-size          "2.8 MB">
-  <!ENTITY xapian-buildsize     "232 MB (add 188 MB for tests)">
+  <!ENTITY xapian-md5sum        "64cd582a4495c5cbda8e06e63f8ce4f4">
+  <!ENTITY xapian-size          "2.9 MB">
+  <!ENTITY xapian-buildsize     "233 MB (add 187 MB for tests)">
   <!ENTITY xapian-time          "0.5 SBU (using parallelism=4; add 35 SBU for tests)">
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -159,6 +160,6 @@
         <listitem>
           <para>
-            performs a document-by-document copy of one or more
-            <application>Xapian</application> databases
+            perform a document-by-document copy of one or more
+            <application>Xapian</application> databases.
           </para>
           <indexterm zone="xapian copydatabase">
@@ -172,5 +173,5 @@
         <listitem>
           <para>
-            is a command line tool to search through a database
+            is a search command line tool.
           </para>
           <indexterm zone="xapian quest">
@@ -184,5 +185,5 @@
         <listitem>
           <para>
-            is a simple example program demonstrating query expansion
+            is a simple example program demonstrating query expansion.
           </para>
           <indexterm zone="xapian simpleexpand">
@@ -196,6 +197,6 @@
         <listitem>
           <para>
-            indexes each paragraph of a text file as a
-            <application>Xapian</application> document
+            index each paragraph of a text file as a
+            <application>Xapian</application> document.
           </para>
           <indexterm zone="xapian simpleindex">
@@ -209,5 +210,5 @@
         <listitem>
           <para>
-            is a simple command line search utility
+            is a simple command line search utility.
           </para>
           <indexterm zone="xapian simplesearch">
@@ -221,5 +222,5 @@
         <listitem>
           <para>
-            checks the consistency of a database or table
+            check the consistency of a database or table.
           </para>
           <indexterm zone="xapian xapian-check">
@@ -248,5 +249,5 @@
         <listitem>
           <para>
-            compacts a database, or merges and compacts several databases
+            compact a database, or merge and compact several.
           </para>
           <indexterm zone="xapian xapian-compact">
@@ -260,5 +261,5 @@
         <listitem>
           <para>
-            reports information about the installed xapian
+            report information about the installed xapian.
           </para>
           <indexterm zone="xapian xapian-config">
@@ -272,6 +273,6 @@
         <listitem>
           <para>
-            inspects the contents of a <application>Xapian</application>
-            database
+            inspect the contents of a <application>Xapian</application>
+            database.
           </para>
           <indexterm zone="xapian xapian-delve">
@@ -285,5 +286,5 @@
         <listitem>
           <para>
-            reads and writes user metadata
+            read and write user metadata.
           </para>
           <indexterm zone="xapian xapian-metadata">
@@ -297,5 +298,5 @@
         <listitem>
           <para>
-            inspects the contents of a flint table for development or debugging
+            inspect the contents of a flint table for development or debugging.
           </para>
           <indexterm zone="xapian xapian-pos">
@@ -309,5 +310,5 @@
         <listitem>
           <para>
-            is a remote server for use with <application>ProgClient</application>
+            remote server for use with <application>ProgClient</application>.
           </para>
           <indexterm zone="xapian xapian-progsrv">
@@ -321,5 +322,5 @@
         <listitem>
           <para>
-            replicates a database from a master server to a local copy
+            replicate a database from a master server to a local copy.
           </para>
           <indexterm zone="xapian xapian-replicate">
@@ -333,5 +334,5 @@
         <listitem>
           <para>
-            services database replication requests from clients
+            service database replication requests from clients.
           </para>
           <indexterm zone="xapian xapian-replicate-server">
@@ -346,5 +347,5 @@
           <para>
             is the TCP daemon for use with <application>Xapian</application>'s
-            remote backend
+            remote backend.
           </para>
           <indexterm zone="xapian xapian-tcpsrv">
Index: general/genutils/asciidoc.xml
===================================================================
--- general/genutils/asciidoc.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/asciidoc.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY asciidoc-download-http "https://github.com/asciidoc/asciidoc-py3/releases/download/&asciidoc-version;/asciidoc-&asciidoc-version;.tar.gz">
   <!ENTITY asciidoc-download-ftp  " ">
-  <!ENTITY asciidoc-md5sum        "6b0700c602a926325d71f7681dde5c6e">
+  <!ENTITY asciidoc-md5sum        "1201c34c5169b1f6a190a92117c0be2a">
   <!ENTITY asciidoc-size          "1.2 MB">
-  <!ENTITY asciidoc-buildsize     "8.6 MB">
+  <!ENTITY asciidoc-buildsize     "8.5 MB">
   <!ENTITY asciidoc-time          "less than 0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -80,5 +81,5 @@
       <xref linkend="libxslt"/>,
       <xref linkend="lynx"/>,
-      <ulink url="https://sourceforge.net/projects/dblatex/">dblatex</ulink>, and
+      <ulink url="http://sourceforge.net/projects/dblatex/">dblatex</ulink>, and
       <ulink url="&w3m-url;">W3m</ulink>
     </para>
@@ -155,5 +156,5 @@
           <para>
             is a toolchain manager for AsciiDoc 
-            (converts Asciidoc text files to other file formats)
+            (converts Asciidoc text files to other file formats).
           </para>
           <indexterm zone="asciidoc a2x">
Index: neral/genutils/asciidoctor.xml
===================================================================
--- general/genutils/asciidoctor.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?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 asciidoctor-download-http "https://github.com/asciidoctor/asciidoctor/archive/v&asciidoctor-version;/asciidoctor-&asciidoctor-version;.tar.gz">
-  <!ENTITY asciidoctor-download-ftp  " ">
-  <!ENTITY asciidoctor-md5sum        "5fb5891fd8d653e65e950bb194f768bc">
-  <!ENTITY asciidoctor-size          "1.6 MB">
-  <!ENTITY asciidoctor-buildsize     "5.2 MB">
-  <!ENTITY asciidoctor-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="asciidoctor" xreflabel="asciidoctor-&asciidoctor-version;">
-  <?dbhtml filename="asciidoctor.html"?>
-
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Asciidoctor-&asciidoctor-version;</title>
-
-  <indexterm zone="asciidoctor">
-    <primary sortas="a-asciidoctor">asciidoctor</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Asciidoctor</title>
-
-    <para>
-      Asciidoctor is a fast, open source text processor and publishing
-      toolchain for converting AsciiDoc content to HTML5, DocBook, PDF, and
-      other formats.
-    </para>
-
-    &lfs110a_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&asciidoctor-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&asciidoctor-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &asciidoctor-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &asciidoctor-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &asciidoctor-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &asciidoctor-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Asciidoctor Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="ruby"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/asciidoctor"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Asciidoctor</title>
-
-    <para>
-      Build the Ruby gem:
-    </para>
-
-<screen><userinput>gem build asciidoctor.gemspec</userinput></screen>
-
-    <para>
-      The test suite needs many Ruby gems beyond the scope of BLFS.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>gem install asciidoctor-&asciidoctor-version;.gem &amp;&amp;
-install -vm644 man/asciidoctor.1 /usr/share/man/man1</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          asciidoctor
-        </seg>
-        <seg>None</seg>
-        <seg>
-          &ruby-gemdir;/gems/asciidoctor-&asciidoctor-version; and
-          &ruby-gemdir;/doc/asciidoctor-&asciidoctor-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="asciidoctor-prog">
-        <term><command>asciidoctor</command></term>
-        <listitem>
-          <para>
-            converts AsciiDoc source files to HTML, DocBook, and other formats
-          </para>
-          <indexterm zone="asciidoctor asciidoctor-prog">
-            <primary sortas="b-asciidoctor-prog">asciidoctor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/bogofilter.xml
===================================================================
--- general/genutils/bogofilter.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/bogofilter.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -178,5 +179,5 @@
           <para>
             creates a more compact bogofilter working directory with a
-            dump/load cycle
+            dump/load cycle.
           </para>
           <indexterm zone="bogofilter bf_compact">
@@ -190,5 +191,5 @@
         <listitem>
           <para>
-            copies a bogofilter working directory to another directory
+            copies a bogofilter working directory to another directory.
           </para>
           <indexterm zone="bogofilter bf_copy">
@@ -203,5 +204,5 @@
           <para>
             bundles a bogofilter working directory in tar format and
-            copies it to standard output
+            copies it to standard output.
           </para>
           <indexterm zone="bogofilter bf_tar">
@@ -215,5 +216,5 @@
         <listitem>
           <para>
-            is a fast Bayesian spam filter
+            is a fast Bayesian spam filter.
           </para>
           <indexterm zone="bogofilter bogofilter-prog">
@@ -228,5 +229,5 @@
           <para>
             is used to separate messages into tokens and to test new
-            versions of the lexer.l code
+            versions of the lexer.l code.
           </para>
           <indexterm zone="bogofilter bogolexer">
@@ -240,5 +241,5 @@
         <listitem>
           <para>
-            attempts to find optimum parameter settings for bogofilter
+            attempts to find optimum parameter settings for bogofilter.
           </para>
           <indexterm zone="bogofilter bogotune">
@@ -252,5 +253,5 @@
         <listitem>
           <para>
-            upgrades the bogofilter database to the current version
+            upgrades the bogofilter database to the current version.
           </para>
           <indexterm zone="bogofilter bogoupgrade">
@@ -264,5 +265,5 @@
         <listitem>
           <para>
-            dumps, loads, and maintains bogofilter database files
+            dumps, loads, and maintains bogofilter database files.
           </para>
           <indexterm zone="bogofilter bogoutil">
Index: general/genutils/compface.xml
===================================================================
--- general/genutils/compface.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/compface.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -125,5 +126,5 @@
           <para>
             is a filter for generating highly compressed representations
-            of 48x48x1 face image files
+            of 48x48x1 face image files.
           </para>
           <indexterm zone="compface compface-prog">
@@ -138,5 +139,5 @@
           <para>
             is an inverse filter which performs an inverse
-            transformation with no loss of data
+            transformation with no loss of data.
           </para>
           <indexterm zone="compface uncompface">
@@ -150,5 +151,5 @@
         <listitem>
           <para>
-            is a script to generate xfaces
+            is a script to generate xfaces.
           </para>
           <indexterm zone="compface xbm2xface">
@@ -159,9 +160,9 @@
 
       <varlistentry id="libcompface">
-        <term><filename class="libraryfile">libcompface.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libcompface.{so,a}</filename></term>
         <listitem>
           <para>
             allows the compression and decompression algorithms to be
-            used in other programs such as MTAs
+            used in other programs such as MTAs.
           </para>
           <indexterm zone="compface libcompface">
Index: general/genutils/desktop-file-utils.xml
===================================================================
--- general/genutils/desktop-file-utils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/desktop-file-utils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -116,5 +117,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -129,11 +130,4 @@
 <screen role="root"><userinput>ninja install</userinput></screen>
 
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
   </sect2>
 
@@ -215,5 +209,5 @@
         <listitem>
           <para>
-            is used to modify an existing desktop file entry
+            is used to modify an existing desktop file entry.
           </para>
           <indexterm zone="desktop-file-utils desktop-file-edit">
@@ -229,5 +223,5 @@
             is used to install a new desktop file entry. It is
             also used to rebuild or modify the MIME-types application
-            database
+            database.
           </para>
           <indexterm zone="desktop-file-utils desktop-file-install">
@@ -241,5 +235,5 @@
         <listitem>
           <para>
-            is used to verify the integrity of a desktop file
+            is used to verify the integrity of a desktop file.
           </para>
           <indexterm zone="desktop-file-utils desktop-file-validate">
@@ -253,5 +247,5 @@
         <listitem>
           <para>
-            is used to update the MIME-types application database
+            is used to update the MIME-types application database.
           </para>
           <indexterm zone="desktop-file-utils update-desktop-database">
Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/genutils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
  %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="general-genutils">
@@ -20,6 +25,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="asciidoc.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="asciidoctor.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bogofilter.xml"/>
Index: general/genutils/graphviz.xml
===================================================================
--- general/genutils/graphviz.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/graphviz.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY graphviz-download-http "https://gitlab.com/graphviz/graphviz/-/archive/&graphviz-version;/graphviz-&graphviz-version;.tar.gz">
+  <!ENTITY graphviz-download-http "https://www2.graphviz.org/Packages/stable/portable_source/graphviz-&graphviz-version;.tar.gz">
   <!ENTITY graphviz-download-ftp  " ">
-  <!ENTITY graphviz-md5sum        "f9dd7caf4785f47f5fd40f5407d9d7ce">
-  <!ENTITY graphviz-size          "29 MB">
-  <!ENTITY graphviz-buildsize     "204 MB">
-  <!ENTITY graphviz-time          "0.7 SBU (using parallelism=4)">
+  <!ENTITY graphviz-md5sum        "96792adafea5cc6879060c400da31ea3">
+  <!ENTITY graphviz-size          "33 MB">
+  <!ENTITY graphviz-buildsize     "284 MB">
+  <!ENTITY graphviz-time          "1.0 SBU (using parallelism=4)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -145,5 +146,5 @@
       <xref linkend="libwebp"/> (WebP support is considered experimental),
       <ulink url="http://openil.sourceforge.net/projects.php">DevIL</ulink>,
-      <ulink url="https://sourceforge.net/projects/lasi/">libLASi</ulink>,
+      <ulink url="http://sourceforge.net/projects/lasi/">libLASi</ulink>,
       <ulink url="http://www.freedesktop.org/wiki/Software/glitz">glitz</ulink>,
       and <ulink url="http://www.libming.org/">libming</ulink> (Adobe
@@ -184,5 +185,5 @@
       <xref linkend="lua"/>,
       <xref linkend="php"/>,
-      <!--<xref linkend="python2"/>, Removed in 2.47.3 -->
+      <xref linkend="python2"/>,
       <xref linkend="ruby"/>,
       <!-- <xref linkend="tcl"/>, -->
@@ -197,6 +198,6 @@
     <para role="optional">
       <ulink url="https://github.com/Snaipe/Criterion">Criterion</ulink>
-          (framework for tests) and
-      <ulink url="http://linux.softpedia.com/get/Programming/Debuggers/Electric-Fence-3305.shtml/">Electric Fence</ulink>
+          (framework for tests),
+      <ulink url="http://linux.softpedia.com/get/Programming/Debuggers/Electric-Fence-3305.shtml/">Electric Fence</ulink>,
     </para>
 
@@ -241,8 +242,6 @@
 <screen><userinput>sed -i '/LIBPOSTFIX="64"/s/64//' configure.ac &amp;&amp;
 
-./autogen.sh              &amp;&amp;
-./configure --prefix=/usr \
-            --disable-php \
-            PS2PDF=true   &amp;&amp;
+autoreconf                            &amp;&amp;
+./configure --prefix=/usr PS2PDF=true &amp;&amp;
 make</userinput></screen>
 
@@ -266,5 +265,5 @@
     </para>
 
-<screen role="root"><userinput>ln -svr /usr/share/graphviz/doc /usr/share/doc/graphviz-&graphviz-version;</userinput></screen>
+<screen role="root"><userinput>ln -v -s /usr/share/graphviz/doc /usr/share/doc/graphviz-&graphviz-version;</userinput></screen>
 
   </sect2>
@@ -277,9 +276,9 @@
       avoid installing files in /usr/lib64.
     </para>
-
-    <para>
-      <parameter>--disable-php</parameter>: This version of graphviz
-      does not support php version 8.
-    </para>
+<!-- Seems php bindings can be built now (not tested)
+    <para>
+      <parameter>- -disable-php</parameter>: This version of graphviz
+      does not support php version 7.
+    </para>-->
 
     <para>
@@ -336,5 +335,5 @@
         <application>Graphviz</application>. You may consider installing the
         additional plugins and tools available from the download page at
-        <ulink url="https://graphviz.org/download/source/"/> for additional
+        <ulink url="http://www.graphviz.org/Download_source.php"/> for additional
         capabilities. If additional plugins are installed, you can run
         <command>dot -c</command> (as the
@@ -369,5 +368,5 @@
           libpathplan.so, libxdot.so, and several plugins in /usr/lib/graphviz.
           There are also several in subdirectories of
-          /usr/lib/{lua,perl5,php,<!--python&python2-majorver;-->,python&python3-majorver;,tcl8.6}.
+          /usr/lib/{lua,perl5,php,python&python2-majorver;,python&python3-majorver;tcl8.6}.
           Unfortunately, some libraries are duplicated.
         </seg>
@@ -393,5 +392,5 @@
             is a filter that takes a directed graph as input and outputs a
             copy of the graph with sufficient edges reversed to make the
-            graph acyclic
+            graph acyclic.
           </para>
           <indexterm zone="graphviz acyclic">
@@ -406,5 +405,5 @@
           <para>
             decomposes graphs into their biconnected components,
-            printing the components to standard output
+            printing the components to standard output.
           </para>
           <indexterm zone="graphviz bcomps">
@@ -419,5 +418,5 @@
           <para>
             decomposes graphs into their connected components,
-            printing the components to standard output
+            printing the components to standard output.
           </para>
           <indexterm zone="graphviz ccomps">
@@ -431,5 +430,5 @@
         <listitem>
           <para>
-            draws graphs using a circular layout
+            draws graphs using a circular layout.
           </para>
           <indexterm zone="graphviz circo">
@@ -444,5 +443,5 @@
           <para>
             takes as input a graph in DOT format, finds node clusters
-            and augments the graph with this information
+            and augments the graph with this information.
           </para>
           <indexterm zone="graphviz cluster">
@@ -459,5 +458,5 @@
             generates an image where each pixel is the
             difference between the corresponding pixel in
-            each of the two source images
+            each of the two source images.
           </para>
           <indexterm zone="graphviz diffimg">
@@ -472,5 +471,5 @@
           <para>
             reads a stream of graphs and for each computes the distance of
-            every node from sourcenode
+            every node from sourcenode.
           </para>
           <indexterm zone="graphviz dijkstra">
@@ -487,5 +486,5 @@
             that can be drawn as hierarchies. It reads attributed graph files and
             writes drawings. By default, the output format dot is the input file
-            with layout coordinates appended
+            with layout coordinates appended.
           </para>
           <indexterm zone="graphviz dot">
@@ -503,8 +502,8 @@
             <command>gxl2dot</command> will deduce the type of conversion from
             the suffix of the input file, a
-            <filename class="extension">.dot</filename> suffix causing a
+            <filename class='extension'>.dot</filename> suffix causing a
             conversion from DOT to GXL, and a
-            <filename class="extension">.gxl</filename> suffix causing a
-            conversion from GXL to DOT
+            <filename class='extension'>.gxl</filename> suffix causing a
+            conversion from GXL to DOT.
           </para>
           <indexterm zone="graphviz dot2gxl">
@@ -520,5 +519,5 @@
             is a graph editor for the X Window System. It may be run as a
             standalone editor, or as a front end for applications that use
-            graphs. It can control multiple windows viewing different graphs
+            graphs. It can control multiple windows viewing different graphs.
           </para>
           <indexterm zone="graphviz dotty">
@@ -532,5 +531,5 @@
         <listitem>
           <para>
-            performs edge coloring to disambiguate crossing edges
+            performs edge coloring to disambiguate crossing edges.
           </para>
           <indexterm zone="graphviz edgepaint">
@@ -546,5 +545,5 @@
             draws undirected graphs using a <quote>spring</quote> model. It
             relies on a force-directed approach in the spirit of Fruchterman
-            and Reingold
+            and Reingold.
           </para>
           <indexterm zone="graphviz fdp">
@@ -561,5 +560,5 @@
             to standard output the number of nodes, edges, connected components
             or clusters contained in the input files. It also prints a total
-            count for all graphs if more than one graph is given
+            count for all graphs if more than one graph is given.
           </para>
           <indexterm zone="graphviz gc-graphviz">
@@ -574,5 +573,5 @@
           <para>
             converts a graph specified in the GML format to
-            a graph in the GV (formerly DOT) format
+            a graph in the GV (formerly DOT) format.
           </para>
           <indexterm zone="graphviz gml2gv">
@@ -587,5 +586,5 @@
           <para>
             converts a graph specified in the GRAPHML format to a graph in
-            the GV (formerly DOT) format
+            the GV (formerly DOT) format.
           </para>
           <indexterm zone="graphviz graphml2gv">
@@ -599,5 +598,5 @@
         <listitem>
           <para>
-            converts a graph specified in the GV format to a graph in the GML format
+            converts a graph specified in the GV format to a graph in the GML format.
           </para>
           <indexterm zone="graphviz gv2gml">
@@ -611,5 +610,5 @@
         <listitem>
           <para>
-            converts a graph specified in the GV format to a graph in the GXL format
+            converts a graph specified in the GV format to a graph in the GXL format.
           </para>
           <indexterm zone="graphviz gv2gxl">
@@ -625,5 +624,5 @@
             is a filter that sets node colors from initial seed values.
             Colors flow along edges from tail to head, and are averaged (as HSB
-            vectors) at nodes
+            vectors) at nodes.
           </para>
           <indexterm zone="graphviz gvcolor">
@@ -639,5 +638,5 @@
             provides a simple graph editor and viewer. It allows many
             graphs to be viewed at the same time. The text of each
-            graph is displayed in its own text window
+            graph is displayed in its own text window.
           </para>
           <indexterm zone="graphviz gvedit">
@@ -652,5 +651,5 @@
           <para>
             generates a variety of simple, regularly-structured
-            abstract graphs
+            abstract graphs.
           </para>
           <indexterm zone="graphviz gvgen">
@@ -667,5 +666,5 @@
             clusters and produces a rendering of the graph as
             a geographic-style map, with clusters highlighted,
-            in xdot format
+            in xdot format.
           </para>
           <indexterm zone="graphviz gvmap">
@@ -679,5 +678,5 @@
         <listitem>
           <para>
-            is a pipeline for running gvmap
+            is a pipeline for running gvmap.
           </para>
           <indexterm zone="graphviz gvmap.sh">
@@ -692,5 +691,5 @@
           <para>
             reads in a stream of graphs, combines the graphs into a single layout,
-            and produces a single graph serving as the union of the input graphs
+            and produces a single graph serving as the union of the input graphs.
           </para>
           <indexterm zone="graphviz gvpack">
@@ -707,5 +706,5 @@
             copies input graphs to its output, possibly transforming their
             structure and attributes, creating new graphs, or printing arbitrary
-            information
+            information.
           </para>
           <indexterm zone="graphviz gvpr">
@@ -723,8 +722,8 @@
             <command>gxl2dot</command> will deduce the type of conversion from
             the suffix of the input file, a
-            <filename class="extension">.dot</filename> suffix causing a
+            <filename class='extension'>.dot</filename> suffix causing a
             conversion from DOT to GXL, and a
-            <filename class="extension">.gxl</filename> suffix causing a
-            conversion from GXL to DOT
+            <filename class='extension'>.gxl</filename> suffix causing a
+            conversion from GXL to DOT.
           </para>
           <indexterm zone="graphviz gxl2dot">
@@ -739,5 +738,5 @@
           <para>
             converts between graphs represented in GXL and in
-            the GV language
+            the GV language.
           </para>
           <indexterm zone="graphviz gxl2gv">
@@ -751,5 +750,5 @@
         <listitem>
           <para>
-            is a two-view graphics editor for technical pictures
+            is a two-view graphics editor for technical pictures.
           </para>
           <indexterm zone="graphviz lefty">
@@ -765,5 +764,5 @@
             is a graph editor for the X Window System. It may be run as a
             standalone editor, or as a front end for applications that use
-            graphs. It can control multiple windows viewing different graphs
+            graphs. It can control multiple windows viewing different graphs.
           </para>
           <indexterm zone="graphviz lneato">
@@ -778,5 +777,5 @@
           <para>
             converts a sparse matrix of the Matrix Market format
-            to a graph in the GV (formerly DOT) format
+            to a graph in the GV (formerly DOT) format.
           </para>
           <indexterm zone="graphviz mm2gv">
@@ -793,5 +792,5 @@
             files must be formatted in the <command>dot</command>  attributed
             graph language. By default, the output of <command>neato</command>
-            is the input graph with layout coordinates appended
+            is the input graph with layout coordinates appended.
           </para>
           <indexterm zone="graphviz neato">
@@ -806,5 +805,5 @@
           <para>
             reads a stream of graphs and prints each in pretty-printed (canonical)
-            format on stdout. If no files are given, it reads from stdin
+            format on stdout. If no files are given, it reads from stdin.
           </para>
           <indexterm zone="graphviz nop">
@@ -819,5 +818,5 @@
           <para>
             draws clustered graphs. As input, it takes any
-            graph in the DOT format
+            graph in the DOT format.
           </para>
           <indexterm zone="graphviz osage">
@@ -832,5 +831,5 @@
           <para>
             draws clustered graphs using a squarified treemap layout.
-            As input, it takes any graph in the DOT format
+            As input, it takes any graph in the DOT format.
           </para>
           <indexterm zone="graphviz patchwork">
@@ -846,5 +845,5 @@
             reads directed graphs in the same format used by
             <command>dot</command> and removes subgraphs rooted at nodes
-            specified on the command line via options
+            specified on the command line via options.
           </para>
           <indexterm zone="graphviz prune">
@@ -861,5 +860,5 @@
             auxiliary map of the relationship between components. In this map,
             each component is collapsed into a node. The resulting graphs are
-            printed to stdout
+            printed to stdout.
           </para>
           <indexterm zone="graphviz sccmap">
@@ -875,5 +874,5 @@
             draws undirected graphs using the <quote>spring</quote> model,
             but it uses a multi-scale approach to produce layouts of large
-            graphs in a reasonably short time
+            graphs in a reasonably short time.
           </para>
           <indexterm zone="graphviz sfdp">
@@ -890,5 +889,5 @@
             prints the resulting graphs to standard output. This removes edges
             implied by transitivity. Nodes and subgraphs are not otherwise
-            affected
+            affected.
           </para>
           <indexterm zone="graphviz tred">
@@ -905,5 +904,5 @@
             chosen as the center and put at the origin. The remaining nodes are
             placed on a sequence of concentric circles centered about the origin,
-            each a fixed radial distance from the previous circle
+            each a fixed radial distance from the previous circle.
           </para>
           <indexterm zone="graphviz twopi">
@@ -919,5 +918,5 @@
             is a preprocessor to <command>dot</command> that is used to
             improve the aspect ratio of graphs having many leaves or disconnected
-            nodes. The usual layout for such a graph is generally very wide or tall
+            nodes. The usual layout for such a graph is generally very wide or tall.
           </para>
           <indexterm zone="graphviz unflatten">
@@ -933,5 +932,5 @@
             is a simple script which launches the <command>gvim</command>
             or <command>vim</command> editor along with a GUI window
-            showing the <command>dot</command> output of the edited file
+            showing the <command>dot</command> output of the edited file.
           </para>
           <indexterm zone="graphviz vimdot">
@@ -947,5 +946,5 @@
             manages run-time dictionaries using standard container data
             types: unordered set/multiset, ordered set/multiset, list, stack,
-            and queue
+            and queue.
           </para>
           <indexterm zone="graphviz libcdt">
@@ -961,5 +960,5 @@
             supports graph programming by maintaining graphs in memory and
             reading and writing graph files. Graphs are composed of nodes,
-            edges, and nested subgraphs
+            edges, and nested subgraphs.
           </para>
           <indexterm zone="graphviz libcgraph">
@@ -975,5 +974,5 @@
             provides a context for applications wishing to manipulate
             and render graphs. It provides a command line parsing,
-            common rendering code, and a plugin mechanism for renderers
+            common rendering code, and a plugin mechanism for renderers.
           </para>
           <indexterm zone="graphviz libgvc">
@@ -988,5 +987,5 @@
           <para>
             contains functions to find the shortest path between two points
-            in a simple polygon
+            in a simple polygon.
           </para>
           <indexterm zone="graphviz libpathplan">
@@ -1001,5 +1000,5 @@
           <para>
             provides support for parsing and deparsing graphical
-            operations specificed by the xdot language
+            operations specificed by the xdot language.
           </para>
           <indexterm zone="graphviz libxdot">
Index: general/genutils/gtk-doc.xml
===================================================================
--- general/genutils/gtk-doc.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/gtk-doc.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY gtk-doc-download-http "&gnome-download-http;/gtk-doc/&gtk-doc-major;/gtk-doc-&gtk-doc-version;.tar.xz">
   <!ENTITY gtk-doc-download-ftp  "&gnome-download-ftp;/gtk-doc/&gtk-doc-major;/gtk-doc-&gtk-doc-version;.tar.xz">
-  <!ENTITY gtk-doc-md5sum        "ea6563421abe964d02135ca0d5b8dd8e">
-  <!ENTITY gtk-doc-size          "496 KB">
-  <!ENTITY gtk-doc-buildsize     "13 MB (with tests)">
+  <!ENTITY gtk-doc-md5sum        "13e4b98ab74eba8b15caaec86fbd96c4">
+  <!ENTITY gtk-doc-size          "752 KB">
+  <!ENTITY gtk-doc-buildsize     "14 MB (with tests)">
   <!ENTITY gtk-doc-time          "0.2 SBU (with tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -105,5 +106,5 @@
     <para role="optional">
       For tests: 
-      <ulink url="https://sourceforge.net/projects/dblatex/">dblatex</ulink> or
+      <ulink url="http://sourceforge.net/projects/dblatex/">dblatex</ulink> or
       <xref linkend="fop"/> (XML PDF support),
       <xref linkend="glib2"/>,
@@ -111,5 +112,5 @@
       Python modules 
       <xref linkend="lxml"/>,
-      <!--<ulink url="https://anytree.readthedocs.io/en/latest/">anytree</ulink>,-->
+      <ulink url="https://anytree.readthedocs.io/en/latest/">anytree</ulink>,
       <ulink url="https://pypi.org/project/parameterized/">parameterized</ulink>,
       and <ulink url="&gnome-download-http;/yelp-tools">yelp-tools</ulink>
@@ -203,5 +204,5 @@
             <application>Python</application> scripts used by
             package <filename>Makefile</filename> scripts to generate
-            documentation for the package being built
+            documentation for the package being built.
           </para>
           <indexterm zone="gtk-doc gtkdoc">
Index: general/genutils/hd2u.xml
===================================================================
--- general/genutils/hd2u.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/hd2u.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-<!ENTITY hd2u-download-http "https://hany.sk/~hany/_data/hd2u/hd2u-&hd2u-version;.tgz">
+<!ENTITY hd2u-download-http "http://hany.sk/~hany/_data/hd2u/hd2u-&hd2u-version;.tgz">
 <!ENTITY hd2u-download-ftp  " ">
 <!ENTITY hd2u-md5sum        "d516d794deb42ee95bd4e96af94088de">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -130,5 +131,5 @@
           <para>
             converts text between various OS formats (such as
-            converting from DOS format to Unix)
+            converting from DOS format to Unix).
           </para>
           <indexterm zone="hd2u dos2unix">
Index: general/genutils/highlight.xml
===================================================================
--- general/genutils/highlight.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/highlight.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY highlight-download-http "http://www.andre-simon.de/zip/highlight-&highlight-version;.tar.bz2">
   <!ENTITY highlight-download-ftp  " ">
-  <!ENTITY highlight-md5sum        "65caf60e800bb8badf42aac523d48858">
-  <!ENTITY highlight-size          "1.4 MB">
-  <!ENTITY highlight-buildsize     "24 MB (with gui)">
+  <!ENTITY highlight-md5sum        "33f7f5548ac86e18a39b93fbefbe7e5d">
+  <!ENTITY highlight-size          "1.3 MB">
+  <!ENTITY highlight-buildsize     "23 MB (with gui)">
   <!ENTITY highlight-time          "0.3 SBU (Using paralllelism=4; with gui)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -151,9 +152,8 @@
 
     <para>
-      <parameter>doc_dir=/usr/share/doc/highlight-&highlight-version;/</parameter>:
-      installs the highlight documentation into a versioned directory. This
+      <parameter>doc_dir=/usr/share/doc/highlight-&highlight-version;</parameter>:
+      install highlight documentation into a versioned directory. This
       parameter is also needed for <command>make gui</command>, because
-      its value would be hardcoded into the gui executable.  Note that the
-      trailing <quote>/</quote> is necessary.
+      its value would be hardcoded into the gui executable.
 	</para>
   </sect2>
@@ -169,5 +169,5 @@
       <seglistitem>
         <seg>
-          highlight and highlight-gui (optional)
+          highlight
         </seg>
         <seg>
@@ -191,5 +191,5 @@
         <listitem>
           <para>
-            is a universal source code to formatted text converter
+            is a universal source code to formatted text converter.
           </para>
           <indexterm zone="highlight highlight-prog">
@@ -199,9 +199,10 @@
       </varlistentry>
 
+<!--
       <varlistentry id="highlight-gui">
         <term><command>highlight-gui</command></term>
         <listitem>
           <para>
-            is the <application>Qt5</application> interface to
+            is the <application>Qt4</application> interface to
             <command>highlight</command>.
           </para>
@@ -211,4 +212,5 @@
         </listitem>
       </varlistentry>
+-->
 
     </variablelist>
Index: general/genutils/ibus.xml
===================================================================
--- general/genutils/ibus.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/ibus.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY ibus-download-http "https://github.com/ibus/ibus/releases/download/&ibus-version;/ibus-&ibus-version;.tar.gz">
   <!ENTITY ibus-download-ftp  " ">
-  <!ENTITY ibus-md5sum        "c1670d622c555aca804b0d6a074ce93e">
-  <!ENTITY ibus-size          "3.5 MB">
-  <!ENTITY ibus-buildsize     "55 MB (with tests)">
-  <!ENTITY ibus-time          "1.0 SBU (Using parallelism=4; with tests)">
+  <!ENTITY ibus-md5sum        "2e2cf49d449c532171b9d9698f934a01">
+  <!ENTITY ibus-size          "3.4 MB">
+  <!ENTITY ibus-buildsize     "75 MB (with tests)">
+  <!ENTITY ibus-time          "0.9 SBU (Using parallelism=4; with tests)">
 
   <!ENTITY ucd-download-http  "https://www.unicode.org/Public/zipped/13.0.0/UCD.zip">
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -103,11 +104,8 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtk3"/> (to build IM module for it),
-      <xref linkend="gtk4"/> (to build IM module for it),
       <xref linkend="dbus-python"/> and
       <xref linkend="pygobject3"/> (both to build the Python support library),
       <xref linkend="gtk-doc"/>,
-      <xref linkend="pyxdg" role="runtime"/>
-      (runtime, for the <command>ibus-setup</command>), and
+      <xref linkend="pyxdg"/> (for the <command>ibus-setup</command>), and
       <xref linkend="libxkbcommon"/>,
       <xref linkend="wayland"/> (both to build the Wayland support programs), and
@@ -158,7 +156,5 @@
     <para>
       To test the results, issue: <command>make -k check</command>.
-      The test named ibus-compose fails because it uses some locales
-      not installed in LFS.  The test named ibus-keypress is known to fail
-      in Wayland based desktop environment.
+      One test may fail for unknown reasons.
     </para>
 
@@ -196,10 +192,4 @@
       the <application>GTK+ 2</application> immodule. Use it if
       you have not installed <application>GTK+ 2</application>.
-    </para>
-
-    <para>
-      <option>--enable-gtk4</option>: This switch enables building
-      the <application>GTK 4</application> immodule. Use it if
-      you have installed <application>GTK 4</application>.
     </para>
 
@@ -271,5 +261,5 @@
         <listitem>
           <para>
-            is the Intelligent Input Bus Daemon
+            is the Intelligent Input Bus Daemon.
           </para>
           <indexterm zone="ibus ibus-daemon">
@@ -284,5 +274,5 @@
           <para>
             is the <application>GTK+</application> program used to configure
-            the <command>ibus-daemon</command>
+            the <command>ibus-daemon</command>.
           </para>
           <indexterm zone="ibus ibus-setup">
@@ -296,5 +286,5 @@
         <listitem>
           <para>
-            contains the <application>ibus</application> API functions
+            contains the <application>ibus</application> API functions.
           </para>
           <indexterm zone="ibus libibus-1.0">
Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/imagemagick.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,13 +5,11 @@
   %general-entities;
 
-  <!ENTITY imagemagick-patch-version "4">
+  <!ENTITY imagemagick-patch-version "27">
 
   <!ENTITY imagemagick-download-http "https://www.imagemagick.org/download/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
-<!-- 2021-01-14 : ftp.imagemagick.org hangs, assume no longer usable
-  <!ENTITY imagemagick-download-ftp  "ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz"> -->
-  <!ENTITY imagemagick-download-ftp  " ">
-  <!ENTITY imagemagick-md5sum        "d69d22a78d493afdc0c2edd7931f707c">
-  <!ENTITY imagemagick-size          "9.9 MB">
-  <!ENTITY imagemagick-buildsize     "193 MB (with typical dependencies; add 20 MB for checks)">
+  <!ENTITY imagemagick-download-ftp  "ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
+  <!ENTITY imagemagick-md5sum        "40470fd58ae85010a53b61de0378f1c3">
+  <!ENTITY imagemagick-size          "9.3 MB">
+  <!ENTITY imagemagick-buildsize     "212 MB (with typical dependencies; add 31 MB for checks)">
   <!ENTITY imagemagick-time          "0.9 SBU (with typical dependencies; add 0.6 SBU for checks, both using  parallelism=4)">
 ]>
@@ -36,13 +34,7 @@
      [bdubbs] Just removed it.  I don't think it adds anything.
 
-     [ken] Comparing 7.0.10-27 to 7.0.10-57 on the same machine: for -27 my
-     timings and space matched the book (well, make check was marginally
-     faster on this machine), but for -57 the compiled source, installed
-     files and extra space for make check were all much smaller.
-
      Also, please look over the output from the configure command for any
      additional dependencies that need to be listed, as ImageMagick is
-     constantly adding additional features and dependencies. Or diff the
-     configure script against the previous version.
+     constantly adding additional features and dependencies.
 
      For those of us who touch this infrequently:
@@ -55,4 +47,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -74,5 +67,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -112,5 +105,5 @@
         work just fine, but this has not been tested by the BLFS team. If the
         package version shown above is not available from the locations shown
-        above, or from the <filename class="directory">legacy/</filename>
+        above, or from the <filename class='directory'>legacy/</filename>
         directory at <literal>ftp.ImageMagick.org/pub/ImageMagick</literal> you
         can download it from the BLFS package server at Oregon State University: 
@@ -129,8 +122,7 @@
       The optional dependencies listed below should be installed if you need
       support for the specific format or the conversion tool the dependency
-      provides. <!-- No such section in 7.1.0-4
-                Many of the dependencies' capabilities and uses are described in
+      provides. Many of the dependencies' capabilities and uses are described in
       the <quote>MAGICK DELEGATES</quote> section of the
-      <filename>README.txt</filename> file located in the source tree. -->
+      <filename>README.txt</filename> file located in the source tree.
       Additional information about the dependencies can be found in the
       <filename>Install-unix.txt</filename> file located in the source tree as
@@ -138,5 +130,5 @@
       summary of this information, as well as some additional notes can be
       viewed on-line at <ulink
-      url="https://imagemagick.org/script/install-source.php"/>.
+      url="https://imagemagick.org/script/advanced-unix-installation.php"/>.
     </para>
 
@@ -189,8 +181,5 @@
       <ulink url="http://www.cl.cam.ac.uk/~mgk25/jbigkit/">JBIG-KIT</ulink>,
       <!--<ulink url="&gnome-download-http;/libgxps/">libgxps</ulink>,-->
-      <ulink url="https://github.com/strukturag/libheif/">libheif</ulink> with
-      <ulink url="https://github.com/strukturag/libde265/">libde265</ulink>
-      (both needed if converting macOS heic images),
-      <ulink url="https://github.com/libjxl/libjxl/">libjxl</ulink>,
+      <ulink url="https://github.com/strukturag/libheif/">libheif</ulink>,
       <ulink url="https://github.com/HOST-Oman/libraqm/">libraqm</ulink>,
       <ulink url="http://liblqr.wikidot.com/en:download-page">Liquid Rescale</ulink>,
@@ -259,11 +248,10 @@
 
     <para>
-      To test the installation, issue: <command>make check</command>.
-              <!-- seems to have been dropped                         A more
+      To test the installation, issue: <command>make check</command>. A more
       comprehensive test is the <application>ImageMagick</application>
       validation suite. If <command>make check</command> has not been executed,
       run <command>make tests/validate</command> to compile it.  Issue
       <command>tests/validate 2>&amp;1 | tee validate.log</command> to run the
-      validation suite.--> <!-- summary is last line of output
+      validation suite. <!-- summary is last line of output
        The result summary may be obtained with <command>grep
       "validation suite" validate.log</command>. -->
@@ -389,5 +377,5 @@
       <listitem>
         <para>
-          animates a sequence of images
+          animates a sequence of images.
         </para>
         <indexterm zone="imagemagick animate">
@@ -401,5 +389,5 @@
       <listitem>
         <para>
-          compares an image to a reconstructed image
+          compares an image to a reconstructed image.
         </para>
         <indexterm zone="imagemagick compare">
@@ -413,5 +401,5 @@
       <listitem>
         <para>
-          composites various images into the given base image
+          composites various images into the given base image.
         </para>
         <indexterm zone="imagemagick composite">
@@ -425,5 +413,5 @@
       <listitem>
         <para>
-          processes a MSL script to create an image
+          processes a MSL script to create an image.
         </para>
         <indexterm zone="imagemagick conjure">
@@ -437,5 +425,5 @@
       <listitem>
         <para>
-          converts image(s) from one format to another
+          converts image(s) from one format to another.
         </para>
         <indexterm zone="imagemagick convert">
@@ -449,5 +437,5 @@
       <listitem>
         <para>
-          displays an image
+          displays an image.
         </para>
         <indexterm zone="imagemagick display">
@@ -461,5 +449,5 @@
       <listitem>
         <para>
-          describes the format and characteristics of an image file
+          describes the format and characteristics of an image file.
         </para>
         <indexterm zone="imagemagick identify">
@@ -473,5 +461,5 @@
       <listitem>
         <para>
-          captures an X window
+          captures an X window.
         </para>
         <indexterm zone="imagemagick import">
@@ -487,5 +475,5 @@
           convert between image formats as well as resize an image,
           blur, crop, despeckle, dither, draw on, flip, join, re-sample
-          and much more
+          and much more.
         </para>
         <indexterm zone="imagemagick magick">
@@ -500,5 +488,5 @@
         <para>
           show information about the installed versions of the
-          <application>ImageMagick</application> libraries
+          <application>ImageMagick</application> libraries.
         </para>
         <indexterm zone="imagemagick magick-config">
@@ -512,5 +500,5 @@
       <listitem>
         <para>
-          transforms an image
+          transforms an image.
         </para>
         <indexterm zone="imagemagick mogrify">
@@ -524,5 +512,5 @@
       <listitem>
         <para>
-          composites various images into a new image
+          composites various images into a new image.
         </para>
         <indexterm zone="imagemagick montage">
@@ -537,5 +525,5 @@
         <para>
           streams one or more pixel components of an image or
-          portion of the image to your choice of storage formats
+          portion of the image to your choice of storage formats.
         </para>
         <indexterm zone="imagemagick stream">
@@ -546,5 +534,5 @@
 
     <varlistentry id="perlmagick">
-      <term><filename class="libraryfile">Image::Magick</filename></term>
+      <term><filename class='libraryfile'>Image::Magick</filename></term>
       <listitem>
         <para>
@@ -552,7 +540,7 @@
           image file formats using the <application>ImageMagick</application>
           library. Run <command>make</command> in the
-          <filename class="directory">PerlMagick/demo</filename> directory of
+          <filename class='directory'>PerlMagick/demo</filename> directory of
           the package source tree after the package is installed to see a nice
-          demo of the module's capabilities
+          demo of the module's capabilities.
         </para>
         <indexterm zone="imagemagick perlmagick">
@@ -566,5 +554,5 @@
       <listitem>
         <para>
-          provides the C API for ImageMagick
+          provides the C API for ImageMagick.
         </para>
         <indexterm zone="imagemagick libMagickCore-7.Q16HDRI">
@@ -579,5 +567,5 @@
         <para>
           is the recommended C API for ImageMagick. Unlike the MagickCore API it
-          uses  only a few opaque types
+          uses  only a few opaque types.
         </para>
         <indexterm zone="imagemagick libMagickWand-7.Q16HDRI">
@@ -591,5 +579,5 @@
       <listitem>
         <para>
-          provides the C++ API for ImageMagick
+          provides the C++ API for ImageMagick.
         </para>
         <indexterm zone="imagemagick libMagickpp-7.Q16HDRI">
Index: general/genutils/iso-codes.xml
===================================================================
--- general/genutils/iso-codes.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/iso-codes.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY iso-codes-download-http "http://ftp.debian.org/debian/pool/main/i/iso-codes//iso-codes_&iso-codes-version;.orig.tar.xz">
+  <!ENTITY iso-codes-download-http "http://anduin.linuxfromscratch.org/BLFS/iso-codes/iso-codes-&iso-codes-version;.tar.xz">
   <!ENTITY iso-codes-download-ftp  " ">
-  <!ENTITY iso-codes-md5sum        "3b29445663cd01922dcea24a02228c69">
+  <!ENTITY iso-codes-md5sum        "716ecc291f46e1431a7cb6de340b79a8">
   <!ENTITY iso-codes-size          "3.8 MB">
-  <!ENTITY iso-codes-buildsize     "111 MB">
+  <!ENTITY iso-codes-buildsize     "87 MB">
   <!ENTITY iso-codes-time          "0.2 SBU (with tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -78,8 +79,4 @@
   <sect2 role="installation">
     <title>Installation of ISO Codes</title>
-
-    <para>
-      The directory is called iso-codes-&iso-codes-version;.
-    </para>
 
     <para>
Index: general/genutils/lsof.xml
===================================================================
--- general/genutils/lsof.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/lsof.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,6 +10,6 @@
 <!-- URL is for a mirror.  Change back to below if/when main site comes back. -->
 
-<!ENTITY lsof-download-http  "https://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_&lsof-version;.tar.gz">
-<!ENTITY lsof-download-ftp  " ">
+<!ENTITY lsof-download-http  " ">
+<!ENTITY lsof-download-ftp  "https://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_&lsof-version;.tar.gz">
 <!ENTITY lsof-md5sum        "10e1353aa4bf2fd5bbed65db9ef6fd47">
 <!ENTITY lsof-size          "1.1 MB">
@@ -22,4 +22,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -154,5 +155,5 @@
         <listitem>
           <para>
-            lists open files for running processes
+            lists open files for running processes.
           </para>
           <indexterm zone="lsof lsof-app">
Index: general/genutils/pinentry.xml
===================================================================
--- general/genutils/pinentry.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/pinentry.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,7 +8,7 @@
   <!ENTITY pinentry-download-ftp  "&gnupg-ftp;/pinentry/pinentry-&pinentry-version;.tar.bz2">
   <!ENTITY pinentry-download-ftp  " ">
-  <!ENTITY pinentry-md5sum        "32e09a982711d6e705f9d89020424c2d">
-  <!ENTITY pinentry-size          "488 KB">
-  <!ENTITY pinentry-buildsize     "6.3 MB">
+  <!ENTITY pinentry-md5sum        "3829315cb0a1e9cedc05ffe6def7a2c6">
+  <!ENTITY pinentry-size          "460 KB">
+  <!ENTITY pinentry-buildsize     "11 MB">
   <!ENTITY pinentry-time          "less than 0.1 SBU">
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -44,5 +45,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -94,9 +95,9 @@
       <xref linkend="gcr"/>,
       <xref linkend="gtk2"/>,
+      <xref linkend="gtk3"/>,
       <!-- <xref linkend="libcap-pam"/>, This is in LFS already. PAM is not
       necessary. -->
-      <xref linkend="libsecret"/>,
-      <xref linkend="qt5"/>, and
-      <ulink url="https://www.enlightenment.org/about-efl">efl</ulink>
+      <xref linkend="libsecret"/>, and
+      <xref linkend="qt5"/>
     </para>
 
@@ -149,6 +150,5 @@
     <para>
       <option>--enable-pinentry-gnome3=yes/no</option>: Default is yes.
-      Actually, it uses <application>Gcr</application> for the pinentry
-      dialog.
+      Actually, it is the gtk3 pinentry.
     </para>
 
@@ -187,5 +187,5 @@
           <para>
             is a symbolic link to the default
-            <application>PIN-Entry</application> program
+            <application>PIN-Entry</application> program.
           </para>
           <indexterm zone="pinentry pinentry-prog">
@@ -200,5 +200,5 @@
           <para>
             is an <application>Ncurses</application> text-based
-            <application>PIN-Entry</application> helper program
+            <application>PIN-Entry</application> helper program.
           </para>
           <indexterm zone="pinentry pinentry-curses">
@@ -213,5 +213,5 @@
           <para>
             is an <application>Emacs</application> version of the
-            <application>PIN-Entry</application> helper program
+            <application>PIN-Entry</application> helper program.
           </para>
           <indexterm zone="pinentry pinentry-emacs">
@@ -226,5 +226,5 @@
           <para>
             is a <application>FLTK</application>
-            <application>PIN-Entry</application> helper program
+            <application>PIN-Entry</application> helper program.
           </para>
           <indexterm zone="pinentry pinentry-fltk">
@@ -239,5 +239,5 @@
           <para>
             is a <application>GNOME-3</application>
-            <application>PIN-Entry</application> helper program
+            <application>PIN-Entry</application> helper program.
           </para>
           <indexterm zone="pinentry pinentry-gnome3">
@@ -252,5 +252,5 @@
           <para>
             is a <application>GTK+2</application>
-            <application>PIN-Entry</application> program program
+            <application>PIN-Entry</application> program program.
           </para>
           <indexterm zone="pinentry pinentry-gtk-2">
@@ -265,5 +265,5 @@
           <para>
             is a <application>Qt4 or 5</application>
-            <application>PIN-Entry</application> helper program
+            <application>PIN-Entry</application> helper program.
           </para>
           <indexterm zone="pinentry pinentry-qt">
@@ -278,5 +278,5 @@
           <para>
             is a <application>tty</application>
-            <application>PIN-Entry</application> helper program
+            <application>PIN-Entry</application> helper program.
           </para>
           <indexterm zone="pinentry pinentry-tty">
Index: general/genutils/rarian.xml
===================================================================
--- general/genutils/rarian.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/rarian.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -150,5 +151,5 @@
           <para>
             prints a nice list of all available documents found by the
-            library
+            library.
           </para>
           <indexterm zone="rarian rarian-example">
@@ -162,5 +163,5 @@
         <listitem>
           <para>
-            emulates <command>scrollkeeper-config</command>
+            emulates <command>scrollkeeper-config</command>.
           </para>
           <indexterm zone="rarian rarian-sk-config">
@@ -175,5 +176,5 @@
           <para>
             is a wrapper around xsltproc to mimic <command>
-            scrollkeeper-extract</command>
+            scrollkeeper-extract</command>.
           </para>
           <indexterm zone="rarian rarian-sk-extract">
@@ -187,5 +188,5 @@
         <listitem>
           <para>
-            generates a unique (random) uuid
+            generates a unique (random) uuid.
           </para>
           <indexterm zone="rarian rarian-sk-gen-uuid">
@@ -199,5 +200,5 @@
         <listitem>
           <para>
-            gets a content list (category tree)
+            gets a content list (category tree).
           </para>
           <indexterm zone="rarian rarian-sk-get-cl">
@@ -212,5 +213,5 @@
           <para>
             is a simple wrapper to make calling <command>scrollkeeper-get-cl
-            </command> easier
+            </command> easier.
           </para>
           <indexterm zone="rarian rarian-sk-get-content-list">
@@ -227,5 +228,5 @@
           <para>
             is a simple wrapper to make calling <command>scrollkeeper-get-cl
-            </command> (extended) easier
+            </command> (extended) easier.
           </para>
           <indexterm zone="rarian rarian-sk-get-extended-content-list">
@@ -243,5 +244,5 @@
             scrollkeeper-get-index-from-index-from-docpath</command>, <command>
             scrollkeeper-get-toc-from-docpath</command>, and <command>
-            scrollkeeper-get-toc-from-id</command>
+            scrollkeeper-get-toc-from-id</command>.
           </para>
           <indexterm zone="rarian rarian-sk-get-scripts">
@@ -256,5 +257,5 @@
           <para>
             emulates <command>scrollkeeper-install</command> and
-            <command>scrollkeeper-uninstall</command>
+            <command>scrollkeeper-uninstall</command>.
           </para>
           <indexterm zone="rarian rarian-sk-install">
@@ -269,5 +270,5 @@
           <para>
             takes in a directory full of omf's, reads and parses them and
-            spews out an equivalent scroll file
+            spews out an equivalent scroll file.
           </para>
           <indexterm zone="rarian rarian-sk-migrate">
@@ -282,5 +283,5 @@
           <para>
             creates the omf file by reading an existing omf file and
-            replacing the url for a resource with the url
+            replacing the url for a resource with the url.
           </para>
           <indexterm zone="rarian rarian-sk-preinstall">
@@ -295,5 +296,5 @@
           <para>
             is a simple wrapper script to emulate <command>
-            scrollkeeper-rebuilddb</command>
+            scrollkeeper-rebuilddb</command>.
           </para>
           <indexterm zone="rarian rarian-sk-rebuild">
@@ -309,5 +310,5 @@
             is compatible with the <command>scrollkeeper-update</command>
             script that's required to be run when installing new omf files.  It
-            converts the omf files into new-style scrolls
+            converts the omf files into new-style scrolls.
           </para>
           <indexterm zone="rarian rarian-sk-update">
@@ -319,9 +320,9 @@
 
       <varlistentry id="librarian">
-        <term><filename class="libraryfile">librarian.{so,a}</filename></term>
+        <term><filename class='libraryfile'>librarian.{so,a}</filename></term>
         <listitem>
           <para>
             is the API to build a list of available meta data files and
-            allows access to these
+            allows access to these.
           </para>
           <indexterm zone="rarian librarian">
Index: general/genutils/rep-gtk.xml
===================================================================
--- general/genutils/rep-gtk.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/rep-gtk.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY rep-gtk-download-http "https://download.tuxfamily.org/librep/rep-gtk/rep-gtk_&rep-gtk-version;.tar.xz">
+  <!ENTITY rep-gtk-download-http "http://download.tuxfamily.org/librep/rep-gtk/rep-gtk_&rep-gtk-version;.tar.xz">
   <!ENTITY rep-gtk-download-ftp  " ">
   <!ENTITY rep-gtk-md5sum        "b20f72cf00d316d35fa7f84a6e7532af">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -133,11 +134,11 @@
 
       <varlistentry id="lisp-bindings">
-        <term><filename class="libraryfile">Lisp bindings</filename></term>
+        <term><filename class='libraryfile'>Lisp bindings</filename></term>
         <listitem>
           <para>
-            are libraries stored in
-            <filename class="directory">/usr/lib/rep/gui/</filename> that
-            assist communication between Lisp and the
-            <application>GTK</application> libraries
+            are libraries stored in <filename
+            class="directory">/usr/lib/rep/gui/</filename> that assist
+            communication between Lisp and the <application>GTK</application>
+            libraries.
           </para>
           <indexterm zone="rep-gtk lisp-bindings">
Index: general/genutils/screen.xml
===================================================================
--- general/genutils/screen.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/screen.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -72,14 +73,4 @@
         <para>
           Estimated build time: &screen-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/screen-&screen-version;-upstream_fixes-1.patch"/>
         </para>
       </listitem>
@@ -100,10 +91,4 @@
   <sect2 role="installation">
     <title>Installation of Screen</title>
-
-    <para>
-      First, apply a patch from upstream that fixes a security vulnerability:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../screen-&screen-version;-upstream_fixes-1.patch</userinput></screen>
 
     <para>
@@ -220,5 +205,5 @@
         <listitem>
           <para>
-            is a terminal multiplexor with VT100/ANSI terminal emulation
+            is a terminal multiplexor with VT100/ANSI terminal emulation.
           </para>
           <indexterm zone="screen screen-prog">
Index: general/genutils/shared-mime-info.xml
===================================================================
--- general/genutils/shared-mime-info.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/shared-mime-info.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,7 +6,7 @@
 
   <!ENTITY shared-mime-info-download-http
-           "https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/&shared-mime-info-version;/shared-mime-info-&shared-mime-info-version;.tar.gz">
+           "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0ee50652091363ab0d17e335e5e74fbe/shared-mime-info-&shared-mime-info-version;.tar.xz">
   <!ENTITY shared-mime-info-download-ftp  " ">
-  <!ENTITY shared-mime-info-md5sum        "8d059fb2d34062a67fd9ca63fab1fb91">
+  <!ENTITY shared-mime-info-md5sum        "410725367f52ddbc06ef9eda883b8f73">
   <!ENTITY shared-mime-info-size          "5.0 MB">
   <!ENTITY shared-mime-info-buildsize     "26 MB">
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -99,9 +100,17 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release -Dupdate-mimedb=true .. &amp;&amp;
+meson --prefix=/usr -Dupdate-mimedb=true .. &amp;&amp;
 ninja</userinput></screen>
 
+<!--
     <para>
-      To test the result, issue <command>ninja test</command>.
+      To test the results, issue: <command>make check</command>.
+    </para>
+-->
+
+    <!-- The files for the tests are not shipped in the tarball, and needs
+         an external checkout. -->
+    <para>
+      This package does not come with a working test suite.
     </para>
 
@@ -116,7 +125,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -158,5 +164,5 @@
         <listitem>
           <para>
-            assists in adding MIME data to the database
+            assists in adding MIME data to the database.
           </para>
           <indexterm zone="shared-mime-info update-mime-database">
Index: general/genutils/sharutils.xml
===================================================================
--- general/genutils/sharutils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/sharutils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -139,5 +140,5 @@
           <para>
             creates "shell archives" (or shar files) which are in
-            text format and can be mailed
+            text format and can be mailed.
           </para>
           <indexterm zone="sharutils shar">
@@ -151,5 +152,5 @@
         <listitem>
           <para>
-            unpacks a shar file
+            unpacks a shar file.
           </para>
           <indexterm zone="sharutils unshar">
@@ -165,5 +166,5 @@
             reads a file (or by default the standard input) and writes an
             encoded  version to the standard output. The encoding uses only
-            printing ASCII characters
+            printing ASCII characters.
           </para>
           <indexterm zone="sharutils uudecode">
@@ -178,5 +179,5 @@
           <para>
             reads a file (or by default the standard input) and decodes
-            the uuencoded version to the standard output
+            the uuencoded version to the standard output.
           </para>
           <indexterm zone="sharutils uuencode">
@@ -191,2 +192,3 @@
 
 </sect1>
+
Index: general/genutils/telepathy-logger.xml
===================================================================
--- general/genutils/telepathy-logger.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/telepathy-logger.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -170,5 +171,5 @@
         <listitem>
           <para>
-            is the <application>Telepathy Logger</application> D-Bus service
+            is the <application>Telepathy Logger</application> D-Bus service.
           </para>
           <indexterm zone="telepathy-logger telepathy-logger-prog">
@@ -182,5 +183,5 @@
         <listitem>
           <para>
-            contains the <application>Telepathy Logger</application> API functions
+            contains the <application>Telepathy Logger</application> API functions.
           </para>
           <indexterm zone="telepathy-logger libtelepathy-logger">
Index: general/genutils/telepathy-mission-control.xml
===================================================================
--- general/genutils/telepathy-mission-control.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/telepathy-mission-control.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -170,5 +171,5 @@
         <listitem>
           <para>
-            is a command line tool used to manipulate Mission Control accounts
+            is a command line tool used to manipulate Mission Control accounts.
           </para>
           <indexterm zone="telepathy-mission-control mc-tool">
@@ -183,5 +184,5 @@
           <para>
             waits for a D-Bus bus name that will be provided
-            automatically by the desktop session
+            automatically by the desktop session.
           </para>
           <indexterm zone="telepathy-mission-control mc-wait-for-name">
@@ -197,5 +198,5 @@
             is a <application>D-Bus</application> service which runs on the session
             bus to implement AccountManager and ChannelDispatcher services described
-            in the <application>Telepathy</application> D-Bus specification
+            in the <application>Telepathy</application> D-Bus specification.
           </para>
           <indexterm zone="telepathy-mission-control mission-control-5">
@@ -209,5 +210,5 @@
         <listitem>
           <para>
-            contains <application>Telepathy Mission Control</application> plugin API functions
+            contains <application>Telepathy Mission Control</application> plugin API functions.
           </para>
           <indexterm zone="telepathy-mission-control libmission-control-plugins">
Index: general/genutils/tidy-html5.xml
===================================================================
--- general/genutils/tidy-html5.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/tidy-html5.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,6 +7,6 @@
   <!ENTITY tidy-html5-download-http "https://github.com/htacg/tidy-html5/archive/&tidy-html5-version;/tidy-html5-&tidy-html5-version;.tar.gz">
   <!ENTITY tidy-html5-download-ftp  " ">
-  <!ENTITY tidy-html5-md5sum        "0f6c55ef651e258adbe5750f555af50f">
-  <!ENTITY tidy-html5-size          "992 KB">
+  <!ENTITY tidy-html5-md5sum        "85c8a163d9ece6a02fe12bc9bddbc455">
+  <!ENTITY tidy-html5-size          "649 KB">
   <!ENTITY tidy-html5-buildsize     "11 MB">
   <!ENTITY tidy-html5-time          "0.2 SBU">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -116,5 +117,4 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-rm -fv /usr/lib/libtidy.a &amp;&amp;
 install -v -m755 tab2space /usr/bin</userinput></screen>
 
@@ -171,5 +171,5 @@
     <seglistitem>
     <seg>tab2space and tidy</seg>
-    <seg>libtidy.so</seg>
+    <seg>libtidy.so and libtidys.a</seg>
     <seg>/usr/share/doc/tidy-&tidy-html5-version;</seg>
     </seglistitem>
@@ -185,5 +185,5 @@
         <listitem>
           <para>
-            is a utility to expand tabs and ensure consistent line endings
+            is a utility to expand tabs and ensure consistent line endings.
           </para>
           <indexterm zone="tidy-html5 tab2space">
@@ -197,5 +197,5 @@
         <listitem>
           <para>
-            validates, corrects, and pretty-prints HTML files
+            validates, corrects, and pretty-prints HTML files.
           </para>
           <indexterm zone="tidy-html5 tidy">
@@ -207,5 +207,5 @@
       <varlistentry id="libtidy">
         <term>
-          <filename class="libraryfile">libtidy.so</filename>
+          <filename class='libraryfile'>libtidy.so and libtidys.a</filename>
         </term>
         <listitem>
@@ -213,5 +213,5 @@
             library provides the <application>Tidy HTML5</application> API
             functions to <command>tidy</command> and can also be called by other
-            programs
+            programs.
           </para>
           <indexterm zone="tidy-html5 libtidy">
Index: general/genutils/time.xml
===================================================================
--- general/genutils/time.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/time.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -41,5 +42,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -134,5 +135,5 @@
         <listitem>
           <para>
-            reports various statistics about an executed command
+            reports various statistics about an executed command.
           </para>
           <indexterm zone="time time-prog">
@@ -143,4 +144,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/genutils/tree.xml
===================================================================
--- general/genutils/tree.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/tree.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -123,5 +124,5 @@
         <listitem>
           <para>
-            displays a directory tree in a terminal
+            displays a directory tree in a terminal.
           </para>
           <indexterm zone="tree tree-app">
Index: general/genutils/unixodbc.xml
===================================================================
--- general/genutils/unixodbc.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/unixodbc.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -43,5 +44,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -215,5 +216,5 @@
           <para>
             is a utility used to check a shared library to see if it can be
-            loaded and if a given symbol exists in it
+            loaded and if a given symbol exists in it.
           </para>
           <indexterm zone="unixodbc dltest">
@@ -229,5 +230,5 @@
             is a utility which can be used to submit SQL to a data source and
             to format/output results. It can be used in batch or interactive
-            mode
+            mode.
           </para>
           <indexterm zone="unixodbc isql">
@@ -242,5 +243,5 @@
           <para>
             provides the same functionality as the <command>isql</command>
-            program
+            program.
           </para>
           <indexterm zone="unixodbc iusql">
@@ -255,5 +256,5 @@
           <para>
             is used to find out details about the installation of
-            the <application>unixODBC</application> package
+            the <application>unixODBC</application> package.
           </para>
           <indexterm zone="unixodbc odbc_config">
@@ -269,7 +270,7 @@
             is a utility created for install script/RPM writers. It is a
             command line interface to key functionality in the
-            <filename class="libraryfile">libodbcinst</filename> library. It does
+            <filename class='libraryfile'>libodbcinst</filename> library. It does
             not copy any files (i.e., libraries) but it will modify the ODBC
-            System Information for the user
+            System Information for the user.
           </para>
           <indexterm zone="unixodbc odbcinst">
@@ -284,5 +285,5 @@
           <para>
             is a utility which attempts to check whether an ODBC driver
-            was built with 32-bit or 64-bit SQLLEN types
+            was built with 32-bit or 64-bit SQLLEN types.
           </para>
           <indexterm zone="unixodbc slencheck">
Index: general/genutils/xdg-user-dirs.xml
===================================================================
--- general/genutils/xdg-user-dirs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/genutils/xdg-user-dirs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -161,5 +162,5 @@
         <listitem>
           <para>
-            looks up the current path for one of the XDG user directories
+            looks up the current path for one of the XDG user directories.
           </para>
           <indexterm zone="xdg-user-dirs xdg-user-dir">
@@ -173,5 +174,5 @@
         <listitem>
           <para>
-            creates localized versions of the user directories
+            creates localized versions of the user directories.
           </para>
           <indexterm zone="xdg-user-dirs xdg-user-dirs-update">
@@ -183,4 +184,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/graphlib/aalib.xml
===================================================================
--- general/graphlib/aalib.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/aalib.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -141,5 +142,5 @@
           <para>
             is a demo of <application>AAlib</application>, rendering
-            an animated fire in ASCII Art
+            an animated fire in ASCII Art.
           </para>
           <indexterm zone="aalib aafire">
@@ -154,5 +155,5 @@
           <para>
             provides information for your current settings related to
-            <application>AAlib</application>
+            <application>AAlib</application>.
           </para>
           <indexterm zone="aalib aainfo">
@@ -166,5 +167,5 @@
         <listitem>
           <para>
-            provides configuration info for <application>AAlib</application>
+            provides configuration info for <application>AAlib</application>.
           </para>
           <indexterm zone="aalib aalib-config">
@@ -178,5 +179,5 @@
         <listitem>
           <para>
-            saves a font to a file
+            saves a font to a file.
           </para>
           <indexterm zone="aalib aasavefont">
@@ -191,5 +192,5 @@
           <para>
             shows the abilities of <application>AAlib</application>
-            in a little test
+            in a little test.
           </para>
           <indexterm zone="aalib aatest">
@@ -200,5 +201,5 @@
 
       <varlistentry id="libaa">
-        <term><filename class="libraryfile">libaa.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libaa.{so,a}</filename></term>
         <listitem>
           <para>
@@ -206,5 +207,5 @@
             portable format to ASCII Art. It can be used through many programs
             and has a very well documented API, so you can easily put it into
-            your own programs
+            your own programs.
           </para>
           <indexterm zone="aalib libaa">
Index: general/graphlib/babl.xml
===================================================================
--- general/graphlib/babl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/babl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY babl-download-http "https://download.gimp.org/pub/babl/0.1/babl-&babl-version;.tar.xz">
   <!ENTITY babl-download-ftp  " ">
-  <!ENTITY babl-md5sum        "bda974863edb0fd31fb7715575906c65">
+  <!ENTITY babl-md5sum        "b40aea9b42f7245dbe36bcaa4170da93">
   <!ENTITY babl-size          "296 KB">
-  <!ENTITY babl-buildsize     "9.4 MB (with tests)">
-  <!ENTITY babl-time          "0.1 SBU (with tests)">
+  <!ENTITY babl-buildsize     "16 MB (with tests)">
+  <!ENTITY babl-time          "0.2 SBU (with tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -99,5 +100,5 @@
 cd    bld &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja </userinput></screen>
 
@@ -154,8 +155,8 @@
 
       <varlistentry id="libbabl">
-        <term><filename class="libraryfile">libbabl-0.1.so</filename></term>
+        <term><filename class='libraryfile'>libbabl-0.1.so</filename></term>
         <listitem>
           <para>
-            contains functions to access BablFishes to convert between formats
+            contains functions to access BablFishes to convert between formats.
           </para>
           <indexterm zone="babl libbabl">
@@ -166,4 +167,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/graphlib/exiv2.xml
===================================================================
--- general/graphlib/exiv2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/exiv2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY exiv2-download-http "https://www.exiv2.org/builds/exiv2-&exiv2-version;-Source.tar.gz">
+  <!ENTITY exiv2-download-http "http://www.exiv2.org/builds/exiv2-&exiv2-version;-Source.tar.gz">
   <!ENTITY exiv2-download-ftp  " ">
-  <!ENTITY exiv2-md5sum        "15c24498a7d6abd171ae525574f98efb">
-  <!ENTITY exiv2-size          "31 MB">
-  <!ENTITY exiv2-buildsize     "86 MB">
+  <!ENTITY exiv2-md5sum        "68a59595e8617284b2e1eee528ae1f77">
+  <!ENTITY exiv2-size          "25 MB">
+  <!ENTITY exiv2-buildsize     "76 MB">
   <!ENTITY exiv2-time          "0.3 SBU (Using parallelism=4)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -69,16 +70,4 @@
       </listitem>
     </itemizedlist>
-
-<!--
-   <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/exiv2-&exiv2-version;-security_fixes-1.patch"/>	
-        </para>
-      </listitem>
-    </itemizedlist>
--->
 
     <bridgehead renderas="sect3">Exiv2 dependencies</bridgehead>
@@ -208,5 +197,5 @@
         <listitem>
           <para>
-            is a utility used to dump Exif data
+            is a utility used to dump Exif data.
           </para>
           <indexterm zone="exiv2 exiv2-prog">
Index: general/graphlib/fontconfig.xml
===================================================================
--- general/graphlib/fontconfig.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/fontconfig.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -114,4 +115,10 @@
   <sect2 role="installation">
     <title>Installation of Fontconfig</title>
+
+    <para>
+      Make sure the system regenerates src/fcobjshash.h.
+    </para>
+
+<screen><userinput>rm -f src/fcobjshash.h</userinput></screen>
 
     <para>
@@ -294,5 +301,5 @@
         <listitem>
           <para>
-            is used to create font information caches
+            is used to create font information caches.
           </para>
           <indexterm zone="fontconfig fc-cache">
@@ -306,5 +313,5 @@
         <listitem>
           <para>
-            is used to read font information caches
+            is used to read font information caches.
           </para>
           <indexterm zone="fontconfig fc-cat">
@@ -318,5 +325,5 @@
         <listitem>
           <para>
-            shows the ruleset files' information on the system
+            shows the ruleset files' information on the system.
           </para>
           <indexterm zone="fontconfig fc-conflist">
@@ -330,5 +337,5 @@
         <listitem>
           <para>
-            is used to create font lists
+            is used to create font lists.
           </para>
           <indexterm zone="fontconfig fc-list">
@@ -343,5 +350,5 @@
           <para>
             is used to match available fonts, or find fonts that match
-            a given pattern
+            a given pattern.
           </para>
           <indexterm zone="fontconfig fc-match">
@@ -356,5 +363,5 @@
           <para>
             is used to parse pattern (empty pattern by default) and show
-            the parsed result
+            the parsed result.
           </para>
           <indexterm zone="fontconfig fc-pattern">
@@ -368,5 +375,5 @@
         <listitem>
           <para>
-            is used to query fonts files and print resulting patterns
+            is used to query fonts files and print resulting patterns.
           </para>
           <indexterm zone="fontconfig fc-query">
@@ -381,5 +388,5 @@
           <para>
             is used to scan font files and directories, and print resulting
-            patterns
+            patterns.
           </para>
           <indexterm zone="fontconfig fc-scan">
@@ -393,5 +400,5 @@
         <listitem>
           <para>
-            is used to validate font files
+            is used to validate font files.
           </para>
           <indexterm zone="fontconfig fc-validate">
@@ -407,5 +414,5 @@
             contains functions used by the <application>Fontconfig</application>
             programs and also by other programs to configure or customize font
-            access
+            access.
           </para>
           <indexterm zone="fontconfig libfontconfig">
Index: general/graphlib/freetype2.xml
===================================================================
--- general/graphlib/freetype2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/freetype2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY freetype2-download-http "&sourceforge-dl;/freetype/freetype-&freetype2-version;.tar.xz">
   <!ENTITY freetype2-download-ftp  "&gentoo-ftp-repo;/freetype-&freetype2-version;.tar.xz">
-  <!ENTITY freetype2-md5sum        "f931582653774e310ed3a7e49b7167a3">
-  <!ENTITY freetype2-size          "2.2 MB">
-  <!ENTITY freetype2-buildsize     "30 MB (with additional documentation)">
+  <!ENTITY freetype2-md5sum        "0e6c0e9b218be3ba3e26e1d23b1c80dd">
+  <!ENTITY freetype2-size          "2.4 MB">
+  <!ENTITY freetype2-buildsize     "43 MB (with additional documentation)">
   <!ENTITY freetype2-time          "0.2 SBU (with additional documentation)">
 
@@ -15,5 +15,5 @@
   <!ENTITY freetype2-doc-download-http "&sourceforge-dl;/freetype/freetype-doc-&freetype2-doc-version;.tar.xz">
   <!ENTITY freetype2-doc-download-ftp  "&gentoo-ftp-repo;/freetype-doc-&freetype2-doc-version;.tar.xz">
-  <!ENTITY freetype2-doc-md5sum        "c61af913d48e89566c99cddfb8e4c158">
+  <!ENTITY freetype2-doc-md5sum        "a389bc390ca8009c758094e71a8fb18d">
   <!ENTITY freetype2-doc-size          "2.0 MB">
 ]>
@@ -23,4 +23,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -41,5 +42,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -236,5 +237,5 @@
           <para>
             is used to get <application>FreeType</application> compilation
-            and linking information
+            and linking information.
           </para>
           <indexterm zone="freetype2 freetype-config">
@@ -249,5 +250,5 @@
           <para>
             contains functions for rendering various font types, such
-            as TrueType and Type1
+            as TrueType and Type1.
           </para>
           <indexterm zone="freetype2 libfreetype">
Index: general/graphlib/fribidi.xml
===================================================================
--- general/graphlib/fribidi.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/fribidi.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -95,5 +96,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -107,11 +108,4 @@
 
 <screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
   </sect2>
 
@@ -148,5 +142,5 @@
             is a command-line interface to the
             <filename class="libraryfile">libfribidi</filename> library and
-            can be used to convert a logical string to visual output
+            can be used to convert a logical string to visual output.
           </para>
           <indexterm zone="fribidi fribidi-prog">
@@ -160,7 +154,7 @@
         <listitem>
           <para>
-            contains functions used to implement the
-            <ulink url="http://www.unicode.org/reports/tr9/">Unicode
-            Bidirectional Algorithm</ulink>
+            contains functions used to implement the <ulink
+            url="http://www.unicode.org/reports/tr9/">Unicode
+            Bidirectional Algorithm</ulink>.
           </para>
           <indexterm zone="fribidi libfribidi">
Index: general/graphlib/gegl.xml
===================================================================
--- general/graphlib/gegl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/gegl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY gegl-download-http "https://download.gimp.org/pub/gegl/0.4/gegl-&gegl-version;.tar.xz">
   <!ENTITY gegl-download-ftp  " ">
-  <!ENTITY gegl-md5sum        "6ae601b8c7cab8af5a36406df0b95ebf">
-  <!ENTITY gegl-size          "5.2 MB">
-  <!ENTITY gegl-buildsize     "60 MB (with tests)">
+  <!ENTITY gegl-md5sum        "4111e0085c7077a506a67dc14d3514ed">
+  <!ENTITY gegl-size          "4.7 MB">
+  <!ENTITY gegl-buildsize     "89 MB (with tests)">
   <!ENTITY gegl-time          "0.5 SBU (Using parallelism=4; with tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -74,8 +75,6 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="babl"/>,
-      <xref linkend="json-glib"/>,
-      <xref linkend="libjpeg"/>, and
-      <xref linkend="libpng"/>
+      <xref linkend="babl"/> and
+      <xref linkend="json-glib"/>
     </para>
 
@@ -107,7 +106,10 @@
       <xref linkend="gdk-pixbuf"/>,
       <xref linkend="gexiv2"/>,
+      <xref linkend="graphviz"/>,
       <xref linkend="gtk-doc"/>,
       <xref linkend="jasper"/>,
       <xref linkend="lcms2"/>,
+      <xref linkend="libjpeg"/>
+      <xref linkend="libpng"/>,
       <xref linkend="librsvg"/>,
       <xref linkend="libtiff"/>,
@@ -118,7 +120,7 @@
       <xref linkend="v4l-utils"/>,
       <xref linkend="vala"/>,
-      <xref linkend="libspiro"/>,
       <ulink url="https://lensfun.github.io/">lensfun</ulink>,
       <ulink url="https://libopenraw.pages.freedesktop.org/">libopenraw</ulink>,
+      <ulink url="http://libspiro.sourceforge.net/">libspiro</ulink>,
       <ulink url="http://faculty.cse.tamu.edu/davis/suitesparse.html">libumfpack</ulink>,
       <ulink url="http://luajit.org/luajit.html">LuaJIT</ulink>,
@@ -135,5 +137,4 @@
     <title>Installation of gegl</title>
 
-    <!-- With 0.4.30, the scripts already use python3
     <para>
       At first, adjust some test scripts to use Python 3 installed in LFS,
@@ -142,5 +143,5 @@
 
 <screen><userinput>sed '1s@python@&amp;3@' -i tests/python/*.py</userinput></screen>
-    -->
+
     <para>
       Install <application>gegl</application> by running the following commands:
@@ -150,5 +151,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -206,5 +207,5 @@
         <listitem>
           <para>
-            is a commandline tool for working with the XML data model
+            is a commandline tool for working with the XML data model.
           </para>
           <indexterm zone="gegl gegl-prog">
@@ -219,5 +220,5 @@
           <para>
             is a simple image difference detection tool for use in regression
-            testing
+            testing.
           </para>
           <indexterm zone="gegl gegl-imgcmp">
@@ -228,9 +229,9 @@
 
       <varlistentry id="libgegl-0.4">
-        <term><filename class="libraryfile">libgegl-0.4.so</filename></term>
+        <term><filename class='libraryfile'>libgegl-0.4.so</filename></term>
         <listitem>
           <para>
             provides infrastructure to do demand based cached non destructive
-            image editing on larger than RAM buffers
+            image editing on larger than RAM buffers.
           </para>
           <indexterm zone="gegl libgegl-0.4">
@@ -241,8 +242,8 @@
 
       <varlistentry id="libgegl-npd-0.4">
-        <term><filename class="libraryfile">libgegl-npd-0.4.so</filename></term>
-        <listitem>
-          <para>
-            is the GEGL N-point image deformation library
+        <term><filename class='libraryfile'>libgegl-npd-0.4.so</filename></term>
+        <listitem>
+          <para>
+            is the GEGL N-point image deformation library.
           </para>
           <indexterm zone="gegl libgegl-npd-0.4">
@@ -253,8 +254,8 @@
 
       <varlistentry id="libgegl-sc-0.4">
-        <term><filename class="libraryfile">libgegl-sc-0.4.so</filename></term>
-        <listitem>
-          <para>
-            is the GEGL Seamless Cloning library
+        <term><filename class='libraryfile'>libgegl-sc-0.4.so</filename></term>
+        <listitem>
+          <para>
+            is the GEGL Seamless Cloning library.
           </para>
           <indexterm zone="gegl libgegl-sc-0.4">
@@ -266,4 +267,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/graphlib/giflib.xml
===================================================================
--- general/graphlib/giflib.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/giflib.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -103,6 +104,4 @@
 
 <screen role="root"><userinput>make PREFIX=/usr install &amp;&amp;
-
-rm -fv /usr/lib/libgif.a &amp;&amp;
 
 find doc \( -name Makefile\* -o -name \*.1 \
@@ -123,9 +122,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <command>rm -fv /usr/lib/libgif.a</command>: This command removes a
-      static library which is not used by any BLFS package.
-    </para>
 
     <para>
@@ -161,5 +155,5 @@
         <listitem>
           <para>
-            converts images saved as GIF to 24-bit RGB images
+            converts images saved as GIF to 24-bit RGB images.
           </para>
           <indexterm zone="giflib gif2rgb">
@@ -173,5 +167,5 @@
         <listitem>
           <para>
-            dumps GIF data in a textual format, or undumps it to a GIF
+            dumps GIF data in a textual format, or undumps it to a GIF.
           </para>
           <indexterm zone="giflib gifbuild">
@@ -185,5 +179,5 @@
         <listitem>
           <para>
-            modifies GIF image colormaps
+            modifies GIF image colormaps.
           </para>
           <indexterm zone="giflib gifclrmp">
@@ -197,5 +191,5 @@
         <listitem>
           <para>
-            clumsily attempts to fix truncated GIF images
+            clumsily attempts to fix truncated GIF images.
           </para>
           <indexterm zone="giflib giffix">
@@ -209,5 +203,5 @@
         <listitem>
           <para>
-            prints (text only) general information about a GIF file
+            prints (text only) general information about a GIF file.
           </para>
           <indexterm zone="giflib giftext">
@@ -221,5 +215,5 @@
         <listitem>
           <para>
-            is a GIF transformation tool
+            is a GIF transformation tool.
           </para>
           <indexterm zone="giflib giftool">
@@ -236,5 +230,5 @@
             <application>giflib</application> programs and any other programs
             needing library functionality to read, write and manipulate GIF
-            images
+            images.
           </para>
           <indexterm zone="giflib libgif">
Index: general/graphlib/glm.xml
===================================================================
--- general/graphlib/glm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/glm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -140,4 +141,3 @@
 
   </sect2>
-
 </sect1>
Index: general/graphlib/graphite2.xml
===================================================================
--- general/graphlib/graphite2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/graphite2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -43,5 +44,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -89,5 +90,5 @@
     <para role="optional">
       <xref linkend="freetype2"/>,
-      <ulink url="https://sourceforge.net/projects/silgraphite/files/silgraphite/2.3.1/">silgraphite</ulink>
+      <ulink url="http://sourceforge.net/projects/silgraphite/files/silgraphite/2.3.1/">silgraphite</ulink>
       to build the <command>comparerender</command> test and benchmarking tool,
       and if that is present, and
@@ -222,5 +223,5 @@
         <listitem>
           <para>
-            is a test and benchmarking tool
+            is a test and benchmarking tool.
           </para>
           <indexterm zone="graphite2 comparerender">
@@ -234,5 +235,5 @@
         <listitem>
           <para>
-            is a diagnostic console tool for graphite fonts
+            is a diagnostic console tool for graphite fonts.
           </para>
           <indexterm zone="graphite2 gr2fonttest">
@@ -246,5 +247,5 @@
         <listitem>
           <para>
-            is a rendering engine for graphite fonts
+            is a rendering engine for graphite fonts.
           </para>
           <indexterm zone="graphite2 libgraphite2">
Index: general/graphlib/graphlib.xml
===================================================================
--- general/graphlib/graphlib.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/graphlib.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
  %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="general-graphlib">
Index: general/graphlib/harfbuzz.xml
===================================================================
--- general/graphlib/harfbuzz.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/harfbuzz.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,8 +8,8 @@
            "https://github.com/harfbuzz/harfbuzz/releases/download/&harfbuzz-version;/harfbuzz-&harfbuzz-version;.tar.xz">
   <!ENTITY harfbuzz-download-ftp  " ">
-  <!ENTITY harfbuzz-md5sum        "b1977caae59978c2fea28a4b66a60da0">
-  <!ENTITY harfbuzz-size          "11 MB">
-  <!ENTITY harfbuzz-buildsize     "86 MB (add 6 MB for tests)">
-  <!ENTITY harfbuzz-time          "0.4 SBU (Using parallelism=4; add 0.4 SBU for tests)">
+  <!ENTITY harfbuzz-md5sum        "6d8393e6fb84edfb15997d1c5ba35b1b">
+  <!ENTITY harfbuzz-size          "9.1 MB">
+  <!ENTITY harfbuzz-buildsize     "229 MB (add 6 MB for tests)">
+  <!ENTITY harfbuzz-time          "0.3 SBU (Using parallelism=4; add 0.2 SBU for tests)">
 ]>
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -75,5 +76,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="gobject-introspection"/> (required if building GNOME),
+      <xref linkend="git"/>,
       <xref linkend="glib2"/> (required for Pango),
       <xref role="first" linkend="graphite2"/> (required for building
@@ -91,9 +92,8 @@
       dependencies, including harfbuzz, first, then rebuild harfbuzz if the
       cairo backend is needed),
-      <xref linkend="git"/>,
-      <xref linkend="gtk-doc"/>,
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="gtk-doc"/>, and
       <ulink url="https://pypi.org/project/FontTools/">FontTools</ulink>
-      (Python 3 module, for the testsuite), and
-      <ulink url="https://www.colm.net/open-source/ragel/">ragel</ulink>
+      (Python 3 module, for the testsuite)
     </para>
 
@@ -124,8 +124,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr        \
-      --buildtype=release  \
-      -Dgraphite=enabled   \
-      -Dbenchmark=disabled &amp;&amp;
+meson --prefix=/usr -Dgraphite=enabled -Dbenchmark=disabled &amp;&amp;
 ninja</userinput></screen>
 
@@ -143,7 +140,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
 <!--
@@ -210,5 +204,5 @@
             single characters and/or single character names. Example:
             <command>hb-ot-shape-closure
-              /usr/share/fonts/dejavu/DejaVuSans.ttf "Hello World."</command>
+              /usr/share/fonts/dejavu/DejaVuSans.ttf "Hello World."</command>.
           </para>
           <indexterm zone="harfbuzz hb-ot-shape-closure">
@@ -222,5 +216,5 @@
         <listitem>
           <para>
-            is used for the conversion of text strings into positioned glyphs
+            is used for the conversion of text strings into positioned glyphs.
           </para>
           <indexterm zone="harfbuzz hb-shape">
@@ -234,5 +228,5 @@
         <listitem>
           <para>
-            is used to create subsets of fonts, and display text using them
+            is used to create subsets of fonts, and display text using them.
           </para>
           <indexterm zone="harfbuzz hb-subset">
@@ -251,5 +245,5 @@
             being ansi/png/svg/pdf/ps/eps. For example:
             <command>hb-view --output-file=hello.png
-              /usr/share/fonts/dejavu/DejaVuSans.ttf "Hello World."</command>
+              /usr/share/fonts/dejavu/DejaVuSans.ttf "Hello World."</command>.
           </para>
           <indexterm zone="harfbuzz hb-view">
@@ -263,5 +257,5 @@
         <listitem>
           <para>
-            is the HarfBuzz text shaping library
+            is the HarfBuzz text shaping library.
           </para>
           <indexterm zone="harfbuzz libharfbuzz">
@@ -275,5 +269,5 @@
         <listitem>
           <para>
-            provides GObject integration for the HarfBuzz text shaping library
+            provides GObject integration for the HarfBuzz text shaping library.
           </para>
           <indexterm zone="harfbuzz libharfbuzz-gobject">
@@ -287,5 +281,5 @@
         <listitem>
           <para>
-            provides ICU integration for the HarfBuzz text shaping library
+            provides ICU integration for the HarfBuzz text shaping library.
           </para>
           <indexterm zone="harfbuzz libharfbuzz-icu">
Index: general/graphlib/jasper.xml
===================================================================
--- general/graphlib/jasper.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/jasper.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY jasper-download-http "https://github.com/jasper-software/jasper/archive/version-&jasper-version;/jasper-&jasper-version;.tar.gz">
+  <!ENTITY jasper-download-http "http://www.ece.uvic.ca/~frodo/jasper/software/jasper-&jasper-version;.tar.gz">
   <!ENTITY jasper-download-ftp  " ">
-  <!ENTITY jasper-md5sum        "e98c3e1b3cb07bfa3d5ea94abd163bc1">
-  <!ENTITY jasper-size          "1.9 MB">
-  <!ENTITY jasper-buildsize     "7.9 MB (with tests)">
-  <!ENTITY jasper-time          "0.2 SBU (with tests)">
+  <!ENTITY jasper-md5sum        "23561b51da8eb5d0dc85b91eff3d9a7f">
+  <!ENTITY jasper-size          "1.6 MB">
+  <!ENTITY jasper-buildsize     "11 MB (with tests)">
+  <!ENTITY jasper-time          "0.3 SBU (with tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -97,17 +98,4 @@
   <sect2 role="installation">
     <title>Installation of JasPer</title>
-
-    <note>
-      <para>
-        The tarball <emphasis>jasper-&jasper-version;.tar.gz</emphasis> will
-        extract to
-        <emphasis>jasper-version-&jasper-version;</emphasis>.
-      </para>
-    </note>
-
-    <para>
-      Install <application>JasPer</application> by running the following
-      commands:
-    </para>
 
 <screen><userinput>mkdir BUILD &amp;&amp;
@@ -174,5 +162,5 @@
         <listitem>
           <para>
-            compares two images of the same geometry
+            compares two images of the same geometry.
           </para>
           <indexterm zone="jasper imgcmp">
@@ -186,5 +174,5 @@
         <listitem>
           <para>
-            displays information about an image
+            displays information about an image.
           </para>
           <indexterm zone="jasper imginfo">
@@ -199,5 +187,5 @@
           <para>
             converts images between formats (BMP, JPS, JPC, JPG, PGX, PNM, MIF,
-            and RAS)
+            and RAS).
           </para>
           <indexterm zone="jasper jasper">
@@ -211,5 +199,5 @@
         <listitem>
           <para>
-            displays images
+            displays images.
           </para>
           <indexterm zone="jasper jiv">
@@ -220,9 +208,9 @@
 
       <varlistentry id="jasper-lib">
-        <term><filename class="libraryfile">libjasper.so</filename></term>
+        <term><filename class='libraryfile'>libjasper.so</filename></term>
         <listitem>
           <para>
             is a library used by programs for reading and writing
-            JPEG2000 format files
+            JPEG2000 format files.
           </para>
           <indexterm zone="jasper jasper-lib">
Index: general/graphlib/lcms.xml
===================================================================
--- general/graphlib/lcms.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/lcms.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -162,5 +163,5 @@
         <listitem>
           <para>
-            generates PostScript CRD or CSA from ICC profiles
+            generates PostScript CRD or CSA from ICC profiles.
           </para>
           <indexterm zone="lcms icc2ps">
@@ -174,5 +175,5 @@
         <listitem>
           <para>
-            links two or more profiles into a single device link profile
+            links two or more profiles into a single device link profile.
           </para>
           <indexterm zone="lcms icclink">
@@ -186,5 +187,5 @@
         <listitem>
           <para>
-            is a color space conversion calculator
+            is a color space conversion calculator.
           </para>
           <indexterm zone="lcms icctrans">
@@ -198,5 +199,5 @@
         <listitem>
           <para>
-            is an ICC profile applier for JPEG files
+            is an ICC profile applier for JPEG files.
           </para>
           <indexterm zone="lcms jpegicc">
@@ -210,5 +211,5 @@
         <listitem>
           <para>
-            is an ICC profile applier for TIFF files
+            is an ICC profile applier for TIFF files.
           </para>
           <indexterm zone="lcms tifficc">
@@ -222,5 +223,5 @@
         <listitem>
           <para>
-            is a TIFF compare utility
+            is a TIFF compare utility.
           </para>
           <indexterm zone="lcms tiffdiff">
@@ -234,5 +235,5 @@
         <listitem>
           <para>
-            shows media white of profiles, identifying black body locus
+            shows media white of profiles, identifying black body locus.
           </para>
           <indexterm zone="lcms wtpt">
@@ -243,9 +244,9 @@
 
       <varlistentry id="liblcms">
-        <term><filename class="libraryfile">liblcms.so</filename></term>
+        <term><filename class='libraryfile'>liblcms.so</filename></term>
         <listitem>
           <para>
             is used by the <application>lcms</application> programs as
-            well as other programs to provide color management facilities
+            well as other programs to provide color management facilities.
           </para>
           <indexterm zone="lcms liblcms">
Index: general/graphlib/lcms2.xml
===================================================================
--- general/graphlib/lcms2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/lcms2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY lcms2-download-http "&sourceforge-dl;/lcms/lcms2-&lcms2-version;.tar.gz">
   <!ENTITY lcms2-download-ftp  " ">
-  <!ENTITY lcms2-md5sum        "8cb583c8447461896320b43ea9a688e0">
-  <!ENTITY lcms2-size          "7.1 MB">
-  <!ENTITY lcms2-buildsize     "22 MB (with the tests)">
+  <!ENTITY lcms2-md5sum        "598dae499e58f877ff6788254320f43e">
+  <!ENTITY lcms2-size          "6.2 MB">
+  <!ENTITY lcms2-buildsize     "21 MB (with the tests)">
   <!ENTITY lcms2-time          "0.2 SBU (with the tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -149,5 +150,5 @@
         <listitem>
           <para>
-            is the Little CMS ICC profile applier for JPEG
+            is the Little CMS ICC profile applier for JPEG.
           </para>
           <indexterm zone="lcms2 jpgicc">
@@ -173,5 +174,5 @@
         <listitem>
           <para>
-            is the Little CMS ICC PostScript generator
+            is the Little CMS ICC PostScript generator.
           </para>
           <indexterm zone="lcms2 psicc">
@@ -185,5 +186,5 @@
         <listitem>
           <para>
-            is the Little CMS ICC tiff generator
+            is the Little CMS ICC tiff generator.
           </para>
           <indexterm zone="lcms2 tificc">
@@ -197,5 +198,5 @@
         <listitem>
           <para>
-            is the Little CMS ColorSpace conversion calculator
+            is the Little CMS ColorSpace conversion calculator.
           </para>
           <indexterm zone="lcms2 transicc">
@@ -209,5 +210,5 @@
         <listitem>
           <para>
-            contains functions that implement the lcms2 API
+            contains functions that implement the lcms2 API.
           </para>
           <indexterm zone="lcms2 liblcms2">
@@ -218,4 +219,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/graphlib/libexif.xml
===================================================================
--- general/graphlib/libexif.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/libexif.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -22,4 +22,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -42,5 +43,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -179,9 +180,9 @@
 
       <varlistentry id="libexif-lib">
-        <term><filename class="libraryfile">libexif.so</filename></term>
+        <term><filename class='libraryfile'>libexif.so</filename></term>
         <listitem>
           <para>
             contains functions used for parsing, editing, and saving
-            EXIF data
+            EXIF data.
           </para>
           <indexterm zone="libexif libexif-lib">
Index: general/graphlib/libgxps.xml
===================================================================
--- general/graphlib/libgxps.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/libgxps.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY libgxps-download-http "&gnome-download-http;/libgxps/0.3/libgxps-&libgxps-version;.tar.xz">
   <!ENTITY libgxps-download-ftp  "&gnome-download-ftp;/libgxps/0.3/libgxps-&libgxps-version;.tar.xz">
-  <!ENTITY libgxps-md5sum        "0527ac7c8c405445e96a5baa6019a0c3">
-  <!ENTITY libgxps-size          "80 KB">
-  <!ENTITY libgxps-buildsize     "5.4 MB">
+  <!ENTITY libgxps-md5sum        "ade83c264b3af2551a0dff9144478df8">
+  <!ENTITY libgxps-size          "92 KB">
+  <!ENTITY libgxps-buildsize     "6.0 MB">
   <!ENTITY libgxps-time          "0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -104,5 +105,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -116,11 +117,4 @@
 
 <screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
   </sect2>
 
@@ -155,5 +149,5 @@
         <listitem>
           <para>
-            converts XPS documents to a JPEG image
+            converts XPS documents to a JPEG image.
           </para>
           <indexterm zone="libgxps xpstojpeg">
@@ -167,5 +161,5 @@
         <listitem>
           <para>
-            converts XPS documents to PDF format
+            converts XPS documents to PDF format.
           </para>
           <indexterm zone="libgxps xpstopdf">
@@ -179,5 +173,5 @@
         <listitem>
           <para>
-            converts XPS documents to a PNG image
+            converts XPS documents to a PNG image.
           </para>
           <indexterm zone="libgxps xpstopng">
@@ -191,5 +185,5 @@
         <listitem>
           <para>
-            converts XPS documents to PostScript
+            converts XPS documents to PostScript.
           </para>
           <indexterm zone="libgxps xpstops">
@@ -203,5 +197,5 @@
         <listitem>
           <para>
-            converts XPS documents to SVG images
+            converts XPS documents to SVG images.
           </para>
           <indexterm zone="libgxps xpstosvg">
@@ -215,5 +209,5 @@
         <listitem>
           <para>
-            contains API functions for manipulating XPS documents
+            contains API functions for manipulating XPS documents.
           </para>
           <indexterm zone="libgxps libgxps-lib">
@@ -224,4 +218,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/graphlib/libjpeg-turbo.xml
===================================================================
--- general/graphlib/libjpeg-turbo.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/libjpeg-turbo.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY libjpeg-download-http "&sourceforge-dl;/libjpeg-turbo/libjpeg-turbo-&libjpeg-turbo-version;.tar.gz">
   <!ENTITY libjpeg-download-ftp  " ">
-  <!ENTITY libjpeg-md5sum        "cf16866976ab31cd6fc478eac8c2c54e">
-  <!ENTITY libjpeg-size          "2.2 MB">
-  <!ENTITY libjpeg-buildsize     "33 MB (with tests)">
+  <!ENTITY libjpeg-md5sum        "4cada3f0bdc93d826fa31bf9e4469ef6">
+  <!ENTITY libjpeg-size          "2.1 MB">
+  <!ENTITY libjpeg-buildsize     "31 MB (with tests)">
   <!ENTITY libjpeg-time          "0.3 SBU (using parallelism=4; with tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+  <othername>$LastChangedBy$</othername>
   <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -174,5 +175,5 @@
             standard output. Currently supported input file formats are: PPM
             (PBMPLUS color format), PGM (PBMPLUS gray-scale format),
-            BMP, and Targa
+            BMP, and Targa.
           </para>
           <indexterm zone="libjpeg cjpeg">
@@ -188,5 +189,5 @@
             decompresses image files from JPEG/JFIF format to either
             PPM (PBMPLUS color format), PGM (PBMPLUS gray-scale format),
-            BMP, or Targa format
+            BMP, or Targa format.
           </para>
           <indexterm zone="libjpeg djpeg">
@@ -200,5 +201,5 @@
         <listitem>
           <para>
-            is used for lossless transformation of JPEG files
+            is used for lossless transformation of JPEG files.
           </para>
           <indexterm zone="libjpeg jpegtran">
@@ -212,5 +213,5 @@
         <listitem>
           <para>
-            displays text comments from within a JPEG file
+            displays text comments from within a JPEG file.
           </para>
           <indexterm zone="libjpeg rdjpgcom">
@@ -224,5 +225,5 @@
         <listitem>
           <para>
-            is used to benchmark the performance of libjpeg-turbo
+            is used to benchmark the performance of libjpeg-turbo.
           </para>
           <indexterm zone="libjpeg tjbench">
@@ -236,5 +237,5 @@
         <listitem>
           <para>
-            inserts text comments into a JPEG file
+            inserts text comments into a JPEG file.
           </para>
           <indexterm zone="libjpeg wrjpgcom">
@@ -248,5 +249,5 @@
         <listitem>
           <para>
-            contains functions used for reading and writing JPEG images
+            contains functions used for reading and writing JPEG images.
         </para>
           <indexterm zone="libjpeg libjpeg-lib">
Index: general/graphlib/libmng.xml
===================================================================
--- general/graphlib/libmng.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/libmng.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -139,10 +140,10 @@
 
       <varlistentry id="libmng-lib">
-        <term><filename class="libraryfile">libmng.so</filename></term>
+        <term><filename class='libraryfile'>libmng.so</filename></term>
         <listitem>
           <para>
             provides functions for programs wishing to read and write MNG
             files which are animation files without the patent problems
-            associated with certain other formats
+            associated with certain other formats.
           </para>
           <indexterm zone="libmng libmng-lib">
Index: general/graphlib/libmypaint.xml
===================================================================
--- general/graphlib/libmypaint.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/libmypaint.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -149,5 +150,5 @@
         <listitem>
           <para>
-            contains functions for making brushstrokes
+            contains functions for making brushstrokes.
           </para>
           <indexterm zone="libmypaint libmypaint-lib">
@@ -158,4 +159,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/graphlib/libpng.xml
===================================================================
--- general/graphlib/libpng.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/libpng.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -23,4 +23,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -42,5 +43,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -173,5 +174,5 @@
           <para>
             tests, optimizes and optionally fixes the zlib header in PNG files.
-            Optionally, when fixing, strips ancillary chunks from the file
+            Optionally, when fixing, strips ancillary chunks from the file.
           </para>
           <indexterm zone="libpng pngfix">
@@ -186,5 +187,5 @@
           <para>
             fixes PNG files that have an incorrect length field in the
-            iTXt chunks
+            iTXt chunks.
           </para>
           <indexterm zone="libpng png-fix-itxt">
@@ -200,5 +201,5 @@
             is a shell script that provides configuration information
             for applications wanting to use
-            <application>libpng</application>
+            <application>libpng</application>.
           </para>
           <indexterm zone="libpng libpng-config">
@@ -213,5 +214,5 @@
           <para>
             contain routines used to create and manipulate PNG
-            format graphics files
+            format graphics files.
           </para>
           <indexterm zone="libpng libpng-lin">
Index: general/graphlib/libraw.xml
===================================================================
--- general/graphlib/libraw.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/libraw.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libraw-download-http "https://www.libraw.org/data/LibRaw-&libraw-version;.tar.gz">
+  <!ENTITY libraw-download-http "http://www.libraw.org/data/LibRaw-&libraw-version;.tar.gz">
   <!ENTITY libraw-download-ftp  " ">
   <!ENTITY libraw-md5sum        "2e5bedb59ea433e2d2ef6bbbe5253179">
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -151,5 +152,5 @@
       <note>
          <para>
-           All the installed programs are examples of using libraw.
+           All the installed programs are examples of libraw use.
          </para>
       </note>
@@ -185,5 +186,5 @@
         <listitem>
           <para>
-            generates four TIFF files from RAW data, one file per channel
+            generates four TIFF files from RAW data, one file per channel.
           </para>
           <indexterm zone="libraw _4channels">
@@ -197,6 +198,6 @@
         <listitem>
           <para>
-            emulates "dcraw -h" (see
-            <ulink url="&dcraw-manpage-url;"> DCRAW manpage</ulink>)
+            emulates "dcraw -h" (see <ulink
+            url="&dcraw-manpage-url;"> DCRAW manpage</ulink>).
           </para>
           <indexterm zone="libraw dcraw_half">
@@ -210,6 +211,6 @@
         <listitem>
           <para>
-            emulates "dcraw [-4] [-6] [-e]" (see
-            <ulink url="&dcraw-manpage-url;"> DCRAW manpage</ulink>)
+            emulates "dcraw [-4] [-6] [-e]" (see <ulink
+            url="&dcraw-manpage-url;"> DCRAW manpage</ulink>).
           </para>
           <indexterm zone="libraw mem_image">
@@ -224,5 +225,5 @@
           <para>
             creates eight different renderings from one source file.
-            The first and fourth one should be identical
+            The first and fourth one should be identical.
           </para>
           <indexterm zone="libraw postprocessing_benchmark">
@@ -237,6 +238,6 @@
         <listitem>
           <para>
-            emulates call to "dcraw  [-D]  [-T] [-v] [-e] [-4]"  (see
-            <ulink url="&dcraw-manpage-url;"> DCRAW manpage</ulink>)
+            emulates call to "dcraw  [-D]  [-T] [-v] [-e] [-4]"  (see <ulink
+            url="&dcraw-manpage-url;"> DCRAW manpage</ulink>).
           </para>
           <indexterm zone="libraw simple_dcraw">
@@ -250,6 +251,6 @@
         <listitem>
           <para>
-            is an almost complete dcraw emulator (see
-            <ulink url="&dcraw-manpage-url;"> DCRAW manpage</ulink>)
+            is an almost complete dcraw emulator (see <ulink
+            url="&dcraw-manpage-url;"> DCRAW manpage</ulink>).
           </para>
           <indexterm zone="libraw dcraw_emu">
@@ -263,6 +264,6 @@
         <listitem>
           <para>
-            emulates call to "dcraw -h [-w] [-a] [-v]"  (see
-            <ulink url="&dcraw-manpage-url;">DCRAW manpage</ulink>)
+            emulates call to "dcraw -h [-w] [-a] [-v]"  (see <ulink
+            url="&dcraw-manpage-url;">DCRAW manpage</ulink>).
           </para>
           <indexterm zone="libraw half_mt">
@@ -277,5 +278,5 @@
           <para>
             creates eight different renderings from one source file.
-            The first and fourth one should be identical
+            The first and fourth one should be identical.
           </para>
           <indexterm zone="libraw multirender_test">
@@ -289,6 +290,6 @@
         <listitem>
           <para>
-            emulates call to "dcraw -i [-v]"  (see
-            <ulink url="&dcraw-manpage-url;"> DCRAW manpage</ulink>)
+            emulates call to "dcraw -i [-v]"  (see <ulink
+            url="&dcraw-manpage-url;"> DCRAW manpage</ulink>).
           </para>
           <indexterm zone="libraw raw-identify">
@@ -303,5 +304,5 @@
           <para>
             generates unprocessed raw image: with masked pixels and without
-            black subtraction
+            black subtraction.
           </para>
           <indexterm zone="libraw unprocessed_raw">
Index: general/graphlib/librsvg.xml
===================================================================
--- general/graphlib/librsvg.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/librsvg.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY librsvg-download-http "&gnome-download-http;/librsvg/2.50/librsvg-&librsvg-version;.tar.xz">
   <!ENTITY librsvg-download-ftp  "&gnome-download-ftp;/librsvg/2.50/librsvg-&librsvg-version;.tar.xz">
-  <!ENTITY librsvg-md5sum        "e6ac4051ef7653cd8b1e27a4da051600">
-  <!ENTITY librsvg-size          "21 MB">
-  <!ENTITY librsvg-buildsize     "1.2 GB (96 MB installed), add 1.0 GB for tests">
-  <!ENTITY librsvg-time          "1.0 SBU (Using parallelism=4), add 0.7 SBU for tests">
+  <!ENTITY librsvg-md5sum        "15a5073ab330e15c2d17802cfb2d1f8c">
+  <!ENTITY librsvg-size          "16 MB">
+  <!ENTITY librsvg-buildsize     "1.3 GB (97 MB installed), add 1.0 GB for tests">
+  <!ENTITY librsvg-time          "1.8 SBU (Using parallelism=4), add 0.8 SBU for tests">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -112,12 +113,11 @@
 
     <para>
+      To test the results, issue: <command>make check</command>.
       <!-- https://gitlab.gnome.org/GNOME/librsvg/issues/511 -->
-      Many of the tests in 'reftests' may fail (over half in May 2021) because
+      Many of the tests in 'reftests' may fail (44 in November 2020) because
       they produce, and then diff, graphic files with text and the details such
       as spacing vary when the system versions of cairo, freetype, pixman, pango
       and perhaps harfbuzz differ from the versions on the system where the
-      reference files were created. For this reason, running the tests is not
-      recommended.
-      To test the results anyway, issue: <command>make check</command>.
+      reference files were created.
     </para>
 
@@ -196,5 +196,5 @@
         <listitem>
           <para>
-            is used to convert images into PNG, PDF, PS, SVG and other formats
+            is used to convert images into PNG, PDF, PS, SVG and other formats.
           </para>
           <indexterm zone="librsvg rsvg-convert">
@@ -208,5 +208,5 @@
         <listitem>
           <para>
-            provides the functions to render Scalable Vector Graphics
+            provides the functions to render Scalable Vector Graphics.
           </para>
           <indexterm zone="librsvg librsvg-2">
@@ -222,5 +222,5 @@
             is the <application>Gdk Pixbuf</application> plugin that allows
             <application>GTK+</application> applications to render Scalable
-            Vector Graphics images
+            Vector Graphics images.
           </para>
           <indexterm zone="librsvg libpixbufloader-svg">
Index: general/graphlib/libspiro.xml
===================================================================
--- general/graphlib/libspiro.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/libspiro.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -138,5 +139,5 @@
           <para>
             is a shareable library that can be used by programs to do the Spiro
-            computations for you
+            computations for you.
           </para>
           <indexterm zone="libspiro libspiro-lib">
@@ -147,4 +148,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/graphlib/libtiff.xml
===================================================================
--- general/graphlib/libtiff.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/libtiff.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,9 +6,9 @@
 
   <!ENTITY libtiff-download-http
-           "https://download.osgeo.org/libtiff/tiff-&libtiff-version;.tar.gz">
+           "http://download.osgeo.org/libtiff/tiff-&libtiff-version;.tar.gz">
 <!--  <!ENTITY libtiff-download-ftp
            "ftp://ftp.remotesensing.org/libtiff/tiff-&libtiff-version;.tar.gz">-->
   <!ENTITY libtiff-download-ftp  " ">
-  <!ENTITY libtiff-md5sum        "0a2e4744d1426a8fc8211c0cdbc3a1b3">
+  <!ENTITY libtiff-md5sum        "2bbf6db1ddc4a59c89d6986b368fc063">
   <!ENTITY libtiff-size          "2.7 MB">
   <!ENTITY libtiff-buildsize     "16 MB (with tests)">
@@ -16,22 +16,23 @@
 ]>
 
-<sect1 id="libtiff" xreflabel="libtiff-&libtiff-version;">
+<sect1 id="libtiff" xreflabel="LibTIFF-&libtiff-version;">
   <?dbhtml filename="libtiff.html"?>
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
 
-  <title>libtiff-&libtiff-version;</title>
+  <title>LibTIFF-&libtiff-version;</title>
 
   <indexterm zone="libtiff">
-    <primary sortas="a-libtiff">libtiff</primary>
+    <primary sortas="a-LibTIFF">LibTIFF</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to libtiff</title>
+    <title>Introduction to LibTIFF</title>
 
     <para>
-      The <application>libtiff</application> package contains the TIFF
+      The <application>LibTIFF</application> package contains the TIFF
       libraries and associated utilities. The libraries are used by many
       programs for reading and writing TIFF files and the utilities are
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -75,5 +76,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">libtiff Dependencies</bridgehead>
+    <bridgehead renderas="sect3">LibTIFF Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
@@ -96,8 +97,8 @@
 
   <sect2 role="installation">
-    <title>Installation of libtiff</title>
+    <title>Installation of LibTIFF</title>
 
     <para>
-      Install <application>libtiff</application> by running the following
+      Install <application>LibTIFF</application> by running the following
       commands:
     </para>
@@ -120,17 +121,5 @@
     </para>
 
-<screen role="root"><userinput>ninja install
-sed -i /Version/s/\$/$(cat ../VERSION)/ /usr/lib/pkgconfig/libtiff-4.pc</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i /Version/...</command>: When building with cmake/ninja,
-      the Version field in the pkgconfig file is empty. This command 
-      fixes that field.
-    </para>
+<screen role="root"><userinput>ninja install</userinput></screen>
 
   </sect2>
@@ -182,5 +171,5 @@
         <listitem>
           <para>
-            converts a TIFF facsimile to compressed PostScript file
+            converts a TIFF facsimile to compressed PostScript file.
           </para>
           <indexterm zone="libtiff fax2ps">
@@ -194,5 +183,5 @@
         <listitem>
           <para>
-            creates a TIFF Class F fax file from raw fax data
+            creates a TIFF Class F fax file from raw fax data.
           </para>
           <indexterm zone="libtiff fax2tiff">
@@ -219,5 +208,5 @@
           <para>
             converts a palette color TIFF image to a full color
-            image
+            image.
           </para>
           <indexterm zone="libtiff pal2rgb">
@@ -231,5 +220,5 @@
         <listitem>
           <para>
-            creates a TIFF file from a PPM image file
+            creates a TIFF file from a PPM image file.
           </para>
           <indexterm zone="libtiff ppm2tiff">
@@ -255,5 +244,5 @@
         <listitem>
           <para>
-            converts a raw byte sequence into TIFF
+            converts a raw byte sequence into TIFF.
           </para>
           <indexterm zone="libtiff raw2tiff">
@@ -291,5 +280,5 @@
         <listitem>
           <para>
-            converts a color TIFF image to grayscale
+            converts a color TIFF image to grayscale.
           </para>
           <indexterm zone="libtiff tiff2bw">
@@ -303,5 +292,5 @@
         <listitem>
           <para>
-            converts a TIFF image to a PDF document
+            converts a TIFF image to a PDF document.
           </para>
           <indexterm zone="libtiff tiff2pdf">
@@ -315,5 +304,5 @@
         <listitem>
           <para>
-            converts a TIFF image to a PostScript file
+            converts a TIFF image to a PostScript file.
           </para>
           <indexterm zone="libtiff tiff2ps">
@@ -328,5 +317,5 @@
           <para>
             converts a wide variety of TIFF images into an RGBA
-            TIFF image
+            TIFF image.
           </para>
           <indexterm zone="libtiff tiff2rgba">
@@ -340,5 +329,5 @@
         <listitem>
           <para>
-            compares two TIFF files
+            compares two TIFF files.
           </para>
           <indexterm zone="libtiff tiffcmp">
@@ -352,5 +341,5 @@
         <listitem>
           <para>
-            copies (and possibly converts) a TIFF file
+            copies (and possibly converts) a TIFF file.
           </para>
           <indexterm zone="libtiff tiffcp">
@@ -365,5 +354,5 @@
           <para>
             selects, copies, crops, converts, extracts and/or processes
-            one or more TIFF files
+            one or more TIFF files.
           </para>
           <indexterm zone="libtiff tiffcrop">
@@ -377,5 +366,5 @@
         <listitem>
           <para>
-            converts a grayscale image to bilevel using dithering
+            converts a grayscale image to bilevel using dithering.
           </para>
           <indexterm zone="libtiff tiffdither">
@@ -389,5 +378,5 @@
         <listitem>
           <para>
-            prints verbatim information about TIFF files
+            prints verbatim information about TIFF files.
           </para>
           <indexterm zone="libtiff tiffdump">
@@ -401,5 +390,5 @@
         <listitem>
           <para>
-            displays an image stored in a TIFF file
+            displays an image stored in a TIFF file.
           </para>
           <indexterm zone="libtiff tiffgt">
@@ -413,5 +402,5 @@
         <listitem>
           <para>
-            prints information about TIFF files
+            prints information about TIFF files.
           </para>
           <indexterm zone="libtiff tiffinfo">
@@ -425,5 +414,5 @@
         <listitem>
           <para>
-            applies the median cut algorithm to data in a TIFF file
+            applies the median cut algorithm to data in a TIFF file.
           </para>
           <indexterm zone="libtiff tiffmedian">
@@ -437,5 +426,5 @@
         <listitem>
           <para>
-            sets the value of a TIFF header to a specified value
+            sets the value of a TIFF header to a specified value.
           </para>
           <indexterm zone="libtiff tiffset">
@@ -449,5 +438,5 @@
         <listitem>
           <para>
-            splits a multi-image TIFF into single-image TIFF files
+            splits a multi-image TIFF into single-image TIFF files.
           </para>
           <indexterm zone="libtiff tiffsplit">
@@ -463,5 +452,5 @@
             contains the API functions used by the
             <application>libtiff</application> programs as well as other
-            programs to read and write TIFF files
+            programs to read and write TIFF files.
           </para>
           <indexterm zone="libtiff libtiff-lib">
@@ -476,5 +465,5 @@
           <para>
             contains the C++ API functions used
-            by programs to read and write TIFF files
+            by programs to read and write TIFF files.
           </para>
           <indexterm zone="libtiff libtiffxx">
Index: general/graphlib/libwebp.xml
===================================================================
--- general/graphlib/libwebp.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/libwebp.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY libwebp-download-http "http://downloads.webmproject.org/releases/webp/libwebp-&libwebp-version;.tar.gz">
   <!ENTITY libwebp-download-ftp  " ">
-  <!ENTITY libwebp-md5sum        "f30c738034faa13d6255604ed46b6158">
-  <!ENTITY libwebp-size          "3.9 MB">
-  <!ENTITY libwebp-buildsize     "41 MB">
+  <!ENTITY libwebp-md5sum        "7e047f2cbaf584dff7a8a7e0f8572f18">
+  <!ENTITY libwebp-size          "3.8 MB">
+  <!ENTITY libwebp-buildsize     "45 MB">
   <!ENTITY libwebp-time          "0.3 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -144,17 +145,9 @@
       <seglistitem>
         <seg>
-          cwebp, 
-          dwebp, 
-          gif2webp, 
-          img2webp, 
-          vwebp,
-          webpinfo, 
-          and webpmux
+          cwebp, dwebp, gif2webp, vwebp, and webpmux
         </seg>
         <seg>
-          libwebpdecoder.so, 
-          libwebpdemux.so,
-          libwebpmux.so,
-          and libwebp.so
+          libwebpdecoder.so, libwebpdemux.so, libwebpextras.so,
+          libwebpmux.so, and libwebp.so
         </seg>
         <seg>
@@ -173,5 +166,5 @@
         <listitem>
           <para>
-            compresses an image using the WebP format
+            compresses an image using the WebP format.
           </para>
           <indexterm zone="libwebp cwebp">
@@ -185,5 +178,5 @@
         <listitem>
           <para>
-            decompresses WebP files into PNG, PAM, PPM or PGM images
+            decompresses WebP files into PNG, PAM, PPM or PGM images.
           </para>
           <indexterm zone="libwebp dwebp">
@@ -197,5 +190,5 @@
         <listitem>
           <para>
-            converts a GIF image to a WebP image
+            converts a GIF image to a WebP image.
           </para>
           <indexterm zone="libwebp gif2webp">
@@ -205,21 +198,9 @@
       </varlistentry>
 
-      <varlistentry id="img2webp">
-        <term><command>img2webp</command></term>
-        <listitem>
-          <para>
-            creates an animated WebP file from a sequence of input images
-          </para>
-          <indexterm zone="libwebp img2webp">
-            <primary sortas="b-img2webp">img2webp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="vwebp">
         <term><command>vwebp</command></term>
         <listitem>
           <para>
-            decompresses a WebP file and displays it in a window
+            decompress a WebP file and display it in a window.
           </para>
           <indexterm zone="libwebp vwebp">
@@ -229,17 +210,4 @@
       </varlistentry>
 
-      <varlistentry id="webpinfo">
-        <term><command>webpinfo</command></term>
-        <listitem>
-          <para>
-            prints out the cunk level structure of WebP files along with
-            performing basic integrity checks
-          </para>
-          <indexterm zone="libwebp webpinfo">
-            <primary sortas="b-webpinfo">webpinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="webpmux">
         <term><command>webpmux</command></term>
@@ -248,5 +216,5 @@
             creates animated WebP files from non-animated WebP images, extracts
             frames from animated WebP images, and manages XMP/EXIF metadata and
-            ICC profile
+            ICC profile.
           </para>
           <indexterm zone="libwebp webpmux">
@@ -260,5 +228,5 @@
         <listitem>
           <para>
-            contains the API functions for WebP encoding and decoding
+            contains the API functions for WebP encoding and decoding.
           </para>
           <indexterm zone="libwebp libwebp-lib">
Index: general/graphlib/mypaint-brushes.xml
===================================================================
--- general/graphlib/mypaint-brushes.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/mypaint-brushes.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -139,4 +140,3 @@
 
   </sect2>
-
 </sect1>
Index: general/graphlib/newt.xml
===================================================================
--- general/graphlib/newt.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/newt.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -86,10 +87,10 @@
       <xref role="runtime" linkend="gpm"/> (runtime)
     </para>
-<!-- Python 3 can be used, do not tell about python2
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="python2"/> 
     </para>
--->
+
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/newt"/>
@@ -105,12 +106,10 @@
     </para>
 
-<screen><userinput>sed -e 's/^LIBNEWT =/#&amp;/'                   \
+<screen><userinput>sed -e 's/^LIBNEWT =/#&amp;/' \
     -e '/install -m 644 $(LIBNEWT)/ s/^/#/' \
-    -e 's/$(LIBNEWT)/$(LIBNEWTSONAME)/g'    \
-    -i Makefile.in                          &amp;&amp;
+    -e 's/$(LIBNEWT)/$(LIBNEWTSONAME)/g' \
+    -i Makefile.in                           &amp;&amp;
 
-./configure --prefix=/usr           \
-            --with-gpm-support      \
-            --with-python=python&python3-majorver; &amp;&amp;
+./configure --prefix=/usr --with-gpm-support &amp;&amp;
 make</userinput></screen>
 
@@ -131,9 +130,4 @@
 
     <para>
-      <command>sed -e ... -i Makefile.in</command>: Disables installation of a
-      static library.
-    </para>
-
-    <para>
       <parameter>--with-gpm-support</parameter>: This switch enables mouse support for newt
       applications through GPM.
@@ -141,7 +135,6 @@
 
     <para>
-      <parameter>--with-python=python&python3-majorver;</parameter>: By giving
-      explicitly the name of the directory where python modules reside, this
-      switch prevents building the python2 module.
+      <command>sed -e ... -i Makefile.in</command>: Disables installation of a
+      static library.
     </para>
 
@@ -159,5 +152,5 @@
         <seg> whiptail </seg>
         <seg> libnewt.so, whiptcl.so, and
-        /usr/lib/python&python3-majorver;/site-packages/_snack.so </seg>
+        /usr/lib/python{&python2-majorver;,&python3-majorver;}/site-packages/_snack.so </seg>
         <seg> None </seg>
       </seglistitem>
@@ -173,5 +166,5 @@
         <listitem>
           <para>
-            displays dialog boxes from shell scripts
+            displays dialog boxes from shell scripts.
           </para>
           <indexterm zone="newt whiptail-prog">
@@ -185,5 +178,5 @@
         <listitem>
           <para>
-            is the library for color text mode, widget based user interfaces
+            is the library for color text mode, widget based user interfaces.
           </para>
           <indexterm zone="newt libnewt-lib">
Index: general/graphlib/opencv.xml
===================================================================
--- general/graphlib/opencv.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/opencv.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY opencv-download-http     "https://github.com/opencv/opencv/archive/&opencv-version;/opencv-&opencv-version;.tar.gz">
   <!ENTITY opencv-download-ftp      " ">
-  <!ENTITY opencv-md5sum            "1fe94553bcc8c8723b47c1a72f9f768f">
-  <!ENTITY opencv-size              "85 MB">
-  <!ENTITY opencv-buildsize         "769 MB">
-  <!ENTITY opencv-time              "4.3 SBU (using parallelism=4)">
+  <!ENTITY opencv-md5sum            "2205d3169238ec1f184438a96de68513">
+  <!ENTITY opencv-size              "84 MB">
+  <!ENTITY opencv-buildsize         "706 MB">
+  <!ENTITY opencv-time              "2.9 SBU (using parallelism=4)">
 
 
@@ -20,4 +20,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -113,5 +114,4 @@
       <xref linkend="gtk3"/>,
       <xref linkend="jasper"/>,
-      <xref linkend="libexif"/>,
       <xref linkend="libjpeg"/>,
       <xref linkend="libpng"/>,
@@ -128,23 +128,21 @@
       <xref linkend="java"/>,
       <xref linkend="python2"/>,
-      <ulink url="https://www.netlib.org/blas/">blas</ulink>,
       <ulink url="https://developer.nvidia.com/cuda-zone">Cuda</ulink>,
-      <ulink url="https://eigen.tuxfamily.org/">Eigen</ulink>,
+      <ulink url="http://eigen.tuxfamily.org/">Eigen</ulink>,
       <ulink url="http://www.openexr.com/">OpenEXR</ulink>,
-      <!--<ulink url="http://gcd.joewheaton.org/">GCD</ulink>,-->
+      <ulink url="http://gcd.joewheaton.org/">GCD</ulink>,
       <ulink url="http://www.gdal.org/">GDAL</ulink>,
-      <!--<ulink url="https://www.jai.com/technology/interfaces">GigEVisionSDK</ulink>,-->
-      <!--<ulink url="http://jackaudio.org/">JACK</ulink>,-->
-      <ulink url="http://www.netlib.org/lapack/">lapack</ulink>,
-      <ulink url="https://sourceforge.net/projects/libdc1394/">libdc1394</ulink>,
-      <!--<ulink url="http://www.gphoto.org/">libgphoto2</ulink>,-->
+      <ulink url="https://www.jai.com/technology/interfaces">GigEVisionSDK</ulink>,
+      <ulink url="http://jackaudio.org/">JACK</ulink>,
+      <ulink url="http://sourceforge.net/projects/libdc1394/">libdc1394</ulink>,
+      <ulink url="http://www.gphoto.org/">libgphoto2</ulink>,
       <ulink url="http://www.numpy.org/">NumPy</ulink>,
-      <!--<ulink url="http://structure.io/openni">OpenNI</ulink>,
+      <ulink url="http://structure.io/openni">OpenNI</ulink>,
       <ulink url="http://plantuml.sourceforge.net/">PlanetUML</ulink>,
-      <ulink url="https://www.alliedvision.com/en/support/software-downloads.html">PvAPI</ulink>,-->
-      <ulink url="https://github.com/oneapi-src/oneTBB">Threading Building Blocks (TBB)</ulink>, and
-      <!--<ulink url="http://unicap-imaging.org/">UniCap</ulink>,-->
-      <ulink url="http://www.vtk.org/">VTK - The Visualization Toolkit</ulink>,
-      <!--<ulink url="http://www.ximea.com/">XIMEA</ulink>-->
+      <ulink url="https://www.alliedvision.com/en/support/software-downloads.html">PvAPI</ulink>,
+      <ulink url="https://github.com/oneapi-src/oneTBB">Threading Building Blocks (TBB)</ulink>,
+      <ulink url="http://unicap-imaging.org/">UniCap</ulink>,
+      <ulink url="http://www.vtk.org/">VTK - The Visualization Toolkit</ulink>, and
+      <ulink url="http://www.ximea.com/">XIMEA</ulink>
     </para>
 
@@ -227,5 +225,4 @@
           opencv_annotation,
           opencv_interactive-calibration,
-          opencv_model_diagnostics,
           opencv_version,
           opencv_visualisation, and
@@ -252,6 +249,4 @@
           /usr/include/opencv4
           /usr/lib/cmake/opencv4,
-          /usr/lib/python&python3-majorver;/site-packages/cv2,
-          /usr/share/licenses/opencv4,
           /usr/share/opencv4, and
           /usr/share/java/opencv4
Index: general/graphlib/openjpeg2.xml
===================================================================
--- general/graphlib/openjpeg2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/openjpeg2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -165,5 +166,5 @@
         <listitem>
           <para>
-            converts various image formats to the jpeg2000 format
+            converts various image formats to the jpeg2000 format.
           </para>
           <indexterm zone="openjpeg2 opj_compress">
@@ -177,5 +178,5 @@
         <listitem>
           <para>
-            converts jpeg2000 images to other image types
+            converts jpeg2000 images to other image types.
           </para>
           <indexterm zone="openjpeg2 opj_decompress">
@@ -189,5 +190,5 @@
         <listitem>
           <para>
-            reads in a jpeg2000 image and dumps the contents to stdout
+            reads in a jpeg2000 image and dumps the contents to stdout.
           </para>
           <indexterm zone="openjpeg2 opj_dump">
Index: general/graphlib/pixman.xml
===================================================================
--- general/graphlib/pixman.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/pixman.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -95,5 +96,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release &amp;&amp;
+meson --prefix=/usr &amp;&amp;
 ninja</userinput></screen>
 
@@ -108,11 +109,4 @@
 <screen role="root"><userinput>ninja install</userinput></screen>
 
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
   </sect2>
 
@@ -148,5 +142,5 @@
           <para>
             contains functions that provide low-level pixel manipulation
-            features
+            features.
           </para>
           <indexterm zone="pixman libpixman">
Index: general/graphlib/poppler.xml
===================================================================
--- general/graphlib/poppler.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/poppler.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,9 +7,8 @@
   <!ENTITY poppler-download-http "https://poppler.freedesktop.org/poppler-&poppler-version;.tar.xz">
   <!ENTITY poppler-download-ftp  " ">
-  <!ENTITY poppler-md5sum        "60d5be55cc080d602bf58daf6825b124">
+  <!ENTITY poppler-md5sum        "eb4a8465b03ec58cc6a3277aa7d4fa7b">
   <!ENTITY poppler-size          "1.6 MB">
-  <!ENTITY poppler-buildsize     "105 MB (with Qt5 library and tests)">
+  <!ENTITY poppler-buildsize     "96 MB (with Qt5 library and tests)">
   <!ENTITY poppler-time          "0.7 SBU (with parallelism=4, Qt5 library, and tests)">
-  <!-- Time increase might be due to git.freedesktop.org -->
 
   <!ENTITY poppler-data-version       "0.4.10">
@@ -26,4 +25,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -44,5 +44,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -129,5 +129,4 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="boost"/>,
       <xref linkend="cairo"/>,
       <xref linkend="lcms2"/>,
@@ -140,4 +139,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="boost"/>,
       <xref linkend="curl"/>,
       <xref linkend="gdk-pixbuf"/>,
@@ -179,5 +179,5 @@
       be obtained only from a git repository. The command to download
       them is:
-<command>git clone --depth 1 git://git.freedesktop.org/git/poppler/test testfiles</command>.
+<command>git clone git://git.freedesktop.org/git/poppler/test testfiles</command>.
       Then issue: <command>LC_ALL=en_US.UTF-8 make test</command>. 
     </para>
@@ -239,6 +239,6 @@
     <para>
       <parameter>-DENABLE_UNSTABLE_API_ABI_HEADERS=ON</parameter>: Installs some old
-      <application>Xpdf</application> headers required by certain programs.
-      <!--(e.g. <application>Inkscape</application>).-->
+      <application>Xpdf</application> headers required by certain programs (e.g.
+      <application>Inkscape</application>).
     </para>
 
@@ -254,10 +254,4 @@
       GTK-Doc and Pygments is installed and you wish to rebuild and install 
       the API documentation.
-    </para>
-
-    <para>
-      <option>-DENABLE_BOOST=OFF</option>: Use this parameter if you have
-      not installed <application>boost</application> (the Splash backend for
-      Qt5 recommends boost).
     </para>
 
@@ -307,5 +301,5 @@
         <listitem>
           <para>
-            adds a new embedded file to an existing PDF file
+            adds a new embedded file to an existing PDF file.
           </para>
           <indexterm zone="poppler pdfattach">
@@ -319,5 +313,5 @@
         <listitem>
           <para>
-            lists or extracts embedded files from PDF files
+            lists or extracts embedded files from PDF files.
           </para>
           <indexterm zone="poppler pdfdetach">
@@ -332,5 +326,5 @@
           <para>
             lists the fonts used in a PDF file along with various information
-            for each font
+            for each font.
           </para>
           <indexterm zone="poppler pdffonts">
@@ -344,5 +338,5 @@
         <listitem>
           <para>
-            saves images from a PDF file as PPM, PBM, or JPEG files
+            saves images from a PDF file as PPM, PBM, or JPEG files.
           </para>
           <indexterm zone="poppler pdfimages">
@@ -357,5 +351,5 @@
           <para>
             prints the contents of the 'Info' dictionary (plus some other useful
-            information) from a PDF file
+            information) from a PDF file.
           </para>
           <indexterm zone="poppler pdfinfo">
@@ -369,5 +363,5 @@
         <listitem>
           <para>
-            extracts single pages from a PDF file
+            extracts single pages from a PDF file.
           </para>
           <indexterm zone="poppler pdfseparate">
@@ -381,5 +375,5 @@
         <listitem>
           <para>
-            verifies the digital signatures in a PDF document
+            verifies the digital signatures in a PDF document.
           </para>
           <indexterm zone="poppler pdfsig">
@@ -394,5 +388,5 @@
           <para>
             converts a PDF file to one of several formats (PNG, JPEG, PDF, PS,
-            EPS, SVG) using the cairo output device of the poppler library
+            EPS, SVG) using the cairo output device of the poppler library.
           </para>
           <indexterm zone="poppler pdftocairo">
@@ -406,5 +400,5 @@
         <listitem>
           <para>
-            converts a PDF file to HTML
+            converts a PDF file to HTML.
           </para>
           <indexterm zone="poppler pdftohtml">
@@ -418,5 +412,5 @@
         <listitem>
           <para>
-            converts PDF files to PBM, PGM and PPM formats
+            converts PDF files to PBM, PGM and PPM formats.
           </para>
           <indexterm zone="poppler pdftoppm">
@@ -430,5 +424,5 @@
         <listitem>
           <para>
-            converts PDF files to Postscript format
+            converts PDF files to Postscript format.
           </para>
           <indexterm zone="poppler pdftops">
@@ -442,5 +436,5 @@
         <listitem>
           <para>
-            converts PDF files to plain text
+            converts PDF files to plain text.
           </para>
           <indexterm zone="poppler pdftotext">
@@ -455,5 +449,5 @@
           <para>
             merges several PDF files, in the order of their occurrence on the
-            command line, to one PDF output file
+            command line, to one PDF output file.
           </para>
           <indexterm zone="poppler pdfunite">
@@ -467,5 +461,5 @@
         <listitem>
           <para>
-            contains the API functions to render PDF files
+            contains the API functions to render PDF files.
           </para>
           <indexterm zone="poppler libpoppler">
@@ -479,5 +473,5 @@
         <listitem>
           <para>
-            is a C++ backend for rendering PDF files
+            is a C++ backend for rendering PDF files.
           </para>
           <indexterm zone="poppler libpoppler-cpp">
@@ -492,5 +486,5 @@
           <para>
             is a wrapper library used to interface the PDF rendering functions
-            with <application>GTK+</application>
+            with <application>GTK+</application>.
           </para>
           <indexterm zone="poppler libpoppler-glib">
@@ -505,5 +499,5 @@
           <para>
             is a wrapper library used to interface the PDF rendering functions
-            with <application>Qt</application>5
+            with <application>Qt</application>5.
           </para>
           <indexterm zone="poppler libpoppler-qt5">
Index: general/graphlib/potrace.xml
===================================================================
--- general/graphlib/potrace.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/potrace.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -163,5 +164,5 @@
         <listitem>
           <para>
-            transforms images into bitmaps with scaling and filtering
+            transforms images into bitmaps with scaling and filtering.
           </para>
           <indexterm zone="potrace mkbitmap">
@@ -175,5 +176,5 @@
         <listitem>
           <para>
-            transforms bitmaps into vector graphics
+            transforms bitmaps into vector graphics.
           </para>
           <indexterm zone="potrace potrace-prog">
Index: general/graphlib/qpdf.xml
===================================================================
--- general/graphlib/qpdf.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/qpdf.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY qpdf-download-http "https://github.com/qpdf/qpdf/releases/download/release-qpdf-&qpdf-version;/qpdf-&qpdf-version;.tar.gz">
   <!ENTITY qpdf-download-ftp  " ">
-  <!ENTITY qpdf-md5sum        "29aaaf03e0f83b3527d1470f8391c876">
+  <!ENTITY qpdf-md5sum        "b4c6a66c45bb946944c2fe14ef02d0e0">
   <!ENTITY qpdf-size          "18 MB">
-  <!ENTITY qpdf-buildsize     "271 MB (add 50 MB for tests)">
-  <!ENTITY qpdf-time          "0.5 SBU (using parallelism=4; add 2.0 SBU for tests)">
+  <!ENTITY qpdf-buildsize     "224 MB (add 42 MB for tests)">
+  <!ENTITY qpdf-time          "0.3 SBU (using parallelism=4; add 1.6 SBU for tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -105,6 +106,6 @@
     <para>
       To test the results, issue: <command>make check</command>.
-      <!--Three tests are known to fail due to minor differences in 
-      expected output.-->
+      Three tests are known to fail due to minor differences in 
+      expected output.
     </para>
 
@@ -157,5 +158,5 @@
           <para>
             is used to repair PDF files in QDF form after
-            editing
+            editing.
           </para>
           <indexterm zone="qpdf fix-qdf">
@@ -170,5 +171,5 @@
           <para>
             is used to convert one PDF file to another equivalent
-            PDF file
+            PDF file.
           </para>
           <indexterm zone="qpdf qpdf-prog">
@@ -182,5 +183,5 @@
         <listitem>
           <para>
-            is a raw zlib compression program
+            is a raw zlib compression program.
           </para>
           <indexterm zone="qpdf zlib-flate">
@@ -194,5 +195,5 @@
         <listitem>
           <para>
-            contains the <application>Qpdf</application> API functions
+            contains the <application>Qpdf</application> API functions.
           </para>
           <indexterm zone="qpdf libqpdf">
Index: general/graphlib/qrencode.xml
===================================================================
--- general/graphlib/qrencode.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/qrencode.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -178,5 +179,5 @@
         <listitem>
           <para>
-            encodes input data in a QR Code and saves it as a PNG or EPS image
+            encodes input data in a QR Code and saves it as a PNG or EPS image.
           </para>
           <indexterm zone="qrencode qrencode-prog">
@@ -190,5 +191,5 @@
         <listitem>
           <para>
-            contains functions for encoding data in a QR code symbol
+            contains functions for encoding data in a QR code symbol.
           </para>
           <indexterm zone="qrencode libqrencode">
@@ -199,4 +200,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/graphlib/sassc.xml
===================================================================
--- general/graphlib/sassc.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/sassc.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,16 +8,16 @@
            "https://github.com/sass/sassc/archive/&sassc-version;/sassc-&sassc-version;.tar.gz">
   <!ENTITY sassc-download-ftp  " ">
-  <!ENTITY sassc-md5sum        "4c3b06ce2979f2a9f0a35093e501d8bb">
+  <!ENTITY sassc-md5sum        "dd675920c7151e50e2d2ac14f0fb222a">
   <!ENTITY sassc-size          "28 KB">
-  <!ENTITY sassc-buildsize     "5.1 MB">
-  <!ENTITY sassc-time          "less than 0.1 SBU">
+  <!ENTITY sassc-buildsize     "4.4 MB">
+  <!ENTITY sassc-time          "0.1 SBU">
 
   <!ENTITY libsass-download-http
            "https://github.com/sass/libsass/archive/&libsass-version;/libsass-&libsass-version;.tar.gz">
   <!ENTITY libsass-download-ftp  " ">
-  <!ENTITY libsass-md5sum        "c49765b9b3824dcd4a7423225ca28bad">
-  <!ENTITY libsass-size          "336 KB">
-  <!ENTITY libsass-buildsize     "139 MB">
-  <!ENTITY libsass-time          "0.4 SBU (Using parallelism=4)">
+  <!ENTITY libsass-md5sum        "602f7ff300f41f9d456c60a67270e3e0">
+  <!ENTITY libsass-size          "332 KB">
+  <!ENTITY libsass-buildsize     "210 MB">
+  <!ENTITY libsass-time          "0.5 SBU (Using parallelism=4)">
 ]>
 
@@ -26,4 +26,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -42,5 +43,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -194,5 +195,5 @@
         <listitem>
           <para>
-            provides a command line interface to the libsass library
+            provides a command line interface to the libsass library.
           </para>
           <indexterm zone="sassc sassc-prog">
Index: general/graphlib/woff2.xml
===================================================================
--- general/graphlib/woff2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/graphlib/woff2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -154,5 +155,5 @@
         <listitem>
           <para>
-            provides shared data used by the libwoff2dec and libwoff2enc libraries
+            provides shared data used by the libwoff2dec and libwoff2enc libraries.
           </para>
           <indexterm zone="woff2 libwoff2common">
@@ -166,5 +167,5 @@
         <listitem>
           <para>
-            is the WOFF2 decoder library
+            is the WOFF2 decoder library.
           </para>
           <indexterm zone="woff2 libwoff2dec">
@@ -178,5 +179,5 @@
         <listitem>
           <para>
-            is the WOFF2 encoder library
+            is the WOFF2 encoder library.
           </para>
           <indexterm zone="woff2 libwoff2enc">
@@ -188,4 +189,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/prog/apache-ant.xml
===================================================================
--- general/prog/apache-ant.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/apache-ant.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,5 +7,5 @@
   <!ENTITY apache-ant-download-http "https://archive.apache.org/dist/ant/source/apache-ant-&apache-ant-version;-src.tar.xz">
   <!ENTITY apache-ant-download-ftp  " ">
-  <!ENTITY apache-ant-md5sum        "f93d15af0d2d799d9055e9e006071dde">
+  <!ENTITY apache-ant-md5sum        "700443388a718591dc1e031e52e9be3b">
   <!ENTITY apache-ant-size          "4.3 MB">
   <!ENTITY apache-ant-buildsize     "142 MB">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -42,5 +43,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -127,5 +128,4 @@
     <title>Installation of Apache Ant</title>
 
-<!-- Not needed with 1.10.10
     <para>
       First fix an incompatibility issue between the documentation standard
@@ -134,6 +134,5 @@
     </para>
 
-<screen><userinput>sed -i 's/- -add-modules java.activation/-html4/' build.xml</userinput></screen>
--->
+<screen><userinput>sed -i 's/--add-modules java.activation/-html4/' build.xml</userinput></screen>
 
     <para>
@@ -173,6 +172,6 @@
     <para>
       <command>bootstrap/bin/ant -f fetch.xml -Ddest=optional</command>:
-      Downloads the missing dependencies to the user's home directory, and
-      copies them into the source tree (in the <filename>lib/optional</filename>
+      Downloads the missing dependencies to user's home directory, and copy
+      them into the source tree (in the <filename>lib/optional</filename>
       directory, where <command>ant</command> picks them up at build time).
     </para>
@@ -270,5 +269,5 @@
             is a <application>Java</application> based build tool used by
             many packages instead of the conventional <command>make</command>
-            program
+            program.
           </para>
           <indexterm zone="apache-ant ant">
@@ -283,5 +282,5 @@
           <para>
             is a support script used to start <command>ant</command>
-            build scripts in a given directory
+            build scripts in a given directory.
           </para>
           <indexterm zone="apache-ant antRun">
@@ -296,5 +295,5 @@
           <para>
             is a <application>Perl</application> script that provides similar
-            functionality offered by the <command>antRun</command> script
+            functionality offered by the <command>antRun</command> script.
           </para>
           <indexterm zone="apache-ant antRun.pl">
@@ -310,5 +309,5 @@
             is a <application>Perl</application> script that allows
             <application>Bash</application> to complete an
-            <command>ant</command> command-line
+            <command>ant</command> command-line.
           </para>
           <indexterm zone="apache-ant complete-ant-cmd.pl">
@@ -323,5 +322,5 @@
           <para>
             is a <application>Perl</application> wrapper script used to
-            invoke <command>ant</command>
+            invoke <command>ant</command>.
           </para>
           <indexterm zone="apache-ant runant.pl">
@@ -336,5 +335,5 @@
           <para>
             is a <application>Python</application> wrapper script used to
-            invoke <command>ant</command>
+            invoke <command>ant</command>.
           </para>
           <indexterm zone="apache-ant runant.py">
@@ -345,9 +344,9 @@
 
       <varlistentry id="ant-star">
-        <term><filename class="libraryfile">ant*.jar</filename></term>
+        <term><filename class='libraryfile'>ant*.jar</filename></term>
         <listitem>
           <para>
             files are the <application>Apache Ant</application>
-            <application>Java</application> class libraries
+            <application>Java</application> class libraries.
           </para>
           <indexterm zone="apache-ant ant-star">
Index: general/prog/autoconf213.xml
===================================================================
--- general/prog/autoconf213.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/autoconf213.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -191,5 +192,5 @@
           <para>
             Produces shell scripts that automatically configure software source
-            code packages to adapt to many kinds of Unix-like systems
+            code packages to adapt to many kinds of Unix-like systems.
           </para>
           <indexterm zone="autoconf213 autoconf2.13">
@@ -221,5 +222,5 @@
            <command>libtoolize</command> in the right order when changes
            have been made to <command>autoconf</command> or
-           <command>automake</command> template files
+           <command>automake</command> template files.
           </para>
           <indexterm zone="autoconf213 autoreconf2.13">
@@ -234,5 +235,5 @@
           <para>
             Can be used as a preliminary step in creating a
-            <filename>configure.in</filename> file
+            <filename>configure.in</filename> file.
           </para>
           <indexterm zone="autoconf213 autoscan2.13">
@@ -248,5 +249,5 @@
             Modifies a <filename>configure.in</filename> file that still
             calls <command>autoconf</command> macros by their old names
-            to use the current macro names
+            to use the current macro names.
           </para>
           <indexterm zone="autoconf213 autoupdate2.13">
@@ -264,5 +265,5 @@
             portability, this program can help determine what configure needs to
             check for. It can also fill in gaps in a configure.in file generated
-            by autoscan]
+            by autoscan.]
           </para>
           <indexterm zone="autoconf213 ifnames2.13">
Index: general/prog/cbindgen.xml
===================================================================
--- general/prog/cbindgen.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/cbindgen.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY cbindgen-download-http "https://github.com/eqrion/cbindgen/archive/v&cbindgen-version;/cbindgen-&cbindgen-version;.tar.gz">
   <!ENTITY cbindgen-download-ftp  " ">
-  <!ENTITY cbindgen-md5sum        "19e6e9bc319f689ef433eb59090e3f3c">
-  <!ENTITY cbindgen-size          "192 KB">
-  <!ENTITY cbindgen-buildsize     "124 MB (add 568 MB for tests)">
-  <!ENTITY cbindgen-time          "0.8 SBU (add 0.4 SBU for tests), both on a 4-core machine">
+  <!ENTITY cbindgen-md5sum        "396f97c1d79ee5307611e7d586b4b011">
+  <!ENTITY cbindgen-size          "188 KB">
+  <!ENTITY cbindgen-buildsize     "122 MB (add 446 MB for tests)">
+  <!ENTITY cbindgen-time          "0.8 SBU (add 0.5 SBU for tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -101,8 +102,6 @@
 
     <para>
-      <!-- 0.16.0 log shows 2 suites where both tests pass, in the third
-           3 of 6 fail. The suite names are impenetrable. -->
       To test the results, issue: <command>cargo test</command>.
-      Three tests in the final suite are known to fail.
+      Six tests, test_expand*, are known to fail.
     </para>
 
@@ -145,5 +144,5 @@
         <listitem>
           <para>
-            generates C bindings for <application>Rust</application> code
+            generates C bindings for <application>Rust</application> code.
           </para>
           <indexterm zone="cbindgen cbindgen-prog">
Index: general/prog/clisp.xml
===================================================================
--- general/prog/clisp.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/clisp.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -89,5 +90,4 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libnsl"/> and
       <ulink url="https://www.gnu.org/software/libffcall/">libffcall</ulink>
     </para>
@@ -113,5 +113,5 @@
 
 <screen><userinput remap="pre">case $(uname -m) in
-    i?86) export CFLAGS="${CFLAGS:--O2 -g} -falign-functions=4" ;;
+    i?86) export CFLAGS+=-falign-functions=4 ;;
 esac</userinput></screen>
 
Index: general/prog/cmake.xml
===================================================================
--- general/prog/cmake.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/cmake.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY cmake-download-http "https://cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz">
   <!ENTITY cmake-download-ftp  " ">
-  <!ENTITY cmake-md5sum        "2ecc4091021c44f400bfbb25dcc77e97">
-  <!ENTITY cmake-size          "9.2 MB">
-  <!ENTITY cmake-buildsize     "319 MB (add 881 MB for tests)">
-  <!ENTITY cmake-time          "2.0 SBU (add 3.2 SBU for tests, both using parallelism=4)">
+  <!ENTITY cmake-md5sum        "043d47c9a37755f3da1e8c1123e1a2dd">
+  <!ENTITY cmake-size          "8.8 MB">
+  <!ENTITY cmake-buildsize     "352 MB (add 699 MB for tests)">
+  <!ENTITY cmake-time          "1.7 SBU (add 3.1 SBU for tests, both using parallelism=4)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -102,5 +103,4 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gcc"/> (for gfortran),
       <xref linkend="git"/> (for use during tests),
       <xref linkend="mercurial"/> (for use during tests),
@@ -143,15 +143,14 @@
 
     <para>
-      To test the results, issue: <command>LC_ALL=en_US.UTF-8 bin/ctest
+      To test the results, issue: <command>bin/ctest
       -j<replaceable>&lt;N&gt;</replaceable> -O
       cmake-&cmake-version;-test.log</command>, where
       <replaceable>&lt;N&gt;</replaceable> is an integer between 1 and the
-      number of system cores. Setting <envar>LC_ALL</envar> is needed to
-      prevent some test failures when some of the locale variables are
-      set to non English locales. One test, RunCMake.CMP0125. is known to fail.
-    </para>
-
-    <para> 
-      If you want to investigate a problem with a given "problem1-test",
+      number of system cores. In case the environment variable 
+      <literal>LANG</literal> is set to a non-blank value and failures 
+      occur, try running the tests without having <literal>LANG</literal> set.
+
+     <!-- Please, don't remove this comment, needed if tests start to fail
+      again. If you want to investigate a problem with a given "problem1-test",
       use <command>bin/ctest -R "problem1-test"</command> and, to omit it, use
       <command>bin/ctest -E "problem1-test"</command>. These options can be
@@ -160,5 +159,5 @@
       available tests, and you can run <command>bin/ctest</command> for a
       sub-set of tests by using separated by spaces names or numbers as
-      options. Option -/-help can be used to show all options.
+      options. Option -/-help can be used to show all options.-->
     </para>
 
@@ -248,5 +247,5 @@
           <para>
             is a curses based interactive frontend to
-            <command>cmake</command>
+            <command>cmake</command>.
           </para>
           <indexterm zone="cmake ccmake">
@@ -260,5 +259,5 @@
         <listitem>
           <para>
-            is the makefile generator
+            is the makefile generator.
           </para>
           <indexterm zone="cmake cmake-prog">
@@ -273,5 +272,5 @@
           <para>
             (optional) is the <application>Qt</application>-based frontend to
-            <command>cmake</command>
+            <command>cmake</command>.
           </para>
           <indexterm zone="cmake cmake-gui">
@@ -285,5 +284,5 @@
         <listitem>
           <para>
-            is the <application>CMake</application> packaging program
+            is the <application>CMake</application> packaging program.
           </para>
           <indexterm zone="cmake cpack">
@@ -297,5 +296,5 @@
         <listitem>
           <para>
-            is a testing utility for cmake-generated build trees
+            is a testing utility for cmake-generated build trees.
           </para>
           <indexterm zone="cmake ctest">
Index: general/prog/dbus-python.xml
===================================================================
--- general/prog/dbus-python.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/dbus-python.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY dbus-python-download-http "https://dbus.freedesktop.org/releases/dbus-python/dbus-python-&dbus-python-version;.tar.gz">
   <!ENTITY dbus-python-download-ftp  " ">
-  <!ENTITY dbus-python-md5sum        "468874f3bf61d1b7deac98bbe2cfd8ac">
-  <!ENTITY dbus-python-size          "568 KB">
-  <!ENTITY dbus-python-buildsize     "10 MB (both versions, with tests)">
-  <!ENTITY dbus-python-time          "0.3 SBU (both versions, with tests)">
+  <!ENTITY dbus-python-md5sum        "51a45c973d82bedff033a4b57d69d5d8">
+  <!ENTITY dbus-python-size          "564 KB">
+  <!ENTITY dbus-python-buildsize     "11 MB (both versions, with tests)">
+  <!ENTITY dbus-python-time          "0.4 SBU (both versions, with tests)">
 ]>
 
@@ -30,5 +30,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -190,2 +190,3 @@
 
   </sect2>
+  <!-- End D-Bus Python -->
Index: general/prog/decorator.xml
===================================================================
--- general/prog/decorator.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/decorator.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY decorator-download-http "https://files.pythonhosted.org/packages/source/d/decorator/decorator-&decorator-version;.tar.gz">
   <!ENTITY decorator-download-ftp  " ">
-  <!ENTITY decorator-md5sum        "a90526e45e7a30cf2710d6467f403e03">
+  <!ENTITY decorator-md5sum        "d83c624cce93e6bdfab144821b526e1d">
   <!ENTITY decorator-size          "36 KB">
-  <!ENTITY decorator-buildsize     "232 KB">
+  <!ENTITY decorator-buildsize     "244 KB">
   <!ENTITY decorator-time          "less than 0.1 SBU">
 ]>
@@ -30,5 +30,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -107,8 +107,8 @@
           </seg>
           <seg>
-            /usr/lib/python&python3-majorver;/site-packages/decorator-&decorator-version;-py&python3-majorver;.egg-info
+            /usr/lib/python&python3-majorver;/site-packages/decorator/decorator-&decorator-version;-py&python3-majorver;.egg-info
           </seg>
           <seg>
-            None
+            /usr/lib/python&python3-majorver;/site-packages/decorator
           </seg>
         </seglistitem>
@@ -118,2 +118,3 @@
 
   </sect2>
+  <!-- End decorator -->
Index: general/prog/docutils.xml
===================================================================
--- general/prog/docutils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/docutils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,8 +5,8 @@
   %general-entities;
 
-  <!ENTITY docutils-download-http "https://downloads.sourceforge.net/docutils/docutils-&docutils-version;.tar.gz">
+  <!ENTITY docutils-download-http "http://downloads.sourceforge.net/docutils/docutils-&docutils-version;.tar.gz">
   <!ENTITY docutils-download-ftp  " ">
-  <!ENTITY docutils-md5sum        "ed810564c25063e9dac10dd0893ead47">
-  <!ENTITY docutils-size          "1.9 MB">
+  <!ENTITY docutils-md5sum        "9ccb6f332e23360f964de72c8ea5f0ed">
+  <!ENTITY docutils-size          "1.8 MB">
   <!ENTITY docutils-buildsize     "12 MB">
   <!ENTITY docutils-time          "less than 0.1 SBU">
@@ -31,5 +31,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -131,2 +131,3 @@
 
   </sect2>
+  <!--End docutils -->
Index: general/prog/doxygen.xml
===================================================================
--- general/prog/doxygen.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/doxygen.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY doxygen-download-http "https://doxygen.nl/files/doxygen-&doxygen-version;.src.tar.gz">
+  <!ENTITY doxygen-download-http "http://doxygen.nl/files/doxygen-&doxygen-version;.src.tar.gz">
   <!ENTITY doxygen-download-ftp  " ">
-  <!ENTITY doxygen-md5sum        "84c0522bb65d17f9127896268b72ea2a">
-  <!ENTITY doxygen-size          "4.8 MB">
-  <!ENTITY doxygen-buildsize     "165 MB (with tests)">
-  <!ENTITY doxygen-time          "1.2 SBU (using parallelism=4; with tests)">
+  <!ENTITY doxygen-md5sum        "aae07b29b31da5ce1e6e01a57a6e4f10">
+  <!ENTITY doxygen-size          "4.9 MB">
+  <!ENTITY doxygen-buildsize     "158 MB (with tests)">
+  <!ENTITY doxygen-time          "1.0 SBU (using parallelism=4; with tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -50,5 +51,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -113,7 +114,6 @@
       <xref linkend="python2"/>,
       <xref linkend="qt5"/> (for doxywizard),
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>),
-      <xref linkend="xapian"/> (for doxyindexer), and
-      <ulink url="https://javacc.github.io/javacc/">javacc</ulink>
+      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>), and
+      <xref linkend="xapian"/> (for doxyindexer)
     </para>
 
@@ -143,5 +143,4 @@
     <para>
       To test the results, issue: <command>make tests</command>.
-      One test, 012_cite.dox, is known to fail.
     </para>
 
@@ -251,5 +250,5 @@
             configuration files and then generate documentation from these
             templates. Use <command>doxygen --help</command> for an
-            explanation of the command-line parameters
+            explanation of the command-line parameters.
           </para>
           <indexterm zone="doxygen doxygen-prog">
@@ -264,5 +263,5 @@
           <para>
             is a GUI front-end for configuring and
-            running <command>doxygen</command>
+            running <command>doxygen</command>.
           </para>
           <indexterm zone="doxygen doxywizard">
@@ -278,6 +277,6 @@
             generates a search index called <filename>doxysearch.db</filename>
             from one or more search data files produced by
-            <command>doxygen</command>. See, e.g.
-            <ulink url="https://javacc.github.io/javacc/"/>
+            <command>doxygen</command>. See, e.g. <ulink
+            url="http://www.stack.nl/~dimitri/doxygen/manual/extsearch.html"/>.
           </para>
           <indexterm zone="doxygen doxyindexer">
@@ -292,5 +291,5 @@
           <para>
             is a CGI program to search the data indexed by
-            <command>doxyindexer</command>
+            <command>doxyindexer</command>.
           </para>
           <indexterm zone="doxygen doxysearch.cgi">
Index: general/prog/dummy-java.xml
===================================================================
--- general/prog/dummy-java.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/dummy-java.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,4 +6,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: general/prog/gc.xml
===================================================================
--- general/prog/gc.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/gc.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -43,5 +44,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -79,6 +80,6 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
       <xref linkend="libatomic_ops"/>
     </para>
@@ -180,5 +181,5 @@
           <para>
             contains a C interface to the conservative garbage collector,
-            primarily designed to replace the C malloc function
+            primarily designed to replace the C malloc function.
           </para>
           <indexterm zone="gc libgc">
@@ -192,5 +193,5 @@
         <listitem>
           <para>
-            contains a C++ interface to the conservative garbage collector
+            contains a C++ interface to the conservative garbage collector.
           </para>
           <indexterm zone="gc libgccpp">
Index: general/prog/gcc.xml
===================================================================
--- general/prog/gcc.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/gcc.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,10 +7,8 @@
   <!ENTITY gcc-download-http  "&gnu-http;/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.xz">
   <!ENTITY gcc-download-ftp   "&gnu-ftp;/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.xz">
-  <!ENTITY gcc-md5sum         "31c86f2ced76acac66992eeedce2fce2">
-  <!ENTITY gcc-size           "77 MB">
-  <!ENTITY gcc-buildsize      "8.0 GB (2.4 GB installed with all listed languages; add 1.0 GB for tests)">
-  <!-- For me the SBU values are a bit faster on haswell, but much slower on ryzen 3400G,
-       so keeping these existing values as an approximation - ken -->
-  <!ENTITY gcc-time           "26 SBU (add 56 SBU for tests; both with parallelism=4)">
+  <!ENTITY gcc-md5sum         "e9fd9b1789155ad09bcf3ae747596b50">
+  <!ENTITY gcc-size           "72 MB">
+  <!ENTITY gcc-buildsize      "8.3 GB (2.8 GB installed with all listed languages; add 1.1 GB for tests)">
+  <!ENTITY gcc-time           "24 SBU (with parallelism=4, add 51 SBU for tests with parallelism=4)">
 ]>
 
@@ -19,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -43,5 +42,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <caution>
@@ -113,4 +112,15 @@
     </itemizedlist>
 
+<!--    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/gcc-&gcc-version;-upstream_fixes-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+-->
+
     <bridgehead renderas="sect3">GCC Dependencies</bridgehead>
 <!--
@@ -142,9 +152,8 @@
         installation process will overwrite your existing
         <application>GCC</application> C and C++ compilers and libraries.
-        <!--Having the <application>Tcl</application>,
+        Having the <application>Tcl</application>,
         <application>Expect</application> and <application>DejaGnu</application>
         packages installed before beginning the build is highly recommended so
-        you can run the full suite of tests.-->
-        Running the full suite of tests is recommended.
+        you can run the full suite of tests.
       </para>
 
@@ -169,12 +178,4 @@
 
     <para>
-      As in LFS fix an issue breaking libasan.a identified upstream:
-    </para>
-
-<screen><userinput>sed -e '/static.*SIGSTKSZ/d' \
-    -e 's/return kAltStackSize/return SIGSTKSZ * 4/' \
-    -i libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cpp</userinput></screen>
-
-    <para>
       Install <application>GCC</application> by running the following commands:
     </para>
@@ -201,9 +202,9 @@
       the <application>GCC</application> part of the testsuite will run more
       tests than in LFS. Some of those will report FAIL and others XPASS
-      (pass when expected to FAIL). As of gcc-11.1.0, about 90 FAIL occur
+      (pass when expected to FAIL). As of gcc-10.2.0, about 90 FAIL occur
       in the <quote>guality</quote> suite, as well as miscellaneous failures
       throughout the rest of the test suite. If all the compilers above are
-      built, there will be  around 102 unexpected failures out of over
-      481,000 tests. To run the tests, issue:
+      built, there will be  around 120 unexpected failures out of over
+      468,000 tests. To run the tests, issue:
     </para>
 
@@ -220,7 +221,4 @@
 
 <screen><userinput>../contrib/test_summary</userinput></screen>
-
-    <para>A few tests, less than 20 out of about 450,000, will fail, but unless
-    the failures are excessive, they can be ignored.</para>
 
     <para>
@@ -279,6 +277,6 @@
       <parameter>--enable-languages=c,c++,d,fortran,go,objc,obj-c++</parameter>:
       This command identifies which languages to build. You may modify
-      this command to remove undesired languages. Three other languages can be
-      added, including ADA, BRIG (add
+      this command to remove undesired languages. Two other languages can be
+      added, besides ADA (see introduction above): BRIG (add
       <parameter>brig</parameter> to the list of enabled languages), a binary
       format for HSAIL (Heterogeneous System Architecture Intermediate
@@ -381,5 +379,5 @@
           <para>
             is a GCC-based compiler for the <application>Go</application>
-            language
+            language.
           </para>
           <indexterm zone="gcc gccgo">
@@ -393,5 +391,5 @@
         <listitem>
           <para>
-            is a tool for managing <application>Go</application> source code
+            is a tool for managing <application>Go</application> source code.
           </para>
           <indexterm zone="gcc go">
@@ -405,5 +403,5 @@
         <listitem>
           <para>
-            is a tool for formatting <application>Go</application> source code
+            is a tool for formatting <application>Go</application> source code.
           </para>
           <indexterm zone="gcc gofmt">
@@ -418,5 +416,5 @@
           <para>
             is a GCC-based compiler for the <application>D</application>
-            language
+            language.
           </para>
           <indexterm zone="gcc gdc">
@@ -431,5 +429,5 @@
           <para>
             is a GCC-based compiler for the <application>Fortran</application>
-            language
+            language.
           </para>
           <indexterm zone="gcc gfortran">
Index: general/prog/gdb.xml
===================================================================
--- general/prog/gdb.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/gdb.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,5 +7,5 @@
   <!ENTITY gdb-download-http "&gnu-http;/gdb/gdb-&gdb-version;.tar.xz">
   <!ENTITY gdb-download-ftp  "&gnu-ftp;/gdb/gdb-&gdb-version;.tar.xz">
-  <!ENTITY gdb-md5sum        "c044b7146903ec51c9d2337a29aee93b">
+  <!ENTITY gdb-md5sum        "1822a7dd45e7813f4408407eec1a6af1">
   <!ENTITY gdb-size          "21 MB">
   <!ENTITY gdb-buildsize     "761 MB (add 750 MB for docs; add 633 MB for tests)">
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -193,11 +194,4 @@
           A test run of the test suite had 230 unexpected failures 
           (out of over 70000 tests). 
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          On some systems, the gdb.tui test suite will fail if running over
-          SSH.
         </para>
       </listitem>
@@ -284,5 +278,5 @@
         <listitem>
           <para>
-            generates a core dump of a running program
+            generates a core dump of a running program.
           </para>
           <indexterm zone="gdb gcore">
@@ -296,5 +290,5 @@
         <listitem>
           <para>
-            is the GNU Debugger
+            is the GNU Debugger.
           </para>
           <indexterm zone="gdb gdb-prog">
@@ -309,5 +303,5 @@
           <para>
             is a remote server for the GNU debugger (it allows programs
-            to be debugged from a different machine)
+            to be debugged from a different machine).
           </para>
           <indexterm zone="gdb gdbserver">
Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/git.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -9,14 +9,13 @@
   <!ENTITY git-download-http "&git-root;/git-&git-version;.tar.xz">
   <!ENTITY git-download-ftp  " ">
-  <!ENTITY git-md5sum        "0990ff97af1511be0d9f0d3223dd4359">
-
-  <!ENTITY git-size          "6.2 MB">
+  <!ENTITY git-md5sum        "2457ee7e198bb949fecb0af94f7361a3">
+  <!ENTITY git-size          "6.0 MB">
   <!-- using gcc-8.1 the build and install are much bigger than with gcc-7.3 -->
   <!-- but people keep forgetting that an install not only needs the nett build
        space, it also needs the install space (or DESTDIR) -->
-  <!ENTITY git-buildsize     "332 MB (with downloaded documentation, add 16 MB to build documentation)">
+  <!ENTITY git-buildsize     "365 MB (with downloaded documentation, 135 MB installed)">
   <!-- With 2.23.0, there was a large increase in time for tests. Possibly disk related? -->
   <!-- Confirmed that it is disk related.-->
-  <!ENTITY git-time          "0.4 SBU (with parallelism=4; add 0.4 SBU for building documentation and 2.1 SBU for tests, both with parallelism=4)">
+  <!ENTITY git-time          "0.3 SBU (with parallelism=4; add 4.1 SBU for tests with parallelism=4)">
 ]>
 
@@ -25,4 +24,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -52,5 +52,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -118,21 +118,13 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref role="runtime" linkend="gnupg2"/> (runtime, may be used to sign
-      <application>Git</application> commits or tags, or verify the signatures
-      of them),
-      <xref role="runtime" linkend="openssh"/> (runtime, needed to use
-      <application>Git</application> over ssh),
       <xref linkend="pcre2"/> (<emphasis>or</emphasis> the deprecated <xref
       role="nodep" linkend="pcre"/>), in either case configured with
       <literal>--enable-jit</literal>,
-      <xref role="runtime" linkend="subversion"/> with Perl bindings
-         (runtime, for <command>git svn</command>),
+      <xref linkend="subversion"/> with Perl bindings (for <command>git
+         svn</command>),
       <xref role="runtime" linkend="tk"/>
       (gitk, a simple <application>Git</application>
-      repository viewer, uses <application>Tk</application> at runtime),
-      <xref linkend="valgrind"/>,
-      <ulink url="https://metacpan.org/pod/Authen::SASL">Authen::SASL</ulink> and
-      <ulink url="https://metacpan.org/pod/MIME::Base64">MIME::Base64</ulink>
-      (both runtime, for <command>git send-email</command>)
+      repository viewer, uses <application>Tk</application> at runtime), and
+      <xref linkend="valgrind"/>
     </para>
 
@@ -141,7 +133,6 @@
     <para role="optional">
       <xref linkend="xmlto"/> and
-      <xref linkend="asciidoc"/>
-      <!-- or xref linkend="asciidoctor", doesn't work now because it needs docbook-xsl-ns -->,
-      and also
+      <xref linkend="asciidoc"/> or
+      <ulink url="http://asciidoctor.org/">AsciiDoctor</ulink>, and also
       <ulink url="http://dblatex.sourceforge.net/">dblatex</ulink>
       (for the PDF version of the user manual), and
@@ -280,5 +271,5 @@
 
     <para>
-      <parameter>--with-python=python3</parameter>: Use this switch to use
+      <option>--with-python=python3</option>: Use this switch to use
       <application>Python 3</application>, instead of the EOL'ed
       <application>Python 2</application>. Python is used for the
@@ -379,5 +370,5 @@
         <listitem>
           <para>
-            is the stupid content tracker
+            is the stupid content tracker.
           </para>
           <indexterm zone="git git-prog">
@@ -391,5 +382,5 @@
         <listitem>
           <para>
-            is a CVS server emulator for <application>Git</application>
+            is a CVS server emulator for <application>Git</application>.
           </para>
           <indexterm zone="git git-cvsserver">
@@ -404,5 +395,5 @@
           <para>
             is a graphical <application>Git</application> repository browser
-            (needs <xref linkend="tk"/>)
+            (needs <xref linkend="tk"/>).
           </para>
           <indexterm zone="git gitk">
@@ -417,5 +408,5 @@
           <para>
             is invoked by <command>git send-pack</command> and updates the
-            repository with the information fed from the remote end
+            repository with the information fed from the remote end.
           </para>
           <indexterm zone="git git-receive-pack">
@@ -430,5 +421,5 @@
           <para>
             is a login shell for SSH accounts to provide restricted Git
-            access
+            access.
           </para>
           <indexterm zone="git git-shell">
@@ -443,5 +434,5 @@
           <para>
             is invoked by <command>git archive --remote</command> and sends
-            a generated archive to the other end over the git protocol
+            a generated archive to the other end over the git protocol.
           </para>
           <indexterm zone="git git-upload-archive">
@@ -457,5 +448,5 @@
             is invoked by <command>git fetch-pack</command>, it discovers
             what objects the other side is missing, and sends them after
-            packing
+            packing.
           </para>
           <indexterm zone="git git-upload-pack">
Index: neral/prog/gitserver.xml
===================================================================
--- general/prog/gitserver.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,395 +1,0 @@
-<?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 gitgid "58">
-  <!ENTITY gituid "58">
-]>
-
-<sect1 id="gitserver" xreflabel="Running a Git Server">
-  <?dbhtml filename="gitserver.html"?>
-
-  <sect1info>
-  <date>$Date$</date>
-  </sect1info>
-
-  <title>Running a Git Server</title>
-
-  <sect2 role="package">
-    <title>Introduction</title>
-
-    <para>
-      This section will describe how to set up, administer and secure a
-      <application>git</application> server. <application>Git</application>
-      has many options available. For more detailed documentation see 
-      <ulink url="https://git-scm.com/book/en/v2"/>. 
-    </para>
-
-    <bridgehead renderas="sect3">Server Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="git"/> and
-      <xref linkend="openssh"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Setting up a Git Server</title>
-
-    <para>
-      The following instructions will install a
-      <application>git</application> server. It will be set
-      up to use <application>OpenSSH</application> as the secure
-      remote access method.
-    </para>
-
-    <para>
-      Configuration of the server consists of the following steps:
-    </para>
-
-    <sect3>
-      <title>1. Setup Users, Groups, and Permissions</title>
-
-      <para>
-        You will need to be user <systemitem class='username'>root</systemitem>
-        for the initial portion of configuration. Create the <systemitem
-        class="username">git</systemitem> user and group and set and unusable
-        password hash with the following commands:
-      </para>
-
-<screen role="root"><userinput>groupadd -g &gitgid; git &amp;&amp;
-useradd -c "git Owner" -d /home/git -m -g git -s /usr/bin/git-shell -u &gituid; git &amp;&amp;
-sed -i '/^git:/s/^git:[^:]:/git:NP:/' /etc/shadow</userinput></screen>
-
-      <para>
-        Putting in an unuable password hash (replacing the <literal>!</literal>
-        by <literal>NP</literal>) unlocks the account but it cannot be used
-        to login via password authentication. That is required by 
-        <application>sshd</application> to work properly.
-        Next, create some files and directories in the home directory of the git user
-        allowing access to the git repository using ssh keys.
-      </para>
-      
-<screen role="root"><userinput>install -o git -g git -dm0700 /home/git/.ssh &amp;&amp;
-install -o git -g git -m0600 /dev/null /home/git/.ssh/authorized_keys</userinput></screen>
-
-      <para>
-        For any developer who should have access to the repository
-        add his/her public ssh key to <filename>/home/git/.ssh/authorized_keys</filename>.
-        First, prepend some options to prevent users from using the
-        connection to git for port forwarding to other machines
-        the git server might reach.
-      </para>
-
-<screen role="nodump"><userinput>echo -n "no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty " >> /home/git/.ssh/authorized_keys &amp;&amp;
-cat &lt;user-ssh-key&gt; &gt;&gt; /home/git/.ssh/authorized_keys</userinput></screen>
-
-      <para>
-        It is also useful to set the default name of the initial branch 
-        of new repositories by modifying the git configuration. As the
-        <systemitem class='username'>root</systemitem> user, run:
-      </para>
-
-<screen role="nodump"><userinput>git config --system init.defaultBranch trunk</userinput></screen>
-
-      <para>
-        Finally add the <filename>/usr/bin/git-shell</filename> entry to
-        the <filename>/etc/shells</filename> configuration file. This shell
-        has been set in the <systemitem class='username'>git</systemitem>
-        user profile and is to make sure that only git related actions
-        can be executed:
-      </para>
-      
-<screen role="root"><userinput>echo "/usr/bin/git-shell" &gt;&gt; /etc/shells</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>2. Create a git repository</title>
-
-      <para>
-        The repository can be anywhere on the filesystem. It is
-        important that the git user has read/write access to that
-        location. We use <filename class="directory">/srv/git</filename>
-        as base directory. Create a new <application>git</application>
-        repository with the following commands (as the
-        <systemitem class="username">root</systemitem> user):
-      </para>
-
-      <note>
-        <para>
-          In all the instructions below, we use <emphasis>project1</emphasis>
-          as an example repository name.  You should name your repository 
-          as a short descriptive name for your specific project.
-        </para>
-      </note>
-
-<screen role="root"><userinput>install -o git -g git -m755 -d /srv/git/project1.git &amp;&amp;
-cd /srv/git/project1.git                             &amp;&amp;
-git init --bare                                      &amp;&amp;
-chown -R git:git .</userinput></screen>
-    
-    </sect3>
-
-    <sect3>
-      <title>3. Populate the repository from a client system</title>
-
-      <note>
-        <para>
-          All the instructions in this section and the next should
-          be done on a user system, not the server system.
-        </para>
-      </note>
-
-      <para>
-        Now that the repository is created, it can be used by the
-        developers to put some files into it. Once the ssh key of
-        the user is imported to git's <filename>authorized_keys</filename>
-        file, the user can interact with the repository.
-      </para>
-
-      <para>
-        A minimal configuration should be available on the developer's
-        system specifying its user name and the email address.
-        Create this minimal config file on client side:
-      </para>
-
-<screen role="nodump"><userinput>cat &gt; ~/.gitconfig &lt;&lt;EOF
-[user]
-	name = &lt;users-name&gt;
-	email = &lt;users-email-address&gt;
-EOF</userinput></screen>
-
-      <para>
-        On the developer's machine, setup some files to be pushed
-        to the repository as the initial content:
-      </para>
-
-      <note>
-        <para>
-          The <emphasis>gitserver</emphasis> term used below 
-          should be the host name (or ip address) of the git server. 
-        </para>
-      </note>
-
-<screen role="nodump"><userinput>mkdir myproject
-cd myproject
-git init --initial-branch=trunk
-git remote add origin git@gitserver:/srv/git/project1.git
-cat &gt;README &lt;&lt;EOF
-This is the README file
-EOF
-git add README
-git commit -m 'Initial creation of README'
-git push --set-upstream origin trunk</userinput></screen>
-
-      <para>The initial content is now pushed to the server and
-        is available for other users. On the current machine, the 
-        argument <literal>--set-upstream origin trunk</literal> is
-        now no longer required as the local repository is now
-        connected to the remote repository. Subsequent pushes
-        can be performed as
-      </para>
-
-<screen role="nodump"><userinput>git push</userinput></screen>
-      
-      <para>
-        Other developers can now clone the repository and do
-        modifications to the content (as long as their ssh keys
-        has been installed):
-      </para>
-
-<screen role="nodump"><userinput>git clone git@gitserver:/srv/git/project1.git
-cd project1
-vi README
-git commit -am 'Fix for README file'
-git push</userinput></screen>
-
-      <note>
-        <para>
-          This is a very basic server setup based on
-          <application>OpenSSH</application> access. All developers are using
-          the <systemitem class="username">git</systemitem> user to perform
-          actions on the repository and the changes users are commiting can be
-          distiguished as the local user name (see
-          <filename>~/.gitconfig</filename>) is recorded in the
-          changesets.
-        </para>
-      </note>
-
-      <para>
-        Access is restricted by the public keys added to git's
-        <filename>authorized_keys</filename> file and there is no
-        option for the public to export/clone the repository. To
-        enable this, continue with step 4 to set up the git server
-        for public read-only access.
-      </para>
-
-      <para>
-        In the URL used to clone the project, the absolute path (here 
-        <filename>/srv/git/project1.git</filename>) has to be specified
-        as the repository is not in git's home directory but in
-        <filename class="directory">/srv/git</filename>. To get rid of the
-        need to expose the structure of the server installation, a symlink
-        can be added in git's home directory for each project like this:
-      </para>
-<screen role="nodump"><userinput>ln -svf /srv/git/project1.git /home/git/</userinput></screen>
-
-      <para>
-        Now, the repository can be cloned using
-      </para>
-<screen role="nodump"><userinput>git clone git@gitserver:project1.git</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="gitserver-init">
-      <title>4. Configure the Server</title>
-
-      <para>
-        The setup described above makes a repository available for
-        authenticated users (via providing the ssh public key file).
-        There is also a simple way to publish the 
-        repository to unauthenticated users &mdash; of course without write
-        access.
-      </para>
-
-      <para>
-        The combination of access via ssh (for authenticated users) and
-        the export of repositories to unauthenticated users via the
-        daemon is in most cases enough for a development site.
-      </para>
-      
-      <note>
-        <para>
-          The daemon will be reachable at port <literal>9418</literal>
-          by default. Make sure that your firewall setup allows
-          access to that port.
-        </para>
-      </note>
-
-      <para revision="sysv">
-        To start the server at boot time, install the git-daemon
-        bootscript included in the <xref linkend="bootscripts"/> package:
-      </para>
-
-      <indexterm zone="gitserver gitserver-init" revision="sysv">
-        <primary sortas="f-git">git</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-git-daemon</userinput></screen>
-
-      <para revision="systemd">
-        To start the server at boot time, install the
-        <filename>git-daemon.service</filename> unit from the
-        <xref linkend="systemd-units"/> package:
-      </para>
-
-      <indexterm zone="gitserver gitserver-init" revision="systemd">
-        <primary sortas="f-gitserve">gitserve</primary>
-      </indexterm>
-
-<screen role="root" revision="systemd"><userinput>make install-git-daemon</userinput></screen>
-
-      <para>
-        In order to allow <application>git</application> to export a
-        repository, a file named <filename>git-daemon-export-ok</filename>
-        is required in each repository directory on the server. The
-        file needs no content, just its existance enables, its absence
-        disables the export of that repository.
-      </para>
-
-<screen role="root"><userinput>touch /srv/git/project1.git/git-daemon-export-ok</userinput></screen>
-
-      <para revision="sysv">
-        The script to start the git daemon uses some default values
-        internally. Most important is the path to the repository
-        directory which is set to <filename class="directory">/srv/git</filename>.
-        In case you have for whatever reason created the repository in a
-        different location, you'll need to tell the boot script where the
-        repository is to be found. This can be achieved by creating a
-        configuration file named <filename>/etc/sysconfig/git-daemon</filename>.
-        This configuration file will be imported if it exists, meaning it is
-        optional. The file can look like:</para>
-<screen revision="sysv">
-# Begin /etc/sysconfig/git-daemon
-
-# Specify the location of the git repository
-GIT_BASE_DIR="/srv/git/"
-
-# Directories added to whitelist
-DFT_REPO_DIR="$GIT_BASE_DIR"
-
-# Add extra options which will appended to the 'git daemon'
-# command executed in the boot script
-GIT_DAEMON_OPTS=""
-
-# End /etc/sysconfig/git-daemon
-</screen>
-      <para revision="systemd">
-        Along with the <filename>git-daemon.service</filename> unit, a
-        configuration file named <filename>/etc/default/git-daemon</filename>
-        has been installed. Review this configuration file to match your
-        needs.
-      </para>
-
-      <para>
-        There are only three options to set in the configuration file:
-        <itemizedlist>
-          <listitem>
-            <para>
-              GIT_BASE_DIR=&lt;dirname&gt;
-            </para>
-            <para>Specify the location of the git repositories.
-              Relative paths used when accessing the daemon will 
-              translated relative to this directory.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              DFT_REPO_DIR=&lt;dirname&gt;
-            </para>
-            <para>This directory is added to the white list of allowed
-              directories. This variable can hold multiple directory
-              names but is usually set equal to <literal>GIT_BASE_DIR</literal>.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              GIT_DAEMON_OPTS=&lt;options&gt;
-            </para>
-            <para>
-              In case special options to the <command>git daemon</command>
-              command are needed, they have to be specified in this setting.
-              One example might be to adjust the port number where daemon is
-              listening. In this case, add <literal>--port=&lt;port
-              number&gt;</literal> to this variable.  For more information
-              about which options can be set, take a look at the output of
-              <command>git daemon --help</command>.
-            </para>
-          </listitem>
-        </itemizedlist>
-      </para>
-
-      <para>
-        After starting the daemon, unauthenticated users can clone exported
-        repositories by using
-      </para>
-<screen role="nodump"><userinput>git clone git://gitserver/project1.git</userinput></screen>
-
-      <para>
-        As the base directory is <filename class="directory">/srv/git</filename> 
-        by default (or set to a custom value in the configuration),
-        <application>git</application> interprets the incoming path
-        (/project1.git) relative to that base directory so that the repository
-        in <filename class="directory">/srv/git/project1.git</filename> is
-        served.
-      </para>
-      
-    </sect3>
-
-  </sect2>
-
-</sect1>
Index: general/prog/guile.xml
===================================================================
--- general/prog/guile.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/guile.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY guile-download-http "&gnu-http;/guile/guile-&guile-version;.tar.xz">
   <!ENTITY guile-download-ftp  "&gnu-ftp;/guile/guile-&guile-version;.tar.xz">
-  <!ENTITY guile-md5sum        "eb7d26dae3a2fc85a36511a68d76f7d1">
-  <!ENTITY guile-size          "13 MB">
-  <!ENTITY guile-buildsize     "202 MB (add 4 MB for tests)">
-  <!ENTITY guile-time          "1.8 SBU (Using parallelism=4; add 0.4 SBU for tests)">
+  <!ENTITY guile-md5sum        "55d9875992b9c684cb96f66ea6b3efc2">
+  <!ENTITY guile-size          "12 MB">
+  <!ENTITY guile-buildsize     "273 MB (add 3 MB for tests)">
+  <!ENTITY guile-time          "1.9 SBU (Using parallelism=4; add 0.4 SBU for tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -92,12 +93,4 @@
   <sect2 role="installation">
     <title>Installation of Guile</title>
-
-    <para>
-      First, fix a build failure with glibc-2.34 installed:
-    </para>
-
-<screen><userinput remap="pre">sed -e 's/#ifndef __attribute_maybe_unused__//' \
-    -e '174d'                                   \
-    -i lib/libc-config.h</userinput></screen>
 
     <para>
@@ -186,5 +179,5 @@
           <para>
             is a stand-alone Scheme interpreter for
-            <application>Guile</application>
+            <application>Guile</application>.
           </para>
           <indexterm zone="guile guile-prog">
@@ -201,5 +194,5 @@
             information necessary to link your programs against the
             <application>Guile</application> library, in much the same way
-            PkgConfig does
+            PkgConfig does.
           </para>
           <indexterm zone="guile guile-config">
@@ -216,5 +209,5 @@
             <application>C</application> code for
             <application>Scheme</application> visible
-            <application>C</application> functions
+            <application>C</application> functions.
           </para>
           <indexterm zone="guile guile-snarf">
@@ -230,5 +223,5 @@
             is a wrapper program installed along with <command>guile</command>,
             which knows where a particular module is installed and calls it,
-            passing its arguments to the program
+            passing its arguments to the program.
           </para>
           <indexterm zone="guile guild">
@@ -242,5 +235,5 @@
         <listitem>
           <para>
-            is a symlink to <command>guild</command>
+            is a symlink to <command>guild</command>.
           </para>
           <indexterm zone="guile guile-tools">
Index: general/prog/java.xml
===================================================================
--- general/prog/java.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/java.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,17 +8,15 @@
     the directory: this saves more than 70 MB. -->
   <!ENTITY anduin-download             "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
-  <!ENTITY openjdk-download-binary-x86 "&sources-anduin-http;/OpenJDK/OpenJDK-16.0.2/OpenJDK-16.0.2+7-i686-bin.tar.xz">
-  <!ENTITY openjdk-bin-md5sum-x86      "45410ad7ec9045c379f9e736488696c3">
-  <!ENTITY openjdk-bin-size-x86        "152 MB">
-  <!ENTITY openjdk-bin-buildsize-x86   "29 MB">
+  <!ENTITY openjdk-download-binary-x86 "&sources-anduin-http;/OpenJDK/OpenJDK-14.0.1/OpenJDK-14.0.1+7-i686-bin.tar.xz">
+  <!ENTITY openjdk-bin-md5sum-x86      "03bea53f017e53d64811c24a794368e0">
+  <!ENTITY openjdk-bin-size-x86        "109 MB">
+  <!ENTITY openjdk-bin-buildsize-x86   "242 MB">
 
 <!-- Not uploaded to anduin, since this file is now available under GNU GPLv2
      licence.-->
-<!-- Reuploaded to anduin due to the complexity of the download URL, per Bruce's
-     request. - Doug -->
-  <!ENTITY openjdk-download-binary-x64 "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;/openjdk-&openjdk-version;_linux-x64_bin.tar.gz">
-  <!ENTITY openjdk-bin-md5sum-x64      "31c344e9097bd034c892b97c5ac45c27">
-  <!ENTITY openjdk-bin-size-x64        "176 MB">
-  <!ENTITY openjdk-bin-buildsize-x64   "303 MB">
+  <!ENTITY openjdk-download-binary-x64 "https://download.java.net/java/GA/jdk14.0.1/664493ef4a6946b186ff29eb326336a2/&openjdk-build;/GPL/openjdk-&openjdk-version;_linux-x64_bin.tar.gz">
+  <!ENTITY openjdk-bin-md5sum-x64      "8b402feab7c615367b21e289ddda665e">
+  <!ENTITY openjdk-bin-size-x64        "189 MB">
+  <!ENTITY openjdk-bin-buildsize-x64   "320 MB">
 ]>
 
@@ -27,4 +25,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -42,5 +41,5 @@
       Java is different from most of the packages in LFS and BLFS. It
       is a programming language that works with files of byte codes to obtain
-      instructions and executes them in a Java Virtual Machine (JVM). An
+      instructions and executes then in a Java Virtual Machine (JVM). An
       introductory java program looks like:
     </para>
@@ -100,5 +99,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Binary Package Information</bridgehead>
@@ -160,13 +159,4 @@
   <sect2 role="installation">
     <title>Installation of the Java BinaryJDK </title>
-
-    <note>
-      <para>
-        The tarball
-        <emphasis>openjdk-&openjdk-version;_linux-x64_bin.tar.gz</emphasis> will
-        untar to the <emphasis>jdk-&openjdk-version;</emphasis> directory.
-      </para>
-    </note>
-
     <para>
       Begin by extracting the appropriate binary tarball for your
@@ -176,7 +166,7 @@
     </para>
 
-<screen role="root"><userinput>install -vdm755 /opt/OpenJDK-&openjdk-version;-bin &amp;&amp;
-mv -v * /opt/OpenJDK-&openjdk-version;-bin         &amp;&amp;
-chown -R root:root /opt/OpenJDK-&openjdk-version;-bin</userinput></screen>
+<screen role="root"><userinput>install -vdm755 /opt/OpenJDK-&openjdk-version;+&openjdk-build;-bin &amp;&amp;
+mv -v * /opt/OpenJDK-&openjdk-version;+&openjdk-build;-bin         &amp;&amp;
+chown -R root:root /opt/OpenJDK-&openjdk-version;+&openjdk-build;-bin</userinput></screen>
 
     <para>
@@ -186,5 +176,5 @@
     </para>
 
-<screen role="root"><userinput>ln -sfn OpenJDK-&openjdk-version;-bin /opt/jdk</userinput></screen>
+<screen role="root"><userinput>ln -sfn OpenJDK-&openjdk-version;+&openjdk-build;-bin /opt/jdk</userinput></screen>
 
     <para>
Index: general/prog/jinja2.xml
===================================================================
--- general/prog/jinja2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/jinja2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY Jinja2-download-http "&pymodules-dl;/J/Jinja2/Jinja2-&Jinja2-version;.tar.gz">
   <!ENTITY Jinja2-download-ftp  " ">
-  <!ENTITY Jinja2-md5sum        "25ba6ef98c164878acff1036fbd72a1d">
-  <!ENTITY Jinja2-size          "264 KB">
-  <!ENTITY Jinja2-buildsize     "2.3 MB">
+  <!ENTITY Jinja2-md5sum        "0362203b22547abca06ed1082bc1e7b4">
+  <!ENTITY Jinja2-size          "252 KB">
+  <!ENTITY Jinja2-buildsize     "2.6 MB">
   <!ENTITY Jinja2-time          "less than 0.1 SBU">
 ]>
@@ -30,12 +30,5 @@
       </para>
 
-      <note revision="systemd">
-        <para>
-          <application>Jinja2</application> was installed in LFS.
-          The instruction is only kept here for SysV revision.
-        </para>
-      </note>
-
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -143,2 +136,3 @@
 
   </sect2>
+  <!--End Jinja2 -->
Index: general/prog/librep.xml
===================================================================
--- general/prog/librep.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/librep.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY librep-download-http "https://download.tuxfamily.org/librep/librep_&librep-version;.tar.xz">
+  <!ENTITY librep-download-http "http://download.tuxfamily.org/librep/librep_&librep-version;.tar.xz">
   <!ENTITY librep-download-ftp " ">
   <!ENTITY librep-md5sum "036195b371006848e29ed6f50ddc8475">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -132,5 +133,5 @@
         <listitem>
           <para>
-            is the Lisp interpreter
+            is the Lisp interpreter.
           </para>
           <indexterm zone="librep rep">
@@ -141,8 +142,8 @@
 
       <varlistentry id="librep-lib">
-        <term><filename class="libraryfile">librep.so</filename></term>
+        <term><filename class='libraryfile'>librep.so</filename></term>
         <listitem>
           <para>
-            contains the functions necessary for the Lisp interpreter
+            contains the functions necessary for the Lisp interpreter.
           </para>
           <indexterm zone="librep librep-lib">
@@ -157,2 +158,3 @@
 
 </sect1>
+
Index: general/prog/libxml2py2.xml
===================================================================
--- general/prog/libxml2py2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/libxml2py2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,5 +8,5 @@
   <!ENTITY libxml2py2-download-http "http://xmlsoft.org/sources/libxml2-&libxml2-version;.tar.gz">
   <!ENTITY libxml2py2-download-ftp  "ftp://xmlsoft.org/libxml2/libxml2-&libxml2-version;.tar.gz">
-  <!ENTITY libxml2py2-md5sum        "f433a39be087a9f0b197eb2307ad9f75">
+  <!ENTITY libxml2py2-md5sum        "10942a1dc23137a8aa07f0639cbfece5">
   <!ENTITY libxml2py2-size          "5.4 MB">
   <!ENTITY libxml2py2-buildsize     "53 MB (2.3 MB installed)">
@@ -40,5 +40,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -141,5 +141,5 @@
         <listitem>
           <para>
-            is a SAX <application>Python2</application> driver for libxml2
+            is a SAX <application>Python2</application> driver for libxml2.
           </para>
           <indexterm zone="libxml2py2 drv_libxml2.py2">
@@ -153,5 +153,5 @@
         <listitem>
           <para>
-            is the <application>Python2</application> binding for libxml2
+            is the <application>Python2</application> binding for libxml2.
           </para>
           <indexterm zone="libxml2py2 libxml2.py2">
@@ -166,5 +166,5 @@
           <para>
             is the interface for <application>Python2</application>
-            to use <filename class="libraryfile">libxml2.so</filename>
+            to use <filename class="libraryfile">libxml2.so</filename>.
           </para>
           <indexterm zone="libxml2py2 libxml2mod2">
@@ -179,2 +179,3 @@
 
   </sect2>
+  <!--End lbxml2py2 -->
Index: general/prog/llvm.xml
===================================================================
--- general/prog/llvm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/llvm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -9,15 +9,15 @@
   <!ENTITY llvm-download-http "&llvm-url;/llvm-&llvm-version;.src.tar.xz">
   <!ENTITY llvm-download-ftp  " ">
-  <!ENTITY llvm-md5sum        "72a257604efa1d32ef85a37cd9c66873">
-  <!ENTITY llvm-size          "41 MB">
-  <!ENTITY llvm-buildsize     "2.5 GB (715 MB installed, add 11 GB for tests)">
-  <!ENTITY llvm-time          "29 SBU (with parallelism=4, add 38 SBU for tests)">
+  <!ENTITY llvm-md5sum        "85844102335b2e01b3c64b6734fb56f2">
+  <!ENTITY llvm-size          "38 MB">
+  <!ENTITY llvm-buildsize     "3.1 GB (726 MB installed, add 17 GB for tests)">
+  <!ENTITY llvm-time          "37 SBU (with parallelism=4, add 12 SBU for tests)">
 
   <!ENTITY clang-download-http "&llvm-url;/clang-&llvm-version;.src.tar.xz">
-  <!ENTITY clang-md5sum        "03d77af27fcbeeae4414fb4713b9fd7e">
+  <!ENTITY clang-md5sum        "d8fbc5b1d27f44922cfbbf199d0bab78">
   <!ENTITY clang-size          "15 MB">
 
   <!ENTITY compiler-rt-download-http "&llvm-url;/compiler-rt-&llvm-version;.src.tar.xz">
-  <!ENTITY compiler-rt-md5sum        "40095daa9070b20eef9bdd32fdc53db5">
+  <!ENTITY compiler-rt-md5sum        "182511f9ba2c83b9d3c934501d48bee9">
   <!ENTITY compiler-rt-size          "2.1 MB">
 ]>
@@ -27,4 +27,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -63,5 +64,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -138,10 +139,10 @@
         </listitem>
       </itemizedlist>
-<!--
-      <itemizedlist spacing="compact">
+
+<!--      <itemizedlist spacing="compact">
         <listitem>
           <para>
             Optional patch:
-            <ulink url="&patch-root;/llvm-&llvm-version;-compiler_rt_buildfix-1.patch"/>
+            <ulink url="&patch-root;/compiler-rt-4.0.1-glibc-2.26-1.patch"/>
             (required if using compiler-rt)
           </para>
@@ -162,5 +163,4 @@
       <xref linkend="graphviz"/>,
       <xref linkend="libxml2"/>,
-      <xref linkend="pygments"/>,
       <xref linkend="rsync"/> (for tests),
       <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>),
@@ -207,12 +207,5 @@
 
 <screen><userinput>grep -rl '#!.*python' | xargs sed -i '1s/python$/python3/'</userinput></screen>
-<!--
-    <para>
-      If you have downloaded <application>compiler-rt</application>,
-      fix building it with Linux-5.13.0 by using the following command:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../llvm-&llvm-version;-compiler_rt_buildfix-1.patch</userinput></screen>
--->
+
     <para>
       Install <application>LLVM</application> by running the following
@@ -232,5 +225,4 @@
       -DLLVM_TARGETS_TO_BUILD="host;AMDGPU;BPF" \
       -DLLVM_BUILD_TESTS=ON                     \
-      -DLLVM_BINUTILS_INCDIR=/usr/include       \
       -Wno-dev -G Ninja ..                      &amp;&amp;
 ninja</userinput></screen>
@@ -267,7 +259,6 @@
       by the <systemitem class="username">root</systemitem> user and makes them
       temporarily unusable by all jobs on the machine.)
-      Note that a few of the compiler-rt Sanitizer based tests (16 of more than 48000
-      tests run) are known to fail. Some of the LLVM-Unit IR tests are known to
-      fail as well.
+      Note that a few of the compiler-rt Sanitizer based tests (6 of more than 48000
+      tests run) are known to fail.
     </para>
 
@@ -306,5 +297,5 @@
 
     <para>
-      <parameter>-DLLVM_ENABLE_FFI=ON</parameter>: This switch allows
+      <parameter>-DLLVM_ENABLE_FFI=ON</parameter>: This switch enables
       <application>LLVM</application> to use
       <application>libffi</application>.
@@ -312,7 +303,7 @@
 
     <para>
-      <parameter>-DLLVM_BUILD_LLVM_DYLIB=ON</parameter>: This switch builds
-      the libraries as static and links all of them into an unique shared one.
-      This is the recommended way of building a shared library.
+      <parameter>-DLLVM_BUILD_LLVM_DYLIB=ON</parameter>: builds libraries as
+      static and links all of them into an unique shared one. This is the
+      recommended way of building a shared library.
     </para>
 
@@ -328,8 +319,8 @@
       switch enables building for the same target as the host, and also for
       the r600 AMD GPU used by the Mesa r600 and radeonsi drivers. The BPF
-      target is required to build <xref linkend="v4l-utils"/>. The Default is
-      all of the targets. You can use a semicolon separated list. Valid targets
-      are: host, X86, Sparc, PowerPC, ARM, AArch64, Mips, Hexagon, Xcore, 
-      M68K, MSP430, NVPTX, SystemZ, AMDGPU, BPF, CppBackend, or all.
+      target is required to build <xref linkend="v4l-utils"/>. Default is
+      all. You can use a semicolon separated list. Valid targets are: host,
+      X86, Sparc, PowerPC, ARM, AArch64, Mips, Hexagon, Xcore, MSP430, NVPTX,
+      SystemZ, AMDGPU, BPF, CppBackend, or all.
     </para>
 
@@ -343,16 +334,7 @@
 
     <para>
-      <parameter>-DLLVM_ENABLE_RTTI=ON</parameter>: This switch is used to 
-      build LLVM with run-time type information. This is required for building 
+      <parameter>-DLLVM_ENABLE_RTTI=ON</parameter>: Used to build LLVM with 
+      run-time type information. This is required for building 
       <xref linkend="mesa"/>.
-    </para>
-
-    <para>
-      <parameter>-DLLVM_BINUTILS_INCDIR=/usr/include</parameter>: This switch
-      is used to tell the build system the location of binutils headers, 
-      which were installed in LFS.  This allows the building of
-      <filename class="libraryfile">LLVMgold.so</filename>, which is needed
-      for building programs with <command>clang</command> and Link Time
-      Optimization (LTO).
     </para>
 
@@ -389,7 +371,6 @@
           clang-offload-bundler, clang-offload-wrapper, 
           clang-refactor, clang-rename, clang-scan-deps,
-          diagtool, dsymutil, git-clang-format, hmaptool, llc, lli, 
-          llvm-addr2line, llvm-ar, llvm-as, llvm-bcanalyzer,
-          llvm-bitcode-strip (symlink to llvm-objcopy), llvm-cat, 
+          diagtool, dsymutil, git-clang-format, hmap-tool, llc, lli, 
+          llvm-addr2line, llvm-ar, llvm-as, llvm-bcanalyzer, llvm-cat, 
           llvm-cfi-verify, llvm-config, llvm-cov, llvm-c-test, llvm-cvtres, 
           llvm-cxxdump, llvm-cxxfilt, llvm-cxxmap,
@@ -397,24 +378,21 @@
           llvm-dwp, llvm-elfabi, llvm-exegenesis, llvm-extract, llvm-gsymutil, llvm-ifs,
           llvm-install-name-tool (symlink to llvm-objcopy), llvm-jitlink,
-          llvm-lib (symlink to llvm-ar), llvm-libtool-darwin, llvm-link, 
-          llvm-lipo, llvm-lto, llvm-lto2, llvm-mc, llvm-mca, llvm-ml, 
-          llvm-modextract, llvm-mt, llvm-nm, llvm-objcopy, llvm-objdump,
-          llvm-opt-report, llvm-pdbutil, llvm-profdata, llvm-profgen, 
-          llvm-ranlib (symlink to llvm-ar), llvm-rc, 
+          llvm-lib (symlink to llvm-ar), llvm-link, llvm-lipo, llvm-lto, 
+          llvm-lto2, llvm-mc, llvm-mca, llvm-modextract,
+          llvm-mt, llvm-nm, llvm-objcopy, llvm-objdump, llvm-opt-report,
+          llvm-pdbutil, llvm-profdata, llvm-ranlib (symlink to llvm-ar), llvm-rc,
           llvm-readelf (symlink to llvm-readobj), llvm-readobj, llvm-reduce, 
           llvm-rtdyld, llvm-size, llvm-split, llvm-stress, llvm-strings, 
           llvm-strip (symlink to llvm-objcopy), llvm-symbolizer, llvm-tblgen, 
-          llvm-undname, llvm-xray, opt, sancov, sanstats, scan-build,
-          scan-view, split-file, and verify-uselistorder
+          llvm-undname, llvm-xray, obj2yaml, opt, sancov, sanstats, scan-build,
+          scan-view, verify-uselistorder, and yaml2obj
         </seg>
         <seg>
           libLLVM.so, 
-          libLLVM*.a (84 libraries), 
+          libLLVM*.a (75 libraries), 
           libLTO.so, 
           libRemarks.so, 
           libclang.so,
-          libclang-cpp.so,
-          libclang*.a (37 libraries),
-          and LLVMgold.so
+          and libclang*.a (63 libraries)
         </seg>
         <seg>
@@ -436,5 +414,5 @@
         <listitem>
           <para>
-            is the automatic test case reduction tool
+            is the automatic test case reduction tool.
           </para>
           <indexterm zone="llvm bugpoint">
@@ -448,5 +426,5 @@
         <listitem>
           <para>
-            is used to test the libclang API and demonstrate its usage
+            is used to test the libclang API and demonstrate its usage.
           </para>
           <indexterm zone="llvm c-index-test">
@@ -461,5 +439,5 @@
           <para>
             is the <application>Clang</application> C, C++,
-            and Objective-C compiler
+            and Objective-C compiler.
           </para>
           <indexterm zone="llvm clang">
@@ -474,5 +452,5 @@
           <para>
             is a tool to perform static code analysis and display Abstract
-            Syntax Trees (AST)
+            Syntax Trees (AST).
           </para>
           <indexterm zone="llvm clang-check">
@@ -487,5 +465,5 @@
           <para>
             is a tool to collect the USR name and location of external
-            definitions in a source file
+            definitions in a source file.
           </para>
           <indexterm zone="llvm clang-extdef-mapping">
@@ -500,5 +478,5 @@
           <para>
             is a tool to format C/C++/Java/JavaScript/Objective-C/Protobuf
-            code
+            code.
           </para>
           <indexterm zone="llvm clang-format">
@@ -526,6 +504,6 @@
         <listitem>
           <para>
-            is a tool to bundle/unbundle OpenMP offloaded files associated with
-            a common source file
+            is a tool to bundle/unbundle openMP offloaded files associated with
+            a common source file.
           </para>
           <indexterm zone="llvm clang-offload-bundler">
@@ -536,8 +514,8 @@
 
       <varlistentry id="clang-offload-wrapper">
-        <term><command>clang-offload-wrapper</command></term>
-        <listitem>
-          <para>
-            is a tool to create wrapper bitcode for offload target binaries
+        <term><command>clang-offload-bundler</command></term>
+        <listitem>
+          <para>
+            is a tool to create wrapper bitcode for offload target binaries.
           </para>
           <indexterm zone="llvm clang-offload-wrapper">
@@ -551,5 +529,5 @@
         <listitem>
           <para>
-            is a Clang-based refactoring tool for C, C++ and Objective-C
+            is a Clang-based refactoring tool for C, C++ and Objective-C.
           </para>
           <indexterm zone="llvm clang-refactor">
@@ -563,5 +541,5 @@
         <listitem>
           <para>
-            is a tool to rename symbols in C/C++ programs
+            is a tool to rename symbols in C/C++ programs.
           </para>
           <indexterm zone="llvm clang-rename">
@@ -575,5 +553,5 @@
         <listitem>
           <para>
-            is a tool to scan for dependencies in a source file
+            is a tool to scan for dependencies in a source file.
           </para>
           <indexterm zone="llvm clang-scan-deps">
@@ -587,5 +565,5 @@
         <listitem>
           <para>
-            is a combination of tools for dealing with diagnostics in clang
+            is a combination of tools for dealing with diagnostics in clang.
           </para>
           <indexterm zone="llvm diagtool">
@@ -600,5 +578,5 @@
           <para>
             is a tool used to manipulate archived DWARF debug symbol files,
-            compatible with the Darwin command <command>dsymutil</command>
+            compatible with the Darwin command <command>dsymutil</command>.
           </para>
           <indexterm zone="llvm dsymutil">
@@ -625,5 +603,5 @@
         <listitem>
           <para>
-            is a Python tool to dump and construct header maps
+            is a Python tool to dump and construct header maps.
           </para>
           <indexterm zone="llvm hmaptool">
@@ -637,5 +615,5 @@
         <listitem>
           <para>
-            is the <application>LLVM</application> static compiler
+            is the <application>LLVM</application> static compiler.
           </para>
           <indexterm zone="llvm llc">
@@ -650,5 +628,5 @@
           <para>
             is used to directly execute programs from
-            <application>LLVM</application> bitcode
+            <application>LLVM</application> bitcode.
           </para>
           <indexterm zone="llvm lli">
@@ -663,5 +641,5 @@
           <para>
             is a tool used to convert addresses into file names and line
-            numbers
+            numbers.
           </para>
           <indexterm zone="llvm llvm-addr2line">
@@ -675,5 +653,5 @@
         <listitem>
           <para>
-            is the <application>LLVM</application> archiver
+            is the <application>LLVM</application> archiver.
           </para>
           <indexterm zone="llvm llvm-ar">
@@ -687,5 +665,5 @@
         <listitem>
           <para>
-            is the <application>LLVM</application> assembler
+            is the <application>LLVM</application> assembler.
           </para>
           <indexterm zone="llvm llvm-as">
@@ -699,5 +677,5 @@
         <listitem>
           <para>
-            is the <application>LLVM</application> bitcode analyzer
+            is the <application>LLVM</application> bitcode analyzer.
           </para>
           <indexterm zone="llvm llvm-bcanalyzer">
@@ -707,21 +685,9 @@
       </varlistentry>
 
-      <varlistentry id="llvm-bitcode-strip">
-        <term><command>llvm-bitcode-strip</command></term>
-        <listitem>
-          <para>
-            strips LLVM bitcode from an object
-          </para>
-          <indexterm zone="llvm llvm-bitcode-strip">
-            <primary sortas="b-llvm-bitcode-strip">llvm-bitcode-strip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="llvm-cat">
         <term><command>llvm-cat</command></term>
         <listitem>
           <para>
-            is a tool to concatenate llvm modules
+            is a tool to concatenate llvm modules.
           </para>
           <indexterm zone="llvm llvm-cat">
@@ -737,5 +703,5 @@
             identifies whether Control Flow Integrity protects all indirect
             control flow instructions in the provided object file, DSO, or
-            binary
+            binary.
           </para>
           <indexterm zone="llvm llvm-cfi-verify">
@@ -749,5 +715,5 @@
         <listitem>
           <para>
-            Prints <application>LLVM</application> compilation options
+            Prints <application>LLVM</application> compilation options.
           </para>
           <indexterm zone="llvm llvm-config">
@@ -761,5 +727,5 @@
         <listitem>
           <para>
-            is used to emit coverage information
+            is used to emit coverage information.
           </para>
           <indexterm zone="llvm llvm-cov">
@@ -773,5 +739,5 @@
         <listitem>
           <para>
-            is a bytecode disassembler
+            is a bytecode disassembler.
           </para>
           <indexterm zone="llvm llvm-c-test">
@@ -785,5 +751,5 @@
         <listitem>
           <para>
-            is a tool to convert Microsoft resource files to COFF
+            is a tool to convert Microsoft resource files to COFF.
           </para>
           <indexterm zone="llvm llvm-cvtres">
@@ -797,5 +763,5 @@
         <listitem>
           <para>
-            is used as a C++ ABI Data Dumper
+            is used as a C++ ABI Data Dumper.
           </para>
           <indexterm zone="llvm llvm-cxxdump">
@@ -809,5 +775,5 @@
         <listitem>
           <para>
-            is used to demangle C++ symbols in llvm code
+            is used to demangle C++ symbols in llvm code.
           </para>
           <indexterm zone="llvm llvm-cxxfilt">
@@ -821,5 +787,5 @@
         <listitem>
           <para>
-            is used to remap C++ mangled symbols
+            is used to remap C++ mangled symbols.
           </para>
           <indexterm zone="llvm llvm-cxxmap">
@@ -834,5 +800,5 @@
           <para>
             is the <application>LLVM</application> structural
-            '<command>diff</command>'
+            '<command>diff</command>'.
           </para>
           <indexterm zone="llvm llvm-diff">
@@ -846,5 +812,5 @@
         <listitem>
           <para>
-            is the <application>LLVM</application> disassembler
+            is the <application>LLVM</application> disassembler.
           </para>
           <indexterm zone="llvm llvm-dis">
@@ -858,5 +824,5 @@
         <listitem>
           <para>
-            prints the content of DWARF sections in object files
+            prints the content of DWARF sections in object files.
           </para>
           <indexterm zone="llvm llvm-dwarfdump">
@@ -870,5 +836,5 @@
         <listitem>
           <para>
-            merges split DWARF files
+            merges split DWARF files.
           </para>
           <indexterm zone="llvm llvm-dwp">
@@ -882,5 +848,5 @@
         <listitem>
           <para>
-            is used to read information about an ELF binary's ABI
+            is used to read information about an ELF binary's ABI.
           </para>
           <indexterm zone="llvm llvm-elfabi">
@@ -896,5 +862,5 @@
             is a benchmarking tool that uses information available in LLVM to
             measure host machine instruction characteristics like latency or
-            port decomposition
+            port decomposition.
           </para>
           <indexterm zone="llvm llvm-exegesis">
@@ -909,5 +875,5 @@
           <para>
             is used to extract a function from an
-            <application>LLVM</application> module
+            <application>LLVM</application> module.
           </para>
           <indexterm zone="llvm llvm-extract">
@@ -923,5 +889,5 @@
             is used to process GSYM Symbolication Format files which
             convert memory addresses to function name and source file
-            line. These files are smaller than DWARF or Breakpad files
+            line. These files are smaller than DWARF or Breakpad files.
           </para>
           <indexterm zone="llvm llvm-gsymutil">
@@ -935,5 +901,5 @@
         <listitem>
           <para>
-            is used to merge interface stubs with object files
+            is used to merge interface stubs with object files.
           </para>
           <indexterm zone="llvm llvm-ifs">
@@ -947,5 +913,5 @@
         <listitem>
           <para>
-            is used to rewrite load commands into MachO binary format
+            is used to rewrite load commands into MachO binary format.
           </para>
           <indexterm zone="llvm llvm-install-name-tool">
@@ -960,5 +926,5 @@
           <para>
             is used to parse relocatable object files to make their contents
-            executable in a target process
+            executable in a target process.
           </para>
           <indexterm zone="llvm llvm-jitlink">
@@ -968,23 +934,9 @@
       </varlistentry>
 
-      <varlistentry id="llvm-libtool-darwin">
-        <term><command>llvm-libtool-darwin</command></term>
-        <listitem>
-          <para>
-            provides basic libtool functionality on Darwin-based systems.
-            This is mostly useful if you are generating binaries for macOS
-            systems
-          </para>
-          <indexterm zone="llvm llvm-libtool-darwin">
-            <primary sortas="b-llvm-libtool-darwin">llvm-libtool-darwin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="llvm-link">
         <term><command>llvm-link</command></term>
         <listitem>
           <para>
-            is the <application>LLVM</application> linker
+            is the <application>LLVM</application> linker.
           </para>
           <indexterm zone="llvm llvm-link">
@@ -998,5 +950,5 @@
         <listitem>
           <para>
-            is used to create universal binaries from MachO files
+            is used to create universal binaries from MachO files.
           </para>
           <indexterm zone="llvm llvm-lipo">
@@ -1011,5 +963,5 @@
           <para>
             is the <application>LLVM</application> LTO (link time optimization)
-            linker
+            linker.
           </para>
           <indexterm zone="llvm llvm-lto">
@@ -1023,5 +975,5 @@
         <listitem>
           <para>
-            is a test harness for the resolution based LTO interface
+            is a test harness for the resolution based LTO interface.
           </para>
           <indexterm zone="llvm llvm-lto2">
@@ -1035,5 +987,5 @@
         <listitem>
           <para>
-            is a standalone machine code assembler/disassembler
+            is a standalone machine code assembler/disassembler.
           </para>
           <indexterm zone="llvm llvm-mc">
@@ -1047,6 +999,6 @@
         <listitem>
           <para>
-            is a performance analysis tool to statically measure the
-            performance of machine code
+            is a is a performance analysis tool to statically measure the
+            performance of machine code.
           </para>
           <indexterm zone="llvm llvm-mca">
@@ -1068,21 +1020,9 @@
       </varlistentry>-->
 
-      <varlistentry id="llvm-ml">
-        <term><command>llvm-ml</command></term>
-        <listitem>
-          <para>
-            is a playground for machine code provided by LLVM
-          </para>
-          <indexterm zone="llvm llvm-ml">
-            <primary sortas="b-llvm-ml">llvm-ml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="llvm-modextract">
         <term><command>llvm-modextract</command></term>
         <listitem>
           <para>
-            is a tool to extract one module from multimodule bitcode files
+            is a tool to extract one module from multimodule bitcode files.
           </para>
           <indexterm zone="llvm llvm-modextract">
@@ -1097,5 +1037,5 @@
           <para>
             is a tool to generate signed files and catalogs from a
-            side-by-side assembly manifest (used for Microsoft SDK)
+            side-by-side assembly manifest (used for Microsoft SDK).
           </para>
           <indexterm zone="llvm llvm-mt">
@@ -1110,5 +1050,5 @@
           <para>
             is used to list <application>LLVM</application> bitcode
-            and object file's symbol table
+            and object file's symbol table.
           </para>
           <indexterm zone="llvm llvm-nm">
@@ -1122,5 +1062,5 @@
         <listitem>
           <para>
-            is LLVM's version of an objcopy tool
+            is LLVM's version of an objcopy tool.
           </para>
           <indexterm zone="llvm llvm-objcopy">
@@ -1134,5 +1074,5 @@
         <listitem>
           <para>
-            is an <application>LLVM</application> object file dumper
+            is an <application>LLVM</application> object file dumper.
           </para>
           <indexterm zone="llvm llvm-objdump">
@@ -1147,5 +1087,5 @@
           <para>
             is a tool to generate an optimization report from YAML optimization
-            record files
+            record files.
           </para>
           <indexterm zone="llvm llvm-opt-report">
@@ -1159,5 +1099,5 @@
         <listitem>
           <para>
-            is a PDB (Program Database) dumper. PDB is a Microsoft format
+            is a PDB (Program Database) dumper. PDB is a Microsoft format.
           </para>
           <indexterm zone="llvm llvm-pdbutil">
@@ -1171,5 +1111,5 @@
         <listitem>
           <para>
-            is a small tool to manipulate and print profile data files
+            is a small tool to manipulate and print profile data files.
           </para>
           <indexterm zone="llvm llvm-profdata">
@@ -1179,16 +1119,4 @@
       </varlistentry>
 
-      <varlistentry id="llvm-profgen">
-        <term><command>llvm-profgen</command></term>
-        <listitem>
-          <para>
-            generates LLVM SPGO profiling information
-          </para>
-          <indexterm zone="llvm llvm-profgen">
-            <primary sortas="b-llvm-profgen">llvm-profgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="llvm-ranlib">
         <term><command>llvm-ranlib</command></term>
@@ -1196,5 +1124,5 @@
           <para>
             is used to generate an index for a <application>LLVM</application>
-            archive
+            archive.
           </para>
           <indexterm zone="llvm llvm-ranlib">
@@ -1209,5 +1137,5 @@
           <para>
             is a platform-independent tool to compile resource scripts
-            into binary resource files
+            into binary resource files.
           </para>
           <indexterm zone="llvm llvm-rc">
@@ -1221,5 +1149,5 @@
         <listitem>
           <para>
-            displays low-level format-specific information about object files
+            displays low-level format-specific information about object files.
           </para>
           <indexterm zone="llvm llvm-readobj">
@@ -1234,5 +1162,5 @@
           <para>
             is used to automatically reduce testcases
-            when running a test suite
+            when running a test suite.
           </para>
           <indexterm zone="llvm llvm-reduce">
@@ -1246,5 +1174,5 @@
         <listitem>
           <para>
-            is the <application>LLVM</application> MC-JIT tool
+            is the <application>LLVM</application> MC-JIT tool.
           </para>
           <indexterm zone="llvm llvm-rtdyld">
@@ -1258,5 +1186,5 @@
         <listitem>
           <para>
-            is the <application>LLVM</application> object size dumper
+            is the <application>LLVM</application> object size dumper.
           </para>
           <indexterm zone="llvm llvm-size">
@@ -1270,5 +1198,5 @@
         <listitem>
           <para>
-            is the <application>LLVM</application> module splitter
+            is the <application>LLVM</application> module splitter.
           </para>
           <indexterm zone="llvm llvm-split">
@@ -1283,5 +1211,5 @@
           <para>
             is used to generate random
-            <filename class="extension">.ll</filename> files
+            <filename class="extension">.ll</filename> files.
           </para>
           <indexterm zone="llvm llvm-stress">
@@ -1296,5 +1224,5 @@
           <para>
             print strings found in a binary (object file, executable, or
-            archive library)
+            archive library).
           </para>
           <indexterm zone="llvm llvm-strings">
@@ -1308,5 +1236,5 @@
         <listitem>
           <para>
-            converts adresses into source code locations
+            converts adresses into source code locations.
           </para>
           <indexterm zone="llvm llvm-symbolizer">
@@ -1321,5 +1249,5 @@
           <para>
             is the <application>LLVM</application> Target Description
-            To C++ Code Generator
+            To C++ Code Generator.
           </para>
           <indexterm zone="llvm llvm-tblgen">
@@ -1333,5 +1261,5 @@
         <listitem>
           <para>
-            is a tool to demangle names
+            is a tool to demangle names.
           </para>
           <indexterm zone="llvm llvm-undname">
@@ -1345,5 +1273,5 @@
         <listitem>
           <para>
-            is an implementation of Google's XRay function call tracing system
+            is an implementation of Google's XRay function call tracing system.
           </para>
           <indexterm zone="llvm llvm-xray">
@@ -1353,5 +1281,4 @@
       </varlistentry>
 
-<!--
       <varlistentry id="obj2yaml">
         <term><command>obj2yaml</command></term>
@@ -1359,5 +1286,5 @@
           <para>
             takes an object file, and produces a YAML representation of the
-            file
+            file.
           </para>
           <indexterm zone="llvm obj2yaml">
@@ -1366,5 +1293,4 @@
         </listitem>
       </varlistentry>
--->
 
       <varlistentry id="opt">
@@ -1372,5 +1298,5 @@
         <listitem>
           <para>
-            is the <application>LLVM</application> optimizer
+            is the <application>LLVM</application> optimizer.
           </para>
           <indexterm zone="llvm opt">
@@ -1384,5 +1310,5 @@
         <listitem>
           <para>
-            is the sanitizer coverage processing tool
+            is the sanitizer coverage processing tool.
           </para>
           <indexterm zone="llvm sancov">
@@ -1396,5 +1322,5 @@
         <listitem>
           <para>
-            is the sanitizer statistics processing tool
+            is the sanitizer statistics processing tool.
           </para>
           <indexterm zone="llvm sanstats">
@@ -1409,5 +1335,5 @@
           <para>
             is a <application>Perl</application> script that invokes the
-            <application>Clang</application> static analyzer
+            <application>Clang</application> static analyzer.
           </para>
           <indexterm zone="llvm scan-build">
@@ -1422,5 +1348,5 @@
           <para>
             is a viewer for <application>Clang</application> static analyzer
-            results
+            results.
           </para>
           <indexterm zone="llvm scan-view">
@@ -1430,16 +1356,4 @@
       </varlistentry>
 
-      <varlistentry id="split-file">
-        <term><command>split-file</command></term>
-        <listitem>
-          <para>
-            splits an input file into multiple parts separated by regex
-          </para>
-          <indexterm zone="llvm split-file">
-            <primary sortas="b-split-file">split-file</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="verify-uselistorder">
         <term><command>verify-uselistorder</command></term>
@@ -1447,5 +1361,5 @@
           <para>
             is the <application>LLVM</application> tool to verify use-list
-            order
+            order.
           </para>
           <indexterm zone="llvm verify-uselistorder">
@@ -1455,5 +1369,4 @@
       </varlistentry>
 
-<!-- Removed in 12.0.0
       <varlistentry id="yaml2obj">
         <term><command>yaml2obj</command></term>
@@ -1461,5 +1374,5 @@
           <para>
             takes a YAML representation of an object file and converts it
-            to a binary file
+            to a binary file.
           </para>
           <indexterm zone="llvm yaml2obj">
@@ -1468,5 +1381,4 @@
         </listitem>
       </varlistentry>
--->
 <!--
       <varlistentry id="libllvm">
Index: general/prog/lua.xml
===================================================================
--- general/prog/lua.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/lua.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,15 +5,15 @@
   %general-entities;
 
-  <!ENTITY lua-download-http "https://www.lua.org/ftp/lua-&lua-version;.tar.gz">
+  <!ENTITY lua-download-http "http://www.lua.org/ftp/lua-&lua-version;.tar.gz">
   <!ENTITY lua-download-ftp  " ">
-  <!ENTITY lua-md5sum        "ef63ed2ecfb713646a7fcc583cf5f352">
-  <!ENTITY lua-size          "352 KB">
-  <!ENTITY lua-buildsize     "5.8 MB (with Basic tests)">
+  <!ENTITY lua-md5sum        "49c92d6a49faba342c35c52e1ac3f81e">
+  <!ENTITY lua-size          "345 KB">
+  <!ENTITY lua-buildsize     "5.6 MB (with Basic tests)">
   <!ENTITY lua-time          "less than 0.1 SBU (with Basic tests)">
 
-  <!ENTITY lua-tests-download-http "https://www.lua.org/tests/lua-&lua-version;-tests.tar.gz">
+  <!ENTITY lua-tests-download-http "http://www.lua.org/tests/lua-&lua-version;-tests.tar.gz">
   <!ENTITY lua-tests-download-ftp  " ">
-  <!ENTITY lua-tests-md5sum        "4afc92b7e45fc0687c686a470bc8072a">
-  <!ENTITY lua-tests-size          "132 KB">
+  <!ENTITY lua-tests-md5sum        "4ca9e1ad9b8f42f76ac0440bf548201d">
+  <!ENTITY lua-tests-size          "126 KB">
 ]>
 
@@ -22,4 +22,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -45,5 +46,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -244,5 +245,5 @@
         <listitem>
           <para>
-            is the standalone Lua interpreter
+            is the standalone Lua interpreter.
           </para>
           <indexterm zone="lua lua-prog">
@@ -256,5 +257,5 @@
         <listitem>
           <para>
-            is the Lua compiler
+            is the Lua compiler.
           </para>
           <indexterm zone="lua luac">
@@ -268,5 +269,5 @@
         <listitem>
           <para>
-            contains the <application>Lua</application> API functions
+            contains the <application>Lua</application> API functions.
           </para>
           <indexterm zone="lua liblua">
Index: general/prog/lua52.xml
===================================================================
--- general/prog/lua52.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/lua52.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY lua-download-http "https://www.lua.org/ftp/lua-&lua52-version;.tar.gz">
+  <!ENTITY lua-download-http "http://www.lua.org/ftp/lua-&lua52-version;.tar.gz">
   <!ENTITY lua-download-ftp  " ">
   <!ENTITY lua-md5sum        "913fdb32207046b273fdb17aad70be13">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -45,5 +46,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -123,5 +124,5 @@
 Version: ${R}
 Requires:
-Libs: -L${libdir} -llua5.2 -lm -ldl
+Libs: -L${libdir} -llua -lm -ldl
 Cflags: -I${includedir}</literal>
 EOF</userinput></screen>
@@ -231,5 +232,5 @@
         <listitem>
           <para>
-            is the standalone Lua version 5.2 interpreter
+            is the standalone Lua version 5.2 interpreter.
           </para>
           <indexterm zone="lua52 lua-prog">
@@ -243,5 +244,5 @@
         <listitem>
           <para>
-            is the Lua version 5.2 compiler
+            is the Lua version 5.2 compiler.
           </para>
           <indexterm zone="lua52 luac52">
@@ -255,5 +256,5 @@
         <listitem>
           <para>
-            contains the <application>Lua</application> version 5.2 API functions
+            contains the <application>Lua</application> version 5.2 API functions.
           </para>
           <indexterm zone="lua52 liblua52">
Index: general/prog/lxml.xml
===================================================================
--- general/prog/lxml.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/lxml.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY lxml-download-http "&pymodules-dl;/l/lxml/lxml-&lxml-version;.tar.gz">
   <!ENTITY lxml-download-ftp  " ">
-  <!ENTITY lxml-md5sum        "017f94473dcec0f9b2e9b03524398fa5">
+  <!ENTITY lxml-md5sum        "2e39c6e17d61f61e5be68fd328ba6a51">
   <!ENTITY lxml-size          "3.0 MB">
-  <!ENTITY lxml-buildsize     "204 MB (add 29 MB for tests)">
-  <!ENTITY lxml-time          "1.6 SBU (add 0.6 SBU for tests)">
+  <!ENTITY lxml-buildsize     "168 MB (add 51 MB for tests)">
+  <!ENTITY lxml-time          "1.6 SBU (add 1.6 SBU for tests)">
 ]>
 
@@ -31,5 +31,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -157,2 +157,3 @@
 
   </sect2>
+  <!--End lxml -->
Index: general/prog/mako.xml
===================================================================
--- general/prog/mako.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/mako.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY Mako-download-http "&pymodules-dl;/M/Mako/Mako-&mako-version;.tar.gz">
   <!ENTITY Mako-download-ftp  " ">
-  <!ENTITY Mako-md5sum        "409bdc38e9ddda5eada61fb092cb12fd">
-  <!ENTITY Mako-size          "484 KB">
-  <!ENTITY Mako-buildsize     "3.9 MB">
+  <!ENTITY Mako-md5sum        "184bb2ba4b937127e7c557b93db89377">
+  <!ENTITY Mako-size          "468 KB">
+  <!ENTITY Mako-buildsize     "3.1 MB">
   <!ENTITY Mako-time          "less than 0.1 SBU">
 ]>
@@ -31,5 +31,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -134,5 +134,5 @@
         <seglistitem>
           <seg>
-            mako-render
+            <!--mako-render and/or--> mako-render3
           </seg>
           <seg>
@@ -142,8 +142,6 @@
 <!--            /usr/lib/python&python2-majorver;/site-packages/mako,
             /usr/lib/python&python2-majorver;/site-packages/Mako-&mako-version;-py&python2-majorver;.egg-info and/or-->
-            /usr/lib/python&python3-majorver;/site-packages/Mako-&mako-version;-py&python3-majorver;.egg
-<!-- This is different when doing a -\-root install and a direct install.
-     In the latter case, there is only a .egg directory, and no mako
-     directory. -->
+            /usr/lib/python&python3-majorver;/site-packages/mako and 
+            /usr/lib/python&python3-majorver;/site-packages/Mako-&mako-version;-py&python3-majorver;.egg-info
           </seg>
         </seglistitem>
@@ -153,2 +151,3 @@
 
   </sect2>
+  <!--End Mako -->
Index: general/prog/markupsafe.xml
===================================================================
--- general/prog/markupsafe.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/markupsafe.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY MarkupSafe-download-http "&pymodules-dl;/M/MarkupSafe/MarkupSafe-&MarkupSafe-version;.tar.gz">
   <!ENTITY MarkupSafe-download-ftp  " ">
-  <!ENTITY MarkupSafe-md5sum        "892e0fefa3c488387e5cc0cad2daa523">
+  <!ENTITY MarkupSafe-md5sum        "43fd756864fe42063068e092e220c57b">
   <!ENTITY MarkupSafe-size          "20 KB">
-  <!ENTITY MarkupSafe-buildsize     "360 KB">
+  <!ENTITY MarkupSafe-buildsize     "412 KB">
   <!ENTITY MarkupSafe-time          "less than 0.1 SBU">
 ]>
@@ -30,12 +30,5 @@
       </para>
 
-      <note revision="systemd">
-        <para>
-          <application>MarkupSafe</application> was installed in LFS.
-          The instruction is only kept here for SysV revision.
-        </para>
-      </note>
-
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -122,2 +115,3 @@
 
   </sect2>
+  <!--End MarkupSafe -->
Index: general/prog/mercurial.xml
===================================================================
--- general/prog/mercurial.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/mercurial.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY mercurial-download-http "https://www.mercurial-scm.org/release/mercurial-&mercurial-version;.tar.gz">
   <!ENTITY mercurial-download-ftp  " ">
-  <!ENTITY mercurial-md5sum        "47da24d4076609dcc43b9ef76999369c">
-  <!ENTITY mercurial-size          "7.7 MB">
-  <!ENTITY mercurial-buildsize     "77 MB (with docs, add 1.6 GB for tests)">
-  <!ENTITY mercurial-time          "0.3 SBU (with docs, add 17 SBU for tests using -j4)">
+  <!ENTITY mercurial-md5sum        "6cd6e5476a1de5701e162aba51534f0b">
+  <!ENTITY mercurial-size          "7.5 MB">
+  <!ENTITY mercurial-buildsize     "111 MB (with docs, add 1.3 GB for tests)">
+  <!ENTITY mercurial-time          "0.4 SBU (with docs, add 19 SBU for tests using -j4)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,8 +35,8 @@
       <application>Bazaar</application>. <application>Mercurial</application>
       is written in <application>Python</application> and is used by projects
-      such as Mozilla for Firefox and Thunderbird.
-    </para>
-
-    &lfs110a_checked;
+      such as Mozilla and Vim.
+    </para>
+
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -157,5 +158,5 @@
       from now on, there will be no more such failures whether you use the
       debug switch or not. 
-      Two tests, test-duplicateoptions.py and test-removeemptydirs.t, are known to fail.
+      <!--One test, test-doctest.py, is known to fail.-->
     </para>
 
@@ -298,5 +299,5 @@
         <listitem>
           <para>
-            is the mercurial version control system
+            is the mercurial version control system.
           </para>
           <indexterm zone="mercurial hg">
Index: general/prog/nasm.xml
===================================================================
--- general/prog/nasm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/nasm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY nasm-download-http "https://www.nasm.us/pub/nasm/releasebuilds/&nasm-version;/nasm-&nasm-version;.tar.xz">
+  <!ENTITY nasm-download-http "http://www.nasm.us/pub/nasm/releasebuilds/&nasm-version;/nasm-&nasm-version;.tar.xz">
   <!ENTITY nasm-download-ftp  " ">
   <!ENTITY nasm-md5sum        "1c9802446d7341c41c21eb98c7859064">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -76,5 +77,5 @@
         <para>
           Optional documentation: <ulink
-          url="https://www.nasm.us/pub/nasm/releasebuilds/&nasm-version;/nasm-&nasm-version;-xdoc.tar.xz"/>
+          url="http://www.nasm.us/pub/nasm/releasebuilds/&nasm-version;/nasm-&nasm-version;-xdoc.tar.xz"/>
         </para>
       </listitem>
@@ -160,5 +161,5 @@
         <listitem>
           <para>
-            is a portable 80x86 assembler
+            is a portable 80x86 assembler.
           </para>
           <indexterm zone="nasm nasm-prog">
@@ -172,5 +173,5 @@
         <listitem>
           <para>
-            is an 80x86 binary file disassembler
+            is an 80x86 binary file disassembler.
           </para>
           <indexterm zone="nasm ndisasm">
Index: general/prog/ojdk-conf.xml
===================================================================
--- general/prog/ojdk-conf.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/ojdk-conf.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: general/prog/openjdk.xml
===================================================================
--- general/prog/openjdk.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/openjdk.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,20 +5,20 @@
   %general-entities;
 
-  <!ENTITY ojdk-tarball              "jdk-&openjdk-version;-ga.tar.gz">
-  <!ENTITY ojdk-repo                 "https://github.com/openjdk/jdk16u">
+  <!ENTITY ojdk-tarball              "jdk-&openjdk-version;+&openjdk-build;.tar.bz2">
+  <!ENTITY ojdk-repo                 "http://hg.openjdk.java.net/jdk-updates/jdk14u">
   <!ENTITY ojdk-download             "&ojdk-repo;/archive/&ojdk-tarball;">
 
   <!ENTITY anduin-download           "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
 
-  <!ENTITY ojdk-md5sum               "08b1c057136a6756cd8e4609dc517339">
-  <!ENTITY ojdk-size                 "100 MB">
-
-  <!ENTITY jtreg-version             "4.2.0-tip">
+  <!ENTITY ojdk-md5sum               "bf287746bb1be5e0d94c27e3d79d800e">
+  <!ENTITY ojdk-size                 "80 MB">
+
+  <!ENTITY jtreg-version             "4.2-b13-517">
   <!ENTITY jtreg-download            "&anduin-download;/jtreg-&jtreg-version;.tar.gz">
-  <!ENTITY jtreg-md5sum              "11818f2ae4be19d2c7ae6501be60ee98">
-  <!ENTITY jtreg-size                "6.9 MB">
-
-  <!ENTITY ojdk-bdsize               "4.7 GB (add 456 MB for tests)">
-  <!ENTITY ojdk-time                 "5.2 SBU with 4 jobs (add 59 SBU for tests with 4 jobs)">
+  <!ENTITY jtreg-md5sum              "ffcef8f1caa5c22f4d006fb82e074de4">
+  <!ENTITY jtreg-size                "6.8 MB">
+
+  <!ENTITY ojdk-bdsize               "5.3 GB (an additional 394 MB for tests)">
+  <!ENTITY ojdk-time                 "4.5 SBU with 4 jobs (an additional 51 SBU for tests with 4 jobs)">
 ]>
 
@@ -27,4 +27,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -47,5 +48,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <para>
@@ -152,5 +153,5 @@
       </listitem>
     </itemizedlist>
-<!-- 
+
     <bridgehead renderas="sect4">Required patch</bridgehead>
 
@@ -162,5 +163,5 @@
       </listitem>
     </itemizedlist>
--->
+
     <bridgehead renderas="sect3">OpenJDK Dependencies</bridgehead>
 
@@ -194,8 +195,6 @@
       <xref linkend="graphviz"/>,
       <xref linkend="mercurial"/>,
-<!-- not needed now, it seems
       an X Window manager such as <xref linkend="twm"/> (for the tests), and
--->   <ulink url="https://pandoc.org/">pandoc</ulink>, and
-      <ulink url="https://zlib.net/pigz">pigz</ulink>
+      <ulink url="https://pandoc.org/">pandoc</ulink>
     </para>
 
@@ -213,5 +212,5 @@
 
 <screen><userinput>tar -xf ../jtreg-&jtreg-version;.tar.gz</userinput></screen>
-<!--
+
     <para>
       Apply a patch to allow building with make-4.3:
@@ -226,5 +225,5 @@
 <screen><userinput>sed -i /sysctl/d \
     src/jdk.incubator.jpackage/unix/native/libapplauncher/PosixPlatform.cpp</userinput></screen>
--->
+
     <note>
       <para>
@@ -239,7 +238,7 @@
 
       <para>
-        The build system does not allow the <option>-j</option> switch in
+        The build system does not support the <option>-j</option> switch in
         <envar>MAKEFLAGS</envar>. See the command explanation for
-        <option>--with-jobs=</option>
+        <option>--with-jobs=</option> and <option>--with-test-jobs=</option>
         for more information on customizing parallelization.
       </para>
@@ -253,4 +252,5 @@
 <screen><userinput>unset JAVA_HOME                                       &amp;&amp;
 bash configure --enable-unlimited-crypto              \
+               --with-extra-cflags="$CFLAGS -fcommon" \
                --disable-warnings-as-errors           \
                --with-stdc++lib=dynamic               \
@@ -371,10 +371,11 @@
       It is not executable and must be run through <command>bash</command>.
     </para>
-<!-- Not needed in openjdk-15
-    <para>
-      <parameter>- -with-extra-cflags=-fcommon</parameter>: Allows building
+
+    <para>
+      <parameter>--with-extra-cflags=-fcommon</parameter>: Allows building
       with GCC 10.
-    </para>
--->
+      <!-- patchs are available upstream and will be included in java 15 -->
+    </para>
+
     <para>
       <parameter>--enable-unlimited-crypto</parameter>: Because of limitations
@@ -446,10 +447,10 @@
       not needed if <command>java</command> is found in the <envar>PATH</envar>.
     </para>
-<!-- Seems to have disappeared
+
     <para>
       <command>find ... -iname '*.diz' -delete</command>: This command
       removes redundant files.
     </para>
--->
+
   </sect2>
 
@@ -520,7 +521,7 @@
       <seglistitem>
         <seg>jaotc, jar, jarsigner, java, javac, javadoc, javap, jcmd,
-        jconsole, jdb, jdeprscan, jdeps, jfr, jhsdb, jimage, jinfo,
+        jconsole, jdb, jdeprscan, jdeps, jfr, jhsdb, jimage, jinfo, jjs,
 	jlink, jmap, jmod, jpackage, jps, jrunscript, jshell, jstack,
-	jstat, jstatd, keytool, rmid, rmiregistry, and serialver</seg>
+	jstat, jstatd, keytool, rmic, rmid, rmiregistry, and serialver</seg>
         <seg>/opt/jdk-&openjdk-version;/lib/*</seg>
         <seg>/opt/jdk-&openjdk-version;</seg>
@@ -537,5 +538,5 @@
         <listitem>
           <para>
-            is an <quote>ahead-of-time</quote> java class compiler
+            is an <quote>ahead-of-time</quote> java class compiler.
           </para>
           <indexterm zone="openjdk jaotc">
@@ -549,5 +550,5 @@
         <listitem>
           <para>
-            combines multiple files into a single jar archive
+            combines multiple files into a single jar archive.
           </para>
           <indexterm zone="openjdk jar">
@@ -562,5 +563,5 @@
           <para>
             signs jar files and verifies the signatures and integrity
-            of a signed jar file
+            of a signed jar file.
           </para>
           <indexterm zone="openjdk jarsigner">
@@ -576,5 +577,5 @@
             launches a Java application by starting a Java runtime
             environment, loading a specified class and invoking its main
-            method
+            method.
           </para>
           <indexterm zone="openjdk java-prog">
@@ -590,5 +591,5 @@
             reads class and interface definitions, written in the
             Java programming language, and compiles them into bytecode
-            class files
+            class files.
           </para>
           <indexterm zone="openjdk javac">
@@ -605,5 +606,5 @@
             set of Java source files and produces a corresponding set of
             HTML pages describing the classes, interfaces, constructors,
-            methods, and fields
+            methods, and fields.
           </para>
           <indexterm zone="openjdk javadoc">
@@ -617,5 +618,5 @@
         <listitem>
           <para>
-            disassembles a Java class file
+            disassembles a Java class file.
           </para>
           <indexterm zone="openjdk javap">
@@ -630,5 +631,5 @@
           <para>
             is a utility to send diagnostic command requests to a running
-            Java Virtual Machine
+            Java Virtual Machine.
           </para>
           <indexterm zone="openjdk jcmd">
@@ -643,5 +644,5 @@
           <para>
             is a graphical console tool to monitor and manage both
-            local and remote Java applications and virtual machines
+            local and remote Java applications and virtual machines.
           </para>
           <indexterm zone="openjdk jconsole">
@@ -655,5 +656,5 @@
         <listitem>
           <para>
-            is a simple command-line debugger for Java classes
+            is a simple command-line debugger for Java classes.
           </para>
           <indexterm zone="openjdk jdb">
@@ -667,5 +668,5 @@
         <listitem>
           <para>
-            scans class or jar files for uses of deprecated API elements
+            scans class or jar files for uses of deprecated API elements.
           </para>
           <indexterm zone="openjdk jdeprscan">
@@ -680,5 +681,5 @@
           <para>
             shows the package-level or class-level dependencies of
-            Java class files
+            Java class files.
           </para>
           <indexterm zone="openjdk jdeps">
@@ -692,5 +693,5 @@
         <listitem>
           <para>
-            is a tool for working with <quote>Flight Recorder</quote> files
+            is a tool for working with <quote>Flight Recorder</quote> files.
           </para>
           <indexterm zone="openjdk jfr">
@@ -705,5 +706,5 @@
           <para>
             is a tool to analyze the content of a core dump from a
-            crashed Java Virtual Machine (JVM)
+            crashed Java Virtual Machine (JVM).
           </para>
           <indexterm zone="openjdk jhsdb">
@@ -718,5 +719,5 @@
           <para>
             is used to list, extract, verify, or get information about
-            modules in <emphasis>jimage</emphasis> format
+            modules in <emphasis>jimage</emphasis> format.
           </para>
           <indexterm zone="openjdk jimage">
@@ -731,5 +732,5 @@
           <para>
             prints Java configuration information for a given Java
-            process, core file, or a remote debug server
+            process, core file, or a remote debug server.
           </para>
           <indexterm zone="openjdk jinfo">
@@ -738,5 +739,5 @@
         </listitem>
       </varlistentry>
-<!--
+
       <varlistentry id="jjs">
         <term><command>jjs</command></term>
@@ -752,5 +753,5 @@
         </listitem>
       </varlistentry>
--->
+
       <varlistentry id="jlink">
         <term><command>jlink</command></term>
@@ -758,5 +759,5 @@
           <para>
             is used to assemble and optimize a set of modules and their
-            dependencies into a custom runtime image
+            dependencies into a custom runtime image.
           </para>
           <indexterm zone="openjdk jlink">
@@ -771,5 +772,5 @@
           <para>
             prints shared object memory maps or heap memory details
-            of a given process, core file, or a remote debug server
+            of a given process, core file, or a remote debug server.
           </para>
           <indexterm zone="openjdk jmap">
@@ -783,5 +784,5 @@
         <listitem>
           <para>
-            creates JMOD files and lists the content of existing JMOD files
+            creates JMOD files and lists the content of existing JMOD files.
           </para>
           <indexterm zone="openjdk jmod">
@@ -795,5 +796,5 @@
         <listitem>
           <para>
-            generates java application packages and images
+            generates java application packages and images.
           </para>
           <indexterm zone="openjdk jpackage">
@@ -807,5 +808,5 @@
         <listitem>
           <para>
-            lists the instrumented JVMs on the target system
+            lists the instrumented JVMs on the target system.
           </para>
           <indexterm zone="openjdk jps">
@@ -819,5 +820,5 @@
         <listitem>
           <para>
-            is a command line script shell
+            is a command line script shell.
           </para>
           <indexterm zone="openjdk jrunscript">
@@ -832,5 +833,5 @@
           <para>
             is an interactive tool for learning the Java programming
-            language and prototyping Java code
+            language and prototyping Java code.
           </para>
           <indexterm zone="openjdk jshell">
@@ -845,5 +846,5 @@
           <para>
             prints Java stack traces of Java threads for a given
-            Java process, core file, or a remote debug server
+            Java process, core file, or a remote debug server.
           </para>
           <indexterm zone="openjdk jstack">
@@ -857,5 +858,5 @@
         <listitem>
           <para>
-            displays performance statistics for an instrumented JVM
+            displays performance statistics for an instrumented JVM.
           </para>
           <indexterm zone="openjdk jstat">
@@ -870,5 +871,5 @@
           <para>
             is an RMI server application that monitors for the creation
-            and termination of instrumented JVMs
+            and termination of instrumented JVMs.
           </para>
           <indexterm zone="openjdk jstatd">
@@ -882,5 +883,5 @@
         <listitem>
           <para>
-            is a key and certificate management utility
+            is a key and certificate management utility.
           </para>
           <indexterm zone="openjdk keytool">
@@ -902,5 +903,5 @@
         </listitem>
       </varlistentry>
-
+      -->
       <varlistentry id="rmic">
         <term><command>rmic</command></term>
@@ -916,10 +917,10 @@
         </listitem>
       </varlistentry>
-      -->
+
       <varlistentry id="rmid">
         <term><command>rmid</command></term>
         <listitem>
           <para>
-            starts the activation system daemon
+            starts the activation system daemon.
           </para>
           <indexterm zone="openjdk rmid">
@@ -934,5 +935,5 @@
           <para>
             creates and starts a remote object registry on the specified
-            port on the current host
+            port on the current host.
           </para>
           <indexterm zone="openjdk rmiregistry">
@@ -947,5 +948,5 @@
           <para>
             returns the serialVersionUID for one or more classes in a
-            form suitable for copying into an evolving class
+            form suitable for copying into an evolving class.
           </para>
           <indexterm zone="openjdk serialver">
Index: general/prog/perl-deps.xml
===================================================================
--- general/prog/perl-deps.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -372,9 +373,4 @@
       <listitem>
         <para>
-          <xref linkend="perl-scalar-list-utils"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
           <xref linkend="perl-scope-guard"/>
         </para>
@@ -742,7 +738,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-scalar-list-utils.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="perl-deps/perl-scope-guard.xml"/>
 
Index: general/prog/perl-deps/perl-algorithm-diff.xml
===================================================================
--- general/prog/perl-deps/perl-algorithm-diff.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-algorithm-diff.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY my-download-http "&metacpan_authors;/R/RJ/RJBS//Algorithm-Diff-&Algorithm-Diff-version;.tar.gz">
-  <!ENTITY my-md5sum "2eaae910f5220261ee2bbdfc4a8df2c2">
+  <!ENTITY my-download-http "&metacpan_authors;/T/TY/TYEMQ//Algorithm-Diff-&Algorithm-Diff-version;.tar.gz">
+  <!ENTITY my-md5sum "0e8add21a641b8d66436df0c2024bf3b">
 
 ]>
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-alien-build.xml
===================================================================
--- general/prog/perl-deps/perl-alien-build.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-alien-build.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/P/PL/PLICEASE/Alien-Build-&Alien-Build-version;.tar.gz">
-  <!ENTITY my-md5sum "fb974a4bc386e1543223e7db70821122">
+  <!ENTITY my-md5sum "e756cbe05bddf49cec5aacd98f924c73">
 
 ]>
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-alien-libxml2.xml
===================================================================
--- general/prog/perl-deps/perl-alien-libxml2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-alien-libxml2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/P/PL/PLICEASE/Alien-Libxml2-&Alien-Libxml2-version;.tar.gz">
-  <!ENTITY my-md5sum "5fee0bd3a987a1e7f40ce50016c10c8a">
+  <!ENTITY my-md5sum "746d7452f1bbdd2707f07319ae4a5444">
 
 ]>
@@ -28,5 +28,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -49,6 +49,5 @@
       <para role="required">
         <xref linkend="perl-alien-build"/>,
-        <xref linkend="libxml2"/>,
-        <xref linkend="perl-path-tiny"/>
+        <xref linkend="libxml2"/>
       </para>
 
Index: general/prog/perl-deps/perl-b-cow.xml
===================================================================
--- general/prog/perl-deps/perl-b-cow.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-b-cow.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-b-hooks-endofscope.xml
===================================================================
--- general/prog/perl-deps/perl-b-hooks-endofscope.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-b-hooks-endofscope.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-business-isbn-data.xml
===================================================================
--- general/prog/perl-deps/perl-business-isbn-data.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-business-isbn-data.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/B/BD/BDFOY/Business-ISBN-Data-&Business-ISBN-Data-version;.tar.gz">
-  <!ENTITY my-md5sum "a3c6d1ff77eb33d63a35f1a1564530b8">
+  <!ENTITY my-md5sum "393d2c45792854ad43eeaf172cb3dbb6">
 
 ]>
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-capture-tiny.xml
===================================================================
--- general/prog/perl-deps/perl-capture-tiny.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-capture-tiny.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-class-data-inheritable.xml
===================================================================
--- general/prog/perl-deps/perl-class-data-inheritable.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-class-data-inheritable.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -28,5 +28,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-class-inspector.xml
===================================================================
--- general/prog/perl-deps/perl-class-inspector.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-class-inspector.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-class-singleton.xml
===================================================================
--- general/prog/perl-deps/perl-class-singleton.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-class-singleton.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/S/SH/SHAY/Class-Singleton-&Class-Singleton-version;.tar.gz">
-  <!ENTITY my-md5sum "d9c84a7b8d1c490c38e88ed1f9faae47">
+  <!ENTITY my-md5sum "6a2524f590eda075f4bc929598119241">
 
 ]>
@@ -28,5 +28,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-class-tiny.xml
===================================================================
--- general/prog/perl-deps/perl-class-tiny.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-class-tiny.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 <!-- FIXME This does not seem to be needed -->
   <!ENTITY my-download-http "&metacpan_authors;/D/DA/DAGOLDEN/Class-Tiny-&Class-Tiny-version;.tar.gz">
-  <!ENTITY my-md5sum "e3ccfae5f64d443e7e1110be964d7202">
+  <!ENTITY my-md5sum "fa905646a85a1478b2db1fc9113cb6ac">
 
 ]>
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-clone.xml
===================================================================
--- general/prog/perl-deps/perl-clone.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-clone.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -29,5 +29,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-config-autoconf.xml
===================================================================
--- general/prog/perl-deps/perl-config-autoconf.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-config-autoconf.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY my-download-http "&metacpan_authors;/A/AM/AMBS/Config-AutoConf-&Config-AutoConf-version;.tar.gz">
-  <!ENTITY my-md5sum "71664b2864232e265179ac29298e0916">
+  <!ENTITY my-download-http "&metacpan_authors;/R/RE/REHSACK/Config-AutoConf-&Config-AutoConf-version;.tar.gz">
+  <!ENTITY my-md5sum "0bea721ad3996e20324b84b3b924ec71">
 
 ]>
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-cpan-meta-check.xml
===================================================================
--- general/prog/perl-deps/perl-cpan-meta-check.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-cpan-meta-check.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-datetime-format-strptime.xml
===================================================================
--- general/prog/perl-deps/perl-datetime-format-strptime.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-datetime-format-strptime.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/D/DR/DROLSKY/DateTime-Format-Strptime-&DateTime-Format-Strptime-version;.tar.gz">
-  <!ENTITY my-md5sum "441cfec62b0b8a1b4c05cbe5ef73fbf4">
+  <!ENTITY my-md5sum "891c38cdbe0a30291ed4afe711a17e3b">
 
 ]>
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-datetime-locale.xml
===================================================================
--- general/prog/perl-deps/perl-datetime-locale.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-datetime-locale.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/D/DR/DROLSKY/DateTime-Locale-&DateTime-Locale-version;.tar.gz">
-  <!ENTITY my-md5sum "23ba33ef2d40f349f213ed00680f86aa">
+  <!ENTITY my-md5sum "307505aad3d47b8adaee7045f0b76820">
 
 ]>
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -58,6 +58,7 @@
       <para role="recommended">
         <xref linkend="perl-cpan-meta-check"/>,
-        <xref linkend="perl-ipc-system-simple"/> and
-        <xref linkend="perl-test-file-sharedir"/>
+        <xref linkend="perl-ipc-system-simple"/>,
+        <xref linkend="perl-test-file-sharedir"/> and
+        <xref linkend="perl-test-warnings"/>
       </para>
 
Index: general/prog/perl-deps/perl-datetime-timezone.xml
===================================================================
--- general/prog/perl-deps/perl-datetime-timezone.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-datetime-timezone.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/D/DR/DROLSKY/DateTime-TimeZone-&DateTime-TimeZone-version;.tar.gz">
-  <!ENTITY my-md5sum "3ba0c9f5aeae945d2111f28333bd1a3d">
+  <!ENTITY my-md5sum "ad84a62ee01dec5efa9af00b596ffc1d">
 
 ]>
@@ -28,5 +28,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-datetime.xml
===================================================================
--- general/prog/perl-deps/perl-datetime.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-datetime.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/D/DR/DROLSKY/DateTime-&DateTime-version;.tar.gz">
-  <!ENTITY my-md5sum "5b90d9b26741da2627b8d002d8796f95">
+  <!ENTITY my-md5sum "f18d180e2d7e5110f75e7a20955588f3">
 
 ]>
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-devel-stacktrace.xml
===================================================================
--- general/prog/perl-deps/perl-devel-stacktrace.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-devel-stacktrace.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-dist-checkconflicts.xml
===================================================================
--- general/prog/perl-deps/perl-dist-checkconflicts.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-dist-checkconflicts.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-encode-locale.xml
===================================================================
--- general/prog/perl-deps/perl-encode-locale.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-encode-locale.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-eval-closure.xml
===================================================================
--- general/prog/perl-deps/perl-eval-closure.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-eval-closure.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-exception-class.xml
===================================================================
--- general/prog/perl-deps/perl-exception-class.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-exception-class.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/D/DR/DROLSKY/Exception-Class-&Exception-Class-version;.tar.gz">
-  <!ENTITY my-md5sum "1e564d20b374a99fdf660ba3f36b0098">
+  <!ENTITY my-md5sum "6b5bb8e4ad2b1f6120fc1d33ae45e91b">
 
 ]>
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-exporter-tiny.xml
===================================================================
--- general/prog/perl-deps/perl-exporter-tiny.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-exporter-tiny.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-extutils-libbuilder.xml
===================================================================
--- general/prog/perl-deps/perl-extutils-libbuilder.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-extutils-libbuilder.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-ffi-checklib.xml
===================================================================
--- general/prog/perl-deps/perl-ffi-checklib.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-ffi-checklib.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/P/PL/PLICEASE/FFI-CheckLib-&FFI-CheckLib-version;.tar.gz">
-  <!ENTITY my-md5sum "f1098652dedd0b4616262524fa05a948">
+  <!ENTITY my-md5sum "b2e3fc6f762e458d348e98ace632d841">
 
 ]>
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-file-chdir.xml
===================================================================
--- general/prog/perl-deps/perl-file-chdir.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-file-chdir.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -33,5 +33,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-file-copy-recursive.xml
===================================================================
--- general/prog/perl-deps/perl-file-copy-recursive.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-file-copy-recursive.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -28,5 +28,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-file-find-rule.xml
===================================================================
--- general/prog/perl-deps/perl-file-find-rule.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-file-find-rule.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -83,5 +83,5 @@
           <listitem>
             <para>
-              is a command line wrapper to File::Find::Rule
+              is a command line wrapper to File::Find::Rule.
             </para>
             <indexterm zone="perl-file-find-rule findrule-prog">
Index: general/prog/perl-deps/perl-file-listing.xml
===================================================================
--- general/prog/perl-deps/perl-file-listing.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-file-listing.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY my-download-http "&metacpan_authors;/P/PL/PLICEASE/File-Listing-&File-Listing-version;.tar.gz">
-  <!ENTITY my-md5sum "cf60a79563185391831613178a79b4cd">
+  <!ENTITY my-download-http "&metacpan_authors;/G/GA/GAAS/File-Listing-&File-Listing-version;.tar.gz">
+  <!ENTITY my-md5sum "83f636b477741f3a014585bb9cc079a6">
 
 ]>
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-file-sharedir-install.xml
===================================================================
--- general/prog/perl-deps/perl-file-sharedir-install.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-file-sharedir-install.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-file-sharedir.xml
===================================================================
--- general/prog/perl-deps/perl-file-sharedir.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-file-sharedir.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/R/RE/REHSACK/File-ShareDir-&File-ShareDir-version;.tar.gz">
-  <!ENTITY my-md5sum "0084f730f4e3d4d89703d92b3ea82f54">
+  <!ENTITY my-md5sum "f2a0eee9f04c93753dd56437175e5bda">
 
 ]>
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-html-tagset.xml
===================================================================
--- general/prog/perl-deps/perl-html-tagset.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-html-tagset.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-http-cookies.xml
===================================================================
--- general/prog/perl-deps/perl-http-cookies.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-http-cookies.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/O/OA/OALDERS/HTTP-Cookies-&HTTP-Cookies-version;.tar.gz">
-  <!ENTITY my-md5sum "b4d7804231b1dfd10999d42283e0cf06">
+  <!ENTITY my-md5sum "8c663710244e70c85775393a8f5be443">
 
 ]>
@@ -29,5 +29,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-http-date.xml
===================================================================
--- general/prog/perl-deps/perl-http-date.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-http-date.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-http-message.xml
===================================================================
--- general/prog/perl-deps/perl-http-message.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-http-message.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY my-download-http "&metacpan_authors;/O/OA/OALDERS/HTTP-Message-&HTTP-Message-version;.tar.gz">
-  <!ENTITY my-md5sum "e291f19e9532ffb7d1c80eab786bf0f2">
+  <!ENTITY my-download-http "&metacpan_authors;/E/ET/ETHER/HTTP-Message-&HTTP-Message-version;.tar.gz">
+  <!ENTITY my-md5sum "8847fe62ec103a242d39194c9e3c647e">
 
 ]>
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-http-negotiate.xml
===================================================================
--- general/prog/perl-deps/perl-http-negotiate.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-http-negotiate.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-importer.xml
===================================================================
--- general/prog/perl-deps/perl-importer.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-importer.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/E/EX/EXODIST/Importer-&Importer-version;.tar.gz">
-  <!ENTITY my-md5sum "3f09930b82cadfe26d0ce2fb1338aa1b">
+  <!ENTITY my-md5sum "09660fe32701e28ee149258315de0262">
 
 ]>
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-io-html.xml
===================================================================
--- general/prog/perl-deps/perl-io-html.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-io-html.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/C/CJ/CJM/IO-HTML-&IO-HTML-version;.tar.gz">
-  <!ENTITY my-md5sum "04bbe363686fd19bfb4cc0ed775e3d03">
+  <!ENTITY my-md5sum "3f8958718844dc96b9f6946f21d70d22">
 
 ]>
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-ipc-system-simple.xml
===================================================================
--- general/prog/perl-deps/perl-ipc-system-simple.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-ipc-system-simple.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-libwww-perl.xml
===================================================================
--- general/prog/perl-deps/perl-libwww-perl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-libwww-perl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/O/OA/OALDERS/libwww-perl-&libwww-perl-version;.tar.gz">
-  <!ENTITY my-md5sum "4df22c50511a3f01063d2ba4d91bfbec">
+  <!ENTITY my-md5sum "334212e7f6dabf95a77b333c7cf8fbe4">
 
 ]>
@@ -34,5 +34,5 @@
       <!-- For CPAN, this may be pulled in with 'cpan -i Bundle::LWP'  -->
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -112,5 +112,5 @@
           <listitem>
             <para>
-              is a script to fetch a large file from the web
+              is a script to fetch a large file from the web.
             </para>
             <!-- the -prog is for while (old) and new- perl module pages
@@ -128,5 +128,5 @@
           <listitem>
             <para>
-              is used to see what headers and content is returned for a URL
+              is used to see what headers and content is returned for a URL.
             </para>
             <indexterm zone="perl-libwww-perl lwp-dump-prog">
@@ -140,5 +140,5 @@
           <listitem>
             <para>
-              is a simple mirror utility
+              is a simple mirror utility.
             </para>
             <indexterm zone="perl-libwww-perl lwp-mirror-prog">
@@ -152,5 +152,5 @@
           <listitem>
             <para>
-              is a simple command line user agent
+              is a simple command line user agent.
             </para>
             <indexterm zone="perl-libwww-perl lwp-request-prog">
Index: general/prog/perl-deps/perl-list-moreutils-xs.xml
===================================================================
--- general/prog/perl-deps/perl-list-moreutils-xs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-list-moreutils-xs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-list-someutils-xs.xml
===================================================================
--- general/prog/perl-deps/perl-list-someutils-xs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-list-someutils-xs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-list-someutils.xml
===================================================================
--- general/prog/perl-deps/perl-list-someutils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-list-someutils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-list-utilsby.xml
===================================================================
--- general/prog/perl-deps/perl-list-utilsby.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-list-utilsby.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-lwp-mediatypes.xml
===================================================================
--- general/prog/perl-deps/perl-lwp-mediatypes.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-lwp-mediatypes.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-mime-charset.xml
===================================================================
--- general/prog/perl-deps/perl-mime-charset.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-mime-charset.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-module-implementation.xml
===================================================================
--- general/prog/perl-deps/perl-module-implementation.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-module-implementation.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -28,5 +28,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-module-pluggable.xml
===================================================================
--- general/prog/perl-deps/perl-module-pluggable.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-module-pluggable.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-module-runtime.xml
===================================================================
--- general/prog/perl-deps/perl-module-runtime.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-module-runtime.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-mro-compat.xml
===================================================================
--- general/prog/perl-deps/perl-mro-compat.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-mro-compat.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -28,5 +28,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-namespace-autoclean.xml
===================================================================
--- general/prog/perl-deps/perl-namespace-autoclean.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-namespace-autoclean.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -29,5 +29,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-namespace-clean.xml
===================================================================
--- general/prog/perl-deps/perl-namespace-clean.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-namespace-clean.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-net-http.xml
===================================================================
--- general/prog/perl-deps/perl-net-http.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-net-http.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/O/OA/OALDERS/Net-HTTP-&Net-HTTP-version;.tar.gz">
-  <!ENTITY my-md5sum "dbe27483034a79a7d43f61cc48540641">
+  <!ENTITY my-md5sum "6cbebcc76099ce822f0aa7764af11f73">
 
 ]>
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-net-ssleay.xml
===================================================================
--- general/prog/perl-deps/perl-net-ssleay.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-net-ssleay.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/C/CH/CHRISN/Net-SSLeay-&Net-SSLeay-version;.tar.gz">
-  <!ENTITY my-md5sum "00f57f3feb02e4fb7d282f9d6ae2beb2">
+  <!ENTITY my-md5sum "fcef4985f5f7e0381e3dddd0ee7878d1">
 
 ]>
@@ -37,5 +37,5 @@
       </itemizedlist>-->
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-number-compare.xml
===================================================================
--- general/prog/perl-deps/perl-number-compare.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-number-compare.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -28,5 +28,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-package-stash.xml
===================================================================
--- general/prog/perl-deps/perl-package-stash.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-package-stash.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/E/ET/ETHER/Package-Stash-&Package-Stash-version;.tar.gz">
-  <!ENTITY my-md5sum "287d80c9115c9230912aca684f8ca92e">
+  <!ENTITY my-md5sum "dc2d802eea2cb0b52ed9c4dd178761dd">
 
 ]>
@@ -28,5 +28,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -51,12 +51,9 @@
         <xref linkend="perl-module-implementation"/>
       </para>
-      <!-- Note: requirements include Package::Stash::XS but it is ok without that
-           and happily skips the test which would use that. -->
 
       <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
       <para role="recommended">
-        <xref linkend="perl-cpan-meta-check"/>,
         <xref linkend="perl-test-fatal"/>,
-        <xref linkend="perl-test-needs"/>
+        <xref linkend="perl-test-requires"/>
       </para>
 
Index: general/prog/perl-deps/perl-params-validate.xml
===================================================================
--- general/prog/perl-deps/perl-params-validate.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-params-validate.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/D/DR/DROLSKY/Params-Validate-&Params-Validate-version;.tar.gz">
-  <!ENTITY my-md5sum "2f1f7f3a1845974d9fc44d16cac1a0fb">
+  <!ENTITY my-md5sum "cebbbbef30ef71af513ed7c2fb4faf43">
 
 ]>
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-params-validationcompiler.xml
===================================================================
--- general/prog/perl-deps/perl-params-validationcompiler.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-params-validationcompiler.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-path-tiny.xml
===================================================================
--- general/prog/perl-deps/perl-path-tiny.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-path-tiny.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/D/DA/DAGOLDEN/Path-Tiny-&Path-Tiny-version;.tar.gz">
-  <!ENTITY my-md5sum "cb34fd356725ec12b78e88ddac37db08">
+  <!ENTITY my-md5sum "dd6092293f8766fb87d003dceebe4263">
 
 ]>
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-role-tiny.xml
===================================================================
--- general/prog/perl-deps/perl-role-tiny.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-role-tiny.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/H/HA/HAARG/Role-Tiny-&Role-Tiny-version;.tar.gz">
-  <!ENTITY my-md5sum "9ee45591befa3d0b1094ac75d282b6ba">
+  <!ENTITY my-md5sum "98446826608b1e943e65c1f6e35942fe">
 
 ]>
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: neral/prog/perl-deps/perl-scalar-list-utils.xml
===================================================================
--- general/prog/perl-deps/perl-scalar-list-utils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?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 my-download-http "&metacpan_authors;/P/PE/PEVANS/Scalar-List-Utils-&Scalar-List-Utils-version;.tar.gz">
-  <!ENTITY my-md5sum "284a30ac6dfd99a03025fd0edc6cb1ed">
-
-]>
-
-  <!-- Begin i~Scalar::List::Utils -->
-  <sect2 id="perl-scalar-list-utils" xreflabel="Scalar-List-Utils-&Scalar-List-Utils-version;">
-
-    <title>Scalar::List::Utils-&Scalar-List-Utils-version;</title>
-
-    <indexterm zone="perl-scalar-list-utils">
-      <primary sortas="a-Scalar-List-Utils">Scalar::List::Utils</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Scalar::List::Utils</title>
-
-      <para>
-        Scalar::List::Utils provides a selection of list and scalar subroutines.
-      </para>
-
-      <para>
-        <!-- FIXME : List::AllUtils-0.19 requires >= 1.56, perl-5.34.0 only has 1.55 -->
-        The module List::Util from this distribution is part of core perl, but
-        <xref linkend="perl-list-allutils"/> requires a newer version than what
-        is in current perl.
-      </para>
-
-      &lfs110a_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Scalar::List::Utils</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-scope-guard.xml
===================================================================
--- general/prog/perl-deps/perl-scope-guard.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-scope-guard.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-specio.xml
===================================================================
--- general/prog/perl-deps/perl-specio.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-specio.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/D/DR/DROLSKY/Specio-&Specio-version;.tar.gz">
-  <!ENTITY my-md5sum "42a6734e5c02836f6d99646167694b96">
+  <!ENTITY my-md5sum "aca3a183b46b93a8ce02009a2ccd868b">
 
 ]>
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-sub-exporter-progressive.xml
===================================================================
--- general/prog/perl-deps/perl-sub-exporter-progressive.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-sub-exporter-progressive.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-sub-identify.xml
===================================================================
--- general/prog/perl-deps/perl-sub-identify.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-sub-identify.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-sub-info.xml
===================================================================
--- general/prog/perl-deps/perl-sub-info.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-sub-info.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-sub-quote.xml
===================================================================
--- general/prog/perl-deps/perl-sub-quote.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-sub-quote.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-sub-uplevel.xml
===================================================================
--- general/prog/perl-deps/perl-sub-uplevel.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-sub-uplevel.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-super.xml
===================================================================
--- general/prog/perl-deps/perl-super.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-super.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-term-table.xml
===================================================================
--- general/prog/perl-deps/perl-term-table.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-term-table.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-test-deep.xml
===================================================================
--- general/prog/perl-deps/perl-test-deep.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-test-deep.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-test-exception.xml
===================================================================
--- general/prog/perl-deps/perl-test-exception.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-test-exception.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-test-fatal.xml
===================================================================
--- general/prog/perl-deps/perl-test-fatal.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-test-fatal.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/R/RJ/RJBS/Test-Fatal-&Test-Fatal-version;.tar.gz">
-  <!ENTITY my-md5sum "da5d864c04a60e71de9ae51b318562fd">
+  <!ENTITY my-md5sum "7954f6d2e3607be10c0fbd69063a3d1b">
 
 ]>
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-test-file-sharedir.xml
===================================================================
--- general/prog/perl-deps/perl-test-file-sharedir.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-test-file-sharedir.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -31,5 +31,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-test-file.xml
===================================================================
--- general/prog/perl-deps/perl-test-file.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-test-file.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/B/BD/BDFOY/Test-File-&Test-File-version;.tar.gz">
-  <!ENTITY my-md5sum "b4701559a827f348f36b487867d2c528">
+  <!ENTITY my-md5sum "ec8c6f6e940b454e110aaaa663fc761c">
 
 ]>
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-test-leaktrace.xml
===================================================================
--- general/prog/perl-deps/perl-test-leaktrace.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-test-leaktrace.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/L/LE/LEEJO/Test-LeakTrace-&Test-LeakTrace-version;.tar.gz">
-  <!ENTITY my-md5sum "afdb2cc6be0807cb635fb601a004d522">
+  <!ENTITY my-md5sum "d58f3e0fed32df8255787a77d7d87641">
 
 ]>
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-test-mockmodule.xml
===================================================================
--- general/prog/perl-deps/perl-test-mockmodule.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-test-mockmodule.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/G/GF/GFRANKS/Test-MockModule-&Test-MockModule-version;.tar.gz">
-  <!ENTITY my-md5sum "f36bd9aee0349430c434dc1d06b03589">
+  <!ENTITY my-md5sum "efaa3e27d256d9811b81f5286b9ea459">
 
 ]>
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-test-needs.xml
===================================================================
--- general/prog/perl-deps/perl-test-needs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-test-needs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/H/HA/HAARG/Test-Needs-&Test-Needs-version;.tar.gz">
-  <!ENTITY my-md5sum "5643cd323afb77d20363acbaf9b12bcc">
+  <!ENTITY my-md5sum "d5c96d51d8d5510f7c0b7f354c49af1c">
 
 ]>
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-test-requires.xml
===================================================================
--- general/prog/perl-deps/perl-test-requires.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-test-requires.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-test-requiresinternet.xml
===================================================================
--- general/prog/perl-deps/perl-test-requiresinternet.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-test-requiresinternet.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-test-utf8.xml
===================================================================
--- general/prog/perl-deps/perl-test-utf8.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-test-utf8.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-test-warnings.xml
===================================================================
--- general/prog/perl-deps/perl-test-warnings.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-test-warnings.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/E/ET/ETHER/Test-Warnings-&Test-Warnings-version;.tar.gz">
-  <!ENTITY my-md5sum "f608f7011b0bb8f27d3a27e646a52f60">
+  <!ENTITY my-md5sum "d30550a4898499daf351f9cf31602121">
 
 ]>
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-test-without-module.xml
===================================================================
--- general/prog/perl-deps/perl-test-without-module.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-test-without-module.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -28,5 +28,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-test2-plugin-nowarnings.xml
===================================================================
--- general/prog/perl-deps/perl-test2-plugin-nowarnings.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-test2-plugin-nowarnings.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-test2-suite.xml
===================================================================
--- general/prog/perl-deps/perl-test2-suite.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-test2-suite.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/E/EX/EXODIST/Test2-Suite-&Test2-Suite-version;.tar.gz">
-  <!ENTITY my-md5sum "2ccca23d640361f9c6f4912d676f15c8">
+  <!ENTITY my-md5sum "37d02b6ab79abbfe5a4821c56a755255">
 
 ]>
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-text-csv_xs.xml
===================================================================
--- general/prog/perl-deps/perl-text-csv_xs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-text-csv_xs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,5 +7,5 @@
  <!-- .tgz -->
   <!ENTITY my-download-http "&metacpan_authors;/H/HM/HMBRAND/Text-CSV_XS-&Text-CSV_XS-version;.tgz">
-  <!ENTITY my-md5sum "147eb4e11237c848d31fdf36dc1fc364">
+  <!ENTITY my-md5sum "7ed1bfe174b8867bb0987625e9ed57bc">
 
 ]>
@@ -28,5 +28,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-text-diff.xml
===================================================================
--- general/prog/perl-deps/perl-text-diff.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-text-diff.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-text-glob.xml
===================================================================
--- general/prog/perl-deps/perl-text-glob.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-text-glob.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-tie-cycle.xml
===================================================================
--- general/prog/perl-deps/perl-tie-cycle.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-tie-cycle.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY my-download-http "&metacpan_authors;/B/BD/BDFOY/Tie-Cycle-&Tie-Cycle-version;.tar.gz">
-  <!ENTITY my-md5sum "474cbce228dde2e5253d322e0729baa6">
+  <!ENTITY my-download-http "&metacpan_authors;/B/BD/BDFOY/Tie-Cycle-1.225.tar.gz">
+  <!ENTITY my-md5sum "260fd7edbfefd14b40d27234cd59b6ee">
 
 ]>
@@ -28,5 +28,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-timedate.xml
===================================================================
--- general/prog/perl-deps/perl-timedate.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-timedate.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-try-tiny.xml
===================================================================
--- general/prog/perl-deps/perl-try-tiny.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-try-tiny.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -28,5 +28,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-variable-magic.xml
===================================================================
--- general/prog/perl-deps/perl-variable-magic.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-variable-magic.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-www-robotrules.xml
===================================================================
--- general/prog/perl-deps/perl-www-robotrules.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-www-robotrules.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -28,5 +28,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-xml-libxml.xml
===================================================================
--- general/prog/perl-deps/perl-xml-libxml.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-xml-libxml.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&metacpan_authors;/S/SH/SHLOMIF/XML-LibXML-&XML-LibXML-version;.tar.gz">
-  <!ENTITY my-md5sum "d943c3ff20e19c376f08adcbc4158019">
+  <!ENTITY my-md5sum "ae78cb614192c42fb8c4cdf5d735d181">
 
 ]>
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-xml-namespacesupport.xml
===================================================================
--- general/prog/perl-deps/perl-xml-namespacesupport.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-xml-namespacesupport.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-xml-sax-base.xml
===================================================================
--- general/prog/perl-deps/perl-xml-sax-base.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-xml-sax-base.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-deps/perl-xml-sax.xml
===================================================================
--- general/prog/perl-deps/perl-xml-sax.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-deps/perl-xml-sax.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -28,5 +28,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules.xml
===================================================================
--- general/prog/perl-modules.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: general/prog/perl-modules/perl-archive-zip.xml
===================================================================
--- general/prog/perl-modules/perl-archive-zip.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-archive-zip.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -87,5 +87,5 @@
             <para>
               computes and prints to stdout the CRC-32 values of the given
-              files
+              files.
             </para>
             <indexterm zone="perl-archive-zip crc32-prog">
Index: general/prog/perl-modules/perl-autovivification.xml
===================================================================
--- general/prog/perl-modules/perl-autovivification.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-autovivification.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -29,5 +29,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-business-isbn.xml
===================================================================
--- general/prog/perl-modules/perl-business-isbn.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-business-isbn.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&perl_authors;/id/B/BD/BDFOY/Business-ISBN-&Business-ISBN-version;.tar.gz">
-  <!ENTITY my-md5sum "9b9ecd69bc6157332836dc870217ac67">
+  <!ENTITY my-md5sum "d5528402f40ad01635d6031c3b580c8e">
 ]>
 
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-business-ismn.xml
===================================================================
--- general/prog/perl-modules/perl-business-ismn.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-business-ismn.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&perl_authors;/id/B/BD/BDFOY/Business-ISMN-&Business-ISMN-version;.tar.gz">
-  <!ENTITY my-md5sum "7a32381ddbf1cf58f260c3bcb3016bc3">
+  <!ENTITY my-md5sum "1653813a63f1de45a7b02b444d1f2932">
 
 ]>
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-business-issn.xml
===================================================================
--- general/prog/perl-modules/perl-business-issn.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-business-issn.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -28,5 +28,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-class-accessor.xml
===================================================================
--- general/prog/perl-modules/perl-class-accessor.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-class-accessor.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-data-compare.xml
===================================================================
--- general/prog/perl-modules/perl-data-compare.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-data-compare.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-data-dump.xml
===================================================================
--- general/prog/perl-modules/perl-data-dump.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-data-dump.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY my-download-http "&perl_authors;/id/G/GA/GARU/Data-Dump-&Data-Dump-version;.tar.gz">
-  <!ENTITY my-md5sum "9bd7131ef0441e1e0e001bf85e9fae31">
+  <!ENTITY my-download-http "&perl_authors;/id/G/GA/GAAS/Data-Dump-&Data-Dump-version;.tar.gz">
+  <!ENTITY my-md5sum "762c111e525c82ff23d62c90821b26e9">
 
 ]>
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-data-uniqid.xml
===================================================================
--- general/prog/perl-modules/perl-data-uniqid.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-data-uniqid.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-datetime-calendar-julian.xml
===================================================================
--- general/prog/perl-modules/perl-datetime-calendar-julian.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-datetime-calendar-julian.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&perl_authors;/id/W/WY/WYANT/DateTime-Calendar-Julian-&DateTime-Calendar-Julian-version;.tar.gz">
-  <!ENTITY my-md5sum "1f9effa9cba2b9b5df079fdfed588106">
+  <!ENTITY my-md5sum "5832fb4eb8b695dfedd7e24f8ccc17f0">
 
 ]>
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-datetime-format-builder.xml
===================================================================
--- general/prog/perl-modules/perl-datetime-format-builder.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-datetime-format-builder.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-encode-eucjpascii.xml
===================================================================
--- general/prog/perl-modules/perl-encode-eucjpascii.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-encode-eucjpascii.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-encode-hanextra.xml
===================================================================
--- general/prog/perl-modules/perl-encode-hanextra.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-encode-hanextra.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -30,5 +30,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-encode-jis2k.xml
===================================================================
--- general/prog/perl-modules/perl-encode-jis2k.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-encode-jis2k.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-file-slurper.xml
===================================================================
--- general/prog/perl-modules/perl-file-slurper.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-file-slurper.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-file-which.xml
===================================================================
--- general/prog/perl-modules/perl-file-which.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-file-which.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&perl_authors;/id/P/PL/PLICEASE/File-Which-&File-Which-version;.tar.gz">
-  <!ENTITY my-md5sum "d5c9154262b93398f0750ec364207639">
+  <!ENTITY my-md5sum "c8f054534c3c098dd7a0dada60aaae34">
 
 ]>
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-html-parser.xml
===================================================================
--- general/prog/perl-modules/perl-html-parser.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-html-parser.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY my-download-http "&perl_authors;/id/O/OA/OALDERS/HTML-Parser-&HTML-Parser-version;.tar.gz">
-  <!ENTITY my-md5sum "60e266d5a07fbea671a0383dd8af7b6c">
+  <!ENTITY my-download-http "&perl_authors;/id/C/CA/CAPOEIRAB/HTML-Parser-&HTML-Parser-version;.tar.gz">
+  <!ENTITY my-md5sum "65bf65aa8b34b35443e094010f991406">
 
 ]>
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-http-daemon.xml
===================================================================
--- general/prog/perl-modules/perl-http-daemon.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-http-daemon.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-io-socket-ssl.xml
===================================================================
--- general/prog/perl-modules/perl-io-socket-ssl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-io-socket-ssl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&perl_authors;/id/S/SU/SULLR/IO-Socket-SSL-&IO-Socket-SSL-version;.tar.gz">
-  <!ENTITY my-md5sum "4fb67fc8c4817dce8116f2eb7878fd9c">
+  <!ENTITY my-md5sum "4230c829c8875889848093b2b46a7284">
 
   <!ENTITY IO-Socket-SSL-download-http "&perl_authors;/id/S/SU/SULLR/IO-Socket-SSL-&IO-Socket-SSL-version;.tar.gz">
@@ -29,5 +29,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-io-string.xml
===================================================================
--- general/prog/perl-modules/perl-io-string.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-io-string.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-ipc-run3.xml
===================================================================
--- general/prog/perl-modules/perl-ipc-run3.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-ipc-run3.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-lingua-translit.xml
===================================================================
--- general/prog/perl-modules/perl-lingua-translit.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-lingua-translit.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -76,5 +76,5 @@
             <para>
               transliterates text between writing systems using various
-              standards
+              standards.
             </para>
             <indexterm zone="perl-lingua-translit translit-prog">
Index: general/prog/perl-modules/perl-list-allutils.xml
===================================================================
--- general/prog/perl-modules/perl-list-allutils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-list-allutils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&perl_authors;/id/D/DR/DROLSKY/List-AllUtils-&List-AllUtils-version;.tar.gz">
-  <!ENTITY my-md5sum "86469b1f6819ba181a8471eb932965f2">
+  <!ENTITY my-md5sum "9b1513c67e887cbf7e724dd5de427048">
 
 ]>
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -48,6 +48,5 @@
       <para role="required">
         <xref linkend="perl-list-someutils"/>,
-        <xref linkend="perl-list-utilsby"/>,
-        <xref linkend="perl-scalar-list-utils"/>
+        <xref linkend="perl-list-utilsby"/>
       </para>
 
Index: general/prog/perl-modules/perl-list-moreutils.xml
===================================================================
--- general/prog/perl-modules/perl-list-moreutils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-list-moreutils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-log-log4perl.xml
===================================================================
--- general/prog/perl-modules/perl-log-log4perl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-log-log4perl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&perl_authors;/id/E/ET/ETJ/Log-Log4perl-&Log-Log4perl-version;.tar.gz">
-  <!ENTITY my-md5sum "46c5a3a101921c25857f84585cd0b5c2">
+  <!ENTITY my-md5sum "48fcd8fa105af31d9e5247cb8e5b6ff1">
 ]>
 
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -75,5 +75,5 @@
             <para>
               prints out the text of a template Log4perl configuration for
-              starting a new Log4perl configuration file
+              starting a new Log4perl configuration file.
             </para>
             <indexterm zone="perl-log-log4perl l4p-templ-prog">
Index: general/prog/perl-modules/perl-lwp-protocol-https.xml
===================================================================
--- general/prog/perl-modules/perl-lwp-protocol-https.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-lwp-protocol-https.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -28,5 +28,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-module-build.xml
===================================================================
--- general/prog/perl-modules/perl-module-build.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-module-build.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -29,5 +29,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -87,5 +87,5 @@
           <listitem>
             <para>
-              is used to query or change the configuration of perl modules
+              is used to query or change the configuration of perl modules.
             </para>
             <indexterm zone="perl-module-build config-data-prog">
Index: general/prog/perl-modules/perl-net-dns.xml
===================================================================
--- general/prog/perl-modules/perl-net-dns.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-net-dns.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&perl_authors;/id/N/NL/NLNETLABS/Net-DNS-&Net-DNS-version;.tar.gz">
-  <!ENTITY my-md5sum "e8ee02ec42dfeb10ae4a0d175d5fcafc">
+  <!ENTITY my-md5sum "2c9120830a68f18deb43a95826ea6372">
 
 ]>
@@ -28,5 +28,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-parse-recdescent.xml
===================================================================
--- general/prog/perl-modules/perl-parse-recdescent.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-parse-recdescent.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-parse-yapp.xml
===================================================================
--- general/prog/perl-modules/perl-parse-yapp.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-parse-yapp.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -28,5 +28,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -77,5 +77,5 @@
             <para>
               is a frontend to the Parse::Yapp module, which lets you create
-              a Perl OO parser from an input grammar file
+              a Perl OO parser from an input grammar file.
             </para>
             <indexterm zone="perl-parse-yapp yapp-prog">
Index: general/prog/perl-modules/perl-perlio-utf8_strict.xml
===================================================================
--- general/prog/perl-modules/perl-perlio-utf8_strict.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-perlio-utf8_strict.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-regexp-common.xml
===================================================================
--- general/prog/perl-modules/perl-regexp-common.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-regexp-common.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-sgmlspm.xml
===================================================================
--- general/prog/perl-modules/perl-sgmlspm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-sgmlspm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -28,5 +28,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -91,5 +91,5 @@
           <listitem>
             <para>
-              is an SGML processor
+              is an SGML processor.
             </para>
             <indexterm zone="perl-sgmlspm sgmlspl.pl">
@@ -103,6 +103,6 @@
           <listitem>
             <para>
-              is a symbolic link used during the install of
-              <xref linkend="docbook-utils"/>
+              is a symbolic link used during the install of <xref
+              linkend="docbook-utils"/>.
             </para>
             <indexterm zone="perl-sgmlspm sgmlspl-prog">
Index: general/prog/perl-modules/perl-sort-key.xml
===================================================================
--- general/prog/perl-modules/perl-sort-key.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-sort-key.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-test-command.xml
===================================================================
--- general/prog/perl-modules/perl-test-command.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-test-command.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-test-differences.xml
===================================================================
--- general/prog/perl-modules/perl-test-differences.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-test-differences.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&perl_authors;/id/D/DC/DCANTRELL/Test-Differences-&Test-Differences-version;.tar.gz">
-  <!ENTITY my-md5sum "e1de5ef0f13fa4c815d8f2574820d661">
+  <!ENTITY my-md5sum "4a18533f77d43d9feaa1b6ab3dc72735">
 ]>
 
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-text-bibtex.xml
===================================================================
--- general/prog/perl-modules/perl-text-bibtex.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-text-bibtex.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -88,5 +88,5 @@
           <listitem>
             <para>
-              performs lexical analysis on a BibTeX file
+              performs lexical analysis on a BibTeX file.
             </para>
             <indexterm zone="perl-text-bibtex biblex-prog">
@@ -101,5 +101,5 @@
             <para>
               parses a series of BibTeX files with command line options to
-              control the string post-processing behaviour
+              control the string post-processing behaviour.
             </para>
             <indexterm zone="perl-text-bibtex bibparse-prog">
@@ -114,5 +114,5 @@
             <para>
               parses a BibTeX file, splitting 'author' and 'editor' fields
-              into lists of names, and then dumps everything to stdout
+              into lists of names, and then dumps everything to stdout.
             </para>
             <indexterm zone="perl-text-bibtex dumpnames-prog">
@@ -123,8 +123,8 @@
 
         <varlistentry id="libbtparse-lib">
-          <term><filename class="libraryfile">libbtparse.so</filename></term>
+          <term><filename class='libraryfile'>libbtparse.so</filename></term>
           <listitem>
             <para>
-              is a library for parsing and processing BibTeX data files
+              is a library for parsing and processing BibTeX data files.
             </para>
             <indexterm zone="perl-text-bibtex libbtparse-lib">
Index: general/prog/perl-modules/perl-text-csv.xml
===================================================================
--- general/prog/perl-modules/perl-text-csv.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-text-csv.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&perl_authors;/id/I/IS/ISHIGAKI/Text-CSV-&Text-CSV-version;.tar.gz">
-  <!ENTITY my-md5sum "c8fe8236ab3115fe8d82bdb6545e0770">
+  <!ENTITY my-md5sum "435951d381e814b5ce51f570a6a1dc24">
 
 ]>
@@ -28,5 +28,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-text-roman.xml
===================================================================
--- general/prog/perl-modules/perl-text-roman.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-text-roman.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-unicode-collate.xml
===================================================================
--- general/prog/perl-modules/perl-unicode-collate.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-unicode-collate.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY my-download-http "&perl_authors;/id/S/SA/SADAHIRO/Unicode-Collate-&Unicode-Collate-version;.tar.gz">
-  <!ENTITY my-md5sum "ee4d960d057c5e5b02ebb49d0286db8f">
+  <!ENTITY my-md5sum "1576931d68a8533c931b80c4c2e37fe9">
 ]>
 
@@ -34,5 +34,5 @@
       </note>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-unicode-linebreak.xml
===================================================================
--- general/prog/perl-modules/perl-unicode-linebreak.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-unicode-linebreak.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-uri.xml
===================================================================
--- general/prog/perl-modules/perl-uri.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-uri.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,7 +6,5 @@
 
   <!ENTITY my-download-http "&perl_authors;/id/O/OA/OALDERS/URI-&URI-version;.tar.gz">
-  <!ENTITY my-md5sum "bd66b0c620d076c4b0de9507b5f1fbdf">
-
-  <!ENTITY my-md5sum "">
+  <!ENTITY my-md5sum "978454ba823a6908bad1c3c1804945d3">
 
 ]>
@@ -36,5 +34,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-xml-libxml-simple.xml
===================================================================
--- general/prog/perl-modules/perl-xml-libxml-simple.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-xml-libxml-simple.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -28,5 +28,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-xml-libxslt.xml
===================================================================
--- general/prog/perl-modules/perl-xml-libxslt.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-xml-libxslt.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -26,5 +26,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-xml-simple.xml
===================================================================
--- general/prog/perl-modules/perl-xml-simple.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-xml-simple.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -30,5 +30,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/perl-modules/perl-xml-writer.xml
===================================================================
--- general/prog/perl-modules/perl-xml-writer.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/perl-modules/perl-xml-writer.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -27,5 +27,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: general/prog/php.xml
===================================================================
--- general/prog/php.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/php.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,35 +5,10 @@
   %general-entities;
 
-  <!ENTITY php-download-http "https://www.php.net/distributions/php-&php-version;.tar.xz">
+  <!ENTITY php-download-http "http://www.php.net/distributions/php-&php-version;.tar.xz">
   <!ENTITY php-download-ftp  " ">
-  <!ENTITY php-md5sum        "349ee590787ab46e62dae517d90b5101">
-  <!ENTITY php-size          "10.2 MB">
-  <!ENTITY php-buildsize     "446 MB (with tests, add 182 MB for documentation)">
-  <!ENTITY php-time          "1.6 SBU (with parallelism=4; add 2.1 SBU for tests)">
-  <!-- Tests were run for 8.0.1 at -j4, had two timeouts as well.
-       Results were otherwise normal though, so I'm unsure of what caused the
-       increase in time. -renodr
-       No timeout for 8.0.2. Tests run at -j4 too. -pierre
-       No timeouts on 8.0.3 for me this time. -renodr 
-       No timeouts on 8.0.5 -bdubbs 
-       No timeouts, one failure on 8.0.9 -bdubbs
-       No timeouts on 8.0.10 - thomas
-
-TEST RESULT SUMMARY
-
-Exts skipped    :   24
-Exts tested     :   48
-
-
-Number of tests : 16397             12639
-Tests borked    :    3 (  0.0%)
-Tests skipped   : 3755 ( 22.9%)
-Tests warned    :    2 (  0.0%) (  0.0%)
-Tests failed    :   29 (  0.2%) (  0.2%)
-Expected fail   :   30 (  0.2%) (  0.2%)
-Tests passed    : 12578 ( 76.7%) ( 99.5%)
-
-Time taken      :  583 seconds
-       -->
+  <!ENTITY php-md5sum        "52ad70ea64968d6095c6e38139533d57">
+  <!ENTITY php-size          "10 MB">
+  <!ENTITY php-buildsize     "692 MB (add 5 MB for tests, add 103 MB for documentation)">
+  <!ENTITY php-time          "1.5 SBU (with parallelism=4; add 2.0 SBU for tests)">
 ]>
 
@@ -42,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -61,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -148,5 +124,4 @@
       <xref linkend="libpng"/>,
       <xref linkend="libtiff"/>,
-      <xref linkend="libwebp"/>,
       <xref linkend="x-window-system"/>,
       <!--<ulink url="http://www.fastio.com/">ClibPDF</ulink>, - site asks for username/password-->
@@ -160,9 +135,9 @@
       <xref linkend="curl"/>,
       <xref linkend="tidy-html5"/>,
-      <ulink url="https://sourceforge.net/projects/caudium/">Caudium</ulink>,
+      <ulink url="http://sourceforge.net/projects/caudium/">Caudium</ulink>,
       <ulink url="https://www.hyperwave.com/en/">Hyperwave</ulink>,
       <ulink url="http://www.mnogosearch.org/">mnoGoSearch</ulink>,
       <ulink url="http://download.roxen.com/6.1/">Roxen WebServer</ulink>, and
-      <ulink url="https://github.com/Bilal-S/WDDX.net">WDDX</ulink>
+      <ulink url="https://wddxnet.codeplex.com/">WDDX</ulink>
     </para>
 
@@ -187,5 +162,5 @@
       <ulink url="http://www.hughes.com.au/products/msql/">Mini SQL</ulink>,
       <ulink url="http://www.monetra.com/">Monetra</ulink>, and
-      <ulink url="https://sourceforge.net/projects/qdbm">QDBM</ulink>
+      <ulink url="http://sourceforge.net/projects/qdbm">QDBM</ulink>
     </para>
 
@@ -297,5 +272,5 @@
     <para>
       To test the results, issue: <command>make test</command>. Several
-      tests (out of over 16000) may fail, in which case you are asked 
+      tests (out of over 12400) may fail, in which case you are asked 
       whether you want to send the report to the PHP developers. If you 
       want to automate the test, you may prefix the command with 
@@ -642,6 +617,6 @@
         php-cgi, php-config, php-fpm, phpdbg, and phpize</seg>
 
-        <seg>dba.so and opcache.so in
-        /usr/lib/php/extensions/no-debug-non-zts-20200930</seg>
+        <seg>dba.{so,a} and opcache.{so,a} in
+        /usr/lib/php/extensions/no-debug-non-zts-20190902</seg>
 
         <seg>/etc/php-fpm.d, /usr/{include,lib,share}/php, and
@@ -660,5 +635,5 @@
           <para>
             is a command line interface that enables you to parse and
-            execute PHP code
+            execute PHP code.
           </para>
           <indexterm zone="php php-prog">
@@ -673,5 +648,5 @@
           <para>
             is the PHP Extension and Application Repository (PEAR) package
-            manager. This isn't installed by default
+            manager. This isn't installed by default.
           </para>
           <indexterm zone="php pear">
@@ -685,5 +660,5 @@
         <listitem>
           <para>
-            is the fastCGI process manager for PHP
+            is the fastCGI process manager for PHP.
           </para>
           <indexterm zone="php php-fpm">
@@ -697,5 +672,5 @@
         <listitem>
           <para>
-            is the interactive PHP debugger
+            is the interactive PHP debugger.
           </para>
           <indexterm zone="php phpdbg">
Index: general/prog/prog.xml
===================================================================
--- general/prog/prog.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/prog.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
  %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="general-prog">
@@ -33,5 +38,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdb.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="git.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gitserver.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="guile.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="librep.xml"/>
Index: general/prog/py3c.xml
===================================================================
--- general/prog/py3c.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/py3c.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY py3c-download-http
            "https://github.com/encukou/py3c/archive/v&py3c-version;/py3c-&py3c-version;.tar.gz">
-  <!ENTITY py3c-md5sum        "57f6518f3a7bcd501425bb23f2de15a7">
+  <!ENTITY py3c-md5sum        "db1c5fa75548a2be6026151f70fe3c90">
   <!ENTITY py3c-size          "48 KB">
-  <!ENTITY py3c-buildsize     "1.4 MB">
+  <!ENTITY py3c-buildsize     "280 KB">
   <!ENTITY py3c-time          "less than 0.1 SBU">
 ]>
@@ -31,5 +31,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -135,2 +135,3 @@
 
   </sect2>
+  <!-- End Py3c -->
Index: general/prog/pyatspi2.xml
===================================================================
--- general/prog/pyatspi2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/pyatspi2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -9,5 +9,5 @@
   <!ENTITY pyatspi2-download-ftp
            "&gnome-download-ftp;/pyatspi/2.38/pyatspi-&pyatspi2-version;.tar.xz">
-  <!ENTITY pyatspi2-md5sum        "bac820e859310c64fe37c227be657656">
+  <!ENTITY pyatspi2-md5sum        "7909957aac797725741959078f098ba7">
   <!ENTITY pyatspi2-size          "312 KB">
   <!ENTITY pyatspi2-buildsize     "3.7 MB">
@@ -34,5 +34,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -137,2 +137,3 @@
 
   </sect2>
+  <!-- End PyAtSpi2 -->
Index: general/prog/pycairo.xml
===================================================================
--- general/prog/pycairo.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/pycairo.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY pycairo-download-http "https://github.com/pygobject/pycairo/releases/download/v&pycairo-version;/pycairo-&pycairo-version;.tar.gz">
   <!ENTITY pycairo-download-ftp  " ">
-  <!ENTITY pycairo-md5sum        "fa88a28cadbfb34192fe743d32c0ee33">
+  <!ENTITY pycairo-md5sum        "a1f9b661a0000c2f42281db933284451">
   <!ENTITY pycairo-size          "340 KB">
-  <!ENTITY pycairo-buildsize     "3.5 MB">
+  <!ENTITY pycairo-buildsize     "3.6 MB">
   <!ENTITY pycairo-time          "less than 0.1 SBU">
 ]>
@@ -30,5 +30,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
       <!-- Does not use gcc -->
 
@@ -150,4 +150,4 @@
       </segmentedlist>
     </sect3>
-
   </sect2>
+  <!-- End PyCairo -->
Index: general/prog/pycairo2.xml
===================================================================
--- general/prog/pycairo2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/pycairo2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -31,5 +31,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
       <!-- Does not use gcc -->
 
@@ -141,4 +141,4 @@
       </segmentedlist>
     </sect3>
-
   </sect2>
+  <!-- End PyCairo -->
Index: general/prog/pycryptodome.xml
===================================================================
--- general/prog/pycryptodome.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/pycryptodome.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY pycryptodome-download-http "https://github.com/Legrandin/pycryptodome/archive/v&pycryptodome-version;/pycryptodome-&pycryptodome-version;.tar.gz">
   <!ENTITY pycryptodome-download-ftp  " ">
-  <!ENTITY pycryptodome-md5sum        "31f5e8c91e8e0fa45da14271b394bba4">
+  <!ENTITY pycryptodome-md5sum        "33ccef51fdd8908b73923187e8f4a286">
   <!ENTITY pycryptodome-size          "15 MB">
-  <!ENTITY pycryptodome-buildsize     "58 MB">
-  <!ENTITY pycryptodome-time          "0.1 SBU">
+  <!ENTITY pycryptodome-buildsize     "202 MB">
+  <!ENTITY pycryptodome-time          "0.2 SBU">
 ]>
 
@@ -32,5 +32,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -107,8 +107,8 @@
           </seg>
           <seg>
-            None
+            pycryptodome-&pycryptodome-version;-py&python3-majorver;.egg-info
           </seg>
           <seg>
-            /usr/lib/python&python3-majorver;/site-packages/pycryptodome-&pycryptodome-version;-py&python3-majorver;.egg
+            /usr/lib/python&python3-majorver;/site-packages/Crypto
           </seg>
         </seglistitem>
@@ -118,2 +118,3 @@
 
   </sect2>
+  <!--End pycryptodome -->
Index: general/prog/pygments.xml
===================================================================
--- general/prog/pygments.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/pygments.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,7 +8,7 @@
            "https://files.pythonhosted.org/packages/source/P/Pygments/Pygments-&pygments-version;.tar.gz">
   <!ENTITY pygments-download-ftp " ">
-  <!ENTITY pygments-md5sum        "87369a4e15019caf9cf056ab2c5858b3">
-  <!ENTITY pygments-size          "3.9 MB">
-  <!ENTITY pygments-buildsize     "54 MB">
+  <!ENTITY pygments-md5sum        "3db74ee3bd11e1196dccf0b770c5d238">
+  <!ENTITY pygments-size          "2.2 MB">
+  <!ENTITY pygments-buildsize     "18 MB">
   <!ENTITY pygments-time          "less than 0.1 SBU">
 ]>
@@ -32,5 +32,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -110,2 +110,3 @@
 
   </sect2>
+  <!-- End Pygments -->
Index: general/prog/pygobject2.xml
===================================================================
--- general/prog/pygobject2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/pygobject2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -33,5 +33,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -163,4 +163,4 @@
       </segmentedlist>
     </sect3>
-
   </sect2>
+  <!-- End PyGObject2 -->
Index: general/prog/pygobject3.xml
===================================================================
--- general/prog/pygobject3.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/pygobject3.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,11 +6,11 @@
 
   <!ENTITY pygobject3-download-http
-           "&gnome-download-http;/pygobject/&gnome-minor-40;/pygobject-&pygobject3-version;.tar.xz">
+           "&gnome-download-http;/pygobject/&gnome-minor-38;/pygobject-&pygobject3-version;.tar.xz">
   <!ENTITY pygobject3-download-ftp
-           "&gnome-download-ftp;/pygobject/&gnome-minor-40;/pygobject-&pygobject3-version;.tar.xz">
-  <!ENTITY pygobject3-md5sum        "f27e0a2d1526df57c89624cdebbd69e0">
+           "&gnome-download-ftp;/pygobject/&gnome-minor-38;/pygobject-&pygobject3-version;.tar.xz">
+  <!ENTITY pygobject3-md5sum        "2ad8d8f10d1f12a8c66d8179659d5eb9">
   <!ENTITY pygobject3-size          "544 KB">
   <!ENTITY pygobject3-buildsize     "15 MB">
-  <!ENTITY pygobject3-time          "0.2 SBU (Using parallelism=4)">
+  <!ENTITY pygobject3-time          "0.1 SBU (Using parallelism=4)">
 ]>
 
@@ -33,5 +33,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -94,10 +94,67 @@
       <title>Installation of PyGObject3</title>
 
-    <para>
-      First, remove a faulty test:
-    </para>
-
-<screen><userinput remap="pre">mv -v tests/test_gdbus.py{,.nouse}</userinput></screen>
-
+ <!--
+      <note>
+        <para>
+          Both <application>Python 2</application> and
+          <application>Python 3</application> modules can
+          be built and installed without any conflicts.
+        </para>
+      </note>
+
+      <para>
+        To build <application>PyGObject3</application> as a
+        <application>Python 2</application> module, run the
+        following commands:
+      </para>
+
+<screen><userinput>mkdir python2                             &amp;&amp;
+pushd python2                             &amp;&amp;
+  meson - -prefix=/usr -Dpython=python2 .. &amp;&amp;
+  ninja                                   &amp;&amp;
+popd</userinput></screen>
+
+      <para>
+        To test the results, issue: <command>ninja -C python2 test</command>.
+        An already active graphical session with bus address is necessary to
+        run the tests. Two tests fail due to a search for GTK+-4, which has not
+        been released yet.
+      </para>
+
+      <para>
+        To build <application>PyGObject3</application> as a
+        <application>Python 3</application> module, run the
+        following commands:
+      </para>
+
+<screen><userinput>mkdir python3                             &amp;&amp;
+pushd python3                             &amp;&amp;
+  meson - -prefix=/usr -Dpython=python3 .. &amp;&amp;
+  ninja                                   &amp;&amp;
+popd</userinput></screen>
+
+      <para>
+        To test the results, issue: <command>ninja -C python3 test</command>.
+        An already active graphical session with bus address is necessary to
+        run the tests. Two tests fail due to a search for GTK+-4, which has not
+        been released yet.
+      </para>
+
+      <para>
+        To install the <application>Python 2</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>ninja -C python2 install</userinput></screen>
+
+      <para>
+        To install the <application>Python 3</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>ninja -C python3 install</userinput></screen>
+-->
     <para>
       Install <application>pygobject3</application> by running the following
@@ -108,5 +165,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -124,11 +181,4 @@
 <screen role="root"><userinput>ninja install</userinput></screen>
 
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-        href="../../xincludes/meson-buildtype-release.xml"/>
     </sect3>
 
@@ -160,2 +210,3 @@
 
   </sect2>
+  <!-- End PyGObject -->
Index: general/prog/pygtk.xml
===================================================================
--- general/prog/pygtk.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/pygtk.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -32,5 +32,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -196,5 +196,5 @@
             <para>
               is a wrapper script to run the <application>PyGTK</application>
-              codegen module
+              codegen module.
             </para>
             <indexterm zone="pygtk pygtk-codegen-2.0">
@@ -209,5 +209,5 @@
             <para>
               is a Python wrapper to run the <application>PyGTK</application>
-              demo program
+              demo program.
             </para>
             <indexterm zone="pygtk pygtk-demo">
@@ -218,4 +218,4 @@
       </variablelist>
     </sect3>
-
   </sect2>
+  <!-- End PyGTK -->
Index: general/prog/python-dbusmock.xml
===================================================================
--- general/prog/python-dbusmock.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/python-dbusmock.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY dbusmock-download-http "https://github.com/martinpitt/python-dbusmock/releases/download/&dbusmock-version;/python-dbusmock-&dbusmock-version;.tar.gz">
   <!ENTITY dbusmock-download-ftp  " ">
-  <!ENTITY dbusmock-md5sum        "9f32436dab51f159e988354de1b469ae">
-  <!ENTITY dbusmock-size          "80 KB">
-  <!ENTITY dbusmock-buildsize     "1.3 KB">
+  <!ENTITY dbusmock-md5sum        "f9203f4b78ac90f7e804361fc39042f3">
+  <!ENTITY dbusmock-size          "68 KB">
+  <!ENTITY dbusmock-buildsize     "820 KB">
   <!ENTITY dbusmock-time          "less than 0.1 SBU">
 ]>
@@ -26,9 +26,9 @@
 
       <para>
-        <application>dbusmock</application> is a Python library
+        <application>dbusmock</application> a Python library
         useful for writing tests for software which talks to D-Bus services.
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -112,5 +112,5 @@
           </seg>
           <seg>
-            /usr/lib/python&python3-majorver;/site-packages/dbusmock
+            None
           </seg>
         </seglistitem>
@@ -120,2 +120,3 @@
 
   </sect2>
+  <!--End dbusmock -->
Index: general/prog/python-modules.xml
===================================================================
--- general/prog/python-modules.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/python-modules.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: general/prog/python-slip.xml
===================================================================
--- general/prog/python-slip.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/python-slip.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -29,5 +29,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -126,2 +126,3 @@
 
   </sect2>
+  <!-- End python-slip -->
Index: general/prog/python2.xml
===================================================================
--- general/prog/python2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/python2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,6 +10,6 @@
   <!ENTITY python2-md5sum        "fd6cc8ec0a78c44036f825e739f36e5a">
   <!ENTITY python2-size          "12.2 MB">
-  <!ENTITY python2-buildsize     "228 MB (add 17 MB for tests)">
-  <!ENTITY python2-time          "0.5 SBU (Using parallelism=4; add 5.9 SBU for tests)">
+  <!ENTITY python2-buildsize     "134 MB (add 17 MB for tests)">
+  <!ENTITY python2-time          "0.7 SBU (Using parallelism=4; add 7.1 SBU for tests)">
 
   <!ENTITY python2htmldoc-download-http
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -53,5 +54,6 @@
     </note>
 
-    &lfs110a_checked;
+
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -92,17 +94,11 @@
 
     <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/Python-&python2-version;-security_fixes-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Optional HTML Documentation: <ulink url="&python2htmldoc-download-http;"/>
+      <title>Optional HTML Documentation</title>
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&python2htmldoc-download-http;"/>
         </para>
       </listitem>
     </itemizedlist>
-
 
     <bridgehead renderas="sect3">Python 2 Dependencies</bridgehead>
@@ -121,6 +117,5 @@
     <bridgehead renderas="sect4">Optional (For Additional Modules)</bridgehead>
     <para role="optional">
-      <xref linkend="libnsl"/>,
-      <xref linkend="sqlite"/>, and
+      <xref linkend="sqlite"/> and
       <xref linkend="tk"/>
     </para>
@@ -159,14 +154,12 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../Python-&python2-version;-security_fixes-1.patch &amp;&amp;
-./configure --prefix=/usr                              \
-            --enable-shared                            \
-            --with-system-expat                        \
-            --with-system-ffi                          \
-            --enable-unicode=ucs4                     &amp;&amp;
+<screen><userinput>./configure --prefix=/usr       \
+            --enable-shared     \
+            --with-system-expat \
+            --with-system-ffi   \
+            --enable-unicode=ucs4 &amp;&amp;
 make</userinput></screen>
 
     <para>
-      If you invoke the tests, they will run through twice.
       To test the results, issue: <command>make -k test</command>.
     </para>
@@ -302,5 +295,5 @@
             aware GUI editor. For this script to run, you must have installed
             <application>Tk</application> before Python so that the Tkinter
-            Python module is built
+            Python module is built.
           </para>
           <indexterm zone="python2 idle">
@@ -314,5 +307,5 @@
         <listitem>
           <para>
-            is the <application>Python</application> documentation tool
+            is the <application>Python</application> documentation tool.
           </para>
           <indexterm zone="python2 pydoc2">
@@ -327,5 +320,5 @@
           <para>
             is an interpreted, interactive, object-oriented programming
-            language
+            language.
           </para>
           <indexterm zone="python2 python">
@@ -340,5 +333,5 @@
           <para>
             is a version-specific name for the <command>python</command>
-            program
+            program.
           </para>
           <indexterm zone="python2 python2-ver">
@@ -352,5 +345,5 @@
         <listitem>
           <para>
-            is an SMTP proxy implemented in <application>Python</application>
+            is an SMTP proxy implemented in <application>Python</application>.
           </para>
           <indexterm zone="python2 smtpd.py">
Index: general/prog/python3.xml
===================================================================
--- general/prog/python3.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/python3.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,8 +8,8 @@
            "https://www.python.org/ftp/python/&python3-version;/Python-&python3-version;.tar.xz">
   <!ENTITY python3-download-ftp  " ">
-  <!ENTITY python3-md5sum        "ecc29a7688f86e550d29dba2ee66cf80">
+  <!ENTITY python3-md5sum        "61981498e75ac8f00adcb908281fadb6">
   <!ENTITY python3-size          "18 MB">
-  <!ENTITY python3-buildsize     "356 MB (add 56 MB for tests)">
-  <!ENTITY python3-time          "0.6 SBU (using parallelism=4; add 2.7 SBU for tests)">
+  <!ENTITY python3-buildsize     "202 MB (add 31 MB for tests)">
+  <!ENTITY python3-time          "0.5 SBU (using parallelism=4; add 1.9 SBU for tests, including rebuilding)">
   <!--
   Note: Size does not reflect docs that were install in LFS.
@@ -23,4 +23,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -50,5 +51,5 @@
     </note>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -103,6 +104,5 @@
     <bridgehead renderas="sect4">Optional (For Additional Modules)</bridgehead>
     <para role="optional">
-      <xref linkend="db"/>,
-      <xref linkend="libnsl"/>, and
+      <xref linkend="db"/> and
       <xref linkend="tk"/>
     </para>
@@ -121,16 +121,14 @@
     </para>
 
-<screen><userinput>CXX="/usr/bin/g++"               \
-./configure --prefix=/usr        \
-            --enable-shared      \
-            --with-system-expat  \
-            --with-system-ffi    \
-            --with-ensurepip=yes \
-            --enable-optimizations &amp;&amp;
+<screen><userinput>CXX="/usr/bin/g++"              \
+./configure --prefix=/usr       \
+            --enable-shared     \
+            --with-system-expat \
+            --with-system-ffi   \
+            --with-ensurepip=yes &amp;&amp;
 make</userinput></screen>
 
     <para>
-      To test the result, issue <command>make test</command>.
-      Some tests may need an Internet connection.
+      The test suite must be run separately, using an X terminal (see below).
     </para>
 
@@ -140,4 +138,19 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      The test suite must be run separately from the build, either before or
+      after the package is built and installed. Do not run
+      <command>make install</command> after running the test suite. To build
+      and install the package, you need to start with a fresh or clean source
+      tree. For the tests, you also need a clean source code, so either start by
+      removing the source code directory and starting over, by uncompressing
+      the source tarball or by running <command>make clean</command>. Then
+      configure again, adding <quote>--with-pydebug</quote> to the
+      <command>configure</command> switches above, run <command>make</command>,
+      then <command>make test</command>. Remember that tests must be executed
+      using an X terminal. 
+      The test SBU highly depends on the speed of the internet connection.
+    </para>
 
   </sect2>
@@ -158,17 +171,16 @@
     <para>
       <parameter>--with-system-ffi</parameter>: This switch enables linking
-      against the system version of <application>libffi</application>. 
+      against system version of <application>libffi</application>. 
     </para>
 
     <para>
       <parameter>--with-ensurepip=yes</parameter> : This switch enables building
-      the <command>pip</command> and <command>setuptools</command> packaging 
-      programs. <command>setuptools</command> is needed for building some
-      Python modules.
+      <command>pip</command> and <command>setuptools</command> packaging programs.
+      <command>setuptools</command> is needed for building some Python modules.
     </para>
 
     <para>
       <option>--with-dbmliborder=bdb:gdbm:ndbm</option>: Use this switch
-      if you want to build the <application>Python</application> DBM Module
+      if you want to build <application>Python</application> DBM Module
       against <application>Berkeley DB</application> instead of
       <application>GDBM</application>.
@@ -176,6 +188,10 @@
 
     <para>
-      <parameter>--enable-optimization</parameter>: This switch enables
-      stable, but expensive, optimizations.
+      <option>--enable-optimization</option>: Use this switch
+      if you want to enable <emphasis>expensive</emphasis> optimizations (i.e.
+      Profile Guided Optimizations). This adds around 20 SBU, but can
+      <emphasis>slightly</emphasis> speed up some uses, such as using
+      <application>Sphinx</application> for creating documentation, or use of
+      <application>Python3</application> scripts.
     </para>
 
@@ -230,7 +246,5 @@
           2to3-&python3-majorver;,
 
-          <!--
           easy_install-&python3-majorver;,
-          -->
 
           idle3 (symlink) and
@@ -245,4 +259,7 @@
           python3 (symlink);
           python&python3-majorver;, and
+
+          python3 (symlink), and
+          python&python3-majorver;
 
           python3-config (symlink) and
@@ -278,5 +295,4 @@
       </varlistentry>
       Put here for easy use when removing Python2 -->
-      <!--
       <varlistentry id="easy_install">
         <term><command>easy_install</command></term>
@@ -284,5 +300,5 @@
           <para>
             is a frontend to pip3 to make it easier to configure python modules
-            through the PIP package manager
+            through the PIP package manager.
           </para>
           <indexterm zone="python3 easy_install">
@@ -291,5 +307,5 @@
         </listitem>
       </varlistentry>
-      -->
+
       <varlistentry id="idle3">
         <term><command>idle3</command></term>
@@ -299,5 +315,5 @@
             aware GUI editor. For this script to run, you must have installed
             <application>Tk</application> before Python so that the Tkinter
-            Python module is built
+            Python module is built.
           </para>
           <indexterm zone="python3 idle3">
@@ -312,5 +328,5 @@
           <para>
             is the <application>Python</application> documentation
-            tool
+            tool.
           </para>
           <indexterm zone="python3 pydoc3">
@@ -325,5 +341,5 @@
           <para>
             is an interpreted, interactive, object-oriented programming
-            language
+            language.
           </para>
           <indexterm zone="python3 python3-prog">
@@ -338,8 +354,9 @@
           <para>
             is a version-specific name for the <command>python</command>
-            program
+            program.
           </para>
           <indexterm zone="python3 python-ver">
-            <primary sortas="b-python&python3-majorver;">python&python3-majorver;</primary>
+            <primary
+            sortas="b-python&python3-majorver;">python&python3-majorver;</primary>
           </indexterm>
         </listitem>
Index: general/prog/pyxdg.xml
===================================================================
--- general/prog/pyxdg.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/pyxdg.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -31,5 +31,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -109,2 +109,3 @@
 
   </sect2>
+  <!--End PyXDG -->
Index: general/prog/pyyaml.xml
===================================================================
--- general/prog/pyyaml.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/pyyaml.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY PyYAML-download-http "https://pyyaml.org/download/pyyaml/PyYAML-&PyYAML-version;.tar.gz">
+  <!ENTITY PyYAML-download-http "http://pyyaml.org/download/pyyaml/PyYAML-&PyYAML-version;.tar.gz">
   <!ENTITY PyYAML-download-ftp  " ">
   <!ENTITY PyYAML-md5sum        "d3590b85917362e837298e733321962b">
@@ -30,5 +30,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -85,17 +85,31 @@
     <sect3 role="installation">
       <title>Installation of PyYAML</title>
+
+      <note>
+        <para>
+          Both <application>Python 2</application> and
+          <application>Python 3</application> modules can
+          be built and installed without any conflicts.
+        </para>
+      </note>
+
 <!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
 
       <para>
-        Install PyYAML with the following commands:
+        To build both <application>Python 2</application> and
+        <application>Python 3</application> modules,
+        run the following commands:
       </para>
 
-<screen><userinput>python3 setup.py build</userinput></screen>
+<screen><userinput>python2 setup.py build &amp;&amp;
+python3 setup.py build</userinput></screen>
 
       <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
+        To install both modules, run the following commands as the
+        <systemitem class="username">root</systemitem> user:
       </para>
 
-<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
+<screen role="root"><userinput>python2 setup.py install --optimize=1 &amp;&amp;
+python3 setup.py install --optimize=1</userinput></screen>
 
     </sect3>
@@ -126,2 +140,3 @@
 
   </sect2>
+  <!--End PyYAML -->
Index: general/prog/ruby.xml
===================================================================
--- general/prog/ruby.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/ruby.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY ruby-download-http "https://cache.ruby-lang.org/pub/ruby/&ruby-minor-version;/ruby-&ruby-version;.tar.xz">
+  <!ENTITY ruby-download-http "http://cache.ruby-lang.org/pub/ruby/&ruby-minor-version;/ruby-&ruby-version;.tar.xz">
   <!ENTITY ruby-download-ftp  " ">
-  <!ENTITY ruby-md5sum        "242d3a5a2588180ccb3dea9ad8c8cf0e">
+  <!ENTITY ruby-md5sum        "fefb57db58b5c3f11534710bab2bba47">
   <!ENTITY ruby-size          "14 MB">
-  <!ENTITY ruby-buildsize     "573 MB (add 532 MB for C API docs)">
-  <!ENTITY ruby-time          "1.5 SBU (using parallelism=4; add 4.9 SBU for tests; add 0.8 SBU for C API docs)">
+  <!ENTITY ruby-buildsize     "629 MB (add 533 MB for C API docs)">
+  <!ENTITY ruby-time          "1.3 SBU (using parallelism=4; add 5.5 SBU for tests; add 0.8 SBU for C API docs)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -110,12 +111,10 @@
 
     <para>
-      To test the results, issue: <command>make check</command>. There are over
+      To test the results, issue: <command>make check</command>. There are almost
       21,000 tests. Some tests related to ipv6 may indicate errors.  If the
       tests are run in a directory that has a world writable component (e.g.
-      /tmp) then several additional tests may fail. A few tests may fail due
+      /tmp) then several additional tests may fail. A few tests my fail due
       to system configuration expectations.
     </para>
-<!-- With 3.0.2: 
-Finished tests in 443.541527s, 47.5739 tests/s, 6031.9921 assertions/s.                           21101 tests, 2675439 assertions, 4 failures, 1 errors, 45 skips -->
 
     <para>
@@ -196,5 +195,5 @@
         <listitem>
           <para>
-            creates bundles of Ruby Gems
+            creates bundles of Ruby Gems.
           </para>
           <indexterm zone="ruby bundle">
@@ -208,5 +207,5 @@
         <listitem>
           <para>
-            manages an application's dependencies throughout it's lifecycle
+            manages an application's dependencies throughout it's lifecycle.
           </para>
           <indexterm zone="ruby bundler">
@@ -221,5 +220,5 @@
           <para>
             is Tiny eRuby. It interprets a
-            <application>Ruby</application> code embedded text file
+            <application>Ruby</application> code embedded text file.
           </para>
           <indexterm zone="ruby erb">
@@ -234,5 +233,5 @@
           <para>
             command for RubyGems - a sophisticated package manager for
-            <application>Ruby</application>
+            <application>Ruby</application>.
           </para>
           <indexterm zone="ruby gem">
@@ -247,5 +246,5 @@
           <para>
             is the interactive interface for
-            <application>Ruby</application>
+            <application>Ruby</application>.
           </para>
           <indexterm zone="ruby irb">
@@ -259,5 +258,5 @@
         <listitem>
           <para>
-            a make-like build utility for <application>Ruby</application>
+            a make-like build utility for <application>Ruby</application>.
           </para>
           <indexterm zone="ruby rake">
@@ -271,5 +270,5 @@
         <listitem>
           <para>
-            generates <application>Ruby</application> documentation
+            generates <application>Ruby</application> documentation.
           </para>
           <indexterm zone="ruby rdoc">
@@ -284,5 +283,5 @@
           <para>
             displays documentation from a database on
-            <application>Ruby</application> classes, modules, and methods
+            <application>Ruby</application> classes, modules, and methods.
           </para>
           <indexterm zone="ruby ri">
@@ -297,5 +296,5 @@
           <para>
             is an interpreted scripting language for quick
-            and easy object-oriented programming
+            and easy object-oriented programming.
           </para>
           <indexterm zone="ruby ruby-prog">
@@ -309,5 +308,5 @@
         <listitem>
           <para>
-            contains the API functions required by <application>Ruby</application>
+            contains the API functions required by <application>Ruby</application>.
           </para>
           <indexterm zone="ruby libruby">
Index: general/prog/rust.xml
===================================================================
--- general/prog/rust.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/rust.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,6 +7,6 @@
   <!ENTITY rust-download-http "https://static.rust-lang.org/dist/rustc-&rust-version;-src.tar.gz">
   <!ENTITY rust-download-ftp  " ">
-  <!ENTITY rust-md5sum        "bd6fbe9ba5fe457d2514e92a6ccd7b24">
-  <!ENTITY rust-size          "161 MB">
+  <!ENTITY rust-md5sum        "a460bed79b92f6a7833ba6e6390ee6ae">
+  <!ENTITY rust-size          "145 MB">
   <!-- Gentle Reminder: buildsize is how much the user requires for the real
        install, i.e. the source with its DESTDIR *plus* the DESTDIR.  You
@@ -15,6 +15,6 @@
        after the tests. -->
 
-  <!ENTITY rust-buildsize     "9.3 GB (407 MB installed) including 291 MB of ~/.cargo files for the user building this. Add 4.0 GB including extra 179 MB of ~/.cargo files if running the tests">
-  <!ENTITY rust-time          "31 SBU (add 13 SBU for tests, both on a 4-core machine)">
+  <!ENTITY rust-buildsize     "7.6 GB (369 MB installed) including 294 MB of ~/.cargo files for the user building this. Add 3.3 GB if running the tests">
+  <!ENTITY rust-time          "39 SBU (add 31 SBU for tests, both on a 4-core machine)">
 ]>
 
@@ -23,4 +23,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -147,5 +148,5 @@
     </note>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -325,10 +326,8 @@
 
     <para>
-      At a minimum, seven tests will fail: ui/asm/inline-syntax.rs#arm,
-      assembly/target-feature-multiple.rs#SINGLEFLAG,
-      assembly/target-feature-multiple.rs#TWOFLAGS,
-      run-make-fulldeps/long-linker-command-lines, run-make-fulldeps/split-debuginfo,
-      run-make-fulldeps/split-dwarf, run-make-fulldeps/sysroot-crates-are-unstable.
-      With any recent version of <command>gdb</command>, four more failures
+      At a minimum, two tests (run-make-fulldeps/long-linker-command-lines
+      and run-make-fulldeps/sysroot-crates-are-unstable) may fail.
+      If a version of <command>gdb</command> which was released after this
+      version of rust is used, such as <xref linkend="gdb"/>, four more failures
       (debuginfo/extern-c-fn.rs, debuginfo/generator-objects.rs,
       debuginfo/issue-57822.rs, debuginfo/pretty-huge-vec.rs) can be expected.
@@ -560,7 +559,5 @@
       <seglistitem>
         <seg>
-          cargo-clippy, cargo-fmt, cargo-miri, cargo, clippy-driver, miri,
-          rls, rust-analyzer, rust-gdb, rust-gdbgui, rust-lldb, rustc,
-          rustdoc, rustfmt.
+          cargo-clippy, cargo-fmt, cargo-miri, cargo, clippy-driver, miri, rls, rust-gdb, rust-gdbgui, rust-lldb, rustc, rustdoc, rustfmt.
         </seg>
         <seg>
@@ -585,5 +582,5 @@
         <listitem>
           <para>
-            provides lint checks for a cargo package
+            provides lint checks for a cargo package.
           </para>
           <indexterm zone="rust cargo-clippy">
@@ -598,5 +595,5 @@
           <para>
             formats all bin and lib files of the current crate using
-            rustfmt
+            rustfmt.
           </para>
           <indexterm zone="rust cargo-fmt">
@@ -624,5 +621,5 @@
         <listitem>
           <para>
-            is the Package Manager for Rust
+            is the Package Manager for Rust.
           </para>
           <indexterm zone="rust cargo">
@@ -636,5 +633,5 @@
         <listitem>
           <para>
-            provides lint checks for Rust
+            provides lint checks for Rust.
           </para>
           <indexterm zone="rust clippy-driver">
@@ -649,5 +646,5 @@
           <para>
             is an interpreter for Rust's mid-level intermediate representation
-            (MIR). It is broken in this version
+            (MIR). It is broken in this version.
           </para>
           <indexterm zone="rust miri">
@@ -663,5 +660,5 @@
             is the Rust Language Server. This can run in the background to
             provide IDEs, editors, and other tools with information about Rust
-            programs
+            programs.
           </para>
           <indexterm zone="rust rls">
@@ -671,24 +668,11 @@
       </varlistentry>
 
-      <varlistentry id="rust-analyzer">
-        <term><command>rust-analyzer</command></term>
-        <listitem>
-          <para>
-            is an implementation of Language Server Protocol for the Rust
-            programming language.
-          </para>
-          <indexterm zone="rust rust-analyzer">
-            <primary sortas="b-rust-analyzer">rust-analyzer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="rust-gdb">
         <term><command>rust-gdb</command></term>
         <listitem>
           <para>
-            is a wrapper script for gdb, pulling in Python pretty-printing
-            modules installed in
-            <filename class="directory">/opt/rustc-&rust-version;/lib/rustlib/etc</filename>
+            is a wrapper script for gdb, pulling in Python
+            pretty-printing modules installed in <filename
+			class="directory">/opt/rustc-&rust-version;/lib/rustlib/etc</filename>.
           </para>
           <indexterm zone="rust rust-gdb">
@@ -703,5 +687,5 @@
           <para>
             is a wrapper script for a graphical front end to gdb that runs in a
-            browser
+            browser.
           </para>
           <indexterm zone="rust rust-gdbgui">
@@ -716,5 +700,5 @@
           <para>
             is a wrapper script for LLDB (the LLVM debugger)
-            pulling in the Python pretty-printing modules
+            pulling in the Python pretty-printing modules.
           </para>
           <indexterm zone="rust rust-lldb">
@@ -728,5 +712,5 @@
         <listitem>
           <para>
-            is the rust compiler
+            is the rust compiler.
           </para>
           <indexterm zone="rust rustc">
@@ -740,5 +724,5 @@
         <listitem>
           <para>
-            generates documentation from rust source code
+            generates documentation from rust source code.
           </para>
           <indexterm zone="rust rustdoc">
@@ -752,5 +736,5 @@
         <listitem>
           <para>
-            formats rust code
+            formats rust code.
           </para>
           <indexterm zone="rust rustfmt">
@@ -764,5 +748,5 @@
         <listitem>
           <para>
-            is the Rust Standard Library, the foundation of portable Rust software
+            is the Rust Standard Library, the foundation of portable Rust software.
           </para>
           <indexterm zone="rust libstd">
@@ -773,4 +757,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/prog/scons.xml
===================================================================
--- general/prog/scons.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/scons.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY scons-download-http "&sourceforge-dl;/scons/scons-&scons-version;.tar.gz">
   <!ENTITY scons-download-ftp  " ">
-  <!ENTITY scons-md5sum        "29dacf14f304065dfee147555d6db4ed">
-  <!ENTITY scons-size          "2.9 MB">
-  <!ENTITY scons-buildsize     "50 MB">
+  <!ENTITY scons-md5sum        "1b31cdf3864efdaa71a1c49d69d5b1ca">
+  <!ENTITY scons-size          "2.7 MB">
+  <!ENTITY scons-buildsize     "49 MB">
   <!ENTITY scons-time          "less than 0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -91,10 +92,8 @@
     </para>
 
-<screen role="root"><userinput>sed -i 's/env python/&amp;3/' SCons/Utilities/*.py              &amp;&amp;
-sed -i 's:build/doc/man/::' setup.cfg                       &amp;&amp;
+<screen role="root"><userinput>sed -i 's/env python/&amp;3/' SCons/Utilities/*.py            &amp;&amp;
 python3 setup.py install --prefix=/usr  \
                          --optimize=1   \
-                         --install-data=/usr/share/man/man1 &amp;&amp;
-cp scons{,ign}.1 /usr/share/man/man1</userinput></screen>
+                         --install-data=/usr/share</userinput></screen>
 
   </sect2>
@@ -130,5 +129,5 @@
         <listitem>
           <para>
-            is a software construction tool
+            is a software construction tool.
           </para>
           <indexterm zone="scons scons-prog">
@@ -143,5 +142,5 @@
           <para>
             shows or converts the configuration of an
-            <application>SCons</application> cache directory
+            <application>SCons</application> cache directory.
           </para>
           <indexterm zone="scons scons-configure-cache">
@@ -156,5 +155,5 @@
           <para>
             prints <application>SCons</application>
-            <filename>.sconsign</filename> file information
+            <filename>.sconsign</filename> file information.
           </para>
           <indexterm zone="scons sconsign">
Index: general/prog/scour.xml
===================================================================
--- general/prog/scour.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/scour.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -31,5 +31,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -143,5 +143,5 @@
         <listitem>
           <para>
-            is a program to optimize and clean SVG files
+            is a program to optimize and clean SVG files.
           </para>
           <indexterm zone="scour scour-prog">
@@ -156,2 +156,3 @@
 
   </sect2>
+  <!--End scour -->
Index: general/prog/six.xml
===================================================================
--- general/prog/six.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/six.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,5 +7,5 @@
   <!ENTITY six-download-http "&pymodules-dl;/s/six/six-&six-version;.tar.gz">
   <!ENTITY six-download-ftp  " ">
-  <!ENTITY six-md5sum        "a7c927740e4964dd29b72cebfc1429bb">
+  <!ENTITY six-md5sum        "9f90a0eaa0ea7747fda01ca79d21ebcb">
   <!ENTITY six-size          "36 KB">
   <!ENTITY six-buildsize     "376 KB">
@@ -29,5 +29,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
       <!-- Does not use gcc -->
 
@@ -132,4 +132,4 @@
       </segmentedlist>
     </sect3>
-
   </sect2>
+  <!-- End six -->
Index: general/prog/slang.xml
===================================================================
--- general/prog/slang.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/slang.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY slang-download-http "https://www.jedsoft.org/releases/slang/slang-&slang-version;.tar.bz2">
+  <!ENTITY slang-download-http "http://www.jedsoft.org/releases/slang/slang-&slang-version;.tar.bz2">
   <!ENTITY slang-download-ftp  " ">
   <!ENTITY slang-md5sum        "c2d5a7aa0246627da490be4e399c87cb">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -185,5 +186,5 @@
             <application>slang</application> scripts. It supports dynamic
             loading of <application>slang</application> modules and includes a
-            <application>Readline</application> interface for interactive use
+            <application>Readline</application> interface for interactive use.
           </para>
           <indexterm zone="slang slsh">
Index: general/prog/subversion.xml
===================================================================
--- general/prog/subversion.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/subversion.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,5 +7,5 @@
   <!ENTITY subversion-download-http "https://archive.apache.org/dist/subversion/subversion-&subversion-version;.tar.bz2">
   <!ENTITY subversion-download-ftp  " ">
-  <!ENTITY subversion-md5sum        "2eccc2c7451397e01a13682600af9563">
+  <!ENTITY subversion-md5sum        "8f6c50632355ae08445c2ed63ba9689e">
   <!ENTITY subversion-size          "8.1 MB">
   <!-- for 1.12.0                    1.12.2         1.13.0
@@ -16,6 +16,6 @@
        docs:        2 secs   26 MB; 2 sec    27 MB; 2 sec   26 MB
        tests       46 min  1104 MB  46:52  1103 MB  47 min   -->
-  <!ENTITY subversion-buildsize     "208 MB (add 228 MB for bindings, 52 MB for docs, 1.3 GB for tests)">
-  <!ENTITY subversion-time          "0.5 SBU (Using parallelism=4; add 1.9 SBU for bindings, 35 SBU for tests)">
+  <!ENTITY subversion-buildsize     "176 MB (add 93 MB for bindings, 26 MB for docs, 1.1 GB for tests)">
+  <!ENTITY subversion-time          "0.5 SBU (Using parallelism=4; add 1.4 SBU for bindings, 29 SBU for tests)">
 ]>
 
@@ -24,4 +24,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -47,5 +48,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -126,5 +127,4 @@
       <xref linkend="cyrus-sasl"/>,
       <xref linkend="dbus"/>,
-      <xref linkend="doxygen"/> (for generating HTML documentation),
       <xref linkend="gnome-keyring"/>,
       <xref linkend="libsecret"/>,
@@ -179,10 +179,4 @@
 -->
     <para>
-      First, adapt some Python scripts to use python3:
-    </para>
-
-<screen><userinput remap="pre">grep -rl '^#!.*python$' | xargs sed -i '1s/python/&amp;3/'</userinput></screen>
-
-    <para>
       Install <application>Subversion</application> by running the following
       commands:
@@ -232,8 +226,6 @@
 
     <para>
-      To test the results, issue: <command>make check</command>. Four tests in
-      the <filename>commit_tests.py</filename>, 
-      <filename>prop_tests.py</filename>, and
-      <filename>update_tests.py</filename> suites are known to fail.
+      To test the results, issue: <command>make check</command>.  The upgrade_tests.py
+      test is known to fail.
     </para>
 
@@ -312,5 +304,5 @@
     <para>
       <parameter>--with-lz4=internal, --with-utf8proc=internal</parameter>:
-      Remove these switches if you have installed the optional dependencies.
+      Remove them if you have installed the optional dependencies.
     </para>
 
@@ -414,5 +406,5 @@
           <para>
             is a command-line client program used to access
-            <application>Subversion</application> repositories
+            <application>Subversion</application> repositories.
           </para>
           <indexterm zone="subversion svn">
@@ -427,5 +419,5 @@
           <para>
             is a tool for creating, tweaking or repairing a
-            <application>Subversion</application> repository
+            <application>Subversion</application> repository.
           </para>
           <indexterm zone="subversion svnadmin">
@@ -439,5 +431,5 @@
         <listitem>
           <para>
-            is a benchmarking tool
+            is a benchmarking tool.
           </para>
           <indexterm zone="subversion svnbench">
@@ -452,5 +444,5 @@
           <para>
             is a program for filtering <application>Subversion</application>
-            repository dumpfile format streams
+            repository dumpfile format streams.
           </para>
           <indexterm zone="subversion svndumpfilter">
@@ -466,5 +458,5 @@
             is the FSFS (FileSystem atop of the FileSystem -
             <application>Subversion</application> filesystem implementation)
-            repository manipulation tool
+            repository manipulation tool.
           </para>
           <indexterm zone="subversion svnfsfs">
@@ -479,5 +471,5 @@
           <para>
             is a tool for inspecting a <application>Subversion</application>
-            repository
+            repository.
           </para>
           <indexterm zone="subversion svnlook">
@@ -491,5 +483,5 @@
         <listitem>
           <para>
-            is a Multiple URL Command Client for <application>Subversion</application>
+            is a Multiple URL Command Client for <application>Subversion</application>.
           </para>
           <indexterm zone="subversion svnmucc">
@@ -504,5 +496,5 @@
           <para>
             is a tool for dumping or loading a remote
-            <application>Subversion</application> repository
+            <application>Subversion</application> repository.
           </para>
           <indexterm zone="subversion svnrdump">
@@ -517,5 +509,5 @@
           <para>
             is a custom standalone server program, able to run as a daemon
-            process or invoked by SSH
+            process or invoked by SSH.
           </para>
           <indexterm zone="subversion svnserve">
@@ -530,5 +522,5 @@
           <para>
             is a <application>Subversion</application> repository
-            synchronisation tool
+            synchronisation tool.
           </para>
           <indexterm zone="subversion svnsync">
@@ -543,5 +535,5 @@
           <para>
             is used to report the version number and state of a working
-            <application>Subversion</application> repository copy
+            <application>Subversion</application> repository copy.
           </para>
           <indexterm zone="subversion svnversion">
@@ -556,5 +548,5 @@
           <para>
             are the support libraries used by the
-            <application>Subversion</application> programs
+            <application>Subversion</application> programs.
           </para>
           <indexterm zone="subversion libsvn_star-1">
@@ -571,5 +563,5 @@
             server, used to authenticate users to a
             <application>Subversion</application> repository over the Internet
-            or an intranet
+            or an intranet.
           </para>
           <indexterm zone="subversion mod_authz_svn">
@@ -585,5 +577,5 @@
             is a plug-in module for the <application>Apache</application> HTTP
             server, used to make a <application>Subversion</application>
-            repository available to others over the Internet or an intranet
+            repository available to others over the Internet or an intranet.
           </para>
           <indexterm zone="subversion mod_dav_svn">
Index: general/prog/svnserver.xml
===================================================================
--- general/prog/svnserver.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/svnserver.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+  <othername>$LastChangedBy$</othername>
   <date>$Date$</date>
   </sect1info>
Index: general/prog/swig.xml
===================================================================
--- general/prog/swig.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/swig.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -60,5 +61,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -204,5 +205,5 @@
             takes an interface file containing C/C++ declarations and
             SWIG special instructions, and generates the corresponding
-            wrapper code needed to build extension modules
+            wrapper code needed to build extension modules.
           </para>
           <indexterm zone="swig swig-prog">
@@ -217,5 +218,5 @@
           <para>
             is a compiler cache, which speeds up re-compilation of
-            C/C++/SWIG code
+            C/C++/SWIG code.
           </para>
           <indexterm zone="swig ccache-swig">
@@ -227,4 +228,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/prog/sysprof.xml
===================================================================
--- general/prog/sysprof.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/sysprof.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY sysprof-download-http "&gnome-download-http;/sysprof/&gnome-minor-40;/sysprof-&sysprof-version;.tar.xz">
-  <!ENTITY sysprof-download-ftp  "&gnome-download-ftp;/sysprof/&gnome-minor-40;/sysprof-&sysprof-version;.tar.xz">
-  <!ENTITY sysprof-md5sum        "05d1399cb3ab923b03603b10acd8d40e">
-  <!ENTITY sysprof-size          "460 KB">
-  <!ENTITY sysprof-buildsize     "20 MB">
+  <!ENTITY sysprof-download-http "&gnome-download-http;/sysprof/&gnome-minor-38;/sysprof-&sysprof-version;.tar.xz">
+  <!ENTITY sysprof-download-ftp  "&gnome-download-ftp;/sysprof/&gnome-minor-38;/sysprof-&sysprof-version;.tar.xz">
+  <!ENTITY sysprof-md5sum        "b4398e0cd3673cee95fdb3c70d4c5e77">
+  <!ENTITY sysprof-size          "448 KB">
+  <!ENTITY sysprof-buildsize     "28 MB">
   <!ENTITY sysprof-time          "0.1 SBU (using parallelism=4)">
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -76,5 +77,4 @@
     <para role="required">
       <xref linkend="gtk3"/>,
-      <xref linkend="json-glib"/>,
       <xref linkend="libdazzle"/>, <phrase revision="systemd">and</phrase>
       <xref linkend="polkit"/> <phrase revision="sysv">, and</phrase>
@@ -103,5 +103,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release -Dsystemdunitdir=/tmp .. &amp;&amp;
+meson --prefix=/usr -Dsystemdunitdir=/tmp .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -178,5 +178,5 @@
         <listitem>
           <para>
-            is a graphical interface to sysprof
+            is a graphical interface to sysprof.
           </para>
           <indexterm zone="sysprof sysprof-prog">
@@ -190,5 +190,5 @@
         <listitem>
           <para>
-            is a command line interface to sysprof
+            is a command line interface to sysprof.
           </para>
           <indexterm zone="sysprof sysprof-cli">
@@ -202,5 +202,5 @@
         <listitem>
           <para>
-            provides API functions for profiling processes running on a system
+            provides API functions for profiling processes running on a system.
           </para>
           <indexterm zone="sysprof libsysprof-4">
@@ -215,5 +215,5 @@
         <listitem>
           <para>
-            provides a hook used to capture statistics from a process
+            provides a hook used to capture statistics from a process.
           </para>
           <indexterm zone="sysprof libsysprof-capture-4">
@@ -227,5 +227,5 @@
         <listitem>
           <para>
-            provides API functions for capturing memory statistics
+            provides API functions for capturing memory statistics.
           </para>
           <indexterm zone="sysprof libsysprof-memory-4">
@@ -239,5 +239,5 @@
         <listitem>
           <para>
-            provides API functions for tracking the speed of a running process
+            provides API functions for tracking the speed of a running process.
           </para>
           <indexterm zone="sysprof libsysprof-speedtrack-4">
@@ -251,5 +251,5 @@
         <listitem>
           <para>
-            provides API functions for the sysprof GUI
+            provides API functions for the sysprof GUI.
           </para>
           <indexterm zone="sysprof libsysprof-ui-4">
@@ -260,4 +260,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/prog/tk.xml
===================================================================
--- general/prog/tk.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/tk.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY tk-download-http "&sourceforge-dl;/tcl/tk&tk-version;-src.tar.gz">
   <!ENTITY tk-download-ftp  " ">
-  <!ENTITY tk-md5sum        "964d69b6307f86bb7e51f7c189666880">
-  <!ENTITY tk-size          "4.3 MB">
-  <!ENTITY tk-buildsize     "31 MB">
+  <!ENTITY tk-md5sum        "602a47ad9ecac7bf655ada729d140a94">
+  <!ENTITY tk-size          "4.2 MB">
+  <!ENTITY tk-buildsize     "24 MB">
   <!ENTITY tk-time          "0.3 SBU (add 2.0 SBU for tests)">
 
@@ -20,4 +20,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -122,8 +123,4 @@
       tk8.6.10 - bdubbs 11/25/2019
       Total   480     Passed  463     Skipped 17      Failed  0
-
-      tk8.6.11.1 - pierre 01/16/2021 There are two summary lines apparently:
-      Total   9650    Passed  8847    Skipped 708     Failed  95
-      Total   488     Passed  470     Skipped 17      Failed  1
       -->
     </para>
@@ -204,5 +201,5 @@
         <listitem>
           <para>
-            is a symlink to the <command>wish&tk-ver;</command> program
+            is a symlink to the <command>wish&tk-ver;</command> program.
           </para>
           <indexterm zone="tk wish">
@@ -218,5 +215,5 @@
             is a simple shell containing the
             <application>Tk</application> toolkit that creates a main window and
-            then processes <application>Tcl</application> commands
+            then processes <application>Tcl</application> commands.
           </para>
           <indexterm zone="tk wish-eight">
@@ -231,5 +228,5 @@
           <para>
             contains the API functions required
-            by <application>Tk</application>
+            by <application>Tk</application>.
           </para>
           <indexterm zone="tk libtk">
Index: general/prog/vala.xml
===================================================================
--- general/prog/vala.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/vala.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY vala-download-http "&gnome-download-http;/vala/&vala-major-version;/vala-&vala-version;.tar.xz">
   <!ENTITY vala-download-ftp  "&gnome-download-ftp;/vala/&vala-major-version;/vala-&vala-version;.tar.xz">
-  <!ENTITY vala-md5sum        "e193bf126416ad5db36a1c52eb391b63">
+  <!ENTITY vala-md5sum        "82e99bbdc5a3a52592872afd317bd7f3">
   <!ENTITY vala-size          "3.4 MB">
-  <!ENTITY vala-buildsize     "145 MB (add 16 MB for tests)">
-  <!ENTITY vala-time          "0.4 SBU (using parallelism=4; add 3.1 SBU for tests)">
+  <!ENTITY vala-buildsize     "220 MB (add 9 MB for tests)">
+  <!ENTITY vala-time          "0.5 SBU (using parallelism=4; add 2.3 SBU for tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -190,5 +191,5 @@
           <para>
             is a compiler that translates <application>Vala</application>
-            source code into C source and header files
+            source code into C source and header files.
           </para>
           <indexterm zone="vala valac">
@@ -203,5 +204,5 @@
           <para>
             is a documentation generator for generating API documentation
-            from <application>Vala</application> source code based on libvala
+            from <application>Vala</application> source code based on libvala.
           </para>
           <indexterm zone="vala valadoc">
@@ -216,5 +217,5 @@
           <para>
             generates a GI file for GObject and
-            <application>GLib</application> based packages
+            <application>GLib</application> based packages.
           </para>
           <indexterm zone="vala vala-gen-introspect">
@@ -229,5 +230,5 @@
           <para>
             is an utility which generates <application>Vala</application> API
-            (VAPI) files from GI files
+            (VAPI) files from GI files.
           </para>
           <indexterm zone="vala vapigen">
@@ -241,5 +242,5 @@
         <listitem>
           <para>
-            contains the <application>Vala</application> API functions
+            contains the <application>Vala</application> API functions.
           </para>
           <indexterm zone="vala libvala">
Index: general/prog/valgrind.xml
===================================================================
--- general/prog/valgrind.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/valgrind.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY valgrind-download-http "https://sourceware.org/ftp/valgrind/valgrind-&valgrind-version;.tar.bz2">
   <!ENTITY valgrind-download-ftp  "ftp://sourceware.org/pub/valgrind/valgrind-&valgrind-version;.tar.bz2">
-  <!ENTITY valgrind-md5sum        "afe11b5572c3121a781433b7c0ab741b">
+  <!ENTITY valgrind-md5sum        "d1b153f1ab17cf1f311705e7a83ef589">
   <!ENTITY valgrind-size          "16 MB">
-  <!ENTITY valgrind-buildsize     "629 MB (add 103 MB for tests)">
-  <!ENTITY valgrind-time          "0.5 SBU (Using parallelism=4; add 7.9 SBU for tests)">
+  <!ENTITY valgrind-buildsize     "615 MB (add 100 MB for tests)">
+  <!ENTITY valgrind-time          "0.6 SBU (Using parallelism=4; add 7.7 SBU for tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -73,4 +74,5 @@
     </itemizedlist>
 
+<!-- Not needed with 3.16.0
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -78,8 +80,9 @@
         <para>
           Required patch:
-          <ulink url="&patch-root;/valgrind-&valgrind-version;-upstream_fixes-1.patch"/>
+          <ulink url="&patch-root;/valgrind-&valgrind-version;-gcc_10-fixes-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
+-->
 
     <bridgehead renderas="sect3">Valgrind Dependencies</bridgehead>
@@ -110,17 +113,10 @@
     <title>Installation of Valgrind</title>
 
-    <para>
-      First, make several changes that are required for Valgrind to function on
-      systems with glibc-2.34 installed:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../valgrind-&valgrind-version;-upstream_fixes-1.patch</userinput></screen>
-
-<!-- Not needed with 3.17.0
-    <para>
-      First, adapt the tests to glibc-2.33:
-    </para>
-
-<screen><userinput remap="pre">sed -i 's/arm64/amd64/' gdbserver_tests/nlcontrolc.vgtest</userinput></screen>
+<!-- Not needed with 3.16.0
+    <para>
+      First, adapt the tests to GCC-10, and fix the build:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../valgrind-&valgrind-version;-gcc_10-fixes-1.patch</userinput></screen>
 -->
 
@@ -130,6 +126,5 @@
     </para>
 
-<screen><userinput>autoreconf -fiv &amp;&amp;
-sed -i 's|/doc/valgrind||' docs/Makefile.in &amp;&amp;
+<screen><userinput>sed -i 's|/doc/valgrind||' docs/Makefile.in &amp;&amp;
 
 ./configure --prefix=/usr \
@@ -195,5 +190,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -212,5 +207,4 @@
         </seg>
         <seg>
-           <!-- Moved to /usr/lib/valgrind in 3.17.0
           libcoregrind-&lt;Arch&gt;-linux.a,
           libgcc-sup-&lt;Arch&gt;-linux.a,
@@ -225,6 +219,4 @@
           vgpreload_memcheck-&lt;Arch&gt;-linux.so, where
           &lt;Arch&gt; is x86 or amd64
-          -->
-          None
         </seg>
         <seg>
@@ -246,5 +238,5 @@
         <listitem>
           <para>
-            is a program for debugging and profiling Linux executables
+            is a program for debugging and profiling Linux executables.
           </para>
           <indexterm zone="valgrind valgrind-prog">
@@ -260,5 +252,5 @@
             takes an output file produced by the
             <application>Valgrind</application> tool Callgrind and prints the
-            information in an easy-to-read form
+            information in an easy-to-read form.
           </para>
           <indexterm zone="valgrind callgrind_annotate">
@@ -273,5 +265,5 @@
           <para>
             controls programs being run by the <application>Valgrind</application>
-            tool Callgrind
+            tool Callgrind.
           </para>
           <indexterm zone="valgrind callgrind_control">
@@ -286,5 +278,5 @@
           <para>
             is a post-processing tool for the <application>Valgrind</application>
-            tool Cachegrind
+            tool Cachegrind.
           </para>
           <indexterm zone="valgrind cg_annotate">
@@ -298,5 +290,5 @@
         <listitem>
           <para>
-            compares two Cachegrind output files
+            compares two Cachegrind output files.
           </para>
           <indexterm zone="valgrind cg_diff">
@@ -310,5 +302,5 @@
         <listitem>
           <para>
-            merges multiple Cachegrind output files into one
+            merges multiple Cachegrind output files into one.
           </para>
           <indexterm zone="valgrind cg_merge">
@@ -323,5 +315,5 @@
           <para>
             takes an output file produced by the <application>Valgrind</application>
-            tool Massif and prints the information in an easy-to-read form
+            tool Massif and prints the information in an easy-to-read form.
           </para>
           <indexterm zone="valgrind ms_print">
@@ -336,5 +328,5 @@
           <para>
             is a server that reads debuginfo from objects stored on a
-            different machine
+            different machine.
           </para>
           <indexterm zone="valgrind valgrind-di-server">
@@ -348,5 +340,5 @@
         <listitem>
           <para>
-            listens on a socket for Valgrind commentary
+            listens on a socket for Valgrind commentary.
           </para>
           <indexterm zone="valgrind valgrind-listener">
@@ -360,5 +352,5 @@
         <listitem>
           <para>
-            is an intermediary between Valgrind and GDB or a shell
+            is an intermediary between Valgrind and GDB or a shell.
           </para>
           <indexterm zone="valgrind vgdb">
Index: general/prog/yasm.xml
===================================================================
--- general/prog/yasm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/prog/yasm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY yasm-download-http "https://www.tortall.net/projects/yasm/releases/yasm-&yasm-version;.tar.gz">
+  <!ENTITY yasm-download-http "http://www.tortall.net/projects/yasm/releases/yasm-&yasm-version;.tar.gz">
   <!ENTITY yasm-download-ftp  " ">
   <!ENTITY yasm-md5sum        "fc9e586751ff789b34b1f21d572d96af">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -147,5 +148,5 @@
             is a portable, retargetable assembler that supports the x86 and
             AMD64 instruction sets, accepts NASM and GAS assembler syntaxes and
-            outputs binaries in ELF32 and ELF64 object formats
+            outputs binaries in ELF32 and ELF64 object formats.
           </para>
           <indexterm zone="yasm yasm">
@@ -156,9 +157,9 @@
 
       <varlistentry id="libyasm">
-        <term><filename class="libraryfile">libyasm.a</filename></term>
+        <term><filename class='libraryfile'>libyasm.a</filename></term>
         <listitem>
           <para>
             provides all of the core functionality of <command>yasm</command>,
-            for manipulating machine instructions and object file constructs
+            for manipulating machine instructions and object file constructs.
           </para>
           <indexterm zone="yasm libyasm">
Index: general/sysutils/accountsservice.xml
===================================================================
--- general/sysutils/accountsservice.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/accountsservice.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -112,10 +113,9 @@
 cd build &amp;&amp;
 
-meson --prefix=/usr             \
-      --buildtype=release       \
-      -Dadmin_group=adm         \
-      -Delogind=true            \
-      -Dsystemdsystemunitdir=no \
-      .. &amp;&amp;
+meson --prefix=/usr                   \
+            -Dadmin_group=adm         \
+            -Delogind=true            \
+            -Dsystemdsystemunitdir=no \
+            .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -123,9 +123,8 @@
 cd build &amp;&amp;
 
-meson --prefix=/usr       \
-      --buildtype=release \
-      -Dadmin_group=adm   \
-      -Dsystemd=true      \
-      .. &amp;&amp;
+meson --prefix=/usr           \
+            -Dadmin_group=adm \
+            -Dsystemd=true    \
+            .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -145,7 +144,4 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
     <para>
       <parameter>-Dadmin_group=adm</parameter>: This switch sets
@@ -157,5 +153,4 @@
       the D-Bus interface API documentation.
     </para>
-
 <!--
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -248,5 +243,5 @@
         <listitem>
           <para>
-            is the <application>AccountsService</application> daemon
+            is the <application>AccountsService</application> daemon.
           </para>
           <indexterm zone="accountsservice accounts-daemon">
@@ -260,5 +255,5 @@
         <listitem>
           <para>
-            contains the <application>AccountsService</application> API functions
+            contains the <application>AccountsService</application> API functions.
           </para>
           <indexterm zone="accountsservice libaccountsservice">
Index: general/sysutils/acpid.xml
===================================================================
--- general/sysutils/acpid.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/acpid.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -209,5 +210,5 @@
           <para>
             is a program that listens for ACPI events and executes the rules
-            that match the received event
+            that match the received event.
           </para>
           <indexterm zone="acpid acpid-prog">
@@ -222,5 +223,5 @@
           <para>
             is a simple tool which connects to <command>acpid</command> and
-            listens for events
+            listens for events.
           </para>
           <indexterm zone="acpid acpi_listen">
@@ -236,5 +237,5 @@
             is a monitor program that connects to three sources of ACPI events
             (events file, netlink and input layer) and then reports on what it
-            sees while it is connected
+            sees while it is connected.
           </para>
           <indexterm zone="acpid kacpimon">
Index: general/sysutils/at.xml
===================================================================
--- general/sysutils/at.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/at.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,8 @@
   <!ENTITY at-download-http "http://software.calhariz.com/at/at_&at-version;.orig.tar.gz">
   <!ENTITY at-download-ftp  " ">
-  <!ENTITY at-md5sum        "34c379193bb020f39efa021ac651d475">
-  <!ENTITY at-size          "128 KB">
-  <!ENTITY at-buildsize     "2.3 MB including tests">
+  <!ENTITY at-md5sum        "518a1c1782c8434869bb0824f1d84520">
+  <!ENTITY at-md5sum        "">
+  <!ENTITY at-size          "125 KB">
+  <!ENTITY at-buildsize     "1.8 MB including tests">
   <!ENTITY at-time          "less than 0.1 SBU">
 ]>
@@ -17,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -244,5 +246,5 @@
         <listitem>
           <para>
-            queues, examines or deletes jobs for later execution
+            queues, examines or deletes jobs for later execution.
           </para>
           <indexterm zone="at at-prog">
@@ -256,5 +258,5 @@
         <listitem>
           <para>
-            is the daemon that runs jobs queued for later execution
+            is the daemon that runs jobs queued for later execution.
           </para>
           <indexterm zone="at atd">
@@ -268,5 +270,5 @@
         <listitem>
           <para>
-            lists the user's pending jobs, or all jobs, if superuser
+            lists the user's pending jobs, or all jobs, if superuser.
           </para>
           <indexterm zone="at atq">
@@ -280,5 +282,5 @@
         <listitem>
           <para>
-            deletes jobs, identified by their job number
+            deletes jobs, identified by their job number.
           </para>
           <indexterm zone="at atrm">
@@ -292,5 +294,5 @@
         <listitem>
           <para>
-            runs jobs queued for later execution
+            runs jobs queued for later execution.
           </para>
           <indexterm zone="at atrun">
@@ -304,5 +306,5 @@
         <listitem>
           <para>
-            is a script that executes commands when system load levels permit
+            is a script that executes commands when system load levels permit.
           </para>
           <indexterm zone="at batch">
Index: general/sysutils/autofs.xml
===================================================================
--- general/sysutils/autofs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/autofs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY autofs-download-http "&kernel-dl;/linux/daemons/autofs/v5/autofs-&autofs-version;.tar.xz">
   <!ENTITY autofs-download-ftp  " ">
-  <!ENTITY autofs-md5sum        "6bd1ea8a9e5dc3a7dc95119e3bbaf52c">
-  <!ENTITY autofs-size          "324 KB">
-  <!ENTITY autofs-buildsize     "6.7 MB">
+  <!ENTITY autofs-md5sum        "b27ee7a1674ae1779aaf75c5e90b0f1e">
+  <!ENTITY autofs-size          "308 KB">
+  <!ENTITY autofs-buildsize     "8.5 MB">
   <!ENTITY autofs-time          "0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -83,5 +84,4 @@
     <para role="optional">
       <xref linkend="nfs-utils"/>,
-      <xref linkend="libnsl"/>,
       <xref linkend="libxml2"/>,
       <xref linkend="mitkrb"/>,
@@ -128,16 +128,4 @@
     <title>Installation of Autofs</title>
 
-    <para>Some lines of code need to be removed for this package to be
-    consistent with glibc-2.34. We will remove these lines with some sed commands
-    by line numbers showing slightly different methods.</para>
-
-<screen><userinput>sed -e '87d'        \
-    -e '2618,2644d' \
-    -i daemon/automount.c &amp;&amp;
-
-sed -i '1178,1180d' daemon/state.c &amp;&amp;
-sed -i '275,+2 d'   lib/alarm.c</userinput></screen>    
-
-
     <para>
       Install <application>Autofs</application> by running the following
@@ -145,17 +133,16 @@
     </para>
 
-<screen revision="sysv"><userinput>./configure --prefix=/usr             \
-            --with-mapdir=/etc/autofs \
-            --with-libtirpc           \
-            --without-openldap        \
+<screen revision="sysv"><userinput>./configure --prefix=/         \
+            --with-libtirpc    \
+            --without-openldap \
             --mandir=/usr/share/man &amp;&amp;
 make</userinput></screen>
 
-<screen revision="systemd"><userinput>./configure --prefix=/usr             \
-            --with-mapdir=/etc/autofs \
-            --with-libtirpc           \
-            --with-systemd            \
-            --without-openldap        \
+<screen revision="systemd"><userinput>./configure --prefix=/         \
+            --with-libtirpc    \
+            --with-systemd     \
+            --without-openldap \
             --mandir=/usr/share/man &amp;&amp;
+
 make</userinput></screen>
 
@@ -218,7 +205,7 @@
       <para>
         <filename>/etc/sysconfig/autofs.conf</filename>,
-        <filename>/etc/autofs/auto.master</filename>,
-        <filename>/etc/autofs/auto.misc</filename>, and
-        <filename>/etc/autofs/auto.net</filename>
+        <filename>/etc/auto.master</filename>,
+        <filename>/etc/auto.misc</filename>, and
+        <filename>/etc/auto.net</filename>
       </para>
 
@@ -228,13 +215,13 @@
 
       <indexterm zone="autofs autofs-config">
-        <primary sortas="e-etc-auto.master">/etc/autofs/auto.master</primary>
+        <primary sortas="e-etc-auto.master">/etc/auto.master</primary>
       </indexterm>
 
       <indexterm zone="autofs autofs-config">
-        <primary sortas="e-etc-auto.misc">/etc/autofs/auto.misc</primary>
+        <primary sortas="e-etc-auto.misc">/etc/auto.misc</primary>
       </indexterm>
 
       <indexterm zone="autofs autofs-config">
-        <primary sortas="e-etc-auto.net">/etc/autofs/auto.net</primary>
+        <primary sortas="e-etc-auto.net">/etc/auto.net</primary>
       </indexterm>
 
@@ -252,12 +239,12 @@
       </para>
 
-<screen role="root"><userinput>mv /etc/autofs/auto.master /etc/autofs/auto.master.bak &amp;&amp;
-cat &gt; /etc/autofs/auto.master &lt;&lt; "EOF"
-<literal># Begin /etc/autofs/auto.master
-
-/media/auto  /etc/autofs/auto.misc  --ghost
-#/home        /etc/autofs/auto.home
-
-# End /etc/autofs/auto.master</literal>
+<screen role="root"><userinput>mv /etc/auto.master /etc/auto.master.bak &amp;&amp;
+cat &gt; /etc/auto.master &lt;&lt; "EOF"
+<literal># Begin /etc/auto.master
+
+/media/auto  /etc/auto.misc  --ghost
+#/home        /etc/auto.home
+
+# End /etc/auto.master</literal>
 EOF</userinput></screen>
 
@@ -266,5 +253,5 @@
         <filename>/media/auto</filename> that will overlay any existing
         directory of the same name.  In this example, the file,
-        <filename>/etc/autofs/auto.misc</filename>, has a line:
+        <filename>/etc/auto.misc</filename>, has a line:
       </para>
 
@@ -338,5 +325,5 @@
         <application>autofs</application> installs its own
         boot script, but it has no capability for logging or visual conformance
-        with other BLFS scripts. It will be replaced by an enhanced version.
+        with other BLFS scripts.
       </para>
 
@@ -399,5 +386,5 @@
           mount_nfs4.so, parse_amd.so, and parse_sun.so
            </seg>
-        <seg>/usr/lib/autofs, /etc/autofs</seg>
+        <seg>/lib/autofs</seg>
       </seglistitem>
     </segmentedlist>
@@ -413,5 +400,5 @@
           <para>
             is the daemon that performs the mounting when a request is
-            made for the device
+            made for the device.
           </para>
           <indexterm zone="autofs automount">
Index: general/sysutils/blocaled.xml
===================================================================
--- general/sysutils/blocaled.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/blocaled.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -32,10 +33,10 @@
     <para>
       <application>blocaled</application> is an implementation of the
-      <emphasis>org.freedesktop.locale1</emphasis> D-Bus protocol,
+      <emphasis>org.freedesktop.locale1</emphasis> D&ndash;Bus protocol,
       which normally comes with <application>systemd</application>. It is
       needed by the <application>GNOME</application> desktop.
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -233,5 +234,5 @@
           <para>
             is the daemon implementing the
-            <emphasis>org.freedesktop.locale1</emphasis> D-Bus protocol
+            <emphasis>org.freedesktop.locale1</emphasis> D&ndash;Bus protocol
           </para>
           <indexterm zone="blocaled blocaled-prog">
@@ -242,4 +243,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/sysutils/bluez.xml
===================================================================
--- general/sysutils/bluez.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/bluez.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY bluez-download-http "&kernel-dl;/linux/bluetooth/bluez-&bluez-version;.tar.xz">
   <!ENTITY bluez-download-ftp  " ">
-  <!ENTITY bluez-md5sum        "a4c98b6bd2411880cba5930e7f10a1c4">
-  <!ENTITY bluez-size          "2.0 MB">
-  <!ENTITY bluez-buildsize     "64 MB (add 76 MB for tests)">
-  <!ENTITY bluez-time          "0.1 SBU (using parallelism=4; add 0.2 SBU for tests)">
+  <!ENTITY bluez-md5sum        "94972b8bc7ade60c72b0ffa6ccff2c0a">
+  <!ENTITY bluez-size          "1.9 MB">
+  <!ENTITY bluez-buildsize     "68 MB (add 78 MB for tests)">
+  <!ENTITY bluez-time          "0.2 SBU (using parallelism=4; add 0.2 SBU for tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -70,13 +71,14 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3" revision="sysv">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact" revision="sysv">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/bluez-&bluez-version;-obexd_without_systemd-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
+      <!--bridgehead renderas="sect3" revision="sysv">Additional Downloads</bridgehead>
+      <itemizedlist spacing="compact" revision="sysv">
+        <listitem>
+          <para>
+             Optional patch (required to work properly with gnome-bluetooth
+             and/or kde bluedevil):
+            <ulink url="&patch-root;/bluez-&bluez-version;-obexd_without_systemd-1.patch"/>
+          </para>
+        </listitem>
+      </itemizedlist-->
 
     <bridgehead renderas="sect3">BlueZ Dependencies</bridgehead>
@@ -89,9 +91,4 @@
     </para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docutils"/> (to generate man pages)
-    </para>
-
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/bluez"/>
@@ -110,10 +107,5 @@
     </para>
 
-<screen><literal>General Setup ---&gt;
-  [*] Configure standard kernel features (expert users)               [CONFIG_EXPERT]
-    [*] Enable timerfd() system call               [CONFIG_TIMERFD]
-    [*] Enable eventfd() system call               [CONFIG_EVENTFD]
-
-[*] Networking support ---&gt;                [CONFIG_NET]
+<screen><literal>[*] Networking support ---&gt;                [CONFIG_NET]
   &lt;*/M&gt; Bluetooth subsystem support ---&gt;    [CONFIG_BT]
     &lt;*/M&gt; RFCOMM protocol support          [CONFIG_BT_RFCOMM]
@@ -126,17 +118,6 @@
           (Select the appropriate drivers for your Bluetooth hardware)
 
-   &lt;*/M&gt; RF switch subsystem support ----   [CONFIG_RFKILL]
-
--*- Cryptographic API ---&gt;
-   &lt;*/M*&gt; User-space cryptographic algorithm configuration         [CONFIG_CRYPTO_USER]
-   &lt;*/M*&gt; User-space interface for hash algorithms                 [CONFIG_CRYPTO_USER_API_HASH]
-   &lt;*/M*&gt; User-space interface for symmetric key cipher algorithms [CONFIG_CRYPTO_USER_API_SKCIPHER]
-   &lt;*/M*&gt; MD5 digest algorithm                                     [CONFIG_CRYPTO_MD5]
-   &lt;*/M*&gt; SHA1 digest algorithm                                    [CONFIG_CRYPTO_SHA1]
-
-Security Options ---&gt;
-  &lt;*/M*&gt; Diffie-Hellman operations on retained keys [CONFIG_KEY_DH_OPERATIONS]</literal></screen>
-
-<!--
+  &lt;*/M&gt; RF switch subsystem support ----   [CONFIG_RFKILL]</literal></screen>
+
     <para>
       If you wish to run the testsuite (even if treating this package as a build
@@ -145,8 +126,8 @@
     </para>
 
-<screen><literal>-*- Cryptographic API - - -&gt;                                      [CONFIG_CRYPTO]
+<screen><literal>-*- Cryptographic API ---&gt;                                      [CONFIG_CRYPTO]
   &lt;*/M&gt; User-space interface for hash algorithms                 [CONFIG_CRYPTO_USER_API_HASH]
   &lt;*/M&gt; User-space interface for symmetric key cipher algorithms [CONFIG_CRYPTO_USER_API_SKCIPHER]</literal></screen>
--->
+
     <indexterm zone="bluez bluez-kernel">
       <primary sortas="d-bluez">bluez</primary>
@@ -156,14 +137,20 @@
   <sect2 role="installation">
     <title>Installation of BlueZ</title>
-
-    <para>
-      At first, fix an issue building the package with Glibc-2.34 or later:
-    </para>
-
-<screen><userinput>sed 's/pause(/bluez_&amp;/' -i profiles/audio/media.c</userinput></screen>
-
-    <para revision="sysv">Now, make some changes needed for SystemV systems:</para>
+<!--
+    <para revision="sysv">
+      If you are going to use <application>BlueZ</application> with
+      gnome-bluetooth and/or kde bluedevil, apply the following patch:
+    </para>
 
 <screen revision="sysv"><userinput>patch -Np1 -i ../bluez-&bluez-version;-obexd_without_systemd-1.patch</userinput></screen>
+-->
+<!--
+    <para>
+      First, adapt BlueZ to changes in the Linux API Headers in Linux 5.2+:
+    </para>
+    
+<screen><userinput remap="pre">sed -i 's/SIOCGSTAMP/0x8906/' tools/rctest.c \
+                              tools/l2test.c</userinput></screen>
+-->
 
     <para>
@@ -176,5 +163,4 @@
             --localstatedir=/var  \
             --enable-library      \
-            --disable-manpages    \
             --disable-systemd     &amp;&amp;
 make</userinput></screen>
@@ -183,5 +169,4 @@
             --sysconfdir=/etc     \
             --localstatedir=/var  \
-            --disable-manpages    \
             --enable-library      &amp;&amp;
 make</userinput></screen>
@@ -219,11 +204,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-manpages</parameter>: This switch disables generating
-      the manual pages because of the reliance on 'rst2man' in docutils. Remove
-      this switch if you have <xref role="nodep" linkend="docutils"/> installed
-      and wish to generate the manual pages.
-    </para>
 
     <para>
@@ -251,5 +229,5 @@
     <sect3 id="bluez-config">
       <title>Configuration Files</title>
-      <para revision="sysv">
+      <para>
         <filename>/etc/bluetooth/main.conf</filename> is installed automatically
         during the install.  Additionally, there are three supplementary
@@ -259,12 +237,4 @@
       </para>
 
-      <para revision="systemd">
-        <filename>/etc/bluetooth/mail.conf</filename> is installed automatically
-        during the installation. Additionally, there are two supplementary
-        configuration files. In addition, you can optionally install the
-        following files, as the <systemitem class="username">root</systemitem>
-        user:
-     </para>
-
 <screen role="root"><userinput>cat > /etc/bluetooth/rfcomm.conf &lt;&lt; "EOF"</userinput>
 <literal># Start rfcomm.conf
@@ -350,5 +320,5 @@
       <seglistitem>
         <seg>
-      <!--bccmd, -->
+          bccmd, 
           bluemoon, 
           bluetoothctl, 
@@ -378,5 +348,4 @@
       <?dbhtml list-presentation="table"?>
 
-      <!--
       <varlistentry id="bccmd">
         <term><command>bccmd</command></term>
@@ -384,5 +353,5 @@
           <para>
             is used to issue BlueCore commands to Cambridge Silicon
-            Radio devices
+            Radio devices.
           </para>
           <indexterm zone="bluez bccmd">
@@ -391,5 +360,4 @@
         </listitem>
       </varlistentry>
-      -->
 
       <varlistentry id="bluemoon">
@@ -397,5 +365,5 @@
         <listitem>
           <para>
-            is a Bluemoon configuration utility
+            is a Bluemoon configuration utility.
           </para>
           <indexterm zone="bluez bluemoon">
@@ -409,5 +377,5 @@
         <listitem>
           <para>
-            is the interactive Bluetooth control program
+            is the interactive Bluetooth control program.
           </para>
           <indexterm zone="bluez bluetoothctl">
@@ -421,5 +389,5 @@
         <listitem>
           <para>
-            is the Bluetooth daemon
+            is the Bluetooth daemon.
           </para>
           <indexterm zone="bluez bluetoothd">
@@ -434,5 +402,5 @@
           <para>
             provides access to the Bluetooth subsystem monitor
-            infrastructure for reading HCI traces
+            infrastructure for reading HCI traces.
           </para>
           <indexterm zone="bluez btmon">
@@ -448,5 +416,5 @@
           <para>
             is used to convert a file needed by Broadcom devices
-            to hcd (Broadcom bluetooth firmware) format
+            to hcd (Broadcom bluetooth firmware) format.
           </para>
           <indexterm zone="bluez hex2hcd">
@@ -461,5 +429,5 @@
           <para>
             is used to send a L2CAP echo request to the Bluetooth MAC
-            address given in dotted hex notation
+            address given in dotted hex notation.
           </para>
           <indexterm zone="bluez l2ping">
@@ -473,5 +441,5 @@
         <listitem>
           <para>
-            is a L2CAP testing program
+            is a L2CAP testing program.
           </para>
           <indexterm zone="bluez l2test">
@@ -486,5 +454,5 @@
           <para>
             is used to test RFCOMM communications on the
-            Bluetooth stack
+            Bluetooth stack.
           </para>
           <indexterm zone="bluez rctest">
@@ -498,5 +466,5 @@
         <listitem>
           <para>
-            contains the <application>BlueZ</application> 4 API functions
+            contains the <application>BlueZ</application> 4 API functions.
           </para>
           <indexterm zone="bluez libbluetooth">
Index: general/sysutils/bubblewrap.xml
===================================================================
--- general/sysutils/bubblewrap.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/bubblewrap.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY bubblewrap-download-http "https://github.com/projectatomic/bubblewrap/releases/download/v&bubblewrap-version;/bubblewrap-&bubblewrap-version;.tar.xz">
   <!ENTITY bubblewrap-download-ftp  " ">
-  <!ENTITY bubblewrap-md5sum        "a1b802c8381527bf6acbeed7e5ceac3a">
-  <!ENTITY bubblewrap-size          "136 KB">
-  <!ENTITY bubblewrap-buildsize     "2.2 MB">
-  <!ENTITY bubblewrap-time          "0.1 SBU">
+  <!ENTITY bubblewrap-md5sum        "1104b0e43006f22076b5057c129939c8">
+  <!ENTITY bubblewrap-size          "212 KB">
+  <!ENTITY bubblewrap-buildsize     "2.1 MB">
+  <!ENTITY bubblewrap-time          "less than 0.1 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -73,11 +74,4 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Bubblewrap Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional (to generate manual pages)</bridgehead>
-    <para role="optional">
-      <xref linkend="libxslt"/>
-    </para>
-
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/bubblewrap"/>
@@ -100,12 +94,5 @@
 
     <para>
-      Next, if you desire to run the test suite, fix an issue caused by the
-      merged-/usr configuration in LFS:
-    </para>
-
-<screen><userinput remap="pre">sed 's@symlink usr/lib64@ro-bind-try /lib64@' -i tests/libtest.sh</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>
+      This package does not come with a test suite.
     </para>
 
@@ -147,5 +134,5 @@
         <listitem>
           <para>
-            generates a sandbox for a program to run in
+            generates a sandbox for a program to run in.
           </para>
           <indexterm zone="bubblewrap bwrap">
@@ -156,4 +143,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/sysutils/colord.xml
===================================================================
--- general/sysutils/colord.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/colord.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -98,6 +99,4 @@
       <xref linkend="gnome-desktop"/> and
       <xref linkend="colord-gtk"/> (to build the example tools),
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="gtk-doc"/>,
       <xref linkend="libxslt"/>,
       <xref linkend="sane"/>,
@@ -140,5 +139,4 @@
 
 meson --prefix=/usr            \
-      --buildtype=release      \
       -Ddaemon_user=colord     \
       -Dvapi=true              \
@@ -155,5 +153,4 @@
 
 meson --prefix=/usr            \
-      --buildtype=release      \
       -Ddaemon_user=colord     \
       -Dvapi=true              \
@@ -183,7 +180,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -287,5 +281,5 @@
         <listitem>
           <para>
-            is the Color Manager Profile Creation Tool
+            is the Color Manager Profile Creation Tool.
           </para>
           <indexterm zone="colord cd-create-profile">
@@ -299,5 +293,5 @@
         <listitem>
           <para>
-            is a tool used to fix metadata in ICC profiles
+            is a tool used to fix metadata in ICC profiles.
           </para>
           <indexterm zone="colord cd-fix-profile">
@@ -311,5 +305,5 @@
         <listitem>
           <para>
-            dumps the contents of an ICC profile as human readable text
+            dumps the contents of an ICC profile as human readable text.
           </para>
           <indexterm zone="colord cd-iccdump">
@@ -323,5 +317,5 @@
         <listitem>
           <para>
-            is the Color Manager Testing Tool
+            is the Color Manager Testing Tool.
           </para>
           <indexterm zone="colord cd-it8">
@@ -336,5 +330,5 @@
           <para>
             is a text-mode program that allows you to interact with colord on
-            the command line
+            the command line.
           </para>
           <indexterm zone="colord colormgr">
@@ -348,5 +342,5 @@
         <listitem>
           <para>
-            contains the <application>Colord</application> API functions
+            contains the <application>Colord</application> API functions.
           </para>
           <indexterm zone="colord libcolord.so">
@@ -361,5 +355,5 @@
           <para>
             contains legacy API functions for compatibility with older
-            applications
+            applications.
           </para>
           <indexterm zone="colord libcolordcompat.so">
@@ -374,5 +368,5 @@
           <para>
             contains internal API functions for the programs included with
-            <application>Colord</application>
+            <application>Colord</application>.
           </para>
           <indexterm zone="colord libcolordprivate.so">
@@ -386,5 +380,5 @@
         <listitem>
           <para>
-            contains a simple display hardware colorimiter
+            contains a simple display hardware colorimiter.
           </para>
           <indexterm zone="colord libcolorhug.so">
@@ -395,4 +389,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/sysutils/cpio.xml
===================================================================
--- general/sysutils/cpio.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/cpio.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -97,4 +98,5 @@
 
 <screen><userinput>./configure --prefix=/usr \
+            --bindir=/bin \
             --enable-mt   \
             --with-rmt=/usr/libexec/rmt &amp;&amp;
@@ -142,12 +144,10 @@
     <title>Command Explanations</title>
 
-    <!-- FIXME: Removed due to merged-/usr transition
-    <para>
-      <parameter>- -bindir=/bin</parameter>: This parameter installs
+    <para>
+      <parameter>--bindir=/bin</parameter>: This parameter installs
       <command>cpio</command> to <filename class="directory">/bin</filename>
       instead of <filename class="directory">/usr/bin</filename> as recommended
       by the FHS guidelines.
     </para>
-    -->
 
     <para>
@@ -188,5 +188,5 @@
         <listitem>
           <para>
-            copies files to and from archives
+            copies files to and from archives.
           </para>
           <indexterm zone="cpio cpio-prog">
@@ -200,5 +200,5 @@
         <listitem>
           <para>
-            controls magnetic tape drive operations
+            controls magnetic tape drive operations.
           </para>
           <indexterm zone="cpio mt">
Index: general/sysutils/cups-pk-helper.xml
===================================================================
--- general/sysutils/cups-pk-helper.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/cups-pk-helper.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -72,14 +73,4 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/cups-pk-helper-&cups-pk-helper-version;-consolidated_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">cups-pk-helper Dependencies</bridgehead>
 
@@ -97,11 +88,4 @@
   <sect2 role="installation">
     <title>Installation of cups-pk-helper</title>
-
-    <para>
-      First, fix some deprecated syntax that will prevent cups-pk-helper from
-      building on future versions of CUPS:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../cups-pk-helper-&cups-pk-helper-version;-consolidated_fixes-1.patch</userinput></screen>
 
     <para>
Index: general/sysutils/dbus.xml
===================================================================
--- general/sysutils/dbus.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/dbus.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -48,5 +49,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -197,5 +198,4 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-<!-- FIXME: No longer needed with usr merge
     <para>
       The shared library needs to be moved to
@@ -209,5 +209,4 @@
 <screen role="root"><userinput>mv -v /usr/lib/libdbus-1.so.* /lib &amp;&amp;
 ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</userinput></screen>
--->
 
     <para>
@@ -548,5 +547,5 @@
         <listitem>
           <para>
-            is used to clean up leftover sockets in a directory
+            is used to clean up leftover sockets in a directory.
           </para>
           <indexterm zone="dbus dbus-cleanup-sockets">
@@ -560,5 +559,5 @@
         <listitem>
           <para>
-            is the <application>D-Bus</application> message bus daemon
+            is the <application>D-Bus</application> message bus daemon.
           </para>
           <indexterm zone="dbus dbus-daemon">
@@ -574,5 +573,5 @@
             is used to start <command>dbus-daemon</command> from a shell
             script. It  would  normally be called from a user's login
-            scripts
+            scripts.
           </para>
           <indexterm zone="dbus dbus-launch">
@@ -587,5 +586,5 @@
           <para>
             is used to monitor messages going through a
-            <application>D-Bus</application> message bus
+            <application>D-Bus</application> message bus.
           </para>
           <indexterm zone="dbus dbus-monitor">
@@ -599,5 +598,5 @@
         <listitem>
           <para>
-            starts a process as a new <application>D-Bus</application> session
+            starts a process as a new <application>D-Bus</application> session.
           </para>
           <indexterm zone="dbus dbus-run-session">
@@ -612,5 +611,5 @@
           <para>
             is used to send a message to a <application>D-Bus</application>
-            message bus
+            message bus.
           </para>
           <indexterm zone="dbus dbus-send">
@@ -626,5 +625,5 @@
             is a <application>D-Bus</application> traffic generator and test 
             tool; it is a multi-purpose tool for debugging and profiling
-            <application>D-Bus</application>
+            <application>D-Bus</application>.
           </para>
           <indexterm zone="dbus dbus-test-tool">
@@ -642,5 +641,5 @@
             it updates the list of environment variables used by
             <command>dbus-daemon --session</command> when it activates session
-            services without using systemd
+            services without using systemd.
           </para>
           <indexterm zone="dbus dbus-update-activation-environment">
@@ -655,5 +654,5 @@
         <listitem>
           <para>
-            is used to generate a universally unique ID
+            is used to generate a universally unique ID.
           </para>
           <indexterm zone="dbus dbus-uuidgen">
@@ -672,5 +671,5 @@
             one-to-one communication between any two applications;
             <command>dbus-daemon</command> is an application that uses this
-            library to implement a message bus daemon
+            library to implement a message bus daemon.
           </para>
           <indexterm zone="dbus libdbus-1">
@@ -683,5 +682,5 @@
 
   </sect2>
-
+  
   <sect2 role="content" revision="systemd">
     <title>Contents</title>
@@ -695,3 +694,5 @@
   </sect2>
 
+
 </sect1>
+
Index: general/sysutils/elogind.xml
===================================================================
--- general/sysutils/elogind.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/elogind.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY elogind-download-http "https://github.com/elogind/elogind/archive/v&elogind-version;/elogind-&elogind-version;.tar.gz">
   <!ENTITY elogind-download-ftp  " ">
-  <!ENTITY elogind-md5sum        "32ab2201281f14738d9c045f3669c14d">
+  <!ENTITY elogind-md5sum        "d9fdee3692990afadcd8c8764e440fa0">
   <!ENTITY elogind-size          "1.5 MB">
-  <!ENTITY elogind-buildsize     "41 MB (with tests)">
-  <!ENTITY elogind-time          "0.2 SBU (with parallelism=4)">
+  <!ENTITY elogind-buildsize     "52 MB (with tests)">
+  <!ENTITY elogind-time          "0.4 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -41,5 +42,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -86,9 +87,9 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="linux-pam"/> (required for Xorg),
-      <xref linkend="polkit"/> (runtime), 
       <xref linkend="DocBook"/>,
       <xref linkend="docbook-xsl"/>, and
-      <xref linkend="libxslt"/> (all three to build the man pages) 
+      <xref linkend="libxslt"/> (to build the man pages),
+      <xref linkend="linux-pam"/>, and
+      <xref linkend="polkit" role="runtime"/> (runtime)
     </para>
 
@@ -149,15 +150,18 @@
 
     <para>
+      First, fix a problem starting the package via pam:
+    </para>
+
+<screen><userinput>sed -i '/running/,+1s:^://:' src/login/pam_elogind.c</userinput></screen>
+
+    <para>
       Install <application>elogind</application> by running the following
       commands:
     </para>
 
-<screen><userinput>sed -i '/Disable polkit/,+8 d' meson.build &amp;&amp;
-
-mkdir build &amp;&amp;
+<screen><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
 
 meson --prefix=/usr                        \
-      --buildtype=release                  \
       -Dcgroup-controller=elogind          \
       -Ddbuspolicydir=/etc/dbus-1/system.d \
@@ -184,11 +188,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... meson.build</command>: This change allows the
-      package to be built without polkit being installed (it is still a
-      runtime dependency) but able to use polkit after that package is 
-      installed.
-    </para>
 
     <para>
@@ -328,5 +325,5 @@
         <listitem>
           <para>
-            is used to introspect and monitor the D-Bus bus
+            is used to introspect and monitor the D-Bus bus.
           </para>
           <indexterm zone="elogind busctl">
@@ -341,5 +338,5 @@
           <para>
             is used to execute a program with a shutdown, sleep or idle
-            inhibitor lock taken
+            inhibitor lock taken.
           </para>
           <indexterm zone="elogind elogind-inhibit">
@@ -354,5 +351,5 @@
           <para>
             is used to introspect and control the state of the elogind Login
-            Manager
+            Manager.
           </para>
           <indexterm zone="elogind loginctl">
@@ -366,5 +363,5 @@
         <listitem>
           <para>
-            is the main elogind utility library
+            is the main elogind utility library.
           </para>
           <indexterm zone="elogind libelogind">
@@ -377,4 +374,5 @@
 
   </sect2>
-
+  
 </sect1>
+
Index: general/sysutils/fcron.xml
===================================================================
--- general/sysutils/fcron.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/fcron.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -434,5 +435,5 @@
         <listitem>
           <para>
-            is the scheduling daemon
+            is the scheduling daemon.
           </para>
           <indexterm zone="fcron fcron-prog">
@@ -447,5 +448,5 @@
           <para>
             is a user tool intended to interact with a running
-            <command>fcron</command> daemon
+            <command>fcron</command> daemon.
           </para>
           <indexterm zone="fcron fcrondyn">
@@ -460,5 +461,5 @@
           <para>
             instructs <command>fcron</command> to reread the
-            <application>Fcron</application> tables
+            <application>Fcron</application> tables.
           </para>
           <indexterm zone="fcron fcronsighup">
@@ -473,5 +474,5 @@
           <para>
             is a program used to install, edit, list and remove the
-            tables used by <command>fcron</command>
+            tables used by <command>fcron</command>.
           </para>
           <indexterm zone="fcron fcrontab">
Index: general/sysutils/gpm.xml
===================================================================
--- general/sysutils/gpm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/gpm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -41,5 +42,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -136,5 +137,4 @@
              /usr/share/info/gpm.info                 &amp;&amp;
 
-rm -fv /usr/lib/libgpm.a                              &amp;&amp;
 ln -sfv libgpm.so.2.1.0 /usr/lib/libgpm.so            &amp;&amp;
 install -v -m644 conf/gpm-root.conf /etc              &amp;&amp;
@@ -291,5 +291,5 @@
         <seg>disable-paste, display-buttons, display-coords, get-versions, gpm,
         gpm-root, hltest, mev, and mouse-test</seg>
-        <seg>libgpm.so</seg>
+        <seg>libgpm.{so.a}</seg>
         <seg>/usr/share/doc/gpm-&gpm-version;</seg>
       </seglistitem>
@@ -305,5 +305,5 @@
         <listitem>
           <para>
-            is a security mechanism used to disable the paste buffer
+            is a security mechanism used to disable the paste buffer.
           </para>
           <indexterm zone="gpm disable-paste">
@@ -318,5 +318,5 @@
           <para>
             is a simple program that reports the mouse buttons being
-            pressed and released
+            pressed and released.
           </para>
           <indexterm zone="gpm display-buttons">
@@ -330,5 +330,5 @@
         <listitem>
           <para>
-            is a simple program that reports the mouse coordinates
+            is a simple program that reports the mouse coordinates.
           </para>
           <indexterm zone="gpm display-coords">
@@ -343,5 +343,5 @@
           <para>
             is used to report the <application>GPM</application> library
-            and server versions
+            and server versions.
           </para>
           <indexterm zone="gpm get-versions">
@@ -355,5 +355,5 @@
         <listitem>
           <para>
-            is a cut and paste utility and mouse server for virtual consoles
+            is a cut and paste utility and mouse server for virtual consoles.
           </para>
           <indexterm zone="gpm gpm-prog">
@@ -368,5 +368,5 @@
           <para>
             is a default handler for <command>gpm</command>. It is used to
-            draw menus on the root window
+            draw menus on the root window.
           </para>
           <indexterm zone="gpm gpm-root">
@@ -381,5 +381,5 @@
           <para>
             is a simple sample application using the high-level library, meant
-            to be read by programmers trying to use the high-level library
+            to be read by programmers trying to use the high-level library.
           </para>
           <indexterm zone="gpm hltest">
@@ -393,5 +393,5 @@
         <listitem>
           <para>
-            is a program to report mouse events
+            is a program to report mouse events.
           </para>
           <indexterm zone="gpm mev">
@@ -406,5 +406,5 @@
           <para>
             is a tool for determining the mouse type and device it's
-            attached to
+            attached to.
           </para>
           <indexterm zone="gpm mouse-test">
@@ -415,12 +415,12 @@
 
       <varlistentry id="libgpm">
-        <term><filename class="libraryfile">libgpm.so</filename></term>
+        <term><filename class='libraryfile'>libgpm.{so.a}</filename></term>
         <listitem>
           <para>
             contains the API functions to access the
-            <application>GPM</application> daemon
+            <application>GPM</application> daemon.
           </para>
           <indexterm zone="gpm libgpm">
-            <primary sortas="c-libgpm">libgpm.so</primary>
+            <primary sortas="c-libgpm">libgpm.{so,a}</primary>
           </indexterm>
         </listitem>
Index: general/sysutils/hdparm.xml
===================================================================
--- general/sysutils/hdparm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/hdparm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,6 +7,6 @@
   <!ENTITY hdparm-download-http "&sourceforge-dl;/hdparm/hdparm-&hdparm-version;.tar.gz">
   <!ENTITY hdparm-download-ftp  " ">
-  <!ENTITY hdparm-md5sum        "601ebcf88a24d012bf85ffc47640319a">
-  <!ENTITY hdparm-size          "140 KB">
+  <!ENTITY hdparm-md5sum        "25a791d47236c58801f8b27074f3ef93">
+  <!ENTITY hdparm-size          "152 KB">
   <!ENTITY hdparm-buildsize     "1.0 MB">
   <!ENTITY hdparm-time          "less than 0.1 SBU">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <warning>
@@ -105,7 +106,6 @@
     </para>
 
-<screen role="root"><userinput>make binprefix=/usr install</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
-<!-- no longer relevant with merged-/usr
     <note><para>
       Note that by default, <command>hdparm</command> is installed in
@@ -118,5 +118,4 @@
 
 <screen role="nodump"><userinput>make binprefix=/usr install</userinput></screen></note>
--->
 
   </sect2>
@@ -153,5 +152,5 @@
           <para>
             provides a command-line interface to various hard disk ioctls
-            supported by the stock Linux ATA/IDE device driver subsystem
+            supported by the stock Linux ATA/IDE device driver subsystem.
           </para>
           <indexterm zone="hdparm hdparm-prog">
Index: general/sysutils/lm_sensors.xml
===================================================================
--- general/sysutils/lm_sensors.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/lm_sensors.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -260,5 +261,5 @@
             It reads its configuration from a file<!--what file?-->, then
             calculates fan speeds from temperatures and sets the corresponding
-            PWM outputs to the computed values
+            PWM outputs to the computed values.
           </para>
           <indexterm zone="lm_sensors fancontrol">
@@ -275,5 +276,5 @@
             ISA bus. It is intended to probe any chip that lives on the ISA bus
             working with an address register and a data register (I2C-like
-            access) or a flat range (of up to 256 bytes)
+            access) or a flat range (of up to 256 bytes).
           </para>
           <indexterm zone="lm_sensors isadump">
@@ -288,5 +289,5 @@
           <para>
             is a small helper program to set registers visible through the ISA
-            bus
+            bus.
           </para>
           <indexterm zone="lm_sensors isaset">
@@ -301,5 +302,5 @@
           <para>
             tests the pulse width modulation (PWM) outputs of sensors and
-            configures fancontrol
+            configures fancontrol.
           </para>
           <indexterm zone="lm_sensors pwmconfig">
@@ -313,5 +314,5 @@
         <listitem>
           <para>
-            prints the current readings of all sensor chips
+            prints the current readings of all sensor chips.
           </para>
           <indexterm zone="lm_sensors sensors">
@@ -327,5 +328,5 @@
             is a <application>Perl</application> script to convert
             <application>lm-sensors</application> version 2 configuration files
-            to work with version 3
+            to work with version 3.
           </para>
           <indexterm zone="lm_sensors sensors-conf-convert">
@@ -343,5 +344,5 @@
             monitoring chips (sensors) supported by
             <filename class="libraryfile">libsensors</filename>, or more
-            generally by the <application>lm_sensors</application> tool suite
+            generally by the <application>lm_sensors</application> tool suite.
           </para>
           <indexterm zone="lm_sensors sensors-detect">
@@ -356,5 +357,5 @@
           <para>
             (optional) is a daemon that can be used to periodically log sensor
-            readings
+            readings.
           </para>
           <indexterm zone="lm_sensors sensord">
@@ -368,5 +369,5 @@
         <listitem>
           <para>
-            contains the <application>lm_sensors</application> API functions
+            contains the <application>lm_sensors</application> API functions.
           </para>
           <indexterm zone="lm_sensors libsensors">
Index: general/sysutils/logrotate.xml
===================================================================
--- general/sysutils/logrotate.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/logrotate.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY logrotate-download-http "https://github.com/logrotate/logrotate/releases/download/&logrotate-version;/logrotate-&logrotate-version;.tar.xz">
   <!ENTITY logrotate-download-ftp  " ">
-  <!ENTITY logrotate-md5sum        "07d5aba26c350f9ab5730c25a7277751">
+  <!ENTITY logrotate-md5sum        "ac2a7151fc8a187201872358a20a2813">
   <!ENTITY logrotate-size          "160 KB">
-  <!ENTITY logrotate-buildsize     "39 MB (with tests)">
-  <!ENTITY logrotate-time          "0.1 SBU (with tests)">
+  <!ENTITY logrotate-buildsize     "5.6 MB">
+  <!ENTITY logrotate-time          "0.2 SBU (with tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -230,7 +231,7 @@
       logrotate commands to be run immediately. Combining the previous options
       <option>-df</option>, you can debug the effect of the force command.
-      When debugging, the commands are only simulated and are not actually run.
-      As a result, errors about files not existing will eventually appear because
-      the files are not actually created.
+      When debugging, the command is only simulated, not really run, thus,
+      eventual non-existing errors appear, when some intermediate files are
+      expected, because they are not actually created.
     </para>
 
@@ -252,5 +253,5 @@
 chmod 754 /etc/cron.daily/logrotate.sh</userinput></screen>
 
-<screen role="root" revision="systemd"><userinput>cat &gt; /usr/lib/systemd/system/logrotate.service &lt;&lt; "EOF" &amp;&amp;
+<screen role="root" revision="systemd"><userinput>cat &gt; /lib/systemd/system/logrotate.service &lt;&lt; "EOF" &amp;&amp;
 <literal>[Unit]
 Description=Runs the logrotate command
@@ -265,5 +266,5 @@
 ExecStart=/usr/sbin/logrotate /etc/logrotate.conf</literal>
 EOF
-cat &gt; /usr/lib/systemd/system/logrotate.timer &lt;&lt; "EOF" &amp;&amp;
+cat &gt; /lib/systemd/system/logrotate.timer &lt;&lt; "EOF" &amp;&amp;
 <literal>[Unit]
 Description=Runs the logrotate command daily at 3:00 AM
@@ -305,5 +306,5 @@
           <para>
             performs the log maintenance functions defined in the
-            configuration files
+            configuration files.
           </para>
           <indexterm zone="logrotate logrotate-prog">
Index: general/sysutils/lsb-tools.xml
===================================================================
--- general/sysutils/lsb-tools.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/lsb-tools.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -142,5 +143,5 @@
         <listitem>
           <para>
-            is a script to give LSB data
+            is a script to give LSB data.
           </para>
           <indexterm zone="lsb-tools lsb_release">
@@ -153,5 +154,5 @@
         <listitem>
           <para>
-            is a script to activate SysV startup scripts
+            is a script to activate SysV startup scripts.
           </para>
           <indexterm zone="lsb-tools install_initd">
@@ -164,5 +165,5 @@
         <listitem>
           <para>
-            is a script to deactivate SysV startup scripts
+            is a script to deactivate SysV startup scripts.
           </para>
           <indexterm zone="lsb-tools remove_initd">
Index: general/sysutils/mc.xml
===================================================================
--- general/sysutils/mc.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/mc.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY mc-download-http "http://ftp.midnight-commander.org/mc-&mc-version;.tar.xz">
   <!ENTITY mc-download-ftp  "ftp://ftp.osuosl.org/pub/midnightcommander/mc-&mc-version;.tar.xz">
-  <!ENTITY mc-md5sum        "e51cd40a897d9aa01af251d191637ca4">
+  <!ENTITY mc-md5sum        "19f14d368001aac454c28a2ddd2e851b">
   <!ENTITY mc-size          "2.4 MB">
-  <!ENTITY mc-buildsize     "68 MB (add 85 MB for tests)">
-  <!ENTITY mc-time          "0.3 SBU (using parallelism=4; add 0.2 SBU for tests)">
+  <!ENTITY mc-buildsize     "182 MB (with tests)">
+  <!ENTITY mc-time          "0.4 SBU (using parallelism=4; with tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -90,6 +91,4 @@
       <xref linkend="doxygen"/>,
       <xref linkend="gpm"/>,
-      <xref linkend="libssh2"/>,
-      <xref linkend="ruby"/>,
       <xref linkend="samba"/>,
       <xref linkend="unzip"/>,
@@ -118,4 +117,5 @@
     <para>
       To test the results, issue: <command>make check</command>.
+      One test concerning rpm files fails.
     </para>
 
@@ -201,5 +201,5 @@
           <para>
             is used internally by <command>mc</command> for saving and
-            restoring the text behind the panels on Linux text console
+            restoring the text behind the panels on Linux text console.
           </para>
           <indexterm zone="mc conssaver">
@@ -213,5 +213,5 @@
         <listitem>
           <para>
-            is a visual shell
+            is a visual shell.
           </para>
           <indexterm zone="mc mc-prog">
@@ -225,5 +225,5 @@
         <listitem>
           <para>
-            is an internal visual diff tool
+            is an internal visual diff tool.
           </para>
           <indexterm zone="mc mcdiff">
@@ -237,5 +237,5 @@
         <listitem>
           <para>
-            is an internal file editor
+            is an internal file editor.
           </para>
           <indexterm zone="mc mcedit">
@@ -249,5 +249,5 @@
         <listitem>
           <para>
-            is an internal file viewer
+            is an internal file viewer.
           </para>
           <indexterm zone="mc mcview">
Index: general/sysutils/modemmanager.xml
===================================================================
--- general/sysutils/modemmanager.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/modemmanager.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY ModemManager-download-http "https://www.freedesktop.org/software/ModemManager/ModemManager-&ModemManager-version;.tar.xz">
   <!ENTITY ModemManager-download-ftp  " ">
-  <!ENTITY ModemManager-md5sum        "88a9fd4373fedd5c9faa83d82a195767">
+  <!ENTITY ModemManager-md5sum        "138762a976a654d244744963d2250372">
   <!ENTITY ModemManager-size          "2.2 MB">
-  <!ENTITY ModemManager-buildsize     "115 MB (with tests)">
+  <!ENTITY ModemManager-buildsize     "140 MB (with tests)">
   <!ENTITY ModemManager-time          "0.5 SBU (Using parallelism=4; with tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -124,5 +125,4 @@
     <para>
       To test the results, issue: <command>make check</command>.
-      <!--One test, filename/MM/stub/modem/interface filename, is known to fail.-->
     </para>
 
@@ -220,5 +220,5 @@
           <para>
             is an utility used to control and monitor the
-            <application>ModemManager</application>
+            <application>ModemManager</application>.
           </para>
           <indexterm zone="ModemManager mmcli">
@@ -233,5 +233,5 @@
           <para>
             is a <application>D-Bus</application> service used
-            to communicate with modems
+            to communicate with modems.
           </para>
           <indexterm zone="ModemManager ModemManager-prog">
@@ -247,5 +247,5 @@
             contains API functions for communicating with mobile broadband
             modems, regardless of the  protocol used to communicate with
-            the actual device
+            the actual device.
           </para>
           <indexterm zone="ModemManager libmm-glib">
Index: general/sysutils/notification-daemon.xml
===================================================================
--- general/sysutils/notification-daemon.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/notification-daemon.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/sysutils/p7zip.xml
===================================================================
--- general/sysutils/p7zip.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/p7zip.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY p7zip-download-http "https://github.com/jinfeihan57/p7zip/archive/v&p7zip-version;/p7zip-&p7zip-version;.tar.gz">
+  <!ENTITY p7zip-download-http "&sourceforge-dl;/p7zip/p7zip_&p7zip-version;_src_all.tar.bz2">
   <!ENTITY p7zip-download-ftp  " ">
-  <!ENTITY p7zip-md5sum        "00acfd6be87848231722d2d53f89e4a5">
-  <!ENTITY p7zip-size          "6.5 MB">
-  <!ENTITY p7zip-buildsize     "55 MB">
-  <!ENTITY p7zip-time          "2.3 SBU (with tests)">
+  <!ENTITY p7zip-md5sum        "a0128d661cfe7cc8c121e73519c54fbf">
+  <!ENTITY p7zip-size          "4.0 MB">
+  <!ENTITY p7zip-buildsize     "33 MB">
+  <!ENTITY p7zip-time          "1.3 SBU (with tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -32,10 +33,10 @@
       <application>p7zip</application> is the Unix command-line port of 7-Zip, a
       file archiver that archives with high compression ratios. It handles 7z,
-      ZIP, GZIP, Brotli,  BZIP2, XZ, TAR, APM, ARJ, CAB, CHM, CPIO, CramFS, DEB,
-      DMG, FAT, HFS, ISO, Lizard, LZ5, LZFSE, LZH, LZMA, LZMA2, MBR, MSI, MSLZ,
-      NSIS, NTFS, RAR, RPM, SquashFS, UDF, VHD, WIM, XAR, Z, and Zstd formats.
-    </para>
-
-    &lfs110a_checked;
+      ZIP, GZIP, BZIP2, XZ, TAR, APM, ARJ, CAB, CHM, CPIO, CramFS, DEB, DMG,
+      FAT, HFS, ISO, LZH, LZMA, LZMA2, MBR, MSI, MSLZ, NSIS, NTFS, RAR RPM,
+      SquashFS, UDF, VHD, WIM, XAR and Z formats.
+    </para>
+
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -73,5 +74,4 @@
     </itemizedlist>
 
-<!-- Applied in 17.03
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
@@ -81,5 +81,5 @@
       </listitem>
     </itemizedlist>
--->
+
 
     <bridgehead renderas="sect3">p7zip Dependencies</bridgehead>
@@ -99,5 +99,4 @@
     <title>Installation of p7zip</title>
 
-<!-- Applied in 17.03
     <para>
       First, update the package for gcc10 and some security issues:
@@ -105,18 +104,4 @@
 
 <screen><userinput>patch -Np1 -i ../p7zip-&p7zip-version;-consolidated_fixes-1.patch</userinput></screen>
--->
-
-    <para>
-      First, prevent <application>p7zip</application> from installing
-      compressed manual pages:
-    </para>
-
-<screen><userinput remap="pre">sed '/^gzip/d' -i install.sh</userinput></screen>
-
-    <para>
-      Next, fix a security vulnerability:
-    </para>
-
-<screen><userinput remap="pre">sed -i '160a if(_buffer == nullptr || _size == _pos) return E_FAIL;' CPP/7zip/Common/StreamObjects.cpp</userinput></screen>
 
     <para>
@@ -179,5 +164,5 @@
         <listitem>
           <para>
-            is a file archiver utility
+            is a file archiver utility.
           </para>
           <indexterm zone="p7zip Sevenz">
@@ -192,5 +177,5 @@
           <para>
             is a stand-alone executable handling less archive formats than
-            <command>7z</command>
+            <command>7z</command>.
           </para>
           <indexterm zone="p7zip Sevenza">
@@ -205,5 +190,5 @@
           <para>
             is a minimal version of <command>7za</command> that handles only
-            7z archives
+            7z archives.
           </para>
           <indexterm zone="p7zip Sevenzr">
Index: general/sysutils/pax.xml
===================================================================
--- general/sysutils/pax.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/pax.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -49,5 +50,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -121,7 +122,6 @@
     </note>
 
-<screen role="root"><userinput>install -v pax /usr/bin &amp;&amp;
+<screen role="root"><userinput>install -v pax /bin &amp;&amp;
 install -v -m644 pax.1 /usr/share/man/man1</userinput></screen>
-
   </sect2>
 
@@ -148,5 +148,5 @@
         <listitem>
           <para>
-            copies files to and from archives in several formats
+            copies files to and from archives in several formats.
           </para>
           <indexterm zone="pax pax-prog">
@@ -157,4 +157,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: general/sysutils/pciutils.xml
===================================================================
--- general/sysutils/pciutils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/pciutils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -164,5 +165,5 @@
 chmod 754 /etc/cron.weekly/update-pciids.sh</userinput></screen>
 
-<screen role="root" revision="systemd"><userinput>cat &gt; /usr/lib/systemd/system/update-pciids.service &lt;&lt; "EOF" &amp;&amp;
+<screen role="root" revision="systemd"><userinput>cat &gt; /lib/systemd/system/update-pciids.service &lt;&lt; "EOF" &amp;&amp;
 <literal>[Unit]
 Description=Update pci.ids file
@@ -177,5 +178,5 @@
 ExecStart=/usr/sbin/update-pciids</literal>
 EOF
-cat &gt; /usr/lib/systemd/system/update-pciids.timer &lt;&lt; "EOF" &amp;&amp;
+cat &gt; /lib/systemd/system/update-pciids.timer &lt;&lt; "EOF" &amp;&amp;
 <literal>[Unit]
 Description=Update pci.ids file weekly
@@ -224,5 +225,5 @@
           <para>
             is a utility for displaying information about all PCI buses
-            in the system and all devices connected to them
+            in the system and all devices connected to them.
           </para>
           <indexterm zone="pciutils lspci">
@@ -236,5 +237,5 @@
         <listitem>
           <para>
-            is a utility for querying and configuring PCI devices
+            is a utility for querying and configuring PCI devices.
           </para>
           <indexterm zone="pciutils setpci">
@@ -264,5 +265,5 @@
         <para>
           is library that allows applications to access the PCI
-          subsystem
+          subsystem.
         </para>
         <indexterm zone="pciutils libpci">
Index: general/sysutils/pm-utils.xml
===================================================================
--- general/sysutils/pm-utils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/pm-utils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -86,5 +87,5 @@
         ethtool</ulink>, and
       <ulink role="runtime"
-             url="https://ftp.debian.org/debian/pool/main/v/vbetool/">
+             url="http://ftp.de.debian.org/debian/pool/main/v/vbetool/">
         vbetool</ulink>
     </para>
@@ -230,5 +231,5 @@
           <para>
             is a script that determines whether the system is running on AC
-            power (rather than a battery)
+            power (rather than a battery).
           </para>
           <indexterm zone="pm-utils on_ac_power">
@@ -244,5 +245,5 @@
             is a symlink to pm-action script that puts the computer into
             hibernate mode (the system is fully powered off and system state is
-            saved to disk)
+            saved to disk).
           </para>
           <indexterm zone="pm-utils pm-hibernate">
@@ -257,5 +258,5 @@
           <para>
             is a script that checks whether power management features such as
-            suspend and hibernate are supported
+            suspend and hibernate are supported.
           </para>
           <indexterm zone="pm-utils pm-is-supported">
@@ -270,5 +271,5 @@
           <para>
             is a script that puts the computer into powersaving (low power)
-            mode
+            mode.
           </para>
           <indexterm zone="pm-utils pm-powersave">
@@ -283,5 +284,5 @@
           <para>
             is a symlink to pm-action script that puts the computer into suspend
-            mode (most devices are shut down and system state is saved in RAM)
+            mode (most devices are shut down and system state is saved in RAM).
           </para>
           <indexterm zone="pm-utils pm-suspend">
@@ -297,5 +298,5 @@
             is a symlink to pm-action script that puts the computer into
             hybrid-suspend mode (the system does everything it needs to
-            hibernate, but suspends instead of shutting down)
+            hibernate, but suspends instead of shutting down).
           </para>
           <indexterm zone="pm-utils pm-suspend-hybrid">
Index: general/sysutils/raptor.xml
===================================================================
--- general/sysutils/raptor.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/raptor.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY raptor-download-http "https://download.librdf.org/source/raptor2-&raptor-version;.tar.gz">
+  <!ENTITY raptor-download-http "http://download.librdf.org/source/raptor2-&raptor-version;.tar.gz">
   <!ENTITY raptor-download-ftp  " ">
   <!ENTITY raptor-md5sum        "a39f6c07ddb20d7dd2ff1f95fa21e2cd">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -93,5 +94,5 @@
       <xref linkend="gtk-doc"/>,
       <xref linkend="icu"/> and
-      <ulink url="http://lloyd.github.io/yajl/">libyajl</ulink>
+      <ulink url="http://lloyd.github.com/yajl/">libyajl</ulink>
     </para>
 
@@ -120,5 +121,4 @@
     <para>
       To test the results, issue: <command>make check</command>.
-      Several of the XML tests may fail.
     </para>
 
@@ -176,5 +176,5 @@
         <listitem>
           <para>
-            is a RDF parsing and serializing utility
+            is a RDF parsing and serializing utility.
           </para>
           <indexterm zone="raptor rapper">
@@ -188,5 +188,5 @@
         <listitem>
           <para>
-            contains the <application>Raptor</application> API functions
+            contains the <application>Raptor</application> API functions.
           </para>
           <indexterm zone="raptor libraptor2">
Index: general/sysutils/rasqal.xml
===================================================================
--- general/sysutils/rasqal.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/rasqal.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY rasqal-download-http "https://download.librdf.org/source/rasqal-&rasqal-version;.tar.gz">
+  <!ENTITY rasqal-download-http "http://download.librdf.org/source/rasqal-&rasqal-version;.tar.gz">
   <!ENTITY rasqal-download-ftp  " ">
   <!ENTITY rasqal-md5sum        "1f5def51ca0026cd192958ef07228b52">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -153,5 +154,5 @@
           <para>
             is an utility for retrieving the installation options
-            of <application>Rasqal</application>
+            of <application>Rasqal</application>.
           </para>
           <indexterm zone="rasqal rasqal-config">
@@ -165,5 +166,5 @@
         <listitem>
           <para>
-            is an RDF query utility
+            is an RDF query utility.
           </para>
           <indexterm zone="rasqal roqet">
Index: general/sysutils/redland.xml
===================================================================
--- general/sysutils/redland.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/redland.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY redland-download-http "https://download.librdf.org/source/redland-&redland-version;.tar.gz">
+  <!ENTITY redland-download-http "http://download.librdf.org/source/redland-&redland-version;.tar.gz">
   <!ENTITY redland-download-ftp  " ">
   <!ENTITY redland-md5sum        "e5be03eda13ef68aabab6e42aa67715e">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -85,5 +86,5 @@
       <xref linkend="postgresql"/>,
       <ulink url="&sourceforge-dl;/virtuoso/">virtuoso</ulink>, and
-      <ulink url="https://sourceforge.net/projects/threestore/">3store</ulink>
+      <ulink url="http://sourceforge.net/projects/threestore/">3store</ulink>
     </para>
 
@@ -149,5 +150,5 @@
         <listitem>
           <para>
-            is the Redland RDF processor utility
+            is the Redland RDF processor utility.
           </para>
           <indexterm zone="redland rdfproc">
@@ -162,5 +163,5 @@
           <para>
             is a script to get information about the installed version
-            of Redland
+            of Redland.
           </para>
           <indexterm zone="redland redland-config">
@@ -174,5 +175,5 @@
         <listitem>
           <para>
-            upgrades older Redland databases to 0.9.12 format
+            upgrades older Redland databases to 0.9.12 format.
           </para>
           <indexterm zone="redland redland-db-upgrade">
Index: general/sysutils/sg3_utils.xml
===================================================================
--- general/sysutils/sg3_utils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/sg3_utils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY sg3_utils-download-http "https://sg.danny.cz/sg/p/sg3_utils-&sg3_utils-version;.tar.xz">
+  <!ENTITY sg3_utils-download-http "http://sg.danny.cz/sg/p/sg3_utils-&sg3_utils-version;.tar.xz">
   <!ENTITY sg3_utils-download-ftp  " ">
-  <!ENTITY sg3_utils-md5sum        "11854fedf831adfd39438dc5ac9202e9">
-  <!ENTITY sg3_utils-size          "1008 KB">
-  <!ENTITY sg3_utils-buildsize     "31 MB">
+  <!ENTITY sg3_utils-md5sum        "3a1ba25fe7b43577de4a5c1edb018526">
+  <!ENTITY sg3_utils-size          "968 KB">
+  <!ENTITY sg3_utils-buildsize     "24 MB">
   <!ENTITY sg3_utils-time          "0.2 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -132,17 +133,15 @@
       <seglistitem>
         <seg>
-          rescan-scsi-bus.sh, scsi_logging_level, scsi_mandat, scsi_readcap, 
-          scsi_ready, scsi_satl, scsi_start, scsi_stop, scsi_temperature,
-          sg_bg_ctl, sg_compare_and_write, sg_copy_results, sg_dd,
-          sg_decode_sense, sg_emc_trespass, sg_format,
+          scsi_logging_level, scsi_mandat, scsi_readcap, scsi_ready, scsi_satl,
+          scsi_start, scsi_stop, scsi_temperature, sg_bg_ctl, sg_compare_and_write,
+          sg_copy_results, sg_dd, sg_decode_sense, sg_emc_trespass, sg_format,
           sg_get_config, sg_get_lba_status, sg_ident, sg_inq, sg_logs, sg_luns,
           sg_map, sg_map26, sg_modes, sg_opcodes, sg_persist, sg_prevent,
           sg_raw, sg_rbuf, sg_rdac, sg_read, sg_read_attr, sg_read_block_limits,
           sg_read_buffer, sg_read_long, sg_readcap, sg_reassign, sg_referrals,
-          sg_rep_pip, sg_rep_zones, sg_requests, sg_reset, sg_reset_wp,
-          sg_rmsn, sg_rtpg, sg_safte, sg_sanitize, sg_sat_identify,
-          sg_sat_phy_event, sg_sat_read_gplog, sg_sat_set_features, sg_scan,
-          sg_seek, sg_senddiag, sg_ses, sg_ses_microcode, sg_start, sg_stpg,
-          sg_stream_ctl, sg_sync, sg_test_rwbuf, sg_timestamp, 
+          sg_rep_zones, sg_requests, sg_reset, sg_reset_wp, sg_rmsn, sg_rtpg,
+          sg_safte, sg_sanitize, sg_sat_identify, sg_sat_phy_event,
+          sg_sat_read_gplog, sg_sat_set_features, sg_scan, sg_seek, sg_senddiag, sg_ses,
+          sg_ses_microcode, sg_start, sg_stpg, sg_stream_ctl, sg_sync, sg_test_rwbuf, 
           sg_turs, sg_unmap, sg_verify, sg_vpd, sg_wr_mode, sg_write_buffer,
           sg_write_long, sg_write_same, sg_write_verify, sg_write_x, sg_xcopy, sg_zone, 
@@ -163,21 +162,9 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="rescan-scsi-bus.sh">
-        <term><command>rescan-scsi-bus.sh</command></term>
-        <listitem>
-          <para>
-            adds or removes SCSI devices without having to reboot
-          </para>
-          <indexterm zone="sg3_utils rescan-scsi-bus.sh">
-            <primary sortas="b-rescan-scsi-bus.sh">rescan-scsi-bus.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="scsi_logging_level">
         <term><command>scsi_logging_level</command></term>
         <listitem>
           <para>
-            accesses Linux SCSI logging level information
+            accesses Linux SCSI logging level information.
           </para>
           <indexterm zone="sg3_utils scsi_logging_level">
@@ -191,5 +178,5 @@
         <listitem>
           <para>
-            checks SCSI device support for mandatory commands
+            checks SCSI device support for mandatory commands.
           </para>
           <indexterm zone="sg3_utils scsi_mandat">
@@ -203,5 +190,5 @@
         <listitem>
           <para>
-            does the SCSI READ CAPACITY command on disks
+            does the SCSI READ CAPACITY command on disks.
           </para>
           <indexterm zone="sg3_utils scsi_readcap">
@@ -215,5 +202,5 @@
         <listitem>
           <para>
-            does the SCSI TEST UNIT READY on devices
+            does the SCSI TEST UNIT READY on devices.
           </para>
           <indexterm zone="sg3_utils scsi_ready">
@@ -227,5 +214,5 @@
         <listitem>
           <para>
-            checks for SCSI to ATA Translation (SAT) device support
+            checks for SCSI to ATA Translation (SAT) device support.
           </para>
           <indexterm zone="sg3_utils scsi_satl">
@@ -239,5 +226,5 @@
         <listitem>
           <para>
-            starts one or more SCSI disks
+            starts one or more SCSI disks.
           </para>
           <indexterm zone="sg3_utils scsi_start">
@@ -251,5 +238,5 @@
         <listitem>
           <para>
-            stops one or more SCSI disks
+            stops one or more SCSI disks.
           </para>
           <indexterm zone="sg3_utils scsi_stop">
@@ -263,5 +250,5 @@
         <listitem>
           <para>
-            fetches the temperature of a SCSI device
+            fetches the temperature of a SCSI device.
           </para>
           <indexterm zone="sg3_utils scsi_temperature">
@@ -276,5 +263,5 @@
           <para>
             performs a SCSI BACKGROUND CONTROL command on a device to perform
-            "advanced background operations"
+            "advanced background operations".
           </para>
           <indexterm zone="sg3_utils sg_bg_ctl">
@@ -288,5 +275,5 @@
         <listitem>
           <para>
-            sends the SCSI COMPARE AND WRITE command to device
+            sends the SCSI COMPARE AND WRITE command to device.
           </para>
           <indexterm zone="sg3_utils sg_compare_and_write">
@@ -300,5 +287,5 @@
         <listitem>
           <para>
-            sends the SCSI RECEIVE COPY RESULTS command (XCOPY related)
+            sends the SCSI RECEIVE COPY RESULTS command (XCOPY related).
           </para>
           <indexterm zone="sg3_utils sg_copy_results">
@@ -313,5 +300,5 @@
           <para>
             copies data to and from files and devices. Specialised for
-            devices that understand the SCSI command set
+            devices that understand the SCSI command set.
           </para>
           <indexterm zone="sg3_utils sg_dd">
@@ -326,5 +313,5 @@
           <para>
             takes SCSI sense data in binary or as a sequence
-            of ASCII hexadecimal bytes and decodes it
+            of ASCII hexadecimal bytes and decodes it.
           </para>
           <indexterm zone="sg3_utils sg_decode_sense">
@@ -339,5 +326,5 @@
           <para>
             changes ownership of a LUN from another Service-Processor to
-            this one
+            this one.
           </para>
           <indexterm zone="sg3_utils sg_emc_trespass">
@@ -351,5 +338,5 @@
         <listitem>
           <para>
-            formats or resizes a SCSI disk (perhaps changes its block size)
+            formats or resizes a SCSI disk (perhaps changes its block size).
           </para>
           <indexterm zone="sg3_utils sg_format">
@@ -363,5 +350,5 @@
         <listitem>
           <para>
-            sends a SCSI GET CONFIGURATION command (MMC-4 +)
+            sends a SCSI GET CONFIGURATION command (MMC-4 +).
           </para>
           <indexterm zone="sg3_utils sg_get_config">
@@ -375,5 +362,5 @@
         <listitem>
           <para>
-            sends a SCSI GET PHYSICAL ELEMENT STATUS command to a device
+            sends a SCSI GET PHYSICAL ELEMENT STATUS command to a device.
           </para>
           <indexterm zone="sg3_utils sg_get_elem_status">
@@ -387,5 +374,5 @@
         <listitem>
           <para>
-            sends the SCSI GET LBA STATUS command
+            sends the SCSI GET LBA STATUS command.
           </para>
           <indexterm zone="sg3_utils sg_get_lba_status">
@@ -399,5 +386,5 @@
         <listitem>
           <para>
-            sends a SCSI REPORT or SET IDENTIFYING INFORMATION command
+            sends a SCSI REPORT or SET IDENTIFYING INFORMATION command.
           </para>
           <indexterm zone="sg3_utils sg_ident">
@@ -411,5 +398,5 @@
         <listitem>
           <para>
-            access mode page information for a SCSI (or ATAPI) device
+            access mode page information for a SCSI (or ATAPI) device.
           </para>
           <indexterm zone="sg3_utils sginfo">
@@ -424,5 +411,5 @@
           <para>
             sends a SCSI INQUIRY or ATA IDENTIFY (PACKET) DEVICE command and
-            outputs the response
+            outputs the response.
           </para>
           <indexterm zone="sg3_utils sg_inq">
@@ -436,5 +423,5 @@
         <listitem>
           <para>
-            access log pages with SCSI LOG SENSE command
+            access log pages with SCSI LOG SENSE command.
           </para>
           <indexterm zone="sg3_utils sg_logs">
@@ -448,5 +435,5 @@
         <listitem>
           <para>
-            sends the SCSI REPORT LUNS command
+            sends the SCSI REPORT LUNS command.
           </para>
           <indexterm zone="sg3_utils sg_luns">
@@ -460,5 +447,5 @@
         <listitem>
           <para>
-            displays mapping between linux sg and other SCSI devices
+            displays mapping between linux sg and other SCSI devices.
           </para>
           <indexterm zone="sg3_utils sg_map">
@@ -472,5 +459,5 @@
         <listitem>
           <para>
-            maps a special file to a SCSI generic (sg) device (or vice versa)
+            maps a special file to a SCSI generic (sg) device (or vice versa).
           </para>
           <indexterm zone="sg3_utils sg_map26">
@@ -486,5 +473,5 @@
             copies data to and from files and devices. Specialized for
             devices that understand the SCSI command set and does memory mapped
-            transfers from sg devices
+            transfers from sg devices.
           </para>
           <indexterm zone="sg3_utils sgm_dd">
@@ -498,5 +485,5 @@
         <listitem>
           <para>
-            reads mode pages with the SCSI MODE SENSE command
+            reads mode pages with SCSI MODE SENSE command.
           </para>
           <indexterm zone="sg3_utils sg_modes">
@@ -511,5 +498,5 @@
           <para>
             reports information on supported SCSI commands or task
-            management functions
+            management functions.
           </para>
           <indexterm zone="sg3_utils sg_opcodes">
@@ -524,5 +511,5 @@
           <para>
             copies data to and from files and devices. Specialized for
-            devices that understand the SCSI command set
+            devices that understand the SCSI command set.
           </para>
           <indexterm zone="sg3_utils sgp_dd">
@@ -537,5 +524,5 @@
           <para>
             sends a SCSI PERSISTENT RESERVE (IN or OUT) command to
-            manipulate registrations and reservations
+            manipulate registrations and reservations.
           </para>
           <indexterm zone="sg3_utils sg_persist">
@@ -549,5 +536,5 @@
         <listitem>
           <para>
-            sends a SCSI PREVENT ALLOW MEDIUM REMOVAL command
+            sends a SCSI PREVENT ALLOW MEDIUM REMOVAL command.
           </para>
           <indexterm zone="sg3_utils sg_prevent">
@@ -561,5 +548,5 @@
         <listitem>
           <para>
-            sends an arbitrary SCSI command to a device
+            sends an arbitrary SCSI command to a device.
           </para>
           <indexterm zone="sg3_utils sg_raw">
@@ -573,5 +560,5 @@
         <listitem>
           <para>
-            reads data using the SCSI READ BUFFER command
+            reads data using SCSI READ BUFFER command.
           </para>
           <indexterm zone="sg3_utils sg_rbuf">
@@ -585,5 +572,5 @@
         <listitem>
           <para>
-            displays or modifies the RDAC Redundant Controller Page
+            displays or modifies RDAC Redundant Controller Page.
           </para>
           <indexterm zone="sg3_utils sg_rdac">
@@ -597,5 +584,5 @@
         <listitem>
           <para>
-            reads blocks of data continually from the same offset
+            reads blocks of data continually from the same offset.
           </para>
           <indexterm zone="sg3_utils sg_read">
@@ -609,5 +596,5 @@
         <listitem>
           <para>
-            performs a SCSI READ ATTRIBUTE command on a device
+            performs a SCSI READ ATTRIBUTE command on a device.
           </para>
           <indexterm zone="sg3_utils sg_read_attr">
@@ -621,5 +608,5 @@
         <listitem>
           <para>
-            sends a SCSI READ BLOCK LIMITS command
+            sends a SCSI READ BLOCK LIMITS command.
           </para>
           <indexterm zone="sg3_utils sg_read_block_limits">
@@ -633,5 +620,5 @@
         <listitem>
           <para>
-            sends a SCSI READ BUFFER command
+            sends a SCSI READ BUFFER command.
           </para>
           <indexterm zone="sg3_utils sg_read_buffer">
@@ -645,5 +632,5 @@
         <listitem>
           <para>
-            sends a SCSI READ CAPACITY command
+            sends a SCSI READ CAPACITY command.
           </para>
           <indexterm zone="sg3_utils sg_readcap">
@@ -657,5 +644,5 @@
         <listitem>
           <para>
-            sends a SCSI READ LONG command
+            sends a SCSI READ LONG command.
           </para>
           <indexterm zone="sg3_utils sg_read_long">
@@ -669,5 +656,5 @@
         <listitem>
           <para>
-            sends a SCSI REASSIGN BLOCKS command
+            sends a SCSI REASSIGN BLOCKS command.
           </para>
           <indexterm zone="sg3_utils sg_reassign">
@@ -681,5 +668,5 @@
         <listitem>
           <para>
-            sends a SCSI REPORT REFERRALS command
+            sends the SCSI REPORT REFERRALS command.
           </para>
           <indexterm zone="sg3_utils sg_referrals">
@@ -689,21 +676,9 @@
       </varlistentry>
 
-      <varlistentry id="sg_rep_pip">
-        <term><command>sg_rep_pip</command></term>
-        <listitem>
-          <para>
-            sends a SCSI REPORT PROVISIONING INITIALIZATION PATTERN command
-          </para>
-          <indexterm zone="sg3_utils sg_rep_pip">
-            <primary sortas="b-sg_rep_pip">sg_rep_pip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="sg_rep_zones">
         <term><command>sg_rep_zones</command></term>
         <listitem>
           <para>
-            sends a SCSI REPORT ZONES command
+            sends a SCSI REPORT ZONES command.
           </para>
           <indexterm zone="sg3_utils sg_rep_zones">
@@ -717,5 +692,5 @@
         <listitem>
           <para>
-            sends one or more SCSI REQUEST SENSE commands
+            sends one or more SCSI REQUEST SENSE commands.
           </para>
           <indexterm zone="sg3_utils sg_requests">
@@ -729,5 +704,5 @@
         <listitem>
           <para>
-            sends a SCSI device, target, bus or host reset; or checks reset state
+            sends SCSI device, target, bus or host reset; or checks reset state.
           </para>
           <indexterm zone="sg3_utils sg_reset">
@@ -741,5 +716,5 @@
         <listitem>
           <para>
-            sends a SCSI RESET WRITE POINTER command
+            sends a SCSI RESET WRITE POINTER command.
           </para>
           <indexterm zone="sg3_utils sg_reset_wp">
@@ -753,5 +728,5 @@
         <listitem>
           <para>
-            sends a SCSI READ MEDIA SERIAL NUMBER command
+            sends a SCSI READ MEDIA SERIAL NUMBER command.
           </para>
           <indexterm zone="sg3_utils sg_rmsn">
@@ -765,5 +740,5 @@
         <listitem>
           <para>
-            sends a SCSI REPORT TARGET PORT GROUPS command
+            sends a SCSI REPORT TARGET PORT GROUPS command.
           </para>
           <indexterm zone="sg3_utils sg_rtpg">
@@ -777,6 +752,6 @@
         <listitem>
           <para>
-            fetches status information from a SCSI Accessed Fault-Tolerant
-            Enclosure (SAF-TE) device
+            fetches status from a SCSI Accessed Fault-Tolerant Enclosure
+            (SAF-TE) device.
           </para>
           <indexterm zone="sg3_utils sg_safte">
@@ -790,5 +765,5 @@
         <listitem>
           <para>
-            sends a SCSI SANITIZE command
+            sends a SCSI SANITIZE command.
           </para>
           <indexterm zone="sg3_utils sg_sanitize">
@@ -803,5 +778,5 @@
           <para>
             sends an ATA IDENTIFY (PACKET) DEVICE command via a SCSI to ATA
-            Translation (SAT) layer
+            Translation (SAT) layer.
           </para>
           <indexterm zone="sg3_utils sg_sat_identify">
@@ -816,5 +791,5 @@
           <para>
             sends an ATA READ LOG EXT command via a SAT pass through to
-            fetch log page 11h which contains SATA phy event counters
+            fetch log page 11h which contains SATA phy event counters.
           </para>
           <indexterm zone="sg3_utils sg_sat_phy_event">
@@ -829,6 +804,6 @@
         <listitem>
           <para>
-             sends an ATA READ LOG EXT command via a SCSI to ATA Translation
-             (SAT) layer
+             uses an ATA READ LOG EXT command via a SCSI to ATA Translation
+             (SAT) layer.
           </para>
           <indexterm zone="sg3_utils sg_sat_read_gplog">
@@ -842,5 +817,5 @@
           <para>
             sends an ATA SET FEATURES command via a SCSI to ATA Translation
-            (SAT) layer
+            (SAT) layer.
           </para>
           <indexterm zone="sg3_utils sg_sat_set_features">
@@ -855,5 +830,5 @@
           <para>
             does a scan of sg devices (or given SCSI/ATAPI/ATA devices) and
-            prints the results
+            prints the results.
           </para>
           <indexterm zone="sg3_utils sg_scan">
@@ -867,5 +842,5 @@
         <listitem>
           <para>
-            performs a SCSI SEEK or PRE-FETCH command on a device and it's cache
+            performs a SCSI SEEK or PRE-FETCH command on a device and it's cache.
           </para>
           <indexterm zone="sg3_utils sg_seek">
@@ -879,5 +854,5 @@
         <listitem>
           <para>
-            performs a SCSI SEND DIAGNOSTIC command
+            performs a SCSI SEND DIAGNOSTIC command.
           </para>
           <indexterm zone="sg3_utils sg_senddiag">
@@ -891,6 +866,6 @@
         <listitem>
           <para>
-            sends controls and fetches the current status from a SCSI Enclosure
-            Services (SES) device
+            sends controls and fetch status from a SCSI Enclosure Services
+            (SES) device.
           </para>
           <indexterm zone="sg3_utils sg_ses">
@@ -904,5 +879,5 @@
         <listitem>
           <para>
-            sends microcode to a SCSI enclosure
+            sends microcode to a SCSI enclosure.
           </para>
           <indexterm zone="sg3_utils sg_ses_microcode">
@@ -917,5 +892,5 @@
           <para>
             sends a SCSI START STOP UNIT command to start, stop, load or eject
-            medium
+            medium.
           </para>
           <indexterm zone="sg3_utils sg_start">
@@ -929,5 +904,5 @@
         <listitem>
           <para>
-            sends a SCSI SET TARGET PORT GROUPS command
+            sends a SCSI SET TARGET PORT GROUPS command.
           </para>
           <indexterm zone="sg3_utils sg_stpg">
@@ -942,5 +917,5 @@
           <para>
             performs a SCSI STREAM CONTROL or GET STREAM STATUS command on a device
-            to open or close an I/O stream
+            to open or close an I/O stream.
           </para>
           <indexterm zone="sg3_utils sg_stream_ctl">
@@ -954,5 +929,5 @@
         <listitem>
           <para>
-            sends a SCSI command to synchronize the cache
+            sends the scsi command synchronize cache.
           </para>
           <indexterm zone="sg3_utils sg_sync">
@@ -967,5 +942,5 @@
           <para>
             tests the SCSI host adapter by issuing write and read operations
-            on a device's buffer and calculating checksums
+            on a device's buffer and calculating checksums.
           </para>
           <indexterm zone="sg3_utils sg_test_rwbuf">
@@ -975,21 +950,9 @@
       </varlistentry>
 
-      <varlistentry id="sg_timestamp">
-        <term><command>sg_timestamp</command></term>
-        <listitem>
-          <para>
-            reports or sets the timestamp on a SCSI device
-          </para>
-          <indexterm zone="sg3_utils sg_timestamp">
-            <primary sortas="b-sg_timestamp">sg_timestamp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="sg_turs">
         <term><command>sg_turs</command></term>
         <listitem>
           <para>
-            sends one or more SCSI TEST UNIT READY commands
+            sends one or more SCSI TEST UNIT READY commands.
           </para>
           <indexterm zone="sg3_utils sg_turs">
@@ -1003,5 +966,5 @@
         <listitem>
           <para>
-            sends a SCSI UNMAP command
+            sends a SCSI UNMAP command.
           </para>
           <indexterm zone="sg3_utils sg_unmap">
@@ -1015,5 +978,5 @@
         <listitem>
           <para>
-            invokes SCSI VERIFY command(s) on a block device
+            invokes SCSI VERIFY command(s) on a block device.
           </para>
           <indexterm zone="sg3_utils sg_verify">
@@ -1028,5 +991,5 @@
           <para>
             fetches Vital Product Data (VPD) pages using a SCSI INQUIRY
-            command
+            command.
           </para>
           <indexterm zone="sg3_utils sg_vpd">
@@ -1040,5 +1003,5 @@
         <listitem>
           <para>
-            sends a SCSI WRITE BUFFER command
+            sends a SCSI WRITE BUFFER command.
           </para>
           <indexterm zone="sg3_utils sg_write_buffer">
@@ -1052,5 +1015,5 @@
         <listitem>
           <para>
-            sends a SCSI WRITE LONG command
+            sends the SCSI WRITE LONG command.
           </para>
           <indexterm zone="sg3_utils sg_write_long">
@@ -1064,5 +1027,5 @@
         <listitem>
           <para>
-            sends a SCSI WRITE SAME command
+            sends the SCSI WRITE SAME command.
           </para>
           <indexterm zone="sg3_utils sg_write_same">
@@ -1076,5 +1039,5 @@
         <listitem>
           <para>
-            sends a SCSI WRITE AND VERIFY command
+            sends the SCSI WRITE AND VERIFY command.
           </para>
           <indexterm zone="sg3_utils sg_write_verify">
@@ -1088,5 +1051,5 @@
         <listitem>
           <para>
-            performs SCSI WRITE commands on a device
+            performs SCSI WRITE commands on a device.
           </para>
           <indexterm zone="sg3_utils sg_write_x">
@@ -1100,5 +1063,5 @@
         <listitem>
           <para>
-            writes mode pages
+            writes mode page.
           </para>
           <indexterm zone="sg3_utils sg_wr_mode">
@@ -1113,5 +1076,5 @@
           <para>
             copies data to and from files and devices
-            using SCSI EXTENDED COPY (XCOPY)
+            using SCSI EXTENDED COPY (XCOPY).
           </para>
           <indexterm zone="sg3_utils sg_xcopy">
@@ -1126,5 +1089,5 @@
           <para>
             performs SCSI ZONE commands on a device, such as OPEN, CLOSE, FINISH
-            or SEQUENTIALIZE
+            or SEQUENTIALIZE.
           </para>
           <indexterm zone="sg3_utils sg_zone">
@@ -1138,5 +1101,5 @@
         <listitem>
           <para>
-            contains the <application>sg3_utils</application> API functions
+            contains the <application>sg3_utils</application> API functions.
           </para>
           <indexterm zone="sg3_utils libsgutils2">
Index: general/sysutils/sysstat.xml
===================================================================
--- general/sysutils/sysstat.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/sysstat.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY sysstat-download-http "http://sebastien.godard.pagesperso-orange.fr/sysstat-&sysstat-version;.tar.xz">
   <!ENTITY sysstat-download-ftp  " ">
-  <!ENTITY sysstat-md5sum        "697890a0fe72be4afe1dcdfff802bde1">
-  <!ENTITY sysstat-size          "836 KB">
-  <!ENTITY sysstat-buildsize     "29 MB">
+  <!ENTITY sysstat-md5sum        "0ffc53f703d950748d459032749721f4">
+  <!ENTITY sysstat-size          "800 KB">
+  <!ENTITY sysstat-buildsize     "26 MB">
   <!ENTITY sysstat-time          "0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -116,5 +117,5 @@
     </para>
 
-<screen role="root" revision="systemd"><userinput>install -v -m644 sysstat.service /usr/lib/systemd/system/sysstat.service</userinput></screen>
+<screen role="root" revision="systemd"><userinput>install -v -m644 sysstat.service /lib/systemd/system/sysstat.service</userinput></screen>
 
     <para revision="systemd">
@@ -123,5 +124,5 @@
     </para>
 
-<screen role="root" revision="systemd"><userinput>sed -i "/^Also=/d" /usr/lib/systemd/system/sysstat.service</userinput></screen>
+<screen role="root" revision="systemd"><userinput>sed -i "/^Also=/d" /lib/systemd/system/sysstat.service</userinput></screen>
 
   </sect2>
@@ -281,5 +282,5 @@
           <para>
             displays statistics about read and write operations on CIFS
-            filesystems
+            filesystems.
           </para>
           <indexterm zone="sysstat cifsiostat">
@@ -294,5 +295,5 @@
           <para>
             reports CPU statistics and input/output
-            statistics for devices and partitions
+            statistics for devices and partitions.
           </para>
           <indexterm zone="sysstat iostat">
@@ -306,5 +307,5 @@
         <listitem>
           <para>
-            writes activities for each available processor
+            writes activities for each available processor.
           </para>
           <indexterm zone="sysstat mpstat">
@@ -319,5 +320,5 @@
           <para>
             is used for monitoring individual tasks currently being managed
-            by the Linux kernel
+            by the Linux kernel.
           </para>
           <indexterm zone="sysstat pidstat">
@@ -334,5 +335,5 @@
             the <command>sar</command> command. But unlike
             <command>sar</command>, <command>sadf</command> can write its data
-            in many different formats
+            in many different formats.
           </para>
           <indexterm zone="sysstat sadf">
@@ -347,5 +348,5 @@
           <para>
             is used for displaying the contents of elected cumulative activity
-            counters in the operating system
+            counters in the operating system.
           </para>
           <indexterm zone="sysstat sar">
@@ -360,5 +361,5 @@
           <para>
             is used for monitoring the activity of tape drives connected to
-            a system
+            a system.
           </para>
           <indexterm zone="sysstat tapestat">
Index: general/sysutils/systemd.xml
===================================================================
--- general/sysutils/systemd.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/systemd.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,8 +8,8 @@
   <!ENTITY systemd-download-http "https://github.com/systemd/systemd/archive/v&systemd-version;/systemd-&systemd-version;.tar.gz">
   <!ENTITY systemd-download-ftp  " ">
-  <!ENTITY systemd-md5sum        "8e8adf909c255914dfc10709bd372e69">
-  <!ENTITY systemd-size          "10 MB">
-  <!ENTITY systemd-buildsize     "287 MB (with tests)">
-  <!ENTITY systemd-time          "2.5 SBU (with tests)">
+  <!ENTITY systemd-md5sum        "b0d6e603b814908acc69db29bbfb023c">
+  <!ENTITY systemd-size          "9.4 MB">
+  <!ENTITY systemd-buildsize     "273 MB (with tests)">
+  <!ENTITY systemd-time          "2.1 SBU (with tests)">
 
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -42,5 +43,5 @@
     </para>
     
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -92,5 +93,4 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="Jinja2"/> and
       <xref linkend="linux-pam"/>
     </para>
@@ -103,5 +103,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="btrfs-progs"/>, <!-- homed may support it, see the C.E.-->
+      <xref linkend="btrfs-progs"/> <!-- homed may support it, see the C.E.-->
       <xref linkend="curl"/>,
       <xref linkend="cryptsetup"/>,
@@ -115,21 +115,17 @@
       <xref linkend="libxkbcommon"/>,
       <xref linkend="make-ca"/>,
-      <xref linkend="p11-kit"/>,
       <xref linkend="pcre2"/>,
       <xref linkend="qemu"/>,
       <xref linkend="qrencode"/>,
-      <xref linkend="rsync"/>,
       <xref linkend="valgrind"/>,
       <xref linkend="zsh"/> (for the zsh completions),
-      <ulink url="https://sourceforge.net/projects/gnu-efi/">gnu-efi</ulink>,
+      <ulink url="http://sourceforge.net/projects/gnu-efi/">gnu-efi</ulink>,
       <ulink url="https://www.kernel.org/pub/linux/utils/kernel/kexec/">kexec-tools</ulink>,
-      <ulink url="https://sourceware.org/elfutils/">libdw</ulink>,
       <ulink url="https://developers.yubico.com/libfido2/">libfido2</ulink>,
       <ulink url="https://www.gnu.org/software/libmicrohttpd/">libmicrohttpd</ulink>,
       <ulink url="http://lz4.github.io/lz4/">lz4</ulink>,
       <!--<ulink url="http://fukuchi.org/works/qrencode/">qrencode</ulink>,-->
-      <ulink url="https://sourceforge.net/projects/linuxquota/">quota-tools</ulink>,
-      <ulink url="https://pypi.python.org/pypi/Sphinx">Sphinx</ulink>, and
-      <ulink url="https://tpm2-tss.readthedocs.io/en/latest/">tpm2-tss</ulink>
+      <ulink url="http://sourceforge.net/projects/linuxquota/">quota-tools</ulink> and
+      <ulink url="https://pypi.python.org/pypi/Sphinx">Sphinx</ulink>
     </para>
 
@@ -151,5 +147,6 @@
 
     <para>
-      Apply a patch to fix a security vulnerability:
+      Apply a patch to fix regressions in systemd-networkd and segmentation 
+      faults in systemctl:
     </para>
 
@@ -157,12 +154,10 @@
 
     <para>
-      Remove two unneeded groups,
-      <systemitem class="groupname">render</systemitem> and
-      <systemitem class="groupname">sgx</systemitem>, from the default udev
+      Remove an unneeded group,
+      <systemitem class="groupname">render</systemitem>, from the default udev
       rules:
     </para>
 
-<screen><userinput remap="pre">sed -i -e 's/GROUP="render"/GROUP="video"/' \
-       -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in</userinput></screen>
+<screen><userinput remap="pre">sed -i 's/GROUP="render", //' rules.d/50-udev-default.rules.in</userinput></screen>
 
     <para>
@@ -175,6 +170,6 @@
 
 meson --prefix=/usr                 \
-      --buildtype=release           \
       -Dblkid=true                  \
+      -Dbuildtype=release           \
       -Ddefault-dnssec=no           \
       -Dfirstboot=false             \
@@ -182,4 +177,7 @@
       -Dldconfig=false              \
       -Dman=auto                    \
+      -Drootprefix=                 \
+      -Drootlibdir=/lib             \
+      -Dsplit-usr=true              \
       -Dsysusers=false              \
       -Drpmmacrosdir=no             \
@@ -204,7 +202,8 @@
 
     <para>
-      To test the results, issue:
-      <command>PATH+=:/usr/sbin ninja test</command>.
-      <!-- One test named test-repart needs sfdisk, which is in /usr/sbin. -->
+      To test the results, issue: <command>ninja test</command>. <!--One test,
+      <filename>udev-test</filename> (test 273) fails due to changes in 
+      the Linux 5.3+ kernel. It does not affect the package's
+      functionality. NO LONGER APPLICABLE AS OF 244 -->
     </para>
 
@@ -253,7 +252,4 @@
 -->
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
     <para>
       <parameter>-Dpamconfdir=/etc/pam.d</parameter>: Forces the PAM files to
@@ -269,5 +265,5 @@
 
     <para>
-      <parameter>-Dhomed=false</parameter>: Removes a daemon that does not offer
+      <parameter>-Dhomed=false</parameter>: Remove a daemon that does not offer
       any use under a traditional BLFS configuration, especially using accounts
       created with useradd. To enable systemd-homed, first ensure that you have
@@ -445,5 +441,5 @@
             is a PAM module used to register user sessions with the
             <application>systemd</application> login manager,
-            <command>systemd-logind</command>
+            <command>systemd-logind</command>.
           </para>
           <indexterm zone="systemd pam_systemd">
Index: general/sysutils/sysutils.xml
===================================================================
--- general/sysutils/sysutils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/sysutils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
  %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="general-sysutils">
Index: general/sysutils/udisks2.xml
===================================================================
--- general/sysutils/udisks2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/udisks2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY udisks2-download-http "https://github.com/storaged-project/udisks/releases/download/udisks-&udisks2-version;/udisks-&udisks2-version;.tar.bz2">
   <!ENTITY udisks2-download-ftp  " ">
-  <!ENTITY udisks2-md5sum        "63e18a47069000cb31d5f98cc3c83be0">
-  <!ENTITY udisks2-size          "1.7 MB">
-  <!ENTITY udisks2-buildsize     "38 MB (with tests)">
+  <!ENTITY udisks2-md5sum        "aad9c50f4cafccee01a621a6a6665784">
+  <!ENTITY udisks2-size          "1.6 MB">
+  <!ENTITY udisks2-buildsize     "51 MB (with tests)">
   <!ENTITY udisks2-time          "0.3 SBU (with tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -204,5 +205,5 @@
           <para>
             is a command-line program used to interact with the
-            <command>udisksd</command> daemon
+            <command>udisksd</command> daemon.
           </para>
           <indexterm zone="udisks2 udisksctl">
@@ -231,5 +232,5 @@
             is a command-line program used to unmount file systems
             that have been mounted by the
-            <application>UDisks</application> daemon
+            <application>UDisks</application> daemon.
           </para>
           <indexterm zone="udisks2 umountudisks2">
@@ -243,5 +244,5 @@
         <listitem>
           <para>
-            contains the <application>UDisks</application> API functions
+            contains the <application>UDisks</application> API functions.
           </para>
           <indexterm zone="udisks2 libudisks2">
Index: general/sysutils/unrar.xml
===================================================================
--- general/sysutils/unrar.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/unrar.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY unrar-download-http "https://www.rarlab.com/rar/unrarsrc-&unrar-version;.tar.gz">
+  <!ENTITY unrar-download-http "http://www.rarlab.com/rar/unrarsrc-&unrar-version;.tar.gz">
   <!ENTITY unrar-download-ftp  " ">
-  <!ENTITY unrar-md5sum        "de5017a63a610cb82dba7d33bd826fb6">
+  <!ENTITY unrar-md5sum        "54513ee5b1870f1d35bfa82eacce6b0f">
   <!ENTITY unrar-size          "228 KB">
-  <!ENTITY unrar-buildsize     "2.5 MB">
-  <!ENTITY unrar-time          "0.1 SBU">
+  <!ENTITY unrar-buildsize     "2.2 MB">
+  <!ENTITY unrar-time          "less than 0.1 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -140,5 +141,5 @@
         <listitem>
           <para>
-            uncompresses a <filename>RAR</filename> archive
+            uncompresses a <filename>RAR</filename> archive.
           </para>
           <indexterm zone="unrar unrar-prog">
Index: general/sysutils/unzip.xml
===================================================================
--- general/sysutils/unzip.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/unzip.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <caution>
@@ -258,5 +259,5 @@
           <para>
             allows the output of <command>unzip</command> commands to be
-            redirected
+            redirected.
           </para>
           <indexterm zone="unzip funzip">
@@ -271,5 +272,5 @@
           <para>
             lists, tests or extracts files from a <filename>ZIP</filename>
-            archive
+            archive.
           </para>
           <indexterm zone="unzip unzip-prog">
@@ -286,5 +287,5 @@
             <filename>ZIP</filename> archive.  Files in this format allow the
             recipient to decompress the archive without installing
-            <application>UnZip</application>
+            <application>UnZip</application>.
           </para>
           <indexterm zone="unzip unzipfsx">
@@ -299,5 +300,5 @@
           <para>
             searches files in a <filename>ZIP</filename> archive for
-            lines matching a pattern
+            lines matching a pattern.
           </para>
           <indexterm zone="unzip zipgrep">
@@ -313,5 +314,5 @@
             produces technical information about the files in a
             <filename>ZIP</filename> archive, including file access permissions,
-            encryption status, type of compression, etc
+            encryption status, type of compression, etc.
           </para>
           <indexterm zone="unzip zipinfo">
Index: general/sysutils/upower.xml
===================================================================
--- general/sysutils/upower.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/upower.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY upower-download-http "https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_&upower-version;/upower-UPOWER_&upower-version;.tar.bz2">
+  <!ENTITY upower-download-http "https://gitlab.freedesktop.org/upower/upower/uploads/93cfe7c8d66ed486001c4f3f55399b7a/upower-&upower-version;.tar.xz">
   <!ENTITY upower-download-ftp  " ">
-  <!ENTITY upower-md5sum        "d58b028211aee6050c26c99b777ba60f">
-  <!ENTITY upower-size          "144 KB">
-  <!ENTITY upower-buildsize     "14 MB">
-  <!ENTITY upower-time          "0.1 SBU (using parallelism=4)">
+  <!ENTITY upower-md5sum        "abe6acb617f11f2e8dbd9846fcf86e24">
+  <!ENTITY upower-size          "424 KB">
+  <!ENTITY upower-buildsize     "11 MB (add 3MB for tssts)">
+  <!ENTITY upower-time          "0.1 SBU (add 0.1 SBU for tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -90,7 +91,6 @@
       <xref linkend="gtk-doc"/>,
       <xref linkend="pygobject3"/>,
-      <xref linkend="python-dbusmock"/>,
-      <xref linkend="umockdev"/> (for part of the test suite), and
-      <ulink url="https://libimobiledevice.org/">libimobiledevice</ulink>
+      <xref linkend="python-dbusmock"/>, and 
+      <xref linkend="umockdev"/> (for part of the test suite).
     </para>
 
@@ -128,9 +128,9 @@
     </para>
 
-<screen><userinput>./autogen.sh --prefix=/usr        \
-             --sysconfdir=/etc    \
-             --localstatedir=/var \
-             --enable-deprecated  \
-             --disable-static     &amp;&amp;
+<screen><userinput>./configure --prefix=/usr        \
+            --sysconfdir=/etc    \
+            --localstatedir=/var \
+            --enable-deprecated  \
+            --disable-static     &amp;&amp;
 make</userinput></screen>
 
@@ -240,5 +240,5 @@
         <listitem>
           <para>
-            is the <application>UPower</application> command line tool
+            is the <application>UPower</application> command line tool.
           </para>
           <indexterm zone="upower upower-prog">
@@ -265,5 +265,5 @@
         <listitem>
           <para>
-            contains the <application>UPower</application> API functions
+            contains the <application>UPower</application> API functions.
           </para>
           <indexterm zone="upower libupower-glib">
Index: general/sysutils/usbutils.xml
===================================================================
--- general/sysutils/usbutils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/usbutils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY usbutils-download-http "&kernel-dl;/linux/utils/usb/usbutils/usbutils-&usbutils-version;.tar.xz">
   <!ENTITY usbutils-download-ftp  " ">
-  <!ENTITY usbutils-md5sum        "f21aa68ee7870b161921a590be7765e6">
-  <!ENTITY usbutils-size          "162 KB">
-  <!ENTITY usbutils-buildsize     "3.0 MB">
+  <!ENTITY usbutils-md5sum        "91b0c9a3382d6f4c382df7a98462de2e">
+  <!ENTITY usbutils-size          "96 KB">
+  <!ENTITY usbutils-buildsize     "4.5 MB">
   <!ENTITY usbutils-time          "0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -83,5 +84,5 @@
     <bridgehead renderas="sect3">USB Utils Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Required</bridgehead>
+    
     <para role="required">
       <xref linkend="libusb"/> and
@@ -113,5 +114,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr --datadir=/usr/share/hwdata &amp;&amp;
+<screen><userinput>./autogen.sh --prefix=/usr --datadir=/usr/share/hwdata &amp;&amp;
 make</userinput></screen>
 
@@ -182,5 +183,5 @@
 chmod 754 /etc/cron.weekly/update-usbids.sh</userinput></screen>
 
-<screen role="root" revision="systemd"><userinput>cat &gt; /usr/lib/systemd/system/update-usbids.service &lt;&lt; "EOF" &amp;&amp;
+<screen role="root" revision="systemd"><userinput>cat &gt; /lib/systemd/system/update-usbids.service &lt;&lt; "EOF" &amp;&amp;
 <literal>[Unit]
 Description=Update usb.ids file
@@ -195,5 +196,5 @@
 ExecStart=/usr/bin/wget http://www.linux-usb.org/usb.ids -O /usr/share/hwdata/usb.ids</literal>
 EOF
-cat &gt; /usr/lib/systemd/system/update-usbids.timer &lt;&lt; "EOF" &amp;&amp;
+cat &gt; /lib/systemd/system/update-usbids.timer &lt;&lt; "EOF" &amp;&amp;
 <literal>[Unit]
 Description=Update usb.ids file weekly
@@ -242,5 +243,5 @@
             is a utility for displaying information about all USB buses
             in the system and all devices connected to them, but not in human
-            friendly form
+            friendly form.
           </para>
           <indexterm zone="usbutils lsusb">
@@ -255,5 +256,5 @@
           <para>
             displays information about all USB buses in the system and all
-            devices connected to them in reasonable human friendly form
+            devices connected to them in reasonable human friendly form.
           </para>
           <indexterm zone="usbutils lsusb.py">
@@ -269,5 +270,5 @@
             is a shell script that displays details of USB buses and devices
             connected to them. It is designed to be used if /proc/bus/usb/devices
-            is not available on your system
+            is not available on your system.
           </para>
           <indexterm zone="usbutils usb-devices">
@@ -282,5 +283,5 @@
           <para>
             is used to dump report descriptors and streams from HID
-            (human interface device) interfaces of USB devices
+            (human interface device) interfaces of USB devices.
           </para>
           <indexterm zone="usbutils usbhid-dump">
Index: general/sysutils/which.xml
===================================================================
--- general/sysutils/which.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/which.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -46,5 +47,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -135,5 +136,5 @@
           <para>
             shows the full path of (shell) commands installed in your
-            <envar>PATH</envar>
+            <envar>PATH</envar>.
           </para>
           <indexterm zone="which which-prog">
Index: general/sysutils/zip.xml
===================================================================
--- general/sysutils/zip.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ general/sysutils/zip.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -137,5 +138,5 @@
         <listitem>
           <para>
-            compresses files into a <filename>ZIP</filename> archive
+            compresses files into a <filename>ZIP</filename> archive.
           </para>
           <indexterm zone="zip zip-prog">
@@ -150,5 +151,5 @@
           <para>
             is a utility to encrypt and decrypt a <filename>ZIP</filename>
-            archive
+            archive.
           </para>
           <indexterm zone="zip zipcloak">
@@ -163,5 +164,5 @@
           <para>
             reads or writes comments stored in a <filename>ZIP</filename>
-            file
+            file.
           </para>
           <indexterm zone="zip zipnote">
@@ -176,5 +177,5 @@
           <para>
             is a utility to split <filename>ZIP</filename> files into
-            smaller files
+            smaller files.
           </para>
           <indexterm zone="zip zipsplit">
Index: t-version.sh
===================================================================
--- git-version.sh	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,50 +1,0 @@
-#!/bin/sh
-
-if ! git status > /dev/null; then
-	# Either it's not a git repository, or git is unavaliable.
-	# Just workaround.
-	echo "<!ENTITY version           \"unknown\">"         >  version.ent
-	echo "<!ENTITY versiond          \"unknown-systemd\">" >> version.ent
-	echo "<!ENTITY releasedate       \"unknown\">"         >> version.ent
-	echo "<!ENTITY copyrightdate     \"1999-2021\">"       >> version.ent
-	exit 0
-fi
-
-export LC_ALL=en_US.utf8
-export TZ=US/Pacific
-
-commit_date=$(git show -s --format=format:"%cd" --date=local)
-short_date=$(date --date "$commit_date" "+%Y-%m-%d")
-
-year=$(date --date "$commit_date" "+%Y")
-month=$(date --date "$commit_date" "+%B")
-month_digit=$(date --date "$commit_date" "+%m")
-day_digit=$(date --date "$commit_date" "+%d")
-day=$(echo $day_digit | sed 's/^0//')
-
-case $day in
-	"1" | "21" | "31" ) suffix="st";;
-	"2" | "22" ) suffix="nd";;
-	"3" | "23" ) suffix="rd";;
-	* ) suffix="th";;
-esac
-
-full_date="$month $day$suffix, $year"
-
-sha="$(git describe --abbrev=1)"
-if git describe --all --match trunk > /dev/null 2> /dev/null; then
-	sha=$(echo "$sha" | sed 's/-g[^-]*$//')
-fi
-version="$sha"
-
-if [ "$(git diff HEAD | wc -l)" != "0" ]; then
-	version="$version+"
-fi
-
-echo "<!ENTITY day               \"$day_digit\">"          >  version.ent
-echo "<!ENTITY month             \"$month_digit\">"        >> version.ent
-echo "<!ENTITY year              \"$year\">"               >> version.ent
-echo "<!ENTITY copyrightdate     \"2001-$year\">"          >> version.ent
-echo "<!ENTITY version           \"$version\">"            >> version.ent
-echo "<!ENTITY releasedate       \"$full_date\">"          >> version.ent
-echo "<!ENTITY pubdate           \"$short_date\">"         >> version.ent
Index: gnome.ent
===================================================================
--- gnome.ent	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome.ent	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,2 +1,4 @@
+<!-- $LastChangedBy$ $Date$ -->
+
 <!ENTITY gnome-download-http  "https://download.gnome.org/sources">
 <!ENTITY gnome-download-ftp   "ftp://ftp.acc.umu.se/pub/gnome/sources">
@@ -11,63 +13,61 @@
 <!ENTITY gnome-minor-36       "3.36">
 <!ENTITY gnome-minor-38       "3.38">
-<!ENTITY gnome-minor-40       "3.40">
-<!ENTITY gnome-40             "40">
-<!-- See about removing some of the above entities after 40.0 is in. -->
+<!-- See about removing some of the above entities after 3.32 is in. -->
 
 <!-- Chapter 30 -->
 <!-- Platform -->
-<!ENTITY gcr-version                       "3.40.0">
-<!ENTITY gsettings-desktop-schemas-version "40.0">
+<!ENTITY gcr-version                       "3.38.0">
+<!ENTITY gsettings-desktop-schemas-version "3.38.0">
 <!ENTITY libsecret-version                 "0.20.4">
 <!ENTITY rest-version                      "0.8.1">
-<!ENTITY totem-pl-parser-version           "3.26.6">
-<!ENTITY vte-version                       "0.64.2">
-<!ENTITY yelp-xsl-version                  "40.2">
+<!ENTITY totem-pl-parser-version           "3.26.5">
+<!ENTITY vte-version                       "0.62.1">
+<!ENTITY yelp-xsl-version                  "3.38.2">
 <!ENTITY GConf-version                     "3.2.6">
 <!ENTITY geocode-glib-version              "3.26.2">
-<!ENTITY gjs-version                       "1.68.3">
-<!ENTITY gnome-autoar-version              "0.4.0">
-<!ENTITY gnome-desktop-version             "40.4">
+<!ENTITY gjs-version                       "1.66.1">
+<!ENTITY gnome-autoar-version              "0.2.4">
+<!ENTITY gnome-desktop-version             "3.38.2">
 <!ENTITY gnome-menus-version               "3.36.0">
 <!ENTITY gnome-video-effects-version       "0.5.0">
-<!ENTITY gnome-online-accounts-version     "3.40.0">
+<!ENTITY gnome-online-accounts-version     "3.38.0">
 <!ENTITY grilo-version                     "0.3.13">
 <!ENTITY libchamplain-version              "0.12.20">
-<!ENTITY libgdata-version                  "0.18.1">
-<!ENTITY libgee-version                    "0.20.4">
+<!ENTITY libgdata-version                  "0.17.13">
+<!ENTITY libgee-version                    "0.20.3">
 <!ENTITY libgtop-version                   "2.40.0">
-<!ENTITY libgweather-version               "40.0">
-<!ENTITY libpeas-version                   "1.30.0">
-<!ENTITY libwnck-version                   "40.0">
-<!ENTITY evolution-data-server-version     "3.40.4">
-<!ENTITY folks-version                     "0.15.3">
+<!ENTITY libgweather-version               "3.36.1">
+<!ENTITY libpeas-version                   "1.28.0">
+<!ENTITY libwnck-version                   "3.36.0">
+<!ENTITY evolution-data-server-version     "3.38.2">
+<!ENTITY folks-version                     "0.14.0">
 <!ENTITY gfbgraph-version                  "0.2.4">
-<!--<!ENTITY tracker-version                   "2.3.6">-->
-<!ENTITY tracker3-version                  "3.1.2">
-<!--<!ENTITY tracker-miners-version            "2.3.5">-->
-<!ENTITY tracker3-miners-version           "3.1.2">
-<!ENTITY gsound-version                    "1.0.3">
+<!ENTITY tracker-version                   "2.3.6">
+<!ENTITY tracker3-version                  "3.0.2">
+<!ENTITY tracker-miners-version            "2.3.5">
+<!ENTITY tracker3-miners-version           "3.0.3">
+<!ENTITY gsound-version                    "1.0.2">
 
 <!-- Runtime (sysv) and Desktop (systemd) -->
 <!--<!ENTITY caribou-version                   "0.4.21">-->
-<!ENTITY dconf-version                     "0.40.0">
-<!ENTITY dconf-editor-version              "3.38.3">
-<!ENTITY gnome-backgrounds-version         "40.1">
-<!ENTITY gvfs-version                      "1.48.1">
-<!ENTITY gexiv2-version                    "0.12.3">
-<!ENTITY nautilus-version                  "40.2">
+<!ENTITY dconf-version                     "0.38.0">
+<!ENTITY dconf-editor-version              "3.38.2">
+<!ENTITY gnome-backgrounds-version         "3.38.0">
+<!ENTITY gvfs-version                      "1.46.1">
+<!ENTITY gexiv2-version                    "0.12.1">
+<!ENTITY nautilus-version                  "3.38.2">
 <!ENTITY zenity-version                    "3.32.0">
-<!ENTITY gnome-bluetooth-version           "3.34.5">
-<!ENTITY gnome-keyring-version             "40.0">
-<!ENTITY gnome-settings-daemon-version     "40.0.1">
-<!ENTITY gnome-control-center-version      "40.0">
-<!ENTITY mutter-version                    "40.4">
-<!ENTITY gnome-shell-version               "40.4">
-<!ENTITY gnome-shell-extensions-version    "40.4">
-<!ENTITY gnome-session-version             "40.1.1">
-<!ENTITY gdm-version                       "40.1">
-<!ENTITY gnome-user-docs-version           "40.4">
+<!ENTITY gnome-bluetooth-version           "3.34.3">
+<!ENTITY gnome-keyring-version             "3.36.0">
+<!ENTITY gnome-settings-daemon-version     "3.38.1">
+<!ENTITY gnome-control-center-version      "3.38.2">
+<!ENTITY mutter-version                    "3.38.2">
+<!ENTITY gnome-shell-version               "3.38.2">
+<!ENTITY gnome-shell-extensions-version    "3.38.2">
+<!ENTITY gnome-session-version             "3.38.0">
+<!ENTITY gdm-version                       "3.38.2.1">
+<!ENTITY gnome-user-docs-version           "3.38.2">
 <!-- Icons moved to packages.ent, since they're now in the Icons chapter.-->
-<!ENTITY yelp-version                      "40.3">
+<!ENTITY yelp-version                      "3.38.2">
 <!-- notification-daemon moved to System Utilites, so it's now in packages.ent -->
 <!-- polkit-gnome moved to Security, so it's now in packages.ent -->
@@ -75,30 +75,27 @@
 <!-- Chapter 31 -->
 <!-- Applications -->
-<!ENTITY baobab-version                    "40.0">
+<!ENTITY baobab-version                    "3.38.0">
 <!ENTITY brasero-version                   "3.12.2">
 <!ENTITY cheese-version                    "3.38.0">
-<!ENTITY eog-version                       "40.3">
-<!ENTITY evince-version                    "40.4">
-<!ENTITY evolution-version                 "3.40.4">
-<!ENTITY file-roller-version               "3.40.0">
+<!ENTITY eog-version                       "3.38.1">
+<!ENTITY evince-version                    "3.38.0">
+<!ENTITY evolution-version                 "3.38.2">
+<!ENTITY file-roller-version               "3.38.0">
 <!-- gedit moved to Editors, so it's now in packages.ent -->
-<!ENTITY gnome-calculator-version          "40.1">
+<!ENTITY gnome-calculator-version          "3.38.2">
 <!ENTITY gnome-color-manager-version       "3.36.0">
-<!ENTITY gnome-disk-utility-version        "40.2">
+<!ENTITY gnome-disk-utility-version        "3.38.1">
 <!ENTITY gnome-logs-version                "3.36.0">
-<!ENTITY gnome-maps-version                "40.4">
+<!ENTITY gnome-maps-version                "3.38.2">
 <!ENTITY gnome-nettool-version             "3.8.1">
 <!ENTITY gnome-power-manager-version       "3.32.0">
-<!ENTITY gnome-screenshot-version          "40.0">
-<!ENTITY gnome-system-monitor-version      "40.1">
-<!ENTITY gnome-terminal-version            "3.40.3">
-<!ENTITY gnome-tweaks-version              "40.0">
-<!ENTITY gnome-weather-version             "40.1">
-<!--ENTITY gucharmap-version                 "13.0.8"-->
-<!-- "major" version also used for links to unicode downloads -->
-<!ENTITY gucharmap-major-version         "13.0">
-<!ENTITY gucharmap-version               "&gucharmap-major-version;.8">
+<!ENTITY gnome-screenshot-version          "3.38.0">
+<!ENTITY gnome-system-monitor-version      "3.38.0">
+<!ENTITY gnome-terminal-version            "3.38.1">
+<!ENTITY gnome-tweaks-version              "3.34.1">
+<!ENTITY gnome-weather-version             "3.36.1">
+<!ENTITY gucharmap-version                 "12.0.1">
 <!-- nm-applet moved to Networking Utilities, so it's now in packages.ent -->
-<!ENTITY seahorse-version                  "40.0">
+<!ENTITY seahorse-version                  "3.38.0.1">
 <!ENTITY vinagre-version                   "3.22.0">
 <!--<!ENTITY vino-version                      "3.22.0">-->
Index: gnome/applications/applications.xml
===================================================================
--- gnome/applications/applications.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/applications/applications.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
  %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="gnome-applications">
Index: gnome/applications/baobab.xml
===================================================================
--- gnome/applications/baobab.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/applications/baobab.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY baobab-download-http "&gnome-download-http;/baobab/&gnome-40;/baobab-&baobab-version;.tar.xz">
-  <!ENTITY baobab-download-ftp  "&gnome-download-ftp;/baobab/&gnome-40;/baobab-&baobab-version;.tar.xz">
-  <!ENTITY baobab-md5sum        "7b95ce82fa0607104fee9da78f3b17c7">
-  <!ENTITY baobab-size          "572 KB">
-  <!ENTITY baobab-buildsize     "7.4 MB">
+  <!ENTITY baobab-download-http "&gnome-download-http;/baobab/&gnome-minor-38;/baobab-&baobab-version;.tar.xz">
+  <!ENTITY baobab-download-ftp  "&gnome-download-ftp;/baobab/&gnome-minor-38;/baobab-&baobab-version;.tar.xz">
+  <!ENTITY baobab-md5sum        "b69c1e9e4711d15367b894f63d2081e8">
+  <!ENTITY baobab-size          "568 KB">
+  <!ENTITY baobab-buildsize     "13 MB">
   <!ENTITY baobab-time          "0.1 SBU (Using parallelism=4)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -76,6 +77,5 @@
       <xref linkend="adwaita-icon-theme"/>,
       <xref linkend="gtk3"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="libhandy1"/>, and
+      <xref linkend="itstool"/> and
       <xref linkend="vala"/>
     </para>
@@ -97,5 +97,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -141,5 +141,5 @@
         <listitem>
           <para>
-            is a graphical tool used to analyze disk usage
+            is a graphical tool used to analyze disk usage.
           </para>
           <indexterm zone="baobab baobab-prog">
Index: gnome/applications/brasero.xml
===================================================================
--- gnome/applications/brasero.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/applications/brasero.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -96,5 +97,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtk-doc"/>
+      <xref linkend="gtk-doc"/> and
+      <xref linkend="tracker"/>
     </para>
 
@@ -192,5 +194,5 @@
           <para>
             is a simple and easy to use CD/DVD burning application for the
-            <application>GNOME</application> Desktop
+            <application>GNOME</application> Desktop.
           </para>
           <indexterm zone="brasero brasero-prog">
@@ -204,5 +206,5 @@
         <listitem>
           <para>
-            contains the Burning API functions
+            contains the Burning API functions.
           </para>
           <indexterm zone="brasero libbrasero-burn3">
@@ -216,5 +218,5 @@
         <listitem>
           <para>
-            contains the Media API functions
+            contains the Media API functions.
           </para>
           <indexterm zone="brasero libbrasero-media3">
@@ -228,5 +230,5 @@
         <listitem>
           <para>
-            contains the <application>Brasero</application> API functions
+            contains the <application>Brasero</application> API functions.
           </para>
           <indexterm zone="brasero libbrasero-utils3">
Index: gnome/applications/cheese.xml
===================================================================
--- gnome/applications/cheese.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/applications/cheese.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -69,5 +70,5 @@
       </listitem>
     </itemizedlist>
-
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -75,9 +76,9 @@
         <para>
           Required patch:
-		  <ulink url="&patch-root;/cheese-&cheese-version;-upstream_fixes-1.patch"/>
+		  <ulink url="&patch-root;/cheese-&cheese-version;-gst_debug_disabled-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
-
+-->
     <bridgehead renderas="sect3">Cheese Dependencies</bridgehead>
 
@@ -146,10 +147,4 @@
 
     <para>
-      Next, fix some build issues due to removed Vala functions:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../cheese-&cheese-version;-upstream_fixes-1.patch</userinput></screen>
-
-    <para>
       Install <application>Cheese</application> by running the following
       commands:
@@ -159,5 +154,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release -Dgtk_doc=false .. &amp;&amp;
+meson --prefix=/usr -Dgtk_doc=false .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -176,7 +171,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -184,6 +176,5 @@
       system from generating and installing the API documentation. Omit this
       switch if you have <xref linkend="gtk-doc" role="nodep"/> installed
-      and wish to generate and install the API documentation. Building the
-      documentation is broken due to an incompatibility with gtk-doc.
+      and wish to generate and install the API documentation.
     </para>
   </sect2>
@@ -219,5 +210,5 @@
         <listitem>
           <para>
-            is a webcam tool with graphical effects
+            is a webcam tool with graphical effects.
           </para>
           <indexterm zone="cheese cheese-prog">
@@ -231,5 +222,5 @@
         <listitem>
           <para>
-            contains the <application>Cheese</application> API functions
+            contains the <application>Cheese</application> API functions.
           </para>
           <indexterm zone="cheese libcheese">
@@ -244,5 +235,5 @@
           <para>
             contains the <application>Cheese</application>
-            <application>GTK+</application> widgets
+            <application>GTK+</application> widgets.
           </para>
           <indexterm zone="cheese libcheese-gtk">
Index: gnome/applications/dummy-apps.xml
===================================================================
--- gnome/applications/dummy-apps.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/applications/dummy-apps.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,4 +6,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: gnome/applications/eog.xml
===================================================================
--- gnome/applications/eog.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/applications/eog.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY eog-download-http "&gnome-download-http;/eog/&gnome-40;/eog-&eog-version;.tar.xz">
-  <!ENTITY eog-download-ftp  "&gnome-download-ftp;/eog/&gnome-40;/eog-&eog-version;.tar.xz">
-  <!ENTITY eog-md5sum        "7ed0133cd59b1fed88f2f9513d0de27a">
-  <!ENTITY eog-size          "3.4 MB">
-  <!ENTITY eog-buildsize     "46 MB">
+  <!ENTITY eog-download-http "&gnome-download-http;/eog/&gnome-minor-38;/eog-&eog-version;.tar.xz">
+  <!ENTITY eog-download-ftp  "&gnome-download-ftp;/eog/&gnome-minor-38;/eog-&eog-version;.tar.xz">
+  <!ENTITY eog-md5sum        "2bc2aa65cbebd0a0ef37de6445a3b661">
+  <!ENTITY eog-size          "3.5 MB">
+  <!ENTITY eog-buildsize     "48 MB">
   <!ENTITY eog-time          "0.3 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -115,5 +116,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release -Dlibportal=false .. &amp;&amp;
+meson --prefix=/usr -Dlibportal=false .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -142,7 +143,4 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
     <para>
       <parameter>-Dlibportal=false</parameter>: This parameter disables
@@ -153,5 +151,5 @@
 
     <para>
-      <option>-Dgtk_doc=true</option>: Use this option if
+      <option>-Dgtk-doc=true</option>: Use this option if
       <xref role="nodep" linkend="gtk-doc"/> is installed and you wish to rebuild
       and install the API documentation.
@@ -192,5 +190,5 @@
           <para>
             is a fast and functional image viewer as well as an
-            image cataloging program.  It has basic editing capabilites
+            image cataloging program.  It has basic editing capabilites.
           </para>
           <indexterm zone="eog eog-prog">
Index: gnome/applications/evince.xml
===================================================================
--- gnome/applications/evince.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/applications/evince.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,10 +6,10 @@
 
   <!ENTITY evince-download-http
-     "&gnome-download-http;/evince/&gnome-40;/evince-&evince-version;.tar.xz">
+     "&gnome-download-http;/evince/&gnome-minor-38;/evince-&evince-version;.tar.xz">
   <!ENTITY evince-download-ftp
-     "&gnome-download-ftp;/evince/&gnome-40;/evince-&evince-version;.tar.xz">
-  <!ENTITY evince-md5sum        "bf78a8e8c384bbd2780b7be0ac917e79">
+     "&gnome-download-ftp;/evince/&gnome-minor-38;/evince-&evince-version;.tar.xz">
+  <!ENTITY evince-md5sum        "29dd770b8255bdf6343f83419c975905">
   <!ENTITY evince-size          "2.8 MB">
-  <!ENTITY evince-buildsize     "63 MB">
+  <!ENTITY evince-buildsize     "84 MB">
   <!ENTITY evince-time          "0.4 SBU (Using parallelism=4)">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -83,5 +84,4 @@
       <xref linkend="gtk3"/>,
       <xref linkend="itstool"/>,
-      <xref linkend="libhandy1"/>,
       <xref linkend="libxml2"/>, and
       <xref linkend="openjpeg2"/>
@@ -129,5 +129,6 @@
     </para>
 
-<screen><userinput remap="pre">export CPPFLAGS="-I/opt/texlive/&texlive-year;/include" &amp;&amp;
+<screen><userinput remap="pre">export CFLAGS="$CFLAGS -I/opt/texlive/&texlive-year;/include" &amp;&amp;
+export CXXFLAGS="$CXXFLAGS -I/opt/texlive/&texlive-year;/include" &amp;&amp;
 export LDFLAGS="$LDFLAGS -L/opt/texlive/&texlive-year;/lib"</userinput></screen>
 
@@ -140,8 +141,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr       \
-      --buildtype=release \
-      -Dgtk_doc=false     \
-      -Dsystemduserunitdir=no .. &amp;&amp;
+meson --prefix=/usr -Dgtk_doc=false -Dsystemduserunitdir=no .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -149,5 +147,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release -Dgtk_doc=false .. &amp;&amp;
+meson --prefix=/usr -Dgtk_doc=false .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -169,8 +167,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
     <!--
     <para>
@@ -181,8 +175,11 @@
     -->
 
-    <para>
-      <parameter>CPPFLAGS="..." LDFLAGS="$LDFLAGS ..."</parameter>: If
+<!-- When moving to Meson, I installed the whole texlive suite from source.
+     I was able to verify that this is no longer required. I'm assuming it was
+     one of evince-3.36.3 or texlive-2020 that fixed this.
+    <para>
+      <parameter>CFLAGS="$CFLAGS ..." CXXFLAGS="$CXXFLAGS ..." LDFLAGS="$LDFLAGS ..."</parameter>: If
       <application>TeXLive</application> has been installed in
-      <filename class="directory">/opt/texlive/&texlive-year;</filename> the
+      <filename class="directory">/opt/texlive-&texlive-year;</filename> the
       configure script will find <filename class='libraryfile'>libkpathsea.so</filename>
       and enable the DVI backend, but without this addition the compile will fail
@@ -191,5 +188,5 @@
       build.
     </para>
-
+-->
     <para>
       <parameter>-Dgtk_doc=false</parameter>: This switch disables generating
@@ -228,10 +225,4 @@
       <application>libsecret</application>. Use this switch
       if <application>libsecret</application> is not installed.
-    </para>
-
-    <para>
-      <option>-Dps=enabled</option>: Use this switch if
-      <application>libspectre</application> is installed and you want to
-      view PostScript files with <application>Evince</application>.
     </para>
 
@@ -272,5 +263,5 @@
         <listitem>
           <para>
-            is a multiple format document viewer
+            is a multiple format document viewer.
           </para>
           <indexterm zone="evince evince-prog">
@@ -284,5 +275,5 @@
         <listitem>
           <para>
-            is an applicaton that implements the printing previewer
+            is an applicaton that implements the printing previewer.
           </para>
           <indexterm zone="evince evince-previewer">
@@ -297,5 +288,5 @@
           <para>
             is a simple program used to create thumbnail images of
-            supported documents
+            supported documents.
           </para>
           <indexterm zone="evince evince-thumbnailer">
Index: gnome/applications/evolution.xml
===================================================================
--- gnome/applications/evolution.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/applications/evolution.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,12 +5,10 @@
   %general-entities;
 
-  <!-- Editors: Make sure directory is correct when updating -->
-
-  <!ENTITY evolution-download-http "&gnome-download-http;/evolution/3.40/evolution-&evolution-version;.tar.xz">
-  <!ENTITY evolution-download-ftp  "&gnome-download-ftp;/evolution/3.40/evolution-&evolution-version;.tar.xz">
-  <!ENTITY evolution-md5sum        "ec866ca2cb5ee60c00de9be0beec5f2a">
+  <!ENTITY evolution-download-http "&gnome-download-http;/evolution/&gnome-minor-38;/evolution-&evolution-version;.tar.xz">
+  <!ENTITY evolution-download-ftp  "&gnome-download-ftp;/evolution/&gnome-minor-38;/evolution-&evolution-version;.tar.xz">
+  <!ENTITY evolution-md5sum        "2c578373442eb4a87473b7ea5d90c573">
   <!ENTITY evolution-size          "12 MB">
-  <!ENTITY evolution-buildsize     "349 MB">
-  <!ENTITY evolution-time          "1.2 SBU (Using parallelism=4)">
+  <!ENTITY evolution-buildsize     "346 MB">
+  <!ENTITY evolution-time          "1.1 SBU (Using parallelism=4)">
 ]>
 
@@ -19,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -242,5 +241,5 @@
           <para>
             is an email, calendar and address book suite for
-            the <application>GNOME</application> Desktop
+            the <application>GNOME</application> Desktop.
           </para>
           <indexterm zone="evolution evolution-prog">
Index: gnome/applications/file-roller.xml
===================================================================
--- gnome/applications/file-roller.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/applications/file-roller.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,9 +6,9 @@
 
   <!ENTITY file-roller-download-http
-           "&gnome-download-http;/file-roller/&gnome-minor-40;/file-roller-&file-roller-version;.tar.xz">
+           "&gnome-download-http;/file-roller/&gnome-minor-38;/file-roller-&file-roller-version;.tar.xz">
   <!ENTITY file-roller-download-ftp
-           "&gnome-download-ftp;/file-roller/&gnome-minor-40;/file-roller-&file-roller-version;.tar.xz">
-  <!ENTITY file-roller-md5sum        "b38c3eaea9aba5f44d2701fa23a7a0ff">
-  <!ENTITY file-roller-size          "856 KB">
+           "&gnome-download-ftp;/file-roller/&gnome-minor-38;/file-roller-&file-roller-version;.tar.xz">
+  <!ENTITY file-roller-md5sum        "41ee373818d577659980dcdaf57b772a">
+  <!ENTITY file-roller-size          "860 KB">
   <!ENTITY file-roller-buildsize     "25 MB">
   <!ENTITY file-roller-time          "0.1 SBU (Using parallelism=4)">
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <note>
@@ -122,5 +123,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release -Dpackagekit=false .. &amp;&amp;
+meson --prefix=/usr -Dpackagekit=false .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -146,7 +147,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -187,5 +185,5 @@
         <listitem>
           <para>
-            is an archive manager for <application>GNOME</application>
+            is an archive manager for <application>GNOME</application>.
           </para>
           <indexterm zone="file-roller file-roller-prog">
Index: gnome/applications/gnome-calculator.xml
===================================================================
--- gnome/applications/gnome-calculator.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/applications/gnome-calculator.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-calculator-download-http
-           "&gnome-download-http;/gnome-calculator/&gnome-40;/gnome-calculator-&gnome-calculator-version;.tar.xz">
+           "&gnome-download-http;/gnome-calculator/&gnome-minor-38;/gnome-calculator-&gnome-calculator-version;.tar.xz">
   <!ENTITY gnome-calculator-download-ftp
-           "&gnome-download-ftp;/gnome-calculator/&gnome-40;/gnome-calculator-&gnome-calculator-version;.tar.xz">
-  <!ENTITY gnome-calculator-md5sum        "57e05479d89a68a3649aa4bad69a02da">
-  <!ENTITY gnome-calculator-size          "1000 KB">
-  <!ENTITY gnome-calculator-buildsize     "36 MB (with tests)">
-  <!ENTITY gnome-calculator-time          "0.4 SBU (with tests)">
+           "&gnome-download-ftp;/gnome-calculator/&gnome-minor-38;/gnome-calculator-&gnome-calculator-version;.tar.xz">
+  <!ENTITY gnome-calculator-md5sum        "c634eae25fd365c61c31a20052fe0ea5">
+  <!ENTITY gnome-calculator-size          "984 KB">
+  <!ENTITY gnome-calculator-buildsize     "53 MB (with tests)">
+  <!ENTITY gnome-calculator-time          "0.3 SBU (with tests)">
 ]>
 
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -81,6 +82,5 @@
       <xref linkend="gtksourceview4"/>, 
       <xref linkend="itstool"/>, 
-      <xref linkend="libgee"/>,
-      <xref linkend="libhandy1"/>, and
+      <xref linkend="libgee"/>, and
       <xref linkend="libsoup"/>
     </para>
@@ -116,5 +116,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -148,6 +148,5 @@
         <seg>
           /usr/include/gcalc-2,
-          /usr/include/gci-2,
-          /usr/share/devhelp/books/{GCalc-2,GCi-1}, and
+          /usr/include/gci-2, and
           /usr/share/help/*/gnome-calculator
         </seg>
@@ -165,5 +164,5 @@
           <para>
             is the official calculator of the
-            <application>GNOME</application> Desktop
+            <application>GNOME</application> Desktop.
           </para>
           <indexterm zone="gnome-calculator gnome-calculator-prog">
@@ -178,5 +177,5 @@
           <para>
             is a command line version of
-            <application>gnome-calculator</application>
+            <application>gnome-calculator</application>.
           </para>
           <indexterm zone="gnome-calculator gcalccmd">
Index: gnome/applications/gnome-color-manager.xml
===================================================================
--- gnome/applications/gnome-color-manager.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/applications/gnome-color-manager.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -11,5 +11,5 @@
   <!ENTITY gnome-color-manager-md5sum        "c5360705a68e88455b1801200e9aaa2e">
   <!ENTITY gnome-color-manager-size          "2.1 MB">
-  <!ENTITY gnome-color-manager-buildsize     "12 MB">
+  <!ENTITY gnome-color-manager-buildsize     "18 MB">
   <!ENTITY gnome-color-manager-time          "0.1 SBU">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -119,5 +120,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -196,5 +197,5 @@
         <listitem>
           <para>
-            allows you to import ICC profiles supplied by vendors
+            allows you to import ICC profiles supplied by vendors.
           </para>
           <indexterm zone="gnome-color-manager gcm-import">
@@ -208,5 +209,5 @@
         <listitem>
           <para>
-            allows you to inspect your session color-management settings
+            allows you to inspect your session color-management settings.
           </para>
           <indexterm zone="gnome-color-manager gcm-inspect">
@@ -220,5 +221,5 @@
         <listitem>
           <para>
-            allows you to pick spot colors for use by an attached colorimeter
+            allows you to pick spot colors for use by an attached colorimeter.
           </para>
           <indexterm zone="gnome-color-manager gcm-picker">
@@ -232,5 +233,5 @@
         <listitem>
           <para>
-            allows you to view properties of ICC profiles
+            allows you to view properties of ICC profiles.
           </para>
           <indexterm zone="gnome-color-manager gcm-viewer">
Index: gnome/applications/gnome-disk-utility.xml
===================================================================
--- gnome/applications/gnome-disk-utility.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/applications/gnome-disk-utility.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-disk-utility-download-http
-           "&gnome-download-http;/gnome-disk-utility/&gnome-40;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
+           "&gnome-download-http;/gnome-disk-utility/&gnome-minor-38;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
   <!ENTITY gnome-disk-utility-download-ftp
-           "&gnome-download-ftp;/gnome-disk-utility/&gnome-40;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
-  <!ENTITY gnome-disk-utility-md5sum        "10a01b70d411f5e6c6d1fbf16e07458d">
+           "&gnome-download-ftp;/gnome-disk-utility/&gnome-minor-38;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
+  <!ENTITY gnome-disk-utility-md5sum        "6e18fc9c6a50d120fd2c87c634382f03">
   <!ENTITY gnome-disk-utility-size          "1.3 MB">
-  <!ENTITY gnome-disk-utility-buildsize     "32 MB">
-  <!ENTITY gnome-disk-utility-time          "0.1 SBU">
+  <!ENTITY gnome-disk-utility-buildsize     "36 MB">
+  <!ENTITY gnome-disk-utility-time          "0.1 SBU (with parallelism=4)">
 ]>
 
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -79,5 +80,4 @@
       <xref linkend="itstool"/>,
       <xref linkend="libdvdread"/>,
-      <xref linkend="libhandy1"/>,
       <xref linkend="libpwquality"/>,
       <xref linkend="libsecret"/>, and
@@ -107,5 +107,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr &amp;&amp;
 ninja</userinput></screen>
 
@@ -152,5 +152,5 @@
         <listitem>
           <para>
-            is used to set up disk images
+            is used to set up disk images.
           </para>
           <indexterm zone="gnome-disk-utility gnome-disk-image-mounter">
@@ -165,5 +165,5 @@
           <para>
             is used to inspect, format, partition and configure disks
-            and block devices
+            and block devices.
           </para>
           <indexterm zone="gnome-disk-utility gnome-disks">
Index: gnome/applications/gnome-logs.xml
===================================================================
--- gnome/applications/gnome-logs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/applications/gnome-logs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -157,5 +158,5 @@
           <para>
             is a <application>GNOME</application> log viewer for the
-            systemd journal
+            systemd journal.
           </para>
           <indexterm zone="gnome-logs gnome-logs-prog">
Index: gnome/applications/gnome-maps.xml
===================================================================
--- gnome/applications/gnome-maps.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/applications/gnome-maps.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-maps-download-http
-           "&gnome-download-http;/gnome-maps/&gnome-40;/gnome-maps-&gnome-maps-version;.tar.xz">
+           "&gnome-download-http;/gnome-maps/&gnome-minor-38;/gnome-maps-&gnome-maps-version;.tar.xz">
   <!ENTITY gnome-maps-download-ftp
-           "&gnome-download-ftp;/gnome-maps/&gnome-40;/gnome-maps-&gnome-maps-version;.tar.xz">
-  <!ENTITY gnome-maps-md5sum        "508309d2942484a239cffe62b1fdea05">
-  <!ENTITY gnome-maps-size          "3.4 MB">
-  <!ENTITY gnome-maps-buildsize     "16 MB">
-  <!ENTITY gnome-maps-time          "less than 0.1 SBU">
+           "&gnome-download-ftp;/gnome-maps/&gnome-minor-38;/gnome-maps-&gnome-maps-version;.tar.xz">
+  <!ENTITY gnome-maps-md5sum        "98c794631cbddda1b5c463cb8a30c35a">
+  <!ENTITY gnome-maps-size          "3.8 MB">
+  <!ENTITY gnome-maps-buildsize     "17 MB">
+  <!ENTITY gnome-maps-time          "0.1 SBU">
 ]>
 
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -77,5 +78,4 @@
     <para role="required">
       <xref linkend="clutter-gtk"/>,
-      <xref linkend="desktop-file-utils"/>,
       <xref linkend="folks"/>,
       <xref linkend="geoclue2"/>,
@@ -84,6 +84,5 @@
       <xref linkend="gjs"/>,
       <xref linkend="libchamplain"/>,
-      <xref linkend="libgee"/>,
-      <xref linkend="libhandy1"/>, and
+      <xref linkend="libgee"/>, and
       <xref linkend="rest"/>
     </para>
@@ -105,5 +104,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -152,5 +151,5 @@
         <listitem>
           <para>
-            is a map application for <application>GNOME</application>
+            is a map application for <application>GNOME</application>.
           </para>
           <indexterm zone="gnome-maps gnome-maps-prog">
Index: gnome/applications/gnome-nettool.xml
===================================================================
--- gnome/applications/gnome-nettool.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/applications/gnome-nettool.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -168,5 +169,5 @@
         <listitem>
           <para>
-            is a network information tool
+            is a network information tool.
           </para>
           <indexterm zone="gnome-nettool gnome-nettool-prog">
Index: gnome/applications/gnome-power-manager.xml
===================================================================
--- gnome/applications/gnome-power-manager.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/applications/gnome-power-manager.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -11,5 +11,5 @@
   <!ENTITY gnome-power-manager-md5sum        "9349e6447c80bcbd71d5a4f1469f508e">
   <!ENTITY gnome-power-manager-size          "372 KB">
-  <!ENTITY gnome-power-manager-buildsize     "4.3 MB">
+  <!ENTITY gnome-power-manager-buildsize     "6.4 MB">
   <!ENTITY gnome-power-manager-time          "less than 0.1 SBU (with tests)">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -103,5 +104,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr  --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>   
 
@@ -148,8 +149,9 @@
         <listitem>
           <para>
-            is used to visualize the power consumption of laptop hardware
+            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>
+            <primary
+            sortas="b-gnome-power-statistics">gnome-power-statistics</primary>
           </indexterm>
         </listitem>
Index: gnome/applications/gnome-screenshot.xml
===================================================================
--- gnome/applications/gnome-screenshot.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/applications/gnome-screenshot.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-screenshot-download-http
-           "&gnome-download-http;/gnome-screenshot/&gnome-40;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
+           "&gnome-download-http;/gnome-screenshot/&gnome-minor-38;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
   <!ENTITY gnome-screenshot-download-ftp
-           "&gnome-download-ftp;/gnome-screenshot/&gnome-40;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
-  <!ENTITY gnome-screenshot-md5sum        "9300f1ef8edd9f1ec7903c4121dea247">
+           "&gnome-download-ftp;/gnome-screenshot/&gnome-minor-38;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
+  <!ENTITY gnome-screenshot-md5sum        "6550491108355c9d991e90b735ef3908">
   <!ENTITY gnome-screenshot-size          "352 KB">
-  <!ENTITY gnome-screenshot-buildsize     "3.8 MB">
+  <!ENTITY gnome-screenshot-buildsize     "6.6 MB">
   <!ENTITY gnome-screenshot-time          "less than 0.1 SBU">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -98,5 +99,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -151,5 +152,5 @@
           <para>
             is used to capture the screen, a window, or a user-defined
-            area and save the snapshot image to a file
+            area and save the snapshot image to a file.
           </para>
           <indexterm zone="gnome-screenshot gnome-screenshot-prog">
Index: gnome/applications/gnome-system-monitor.xml
===================================================================
--- gnome/applications/gnome-system-monitor.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/applications/gnome-system-monitor.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-system-monitor-download-http
-           "&gnome-download-http;/gnome-system-monitor/&gnome-40;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
+           "&gnome-download-http;/gnome-system-monitor/&gnome-minor-38;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
   <!ENTITY gnome-system-monitor-download-ftp
-           "&gnome-download-ftp;/gnome-system-monitor/&gnome-40;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
-  <!ENTITY gnome-system-monitor-md5sum        "aad861b88ccd59a6a41217457600ba13">
-  <!ENTITY gnome-system-monitor-size          "748 KB">
-  <!ENTITY gnome-system-monitor-buildsize     "15 MB">
+           "&gnome-download-ftp;/gnome-system-monitor/&gnome-minor-38;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
+  <!ENTITY gnome-system-monitor-md5sum        "0494ca62d2d59b5de5efc2eddef58463">
+  <!ENTITY gnome-system-monitor-size          "696 KB">
+  <!ENTITY gnome-system-monitor-buildsize     "32 MB">
   <!ENTITY gnome-system-monitor-time          "0.2 SBU (with parallelism=4)">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -106,5 +107,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr -Dsystemd=false --buildtype=release .. &amp;&amp;
+meson --prefix=/usr -Dsystemd=false .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -112,5 +113,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -168,5 +169,5 @@
         <listitem>
           <para>
-            is used to display the process tree and hardware meters
+            is used to display the process tree and hardware meters.
           </para>
           <indexterm zone="gnome-system-monitor gnome-system-monitor-prog">
Index: gnome/applications/gnome-terminal.xml
===================================================================
--- gnome/applications/gnome-terminal.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/applications/gnome-terminal.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-terminal-download-http
-           "&gnome-download-http;/gnome-terminal/&gnome-minor-40;/gnome-terminal-&gnome-terminal-version;.tar.xz">
+           "&gnome-download-http;/gnome-terminal/&gnome-minor-38;/gnome-terminal-&gnome-terminal-version;.tar.xz">
   <!ENTITY gnome-terminal-download-ftp
-           "&gnome-download-ftp;/gnome-terminal/&gnome-minor-40;/gnome-terminal-&gnome-terminal-version;.tar.xz">
-  <!ENTITY gnome-terminal-md5sum        "06db1340df1c10a1b159b940c30db87c">
-  <!ENTITY gnome-terminal-size          "2.5 MB">
-  <!ENTITY gnome-terminal-buildsize     "48 MB">
-  <!ENTITY gnome-terminal-time          "0.1 SBU">
+           "&gnome-download-ftp;/gnome-terminal/&gnome-minor-38;/gnome-terminal-&gnome-terminal-version;.tar.xz">
+  <!ENTITY gnome-terminal-md5sum        "8e131d6c4eca8843bec9421e43191790">
+  <!ENTITY gnome-terminal-size          "2.4 MB">
+  <!ENTITY gnome-terminal-buildsize     "47 MB">
+  <!ENTITY gnome-terminal-time          "0.1 SBU (using parallelism=4)">
 ]>
 
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -86,5 +87,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <phrase revision="sysv"><xref linkend="gnome-shell"/> and</phrase>
+      <xref linkend="gnome-shell"/> and
       <xref linkend="nautilus"/>
     </para>
@@ -195,5 +196,5 @@
         <listitem>
           <para>
-            is the <application>GNOME</application> Terminal Emulator
+            is the <application>GNOME</application> Terminal Emulator.
           </para>
           <indexterm zone="gnome-terminal gnome-terminal-prog">
Index: gnome/applications/gnome-tweaks.xml
===================================================================
--- gnome/applications/gnome-tweaks.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/applications/gnome-tweaks.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-tweaks-download-http
-           "&gnome-download-http;/gnome-tweaks/&gnome-40;/gnome-tweaks-&gnome-tweaks-version;.tar.xz">
+           "&gnome-download-http;/gnome-tweaks/&gnome-minor-34;/gnome-tweaks-&gnome-tweaks-version;.tar.xz">
   <!ENTITY gnome-tweaks-download-ftp
-           "&gnome-download-ftp;/gnome-tweaks/&gnome-40;/gnome-tweaks-&gnome-tweaks-version;.tar.xz">
-  <!ENTITY gnome-tweaks-md5sum        "81b5883a6f0046f1b63cc998829d83e4">
-  <!ENTITY gnome-tweaks-size          "248 KB">
-  <!ENTITY gnome-tweaks-buildsize     "5.3 MB">
+           "&gnome-download-ftp;/gnome-tweaks/&gnome-minor-34;/gnome-tweaks-&gnome-tweaks-version;.tar.xz">
+  <!ENTITY gnome-tweaks-md5sum        "34136ab30594546889d7c32ed8b13aba">
+  <!ENTITY gnome-tweaks-size          "244 KB">
+  <!ENTITY gnome-tweaks-buildsize     "5.2 MB">
   <!ENTITY gnome-tweaks-time          "less than 0.1 SBU">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -72,5 +73,4 @@
     </itemizedlist>
 
-<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -82,5 +82,4 @@
       </listitem>
     </itemizedlist>
--->
 
     <bridgehead renderas="sect3">GNOME Tweaks Dependencies</bridgehead>
@@ -103,5 +102,4 @@
     <title>Installation of GNOME Tweaks</title>
 
-<!--
     <para>
       First, port gnome-tweaks to libhandy-1.x:
@@ -109,13 +107,4 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../gnome-tweaks-&gnome-tweaks-version;-port_to_libhandy1-1.patch</userinput></screen>
--->
-
-    <para>
-      First, if you are upgrading from gnome-tweaks-3.34.x, remove some
-      incompatible files as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput remap="pre">rm -rf /usr/lib/python&python3-majorver;/site-packages/gtweak</userinput></screen>
 
     <para>
@@ -127,5 +116,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release &amp;&amp;
+meson --prefix=/usr &amp;&amp;
 ninja</userinput></screen>
 
@@ -139,11 +128,4 @@
 
 <screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
   </sect2>
 
@@ -180,5 +162,5 @@
           <para>
             is used to tweak advanced <application>GNOME</application>
-            settings
+            settings.
           </para>
           <indexterm zone="gnome-tweaks gnome-tweaks-prog">
Index: gnome/applications/gnome-weather.xml
===================================================================
--- gnome/applications/gnome-weather.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/applications/gnome-weather.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-weather-download-http
-           "&gnome-download-http;/gnome-weather/&gnome-40;/gnome-weather-&gnome-weather-version;.tar.xz">
+           "&gnome-download-http;/gnome-weather/&gnome-minor-36;/gnome-weather-&gnome-weather-version;.tar.xz">
   <!ENTITY gnome-weather-download-ftp
-           "&gnome-download-ftp;/gnome-weather/&gnome-40;/gnome-weather-&gnome-weather-version;.tar.xz">
-  <!ENTITY gnome-weather-md5sum        "8cb2525bb9321ff27889877bbd735d7d">
-  <!ENTITY gnome-weather-size          "920 KB">
-  <!ENTITY gnome-weather-buildsize     "4.7 MB">
+           "&gnome-download-ftp;/gnome-weather/&gnome-minor-36;/gnome-weather-&gnome-weather-version;.tar.xz">
+  <!ENTITY gnome-weather-md5sum        "a028a4662b235eb6de442598c7e07fbe">
+  <!ENTITY gnome-weather-size          "5.7 MB">
+  <!ENTITY gnome-weather-buildsize     "19 MB">
   <!ENTITY gnome-weather-time          "less than 0.1 SBU">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -78,7 +79,6 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gjs"/>,
-      <xref linkend="libgweather"/>, and
-      <xref linkend="libhandy1"/>
+      <xref linkend="gjs"/> and
+      <xref linkend="libgweather"/>
     </para>
 
@@ -105,5 +105,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -120,11 +120,4 @@
 <screen role="root"><userinput>ninja install</userinput></screen>
 
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
   </sect2>
 
@@ -160,5 +153,5 @@
           <para>
             is a small application that allows  you to monitor the
-            current weather conditions anywhere in the world
+            current weather conditions anywhere in the world.
           </para>
           <indexterm zone="gnome-weather gnome-weather-prog">
Index: gnome/applications/gucharmap.xml
===================================================================
--- gnome/applications/gucharmap.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/applications/gucharmap.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,13 +5,12 @@
   %general-entities;
 
-  <!-- found by looking at souce of https://gitlab.gnome.org/GNOME/gucharmap/-/tags
-   in seamonkey, finding the .tar.bz2 and putting the gitlab.gnome.org prefix
-   onto it -->
-  <!ENTITY gucharmap-download-http "https://gitlab.gnome.org/GNOME/gucharmap/-/archive/&gucharmap-version;/gucharmap-&gucharmap-version;.tar.bz2">
-  <!ENTITY gucharmap-download-ftp  " ">
-  <!ENTITY gucharmap-md5sum        "5dbe3a3f6d063f819f82f15d6613a7a4">
-  <!ENTITY gucharmap-size          "1.3 MB">
-  <!ENTITY gucharmap-buildsize     "68 MB">
-  <!ENTITY gucharmap-time          "0.1 SBU">
+  <!ENTITY gucharmap-download-http
+       "&gnome-download-http;/gucharmap/12.0/gucharmap-&gucharmap-version;.tar.xz">
+  <!ENTITY gucharmap-download-ftp
+       "&gnome-download-ftp;/gucharmap/12.0/gucharmap-&gucharmap-version;.tar.xz">
+  <!ENTITY gucharmap-md5sum        "0c34aa29657a41712d011d939c5bc85e">
+  <!ENTITY gucharmap-size          "1.6 MB">
+  <!ENTITY gucharmap-buildsize     "56 MB">
+  <!ENTITY gucharmap-time          "0.4 SBU (with a fast internet connection)">
 ]>
 
@@ -20,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -75,22 +75,4 @@
       </listitem>
     </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-      <bridgehead renderas="sect4">Unicode Character Database files</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download: <ulink url="https://www.unicode.org/Public/zipped/&gucharmap-major-version;.0/UCD.zip"> https://www.unicode.org/Public/zipped/&gucharmap-major-version;.0/UCD.zip</ulink>
-            (Unicode Character Database)
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download: <ulink url="https://www.unicode.org/Public/zipped/&gucharmap-major-version;.0/Unihan.zip"> https://www.unicode.org/Public/zipped/&gucharmap-major-version;.0/Unihan.zip</ulink>
-            (CJK Unified Ideographs)
-          </para>
-        </listitem>
-      </itemizedlist>
 
     <bridgehead renderas="sect3">Gucharmap Dependencies</bridgehead>
@@ -99,8 +81,8 @@
     <para role="required">
       <xref linkend="desktop-file-utils"/>,
-      <xref linkend="gsettings-desktop-schemas"/>,
       <xref linkend="gtk3"/>,
-      <xref linkend="itstool"/>, and
-      <xref linkend="unzip"/>
+      <xref linkend="itstool"/>,
+      <xref linkend="unzip"/>, and
+      <xref linkend="wget"/> (used to download data from unicode.org)
     </para>
 
@@ -131,21 +113,13 @@
     </para>
 
-<screen><userinput>mkdir build                   &amp;&amp;
-cd    build                   &amp;&amp;
-mkdir ucd                     &amp;&amp;
-pushd ucd                     &amp;&amp;
-  unzip ../../../UCD.zip      &amp;&amp;
-  cp -v ../../../Unihan.zip . &amp;&amp;
-popd                          &amp;&amp;
-
-meson --prefix=/usr         \
-      --strip               \
-      --buildtype=release   \
-      -Ducd_path=./ucd      \
-      -Ddocs=false ..       &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not have a testsuite.
+<screen><userinput>LIBS="-ldl"               \
+./configure --prefix=/usr \
+            --enable-vala \
+            --with-unicode-data=download &amp;&amp;
+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>
 
@@ -154,6 +128,5 @@
     </para>
 
-<screen role="root"><userinput>rm  -fv /usr/share/glib-2.0/schemas/org.gnome.Charmap.enums.xml &amp;&amp;
-ninja install</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
@@ -162,39 +135,25 @@
     <title>Command Explanations</title>
 
-    <!-- 13.0.8, meson 58 series - file reports 'with debug_info, not stripped'.
-     The build still used -O3 and claimed to not be a debug version -->
-    <para>
-      <parameter>--strip</parameter>: Although the package defaults to a release
-      build without debug information, without this switch there will be some
-      debug information in the binaries.
-    </para>
-
-    <para>
-      <parameter>-Ducd_path=./ucd</parameter>: This points to where the extracted
-      main Unicode data files, and the zipped Unihan archive can be found.
-    </para>
-
-    <para>
-      <command>rm  -fv /usr/share/glib-2.0/schemas/org.gnome.Charmap.enums.xml</command>:
-      Old versions of this package installed an obsolete file that prevents the
-      program from running, as if the main schema has not been installed.
-      Forcibly removing works even if the old file is not present.
-    </para>
-
-    <para>
-      <parameter>-Ddocs=false</parameter>: This allows the package to build even
-      if <application>gtk-doc</application> has not been installed. Remove this
-      if you have installed that and wish to build the documentation.
-    </para>
-
-    <para>
-      <option>-Dgir=false</option>: Use this if you have not installed
-      <xref linkend="gobject-introspection"/>.
-    </para>
-
-    <para>
-      <option>-Dvapi=false</option>: Use this if you have not installed
-      <xref linkend="vala"/>.
-    </para>
+<!-- Needed in Gucharmap 10.0.4: should be fixed in subsequent versions -->
+    <para>
+      <command>LIBS="-ldl" ...</command>: Allows linking some system libraries.
+      This is currently broken in version 10.0.4.
+    </para>
+
+    <para>
+      <parameter>--with-unicode-data=download</parameter>: This switch forces
+      the build process to download the <application>Unicode</application> data
+      instead of trying to look for it locally.
+    </para>
+
+    <para>
+      <parameter>--enable-vala</parameter>: This switch enables building of the
+      <application>Vala</application> bindings (auto-detection of
+      <command>vapigen</command> is currently broken). Remove if you don't
+      have <xref linkend="vala"/> installed.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -210,6 +169,5 @@
       <seglistitem>
         <seg>
-          <!-- these appear to no-longer get created
-          charmap, gnome-character-map (both symlinks), and--> gucharmap
+          charmap, gnome-character-map (both symlinks), and gucharmap
         </seg>
         <seg>
@@ -232,5 +190,5 @@
         <listitem>
           <para>
-            is a Unicode character map and font viewer
+            is a Unicode character map and font viewer.
           </para>
           <indexterm zone="gucharmap gucharmap-prog">
@@ -244,5 +202,5 @@
         <listitem>
           <para>
-            contains the <application>Gucharmap</application> API functions
+            contains the <application>Gucharmap</application> API functions.
           </para>
           <indexterm zone="gucharmap libgucharmap_2_90">
Index: gnome/applications/seahorse.xml
===================================================================
--- gnome/applications/seahorse.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/applications/seahorse.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,9 +6,9 @@
 
   <!ENTITY seahorse-download-http
-           "&gnome-download-http;/seahorse/&gnome-40;/seahorse-&seahorse-version;.tar.xz">
+           "&gnome-download-http;/seahorse/&gnome-minor-38;/seahorse-&seahorse-version;.tar.xz">
   <!ENTITY seahorse-download-ftp
-           "&gnome-download-ftp;/seahorse/&gnome-40;/seahorse-&seahorse-version;.tar.xz">
-  <!ENTITY seahorse-md5sum        "c6c11d77e64c4efc31f02c7127327be8">
-  <!ENTITY seahorse-size          "1.3 MB">
+           "&gnome-download-ftp;/seahorse/&gnome-minor-38;/seahorse-&seahorse-version;.tar.xz">
+  <!ENTITY seahorse-md5sum        "868aef9d2be3fadd74fb7ca76c44b986">
+  <!ENTITY seahorse-size          "1.6 MB">
   <!ENTITY seahorse-buildsize     "58 MB">
   <!ENTITY seahorse-time          "0.4 SBU">
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -123,5 +124,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -139,8 +140,5 @@
 
   <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
+      <title>Command Explanations</title>
 
       <para>
@@ -151,7 +149,5 @@
       <para>
         <option>-Dldap-support=false</option>: Add this switch if you have not
-        installed openldap. Note that you will have to use the following 'sed'
-        command to fix the build:
-        sed -i "448 s/g_list/if (ssrc) &amp;/" pgp/seahorse-pgp-backend.c
+        installed openldap.
       </para>
 
@@ -189,5 +185,5 @@
           <para>
             is the graphical interface for managing and using
-            encryption keys
+            encryption keys.
           </para>
           <indexterm zone="seahorse seahorse-prog">
Index: gnome/applications/vinagre.xml
===================================================================
--- gnome/applications/vinagre.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/applications/vinagre.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -176,5 +177,5 @@
           <para>
             is a remote desktop viewer for the
-            <application>GNOME</application> Desktop
+            <application>GNOME</application> Desktop.
           </para>
           <indexterm zone="vinagre vinagre-prog">
Index: gnome/gnome.xml
===================================================================
--- gnome/gnome.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/gnome.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <part id="gnome" xreflabel="GNOME">
Index: gnome/platform/dconf.xml
===================================================================
--- gnome/platform/dconf.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/dconf.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,8 +6,8 @@
 
 <!-- DConf -->
-  <!ENTITY dconf-download-http "&gnome-download-http;/dconf/0.40/dconf-&dconf-version;.tar.xz">
-  <!ENTITY dconf-download-ftp  "&gnome-download-ftp;/dconf/0.40/dconf-&dconf-version;.tar.xz">
-  <!ENTITY dconf-md5sum        "ac8db20b0d6b996d4bbbeb96463d01f0">
-  <!ENTITY dconf-size          "115 KB">
+  <!ENTITY dconf-download-http "&gnome-download-http;/dconf/0.38/dconf-&dconf-version;.tar.xz">
+  <!ENTITY dconf-download-ftp  "&gnome-download-ftp;/dconf/0.38/dconf-&dconf-version;.tar.xz">
+  <!ENTITY dconf-md5sum        "716cf730995cf133c2c443556a66a50c">
+  <!ENTITY dconf-size          "116 KB">
   <!ENTITY dconf-buildsize     "7.0 MB (with tests)">
   <!ENTITY dconf-time          "0.1 SBU (with tests)">
@@ -16,6 +16,6 @@
   <!ENTITY dconf-editor-download-http "&gnome-download-http;/dconf-editor/&gnome-minor-38;/dconf-editor-&dconf-editor-version;.tar.xz">
   <!ENTITY dconf-editor-download-ftp  "&gnome-download-ftp;/dconf-editor/&gnome-minor-38;/dconf-editor-&dconf-editor-version;.tar.xz">
-  <!ENTITY dconf-editor-md5sum        "06d64abca0673761cf320145e9977b9c">
-  <!ENTITY dconf-editor-size          "584 KB">
+  <!ENTITY dconf-editor-md5sum        "1e03d07187ef2121d75fadd5f53dc1ef">
+  <!ENTITY dconf-editor-size          "580 KB">
   <!ENTITY dconf-editor-buildsize     "37 MB">
   <!ENTITY dconf-editor-time          "0.2 SBU">
@@ -26,4 +26,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -54,5 +55,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -123,15 +124,4 @@
       </listitem>
     </itemizedlist>
-
-    <!-- Applied in 3.38.3
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch for dconf-editor:
-          <ulink url="&patch-root;/dconf-editor-&dconf-editor-version;-vala_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-    -->
 
     <bridgehead renderas="sect3">DConf Dependencies</bridgehead>
@@ -173,10 +163,4 @@
     -->
 
-    <para revision="sysv">
-      First, prevent unnecessary systemd units from being installed:
-    </para>
-
-<screen revision="sysv"><userinput remap="pre">sed -i 's/install_dir: systemd_userunitdir,//' service/meson.build</userinput></screen>
-
     <para>
       Install <application>DConf</application> by running the following
@@ -187,5 +171,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release -Dbash_completion=false .. &amp;&amp;
+meson --prefix=/usr -Dbash_completion=false .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -211,5 +195,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -225,9 +209,6 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <option>-Dgtk_doc=true</option>: Use this parameter if
+    <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.
@@ -271,5 +252,5 @@
           <para>
             is a simple tool for manipulating the
-            <application>DConf</application> database
+            <application>DConf</application> database.
           </para>
           <indexterm zone="dconf dconf-prog">
@@ -284,5 +265,5 @@
           <para>
             is a graphical program for editing the
-            <application>DConf</application> database
+            <application>DConf</application> database.
           </para>
           <indexterm zone="dconf dconf-editor">
@@ -296,5 +277,5 @@
         <listitem>
           <para>
-            contains the <application>DConf</application> client API functions
+            contains the <application>DConf</application> client API functions.
           </para>
           <indexterm zone="dconf libdconf">
Index: gnome/platform/dummy-desktop.xml
===================================================================
--- gnome/platform/dummy-desktop.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/dummy-desktop.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,4 +6,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: gnome/platform/dummy-platform.xml
===================================================================
--- gnome/platform/dummy-platform.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/dummy-platform.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,4 +6,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: gnome/platform/evolution-data-server.xml
===================================================================
--- gnome/platform/evolution-data-server.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/evolution-data-server.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,11 +6,11 @@
 
   <!ENTITY evolution-data-server-download-http
-           "&gnome-download-http;/evolution-data-server/&gnome-minor-40;/evolution-data-server-&evolution-data-server-version;.tar.xz">
+           "&gnome-download-http;/evolution-data-server/&gnome-minor-38;/evolution-data-server-&evolution-data-server-version;.tar.xz">
   <!ENTITY evolution-data-server-download-ftp
-           "&gnome-download-ftp;/evolution-data-server/&gnome-minor-40;/evolution-data-server-&evolution-data-server-version;.tar.xz">
-  <!ENTITY evolution-data-server-md5sum        "eb47d38b72b64e863f2c960d37be311e">
+           "&gnome-download-ftp;/evolution-data-server/&gnome-minor-38;/evolution-data-server-&evolution-data-server-version;.tar.xz">
+  <!ENTITY evolution-data-server-md5sum        "392438d91772ea9873f77e2a032f55de">
   <!ENTITY evolution-data-server-size          "4.4 MB">
-  <!ENTITY evolution-data-server-buildsize     "215 MB (with tests)">
-  <!ENTITY evolution-data-server-time          "1.2 SBU (using parallelism=4, with tests)">
+  <!ENTITY evolution-data-server-buildsize     "205 MB (with tests)">
+  <!ENTITY evolution-data-server-time          "2.3 SBU (using parallelism=4, with tests)">
 ]>
 
@@ -20,4 +20,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -75,15 +76,5 @@
       </listitem>
     </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/evolution-data-server-&evolution-data-server-version;-cmake_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
+
     <bridgehead renderas="sect3">Evolution Data Server Dependencies</bridgehead>
 
@@ -122,5 +113,11 @@
       a <xref linkend="server-mail"/> (that provides a <command>sendmail</command> command),
       <xref linkend="openldap"/>, and
+      <!--<ulink url="https://gitlab.com/groups/accounts-sso">Accounts-SSO</ulink>,
+      <ulink url="https://github.com/google/google-authenticator/">Google Authenticator</ulink>, and-->
       <ulink url="https://github.com/googlei18n/libphonenumber/">libphonenumber</ulink>
+      <!-- For the above commented entries - I can't seem to find references to
+      these in 3.32.0, so they've been commented.-->
+      <!-- Phone Number support via libphonenumber spotted in 3.34.1, check
+           CMakeLists.txt -->
     </para>
 
@@ -138,15 +135,6 @@
     </para>
 
-<screen role="root"
-        revision="systemd"><userinput remap="pre">rm -fv /usr/lib/systemd/user/evolution-*.service</userinput></screen>
-<!--
-    <para>
-      <phrase revision="sysv">First,</phrase>
-      <phrase revision="systemd">Then,</phrase> fix an issue with
-      cmake-3.20.1:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../evolution-data-server-&evolution-data-server-version;-cmake_fix-1.patch</userinput></screen>
--->
+<screen role="root"><userinput remap="pre">rm -v /usr/lib/systemd/user/evolution-*.service</userinput></screen>
+
     <para>
       Install <application>Evolution Data Server</application> by running
@@ -186,7 +174,5 @@
 
     <para>
-      To test the results, issue: <command>make test</command>. <!--One test,
-      <filename>test-book-client-custom-summary</filename>, is known to
-      fail due to an internal test suite error.-->
+      To test the results, issue: <command>make test</command>.
     </para>
 
@@ -203,5 +189,5 @@
 
     <para>
-      <parameter>-DENABLE_GOOGLE=ON</parameter>: This switch enables
+      <parameter>-DENABLE_GOOGLE=ON</parameter>: This default flag enables
       access to google services via <xref linkend="libgdata"/> and also
       enables the Google Authentication option.
@@ -279,5 +265,5 @@
           <para>
             is the <application>Evolution</application> MIME message
-            handling library
+            handling library.
           </para>
           <indexterm zone="evolution-data-server libcamel-1">
@@ -292,5 +278,5 @@
           <para>
             is the utility library for
-            <application>Evolution Data Server</application> Backends
+            <application>Evolution Data Server</application> Backends.
           </para>
           <indexterm zone="evolution-data-server libebackend-1">
@@ -305,5 +291,5 @@
           <para>
             is the client library for <application>Evolution</application>
-            address books
+            address books.
           </para>
           <indexterm zone="evolution-data-server libebook-1">
@@ -318,5 +304,5 @@
           <para>
             is the client library for <application>Evolution</application>
-            contacts
+            contacts.
           </para>
           <indexterm zone="evolution-data-server libebook-contacts-1">
@@ -331,5 +317,5 @@
           <para>
             is the client library for <application>Evolution</application>
-            calendars
+            calendars.
           </para>
           <indexterm zone="evolution-data-server libecal-1">
@@ -344,5 +330,5 @@
           <para>
             is the backend library for <application>Evolution</application>
-            address books
+            address books.
           </para>
           <indexterm zone="evolution-data-server libedata-book-1">
@@ -357,5 +343,5 @@
           <para>
             is the backend library for <application>Evolution</application>
-            calendars
+            calendars.
           </para>
           <indexterm zone="evolution-data-server libedata-cal-1">
@@ -370,5 +356,5 @@
           <para>
             is the utility library for
-            <application>Evolution Data Server</application>
+            <application>Evolution Data Server</application>.
           </para>
           <indexterm zone="evolution-data-server libedataserver-1">
@@ -383,5 +369,5 @@
           <para>
             is the GUI utility library for
-            <application>Evolution Data Server</application>
+            <application>Evolution Data Server</application>.
           </para>
           <indexterm zone="evolution-data-server libedataserverui-3">
@@ -396,5 +382,5 @@
           <para>
             is the server test utility library for
-            <application>Evolution Data Server</application>
+            <application>Evolution Data Server</application>.
           </para>
           <indexterm zone="evolution-data-server libetestserverutils-1">
Index: gnome/platform/folks.xml
===================================================================
--- gnome/platform/folks.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/folks.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY folks-download-http "&gnome-download-http;/folks/0.15/folks-&folks-version;.tar.xz">
-  <!ENTITY folks-download-ftp  "&gnome-download-ftp;/folks/0.15/folks-&folks-version;.tar.xz">
-  <!ENTITY folks-md5sum        "5835eaea7db9630457b6a1b564efcd09">
-  <!ENTITY folks-size          "480 KB">
-  <!ENTITY folks-buildsize     "22 MB (add 27 MB for tests)">
-  <!ENTITY folks-time          "0.2 SBU (Using parallelism=4, add 0.3 SBU for tests)">
+  <!ENTITY folks-download-http "&gnome-download-http;/folks/0.14/folks-&folks-version;.tar.xz">
+  <!ENTITY folks-download-ftp  "&gnome-download-ftp;/folks/0.14/folks-&folks-version;.tar.xz">
+  <!ENTITY folks-md5sum        "dc852fceab9e84362b675d5ffcd4803e">
+  <!ENTITY folks-size          "512 KB">
+  <!ENTITY folks-buildsize     "50 MB (add 19 MB for tests)">
+  <!ENTITY folks-time          "0.2 SBU (Using parallelism=4, add 1.0 SBU for tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -92,6 +93,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-  <!--<xref linkend="tracker"/> (Broken due to API changes in tracker), -->
-      <ulink url="&gnome-download-http;/libsocialweb/">libsocialweb</ulink> and
+      <xref linkend="tracker"/> (Broken due to API changes in tracker),
+      <ulink url="&gnome-download-http;/libsocialweb/">libsocialweb</ulink>, and
       <ulink url="https://packages.debian.org/jessie/zeitgeist">Zeitgeist</ulink>
     </para>
@@ -113,5 +114,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -152,5 +153,4 @@
     <title>Command Explanations</title>
 
-<!-- Tracker support removed in 0.15.1
     <para>
       <option>-Dtracker_backend=true</option>: This switch enables
@@ -160,5 +160,4 @@
       in Tracker that hasn't been accounted for in this package.
     </para>
--->
 
     <para>
@@ -201,5 +200,5 @@
         <listitem>
           <para>
-            is used to import meta-contact information to libfolks
+            is used to import meta-contact information to libfolks.
           </para>
           <indexterm zone="folks folks-import">
@@ -213,5 +212,5 @@
         <listitem>
           <para>
-            is used to inspect meta-contact information in libfolks
+            is used to inspect meta-contact information in libfolks.
           </para>
           <indexterm zone="folks folks-inspect">
@@ -225,5 +224,5 @@
         <listitem>
           <para>
-            contains Evolution specific implementations of the libfolks classes
+            contains Evolution specific implementations of the libfolks classes.
           </para>
           <indexterm zone="folks libfolks-eds">
@@ -251,5 +250,5 @@
         <listitem>
           <para>
-            contains the <application>Folks</application> API functions
+            contains the <application>Folks</application> API functions.
           </para>
           <indexterm zone="folks libfolks">
@@ -263,5 +262,5 @@
         <listitem>
           <para>
-            contains Telepathy specific implementations of the libfolks classes
+            contains Telepathy specific implementations of the libfolks classes.
           </para>
           <indexterm zone="folks libfolks-telepathy">
Index: gnome/platform/gconf.xml
===================================================================
--- gnome/platform/gconf.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/gconf.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -178,5 +179,5 @@
         <listitem>
           <para>
-            merges an XML filesystem hierarchy
+            merges an XML filesystem hierarchy.
           </para>
           <indexterm zone="GConf gconf-merge-tree">
@@ -191,5 +192,5 @@
           <para>
             is a command line tool used for manipulating the
-            <application>GConf</application> database
+            <application>GConf</application> database.
           </para>
           <indexterm zone="GConf gconftool-2">
@@ -204,5 +205,5 @@
           <para>
             reads values out of the users <application>GConf</application>
-            database and stores them in GSettings
+            database and stores them in GSettings.
           </para>
           <indexterm zone="GConf gsettings-data-convert">
@@ -217,5 +218,5 @@
           <para>
             converts between <application>GConf</application> and GSettings
-            schema file formats
+            schema file formats.
           </para>
           <indexterm zone="GConf gsettings-schemas-convert">
@@ -230,5 +231,5 @@
           <para>
             provides the functions necessary to maintain the
-            configuration database
+            configuration database.
           </para>
           <indexterm zone="GConf libgconf-2">
Index: gnome/platform/gcr.xml
===================================================================
--- gnome/platform/gcr.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/gcr.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,8 +5,8 @@
   %general-entities;
 
-  <!ENTITY gcr-download-http "&gnome-download-http;/gcr/&gnome-minor-40;/gcr-&gcr-version;.tar.xz">
-  <!ENTITY gcr-download-ftp  "&gnome-download-ftp;/gcr/&gnome-minor-40;/gcr-&gcr-version;.tar.xz">
-  <!ENTITY gcr-md5sum        "fa34048b5562f80587a71d11931a7c29">
-  <!ENTITY gcr-size          "998 KB">
+  <!ENTITY gcr-download-http "&gnome-download-http;/gcr/&gnome-minor-38;/gcr-&gcr-version;.tar.xz">
+  <!ENTITY gcr-download-ftp  "&gnome-download-ftp;/gcr/&gnome-minor-38;/gcr-&gcr-version;.tar.xz">
+  <!ENTITY gcr-md5sum        "0748cfa7ed7b9ea36bea047353f3fa00">
+  <!ENTITY gcr-size          "1.0 MB">
   <!ENTITY gcr-buildsize     "39 MB (with tests)">
   <!ENTITY gcr-time          "0.4 SBU (with tests)">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -104,5 +105,4 @@
     <title>Installation of Gcr</title>
 
-    <!--
     <caution>
       <para>
@@ -112,5 +112,4 @@
       </para>
     </caution>
-    -->
 
     <para>
@@ -121,12 +120,8 @@
 <screen><userinput>sed -i 's:"/desktop:"/org:' schema/*.xml &amp;&amp;
 
-sed -e '208 s/@BASENAME@/gcr-viewer.desktop/'   \
-    -e '231 s/@BASENAME@/gcr-prompter.desktop/' \
-    -i ui/meson.build                           &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson --prefix=/usr --buildtype=release -Dgtk_doc=false .. &amp;&amp;
+mkdir gcr-build &amp;&amp;
+cd    gcr-build &amp;&amp;
+
+meson --prefix=/usr -Dgtk_doc=false .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -147,15 +142,7 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
     <para>
       <command>sed ... schema/*.xml</command>:  This command fixes a
       deprecated entry in the schema template.
-    </para>
-
-    <para>
-      <command>sed ... ui/meson.build</command>:  This command fixes a
-      problem when building with meson-0.59.0.
     </para>
 
@@ -172,5 +159,5 @@
       haven't installed <xref linkend="gtk3"/>. Note that
       <application>gcr-viewer</application> will not be installed
-      if this is passed to meson.
+      if this is passed to configure.
     </para>
 
@@ -218,5 +205,5 @@
         <listitem>
           <para>
-            is used to view certificates and key files
+            is used to view certificates and key files.
           </para>
           <indexterm zone="gcr gcr-viewer">
@@ -230,5 +217,5 @@
         <listitem>
           <para>
-            contains GObject bindings for PKCS#11
+            contains GObject bindings for PKCS#11.
           </para>
           <indexterm zone="gcr libgck-1">
Index: gnome/platform/gdm.xml
===================================================================
--- gnome/platform/gdm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/gdm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY gdm-download-http "&gnome-download-http;/gdm/&gnome-40;/gdm-&gdm-version;.tar.xz">
-  <!ENTITY gdm-download-ftp  "&gnome-download-ftp;/gdm/&gnome-40;/gdm-&gdm-version;.tar.xz">
-  <!ENTITY gdm-md5sum        "fa32fee88d242ebf5d1c2fb69e74457e">
-  <!ENTITY gdm-size          "788 KB">
-  <!ENTITY gdm-buildsize     "36 MB">
-  <!ENTITY gdm-time          "0.1 SBU">
+  <!ENTITY gdm-download-http "&gnome-download-http;/gdm/&gnome-minor-38;/gdm-&gdm-version;.tar.xz">
+  <!ENTITY gdm-download-ftp  "&gnome-download-ftp;/gdm/&gnome-minor-38;/gdm-&gdm-version;.tar.xz">
+  <!ENTITY gdm-md5sum        "ddc782eaf0b0345ee34fb396f67bd44d">
+  <!ENTITY gdm-size          "772 KB">
+  <!ENTITY gdm-buildsize     "35 MB">
+  <!ENTITY gdm-time          "0.2 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -144,6 +145,7 @@
 
 meson --prefix=/usr               \
-      --buildtype=release         \
+      -Dplymouth=disabled         \
       -Dgdm-xsession=true         \
+      -Dpam-mod-dir=/lib/security \
       -Dsystemd-journal=false     \
       -Dsystemdsystemunitdir=/tmp \
@@ -155,6 +157,7 @@
 
 meson --prefix=/usr               \
-      --buildtype=release         \
-      -Dgdm-xsession=true ..      &amp;&amp;
+      -Dplymouth=disabled         \
+      -Dgdm-xsession=true         \
+      -Dpam-mod-dir=/lib/security .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -176,7 +179,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -184,4 +184,9 @@
       to make <application>GDM</application> start on VT7
       instead of the first free VT.
+    </para>
+
+    <para>
+      <parameter>-Dplymouth=disabled</parameter>: GDM now explicitly requires 
+      plymouth to be installed. Use this switch to disable this dependency.
     </para>
 
@@ -322,5 +327,5 @@
         <listitem>
           <para>
-            is a login prompt for <application>GNOME</application>
+            is a login prompt for <application>GNOME</application>.
           </para>
           <indexterm zone="gdm gdm-prog">
@@ -334,5 +339,5 @@
         <listitem>
           <para>
-            is a screenshot tool for <application>GDM</application>
+            is a screenshot tool for <application>GDM</application>.
           </para>
           <indexterm zone="gdm gdm-screenshot">
Index: gnome/platform/geocode-glib.xml
===================================================================
--- gnome/platform/geocode-glib.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/geocode-glib.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -107,5 +108,5 @@
     <screen><userinput>mkdir build                                   &amp;&amp;
 cd    build                                   &amp;&amp;
-meson --prefix /usr --buildtype=release -Denable-gtk-doc=false .. &amp;&amp;
+meson --prefix /usr -Denable-gtk-doc=false .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -126,7 +127,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -171,5 +169,5 @@
         <listitem>
           <para>
-            contains the <application>Geocode GLib</application> API functions
+            contains the <application>Geocode GLib</application> API functions.
           </para>
           <indexterm zone="geocode-glib libgeocode-glib">
Index: gnome/platform/gexiv2.xml
===================================================================
--- gnome/platform/gexiv2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/gexiv2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,7 +8,7 @@
   <!ENTITY gexiv2-download-http "&gnome-download-http;/gexiv2/0.12/gexiv2-&gexiv2-version;.tar.xz">
   <!ENTITY gexiv2-download-ftp  "&gnome-download-ftp;/gexiv2/0.12/gexiv2-&gexiv2-version;.tar.xz">
-  <!ENTITY gexiv2-md5sum        "9667fc1b35e79834191262f4aec17b72">
-  <!ENTITY gexiv2-size          "372 KB">
-  <!ENTITY gexiv2-buildsize     "3.7 MB">
+  <!ENTITY gexiv2-md5sum        "44a3cfeab1afd83a71e852835d24e656">
+  <!ENTITY gexiv2-size          "364 KB">
+  <!ENTITY gexiv2-buildsize     "5.3 MB">
   <!ENTITY gexiv2-time          "0.1 SBU">
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -104,5 +105,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -118,13 +119,16 @@
 
   </sect2>
-
+<!--
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
+    <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>
-
+-->
   <sect2 role="content">
     <title>Contents</title>
Index: gnome/platform/gfbgraph.xml
===================================================================
--- gnome/platform/gfbgraph.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/gfbgraph.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -159,5 +160,5 @@
         <listitem>
           <para>
-            is a GObject wrapper for the Facebook Graph API
+            is a GObject wrapper for the Facebook Graph API.
           </para>
           <indexterm zone="gfbgraph libgfbgraph-0.2">
Index: gnome/platform/gjs.xml
===================================================================
--- gnome/platform/gjs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/gjs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY gjs-download-http "&gnome-download-http;/gjs/1.68/gjs-&gjs-version;.tar.xz">
-  <!ENTITY gjs-download-ftp  "&gnome-download-ftp;/gjs/1.68/gjs-&gjs-version;.tar.xz">
-  <!ENTITY gjs-md5sum        "031e5a1c3712d43d7130d4b3e11d5bbc">
-  <!ENTITY gjs-size          "548 KB">
-  <!ENTITY gjs-buildsize     "27 MB (with tests)">
-  <!ENTITY gjs-time          "0.9 SBU (with tests)">
+  <!ENTITY gjs-download-http "&gnome-download-http;/gjs/1.66/gjs-&gjs-version;.tar.xz">
+  <!ENTITY gjs-download-ftp  "&gnome-download-ftp;/gjs/1.66/gjs-&gjs-version;.tar.xz">
+  <!ENTITY gjs-md5sum        "82c3b0273f64859e776e52545b5f0b10">
+  <!ENTITY gjs-size          "432 KB">
+  <!ENTITY gjs-buildsize     "76 MB (with tests)">
+  <!ENTITY gjs-time          "0.8 SBU (with tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -82,6 +83,5 @@
     <bridgehead renderas="sect4">Recommended (required for GNOME)</bridgehead>
     <para role="recommended">
-      <xref linkend="gtk3"/> and
-      <xref linkend="gtk4"/>
+      <xref linkend="gtk3"/>
     </para>
 
@@ -91,4 +91,5 @@
       <xref linkend="valgrind"/> (for tests),
       <ulink url="http://dtrace.org/blogs/about">DTrace</ulink>,
+      <ulink url="https://wiki.gnome.org/Projects/GTK/Roadmap/GTK4">GTK+-4</ulink>,
       <ulink url="http://ltp.sourceforge.net/coverage/lcov.php">LCOV</ulink>, and
       <ulink url="https://sourceware.org/systemtap">Systemtap</ulink>
@@ -125,5 +126,5 @@
 cd    gjs-build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -131,7 +132,10 @@
       To test the results, issue: <command>ninja test</command>. The
       <application>GTK</application> and <application>Cairo</application>
-      tests will fail if not running in an Xorg session. The
-      <filename>gjs:JS / Gtk4</filename> test is known to exit with an ERROR
-      on some systems.
+      tests will fail if not running in an Xorg session. <!--Additionally, four
+      tests are currently known to fail:
+      <filename>gjs:C / API tests</filename>,
+      <filename>gjs:JS / GIMarshalling</filename>,
+      <filename>gjs:JS / Regress</filename>, and
+      <filename>gjs:JS / Gtk3</filename>.-->
     </para>
 
@@ -142,12 +146,4 @@
 <screen role="root"><userinput>ninja install &amp;&amp;
 ln -sfv gjs-console /usr/bin/gjs</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
   </sect2>
@@ -188,5 +184,5 @@
           <para>
             contains a console to run <application>JavaScript</application>
-            commands
+            commands.
           </para>
           <indexterm zone="gjs gjs-console">
@@ -200,5 +196,5 @@
         <listitem>
           <para>
-            contains the <application>GNOME</application> JavaScript bindings
+            contains the <application>GNOME</application> JavaScript bindings.
           </para>
           <indexterm zone="gjs libgjs">
Index: gnome/platform/gnome-autoar.xml
===================================================================
--- gnome/platform/gnome-autoar.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/gnome-autoar.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY gnome-autoar-download-http "&gnome-download-http;/gnome-autoar/0.4/gnome-autoar-&gnome-autoar-version;.tar.xz">
-  <!ENTITY gnome-autoar-download-ftp  "&gnome-download-ftp;/gnome-autoar/0.4/gnome-autoar-&gnome-autoar-version;.tar.xz">
-  <!ENTITY gnome-autoar-md5sum        "bef689989c88e3f0712dd4cf1edeac8c">
-  <!ENTITY gnome-autoar-size          "52 KB">
-  <!ENTITY gnome-autoar-buildsize     "2.8 MB">
-  <!ENTITY gnome-autoar-time          "less than 0.1 SBU">
+  <!ENTITY gnome-autoar-download-http "&gnome-download-http;/gnome-autoar/0.2/gnome-autoar-&gnome-autoar-version;.tar.xz">
+  <!ENTITY gnome-autoar-download-ftp  "&gnome-download-ftp;/gnome-autoar/0.2/gnome-autoar-&gnome-autoar-version;.tar.xz">
+  <!ENTITY gnome-autoar-md5sum        "36ab263f477eeee3c95c9381766eb3c2">
+  <!ENTITY gnome-autoar-size          "292 KB">
+  <!ENTITY gnome-autoar-buildsize     "5.1 MB">
+  <!ENTITY gnome-autoar-time          "0.1 SBU">
 ]>
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -101,12 +102,9 @@
     </para>
 
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson --prefix=/usr --buildtype=release -Dvapi=true -Dtests=true &amp;&amp;
-ninja</userinput></screen>
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
 
     <para>
-       To test the results, issue: <command>ninja test</command>
+      This package does not come with a test suite.
     </para>
 
@@ -115,5 +113,5 @@
     </para>
 
-<screen role="root"><userinput>ninja install</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
@@ -122,12 +120,4 @@
     <title>Command Explanations</title>
 
-    <!--
-    <para>
-      <parameter>- -disable-debug</parameter>: Disable the debug mode,
-      in which this package would be built with <option>-O0 -g</option>.
-    </para>
-    -->
-
-    <!--
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
@@ -135,13 +125,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
-    -->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <option>-Dgtk_doc=true</option>: Use this parameter if GTK-Doc is
-      installed and you wish to rebuild and install the API documentation.
-    </para>
 
   </sect2>
@@ -177,5 +158,5 @@
         <listitem>
           <para>
-            provides API functions for automatic archive management
+            provides API functions for automatic archive management.
           </para>
           <indexterm zone="gnome-autoar libgnome-autoar-0">
@@ -189,5 +170,5 @@
          <listitem>
            <para>
-             provides GTK+ widgets to aid in automatic archive management
+             provides GTK+ widgets to aid in automatic archive management.
            </para>
            <indexterm zone="gnome-autoar libgnome-autoar-gtk-0">
@@ -198,4 +179,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: gnome/platform/gnome-backgrounds.xml
===================================================================
--- gnome/platform/gnome-backgrounds.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/gnome-backgrounds.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-backgrounds-download-http
-           "&gnome-download-http;/gnome-backgrounds/&gnome-40;/gnome-backgrounds-&gnome-backgrounds-version;.tar.xz">
+           "&gnome-download-http;/gnome-backgrounds/&gnome-minor-38;/gnome-backgrounds-&gnome-backgrounds-version;.tar.xz">
   <!ENTITY gnome-backgrounds-download-ftp
-           "&gnome-download-ftp;/gnome-backgrounds/&gnome-40;/gnome-backgrounds-&gnome-backgrounds-version;.tar.xz">
-  <!ENTITY gnome-backgrounds-md5sum        "1d0a89993d466806b81c267aede098e4">
-  <!ENTITY gnome-backgrounds-size          "48 MB">
-  <!ENTITY gnome-backgrounds-buildsize     "97 MB">
+           "&gnome-download-ftp;/gnome-backgrounds/&gnome-minor-38;/gnome-backgrounds-&gnome-backgrounds-version;.tar.xz">
+  <!ENTITY gnome-backgrounds-md5sum        "822d5ca042f5143903bee7711ceaaa92">
+  <!ENTITY gnome-backgrounds-size          "39 MB">
+  <!ENTITY gnome-backgrounds-buildsize     "81 MB">
   <!ENTITY gnome-backgrounds-time          "less than 0.1 SBU">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -138,5 +139,5 @@
           <para>
             are background images for the
-            <application>GNOME</application> Desktop
+            <application>GNOME</application> Desktop.
           </para>
         </listitem>
Index: gnome/platform/gnome-bluetooth.xml
===================================================================
--- gnome/platform/gnome-bluetooth.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/gnome-bluetooth.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -9,5 +9,5 @@
   <!ENTITY gnome-bluetooth-download-ftp
            "&gnome-download-ftp;/gnome-bluetooth/&gnome-minor-34;/gnome-bluetooth-&gnome-bluetooth-version;.tar.xz">
-  <!ENTITY gnome-bluetooth-md5sum        "d83faa54abaf64bb40b5313bc233e74e">
+  <!ENTITY gnome-bluetooth-md5sum        "c82f7df6a411c897d4d59337d5d9a789">
   <!ENTITY gnome-bluetooth-size          "348 KB">
   <!ENTITY gnome-bluetooth-buildsize     "17 MB">
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -90,6 +91,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="python-dbusmock"/>
+      <xref linkend="gtk-doc"/>
     </para>
 
@@ -111,5 +111,5 @@
     <para>
       Install <application>GNOME Bluetooth</application> by running the
-      following commands:
+      following  commands:
     </para>
 
@@ -117,9 +117,9 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
     <para>
-      To test the results, issue: <command>ninja test</command>.
+      This package does not come with a test suite.
     </para>
 
@@ -130,11 +130,4 @@
 <screen role="root"><userinput>ninja install</userinput></screen>
 
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
   </sect2>
 
@@ -173,5 +166,5 @@
           <para>
             is a <application>GTK+</application> application for transferring
-            files over Bluetooth
+            files over Bluetooth.
           </para>
           <indexterm zone="gnome-bluetooth bluetooth-sendto">
@@ -186,5 +179,5 @@
           <para>
             contains the <application>GNOME Bluetooth</application> API
-            functions
+            functions.
           </para>
           <indexterm zone="gnome-bluetooth libgnome-bluetooth">
Index: gnome/platform/gnome-control-center.xml
===================================================================
--- gnome/platform/gnome-control-center.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/gnome-control-center.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-control-center-download-http
-           "&gnome-download-http;/gnome-control-center/&gnome-40;/gnome-control-center-&gnome-control-center-version;.tar.xz">
+           "&gnome-download-http;/gnome-control-center/&gnome-minor-38;/gnome-control-center-&gnome-control-center-version;.tar.xz">
   <!ENTITY gnome-control-center-download-ftp
-           "&gnome-download-ftp;/gnome-control-center/&gnome-40;/gnome-control-center-&gnome-control-center-version;.tar.xz">
-  <!ENTITY gnome-control-center-md5sum        "d704e59afe2df9c24ed876841adb3e0a">
-  <!ENTITY gnome-control-center-size          "6.2 MB">
-  <!ENTITY gnome-control-center-buildsize     "187 MB (with tests)">
-  <!ENTITY gnome-control-center-time          "0.4 SBU (Using parallelism=4; with tests)">
+           "&gnome-download-ftp;/gnome-control-center/&gnome-minor-38;/gnome-control-center-&gnome-control-center-version;.tar.xz">
+  <!ENTITY gnome-control-center-md5sum        "f25b2afb9a0f3ef6bbca30718b785488">
+  <!ENTITY gnome-control-center-size          "6.1 MB">
+  <!ENTITY gnome-control-center-buildsize     "182 MB (with tests)">
+  <!ENTITY gnome-control-center-time          "0.5 SBU (Using parallelism=4; with tests)">
 ]>
 
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -145,5 +146,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -164,7 +165,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -213,5 +211,5 @@
           <para>
             is a graphical user interface used to configure various
-            aspects of <application>GNOME</application>
+            aspects of <application>GNOME</application>.
           </para>
           <indexterm zone="gnome-control-center gnome-control-center-prog">
Index: gnome/platform/gnome-desktop.xml
===================================================================
--- gnome/platform/gnome-desktop.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/gnome-desktop.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-desktop-download-http
-           "&gnome-download-http;/gnome-desktop/&gnome-40;/gnome-desktop-&gnome-desktop-version;.tar.xz">
+           "&gnome-download-http;/gnome-desktop/&gnome-minor-38;/gnome-desktop-&gnome-desktop-version;.tar.xz">
   <!ENTITY gnome-desktop-download-ftp
-           "&gnome-download-ftp;/gnome-desktop/&gnome-40;/gnome-desktop-&gnome-desktop-version;.tar.xz">
-  <!ENTITY gnome-desktop-md5sum        "d4b0b08b41560a4ef68bae91c3a8b781">
-  <!ENTITY gnome-desktop-size          "708 KB">
-  <!ENTITY gnome-desktop-buildsize     "18 MB">
+           "&gnome-download-ftp;/gnome-desktop/&gnome-minor-38;/gnome-desktop-&gnome-desktop-version;.tar.xz">
+  <!ENTITY gnome-desktop-md5sum        "ea19b13b4ce8919f0b806543f0c75cf0">
+  <!ENTITY gnome-desktop-size          "728 KB">
+  <!ENTITY gnome-desktop-buildsize     "20 MB">
   <!ENTITY gnome-desktop-time          "0.2 SBU (Using parallelism=4)">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -111,8 +112,7 @@
 
 <screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
+cd build &amp;&amp;
 
 meson --prefix=/usr                 \
-      --buildtype=release           \
       -Dgnome_distributor="BLFS" .. &amp;&amp;
 ninja</userinput></screen>
@@ -146,7 +146,4 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
     <para>
       <option>-Dgnome_distributor="Some Name"</option>: Use this
@@ -184,5 +181,4 @@
         <seg>
           /usr/include/gnome-desktop-3.0,
-          /usr/libexec/gnome-desktop-debug,
           /usr/share/gnome,
           /usr/share/gtk-doc/html/gnome-desktop3, and
@@ -202,5 +198,5 @@
           <para>
             contains functions shared by several <application>GNOME</application>
-            applications
+            applications.
           </para>
           <indexterm zone="gnome-desktop libgnome-desktop-3">
Index: gnome/platform/gnome-keyring.xml
===================================================================
--- gnome/platform/gnome-keyring.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/gnome-keyring.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-keyring-download-http
-           "&gnome-download-http;/gnome-keyring/&gnome-40;/gnome-keyring-&gnome-keyring-version;.tar.xz">
+           "&gnome-download-http;/gnome-keyring/&gnome-minor-36;/gnome-keyring-&gnome-keyring-version;.tar.xz">
   <!ENTITY gnome-keyring-download-ftp
-           "&gnome-download-ftp;/gnome-keyring/&gnome-40;/gnome-keyring-&gnome-keyring-version;.tar.xz">
-  <!ENTITY gnome-keyring-md5sum        "f404b61683a0ff54fb264b337772cff2">
+           "&gnome-download-ftp;/gnome-keyring/&gnome-minor-36;/gnome-keyring-&gnome-keyring-version;.tar.xz">
+  <!ENTITY gnome-keyring-md5sum        "38f0732845a510a8dff4f154c3406f65">
   <!ENTITY gnome-keyring-size          "1.3 MB">
-  <!ENTITY gnome-keyring-buildsize     "155 MB">
-  <!ENTITY gnome-keyring-time          "0.2 SBU (Using parallelism=4; add 0.3 SBU for tests)">
+  <!ENTITY gnome-keyring-buildsize     "164 MB">
+  <!ENTITY gnome-keyring-time          "0.3 SBU (Using parallelism=4; add 0.3 SBU for tests)">
 ]>
 
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -111,5 +112,6 @@
 
 ./configure --prefix=/usr     \
-            --sysconfdir=/etc &amp;&amp;
+            --sysconfdir=/etc \
+            --with-pam-dir=/lib/security &amp;&amp;
 make</userinput></screen>
 
@@ -135,10 +137,8 @@
     </para>
 
-    <!-- FIXME: Removed with usr-merge
     <para>
-      <parameter>- -with-pam-dir=/lib/security</parameter>: This switch
+      <parameter>--with-pam-dir=/lib/security</parameter>: This switch
       specifies where the PAM module will be installed.
     </para>
-    -->
 
   </sect2>
@@ -176,5 +176,5 @@
         <listitem>
           <para>
-            is a session daemon that keeps passwords for users
+            is a session daemon that keeps passwords for users.
           </para>
           <indexterm zone="gnome-keyring gnome-keyring-daemon">
Index: gnome/platform/gnome-menus.xml
===================================================================
--- gnome/platform/gnome-menus.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/gnome-menus.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -174,5 +175,5 @@
             contains functions required to support
             <application>GNOME</application>'s implementation of the
-            Desktop Menu Specification
+            Desktop Menu Specification.
           </para>
           <indexterm zone="gnome-menus libgnome-menu-3">
Index: gnome/platform/gnome-online-accounts.xml
===================================================================
--- gnome/platform/gnome-online-accounts.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/gnome-online-accounts.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-online-accounts-download-http
-           "&gnome-download-http;/gnome-online-accounts/&gnome-minor-40;/gnome-online-accounts-&gnome-online-accounts-version;.tar.xz">
+           "&gnome-download-http;/gnome-online-accounts/&gnome-minor-38;/gnome-online-accounts-&gnome-online-accounts-version;.tar.xz">
   <!ENTITY gnome-online-accounts-download-ftp
-           "&gnome-download-ftp;/gnome-online-accounts/&gnome-minor-40;/gnome-online-accounts-&gnome-online-accounts-version;.tar.xz">
-  <!ENTITY gnome-online-accounts-md5sum        "fcfa7f4b37c5d63a5c5dea28840279f3">
-  <!ENTITY gnome-online-accounts-size          "844 KB">
-  <!ENTITY gnome-online-accounts-buildsize     "28 MB">
+           "&gnome-download-ftp;/gnome-online-accounts/&gnome-minor-38;/gnome-online-accounts-&gnome-online-accounts-version;.tar.xz">
+  <!ENTITY gnome-online-accounts-md5sum        "fa62ae47bfe3b78a72db5d414b8de4d8">
+  <!ENTITY gnome-online-accounts-size          "840 KB">
+  <!ENTITY gnome-online-accounts-buildsize     "36 MB">
   <!ENTITY gnome-online-accounts-time          "0.4 SBU">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -198,5 +199,5 @@
         <listitem>
           <para>
-            is the <application>GNOME Online Accounts</application> Daemon
+            is the <application>GNOME Online Accounts</application> Daemon.
           </para>
           <indexterm zone="gnome-online-accounts goa-daemon">
@@ -211,5 +212,5 @@
           <para>
             contains the <application>GNOME Online Accounts</application>
-            API functions
+            API functions.
           </para>
           <indexterm zone="gnome-online-accounts libgoa-1">
@@ -224,5 +225,5 @@
           <para>
             contains functions used by <application>GNOME Online Accounts</application>
-            backends
+            backends.
           </para>
           <indexterm zone="gnome-online-accounts libgoa-backend-1.0">
Index: gnome/platform/gnome-session.xml
===================================================================
--- gnome/platform/gnome-session.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/gnome-session.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,8 +6,8 @@
 
   <!ENTITY gnome-session-download-http
-           "&gnome-download-http;/gnome-session/&gnome-40;/gnome-session-&gnome-session-version;.tar.xz">
+           "&gnome-download-http;/gnome-session/&gnome-minor-38;/gnome-session-&gnome-session-version;.tar.xz">
   <!ENTITY gnome-session-download-ftp
-           "&gnome-download-ftp;/gnome-session/&gnome-40;/gnome-session-&gnome-session-version;.tar.xz">
-  <!ENTITY gnome-session-md5sum        "4fe52c247137b0c9329ca4ddfe9f0070">
+           "&gnome-download-ftp;/gnome-session/&gnome-minor-38;/gnome-session-&gnome-session-version;.tar.xz">
+  <!ENTITY gnome-session-md5sum        "736024b46e2542b9b68adaa43f754f49">
   <!ENTITY gnome-session-size          "472 KB">
   <!ENTITY gnome-session-buildsize     "15 MB">
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -113,11 +114,9 @@
 <screen><userinput>sed 's@/bin/sh@/bin/sh -l@' -i gnome-session/gnome-session.in</userinput></screen>
 
-<!-- Not needed with 40.1.1
     <para revision="systemd">
       Adapt gnome-session to changes in systemd-247:
     </para>
 
-<screen revision="systemd"><userinput remap="pre">echo 'Slice=-.slice' >> data/gnome-session-restart-dbus.service.in</userinput></screen>
--->
+<screen revision="systemd"><userinput remap="pre">echo 'Slice=.slice' >> data/gnome-session-restart-dbus.service.in</userinput></screen>
 
     <para revision="sysv">
@@ -136,5 +135,4 @@
 
 meson --prefix=/usr           \
-      --buildtype=release     \
       -Dsystemd_journal=false \
       .. &amp;&amp;
@@ -144,5 +142,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -159,10 +157,4 @@
      that causes error messages to flood stdin. -->
 
-    <para>
-      Move the documentation to a versioned directory:
-    </para>
-
-<screen role="root"><userinput>mv -v /usr/share/doc/gnome-session{,-&gnome-session-version;}</userinput></screen>
-
     <para revision="sysv">
       Now, as the <systemitem class="username">root</systemitem> user,
@@ -173,11 +165,4 @@
 
   </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-   </sect2>
 
   <sect2 role="content">
@@ -214,5 +199,5 @@
           <para>
             is used to start up the <application>GNOME</application>
-            Desktop environment
+            Desktop environment.
           </para>
           <indexterm zone="gnome-session gnome-session-prog">
@@ -227,5 +212,5 @@
           <para>
             is used to inhibit certain <application>GNOME</application>
-            Session functionality while executing the given command
+            Session functionality while executing the given command.
           </para>
           <indexterm zone="gnome-session gnome-session-inhibit">
@@ -239,5 +224,5 @@
         <listitem>
           <para>
-            is used to end the <application>GNOME</application> Session
+            is used to end the <application>GNOME</application> Session.
           </para>
           <indexterm zone="gnome-session gnome-session-quit">
Index: gnome/platform/gnome-settings-daemon.xml
===================================================================
--- gnome/platform/gnome-settings-daemon.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/gnome-settings-daemon.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-settings-daemon-download-http
-           "&gnome-download-http;/gnome-settings-daemon/&gnome-40;/gnome-settings-daemon-&gnome-settings-daemon-version;.tar.xz">
+           "&gnome-download-http;/gnome-settings-daemon/&gnome-minor-38;/gnome-settings-daemon-&gnome-settings-daemon-version;.tar.xz">
   <!ENTITY gnome-settings-daemon-download-ftp
-           "&gnome-download-ftp;/gnome-settings-daemon/&gnome-40;/gnome-settings-daemon-&gnome-settings-daemon-version;.tar.xz">
-  <!ENTITY gnome-settings-daemon-md5sum        "b5cbe98f5d5fe430e402048d5817f875">
+           "&gnome-download-ftp;/gnome-settings-daemon/&gnome-minor-38;/gnome-settings-daemon-&gnome-settings-daemon-version;.tar.xz">
+  <!ENTITY gnome-settings-daemon-md5sum        "ac40a03be99379de432b822c0001904e">
   <!ENTITY gnome-settings-daemon-size          "1.4 MB">
-  <!ENTITY gnome-settings-daemon-buildsize     "29 MB">
-  <!ENTITY gnome-settings-daemon-time          "0.1 SBU (Using parallelism=4)">
+  <!ENTITY gnome-settings-daemon-buildsize     "46 MB">
+  <!ENTITY gnome-settings-daemon-time          "1.1 SBU (Using parallelism=4)">
 ]>
 
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -77,5 +78,4 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="alsa-lib"/>,
       <xref linkend="colord"/>,
       <xref linkend="fontconfig"/>,
@@ -146,5 +146,5 @@
     </para>
 
-<screen revision="sysv"><userinput>sed -e 's/(backlight->logind_proxy)/(0)/' \
+<screen revision="sysv"><userinput>sed -i 's/(backlight->logind_proxy)/(0)/' \
     -i plugins/power/gsd-backlight.c</userinput></screen>
 
@@ -163,5 +163,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release -Dsystemd=false .. &amp;&amp;
+meson --prefix=/usr -Dsystemd=false .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -169,5 +169,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -191,12 +191,4 @@
 
 <screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
   </sect2>
@@ -218,7 +210,6 @@
         </seg>
         <seg>
-          /etc/xdg/Xwayland-session.d,
-          /usr/include/gnome-settings-daemon-40,
-          /usr/lib/gnome-settings-daemon-40, and
+          /usr/include/gnome-settings-daemon-3.0,
+          /usr/lib/gnome-settings-daemon-3.0, and
           /usr/share/gnome-settings-daemon
         </seg>
Index: gnome/platform/gnome-shell-extensions.xml
===================================================================
--- gnome/platform/gnome-shell-extensions.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/gnome-shell-extensions.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,9 +6,9 @@
 
   <!ENTITY gnome-shell-extensions-download-http
-           "&gnome-download-http;/gnome-shell-extensions/&gnome-40;/gnome-shell-extensions-&gnome-shell-extensions-version;.tar.xz">
+           "&gnome-download-http;/gnome-shell-extensions/&gnome-minor-38;/gnome-shell-extensions-&gnome-shell-extensions-version;.tar.xz">
   <!ENTITY gnome-shell-extensions-download-ftp
-           "&gnome-download-ftp;/gnome-shell-extensions/&gnome-40;/gnome-shell-extensions-&gnome-shell-extensions-version;.tar.xz">
-  <!ENTITY gnome-shell-extensions-md5sum        "25a9bd6a27a0fb34f31e256e842058ca">
-  <!ENTITY gnome-shell-extensions-size          "216 KB">
+           "&gnome-download-ftp;/gnome-shell-extensions/&gnome-minor-38;/gnome-shell-extensions-&gnome-shell-extensions-version;.tar.xz">
+  <!ENTITY gnome-shell-extensions-md5sum        "527017400c2a22748f97f0603f070dda">
+  <!ENTITY gnome-shell-extensions-size          "208 KB">
   <!ENTITY gnome-shell-extensions-buildsize     "4.4 MB">
   <!ENTITY gnome-shell-extensions-time          "less than 0.1 SBU">
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -93,15 +94,4 @@
     <title>Installation of GNOME Shell Extensions</title>
 
-    <!-- https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/issues/302
-    <warning>
-      <para>
-        If you have the windowsNavigator extension enabled and you are upgrading
-        from a previous version of GNOME, disable it before continuing.
-        This extension is known to cause the Overview menu to lockup after
-        an application is opened.
-      </para>
-    </warning>
-    -->
-
     <para>
       Install <application>GNOME Shell Extensions</application> by running the
Index: gnome/platform/gnome-shell.xml
===================================================================
--- gnome/platform/gnome-shell.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/gnome-shell.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-shell-download-http
-           "&gnome-download-http;/gnome-shell/&gnome-40;/gnome-shell-&gnome-shell-version;.tar.xz">
+           "&gnome-download-http;/gnome-shell/&gnome-minor-38;/gnome-shell-&gnome-shell-version;.tar.xz">
   <!ENTITY gnome-shell-download-ftp
-           "&gnome-download-ftp;/gnome-shell/&gnome-40;/gnome-shell-&gnome-shell-version;.tar.xz">
-  <!ENTITY gnome-shell-md5sum        "079b731cafd4db458b5d357c9a6ae697">
-  <!ENTITY gnome-shell-size          "1.8 MB">
-  <!ENTITY gnome-shell-buildsize     "69 MB (including tests)">
+           "&gnome-download-ftp;/gnome-shell/&gnome-minor-38;/gnome-shell-&gnome-shell-version;.tar.xz">
+  <!ENTITY gnome-shell-md5sum        "069511072eedd1934b762320467c0ab7">
+  <!ENTITY gnome-shell-size          "1.7 MB">
+  <!ENTITY gnome-shell-buildsize     "72 MB (including tests)">
   <!ENTITY gnome-shell-time          "0.2 SBU (Using parallelism=4, with tests)">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -71,16 +72,4 @@
       </listitem>
     </itemizedlist>
-
-    <!--
-    <bridgehead renderas="sect3" revision="sysv">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact" revision="sysv">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/gnome-shell-&gnome-shell-version;-fix_xwayland-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-    -->
 
     <bridgehead renderas="sect3">GNOME Shell Dependencies</bridgehead>
@@ -92,5 +81,4 @@
       <xref linkend="gnome-autoar"/>,
       <xref linkend="gnome-control-center"/>,
-      <xref linkend="gtk4"/>,
       <xref linkend="mutter"/>,
       <xref linkend="sassc"/>,
@@ -147,5 +135,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release -Dsystemd=false .. &amp;&amp;
+meson --prefix=/usr -Dsystemd=false .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -153,5 +141,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -172,12 +160,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para revision="sysv">
-      <command>patch ...</command>: This patch fixes a bug when trying to
-      start an xwayland application on non systemd.
-    </para>
 
     <para revision="sysv">
@@ -230,5 +210,5 @@
           <para>
             provides the core user interface functions for the
-            <application>GNOME</application> 3 Desktop
+            <application>GNOME</application> 3 Desktop.
           </para>
           <indexterm zone="gnome-shell gnome-shell-prog">
Index: gnome/platform/gnome-user-docs.xml
===================================================================
--- gnome/platform/gnome-user-docs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/gnome-user-docs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-user-docs-download-http
-           "&gnome-download-http;/gnome-user-docs/&gnome-40;/gnome-user-docs-&gnome-user-docs-version;.tar.xz">
+           "&gnome-download-http;/gnome-user-docs/&gnome-minor-38;/gnome-user-docs-&gnome-user-docs-version;.tar.xz">
   <!ENTITY gnome-user-docs-download-ftp
-           "&gnome-download-ftp;/gnome-user-docs/&gnome-40;/gnome-user-docs-&gnome-user-docs-version;.tar.xz">
-  <!ENTITY gnome-user-docs-md5sum        "2c5e4db3786e047a32bce3492df0c35d">
-  <!ENTITY gnome-user-docs-size          "8.8 MB">
-  <!ENTITY gnome-user-docs-buildsize     "233 MB">
+           "&gnome-download-ftp;/gnome-user-docs/&gnome-minor-38;/gnome-user-docs-&gnome-user-docs-version;.tar.xz">
+  <!ENTITY gnome-user-docs-md5sum        "3656475c1ac4f0c6cf64af76d79e34b7">
+  <!ENTITY gnome-user-docs-size          "11 MB">
+  <!ENTITY gnome-user-docs-buildsize     "217 MB">
   <!ENTITY gnome-user-docs-time          "0.6 SBU (using parallelism=4)">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: gnome/platform/gnome-video-effects.xml
===================================================================
--- gnome/platform/gnome-video-effects.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/gnome-video-effects.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -88,5 +89,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
Index: gnome/platform/grilo.xml
===================================================================
--- gnome/platform/grilo.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/grilo.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -119,6 +120,5 @@
 cd    build    &amp;&amp;
 
-meson --prefix=/usr       \
-      --buildtype=release \
+meson --prefix=/usr \
       -Denable-gtk-doc=false .. &amp;&amp;
 ninja</userinput></screen>
@@ -138,7 +138,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -146,6 +143,4 @@
       generating documentation. If you have <xref linkend="gtk-doc"/>
       installed and wish to generate documentation, remove this option.
-      Note that building the documentation is currently broken due to
-      an incompatibility with gtk-doc.
     </para>
 
@@ -177,5 +172,5 @@
           <para>
             is a simple playground application that you can use to test the
-            framework and its plugins
+            framework and its plugins.
           </para>
           <indexterm zone="grilo grilo-test-ui">
@@ -189,5 +184,5 @@
         <listitem>
           <para>
-            is a tool that prints out information on available Grilo sources
+            is a tool that prints out information on available Grilo sources.
           </para>
           <indexterm zone="grilo grl-inspect">
@@ -202,5 +197,5 @@
           <para>
             is a tool to run <application>Grilo</application> operations
-            from command line
+            from command line.
           </para>
           <indexterm zone="grilo grl-launch">
@@ -211,8 +206,8 @@
 
       <varlistentry id="libgrilo">
-        <term><filename class="libraryfile">libgrilo.so</filename></term>
-        <listitem>
-          <para>
-            provides the Grilo framework
+        <term><filename class='libraryfile'>libgrilo.so</filename></term>
+        <listitem>
+          <para>
+            provides the Grilo framework.
           </para>
           <indexterm zone="grilo libgrilo">
@@ -223,8 +218,8 @@
 
       <varlistentry id="libgrlnet">
-        <term><filename class="libraryfile">libgrlnet.so</filename></term>
-        <listitem>
-          <para>
-            provides Grilo networking helpers for plug-ins
+        <term><filename class='libraryfile'>libgrlnet.so</filename></term>
+        <listitem>
+          <para>
+            provides Grilo networking helpers for plug-ins.
           </para>
           <indexterm zone="grilo libgrilo">
@@ -235,8 +230,8 @@
 
       <varlistentry id="libgrlpls">
-        <term><filename class="libraryfile">libgrlpls.so</filename></term>
-        <listitem>
-          <para>
-            provides playlist handling functions
+        <term><filename class='libraryfile'>libgrlpls.so</filename></term>
+        <listitem>
+          <para>
+            provides playlist handling functions.
           </para>
           <indexterm zone="grilo libgrilo">
Index: gnome/platform/gsettings-desktop-schemas.xml
===================================================================
--- gnome/platform/gsettings-desktop-schemas.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/gsettings-desktop-schemas.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,10 +6,10 @@
 
   <!ENTITY gsettings-desktop-schemas-download-http
-           "&gnome-download-http;/gsettings-desktop-schemas/&gnome-40;/gsettings-desktop-schemas-&gsettings-desktop-schemas-version;.tar.xz">
+           "&gnome-download-http;/gsettings-desktop-schemas/&gnome-minor-38;/gsettings-desktop-schemas-&gsettings-desktop-schemas-version;.tar.xz">
   <!ENTITY gsettings-desktop-schemas-download-ftp
-           "&gnome-download-ftp;/gsettings-desktop-schemas/&gnome-40;/gsettings-desktop-schemas-&gsettings-desktop-schemas-version;.tar.xz">
-  <!ENTITY gsettings-desktop-schemas-md5sum        "345e5b2340f4c6fd1b90597745761ddf">
-  <!ENTITY gsettings-desktop-schemas-size          "688 KB">
-  <!ENTITY gsettings-desktop-schemas-buildsize     "12 MB">
+           "&gnome-download-ftp;/gsettings-desktop-schemas/&gnome-minor-38;/gsettings-desktop-schemas-&gsettings-desktop-schemas-version;.tar.xz">
+  <!ENTITY gsettings-desktop-schemas-md5sum        "465a98f5ab8a5ca896009228257fc40d">
+  <!ENTITY gsettings-desktop-schemas-size          "672 KB">
+  <!ENTITY gsettings-desktop-schemas-buildsize     "17 MB">
   <!ENTITY gsettings-desktop-schemas-time          "less than 0.1 SBU">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -99,5 +100,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
Index: gnome/platform/gsound.xml
===================================================================
--- gnome/platform/gsound.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/gsound.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY gsound-download-http "&gnome-download-http;/gsound/1.0/gsound-&gsound-version;.tar.xz">
   <!ENTITY gsound-download-ftp  "&gnome-download-ftp;/gsound/1.0/gsound-&gsound-version;.tar.xz">
-  <!ENTITY gsound-md5sum        "7338c295034432a6e782fd20b3d04b68">
-  <!ENTITY gsound-size          "24 KB">
-  <!ENTITY gsound-buildsize     "864 KB">
+  <!ENTITY gsound-md5sum        "c26fd21c21b9ef6533a202a73fab21db">
+  <!ENTITY gsound-size          "276 KB">
+  <!ENTITY gsound-buildsize     "2.5 MB">
   <!ENTITY gsound-time          "less than 0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -72,9 +73,4 @@
     <bridgehead renderas="sect3">gsound Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libcanberra"/>
-    </para>
-
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
@@ -101,9 +97,6 @@
     </para>
 
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
 
     <para>
@@ -115,5 +108,5 @@
     </para>
 
-<screen role="root"><userinput>ninja install</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
   </sect2>
 
@@ -122,5 +115,8 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
+      href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -156,5 +152,5 @@
         <listitem>
           <para>
-            plays system sounds through the libgsound interface
+            plays system sounds through the libgsound interface.
           </para>
           <indexterm zone="gsound gsound-play">
@@ -168,5 +164,5 @@
         <listitem>
           <para>
-            contains API functions for playing system sounds
+            contains API functions for playing system sounds.
           </para>
           <indexterm zone="gsound libgsound">
@@ -177,4 +173,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: gnome/platform/gvfs.xml
===================================================================
--- gnome/platform/gvfs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/gvfs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY gvfs-download-http "&gnome-download-http;/gvfs/1.48/gvfs-&gvfs-version;.tar.xz">
-  <!ENTITY gvfs-download-ftp  "&gnome-download-ftp;/gvfs/1.48/gvfs-&gvfs-version;.tar.xz">
-  <!ENTITY gvfs-md5sum        "a801309d09457bbd0c8a0a871fec0ac3">
+  <!ENTITY gvfs-download-http "&gnome-download-http;/gvfs/1.46/gvfs-&gvfs-version;.tar.xz">
+  <!ENTITY gvfs-download-ftp  "&gnome-download-ftp;/gvfs/1.46/gvfs-&gvfs-version;.tar.xz">
+  <!ENTITY gvfs-md5sum        "3013dca31a373202779d0f9652118fe2">
   <!ENTITY gvfs-size          "1.2 MB">
-  <!ENTITY gvfs-buildsize     "51 MB">
+  <!ENTITY gvfs-buildsize     "56 MB">
   <!ENTITY gvfs-time          "0.4 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -149,17 +150,16 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr       \
-      --buildtype=release \
-      -Dfuse=false        \
-      -Dgphoto2=false     \
-      -Dafc=false         \
-      -Dbluray=false      \
-      -Dnfs=false         \
-      -Dmtp=false         \
-      -Dsmb=false         \
-      -Dtmpfilesdir=no    \
-      -Ddnssd=false       \
-      -Dgoa=false         \
-      -Dgoogle=false      \
+meson --prefix=/usr     \
+      -Dfuse=false      \
+      -Dgphoto2=false   \
+      -Dafc=false       \
+      -Dbluray=false    \
+      -Dnfs=false       \
+      -Dmtp=false       \
+      -Dsmb=false       \
+      -Dtmpfilesdir=no  \
+      -Ddnssd=false     \
+      -Dgoa=false       \
+      -Dgoogle=false    \
       -Dsystemduserunitdir=no .. &amp;&amp;
 ninja</userinput></screen>
@@ -168,16 +168,15 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr       \
-      --buildtype=release \
-      -Dfuse=false        \
-      -Dgphoto2=false     \
-      -Dafc=false         \
-      -Dbluray=false      \
-      -Dnfs=false         \
-      -Dmtp=false         \
-      -Dsmb=false         \
-      -Ddnssd=false       \
-      -Dgoa=false         \
-      -Dgoogle=false      .. &amp;&amp;
+meson --prefix=/usr     \
+      -Dfuse=false      \
+      -Dgphoto2=false   \
+      -Dafc=false       \
+      -Dbluray=false    \
+      -Dnfs=false       \
+      -Dmtp=false       \
+      -Dsmb=false       \
+      -Ddnssd=false     \
+      -Dgoa=false       \
+      -Dgoogle=false    .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -198,7 +197,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -262,5 +258,5 @@
           <para>
             contains the common API functions used in
-            <application>Gvfs</application> programs
+            <application>Gvfs</application> programs.
           </para>
           <indexterm zone="gvfs libgvfscommon">
Index: gnome/platform/libchamplain.xml
===================================================================
--- gnome/platform/libchamplain.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/libchamplain.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -76,4 +77,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+      <xref linkend="clutter"/>,
       <xref linkend="clutter-gtk"/>,
       <xref linkend="gtk3"/>,
@@ -112,5 +114,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -127,11 +129,22 @@
   </sect2>
  
+<!--
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para>
+      <parameter>- -enable-vala</parameter>: This switch enables
+      building of the Vala bindings. Remove if you don't have
+      <xref linkend="vala"/> installed.
+    </para>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-  </sect2>
+      href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+-->
 
   <sect2 role="content">
@@ -166,5 +179,5 @@
         <listitem>
           <para>
-            contains the <application>libchamplain</application> API functions
+            contains the <application>libchamplain</application> API functions.
           </para>
           <indexterm zone="libchamplain libchamplain-0.12">
@@ -178,5 +191,5 @@
         <listitem>
           <para>
-            contains the <application>libchamplain</application> GTK+ bindings
+            contains the <application>libchamplain</application> GTK+ bindings.
           </para>
           <indexterm zone="libchamplain libchamplain-gtk-0.12">
Index: gnome/platform/libgdata.xml
===================================================================
--- gnome/platform/libgdata.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/libgdata.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY libgdata-download-http "&gnome-download-http;/libgdata/0.18/libgdata-&libgdata-version;.tar.xz">
-  <!ENTITY libgdata-download-ftp  "&gnome-download-ftp;/libgdata/0.18/libgdata-&libgdata-version;.tar.xz">
-  <!ENTITY libgdata-md5sum        "92b058d1a0af5d1b96c86c21820f1eff">
+  <!ENTITY libgdata-download-http "&gnome-download-http;/libgdata/0.17/libgdata-&libgdata-version;.tar.xz">
+  <!ENTITY libgdata-download-ftp  "&gnome-download-ftp;/libgdata/0.17/libgdata-&libgdata-version;.tar.xz">
+  <!ENTITY libgdata-md5sum        "b1bebb5951f8ef9782cb64c2f2a3b8ad">
   <!ENTITY libgdata-size          "832 KB">
-  <!ENTITY libgdata-buildsize     "54 MB (with tests)">
+  <!ENTITY libgdata-buildsize     "53 MB (with tests)">
   <!ENTITY libgdata-time          "0.5 SBU (with tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -113,8 +114,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr                 \
-      --buildtype=release           \
-      -Dgtk_doc=false               \
-      -Dalways_build_tests=false .. &amp;&amp;
+meson --prefix=/usr -Dgtk_doc=false -Dalways_build_tests=false .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -138,8 +136,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
     <para>
       <parameter>-Dgtk_doc=false</parameter>: Remove this if you have
@@ -186,5 +180,5 @@
         <listitem>
           <para>
-            contains the <application>libgdata</application> API functions
+            contains the <application>libgdata</application> API functions.
           </para>
           <indexterm zone="libgdata libgdata-lib">
Index: gnome/platform/libgee.xml
===================================================================
--- gnome/platform/libgee.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/libgee.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY libgee-download-http "&gnome-download-http;/libgee/0.20/libgee-&libgee-version;.tar.xz">
   <!ENTITY libgee-download-ftp  "&gnome-download-ftp;/libgee/0.20/libgee-&libgee-version;.tar.xz">
-  <!ENTITY libgee-md5sum        "4d7d6f1f8054f1b3466c752ac2e50946">
-  <!ENTITY libgee-size          "672 KB">
-  <!ENTITY libgee-buildsize     "42 MB (add 3 MB for tests)">
+  <!ENTITY libgee-md5sum        "e574b3952b93d219b5ec7c74c5892c33">
+  <!ENTITY libgee-size          "664 KB">
+  <!ENTITY libgee-buildsize     "35 MB (add 4 MB for tests)">
   <!ENTITY libgee-time          "0.1 SBU (using parallelism=4; add 0.1 SBU for tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -150,5 +151,5 @@
         <listitem>
           <para>
-            contains the <application>libgee</application> API functions
+            contains the <application>libgee</application> API functions.
           </para>
           <indexterm zone="libgee libgee-lib">
Index: gnome/platform/libgtop.xml
===================================================================
--- gnome/platform/libgtop.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/libgtop.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -159,5 +160,5 @@
           <para>
             contains functions that allow access to system
-            performance data
+            performance data.
           </para>
           <indexterm zone="libgtop libgtop-2">
Index: gnome/platform/libgweather.xml
===================================================================
--- gnome/platform/libgweather.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/libgweather.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,10 +6,10 @@
 
   <!ENTITY libgweather-download-http
-           "&gnome-download-http;/libgweather/&gnome-40;/libgweather-&libgweather-version;.tar.xz">
+           "&gnome-download-http;/libgweather/&gnome-minor-36;/libgweather-&libgweather-version;.tar.xz">
   <!ENTITY libgweather-download-ftp
-           "&gnome-download-ftp;/libgweather/&gnome-40;/libgweather-&libgweather-version;.tar.xz">
-  <!ENTITY libgweather-md5sum        "a9c0989890a837982defd8238e1eb356">
+           "&gnome-download-ftp;/libgweather/&gnome-minor-36;/libgweather-&libgweather-version;.tar.xz">
+  <!ENTITY libgweather-md5sum        "d6081108f9c224c5cb594f8ccb025db9">
   <!ENTITY libgweather-size          "2.6 MB">
-  <!ENTITY libgweather-buildsize     "94 MB">
+  <!ENTITY libgweather-buildsize     "92 MB">
   <!ENTITY libgweather-time          "0.2 SBU">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -91,7 +92,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <ulink url="http://glade.gnome.org/">Glade</ulink>, and
-      <ulink url="https://pypi.org/project/pylint/">pylint</ulink>
+      <ulink url="http://glade.gnome.org/">Glade</ulink> and
+      <xref linkend="gtk-doc"/>
     </para>
 
@@ -112,5 +112,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -129,7 +129,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -157,5 +154,4 @@
         </seg>
         <seg>
-          /usr/lib/libgweather,
           /usr/include/libgweather-3.0,
           /usr/share/gtk-doc/html/libgweather-3.0 and
@@ -175,5 +171,5 @@
           <para>
             contains functions that allow the retrieval of weather
-            information
+            information.
           </para>
           <indexterm zone="libgweather libgweather-3">
Index: gnome/platform/libpeas.xml
===================================================================
--- gnome/platform/libpeas.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/libpeas.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,8 +5,8 @@
   %general-entities;
 
-  <!ENTITY libpeas-download-http "&gnome-download-http;/libpeas/1.30/libpeas-&libpeas-version;.tar.xz">
-  <!ENTITY libpeas-download-ftp  "&gnome-download-ftp;/libpeas/1.30/libpeas-&libpeas-version;.tar.xz">
-  <!ENTITY libpeas-md5sum        "60b9d9fe2ee9dd518fb12d5d404e296a">
-  <!ENTITY libpeas-size          "192 KB">
+  <!ENTITY libpeas-download-http "&gnome-download-http;/libpeas/1.28/libpeas-&libpeas-version;.tar.xz">
+  <!ENTITY libpeas-download-ftp  "&gnome-download-ftp;/libpeas/1.28/libpeas-&libpeas-version;.tar.xz">
+  <!ENTITY libpeas-md5sum        "62a5d01e9561f8fafca68e2863640735">
+  <!ENTITY libpeas-size          "188 KB">
   <!ENTITY libpeas-buildsize     "12 MB (with tests)">
   <!ENTITY libpeas-time          "0.2 SBU (with tests)">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -93,5 +94,5 @@
       built with LUA-5.1), with either
       <ulink url="http://luajit.org/">luajit</ulink> or
-      <ulink url="https://www.lua.org/ftp/lua-5.1.5.tar.gz">LUA-5.1</ulink>
+      <ulink url="http://www.lua.org/ftp/lua-5.1.5.tar.gz">LUA-5.1</ulink>
     </para>
 
@@ -104,5 +105,4 @@
     <title>Installation of libpeas</title>
 
-<!-- Fixed in 1.30.0
     <para>
       First, adapt the tests to changes in meson-0.55:
@@ -110,5 +110,4 @@
 
 <screen><userinput remap="pre">sed -i 's/test_exe,/test_exe, depends: [libintrospection_gir],/' tests/libpeas/meson.build</userinput></screen>
--->
 
     <para>
@@ -120,5 +119,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -140,7 +139,4 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
     <para>
       <option>-Dvapi=true</option>: Add this switch if you wish to 
@@ -154,5 +150,5 @@
 
     <para>
-      <option>-Dgtk_doc=true</option>: Add this switch if wish to 
+      <option>-Dgtk-doc=true</option>: Add this switch if wish to 
       build the reference manual.
     </para>
@@ -193,5 +189,5 @@
         <listitem>
           <para>
-            is the Peas demo program
+            is the Peas demo program.
           </para>
           <indexterm zone="libpeas peas-demo">
@@ -205,5 +201,5 @@
         <listitem>
           <para>
-            contains the <application>libpeas</application> API functions
+            contains the <application>libpeas</application> API functions.
           </para>
           <indexterm zone="libpeas libpeas-1">
@@ -218,5 +214,5 @@
           <para>
             contains the <application>libpeas</application>
-            <application>GTK+</application> widgets
+            <application>GTK+</application> widgets.
           </para>
           <indexterm zone="libpeas libpeas-gtk-1">
Index: gnome/platform/libsecret.xml
===================================================================
--- gnome/platform/libsecret.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/libsecret.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -131,5 +132,5 @@
 cd bld &amp;&amp;
 
-meson --prefix=/usr --buildtype=release -Dgtk_doc=false .. &amp;&amp;
+meson --prefix=/usr -Dgtk_doc=false .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -150,7 +151,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -205,5 +203,5 @@
           <para>
             is a command line tool that can be used to store
-            and retrieve passwords
+            and retrieve passwords.
           </para>
           <indexterm zone="libsecret secret-tool">
@@ -217,5 +215,5 @@
         <listitem>
           <para>
-            contains the <application>libsecret</application> API functions
+            contains the <application>libsecret</application> API functions.
           </para>
           <indexterm zone="libsecret libsecret-1">
Index: gnome/platform/libwnck.xml
===================================================================
--- gnome/platform/libwnck.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/libwnck.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY libwnck-download-http "&gnome-download-http;/libwnck/&gnome-40;/libwnck-&libwnck-version;.tar.xz">
-  <!ENTITY libwnck-download-ftp  "&gnome-download-ftp;/libwnck/&gnome-40;/libwnck-&libwnck-version;.tar.xz">
-  <!ENTITY libwnck-md5sum        "653f4221010e775f246a9cc6452d15cd">
-  <!ENTITY libwnck-size          "448 KB">
-  <!ENTITY libwnck-buildsize     "8.8 MB">
+  <!ENTITY libwnck-download-http "&gnome-download-http;/libwnck/&gnome-minor-36;/libwnck-&libwnck-version;.tar.xz">
+  <!ENTITY libwnck-download-ftp  "&gnome-download-ftp;/libwnck/&gnome-minor-36;/libwnck-&libwnck-version;.tar.xz">
+  <!ENTITY libwnck-md5sum        "00bb40dc6fab76af0da33e88a34b6378">
+  <!ENTITY libwnck-size          "440 KB">
+  <!ENTITY libwnck-buildsize     "12 MB">
   <!ENTITY libwnck-time          "0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -104,5 +105,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr -Dbuildtype=release .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -121,7 +122,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -164,5 +162,5 @@
           <para>
             is used to print or modify the properties of a screen/workspace/window,
-            or to interact with it
+            or to interact with it.
           </para>
           <indexterm zone="libwnck wnckprop">
@@ -176,5 +174,5 @@
         <listitem>
           <para>
-            contains functions for writing pagers and task lists
+            contains functions for writing pagers and task lists.
           </para>
           <indexterm zone="libwnck libwnck-3">
Index: gnome/platform/mutter.xml
===================================================================
--- gnome/platform/mutter.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/mutter.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY mutter-download-http "&gnome-download-http;/mutter/&gnome-40;/mutter-&mutter-version;.tar.xz">
-  <!ENTITY mutter-download-ftp  "&gnome-download-ftp;/mutter/&gnome-40;/mutter-&mutter-version;.tar.xz">
-  <!ENTITY mutter-md5sum        "bbfb54fba942b4f388e5b89759f2e9a6">
-  <!ENTITY mutter-size          "2.6 MB">
-  <!ENTITY mutter-buildsize     "296 MB">
-  <!ENTITY mutter-time          "2.1 SBU (Using parallelism=4)">
+  <!ENTITY mutter-download-http "&gnome-download-http;/mutter/&gnome-minor-38;/mutter-&mutter-version;.tar.xz">
+  <!ENTITY mutter-download-ftp  "&gnome-download-ftp;/mutter/&gnome-minor-38;/mutter-&mutter-version;.tar.xz">
+  <!ENTITY mutter-md5sum        "07307571f9f2bdb433894741222773e1">
+  <!ENTITY mutter-size          "2.5 MB">
+  <!ENTITY mutter-buildsize     "140 MB">
+  <!ENTITY mutter-time          "1.3 SBU (Using parallelism=4)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -88,8 +89,12 @@
       <!-- now using internal shipped clutter and cogl copies -->
       <!-- <xref linkend="clutter"/>, -->
+      <xref linkend="gnome-desktop"/>,
       <xref linkend="gnome-settings-daemon"/>,
       <xref linkend="graphene"/>,
+      <xref linkend="libcanberra"/>,
+      <xref linkend="libwacom"/>,
       <xref linkend="libxkbcommon"/>,
-      <xref linkend="pipewire"/>, and
+      <xref linkend="pipewire"/>,
+      <xref linkend="upower"/>, and
       <xref linkend="zenity"/>
     </para>
@@ -142,11 +147,4 @@
 
     <para>
-      First, fix a race condition that sometimes occurs due to meson dependency
-      ordering:
-    </para>
-
-<screen><userinput remap="pre">sed -i '/libmutter_dep = declare_dependency(/a sources: mutter_built_sources,' src/meson.build</userinput></screen>
-
-    <para>
       Install <application>Mutter</application> by running the following
       commands:
@@ -156,5 +154,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=debugoptimized .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -164,6 +162,5 @@
       require an active X session to run correctly. It is not necessary to
       run a  separate D-bus session if not in a GNOME session, but it
-      provides a clean environment in any case. One test,
-      <filename>native-headless</filename>, is known to fail.
+      provides a clean environment in any case.
     </para>
 
@@ -174,22 +171,4 @@
 <screen role="root"><userinput>ninja install</userinput></screen>
 
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--buildtype=debugoptimized</parameter>: Override the
-      default buildtype (<quote>debug</quote>), which would produce
-      unoptimized binaries.  The test suite of this package needs debug
-      to be enabled.
-    </para>
-
-    <para>
-      <option>-Dprofiler=false</option>: Use this option if
-      <application>Sysprof</application> is not installed, and you don't
-      want meson to download <application>Sysprof</application> source
-      code.
-    </para>
   </sect2>
 
@@ -207,8 +186,8 @@
         </seg>
         <seg>
-          libmutter-8.so
+          libmutter-7.so
         </seg>
         <seg>
-          /usr/{lib,include,libexec/installed-tests,share/{installed-tests}}/mutter-8
+          /usr/{lib,include,libexec/installed-tests,share/{installed-tests}}/mutter-7
         </seg>
       </seglistitem>
@@ -225,5 +204,5 @@
           <para>
             is a <application>Clutter</application> based compositing
-            <application>GTK+</application> Window Manager
+            <application>GTK+</application> Window Manager.
           </para>
           <indexterm zone="mutter mutter-prog">
@@ -234,11 +213,11 @@
 
       <varlistentry id="libmutter">
-        <term><filename class="libraryfile">libmutter-8.so</filename></term>
+        <term><filename class="libraryfile">libmutter-7.so</filename></term>
         <listitem>
           <para>
-            contains the <application>Mutter</application> API functions
+            contains the <application>Mutter</application> API functions.
           </para>
           <indexterm zone="mutter libmutter">
-            <primary sortas="c-libmutter">libmutter-8.so</primary>
+            <primary sortas="c-libmutter">libmutter-7.so</primary>
           </indexterm>
         </listitem>
Index: gnome/platform/nautilus.xml
===================================================================
--- gnome/platform/nautilus.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/nautilus.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,10 +6,10 @@
 
   <!ENTITY nautilus-download-http
-           "&gnome-download-http;/nautilus/&gnome-40;/nautilus-&nautilus-version;.tar.xz">
+           "&gnome-download-http;/nautilus/&gnome-minor-38;/nautilus-&nautilus-version;.tar.xz">
   <!ENTITY nautilus-download-ftp
-           "&gnome-download-ftp;/nautilus/&gnome-40;/nautilus-&nautilus-version;.tar.xz">
-  <!ENTITY nautilus-md5sum        "62f856359dcb2964b5cb2e02e90ad2dd">
+           "&gnome-download-ftp;/nautilus/&gnome-minor-38;/nautilus-&nautilus-version;.tar.xz">
+  <!ENTITY nautilus-md5sum        "a94c730fe79104859035ae51e0ba0bd7">
   <!ENTITY nautilus-size          "3.1 MB">
-  <!ENTITY nautilus-buildsize     "160 MB (with tests)">
+  <!ENTITY nautilus-buildsize     "154 MB (with tests)">
   <!ENTITY nautilus-time          "0.3 SBU (with tests, at -j4)">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -80,5 +81,4 @@
       <xref linkend="gnome-autoar"/>,
       <xref linkend="gnome-desktop"/>,
-      <xref linkend="libhandy1"/>,
       <xref linkend="libnotify"/>,
       <xref linkend="libseccomp"/>, and
@@ -91,7 +91,6 @@
       <xref linkend="exempi"/>,
       <xref linkend="gobject-introspection"/>,
-      <xref linkend="gst10-plugins-base"/>,
-      <xref linkend="libexif"/>, and
-      <xref linkend="libportal"/>
+      <xref linkend="gst10-plugins-base"/>, and
+      <xref linkend="libexif"/>
     </para>
 
@@ -124,8 +123,7 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr       \
-      --buildtype=release \
-      -Dselinux=false     \
-      -Dpackagekit=false  \
+meson --prefix=/usr      \
+      -Dselinux=false    \
+      -Dpackagekit=false \
       .. &amp;&amp;
 
@@ -151,7 +149,4 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
     <para>
       <parameter>-Dselinux=false</parameter>: This switch disables the use
@@ -162,9 +157,4 @@
       <parameter>-Dpackagekit=false</parameter>: This switch disables the use
       of PackageKit which isn't suitable for BLFS.
-    </para>
-
-    <para>
-      <option>-Dlibportal=false</option>: Use this switch if you do not
-      have <xref linkend="libportal"/> installed.
     </para>
 
@@ -203,5 +193,5 @@
         <listitem>
           <para>
-            is the <application>GNOME</application> file manager
+            is the <application>GNOME</application> file manager.
           </para>
           <indexterm zone="nautilus nautilus-prog">
@@ -215,5 +205,5 @@
         <listitem>
           <para>
-            supplies the functions needed by the file manager extensions
+            supplies the functions needed by the file manager extensions.
           </para>
           <indexterm zone="nautilus libnautilus-extension">
Index: gnome/platform/platform.xml
===================================================================
--- gnome/platform/platform.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/platform.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
  %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="gnome-core">
@@ -44,5 +49,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="folks.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gfbgraph.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tracker.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tracker3.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tracker-miners.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tracker3-miners.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gsound.xml"/>
Index: gnome/platform/rest.xml
===================================================================
--- gnome/platform/rest.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/rest.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -104,5 +105,6 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+    --with-ca-certificates=/etc/pki/tls/certs/ca-bundle.crt &amp;&amp;
 make</userinput></screen>
 
@@ -124,4 +126,9 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <parameter>--with-ca-certificates=/etc/pki/tls/certs/ca-bundle.crt</parameter>: 
+      This switch sets the location of the BLFS certificate authority bundle.
+    </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -161,5 +168,5 @@
         <listitem>
           <para>
-            contains the RESTful Web API Query functions
+            contains the RESTful Web API Query functions.
           </para>
           <indexterm zone="rest librest-0.7">
@@ -173,5 +180,5 @@
         <listitem>
           <para>
-            contains extra RESTful Web API Query functions
+            contains extra RESTful Web API Query functions.
           </para>
           <indexterm zone="rest librest-extras-0.7">
Index: gnome/platform/totem-pl-parser.xml
===================================================================
--- gnome/platform/totem-pl-parser.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/totem-pl-parser.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -9,8 +9,8 @@
   <!ENTITY totem-pl-parser-download-ftp
    "&gnome-download-ftp;/totem-pl-parser/&gnome-minor-26;/totem-pl-parser-&totem-pl-parser-version;.tar.xz">
-  <!ENTITY totem-pl-parser-md5sum        "69dc2cf0e61e6df71ed45156b24b14da">
-  <!ENTITY totem-pl-parser-size          "1.4 MB">
-  <!ENTITY totem-pl-parser-buildsize     "9.6 MB (with tests)">
-  <!ENTITY totem-pl-parser-time          "0.1 SBU (with tests)">
+  <!ENTITY totem-pl-parser-md5sum        "0798a286af7e98c664d48e2974b77e5a">
+  <!ENTITY totem-pl-parser-size          "1.3 MB">
+  <!ENTITY totem-pl-parser-buildsize     "10 MB (with tests)">
+  <!ENTITY totem-pl-parser-time          "less than 0.1 SBU (with tests)">
 ]>
 
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -88,9 +89,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="cmake"/>, <!-- uses it to look for packages -->
+      <xref linkend="cmake"/> (for CMake Bindings),
       <xref linkend="gtk-doc"/>,
       <xref linkend="gvfs"/> (for some tests),
       <ulink url="http://ltp.sourceforge.net/coverage/lcov.php"> LCOV</ulink>, and
-      <ulink url="https://sourceforge.net/projects/quvi">libquvi &gt;= 0.9.1 and libquvi-scripts</ulink>
+      <ulink url="http://sourceforge.net/projects/quvi">libquvi &gt;= 0.9.1 and libquvi-scripts</ulink>
       - if they are installed, then
       <ulink url="https://github.com/diegonehab/luasocket">lua-socket (git)</ulink>
@@ -114,5 +115,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix /usr --default-library shared .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -127,11 +128,4 @@
 <screen role="root"><userinput>ninja install</userinput></screen>
 
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
   </sect2>
 
@@ -167,5 +161,5 @@
         <listitem>
           <para>
-            is the <application>Totem</application> Playlist Parser library
+            is the <application>Totem</application> Playlist Parser library.
           </para>
           <indexterm zone="totem-pl-parser libtotem-plparser">
@@ -180,5 +174,5 @@
           <para>
             is the <application>Totem</application> Playlist Parser library,
-            mini version
+            mini version.
           </para>
           <indexterm zone="totem-pl-parser libtotem-plparser-mini">
Index: gnome/platform/tracker-miners.xml
===================================================================
--- gnome/platform/tracker-miners.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
+++ gnome/platform/tracker-miners.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -0,0 +1,183 @@
+<?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 tracker-miners-download-http "&gnome-download-http;/tracker-miners/2.3/tracker-miners-&tracker-miners-version;.tar.xz">
+  <!ENTITY tracker-miners-download-ftp  "&gnome-download-ftp;/tracker-miners/2.3/tracker-miners-&tracker-miners-version;.tar.xz">
+  <!ENTITY tracker-miners-md5sum        "0bbcab133ed33ccbf65923020f99e1cc">
+  <!ENTITY tracker-miners-size          "3.0 MB">
+  <!ENTITY tracker-miners-buildsize     "28 MB (with tests)">
+  <!ENTITY tracker-miners-time          "1.0 SBU (with tests)">
+]>
+
+<sect1 id="tracker-miners" xreflabel="tracker-miners-&tracker-miners-version;">
+  <?dbhtml filename="tracker-miners.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Tracker-miners-&tracker-miners-version;</title>
+
+  <indexterm zone="tracker-miners">
+    <primary sortas="a-tracker-miners">tracker-miners</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Tracker-miners</title>
+
+    <para>
+      The <application>Tracker-miners</application> package contains a set of
+      data extractors for Tracker.
+    </para>
+
+    &lfs10_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&tracker-miners-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&tracker-miners-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &tracker-miners-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &tracker-miners-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &tracker-miners-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &tracker-miners-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+           
+    <bridgehead renderas="sect3">Tracker-miners Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gst10-plugins-base"/>,
+      <xref linkend="tracker"/>,
+      <xref linkend="exempi"/>, and
+      <xref linkend="gexiv2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="ffmpeg"/>,
+      <xref linkend="flac"/>,
+      <xref linkend="giflib"/>,
+      <xref linkend="icu"/>,
+      <xref linkend="libexif"/>,
+      <xref linkend="libgrss"/>,
+      <xref linkend="libgxps"/>, and
+      <xref linkend="poppler"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="cmake"/>,
+      <xref linkend="dconf"/>,
+      <xref linkend="libgsf"/>,
+      <xref linkend="libseccomp"/>,
+      <xref linkend="taglib"/>,
+      <xref linkend="totem-pl-parser"/>,
+      <xref linkend="upower"/>,
+      <ulink url="https://github.com/lipnitsk/libcue">libcue</ulink>,
+      <ulink url="https://libosinfo.org">libosinfo</ulink>, and
+      <ulink url="https://gitlab.gnome.org/GNOME/gupnp">gupnp</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/tracker-miners"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Tracker-miners</title>
+
+    <para>
+      Install <application>Tracker-miners</application> by running the following
+      commands:
+    </para>
+
+
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+meson --prefix=/usr .. &amp;&amp;
+ninja</userinput></screen>
+
+    <para>
+      To test the results, as the <systemitem class="username">root</systemitem>
+      user, issue: <command>ninja test</command>.
+      <!--
+      Eight tests, test-image-1, 300-miner-basic-ops, 310-fts-basic,
+      310-fts-basic, 311-fts-file-operations, 401-extractor-flac-cuesheet,
+      500-writeback-images, 501-writeback-image-details, and
+      502-writeback-audio are known to fail due to internal test
+      suite problems.
+      -->
+      Two tests, test-image-1 and functional-401-extractor-flac-cuesheet, 
+      are known to fail.
+      <!-- flac cuesheet is due to libcue not being installed. -->
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>ninja install</userinput></screen>
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <option>-Dminer_rss=false</option>: Use this option if you have not
+      installed the recommended dependency libgrss.
+    </para>
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libtracker-extract.so, and
+          several modules under /usr/lib/tracker-miners-2.0.
+        </seg>
+        <seg>
+          /usr/lib/tracker-miners-2.0 and
+          /usr/share/tracker-miners
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+  </sect2>
+</sect1>
Index: gnome/platform/tracker.xml
===================================================================
--- gnome/platform/tracker.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
+++ gnome/platform/tracker.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -0,0 +1,229 @@
+<?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 tracker-download-http
+           "&gnome-download-http;/tracker/2.3/tracker-&tracker-version;.tar.xz">
+  <!ENTITY tracker-download-ftp
+           "&gnome-download-ftp;/tracker/2.3/tracker-&tracker-version;.tar.xz">
+  <!ENTITY tracker-md5sum        "f3c8baac2a3089f1c7af1dcb00547c97">
+  <!ENTITY tracker-size          "1.5 MB">
+  <!ENTITY tracker-buildsize     "262 MB (with tests)">
+  <!ENTITY tracker-time          "1.3 SBU (with tests)">
+]>
+
+<!-- Tracker2 + Tracker-Miners2 is needed for Folks and Brasero.
+     For Brasero, look for BRASERO_SEARCH in the configure output. -->
+
+<sect1 id="tracker" xreflabel="Tracker-&tracker-version;">
+  <?dbhtml filename="tracker.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Tracker-&tracker-version;</title>
+
+  <indexterm zone="tracker">
+    <primary sortas="a-Tracker">Tracker</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Tracker</title>
+
+    <para>
+      <application>Tracker</application> is the file indexing and search
+      provider used in the <application>GNOME</application> desktop environment.
+    </para>
+
+    &lfs10_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&tracker-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&tracker-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &tracker-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &tracker-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &tracker-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &tracker-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Tracker Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="json-glib"/>,
+      <xref linkend="libseccomp"/>,
+      <xref linkend="libsoup"/>, and
+      <xref linkend="vala"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="icu"/>,
+      <xref linkend="NetworkManager"/>,
+      <xref linkend="sqlite"/>, and
+      <xref linkend="upower"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>,
+      <ulink url="https://github.com/scop/bash-completion/">bash-completion</ulink>, and
+      <ulink url="https://github.com/snowballstem/snowball/">libstemmer</ulink>
+      <!-- Python2 used to be a dependency until 2.2.1 -->
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/tracker"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Tracker</title>
+
+    <para>
+      Install <application>Tracker</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+meson --prefix=/usr .. &amp;&amp;
+ninja</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>ninja test</command>. The tests
+      should be run from a graphical session. <!--The test named steroids may
+      fail but will pass if you rerun the tests after the installation. -->
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>ninja install</userinput></screen>
+
+  </sect2>
+
+<!--
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+    <para>
+      <command>glib-compile-schemas ...</command>:  Compiles the settings
+      schema installed by this package to prevent a runtime error in
+      tracker-store.
+    </para>
+  </sect2>
+-->
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          tracker
+        </seg>
+        <seg>
+          libtracker-control-2.0.so, libtracker-miner-2.0.so, and 
+          libtracker-sparql-2.0.so
+        </seg>
+        <seg>
+          /usr/{include,lib}/tracker-2.0, /usr/share/tracker, and
+          /usr/share/gtk-doc/libtracker-{control,miner,sparql}
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="tracker-prog">
+        <term><command>tracker</command></term>
+        <listitem>
+          <para>
+            is a control program for the indexer.
+          </para>
+          <indexterm zone="tracker tracker-prog">
+            <primary sortas="b-tracker">tracker</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libtracker-control">
+        <term><filename class="libraryfile">libtracker-control-2.0.so</filename></term>
+        <listitem>
+          <para>
+            contains control and monitoring functions for miners.
+          </para>
+          <indexterm zone="tracker libtracker-control">
+            <primary sortas="c-libtracker-control">libtracker-control-2.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libtracker-miner">
+        <term><filename class="libraryfile">libtracker-miner-2.0.so</filename></term>
+        <listitem>
+          <para>
+            contains data mining functions.
+          </para>
+          <indexterm zone="tracker libtracker-miner">
+            <primary sortas="c-libtracker-miner">libtracker-miner-2.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libtracker-sparql">
+        <term><filename class="libraryfile">libtracker-sparql-2.0.so</filename></term>
+        <listitem>
+          <para>
+            contains resource management and database functions.
+          </para>
+          <indexterm zone="tracker libtracker-sparql">
+            <primary sortas="c-libtracker-sparql">libtracker-sparql-2.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome/platform/tracker3-miners.xml
===================================================================
--- gnome/platform/tracker3-miners.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/tracker3-miners.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY tracker3-miners-download-http "&gnome-download-http;/tracker-miners/3.1/tracker-miners-&tracker3-miners-version;.tar.xz">
-  <!ENTITY tracker3-miners-download-ftp  "&gnome-download-ftp;/tracker-miners/3.1/tracker-miners-&tracker3-miners-version;.tar.xz">
-  <!ENTITY tracker3-miners-md5sum        "51978c7f6ba10dfda2ad377f3ded85f1">
-  <!ENTITY tracker3-miners-size          "3.9 MB">
-  <!ENTITY tracker3-miners-buildsize     "37 MB (with tests)">
+  <!ENTITY tracker3-miners-download-http "&gnome-download-http;/tracker-miners/3.0/tracker-miners-&tracker3-miners-version;.tar.xz">
+  <!ENTITY tracker3-miners-download-ftp  "&gnome-download-ftp;/tracker-miners/3.0/tracker-miners-&tracker3-miners-version;.tar.xz">
+  <!ENTITY tracker3-miners-md5sum        "93bd4224b7272f9d4e1a6988d2800e11">
+  <!ENTITY tracker3-miners-size          "3.8 MB">
+  <!ENTITY tracker3-miners-buildsize     "36 MB (with tests)">
   <!ENTITY tracker3-miners-time          "1.0 SBU (with tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -105,6 +106,4 @@
       <ulink url="https://libosinfo.org">libosinfo</ulink>, and
       <ulink url="https://gitlab.gnome.org/GNOME/gupnp">gupnp</ulink>
-      <!--<ulink url="https://pypi.python.org/pypi/tap.py/">tap.py</ulink>
-      (for tests)-->
     </para>
 
@@ -134,5 +133,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release -Dman=false .. &amp;&amp;
+meson --prefix=/usr -Dman=false .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -140,14 +139,10 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr                 \
-      --buildtype=release           \
-      -Dsystemd_user_services=false \
-      -Dman=false .. &amp;&amp;
+meson --prefix=/usr -Dsystemd_user_services=false -Dman=false .. &amp;&amp;
 ninja</userinput></screen>
 
     <para>
       To test the results, as the <systemitem class="username">root</systemitem>
-      user, issue: <command>ninja test</command>. <!-- 38 tests will fail if the
-      Python 3 module tap.py is not installed. -->
+      user, issue: <command>ninja test</command>.
     </para>
 
@@ -161,7 +156,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -176,11 +168,4 @@
       the build process from installing systemd units since they are useless
       on SysV systems.
-    </para>
-
-    <para>
-      <option>-Dseccomp=false</option>: This option disables the seccomp system
-      call filter. On some architectures, such as i686 and ARM, the functions
-      that tracker-miners uses are not guarded properly, and tracker-miners
-      will get killed with a SIGSYS as a result.
     </para>
 
@@ -205,5 +190,5 @@
         </seg>
         <seg>
-          Several modules under /usr/lib/tracker-miners-3.0
+          Several modules under /usr/lib/tracker-miners-3.0.
         </seg>
         <seg>
@@ -215,4 +200,3 @@
     </segmentedlist>
   </sect2>
-
 </sect1>
Index: gnome/platform/tracker3.xml
===================================================================
--- gnome/platform/tracker3.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/tracker3.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,11 +6,11 @@
 
   <!ENTITY tracker3-download-http
-           "&gnome-download-http;/tracker/3.1/tracker-&tracker3-version;.tar.xz">
+           "&gnome-download-http;/tracker/3.0/tracker-&tracker3-version;.tar.xz">
   <!ENTITY tracker3-download-ftp
-           "&gnome-download-ftp;/tracker/3.1/tracker-&tracker3-version;.tar.xz">
-  <!ENTITY tracker3-md5sum        "c2a38ecdfb792b25f6190092b69b15d3">
+           "&gnome-download-ftp;/tracker/3.0/tracker-&tracker3-version;.tar.xz">
+  <!ENTITY tracker3-md5sum        "d1cb71cb69aac7a8f98b360aef438d0b">
   <!ENTITY tracker3-size          "1.4 MB">
-  <!ENTITY tracker3-buildsize     "82 MB (with tests)">
-  <!ENTITY tracker3-time          "0.8 SBU (with tests)">
+  <!ENTITY tracker3-buildsize     "79 MB (with tests)">
+  <!ENTITY tracker3-time          "0.3 SBU (with tests)">
 ]>
 
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -72,5 +73,4 @@
     </itemizedlist>
 
-<!-- Not needed with 3.0.3, but keep around just in case
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -82,5 +82,4 @@
       </listitem>
     </itemizedlist>
--->
 
     <bridgehead renderas="sect3">Tracker Dependencies</bridgehead>
@@ -97,6 +96,8 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>,
-      <xref linkend="icu"/>, and
-      <xref linkend="sqlite"/>
+      <xref linkend="icu"/>,
+      <xref linkend="NetworkManager"/>,
+      <xref linkend="sqlite"/>, and
+      <xref linkend="upower"/>
     </para>
 
@@ -107,6 +108,5 @@
       <ulink url="https://github.com/scop/bash-completion/">bash-completion</ulink>, and
       <ulink url="https://github.com/snowballstem/snowball/">libstemmer</ulink>
-      <!--<ulink url="https://pypi.python.org/pypi/tap.py/">tap.py</ulink>
-      (for tests)-->
+      <!-- Python2 used to be a dependency until 2.2.1 -->
     </para>
 
@@ -120,4 +120,10 @@
 
     <para>
+      First, fix an incompatibility between Tracker and SQLite-3.34.0:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../tracker-&tracker3-version;-upstream_fixes-1.patch</userinput></screen>
+
+    <para>
       Install <application>Tracker</application> by running the following
       commands:
@@ -127,8 +133,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr       \
-      --buildtype=release \
-      -Ddocs=false        \
-      -Dman=false ..      &amp;&amp;
+meson --prefix=/usr -Ddocs=false -Dman=false .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -136,16 +139,10 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr      \
-      --buildtype=release \
-      -Ddocs=false       \
-      -Dman=false        \
-      -Dsystemd_user_services=false .. &amp;&amp;
+meson --prefix=/usr -Ddocs=false -Dman=false -Dsystemd_user_services=false .. &amp;&amp;
 ninja</userinput></screen>
 
     <para>
       To test the results, issue: <command>ninja test</command>. The tests
-      should be run from a graphical session. One test,
-      <filename>tracker:functional/portal</filename>, is known to timeout.
-      <!--14 tests will fail if the Python 3 module tap.py is not installed.-->
+      should be run from a graphical session.
     </para>
 
@@ -161,7 +158,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -204,7 +198,5 @@
         </seg>
         <seg>
-          /usr/{include,lib}/tracker-3.0,
-          /usr/libexec/tracker3,
-          /usr/share/tracker3, and
+          /usr/{include,lib,libexec}/tracker-3.0, /usr/share/tracker3, and
           /usr/share/gtk-doc/html/{libtracker-sparql,ontology}-3
         </seg>
@@ -221,5 +213,5 @@
         <listitem>
           <para>
-            is a control program for the indexer
+            is a control program for the indexer.
           </para>
           <indexterm zone="tracker3 tracker3-prog">
@@ -233,5 +225,5 @@
         <listitem>
           <para>
-            contains resource management and database functions
+            contains resource management and database functions.
           </para>
           <indexterm zone="tracker3 libtracker3-sparql">
Index: gnome/platform/vte.xml
===================================================================
--- gnome/platform/vte.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/vte.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY vte-download-http "https://gitlab.gnome.org/GNOME/vte/-/archive/&vte-version;/vte-&vte-version;.tar.gz">
-  <!ENTITY vte-download-ftp  " ">
-  <!ENTITY vte-md5sum        "692a2656eaf84165e2c8ffe9d84137d9">
-  <!ENTITY vte-size          "604 KB">
-  <!ENTITY vte-buildsize     "10 MB (with tests)">
-  <!ENTITY vte-time          "0.3 SBU (using parallelism=4; with tests)">
+  <!ENTITY vte-download-http "&gnome-download-http;/vte/0.62/vte-&vte-version;.tar.xz">
+  <!ENTITY vte-download-ftp  "&gnome-download-ftp;/vte/0.62/vte-&vte-version;.tar.xz">
+  <!ENTITY vte-md5sum        "b363c82b7d485d696fc1164bebca92b0">
+  <!ENTITY vte-size          "436 KB">
+  <!ENTITY vte-buildsize     "12 MB (with tests)">
+  <!ENTITY vte-time          "0.6 SBU (using parallelism=4; with tests)">
   <!-- Consolidating Tests/No Tests in GNOME sections for consistency. -->
 
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -85,7 +86,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="icu"/>,
-      <xref linkend="gnutls"/>,
-      <xref linkend="gobject-introspection"/>, and
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="gnutls"/>, and
       <xref linkend="vala"/>
     </para>
@@ -95,8 +95,5 @@
       <xref linkend="fribidi"/>,
       <xref linkend="gtk-doc"/>, and
-      <xref linkend="gtk4"/>
-      <!-- Does not currently work unless you pass -Dgtk4=true to meson. However,
-           it's not looking for gtk-4, it's looking for gtk+-4, so it will still
-           fail to build for now.-->
+      <ulink url="https://wiki.gnome.org/Projects/GTK/Roadmap/GTK4">GTK+-4</ulink>
     </para>
 
@@ -117,5 +114,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release -Dfribidi=false .. &amp;&amp;
+meson  --prefix=/usr -Dfribidi=false .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -123,8 +120,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr       \
-      --buildtype=release \
-      -Dfribidi=false     \
-      -D_systemd=false .. &amp;&amp;
+meson --prefix=/usr -Dfribidi=false -D_systemd=false .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -145,7 +139,4 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
     <para>
       <command>rm -v /etc/profile.d/vte.*</command>: This command removes two
@@ -173,9 +164,4 @@
     </para>
 
-    <!-- Uncomment once vte knows how to look for the proper gtk4
-    <para>
-      <option>-Dgtk4=true</option>: Add this switch to build the GTK4 widget.
-    </para>
-    -->
   </sect2>
 
@@ -219,5 +205,5 @@
           <para>
             is a test application for the <application>VTE</application>
-            libraries
+            libraries.
           </para>
           <indexterm zone="vte vte291">
@@ -232,5 +218,5 @@
           <para>
             is a library which implements a terminal emulator
-            widget for <application>GTK+ 3</application>
+            widget for <application>GTK+ 3</application>.
           </para>
           <indexterm zone="vte libvte291">
Index: gnome/platform/yelp-xsl.xml
===================================================================
--- gnome/platform/yelp-xsl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/yelp-xsl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,8 +5,8 @@
   %general-entities;
 
-  <!ENTITY yelp-xsl-download-http "&gnome-download-http;/yelp-xsl/&gnome-40;/yelp-xsl-&yelp-xsl-version;.tar.xz">
-  <!ENTITY yelp-xsl-download-ftp  "&gnome-download-ftp;/yelp-xsl/&gnome-40;/yelp-xsl-&yelp-xsl-version;.tar.xz">
-  <!ENTITY yelp-xsl-md5sum        "bc6b359d67ef5de6669acbda4daa843b">
-  <!ENTITY yelp-xsl-size          "648 KB">
+  <!ENTITY yelp-xsl-download-http "&gnome-download-http;/yelp-xsl/&gnome-minor-38;/yelp-xsl-&yelp-xsl-version;.tar.xz">
+  <!ENTITY yelp-xsl-download-ftp  "&gnome-download-ftp;/yelp-xsl/&gnome-minor-38;/yelp-xsl-&yelp-xsl-version;.tar.xz">
+  <!ENTITY yelp-xsl-md5sum        "6c434d5232eba465c77f194dbc64def4">
+  <!ENTITY yelp-xsl-size          "632 KB">
   <!ENTITY yelp-xsl-buildsize     "10 MB">
   <!ENTITY yelp-xsl-time          "less than 0.1 SBU">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: gnome/platform/yelp.xml
===================================================================
--- gnome/platform/yelp.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/yelp.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,8 +5,8 @@
   %general-entities;
 
-  <!ENTITY yelp-download-http "&gnome-download-http;/yelp/&gnome-40;/yelp-&yelp-version;.tar.xz">
-  <!ENTITY yelp-download-ftp  "&gnome-download-ftp;/yelp/&gnome-40;/yelp-&yelp-version;.tar.xz">
-  <!ENTITY yelp-md5sum        "e9d25bcdd9550d742b1f48a62a218955">
-  <!ENTITY yelp-size          "1.4 MB">
+  <!ENTITY yelp-download-http "&gnome-download-http;/yelp/&gnome-minor-38;/yelp-&yelp-version;.tar.xz">
+  <!ENTITY yelp-download-ftp  "&gnome-download-ftp;/yelp/&gnome-minor-38;/yelp-&yelp-version;.tar.xz">
+  <!ENTITY yelp-md5sum        "e36148a18c7e7203d69c9eab616cc096">
+  <!ENTITY yelp-size          "1.5 MB">
   <!ENTITY yelp-buildsize     "22 MB">
   <!ENTITY yelp-time          "0.1 SBU">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -178,5 +179,5 @@
         <listitem>
           <para>
-            is the <application>GNOME</application> Help Browser
+            is the <application>GNOME</application> Help Browser.
           </para>
           <indexterm zone="yelp yelp-prog">
@@ -190,5 +191,5 @@
         <listitem>
           <para>
-            contains the <application>Yelp</application> API functions
+            contains the <application>Yelp</application> API functions.
           </para>
           <indexterm zone="yelp libyelp">
Index: gnome/platform/zenity.xml
===================================================================
--- gnome/platform/zenity.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ gnome/platform/zenity.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -152,5 +153,5 @@
           <para>
             is a <application>Perl</application> wrapper script which
-            can be used with legacy scripts
+            can be used with legacy scripts.
           </para>
           <indexterm zone="zenity gdialog">
@@ -165,5 +166,5 @@
           <para>
             is a program that will display <application>GTK+</application>
-            dialogs, and return the user's input
+            dialogs, and return the user's input.
           </para>
           <indexterm zone="zenity zenity-prog">
Index: index.xml
===================================================================
--- index.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ index.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -4,4 +4,5 @@
 
 <!--
+$LastChangedBy$
 $Date$
 -->
Index: introduction/important/beyond.xml
===================================================================
--- introduction/important/beyond.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/important/beyond.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -118,5 +119,5 @@
       <para>If you are having a problem compiling the package, try
       searching the LFS archives at
-      <ulink url="https://www.&lfs-domainname;/search.html"/> for the error or if
+      <ulink url="http://www.&lfs-domainname;/search.html"/> for the error or if
       that fails, try searching Google. Often, a distribution will have already
       solved the problem (many of them use development versions of packages, so
Index: introduction/important/bootscripts.xml
===================================================================
--- introduction/important/bootscripts.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/important/bootscripts.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: introduction/important/building-notes.xml
===================================================================
--- introduction/important/building-notes.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/important/building-notes.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -91,7 +92,7 @@
 
   <sect2>
-    <title>Verifying File Integrity</title>
-
-    <para>Generally, to verify that the downloaded file is complete,
+    <title>Verifying File Integrity Using 'md5sum'</title>
+
+    <para>Generally, to verify that the downloaded file is genuine and complete,
     many package maintainers also distribute md5sums of the files. To verify the
     md5sum of the downloaded files, download both the file and the
@@ -111,56 +112,4 @@
 
 <screen><userinput>md5sum <replaceable>&lt;name_of_downloaded_file&gt;</replaceable></userinput></screen>
-
-    <para>MD5 is not cryptographically secure, so the md5sums are only
-    provided for detecting random errors or truncations introduced during
-    network transfer.  There is no <quote>100%</quote> secure way to make
-    sure the genuity of the source files.  Assuming the upstream is managing
-    their website correctly (the private key is not leaked and the domain is
-    not hijacked), and the trust anchors have been set up correctly using
-    <xref linkend="make-ca"/> on the BLFS system, we can reasonably trust
-    download URLs to the upstream official website
-    <emphasis role="bold">with https protocol</emphasis>.  Note that
-    BLFS book itself is published on a website with https, so you should
-    already have some confidence in https protocol or you wouldn't trust the
-    book content.</para>
-
-    <para>If the package is downloaded from an unofficial location (for
-    example a local mirror), checksums generated by cryptographically secure
-    digest algorithms (for example SHA256) can be used to verify the
-    genuity of the package.  Download the checksum file from the upstream
-    <emphasis role="bold">official</emphasis> website (or somewhere
-    <emphasis role="bold">you can trust</emphasis>) and compare the
-    checksum of the package from unoffical location with it.  For example,
-    SHA256 checksum can be checked with the command:</para>
-
-    <note>
-      <para>If the checksum and the package are downloaded from the same
-      untrusted location, you won't gain security enhancement by verifying
-      the package with the checksum. The attacker can fake the checksum as
-      well as compromising the package itself.</para>
-    </note>
-
-<screen><userinput>sha256sum -c <replaceable>file</replaceable>.sha256sum</userinput></screen>
-
-    <para>If <xref linkend="gnupg2"/> is installed, you can also verify the
-    genuity of the package with a GPG signature.  Import the upstream GPG
-    public key with:</para>
-
-<screen><userinput>gpg --recv-key <replaceable>keyID</replaceable></userinput></screen>
-
-    <para><replaceable>keyID</replaceable> should be replaced with the key ID
-    from somewhere <emphasis role="bold">you can trust</emphasis> (for
-    example, copy it from the upstream official website using https).  Now
-    you can verify the signature with:</para>
-
-<screen><userinput>gpg --recv-key <replaceable>file</replaceable>.sig <replaceable>file</replaceable></userinput></screen>
-
-    <para>The advantage of <application>GnuPG</application> signature is,
-    once you imported a public key which can be trusted, you can download
-    both the package and its signature from the same unofficial location and
-    verify them with the public key.  So you won't need to connect to the
-    official upstream website to retrieve a checksum for each new release.
-    You only need to update the public key if it's expired or revoked.
-    </para>
 
   </sect2>
@@ -457,13 +406,4 @@
     <title>Stripping One More Time</title>
 
-    <warning>
-      <para>If you did not strip programs and libraries in LFS,
-      the following will probably make your system unusable. To avoid that,
-      run the instructions at <ulink url="&lfs-root;/chapter08/strippingagain.html"/> 
-      instead.  After the critical files are  stripped using those instructions, 
-      the instructions below can be run any time new packages are installed.
-      </para>
-    </warning>
-
     <para>
       In LFS, stripping of debugging symbols was discussed a couple of
@@ -474,5 +414,5 @@
     </para>
 
-<screen><userinput>find /usr/{bin,lib,sbin} \
+<screen><userinput>find /{,usr/}{bin,lib,sbin} \
     -type f \( -name \*.so* -a ! -name \*dbg \) \
     -exec strip --strip-unneeded {} \;</userinput></screen>
@@ -675,12 +615,9 @@
         </listitem>
         <listitem>
-          <para>debug : '-g' - this is the default if nothing is specified
-          in either <filename>meson.build</filename> or the command line.
-          However it results large and slow binaries, so we should override
-          it in BLFS.</para>
+          <para>debug : '-g'</para>
         </listitem>
         <listitem>
-           <para>debugoptimized : '-O2 -g' : this is the default specified in
-           <filename>meson.build</filename> of some packages.</para>
+           <para>debugoptimized : '-O2 -g' - this is the default if nothing is
+           specified, it leaves assertions enabled.</para>
         </listitem>
         <listitem>
@@ -762,5 +699,5 @@
         replace the package's defaults, or even be ignored.  There are details
         on some desktop packages which were mostly current in April 2019 at
-        <ulink url="https://www.linuxfromscratch.org/~ken/tuning/"/> - in
+        <ulink url="http://www.linuxfromscratch.org/~ken/tuning/"/> - in
         particular, README.txt, tuning-1-packages-and-notes.txt, and
         tuning-notes-2B.txt. The particular thing to remember is that if you
Index: introduction/important/important.xml
===================================================================
--- introduction/important/important.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/important/important.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="important">
Index: introduction/important/la-files.xml
===================================================================
--- introduction/important/la-files.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/important/la-files.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: introduction/important/libraries.xml
===================================================================
--- introduction/important/libraries.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/important/libraries.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: introduction/important/locale-issues.xml
===================================================================
--- introduction/important/locale-issues.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/important/locale-issues.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: introduction/important/patches.xml
===================================================================
--- introduction/important/patches.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/important/patches.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
   <para>In short, the book only includes patches that are either required or
   recommended. There is a
-  <ulink url="https://www.&lfs-domainname;/patches">Patches subproject</ulink>
+  <ulink url="http://www.&lfs-domainname;/patches">Patches subproject</ulink>
   which hosts various patches (including the patches referenced in the books)
   to enable you to configure your LFS the way you like it.</para>
Index: introduction/important/pkgmgt.xml
===================================================================
--- introduction/important/pkgmgt.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/important/pkgmgt.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: introduction/important/position.xml
===================================================================
--- introduction/important/position.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/important/position.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: introduction/important/systemd-units.xml
===================================================================
--- introduction/important/systemd-units.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/important/systemd-units.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: introduction/introduction.xml
===================================================================
--- introduction/introduction.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/introduction.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <part id="introduction" xreflabel="Introduction">
Index: introduction/welcome/acknowledgments.xml
===================================================================
--- introduction/welcome/acknowledgments.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/welcome/acknowledgments.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: introduction/welcome/askhelp.xml
===================================================================
--- introduction/welcome/askhelp.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/welcome/askhelp.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -16,5 +17,5 @@
 
   <para>If you encounter a problem while using this book, and your problem
-  is not listed in the FAQ (<ulink url="https://www.&lfs-domainname;/faq"/>),
+  is not listed in the FAQ (<ulink url="http://www.&lfs-domainname;/faq"/>),
   you will find that most of the people on Internet Relay Chat (IRC) and on the
   mailing lists are willing to help you. An overview of the LFS mailing
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/welcome/changelog.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,7 +1,6 @@
 <?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 changelogs  "https://www.linuxfromscratch.org/blfs">
+  <!ENTITY changelogs  "http://www.linuxfromscratch.org/blfs">
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
@@ -14,4 +13,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -42,38 +42,2988 @@
     </listitem>
     -->
-
-    <listitem>
-      <para>September 5th, 2021</para>
-      <itemizedlist>
-        <listitem>
-          <para>[pierre] - Update to Linux-PAM-1.5.2. Fixes
-          <ulink url="&blfs-ticket-root;15497">#15497</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>September 3rd, 2021</para>
-      <itemizedlist>
-        <listitem>
-          <para>[renodr] - Update to libnsl-2.0.0. Fixes
-          <ulink url="&blfs-ticket-root;15410">#15410</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[dj] - Update to make-ca-1.8.1. Fixes
-          <ulink url="&blfs-ticket-root;15475">#15475</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>September 1st, 2021</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Release of BLFS-11.0.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
+    <listitem>
+      <para>January 2nd, 2021</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Fix the build of python bindings in
+          libmusicbrainz.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to ruby-3.0.0. Fixes
+          <ulink url="&blfs-ticket-root;14415">#14415</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to mesa-20.3.2. Fixes
+          <ulink url="&blfs-ticket-root;14448">#14448</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to python-dbusmock-0.21.0. Fixes
+          <ulink url="&blfs-ticket-root;14452">#14452</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to wget-1.21. Fixes
+          <ulink url="&blfs-ticket-root;14449">#14449</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to vim-8.2.2253. Addreses 
+          <ulink url="&blfs-ticket-root;12241">#12241</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>January 1st, 2021</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to cifs-utils-6.12. Fixes
+          <ulink url="&blfs-ticket-root;14451">#14451</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-disk-utility-3.38.1. Fixes
+          <ulink url="&blfs-ticket-root;14384">#14384</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to epiphany-3.38.2. Fixes
+          <ulink url="&blfs-ticket-root;14328">#14328</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to xscreensaver-5.45. Fixes
+          <ulink url="&blfs-ticket-root;14362">#14362</ulink>.</para>
+        </listitem>
+        <listitem revision="systemd">
+          <para>[renodr] - Add optional dependency on qrencode to systemd since
+          it is now available in BLFS.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to shared-mime-info-2.1. Fixes
+          <ulink url="&blfs-ticket-root;14450">#14450</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to plasma5-5.20.4. Fixes
+          <ulink url="&blfs-ticket-root;13991">#13991</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to smartmontools-7.2. Fixes
+          <ulink url="&blfs-ticket-root;14446">#14446</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to dhcpcd-9.4.0. Fixes
+          <ulink url="&blfs-ticket-root;14442">#14442</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libhandy-1.0.3. Fixes
+          <ulink url="&blfs-ticket-root;14433">#14433</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to geoclue-2.5.7. Fixes
+          <ulink url="&blfs-ticket-root;14432">#14432</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to opencv-4.5.1. Fixes
+          <ulink url="&blfs-ticket-root;14426">#14426</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Introduce the libqrencode-4.1.1 library, now
+          required for plasma.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to mousepad-0.5.1. Fixes
+          <ulink url="&blfs-ticket-root;14424">#14424</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xfce4-terminal-0.8.10. Fixes
+          <ulink url="&blfs-ticket-root;14429">#14429</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to parole-4.15.0. Fixes
+          <ulink url="&blfs-ticket-root;14440">#14440</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xfce4-4.16. Fixes
+          <ulink url="&blfs-ticket-root;14428">#14428</ulink>, 
+          <ulink url="&blfs-ticket-root;13942">#13942</ulink>, and
+          <ulink url="&blfs-ticket-root;14427">#14427</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 31st, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update to KDE frameworks applications 20.12.0. Fixes
+          <ulink url="&blfs-ticket-root;13990">#13990</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to harfbuzz-2.7.4. Move to meson build
+          system. Fixes
+          <ulink url="&blfs-ticket-root;14444">#14444</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 30th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to git-2.30.0. Fixes
+          <ulink url="&blfs-ticket-root;14441">#14441</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to umockdev-0.15.3. Fixes
+          <ulink url="&blfs-ticket-root;14438">#14438</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to OpenJPEG-2.4.0 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;14445">#14445</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 29th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to doxygen-1.9.0. Fixes
+          <ulink url="&blfs-ticket-root;14439">#14439</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xterm-363. Fixes
+          <ulink url="&blfs-ticket-root;14436">#14436</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libarchive-3.5.1. Fixes
+          <ulink url="&blfs-ticket-root;14435">#14435</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to mpg123-1.26.4. Fixes
+          <ulink url="&blfs-ticket-root;14434">#14434</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to harfbuzz-2.7.3. Fixes
+          <ulink url="&blfs-ticket-root;14431">#14431</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to dash-0.5.11.3. Fixes
+          <ulink url="&blfs-ticket-root;14430">#14430</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 28th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to samba-4.13.3. Fixes
+          <ulink url="&blfs-ticket-root;14387">#14387</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libwacom-1.7. Fixes
+          <ulink url="&blfs-ticket-root;14394">#14394</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to enchant-2.2.15. Fixes
+          <ulink url="&blfs-ticket-root;14425">#14425</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libepoxy-1.5.5. Fixes
+          <ulink url="&blfs-ticket-root;14423">#14423</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to SDL2-2.0.14. Fixes
+          <ulink url="&blfs-ticket-root;14422">#14422</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gmime-3.2.7.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to balsa-2.6.2. Fixes
+          <ulink url="&blfs-ticket-root;14421">#14421</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to highlight-3.60. Fixes
+          <ulink url="&blfs-ticket-root;14420">#14420</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libgpg-error-1.41. Fixes
+          <ulink url="&blfs-ticket-root;14419">#14419</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gnupg-2.2.26. Fixes
+          <ulink url="&blfs-ticket-root;14418">#14418</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to sysstat-12.5.2. Fixes
+          <ulink url="&blfs-ticket-root;14413">#14413</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to wireshark-3.4.2. Fixes
+          <ulink url="&blfs-ticket-root;14404">#14404</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to php-8.0.0. Fixes
+          <ulink url="&blfs-ticket-root;14326">#14326</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 25th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to thunderbird-78.6.0 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;14329">#14329</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 24th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to libreoffice-7.0.4.2. Fixes
+          <ulink url="&blfs-ticket-root;14402">#14402</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gtkmm-3.24.3. Fixes
+          <ulink url="&blfs-ticket-root;14381">#14381</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gtk+-2.24.33. Fixes
+          <ulink url="&blfs-ticket-root;14416">#14416</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 21st, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to atkmm-2.28.1. Fixes
+          <ulink url="&blfs-ticket-root;14380">#14380</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to pangomm-2.42.2. Fixes
+          <ulink url="&blfs-ticket-root;14382">#14382</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to glib-2.66.4. Fixes
+          <ulink url="&blfs-ticket-root;14397">#14397</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gegl-0.4.28. Fixes
+          <ulink url="&blfs-ticket-root;14012">#14012</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to babl-0.1.84. Fixes
+          <ulink url="&blfs-ticket-root;14017">#14017</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to sudo-1.9.4p2. Fixes
+          <ulink url="&blfs-ticket-root;14011">#14011</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to python-dbusmock-0.20.0. Fixes
+          <ulink url="&blfs-ticket-root;14409">#14409</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to elogind-246.9.1. Fixes
+          <ulink url="&blfs-ticket-root;14408">#14408</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to tiff-4.2.0. Fixes
+          <ulink url="&blfs-ticket-root;14407">#14407</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 20th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update to extra-cmake-modules, oxygen-icons,
+          breeze-icons, and KDE-frameworks 5.77. Fixes
+          <ulink url="&blfs-ticket-root;14014">#14014</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 19th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to WebKitGTK+-2.30.4. Fixes
+          <ulink url="&blfs-ticket-root;14388">#14388</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 18th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to icu4c-68_2. Fixes
+          <ulink url="&blfs-ticket-root;14399">#14399</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to sudo-1.9.4p1. Fixes
+          <ulink url="&blfs-ticket-root;14398">#14398</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to LWP-Protocol-https-6.10 (Perl Module). Fixes
+          <ulink url="&blfs-ticket-root;14401">#14401</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to node-14.15.3. Fixes
+          <ulink url="&blfs-ticket-root;14400">#14400</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to bind-9.16.10 (including utils). Fixes
+          <ulink url="&blfs-ticket-root;14396">#14396</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to mesa-20.3.1. Fixes
+          <ulink url="&blfs-ticket-root;14339">#14339</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 17th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to cmake-3.19.2. Fixes
+          <ulink url="&blfs-ticket-root;14395">#14395</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to pipewire-0.3.18. Fixes
+          <ulink url="&blfs-ticket-root;14392">#14392</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to node-14.15.2. Fixes
+          <ulink url="&blfs-ticket-root;14390">#14390</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to icewm-2.0.0. Fixes
+          <ulink url="&blfs-ticket-root;14383">#14383</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to fftw-3.3.9. Fixes
+          <ulink url="&blfs-ticket-root;14379">#14379</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xarchiver-0.5.4.16. Fixes
+          <ulink url="&blfs-ticket-root;14377">#14377</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to enchant-2.2.14. Fixes
+          <ulink url="&blfs-ticket-root;14376">#14376</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to imlib2-1.7.1. Fixes
+          <ulink url="&blfs-ticket-root;14375">#14375</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libva-2.10.0 (Xorg Driver). Fixes
+          <ulink url="&blfs-ticket-root;14374">#14374</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 16th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to gdm-3.38.2.1 (security update). Fixes
+          <ulink url="&blfs-ticket-root;14391">#14391</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Patch biber so that tests work with current
+          Unicode::Collate. Fixes
+          <ulink url="&blfs-ticket-root;14389">#14389</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Update to dvisvgm-2.11. Fixes
+          <ulink url="&blfs-ticket-root;14318">#14318</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to wireshark-3.4.1. Fixes
+          <ulink url="&blfs-ticket-root;14366">#14366</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to nss-3.60. Fixes
+          <ulink url="&blfs-ticket-root;14370">#14370</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 15th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to p11-kit-0.23.22 (security update). Fixes
+          <ulink url="&blfs-ticket-root;14371">#14371</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to boost-1.75.0. Fixes
+          <ulink url="&blfs-ticket-root;14373">#14373</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Python-3.9.1. Fixes
+          <ulink url="&blfs-ticket-root;14355">#14355</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libcap-2.46. Fixes
+          <ulink url="&blfs-ticket-root;14378">#14378</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Update to firefox-78.6.0 (security fixes) and JS 78.6.0. Fixes
+          <ulink url="&blfs-ticket-root;14386">#14386</ulink> and
+          <ulink url="&blfs-ticket-root;14385">#14385</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 14th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to mutter-3.38.2. Fixes
+          <ulink url="&blfs-ticket-root;14334">#14334</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-shell-3.38.2. Fixes
+          <ulink url="&blfs-ticket-root;14333">#14333</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-shell-extensions-3.38.2. Fixes
+          <ulink url="&blfs-ticket-root;14333">#14333</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-tweaks-3.34.1. Fixes
+          <ulink url="&blfs-ticket-root;14369">#14369</ulink>.</para>
+        </listitem>
+        <listitem revision="systemd">
+          <para>[renodr] - Adapt gnome-session to changes in systemd-247. Fixes
+          <ulink url="&blfs-ticket-root;14341">#14341</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 13th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Add inih-r52. Required for xfsprogs-5.10.0.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xfsprogs-5.10.0. Fixes
+          <ulink url="&blfs-ticket-root;14372">#14372</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libusb-1.0.24. Fixes
+          <ulink url="&blfs-ticket-root;14368">#14368</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to qemu-5.2.0. Fixes
+          <ulink url="&blfs-ticket-root;14360">#14360</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 11th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to NetworkManager-1.28.0. Fixes
+          <ulink url="&blfs-ticket-root;14348">#14348</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to tracker-3.0.2. Fixes
+          <ulink url="&blfs-ticket-root;14361">#14361</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to tracker-miners-3.0.3. Fixes
+          <ulink url="&blfs-ticket-root;14364">#14364</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to fuse-3.10.1. Fixes
+          <ulink url="&blfs-ticket-root;14353">#14353</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to curl-7.74.0 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;14363">#14363</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 10th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Update to mutt-2.0.3. Fixes
+          <ulink url="&blfs-ticket-root;14344">#14344</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Update to fetchmail-6.4.14. Fixes
+          <ulink url="&blfs-ticket-root;14314">#14314</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 9th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Adapt libwacom to upstream udev changes.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - MuPDF requires GLU. Fixes
+          <ulink url="&blfs-ticket-root;14365">#14365</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update the qtwebengine patch to fix the build.
+          This involved rebasing the patch to add a missing header include
+          in the libxml portion of the code.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 8th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to gdk-pixbuf-2.42.2. Fixes
+          <ulink url="&blfs-ticket-root;14359">#14359</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to sbc-1.5. Fixes
+          <ulink url="&blfs-ticket-root;14358">#14358</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to mlt-6.24.0. Fixes
+          <ulink url="&blfs-ticket-root;14357">#14357</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to unrar-6.0.3. Fixes
+          <ulink url="&blfs-ticket-root;14354">#14354</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gstreamer gst-plugins-base gst-plugins-good 
+                           gst-plugins-bad gst-plugins-ugly gstreamer-vaapi 
+                           gst-libav 1.18.2. Fixes
+          <ulink url="&blfs-ticket-root;14350">#14350</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xine-lib-1.2.11. Fixes
+          <ulink url="&blfs-ticket-root;14351">#14351</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 7th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Allow pulseaudio-14 to build without BlueZ5 and SBC. Fixes
+          <ulink url="&blfs-ticket-root;14352">#14352</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to feh-3.6.1. Fixes
+          <ulink url="&blfs-ticket-root;14349">#14349</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Pygments-2.7.3. Fixes
+          <ulink url="&blfs-ticket-root;14347">#14347</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to poppler-20.12.1. Fixes
+          <ulink url="&blfs-ticket-root;14346">#14346</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 5th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to gtk+3.24.24. Fixes
+          <ulink url="&blfs-ticket-root;14343">#14343</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to pyxdg-0.27. Fixes
+          <ulink url="&blfs-ticket-root;14342">#14342</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 5th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to cups-filters-1.28.6. Fixes
+          <ulink url="&blfs-ticket-root;14335">#14335</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to pcre2-10.36. Fixes 
+          <ulink url="&blfs-ticket-root;14340">#14340</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to xorg-server-1.20.10 (Security Update).
+          Fixes <ulink url="&blfs-ticket-root;14322">#14322</ulink>.</para>
+        </listitem>
+        <listitem revision="systemd">
+          <para>[renodr] - Update to systemd-247. Fixes
+          <ulink url="&blfs-ticket-root;14176">#14176</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to nano-5.4. Fixes
+          <ulink url="&blfs-ticket-root;14330">#14330</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libtirpc-1.3.1. Fixes
+          <ulink url="&blfs-ticket-root;14331">#14331</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to GnuTLS-3.7.0. Fixes
+          <ulink url="&blfs-ticket-root;14332">#14332</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Adapt xf86-input-wacom to changes in udev.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to unbound-1.13.0(security update). Fixes 
+          <ulink url="&blfs-ticket-root;14338">#14338</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to mercurial-5.6.1. Fixes 
+          <ulink url="&blfs-ticket-root;14337">#14337</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to lua-5.4.2. Fixes 
+          <ulink url="&blfs-ticket-root;14336">#14336</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 4th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to vim-8.2.2070. Addresses 
+          <ulink url="&blfs-ticket-root;12241">#12241</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 2nd, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Remove unnecessary patch from libarchive.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to sqlite-autoconf-3.34.0. Fixes
+          <ulink url="&blfs-ticket-root;14327">#14327</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to poppler-20.12.0. Fixes
+          <ulink url="&blfs-ticket-root;14325">#14325</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libarchive-3.5.0. Fixes
+          <ulink url="&blfs-ticket-root;14324">#14324</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to pulseaudio-14.0. Fixes
+          <ulink url="&blfs-ticket-root;14302">#14302</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>December 1st, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to sudo-1.9.4. Fixes
+          <ulink url="&blfs-ticket-root;14320">#14320</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to feh-3.6. Fixes
+          <ulink url="&blfs-ticket-root;14321">#14321</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libsigc++-2.10.6. Fixes
+          <ulink url="&blfs-ticket-root;14307">#14307</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libsigc++-3.0.6. Fixes
+          <ulink url="&blfs-ticket-root;14308">#14308</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to glibmm-2.64.5. Fixes
+          <ulink url="&blfs-ticket-root;14323">#14323</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to umockdev-0.15.2. Fixes
+          <ulink url="&blfs-ticket-root;14309">#14309</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to Mousepad-0.5.0. Fixes
+          <ulink url="&blfs-ticket-root;14274">#14274</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to php-7.4.13. Fixes
+          <ulink url="&blfs-ticket-root;14311">#14311</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to bind-9.16.9 (including utils). Fixes
+          <ulink url="&blfs-ticket-root;14312">#14312</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>November 30th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to py3c-1.3 (Python Module). Fixes
+          <ulink url="&blfs-ticket-root;14319">#14319</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to dhcpcd-9.3.4. Fixes
+          <ulink url="&blfs-ticket-root;14317">#14317</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to Linux-PAM-1.5.1 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;14306">#14306</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>November 28th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to lxml-4.6.2. Fixes
+          <ulink url="&blfs-ticket-root;14313">#14313</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libinput-1.16.4. Fixes
+          <ulink url="&blfs-ticket-root;14315">#14315</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to pipewire-0.3.17. Fixes
+          <ulink url="&blfs-ticket-root;14316">#14316</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Amend details for dvisvgm-2.10.1 to match the current
+          source tarball. Really fixes
+          <ulink url="&blfs-ticket-root;14059">#14059</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>November 26th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Update to asymptote-2.68. Fixes
+          <ulink url="&blfs-ticket-root;14297">#14297</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Update to dvisvgm-2.10.1. Fixes
+          <ulink url="&blfs-ticket-root;14059">#14059</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Update to mutt-2.0.2 (Security fix if connecting
+          to an IMAP server). Fixes
+          <ulink url="&blfs-ticket-root;14217">#14217</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to yelp-xsl-3.38.2. Fixes
+          <ulink url="&blfs-ticket-root;14290">#14290</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-desktop-3.38.2. Fixes
+          <ulink url="&blfs-ticket-root;14305">#14305</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to evolution-data-server-3.38.2. Fixes
+          <ulink url="&blfs-ticket-root;14282">#14282</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to evolution-3.38.2. Fixes
+          <ulink url="&blfs-ticket-root;14284">#14284</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to dconf-editor-3.38.2. Fixes
+          <ulink url="&blfs-ticket-root;14296">#14296</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to nautilus-3.38.2. Fixes
+          <ulink url="&blfs-ticket-root;14283">#14283</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-control-center-3.38.2. Fixes
+          <ulink url="&blfs-ticket-root;14267">#14267</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-user-docs-3.38.2. Fixes
+          <ulink url="&blfs-ticket-root;14289">#14289</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to yelp-3.38.2. Fixes
+          <ulink url="&blfs-ticket-root;14303">#14303</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to eog-3.38.1. Fixes
+          <ulink url="&blfs-ticket-root;14292">#14292</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-calculator-3.38.2. Fixes
+          <ulink url="&blfs-ticket-root;14293">#14293</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-maps-3.38.2. Fixes
+          <ulink url="&blfs-ticket-root;14294">#14294</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gedit-3.38.1. Fixes
+          <ulink url="&blfs-ticket-root;14273">#14273</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>November 25th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to WebKitGTK+-2.30.3 (security update). Fixes
+          <ulink url="&blfs-ticket-root;14281">#14281</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to cmake-3.19.1. Fixes
+          <ulink url="&blfs-ticket-root;14304">#14304</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>November 24th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to nghttp2-1.42.0. Fixes
+          <ulink url="&blfs-ticket-root;14301">#14301</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to mesa-20.2.3. Fixes
+          <ulink url="&blfs-ticket-root;14299">#14299</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gnupg-2.2.25. Fixes
+          <ulink url="&blfs-ticket-root;14298">#14298</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libxkbcommon-1.0.3. Fixes
+          <ulink url="&blfs-ticket-root;14300">#14300</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[thomas] - Add a patch to cmake-3.19.0.
+            Thanks to Pierre for finding it.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>November 22nd, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to scour-0.38.2 (Python Module). Fixes
+          <ulink url="&blfs-ticket-root;14295">#14295</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to sysstat-12.5.1. Fixes
+          <ulink url="&blfs-ticket-root;14288">#14288</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to hdparm-9.60. Fixes
+          <ulink url="&blfs-ticket-root;14287">#14287</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to qpdf-10.0.4. Fixes
+          <ulink url="&blfs-ticket-root;14286">#14286</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to glibmm-2.64.4. Fixes
+          <ulink url="&blfs-ticket-root;14285">#14285</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to tepl-5.0.1. Fixes
+          <ulink url="&blfs-ticket-root;14280">#14280</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to dhcpcd-9.3.3. Fixes
+          <ulink url="&blfs-ticket-root;14278">#14278</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to pipewire-0.3.16. Fixes
+          <ulink url="&blfs-ticket-root;14270">#14270</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to librsvg-2.50.2. Fixes
+          <ulink url="&blfs-ticket-root;14277">#14277</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libxkbcommon-1.0.2. Fixes
+          <ulink url="&blfs-ticket-root;14276">#14276</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libseccomp-2.5.1. Fixes
+          <ulink url="&blfs-ticket-root;14275">#14275</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libX11-1.7.0 (Xorg Library). Fixes
+          <ulink url="&blfs-ticket-root;14279">#14279</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xprop-1.2.5 (Xorg app). Fixes
+          <ulink url="&blfs-ticket-root;14268">#14268</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>November 21st, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Update to seamonkey-2.53.5.1. Includes revised
+          security fix. Fixes
+          <ulink url="&blfs-ticket-root;14269">#14269</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Patch libexif for security fixes. Fixes
+          <ulink url="&blfs-ticket-root;14272">#14272</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Patch libxml2 for security fixes. Fixes
+          <ulink url="&blfs-ticket-root;14271">#14271</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>November 20th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to qtwebengine-5.15.2. Fixes
+          <ulink url="&blfs-ticket-root;14266">#14266</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to qt-everywhere-src-5.15.2. Addresses
+          <ulink url="&blfs-ticket-root;14266">#14266</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>November 19th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to Thunderbird-78.5.0 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;14264">#14264</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to Net-DNS-1.29 (Perl Module). Fixes
+          <ulink url="&blfs-ticket-root;14262">#14262</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to krb5-1.18.3 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;14258">#14258</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to umockdev-0.15.1. Fixes
+          <ulink url="&blfs-ticket-root;14259">#14259</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to tcsh-6.22.03. Fixes
+          <ulink url="&blfs-ticket-root;14260">#14260</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libksba-1.5.0. Fixes
+          <ulink url="&blfs-ticket-root;14261">#14261</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to cmake-3.19.0. Fixes
+          <ulink url="&blfs-ticket-root;14263">#14263</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to vala-0.50.2. Fixes
+          <ulink url="&blfs-ticket-root;14265">#14265</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to c-ares-1.17.1 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;14255">#14255</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to Node.JS-14.15.1 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;14252">#14252</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gtk-doc-1.33.1. Fixes
+          <ulink url="&blfs-ticket-root;14257">#14257</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to ModemManager-1.14.8. Fixes
+          <ulink url="&blfs-ticket-root;14254">#14254</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to GnuPG-2.2.24. Fixes
+          <ulink url="&blfs-ticket-root;14256">#14256</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>November 17th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[timtas] - Update to libjpeg-turbo-2.0.6. Fixes
+          <ulink url="&blfs-ticket-root;14253">#14253</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>November 16th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Update firmware page for intel microcode-20201112. Fixes
+          <ulink url="&blfs-ticket-root;14233">#14233</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to NSS-3.59. Fixes
+          <ulink url="&blfs-ticket-root;14244">#14244</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to glib-2.66.3. Fixes
+          <ulink url="&blfs-ticket-root;14249">#14249</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to tumbler-0.3.1. Fixes
+          <ulink url="&blfs-ticket-root;14247">#14247</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to umockdev-0.15. Fixes
+          <ulink url="&blfs-ticket-root;14251">#14251</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Update to Firefox-78.5.0 and JS78-78.5.0 (security fixes). Fixes
+          <ulink url="&blfs-ticket-root;14250">#14250</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to paxmirabilis-20201030 (pax). Fixes
+          <ulink url="&blfs-ticket-root;14248">#14248</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>November 15th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to highlight-3.59. Fixes
+          <ulink url="&blfs-ticket-root;14245">#14245</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libcap-2.45. Fixes
+          <ulink url="&blfs-ticket-root;14203">#14203</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Update to seamonkey-2.53.5. Includes security fixes. Fixes
+          <ulink url="&blfs-ticket-root;14246">#14246</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>November 13th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Add a security patch to fix issues in raptor. Fixes
+          <ulink url="&blfs-ticket-root;14243">#14243</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gpgme-1.15.0. Fixes
+          <ulink url="&blfs-ticket-root;14242">#14242</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>November 12th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to PostgreSQL-13.1 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;14241">#14241</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to thunderbird-78.4.3. Fixes
+          <ulink url="&blfs-ticket-root;14237">#14237</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libhandy-1.0.2. Fixes
+          <ulink url="&blfs-ticket-root;14239">#14239</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to unrar-6.0.2. Fixes
+          <ulink url="&blfs-ticket-root;14240">#14240</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to mariadb-10.5.8. Fixes
+          <ulink url="&blfs-ticket-root;14235">#14235</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xterm-362. Fixes
+          <ulink url="&blfs-ticket-root;14236">#14236</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to LSB-Tools-0.9. Fixes
+          <ulink url="&blfs-ticket-root;14234">#14234</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>November 11th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Added gdk-pixbuf-xlib. Fixes
+          <ulink url="&blfs-ticket-root;14225">#14225</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gdk-pixbuf-2.42.0. Fixes
+          <ulink url="&blfs-ticket-root;14224">#14224</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Archive libhandy-0.x.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Port gnome-tweaks to libhandy1. Fixes
+          <ulink url="&blfs-ticket-root;14226">#14226</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to mesa-20.2.2. Fixes
+          <ulink url="&blfs-ticket-root;14219">#14219</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to seahorse-3.38.0.1. Fixes
+          <ulink url="&blfs-ticket-root;14220">#14220</ulink>.</para> 
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to fontforge-20201107. Fixes
+          <ulink url="&blfs-ticket-root;14221">#14221</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to pango-1.48.0. Fixes
+          <ulink url="&blfs-ticket-root;14222">#14222</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to xfconf-4.14.4. Fixes
+          <ulink url="&blfs-ticket-root;14223">#14223</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Linux-PAM-1.5.0. Fixes
+          <ulink url="&blfs-ticket-root;14231">#14231</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[timtas] - Update to openldap-2.4.56. Fixes
+          <ulink url="&blfs-ticket-root;14232">#14232</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>November 10th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Patch Seamonkey against CVE-2020-26950. This update
+          is urgent and should be applied to your system as soon as possible.
+          Fixes <ulink url="&blfs-ticket-root;14227">#14227</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to icewm-1.9.2. Fixes
+          <ulink url="&blfs-ticket-root;14230">#14230</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to thunderbird-78.4.2. Contains an urgent
+          security fix. Fixes
+          <ulink url="&blfs-ticket-root;14216">#14216</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[timtas] - Update to sshfs-3.7.1. Fixes
+          <ulink url="&blfs-ticket-root;14229">#14229</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>November 9th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to Firefox-78.4.1 and JS78-78.4.1. Contains
+          an urgent security fix. Fixes
+          <ulink url="&blfs-ticket-root;14228">#14228</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to postfix-3.5.8. Fixes
+          <ulink url="&blfs-ticket-root;14218">#14218</ulink>.</para> 
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>November 6th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to bluefish-2.2.12. Fixes
+          <ulink url="&blfs-ticket-root;14215">#14215</ulink>.</para> 
+        </listitem>
+        <listitem>
+          <para>[pierre] - Recommend Xorg libs for SDL and SDL2, and Wayland
+          for SDL2: some dependent packages assume the corresponding modules
+          exist.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>November 5th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Patch asymptote-2.67 to build with
+          ghostscript-9.53.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to xkbcomp-1.4.4 (Xorg Application). Fixes
+          <ulink url="&blfs-ticket-root;14214">#14214</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to icewm-1.9.1. Fixes
+          <ulink url="&blfs-ticket-root;14213">#14213</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to enchant-2.2.13. Fixes
+          <ulink url="&blfs-ticket-root;14204">#14204</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to dhcpcd-9.3.2. Fixes
+          <ulink url="&blfs-ticket-root;14201">#14201</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to pycryptodome-3.9.9 (Python Module). Fixes
+          <ulink url="&blfs-ticket-root;14200">#14200</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to liblinear-242. Fixes
+          <ulink url="&blfs-ticket-root;14196">#14196</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to qpdf-10.0.3. Fixes
+          <ulink url="&blfs-ticket-root;14197">#14197</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to mercurial-5.6. Fixes
+          <ulink url="&blfs-ticket-root;14207">#14207</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>November 4th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to Thunar-1.8.16. Fixes
+          <ulink url="&blfs-ticket-root;14194">#14194</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to poppler-20.11.0. Fixes
+          <ulink url="&blfs-ticket-root;14199">#14199</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to colord-1.4.5. Fixes
+          <ulink url="&blfs-ticket-root;14206">#14206</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to xfdesktop-4.14.3. Fixes
+          <ulink url="&blfs-ticket-root;14202">#14202</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to xfwm4-4.14.6. Fixes
+          <ulink url="&blfs-ticket-root;14198">#14198</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libdrm-2.4.103. Fixes
+          <ulink url="&blfs-ticket-root;14212">#14212</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libwacom-1.6. Fixes
+          <ulink url="&blfs-ticket-root;14205">#14205</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libinput-1.16.3. Fixes
+          <ulink url="&blfs-ticket-root;14211">#14211</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Fix python2's install procedures to omit
+          unneeded files.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to mariadb-10.5.7 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;14210">#14210</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iptables-1.8.6. Fixes
+          <ulink url="&blfs-ticket-root;14195">#14195</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to pipewire-0.3.15. Fixes
+          <ulink url="&blfs-ticket-root;14193">#14193</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libhandy-1.0.1. Fixes
+          <ulink url="&blfs-ticket-root;14191">#14191</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to icewm-1.9.0. Fixes
+          <ulink url="&blfs-ticket-root;14190">#14190</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gdm-3.38.2. Fixes
+          <ulink url="&blfs-ticket-root;14209">#14209</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libreoffice-7.0.3.1 and adapt to ICU-68.
+          This allows Libreoffice to use system ICU again. Fixes
+          <ulink url="&blfs-ticket-root;14189">#14189</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to wireshark-3.4.0. Fixes
+          <ulink url="&blfs-ticket-root;14188">#14188</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to php-7.4.12. Fixes
+          <ulink url="&blfs-ticket-root;14187">#14187</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>November 3rd, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Add a patch to telepathy-glib to fix various issues.
+          These issues include porting the tests, examples, and internal tools
+          to python3, fixing memory leaks, porting to modern build machinery,
+          and fixing the testsuite to work with glib-2.46 and later.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to samba-4.13.2. Fixes a data corruption
+          issue involving systems with the vfs_glusterfs module. Fixes
+          <ulink url="&blfs-ticket-root;14208">#14208</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to git-2.29.2. Fixes
+          <ulink url="&blfs-ticket-root;14186">#14186</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to asciidoc-9.0.4. Fixes
+          <ulink url="&blfs-ticket-root;14192">#14192</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Patch qtwebengine to build with
+          ICU68.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>November 1st, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Do not use system icu in libreoffice, ICU-68
+          breaks at least one of the external tarballs.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 30th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Fix libxml2 build when ICU-68 is used.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to node.js-14.15.0. Fixes
+          <ulink url="&blfs-ticket-root;14181">#14181</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to Samba-4.13.1 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;14185">#14185</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libass-0.15.0 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;14183">#14183</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to qpdf-10.0.2. Fixes
+          <ulink url="&blfs-ticket-root;14182">#14182</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 29th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to icu4c-68_1-src. Fixes
+          <ulink url="&blfs-ticket-root;14184">#14184</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 27th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update the gstreamer stack to 1.18.1. Fixes
+          <ulink url="&blfs-ticket-root;14179">#14179</ulink>. Includes
+          several security fixes.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to lxtask-0.1.10. Fixes
+          <ulink url="&blfs-ticket-root;14178">#14178</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[timtas] - Update to openldap-2.4.55. Fixes
+          <ulink url="&blfs-ticket-root;14177">#14177</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 26th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Update to rustc-1.47.0 to allow system llvm-11 to be
+          used. Patch firefox and thunderbird for this. Fixes
+          <ulink url="&blfs-ticket-root;14142">#14142</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Update to llvm-11.0.0. Fixes
+          <ulink url="&blfs-ticket-root;14133">#14133</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to Pygments-2.7.2. Fixes
+          <ulink url="&blfs-ticket-root;14173">#14173</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to git-2.29.1. Fixes
+          <ulink url="&blfs-ticket-root;14171">#14171</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to Net-DNS-1.28 (Perl Module). Fixes
+          <ulink url="&blfs-ticket-root;14170">#14170</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to umockdev-0.14.4. Fixes
+          <ulink url="&blfs-ticket-root;14169">#14169</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libgcrypt-1.8.7. Fixes
+          <ulink url="&blfs-ticket-root;14168">#14168</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gdb-10.1. Fixes
+          <ulink url="&blfs-ticket-root;14174">#14174</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libassuan-2.5.4. Fixes
+          <ulink url="&blfs-ticket-root;14167">#14167</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 25th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to libevdev-1.10.0. Fixes
+          <ulink url="&blfs-ticket-root;14175">#14175</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to btrfs-progs-v5.9. Fixes
+          <ulink url="&blfs-ticket-root;14166">#14166</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 23rd, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Update to thunderbird-78.4.0 (security fix). Fixes
+          <ulink url="&blfs-ticket-root;14100">#14100</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 23rd, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to unrar-6.0.1. Fixes
+          <ulink url="&blfs-ticket-root;14163">#14163</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to usbutils-013. Fixes
+          <ulink url="&blfs-ticket-root;14164">#14164</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to WebKitGTK+-2.30.2. Fixes
+          <ulink url="&blfs-ticket-root;14165">#14165</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - In scour-0.38.1 fix the test invocation, and
+          drop the python2 module since nothing in the book uses it.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 22nd, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to nfs-utils-2.5.2. Fixes
+          <ulink url="&blfs-ticket-root;14161">#14161</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to bind9 and bind-utils 9.16.8. Fixes
+          <ulink url="&blfs-ticket-root;14160">#14160</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to URI-5.05 (Perl Module). Fixes
+          <ulink url="&blfs-ticket-root;14159">#14159</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to List-MoreUtils-0.430 (Perl Module). Fixes
+          <ulink url="&blfs-ticket-root;14158">#14158</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to List-MoreUtils-XS-0.430 (Perl Module).
+          Fixes <ulink url="&blfs-ticket-root;14162">#14162</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to poppler-data-0.4.10. Fixes
+          <ulink url="&blfs-ticket-root;14157">#14157</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to faad2-2_10_0. Fixes
+          <ulink url="&blfs-ticket-root;14156">#14156</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to alsa-lib, alsa-firmware, and alsa-utils
+          1.2.4. Fixes 
+          <ulink url="&blfs-ticket-root;14135">#14135</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to xfsprogs-5.9.0. Fixes
+          <ulink url="&blfs-ticket-root;14154">#14154</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 21st, 2020</para>
+      <itemizedlist>
+        <listitem revision="systemd">
+          <para>[renodr] - Add configuration instructions for the systemd 
+          variant of TigerVNC.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Adapt gnome-nettool to work with current versions of
+          ping, ping6, and netstat.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to epiphany-3.38.1. Finishes
+          <ulink url="&blfs-ticket-root;14032">#14032</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gedit-3.38.0. Part of
+          <ulink url="&blfs-ticket-root;14032">#14032</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-terminal-3.38.1. Part of
+          <ulink url="&blfs-ticket-root;14032">#14032</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-system-monitor-3.38.0. Part of
+          <ulink url="&blfs-ticket-root;14032">#14032</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-screenshot-3.38.0. Part of
+          <ulink url="&blfs-ticket-root;14032">#14032</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-maps-3.38.1.1. Part of
+          <ulink url="&blfs-ticket-root;14032">#14032</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-disk-utility-3.38.0. Part of
+          <ulink url="&blfs-ticket-root;14032">#14032</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-calculator-3.38.0. Part of
+          <ulink url="&blfs-ticket-root;14032">#14032</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to file-roller-3.38.0. Part of
+          <ulink url="&blfs-ticket-root;14032">#14032</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to evolution-3.38.1. Part of
+          <ulink url="&blfs-ticket-root;14032">#14032</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to NetworkManager-1.26.4. Fixes
+          <ulink url="&blfs-ticket-root;14139">#14139</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to ModemManager-1.14.6. Fixes
+          <ulink url="&blfs-ticket-root;14138">#14138</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to openldap-2.4.54. Fixes
+          <ulink url="&blfs-ticket-root;14135">#14135</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 20th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Patch ghostscript to fix a build failure with
+          freetype-2.10.3 and later.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Update to freetype-2.10.4 (security fix). Fixes
+          <ulink url="&blfs-ticket-root;14153">#14153</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to git-2.29.0. Fixes
+          <ulink url="&blfs-ticket-root;14152">#14152</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 19th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Fixed a regression in avahi that leads to severe 
+          log spam on systems with multiple NICs installed and that have IPv6
+          enabled.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to glib2-2.66.2. Contains a fix for European 
+          Daylight Savings Time. Fixes
+          <ulink url="&blfs-ticket-root;14150">#14150</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to curl-7.73.0. Fixes
+          <ulink url="&blfs-ticket-root;14140">#14140</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Update to firefox-78.4.0 (security fixes) and
+          JS78.4.0. Fixes
+          <ulink url="&blfs-ticket-root;14151">#14151</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to lxml-4.6.1 (Perl Module). Fixes
+          <ulink url="&blfs-ticket-root;14149">#14149</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 18th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Update to LSB-Tools-0.8.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to evince-3.38.0 and restore DVI support.
+          Part of <ulink url="&blfs-ticket-root;14032">#14032</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to lxml-4.6.0 (Perl Module). Fixes
+          <ulink url="&blfs-ticket-root;14148">#14148</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to asciidoc-9.0.3. Fixes
+          <ulink url="&blfs-ticket-root;14147">#14147</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 17th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to nss-3.58. Fixes
+          <ulink url="&blfs-ticket-root;14146">#14146</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to soundtouch-2.2. Fixes
+          <ulink url="&blfs-ticket-root;14145">#14145</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to enchant-2.2.12. Fixes
+          <ulink url="&blfs-ticket-root;14144">#14144</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to sysprof-3.38.1. Fixes
+          <ulink url="&blfs-ticket-root;14143">#14143</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to opencv-4.5.0. Fixes
+          <ulink url="&blfs-ticket-root;14132">#14132</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 16th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to xterm-361. Fixes
+          <ulink url="&blfs-ticket-root;14141">#14141</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to LibRaw-0.20.2. Fixes
+          <ulink url="&blfs-ticket-root;14137">#14137</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to stunnel-5.57. Fixes
+          <ulink url="&blfs-ticket-root;14128">#14128</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libpwquality-1.4.4. Fixes
+          <ulink url="&blfs-ticket-root;14130">#14130</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 15th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to dhcpcd-9.3.1. Fixes
+          <ulink url="&blfs-ticket-root;14134">#14134</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libpwquality-1.4.3. Fixes
+          <ulink url="&blfs-ticket-root;14130">#14130</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to cups-filters-1.28.5. Fixes
+          <ulink url="&blfs-ticket-root;14115">#14115</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libcap-2.44. Fixes
+          <ulink url="&blfs-ticket-root;14096">#14096</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Python-3.9.0. Fixes
+          <ulink url="&blfs-ticket-root;14098">#14098</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to mesa-20.2.1. Fixes
+          <ulink url="&blfs-ticket-root;14077">#14077</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to EOG-3.38.0. Part of
+          <ulink url="&blfs-ticket-root;14032">#14032</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to baobab-3.38.0. Part of
+          <ulink url="&blfs-ticket-root;14032">#14032</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Added libportal. Fixes 
+          <ulink url="&blfs-ticket-root;14038">#14038</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gdm-3.38.1. Fixes
+          <ulink url="&blfs-ticket-root;14136">#14136</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Fix the dependency on tracker3 in
+          tracker-miners3.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 14th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to cups-filters-1.28.4. Fixes
+          <ulink url="&blfs-ticket-root;14115">#14115</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libreoffice-7.0.2.2. Fixes
+          <ulink url="&blfs-ticket-root;14114">#14114</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to nmap-7.91. Fixes
+          <ulink url="&blfs-ticket-root;14123">#14123</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 13th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to mupdf-1.18.0. Fixes
+          <ulink url="&blfs-ticket-root;14110">#14110</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to mariadb-10.5.6. Fixes
+          <ulink url="&blfs-ticket-root;14109">#14109</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 12th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to yelp-3.38.1. Finishes
+          <ulink url="&blfs-ticket-root;14031">#14031</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-user-docs-3.38.1. Part of
+          <ulink url="&blfs-ticket-root;14031">#14031</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gdm-3.38.0. Part of
+          <ulink url="&blfs-ticket-root;14031">#14031</ulink>.</para>
+        </listitem>
+        <listitem revision="sysv">
+          <para>[renodr] - Adapt GDM to build on SysV systems.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-session-3.38.0. Part of
+          <ulink url="&blfs-ticket-root;14031">#14031</ulink>.</para>
+        </listitem>
+        <listitem revision="sysv">
+          <para>[renodr] - Adapt gnome-session to build on SysV systems.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-shell-extensions-3.38.1. Part of
+          <ulink url="&blfs-ticket-root;14031">#14031</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-shell-3.38.1. Part of
+          <ulink url="&blfs-ticket-root;14031">#14031</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to mutter-3.38.1. Part of
+          <ulink url="&blfs-ticket-root;14031">#14031</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-control-center-3.38.1. Part of
+          <ulink url="&blfs-ticket-root;14031">#14031</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-settings-daemon-3.38.1. Part of
+          <ulink url="&blfs-ticket-root;14031">#14031</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-bluetooth-3.34.3. Part of
+          <ulink url="&blfs-ticket-root;14031">#14031</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 11th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to gnome-backgrounds-3.38.0. Part of
+          <ulink url="&blfs-ticket-root;14031">#14031</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to fuse-3.10.0. Fixes
+          <ulink url="&blfs-ticket-root;14122">#14122</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to samba-4.13.0. Fixes
+          <ulink url="&blfs-ticket-root;14057">#14057</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gvfs-1.46.1. Part of
+          <ulink url="&blfs-ticket-root;14031">#14031</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to nautilus-3.38.1. Part of
+          <ulink url="&blfs-ticket-root;14031">#14031</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to freetype-2.10.3. Fixes
+          <ulink url="&blfs-ticket-root;14125">#14125</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to lua-5.4.1. Fixes
+          <ulink url="&blfs-ticket-root;14121">#14121</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xcb-proto-1.14.1. Fixes
+          <ulink url="&blfs-ticket-root;14112">#14112</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to cbindgen-0.15.0. Fixes
+          <ulink url="&blfs-ticket-root;14108">#14108</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libqmi-1.26.6. Fixes
+          <ulink url="&blfs-ticket-root;14107">#14107</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to node-12.19.0. Fixes
+          <ulink url="&blfs-ticket-root;14103">#14103</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to cmake-3.18.4. Fixes
+          <ulink url="&blfs-ticket-root;14102">#14102</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to dhcpcd-9.3.0. Fixes
+          <ulink url="&blfs-ticket-root;14099">#14099</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gjs-1.66.1. Fixes
+          <ulink url="&blfs-ticket-root;14117">#14117</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libsecret-0.20.4. Fixes
+          <ulink url="&blfs-ticket-root;14124">#14124</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to vte-0.62.1. Fixes
+          <ulink url="&blfs-ticket-root;14118">#14118</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to yelp-xsl-3.38.1. Fixes
+          <ulink url="&blfs-ticket-root;14116">#14116</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-online-accounts-3.38.0. Fixes
+          <ulink url="&blfs-ticket-root;14120">#14120</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 9th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[thomas] - Update to unbound-1.12.0. Fixes
+          <ulink url="&blfs-ticket-root;14113">#14113</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 8th, 2020</para>
+      <itemizedlist>
+        <listitem revision="sysv">
+          <para>[renodr] - Adapt tracker-3 and tracker-miners-3 to build
+          properly on SysV systems.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to Tracker-Miners-3.0 and move to a separate
+          page. Fixes
+          <ulink url="&blfs-ticket-root;14030">#14030</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to Tracker-3.0.1 and move to a separate page.
+          Part of <ulink url="&blfs-ticket-root;14030">#14030</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to dconf-0.38.0. Part of
+          <ulink url="&blfs-ticket-root;14031">#14031</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to dconf-editor-3.38.0. Part of
+          <ulink url="&blfs-ticket-root;14031">#14031</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to evolution-data-server-3.38.1. Part of
+          <ulink url="&blfs-ticket-root;14030">#14030</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libpeas-1.28.0. Part of
+          <ulink url="&blfs-ticket-root;14030">#14030</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to cheese-3.38.0. Part of
+          <ulink url="&blfs-ticket-root;14032">#14032</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-desktop-3.38.1. Part of
+          <ulink url="&blfs-ticket-root;14030">#14030</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to yelp-xsl-3.38.0. Part of
+          <ulink url="&blfs-ticket-root;14030">#14030</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to VTE-0.62.0. Part of
+          <ulink url="&blfs-ticket-root;14030">#14030</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gsettings-desktop-schemas-3.38.0. Part of
+          <ulink url="&blfs-ticket-root;14030">#14030</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Drop the Python2 version of PyCryptodome.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to nano-5.3. Fixes
+          <ulink url="&blfs-ticket-root;14106">#14106</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libinput-1.16.2 (Xorg Driver). Fixes
+          <ulink url="&blfs-ticket-root;14105">#14105</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to XML-Writer-0.900 (Perl Module). Fixes
+          <ulink url="&blfs-ticket-root;14104">#14104</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xkeyboard-config-2.31. Fixes
+          <ulink url="&blfs-ticket-root;14101">#14101</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to pycairo-1.20.0 (Python module). Fixes
+          <ulink url="&blfs-ticket-root;12497">#12497</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 7th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to gimp-2.10.22. Fixes
+          <ulink url="&blfs-ticket-root;14095">#14095</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to cairomm-1.16.0. Fixes
+          <ulink url="&blfs-ticket-root;14079">#14079</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Add libsigc++-3.0.4. Fixes
+          <ulink url="&blfs-ticket-root;12483">#12483</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 6th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to iw-5.9. Fixes
+          <ulink url="&blfs-ticket-root;14091">#14091</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gobject-introspection-1.66.1. Fixes
+          <ulink url="&blfs-ticket-root;14094">#14094</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to ruby-2.7.2. Fixes
+          <ulink url="&blfs-ticket-root;14090">#14090</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 5th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to php-7.4.11. Fixes
+          <ulink url="&blfs-ticket-root;14087">#14087</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to poppler-20.10.0. Fixes
+          <ulink url="&blfs-ticket-root;14085">#14085</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to glib-2.66.1. Fixes
+          <ulink url="&blfs-ticket-root;14083">#14083</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 4th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to gtk-doc-1.33.0. Fixes
+          <ulink url="&blfs-ticket-root;14086">#14086</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libmbim-1.24.4. Fixes
+          <ulink url="&blfs-ticket-root;14084">#14084</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to ibus-1.5.23. Fixes
+          <ulink url="&blfs-ticket-root;14080">#14080</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Python-3.8.6. Fixes
+          <ulink url="&blfs-ticket-root;14066">#14066</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to ghostscript-9.53.3. Fixes
+          <ulink url="&blfs-ticket-root;14093">#14093</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to nmap-7.90. Fixes
+          <ulink url="&blfs-ticket-root;14092">#14092</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to mercurial-5.5.2. Fixes
+          <ulink url="&blfs-ticket-root;14089">#14089</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to librsvg-2.50.1. Fixes
+          <ulink url="&blfs-ticket-root;14088">#14088</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[thomas] - Update to apache-ant-1.10.9. Fixes
+          <ulink url="&blfs-ticket-root;14082">#14082</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 2nd, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to vala-0.50.1. Part of
+          <ulink url="&blfs-ticket-root;14029">#14029</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libsigc++-2.10.4. Part of
+          <ulink url="&blfs-ticket-root;14029">#14029</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gjs-1.66.0. Part of
+          <ulink url="&blfs-ticket-root;14030">#14030</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gcr-3.38.0. Part of
+          <ulink url="&blfs-ticket-root;14030">#14030</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to WebKitGTK+-2.30.1. Finishes
+          <ulink url="&blfs-ticket-root;14029">#14029</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    
+    <listitem>
+      <para>September 29th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to pipewire-0.3.13. Fixes
+          <ulink url="&blfs-ticket-root;14078">#14078</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    
+    <listitem>
+      <para>September 28th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to openssh-8.4p1. Fixes
+          <ulink url="&blfs-ticket-root;14075">#14075</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to cairomm-1.14.0. Fixes
+          <ulink url="&blfs-ticket-root;14076">#14076</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    
+    <listitem>
+      <para>September 27th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[timtas] - Fix libnsl installation. Fixes
+          <ulink url="&blfs-ticket-root;14069">#14069</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Remove the boot script installation for
+          AccountsServices (SysV): it is not needed since the daemon is
+          automatically started by D-Bus.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Unicode-Collate-1.29. Fixes
+          <ulink url="&blfs-ticket-root;14074">#14074</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    
+    <listitem>
+      <para>September 26th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to ghostscript-9.53.2. Fixes
+          <ulink url="&blfs-ticket-root;14071">#14071</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libva-2.9.0. Fixes
+          <ulink url="&blfs-ticket-root;14072">#14072</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to thunderbird-78.3.1 (emergency fix). Fixes
+          <ulink url="&blfs-ticket-root;14073">#14073</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to pipewire-0.3.12. Fixes
+          <ulink url="&blfs-ticket-root;14033">#14033</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    
+    <listitem>
+      <para>September 25th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to pipewire-0.3.11. Fixes
+          <ulink url="&blfs-ticket-root;14033">#14033</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to libnsl-1.3.0. Fixes
+          <ulink url="&blfs-ticket-root;14069">#14069</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to cups-filters-1.28.3. Fixes
+          <ulink url="&blfs-ticket-root;14068">#14068</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to postgresql-13.0. Fixes
+          <ulink url="&blfs-ticket-root;14067">#14067</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to libuv-1.40.0. Fixes
+          <ulink url="&blfs-ticket-root;14065">#14065</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to thunderbird-78.3.0 (security fix). Fixes
+          <ulink url="&blfs-ticket-root;14064">#14064</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to wireshark-3.2.7. Fixes
+          <ulink url="&blfs-ticket-root;14063">#14063</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to sudo-1.9.3p1. Fixes
+          <ulink url="&blfs-ticket-root;14062">#14062</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    
+    <listitem>
+      <para>September 24th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[thomas] - Update to cmake-3.18.3. Fixes
+          <ulink url="&blfs-ticket-root;14061">#14061</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    
+    <listitem>
+      <para>September 23rd, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to seamonkey-2.53.4. Fixes
+          <ulink url="&blfs-ticket-root;14058">#14058</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Unicode-Collate-1.28. Fixes
+          <ulink url="&blfs-ticket-root;14060">#14060</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to amtk-5.2.0. Part of
+          <ulink url="&blfs-ticket-root;14029">#14029</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to at-spi2-core-2.38.0. Part of
+          <ulink url="&blfs-ticket-root;14029">#14029</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to at-spi2-atk-2.38.0. Part of
+          <ulink url="&blfs-ticket-root;14029">#14029</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to pyatspi-2.38.0. Part of
+          <ulink url="&blfs-ticket-root;14029">#14029</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gtksourceview-4.8.0. Part of
+          <ulink url="&blfs-ticket-root;14029">#14029</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libhandy-1.0.0 and split into a different
+          page, since this major release is needed for two packages in the book,
+          but incompatible with others. Part of
+          <ulink url="&blfs-ticket-root;14029">#14029</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to tepl-5.0.0. Part of
+          <ulink url="&blfs-ticket-root;14029">#14029</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>September 22nd, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to cbindgen-0.14.6. Fixes
+          <ulink url="&blfs-ticket-root;14056">#14056</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to sudo-1.9.3. Fixes
+          <ulink url="&blfs-ticket-root;14055">#14055</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>September 21st, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to adwaita-icon-theme-3.38.0. Part of
+          <ulink url="&blfs-ticket-root;14029">#14029</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to librsvg-2.50.0. Part of
+          <ulink url="&blfs-ticket-root;14029">#14029</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libsoup-2.72.0. Part of
+          <ulink url="&blfs-ticket-root;14029">#14029</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to glib-networking-2.66.0. Part of
+          <ulink url="&blfs-ticket-root;14029">#14029</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Update to firefox-78.3.0 (security fixes) and
+          JS78.3.0. Fixes
+          <ulink url="&blfs-ticket-root;14054">#14054</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libdazzle-3.38.0. Part of
+          <ulink url="&blfs-ticket-root;14029">#14029</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Add sysprof-3.38.0. Fixes
+          <ulink url="&blfs-ticket-root;14051">#14051</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xterm-360. Fixes
+          <ulink url="&blfs-ticket-root;14053">#14053</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>September 20th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to cbindgen-0.14.5. Fixes
+          <ulink url="&blfs-ticket-root;14052">#14052</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to Samba-4.12.7 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;14047">#14047</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Patch gtk-doc so that glib2 can be built without
+          downloading a development version of gtk-doc.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>September 19th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Update to nss-3.57. Fixes
+          <ulink url="&blfs-ticket-root;14050">#14050</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to pygobject-3.38.0. Part of
+          <ulink url="&blfs-ticket-root;14029">#14029</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to json-glib-1.6.0. Part of
+          <ulink url="&blfs-ticket-root;14029">#14029</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Adapt NetworkManager to build with the latest
+          pygobject.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Adapt the tests in libpeas to meson-0.55. Note that
+          this affects the new version of libpeas as well.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Disable documentation generation for the python2
+          version of dbus-python. This is due to changes in docutils being
+          python3 only.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - In preperation for the removal of the python2 module
+          in pygobject3's update, force the dbus tests to use python3.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to bind-9.16.7. Fixes
+          <ulink url="&blfs-ticket-root;14042">#14042</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to pango-1.46.2. Fixes
+          <ulink url="&blfs-ticket-root;14048">#14048</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to nspr-4.29. Fixes
+          <ulink url="&blfs-ticket-root;14046">#14046</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Pygments-2.7.1 (Python Module). Fixes
+          <ulink url="&blfs-ticket-root;14044">#14044</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to PerlIO-utf8_strict-0.008 (Perl Module). Fixes
+          <ulink url="&blfs-ticket-root;14049">#14049</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Log-Log4perl-1.53 (Perl Module). Fixes
+          <ulink url="&blfs-ticket-root;14045">#14045</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>September 17th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to node-12.18.4. Fixes
+          <ulink url="&blfs-ticket-root;14040">#14040</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to icewm-1.8.3. Fixes
+          <ulink url="&blfs-ticket-root;14041">#14041</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to mesa-20.1.8. Fixes
+          <ulink url="&blfs-ticket-root;14043">#14043</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>September 16th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to libgudev-234. Part of
+          <ulink url="&blfs-ticket-root;14029">#14029</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to vala-0.50.0. Part of
+          <ulink url="&blfs-ticket-root;14029">#14029</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gobject-introspection-1.66.0. Part of
+          <ulink url="&blfs-ticket-root;14029">#14029</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to glib-2.66.0. Part of
+          <ulink url="&blfs-ticket-root;14029">#14029</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to polkit-0.118. Fixes
+          <ulink url="&blfs-ticket-root;14028">#14028</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>September 15th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to cups-filters-1.28.2. Fixes
+          <ulink url="&blfs-ticket-root;14034">#14034</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to ghostscript-9.53.1. Fixes
+          <ulink url="&blfs-ticket-root;14035">#14035</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libxkbcommon-1.0.1. Fixes
+          <ulink url="&blfs-ticket-root;14037">#14037</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to pygments-2.7.0 (Python Module). Fixes
+          <ulink url="&blfs-ticket-root;14039">#14039</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Net-DNS-1.27 (Perl module). Fixes
+          <ulink url="&blfs-ticket-root;14036">#14036</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>September 14th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Update to biber-2.15 with biblatex-3.15a. Fixes
+          <ulink url="&blfs-ticket-root;13934">#13934</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>September 13th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update the gstreamer stack to 1.18.0. Fixes
+          <ulink url="&blfs-ticket-root;14023">#14023</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Promote clang in LLVM from Optional to
+          Recommended. Add clang as a required dependency for firefox.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>September 12th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to gnome-user-docs-3.36.0. Fixes
+          <ulink url="&blfs-ticket-root;14011">#14011</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to tracker-2.3.6. Fixes
+          <ulink url="&blfs-ticket-root;14016">#14016</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to tracker-miners-2.3.5. Fixes
+          <ulink url="&blfs-ticket-root;14016">#14016</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-desktop-3.36.6. Fixes
+          <ulink url="&blfs-ticket-root;14025">#14025</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to Thunderbird-78.2.2, and modify the
+          build instructions for a smaller and faster build. Fixes
+          <ulink url="&blfs-ticket-root;13969">#13969</ulink> and 
+          <ulink url="&blfs-ticket-root;13982">#13982</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>September 11th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to tigervnc-1.11.0. Fixes
+          <ulink url="&blfs-ticket-root;14024">#14024</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to highlight-3.58. Fixes
+          <ulink url="&blfs-ticket-root;14027">#14027</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to OpenLDAP-2.4.53. Fixes
+          <ulink url="&blfs-ticket-root;14018">#14018</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>September 10th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to qt-everywhere-src-5.15.1 and 
+          qtwebengine-everywhere-src-5.15.1. Fixes
+          <ulink url="&blfs-ticket-root;14026">#14026</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>September 8th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update to inkscape-1.0.1. Fixes
+          <ulink url="&blfs-ticket-root;14022">#14022</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to mutter-3.36.6. Fixes
+          <ulink url="&blfs-ticket-root;14021">#14021</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to gnome-shell-3.36.6. Fixes
+          <ulink url="&blfs-ticket-root;14020">#14020</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to enchant-2.2.11. Fixes
+          <ulink url="&blfs-ticket-root;14017">#14017</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to icewm-1.8.2. Fixes
+          <ulink url="&blfs-ticket-root;14019">#14019</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>September 7th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to libxkbcommon-1.0.0. Fixes
+          <ulink url="&blfs-ticket-root;14015">#14015</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to dhcpcd-9.2.0. Fixes
+          <ulink url="&blfs-ticket-root;14013">#14013</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to bluez-5.55. Fixes
+          <ulink url="&blfs-ticket-root;14012">#14012</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Update to fetchmail-6.4.12. Fixes
+          <ulink url="&blfs-ticket-root;13977">#13977</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Update to mutt-1.14.7. Fixes
+          <ulink url="&blfs-ticket-root;13980">#13980</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>September 6th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to libreoffice-7.0.1.2. Fixes
+          <ulink url="&blfs-ticket-root;13999">#13999</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to cryptsetup-2.3.4. Fixes
+          <ulink url="&blfs-ticket-root;13995">#13995</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to postfix-3.5.7. Fixes
+          <ulink url="&blfs-ticket-root;13983">#13983</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to brotli-1.0.9. Fixes
+          <ulink url="&blfs-ticket-root;13973">#13973</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to scour-0.38.1. Fixes
+          <ulink url="&blfs-ticket-root;13997">#13997</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to vala-0.48.10. Fixes
+          <ulink url="&blfs-ticket-root;14008">#14008</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to unixODBC-2.3.9. Fixes
+          <ulink url="&blfs-ticket-root;13986">#13986</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gnupg-2.2.23. Fixes
+          <ulink url="&blfs-ticket-root;13974">#13974</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to enchant-2.2.10. Fixes
+          <ulink url="&blfs-ticket-root;13957">#13957</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Log-Log4perl-1.52 (Perl Module). Fixes
+          <ulink url="&blfs-ticket-root;14010">#14010</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to List-AllUtils-0.18 (Perl Module). Fixes
+          <ulink url="&blfs-ticket-root;14009">#14009</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to HTML-Parser-3.75 (Perl Module). Fixes
+          <ulink url="&blfs-ticket-root;13971">#13971</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>September 5th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to glib-2.64.5. Fixes
+          <ulink url="&blfs-ticket-root;13941">#13941</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to cifs-utils-6.11 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;13998">#13998</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libgdata-0.17.13. Fixes
+          <ulink url="&blfs-ticket-root;13994">#13994</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to grilo-0.3.13. Fixes
+          <ulink url="&blfs-ticket-root;13993">#13993</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libwacom-1.5. Fixes
+          <ulink url="&blfs-ticket-root;13985">#13985</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to telepathy-mission-control-5.16.6. Fixes
+          <ulink url="&blfs-ticket-root;13970">#13970</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to tracker-miners-2.3.4. Fixes
+          <ulink url="&blfs-ticket-root;13964">#13964</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to tracker-2.3.5. Fixes
+          <ulink url="&blfs-ticket-root;13964">#13964</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to BIND and BIND Utilites-9.16.6 (Security
+          Update).
+          Fixes <ulink url="&blfs-ticket-root;13949">#13949</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to umockdev-0.14.3. Fixes
+          <ulink url="&blfs-ticket-root;13959">#13959</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to js-68.12.0 (from firefox esr). Fixes
+          <ulink url="&blfs-ticket-root;14006">#14006</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to xfsprogs-5.8.0. Fixes
+          <ulink url="&blfs-ticket-root;14005">#14005</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to gnutls-3.6.15 (security update). Fixes
+          <ulink url="&blfs-ticket-root;14004">#14004</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to at-spi2-core-2.36.1. Fixes
+          <ulink url="&blfs-ticket-root;14003">#14003</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to gtk+-3.24.23. Fixes
+          <ulink url="&blfs-ticket-root;14002">#14002</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to amtk-5.1.2. Fixes
+          <ulink url="&blfs-ticket-root;14001">#14001</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to gspell-1.8.4. Fixes
+          <ulink url="&blfs-ticket-root;14000">#14000</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to php-7.4.10. Fixes
+          <ulink url="&blfs-ticket-root;13996">#13996</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to mercurial-5.5.1. Fixes
+          <ulink url="&blfs-ticket-root;13989">#13989</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to cups-filters-1.28.1. Fixes
+          <ulink url="&blfs-ticket-root;13972">#13972</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[thomas] - Update to poppler-20.09.0. Fixes
+          <ulink url="&blfs-ticket-root;13988">#13988</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+        
+    <listitem>
+      <para>September 4th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to pipewire-0.3.10. Fixes
+          <ulink url="&blfs-ticket-root;13943">#13943</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to icewm-1.8.1. Fixes
+          <ulink url="&blfs-ticket-root;13984">#13984</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to feh-3.5. Fixes
+          <ulink url="&blfs-ticket-root;13981">#13981</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to harfbuzz-2.7.1. Fixes
+          <ulink url="&blfs-ticket-root;13978">#13978</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iw-5.8. Fixes
+          <ulink url="&blfs-ticket-root;13975">#13975</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libgpg-error-1.39. Fixes
+          <ulink url="&blfs-ticket-root;13961">#13961</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to nasm-2.15.05. Fixes
+          <ulink url="&blfs-ticket-root;13952">#13952</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to cbindgen-0.14.4. Fixes
+          <ulink url="&blfs-ticket-root;13951">#13951</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to pango-1.46.1. Fixes
+          <ulink url="&blfs-ticket-root;13948">#13948</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to mesa-20.1.7. Fixes
+          <ulink url="&blfs-ticket-root;13946">#13946</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to p11-kit-0.23.21. Fixes
+          <ulink url="&blfs-ticket-root;13939">#13939</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>September 3rd, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to doxygen-1.8.20. Fixes
+          <ulink url="&blfs-ticket-root;13962">#13962</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libX11-1.6.12 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;13967">#13967</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to xorg-server-1.20.9 (Security Update).
+          Fixes <ulink url="&blfs-ticket-root;13968">#13968</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to xapian-1.4.17. Fixes
+          <ulink url="&blfs-ticket-root;13956">#13956</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xfce4-notifyd-0.6.2. Fixes
+          <ulink url="&blfs-ticket-root;13987">#13987</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to links-2.21. Fixes
+          <ulink url="&blfs-ticket-root;13936">#13936</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to scour-0.38. Fixes
+          <ulink url="&blfs-ticket-root;13935">#13935</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libcap-2.43. Fixes
+          <ulink url="&blfs-ticket-root;13931">#13931</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>September 2nd, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to cmake-3.18.2. Fixes
+          <ulink url="&blfs-ticket-root;13950">#13950</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libuv-1.39.0. Fixes
+          <ulink url="&blfs-ticket-root;13966">#13966</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Correct the md5sum for perl module dependency
+          IPC-System-Simple-1.30.tar.gz, noticed by Chris Gorman.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to openldap-2.4.52. Fixes
+          <ulink url="&blfs-ticket-root;13979">#13979</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to curl-7.72.0. Fixes
+          <ulink url="&blfs-ticket-root;13945">#13945</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to nspr-4.28. Fixes
+          <ulink url="&blfs-ticket-root;13954">#13954</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to NSS-3.56. Fixes
+          <ulink url="&blfs-ticket-root;13955">#13955</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to NetworkManager-1.26.2. Fixes
+          <ulink url="&blfs-ticket-root;13944">#13944</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libqmi-1.26.4. Fixes
+          <ulink url="&blfs-ticket-root;13958">#13958</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to ModemManager-1.14.2. Fixes
+          <ulink url="&blfs-ticket-root;13947">#13947</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>September 1st, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Release of BLFS-10.0.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
   </itemizedlist>
+
 </sect1>
Index: introduction/welcome/contact.xml
===================================================================
--- introduction/welcome/contact.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/welcome/contact.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: introduction/welcome/conventions.xml
===================================================================
--- introduction/welcome/conventions.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/welcome/conventions.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -45,5 +46,5 @@
   </blockquote>
 
-  <para><ulink url="https://www.&lfs-domainname;/"/></para>
+  <para><ulink url="http://www.&lfs-domainname;/"/></para>
 
   <blockquote>
Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/welcome/credits.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: introduction/welcome/maillists.xml
===================================================================
--- introduction/welcome/maillists.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/welcome/maillists.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -21,5 +22,5 @@
   <para>For more information regarding which lists are available, how to
   subscribe to them, archive locations, etc., visit
-  <ulink url="https://www.&lfs-domainname;/mail.html"/>.</para>
+  <ulink url="http://www.&lfs-domainname;/mail.html"/>.</para>
 
 </sect1>
Index: introduction/welcome/mirrors.xml
===================================================================
--- introduction/welcome/mirrors.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/welcome/mirrors.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -17,5 +18,5 @@
   <para>The BLFS project has a number of mirrors set up world-wide to make it
   easier and more convenient for you to access the website. Please visit the
-  <ulink url="https://www.&lfs-domainname;/mirrors.html"/> website for the
+  <ulink url="http://www.&lfs-domainname;/mirrors.html"/> website for the
   list of current mirrors.</para>
 
Index: introduction/welcome/newsserver.xml
===================================================================
--- introduction/welcome/newsserver.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/welcome/newsserver.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: introduction/welcome/packages.xml
===================================================================
--- introduction/welcome/packages.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/welcome/packages.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -25,6 +26,6 @@
   State University Open Source Lab, has made an HTTP/FTP site available through
   world wide mirrors.  See <ulink
-  url="https://www.linuxfromscratch.org/blfs/download.html#sources">
-  https://www.linuxfromscratch.org/blfs/download.html#sources</ulink> for a
+  url="http://www.linuxfromscratch.org/blfs/download.html#sources">
+  http://www.linuxfromscratch.org/blfs/download.html#sources</ulink> for a
   list.  These sites have all the sources of the exact versions of the packages
   used in BLFS.  If you can't find the BLFS package you need at the listed
Index: introduction/welcome/version.xml
===================================================================
--- introduction/welcome/version.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/welcome/version.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -20,5 +21,5 @@
   month, it's likely that your mirror hasn't been synchronized recently and a
   newer version is probably available for download or viewing. Check one of the
-  mirror sites at <ulink url="https://www.&lfs-domainname;/mirrors.html"/> for
+  mirror sites at <ulink url="http://www.&lfs-domainname;/mirrors.html"/> for
   an updated version.</para>
 
Index: introduction/welcome/welcome.xml
===================================================================
--- introduction/welcome/welcome.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/welcome/welcome.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="welcome">
Index: introduction/welcome/which.xml
===================================================================
--- introduction/welcome/which.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/welcome/which.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: introduction/welcome/wiki.xml
===================================================================
--- introduction/welcome/wiki.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ introduction/welcome/wiki.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: kde/extra-cmake-modules.xml
===================================================================
--- kde/extra-cmake-modules.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/extra-cmake-modules.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
    <!ENTITY extra-cmake-modules-download-http "&kf5-download-http;/extra-cmake-modules-&kf5-version;.tar.xz">
    <!ENTITY extra-cmake-modules-download-ftp  " ">
-   <!ENTITY extra-cmake-modules-md5sum        "e4d8d5d70334eb9f40feb14c0e5fa1c3">
-   <!ENTITY extra-cmake-modules-size          "312 KB">
-   <!ENTITY extra-cmake-modules-buildsize     "4.2 MB">
+   <!ENTITY extra-cmake-modules-md5sum        "5a7910c636d46379a153b0bcde86fdb6">
+   <!ENTITY extra-cmake-modules-size          "345 KB">
+   <!ENTITY extra-cmake-modules-buildsize     "5.4 MB">
    <!ENTITY extra-cmake-modules-time          "less than 0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -175,2 +176,4 @@
 
 </sect1>
+
+
Index: kde/introduction.xml
===================================================================
--- kde/introduction.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/introduction.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,4 +7,5 @@
 
 <!--
+$LastChangedBy$
 $Date$
 -->
Index: kde/kde-intro.xml
===================================================================
--- kde/kde-intro.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/kde-intro.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: kde/kde.xml
===================================================================
--- kde/kde.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/kde.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
  %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <part id="kde" xreflabel="KDE">
Index: kde/kf5-apps/add-pkgs.xml
===================================================================
--- kde/kf5-apps/add-pkgs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/kf5-apps/add-pkgs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -25,4 +26,11 @@
     <ulink url="&kf5apps-download-http;">&kf5apps-download-http;</ulink>.
   </para>
+
+  <note>
+    <para>
+      Some packages, such as kde-baseapps, kde-runtime, and kmag listed in the
+      link above are only for the older KDE4 and cannot be used with KF5.
+    </para>
+  </note>
 
   <para>
@@ -42,8 +50,4 @@
     <listitem>
       <para>Kaccessible: Integration of accessibility utilities.</para>
-    </listitem>
-    <listitem>
-      <para>Kio-extras: various plugins for urls like <command>man://</command>
-      or <command>smb://</command>.</para>
     </listitem>
     <listitem>
Index: kde/kf5-apps/ark5.xml
===================================================================
--- kde/kf5-apps/ark5.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/kf5-apps/ark5.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY ark5-download-http "&kf5apps-download-http;/ark-&kf5apps-version;.tar.xz">
   <!ENTITY ark5-download-ftp  " ">
-  <!ENTITY ark5-md5sum        "dc58af57fa3cf6f32076ad44d2f5c36f">
+  <!ENTITY ark5-md5sum        "06aea2066ee933152e179cf444d1ad71">
   <!ENTITY ark5-size          "2.6 MB">
-  <!ENTITY ark5-buildsize     "31 MB">
+  <!ENTITY ark5-buildsize     "33 MB">
   <!ENTITY ark5-time          "0.4 SBU (using parallelism=4)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -170,5 +171,5 @@
         <listitem>
           <para>
-             is a KF5-based Archive Manager
+             is a KF5-based Archive Manager.
           </para>
           <indexterm zone="ark5 ark5-prog">
Index: kde/kf5-apps/gwenview.xml
===================================================================
--- kde/kf5-apps/gwenview.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/kf5-apps/gwenview.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY gwenview5-download-http "&kf5apps-download-http;/gwenview-&kf5apps-version;.tar.xz">
   <!ENTITY gwenview5-download-ftp  " ">
-  <!ENTITY gwenview5-md5sum        "3e16bc1a6e99599db0caad2d032313e6">
-  <!ENTITY gwenview5-size          "6.5 MB">
-  <!ENTITY gwenview5-buildsize     "45 MB">
+  <!ENTITY gwenview5-md5sum        "0aa3b4d98ea83887249a81dc2510052e">
+  <!ENTITY gwenview5-size          "6.4 MB">
+  <!ENTITY gwenview5-buildsize     "50 MB">
   <!ENTITY gwenview5-time          "0.6 SBU (using parallelism=4)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -96,5 +97,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="https://download.kde.org/stable/release-service/&kf5apps-version;/src/">KF5Kipi</ulink>
+      <ulink url="http://download.kde.org/stable/release-service/&kf5apps-version;/src/">KF5Kipi</ulink>
     </para>
 
@@ -170,5 +171,5 @@
         <listitem>
           <para>
-            is the KDE image viewer
+            is the KDE image viewer. 
           </para>
           <indexterm zone="gwenview5 gwenview5-prog">
@@ -182,5 +183,5 @@
         <listitem>
           <para>
-            is a Photo importer
+            is a Photo importer.
           </para>
           <indexterm zone="gwenview5 gwenview5-importer">
Index: kde/kf5-apps/k3b.xml
===================================================================
--- kde/kf5-apps/k3b.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/kf5-apps/k3b.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY k3b-download-http "&kf5apps-download-http;/k3b-&kf5apps-version;.tar.xz">
   <!ENTITY k3b-download-ftp  " ">
-  <!ENTITY k3b-md5sum        "43f8a86887670d148123a8ec80b80a29">
+  <!ENTITY k3b-md5sum        "178f9591165b6685c5ac8f35ad92f938">
   <!ENTITY k3b-size          "10 MB">
-  <!ENTITY k3b-buildsize     "118 MB">
-  <!ENTITY k3b-time          "1.2 SBU (using parallelism=4)">
+  <!ENTITY k3b-buildsize     "141 MB">
+  <!ENTITY k3b-time          "1.3 SBU (using parallelism=4)">
 ]>
 
@@ -17,5 +17,6 @@
 
   <sect1info>
-    <date>$Date$</date>
+    <othername>$LastChangedBy: bdubbs $</othername>
+    <date>$Date: 2016-08-31 22:11:41 -0500 (Wed, 31 Aug 2016) $</date>
   </sect1info>
 
@@ -53,5 +54,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -202,5 +203,5 @@
         <listitem>
           <para>
-            is the graphical CD/DVD program
+            is the graphical CD/DVD program.
           </para>
           <indexterm zone="k3b k3b-prog">
Index: kde/kf5-apps/kdenlive5.xml
===================================================================
--- kde/kf5-apps/kdenlive5.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/kf5-apps/kdenlive5.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY kdenlive5-download-http "&kf5apps-download-http;/kdenlive-&kf5apps-version;.tar.xz">
   <!ENTITY kdenlive5-download-ftp  " ">
-  <!ENTITY kdenlive5-md5sum        "af9df34cdbef3aaa878d5fa889de3190">
+  <!ENTITY kdenlive5-md5sum        "55f8b6272556ba46da823c9e42594503">
   <!ENTITY kdenlive5-size          "11 MB">
-  <!ENTITY kdenlive5-buildsize     "182 MB">
-  <!ENTITY kdenlive5-time          "1.6 SBU (using parallelism=4)">
+  <!ENTITY kdenlive5-buildsize     "446 MB">
+  <!ENTITY kdenlive5-time          "2 SBU (using parallelism=4)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -84,5 +85,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="kf5-frameworks"/>,
+      <xref linkend="kf5-frameworks"/>
       <xref linkend="mlt"/>, and 
       <xref role="runtime" linkend="v4l-utils"/> (runtime)
@@ -167,5 +168,5 @@
           <para>
              is an open source non-linear video editor which supports
-             a large number of formats
+             a large number of formats.
           </para>
           <indexterm zone="kdenlive5 kdenlive">
@@ -179,5 +180,5 @@
         <listitem>
           <para>
-             is a render program for <command>kdenlive</command>
+             is a render program for <command>kdenlive</command>.
           </para>
           <indexterm zone="kdenlive5 kdenlive_render">
Index: kde/kf5-apps/kf5-apps.xml
===================================================================
--- kde/kf5-apps/kf5-apps.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/kf5-apps/kf5-apps.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
  %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="kf5-apps">
Index: kde/kf5-apps/khelpcenter.xml
===================================================================
--- kde/kf5-apps/khelpcenter.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/kf5-apps/khelpcenter.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY khelpcenter-download-http "&kf5apps-download-http;/khelpcenter-&kf5apps-version;.tar.xz">
   <!ENTITY khelpcenter-download-ftp  " ">
-  <!ENTITY khelpcenter-md5sum        "0225b861015c6b75c00248f32562678a">
+  <!ENTITY khelpcenter-md5sum        "3f1526e311d8ca91fa27353fc6db031e">
   <!ENTITY khelpcenter-size          "4.1 MB">
-  <!ENTITY khelpcenter-buildsize     "26 MB">
-  <!ENTITY khelpcenter-time          "0.1 SBU (using parallelism=4)">
+  <!ENTITY khelpcenter-buildsize     "43 MB">
+  <!ENTITY khelpcenter-time          "0.2 SBU (using parallelism=4)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -79,14 +80,4 @@
       <xref linkend="xapian"/>
     </para>
-
-    <note>
-      <para>
-        Khelpcenter does not provide the plugin to display the manual pages.
-        It is found in kio-extras, another <ulink
-        url="&kf5apps-download-http;">KDE application</ulink>.
-        Depending on what is installed on your system, other dependencies
-        may be needed to build it.
-      </para>
-    </note>
 
     <para condition="html" role="usernotes">
@@ -159,5 +150,5 @@
         <listitem>
           <para>
-            is the help viewer for KDE applications
+            is the help viewer for KDE applications.
           </para>
           <indexterm zone="khelpcenter khelpcenter-prog">
Index: kde/kf5-apps/kmix5.xml
===================================================================
--- kde/kf5-apps/kmix5.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/kf5-apps/kmix5.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY kmix5-download-http "&kf5apps-download-http;/kmix-&kf5apps-version;.tar.xz">
   <!ENTITY kmix5-download-ftp  " ">
-  <!ENTITY kmix5-md5sum        "6a032471af1093ecdd71b0dbc2c37eb9">
+  <!ENTITY kmix5-md5sum        "872c54b0dd57bcc78700694f3e9317c8">
   <!ENTITY kmix5-size          "1.1 MB">
-  <!ENTITY kmix5-buildsize     "17 MB">
+  <!ENTITY kmix5-buildsize     "21 MB">
   <!ENTITY kmix5-time          "0.2 SBU (using parallelism=4)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -167,5 +168,5 @@
         <listitem>
           <para>
-            is a mini audio mixer for kde
+            is a mini audio mixer for kde.
           </para>
           <indexterm zone="kmix5 kmix5-prog">
@@ -180,5 +181,5 @@
           <para>
             is used to save or restore the settings of
-            <command>kmix</command>
+            <command>kmix</command>.
           </para>
           <indexterm zone="kmix5 kmixctrl5">
@@ -192,5 +193,5 @@
         <listitem>
           <para>
-            is a utility to mute, get and set volume levels
+            is a utility to mute, get and set volume levels.
           </para>
           <indexterm zone="kmix5 kmixremote">
Index: kde/kf5-apps/konsole5.xml
===================================================================
--- kde/kf5-apps/konsole5.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/kf5-apps/konsole5.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,6 +7,6 @@
   <!ENTITY konsole5-download-http "&kf5apps-download-http;/konsole-&kf5apps-version;.tar.xz">
   <!ENTITY konsole5-download-ftp  " ">
-  <!ENTITY konsole5-md5sum        "220c82eb5827952034aa4ad2924685c6">
-  <!ENTITY konsole5-size          "1.3 MB">
+  <!ENTITY konsole5-md5sum        "77c68fc6f3595e48611ffadaa92505b0">
+  <!ENTITY konsole5-size          "1.2 MB">
   <!ENTITY konsole5-buildsize     "40 MB">
   <!ENTITY konsole5-time          "0.5 SBU (using parallism=4)">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -170,5 +171,5 @@
           <para>
              is an X terminal emulation which provides a command-line
-             interface
+             interface.
           </para>
           <indexterm zone="konsole5 konsole5-prog">
@@ -183,5 +184,5 @@
           <para>
             is a command-line tool to change the current tab's profile
-            options
+            options.
           </para>
           <indexterm zone="konsole5 konsoleprofile5">
Index: kde/kf5-apps/libkcddb.xml
===================================================================
--- kde/kf5-apps/libkcddb.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/kf5-apps/libkcddb.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY libkcddb-download-http "&kf5apps-download-http;/libkcddb-&kf5apps-version;.tar.xz">
   <!ENTITY libkcddb-download-ftp  " ">
-  <!ENTITY libkcddb-md5sum        "b02e916532f0438b596f7e740a6e2ed9">
-  <!ENTITY libkcddb-size          "424 KB">
-  <!ENTITY libkcddb-buildsize     "8.5 MB">
+  <!ENTITY libkcddb-md5sum        "68c34c3408e5ecffb3818f56c49ffa0a">
+  <!ENTITY libkcddb-size          "415 KB">
+  <!ENTITY libkcddb-buildsize     "10 MB">
   <!ENTITY libkcddb-time          "0.1 SBU (Using parallelism=4)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -145,5 +146,5 @@
           <para>
             contains functions used to retrieve audio CD meta data
-            from the internet
+            from the internet.
           </para>
           <indexterm zone="libkcddb libkcddb-lib">
Index: kde/kf5-apps/libkdcraw.xml
===================================================================
--- kde/kf5-apps/libkdcraw.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/kf5-apps/libkdcraw.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY libkdcraw-download-http "&kf5apps-download-http;/libkdcraw-&kf5apps-version;.tar.xz">
   <!ENTITY libkdcraw-download-ftp  " ">
-  <!ENTITY libkdcraw-md5sum        "8096110c82b3a4cdc4895b4bd09c2a64">
-  <!ENTITY libkdcraw-size          "40 KB">
-  <!ENTITY libkdcraw-buildsize     "1.4 MB">
+  <!ENTITY libkdcraw-md5sum        "f7eadd8590d319f6321623df47fa836a">
+  <!ENTITY libkdcraw-size          "41 KB">
+  <!ENTITY libkdcraw-buildsize     "1.5 MB">
   <!ENTITY libkdcraw-time          "less than 0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/kf5-apps/libkexiv2.xml
===================================================================
--- kde/kf5-apps/libkexiv2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/kf5-apps/libkexiv2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY libkexiv2-download-http "&kf5apps-download-http;/libkexiv2-&kf5apps-version;.tar.xz">
   <!ENTITY libkexiv2-download-ftp  " ">
-  <!ENTITY libkexiv2-md5sum        "20eb9223aec6e407f388643163880f25">
-  <!ENTITY libkexiv2-size          "60 KB">
-  <!ENTITY libkexiv2-buildsize     "3.2 MB">
-  <!ENTITY libkexiv2-time          "0.2 SBU">
+  <!ENTITY libkexiv2-md5sum        "7e2d35b5c395478cc23a8373e58f43a2">
+  <!ENTITY libkexiv2-size          "63 KB">
+  <!ENTITY libkexiv2-buildsize     "3.4 MB">
+  <!ENTITY libkexiv2-time          "0.1 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/kf5-apps/okular5.xml
===================================================================
--- kde/kf5-apps/okular5.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/kf5-apps/okular5.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY okular5-download-http "&kf5apps-download-http;/okular-&kf5apps-version;.tar.xz">
   <!ENTITY okular5-download-ftp  " ">
-  <!ENTITY okular5-md5sum        "6e1244b7145c0f7e22442bfd47777193">
-  <!ENTITY okular5-size          "7.7 MB">
-  <!ENTITY okular5-buildsize     "73 MB">
+  <!ENTITY okular5-md5sum        "11b99d966ad2e11fde67f9e651771b05">
+  <!ENTITY okular5-size          "7.5 MB">
+  <!ENTITY okular5-buildsize     "87 MB">
   <!ENTITY okular5-time          "0.8 SBU (using parallelism=4)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -74,5 +75,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="kf5-frameworks"/>
+      <xref linkend="kf5-frameworks"/>,
     </para>
 
@@ -88,10 +89,10 @@
       <xref linkend="qca"/>,
       <ulink url="http://djvu.sourceforge.net/">DjVuLibre</ulink>,
-      <ulink url="https://download.kde.org/stable/release-service/&kf5apps-version;/src/">
+      <ulink url="http://download.kde.org/stable/release-service/&kf5apps-version;/src/">
                  kpimtextedit</ulink>,
       <ulink url="http://libspectre.freedesktop.org/">libspectre</ulink> 
                  (for PostScript support),
       <ulink url="http://www.jedrea.com/chmlib">libchm</ulink>,
-      <ulink url="https://sourceforge.net/projects/ebook-tools">libepub</ulink>, and
+      <ulink url="http://sourceforge.net/projects/ebook-tools">libepub</ulink>, and
       <ulink url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket">
                  Mobipocket</ulink>
@@ -167,5 +168,5 @@
         <listitem>
           <para>
-             is a document viewer
+             is a document viewer. 
           </para>
           <indexterm zone="okular5 okular5-prog">
Index: kde/kf5/kf5-frameworks.xml
===================================================================
--- kde/kf5/kf5-frameworks.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/kf5/kf5-frameworks.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,5 +10,5 @@
   <!ENTITY kf5-md5sum        "See Below">
   <!ENTITY kf5-size          "266 MB">
-  <!ENTITY kf5-buildsize     "1.3 GB (241 MB installed)">
+  <!ENTITY kf5-buildsize     "560 MB (238 MB installed)">
   <!ENTITY kf5-time          "14 SBU (using parallelism=4)">
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+     <othername>$LastChangedBy$</othername>
      <date>$Date$</date>
   </sect1info>
@@ -33,5 +34,5 @@
   </para>
 
-  &lfs110a_checked;
+  &lfs10_checked;
 
   <para>
@@ -126,22 +127,9 @@
   </para>
 
-  <bridgehead renderas="sect4">Additional recommended dependencies for kapidox</bridgehead>
-  <para role="recommended">
-    <xref role="runtime" linkend="doxygen"/> (Run time),
-    <xref linkend="Jinja2"/>, and
-    <xref linkend="PyYAML"/> (if those python modules are not present at build
-    time, they will be downloaded)
-  </para>
-
-  <bridgehead renderas="sect4">Other python modules needed by kapidox</bridgehead>
+  <bridgehead renderas="sect4">Runtime dependencies for kapidox</bridgehead>
   <para role="optional">
-    <ulink url="https://pypi.org/simple/requests/">requests</ulink>,
-    <ulink url="https://pypi.org/simple/doxyqml/">doxyqml</ulink>,
-    <ulink url="https://pypi.org/simple/doxypypy/">doxypypy</ulink>,
-    <ulink url="https://pypi.org/simple/urllib3/">urllib3</ulink>,
-    <ulink url="https://pypi.org/simple/idna/">idna</ulink>,
-    <ulink url="https://pypi.org/simple/charset-normalizer/">charset-normalizer</ulink>, and
-    <ulink url="https://pypi.org/simple/certifi/">certifi</ulink> (all will be
-    automatically installed at build time if not present on the system)
+    <xref role="runtime" linkend="doxygen"/>,
+    <xref role="runtime" linkend="Jinja2"/>, and
+    <xref role="runtime" linkend="PyYAML"/>
   </para>
 
@@ -186,5 +174,5 @@
     </para>
 
-<screen><userinput>url=https://download.kde.org/stable/frameworks/&kf5-short-version;/
+<screen><userinput>url=http://download.kde.org/stable/frameworks/&kf5-short-version;/
 wget -r -nH -nd -A '*.xz' -np $url</userinput>
 <literal>
@@ -207,87 +195,87 @@
 
 <screen><userinput>cat &gt; frameworks-&kf5-version;.md5 &lt;&lt; "EOF"
-<literal>06d286995319fd9565d43bf736576a82  attica-5.85.0.tar.xz
-#e4d8d5d70334eb9f40feb14c0e5fa1c3  extra-cmake-modules-5.85.0.tar.xz
-007581e41e7c13cc52f03c50f65c9826  kapidox-5.85.0.tar.xz
-deee0085dbd22032a437106ba01ba7b2  karchive-5.85.0.tar.xz
-3fb5aba8c68be4c384ee17a91798ddec  kcodecs-5.85.0.tar.xz
-eef295c85781ddf9a3abbd95a4da5df3  kconfig-5.85.0.tar.xz
-d7a2748aebb1206fc38cb00bb39bc0eb  kcoreaddons-5.85.0.tar.xz
-c9b3062073d8fb0977aa63fab7582d1e  kdbusaddons-5.85.0.tar.xz
-510b0e437a855592d3512faa94fcd4ba  kdnssd-5.85.0.tar.xz
-7b5b4d7610c45895ac5138c1e762ef41  kguiaddons-5.85.0.tar.xz
-e9463a50c2bc56a6cebc70c487b5a45d  ki18n-5.85.0.tar.xz
-58a3e469ac54cb78469b27f216c87c0a  kidletime-5.85.0.tar.xz
-5cb4de5a5215b8f9412bbff02ac59f11  kimageformats-5.85.0.tar.xz
-3f00cbe1c9ded4b9f061f0dcc3c38071  kitemmodels-5.85.0.tar.xz
-5ed293814f6ca4c37a9fef6963431db0  kitemviews-5.85.0.tar.xz
-040eaecd9952dc73b11ab4570f7b93f8  kplotting-5.85.0.tar.xz
-381c75cf800cfe1483ea3493e2de245c  kwidgetsaddons-5.85.0.tar.xz
-4d9cca227b795280ee920156cdec4859  kwindowsystem-5.85.0.tar.xz
-f530333f5635266765b9d998ddc51d33  networkmanager-qt-5.85.0.tar.xz
-254a03e4914ad144126a615ebbcbc11c  solid-5.85.0.tar.xz
-6883eeb4c62837d70c6d6cbd01ba4cb8  sonnet-5.85.0.tar.xz
-ceb00c86052dd1c9e4bef970c19f46d4  threadweaver-5.85.0.tar.xz
-7e097f4474c43e08b2540a8883dc1e00  kauth-5.85.0.tar.xz
-dcf9b03389d733eac8ae930b26d5389a  kcompletion-5.85.0.tar.xz
-cc72c9ac7cba7207ef1a170bb2e4719e  kcrash-5.85.0.tar.xz
-2676c29e1d3a93bd42e4f84f86961c4d  kdoctools-5.85.0.tar.xz
-f85fe1b8f7319ed6e69d562671a705d0  kpty-5.85.0.tar.xz
-298c9df17377b26ccd76d34f54ffad6c  kunitconversion-5.85.0.tar.xz
-530e29b6a5993c0f23adbe09c48a7f16  kconfigwidgets-5.85.0.tar.xz
-3081cf3c1eae4121b9b1fb71a1aa7c64  kservice-5.85.0.tar.xz
-c3a62eeaf5d94bf326cab38dd1380204  kglobalaccel-5.85.0.tar.xz
-5203415a3948fb0c3c1937bcba5c5758  kpackage-5.85.0.tar.xz
-f57850b50533be59335bdf2d76fcfc76  kdesu-5.85.0.tar.xz
-c4c930b28e1c5bd4e2a1aad9e8c328b0  kemoticons-5.85.0.tar.xz
-edf31862bd801304fdb578050b0326d2  kiconthemes-5.85.0.tar.xz
-b73b00a29afcf70d964190219ee6ccbc  kjobwidgets-5.85.0.tar.xz
-8b7c4520f6ffc7cfc1fbd22e0c9ffa18  knotifications-5.85.0.tar.xz
-fd3490e92465f433a5576b40ac348cbd  ktextwidgets-5.85.0.tar.xz
-5b2362e1d485d80c3111679ae4cad68b  kxmlgui-5.85.0.tar.xz
-679bb7a808f2d51e43f9dc26ce3f62d1  kbookmarks-5.85.0.tar.xz
-ceaebee871b3f792766377c1074216a3  kwallet-5.85.0.tar.xz
-aa1168d883e43dc304bbd809c9aa2f3d  kded-5.85.0.tar.xz
-30c8871003edb993afc385e16f8b1a64  kio-5.85.0.tar.xz
-1da45e0185075d0c384100c17d8a789f  kdeclarative-5.85.0.tar.xz
-2e11d1726375387f2942cf9f3845760a  kcmutils-5.85.0.tar.xz
-975fa5fd7a1db023639eb26f0d5e6809  kirigami2-5.85.0.tar.xz
-8de5ea8546df1d8a23a2eb1ce465dbc9  syndication-5.85.0.tar.xz
-7b1926330878c8c9c8a28f2403ff2e81  knewstuff-5.85.0.tar.xz
-f6178e5a138b0fe4260bb74bfabd2a5f  frameworkintegration-5.85.0.tar.xz
-e86d84f9d34aa94e55d0ca177f49a57c  kinit-5.85.0.tar.xz
-14c79ffe82f063ff67392f64005477d2  kparts-5.85.0.tar.xz
-0fef80b90c110adfe7c775f93e1f3e1d  kactivities-5.85.0.tar.xz
-#3557d248cdecb2bd03e0a00b0dab7ae2  kdewebkit-5.85.0.tar.xz
-1ef1c6039a3e91ec533af11af19539ec  syntax-highlighting-5.85.0.tar.xz
-535adfca5246321df0f69de579c5f29c  ktexteditor-5.85.0.tar.xz
-6f09f3c76f6a698ede4fb67f6bb709cc  kdesignerplugin-5.85.0.tar.xz
-5253a422ba21dcb9bf92ffb53c035f2a  kwayland-5.85.0.tar.xz
-fa2e79613982549dca6e20ecd0907fa5  plasma-framework-5.85.0.tar.xz
-#1ad46346789bc04b7ff10bb4bb257e84  modemmanager-qt-5.85.0.tar.xz
-424f8cbccde63734ca9a41d2be38ce44  kpeople-5.85.0.tar.xz
-148e239b5fd08a66e655116a7399c22d  kxmlrpcclient-5.85.0.tar.xz
-0a90f655455ab7dcbe5e652a84a06a6e  bluez-qt-5.85.0.tar.xz
-866ba6788b62d46011d6d23f4195230d  kfilemetadata-5.85.0.tar.xz
-e4fa06ec978fece6eb13c2a9e6749fcc  baloo-5.85.0.tar.xz
-#42665314255bdf88736973c28c8c0a65  breeze-icons-5.85.0.tar.xz
-#b6cad03903a685db1b323db2165355eb  oxygen-icons5-5.85.0.tar.xz
-65e8097e66204a7b8ae8fd616a9789a9  kactivities-stats-5.85.0.tar.xz
-0da888b4320299c93b56259da68563a8  krunner-5.85.0.tar.xz
-baf7228889d33913fffd26faedca61e5  prison-5.85.0.tar.xz
-daf55ba893a81e851c42507cb7b99e48  qqc2-desktop-style-5.85.0.tar.xz
-5c1a1d58b3ad5bb0d7fbbf427fc0dff1  kjs-5.85.0.tar.xz
-f5e0ca6f84d143f216a38cfb0c083267  kdelibs4support-5.85.0.tar.xz
-06c9c414894382a06a150967d2b1bbee  khtml-5.85.0.tar.xz
-e8f677e831ec75d8894ab77b139b0d77  kjsembed-5.85.0.tar.xz
-346789a75525372ac67d46c39834b150  kmediaplayer-5.85.0.tar.xz
-2e92ff7e9cc04bd2a3e06dfa24cf0f1f  kross-5.85.0.tar.xz
-75032ec4d4b432c7e3bb83b0bdbe0cac  kholidays-5.85.0.tar.xz
-7921bd89698216109cde504e59e115c0  purpose-5.85.0.tar.xz
-eaee772562d93a2752547c09427679cc  kcalendarcore-5.85.0.tar.xz
-565639b8a34802e97efaeac520d894a3  kcontacts-5.85.0.tar.xz
-07a1780a5e1cb8479232cf2244b69f7a  kquickcharts-5.85.0.tar.xz
-345e20cbc8d815173ab5861a72b084bb  knotifyconfig-5.85.0.tar.xz
-fc2b4c6df2f4f7c50955b31445774d3a  kdav-5.85.0.tar.xz</literal>
+<literal>1c88cf12490b17396b21628bf44ac2f5  attica-5.77.0.tar.xz
+#5a7910c636d46379a153b0bcde86fdb6  extra-cmake-modules-5.77.0.tar.xz
+3ff69c0f50dd5f098f098d1041bed00f  kapidox-5.77.0.tar.xz
+1f78a31989a1edb49d9efda663fd7ad7  karchive-5.77.0.tar.xz
+59aa68a9aa63bb5184ff55bbfe964bea  kcodecs-5.77.0.tar.xz
+4a90e5475fd7ca5325840f56d3d8665c  kconfig-5.77.0.tar.xz
+e04c9ac5cc06caa258477f9703372484  kcoreaddons-5.77.0.tar.xz
+9b43e68661403c868908d9de98fb55e5  kdbusaddons-5.77.0.tar.xz
+2030bc33c273e1bb0f805ad03fdf107a  kdnssd-5.77.0.tar.xz
+1fdab3a35e02600ca7b83275cd4d1ee8  kguiaddons-5.77.0.tar.xz
+18830bfe197660016a7b29c14930225d  ki18n-5.77.0.tar.xz
+08fb73549753f2c1d6f27d3e1fcb38af  kidletime-5.77.0.tar.xz
+0572e703b5f60873f6c2ecb5d53c7cee  kimageformats-5.77.0.tar.xz
+4e8d8e94c3b0f8803bba9d51388f7d51  kitemmodels-5.77.0.tar.xz
+c9576659a4edd52dff21ddfaa4b80799  kitemviews-5.77.0.tar.xz
+e5b494463be614a6622891906bc21e39  kplotting-5.77.0.tar.xz
+12fb7639c25319b6710acb8e7743e9a4  kwidgetsaddons-5.77.0.tar.xz
+60eeca9087697979006f3bd3c8131460  kwindowsystem-5.77.0.tar.xz
+54199e7c793beaced8dbb6f1cbf4ff0a  networkmanager-qt-5.77.0.tar.xz
+c50c31248301c30dc00d395c1eee579c  solid-5.77.0.tar.xz
+65b54bd20801b61c4ad414f7dda4f396  sonnet-5.77.0.tar.xz
+bb2392bdc19a1ced13e2ed7723f669bd  threadweaver-5.77.0.tar.xz
+29540787897712c6bd0d61ec99d29cd4  kauth-5.77.0.tar.xz
+ee50f594a2e9db21014366cadf77473d  kcompletion-5.77.0.tar.xz
+6c49aa9c2daa4b3689db17967279759a  kcrash-5.77.0.tar.xz
+617f7e630b988e89944caf6f51b6df87  kdoctools-5.77.0.tar.xz
+e69d0516c769d57acae792124d4c6ea2  kpty-5.77.0.tar.xz
+5546bfc9051e31b3c99e25e1c90a8387  kunitconversion-5.77.0.tar.xz
+56f3c52990c8e4422adb9f9d52c66aea  kconfigwidgets-5.77.0.tar.xz
+ea9b11a949d5744f870736ffc674d854  kservice-5.77.0.tar.xz
+2c5dc539320eb4f03c42eedff638d68d  kglobalaccel-5.77.0.tar.xz
+4d16dfbf54d9bee0cb3591226aa3ee7c  kpackage-5.77.0.tar.xz
+752cca700b5c3b032c2c2e3e8a8328ba  kdesu-5.77.0.tar.xz
+95629bcceac3ed8ed4726816e8c6043a  kemoticons-5.77.0.tar.xz
+3a135e90078316ee19a42189ea3832a0  kiconthemes-5.77.0.tar.xz
+e0ae97cc24b929bfbdb6eb2cf2d3bc18  kjobwidgets-5.77.0.tar.xz
+adff613f0122ddaefb9f002336349f70  knotifications-5.77.0.tar.xz
+7a1306085ffad4445ba91427a7b52823  ktextwidgets-5.77.0.tar.xz
+0e9464f19b23e3d43a87c002f62a3f40  kxmlgui-5.77.0.tar.xz
+756b4ac1be8f996f480eab1a9cdc9580  kbookmarks-5.77.0.tar.xz
+b5021ed5e46eaf8ed25c172b0d73fbd6  kwallet-5.77.0.tar.xz
+a473d76a8ae084b6263a51a310535e1e  kded-5.77.0.tar.xz
+3d3d0655cd795a8ee4586c7d484f1a58  kio-5.77.0.tar.xz
+eb42f44df133e675de8417bb8407263d  kdeclarative-5.77.0.tar.xz
+1ac3b4b5b20e984f8fc9b0213cd4223b  kcmutils-5.77.0.tar.xz
+c49f1148f38ded3c7803f87b9f29bf8b  kirigami2-5.77.0.tar.xz
+76ef015265429be8b5f99e4b697b7be0  knewstuff-5.77.0.tar.xz
+ff8a15b77f79935f90e08739ee40a6e7  frameworkintegration-5.77.0.tar.xz
+dd868056b62ed81696d6281d5bf3b0e0  kinit-5.77.0.tar.xz
+0cfe9f9eadb47412a2f54d86354281b8  knotifyconfig-5.77.0.tar.xz
+c42cbd1c7b3af1fa33e8cf6e812fcafa  kparts-5.77.0.tar.xz
+f164e8b93c36c1bcaa26a176eb9ba0c7  kactivities-5.77.0.tar.xz
+#d4731055b6508b48d29ad9c3459b9e16  kdewebkit-5.77.0.tar.xz
+bccbc38b25aa93f39cf92e7e33a8af1a  syntax-highlighting-5.77.0.tar.xz
+ce2f83c56eebc81bb8ab1a6e6fb1c742  ktexteditor-5.77.0.tar.xz
+cb9c753eefe045f36f7acb6ce10edca5  kdesignerplugin-5.77.0.tar.xz
+c730b5144af115627149caf739786770  kwayland-5.77.0.tar.xz
+8b23fd8555acbd2738d332f75a19d83d  plasma-framework-5.77.0.tar.xz
+#21e8931f7d6ef1de21e68d041a5645ad  modemmanager-qt-5.77.0.tar.xz
+1be757e218979c4185806dfdaadd18df  kpeople-5.77.0.tar.xz
+137c6a33c782912e16ae413da627006d  kxmlrpcclient-5.77.0.tar.xz
+b1ce3754f40518c0f6398db172d4adc3  bluez-qt-5.77.0.tar.xz
+694aaf815cd828cfc116b29b78f253b4  kfilemetadata-5.77.0.tar.xz
+9d83a40826cd0c5c189f217eafc8f33e  baloo-5.77.0.tar.xz
+#6d4cd111ecaaf18137b3d927ee319aa0  breeze-icons-5.77.0.tar.xz
+#750e034aaf3a2a87f9823dfec211e068  oxygen-icons5-5.77.0.tar.xz
+c5f09fe172eca2f22cebc61ab1809a36  kactivities-stats-5.77.0.tar.xz
+fa11049dea1822a2c764d94e67cb0e98  krunner-5.77.0.tar.xz
+4d040239746f41babc5289425444949a  prison-5.77.0.tar.xz
+01db2c910f5531ec6ecba475ade399fe  qqc2-desktop-style-5.77.0.tar.xz
+7b4dc53fc8edbcaa45dae31609637c97  kjs-5.77.0.tar.xz
+86e8fa3f93ee20e8889b262738c1d106  kdelibs4support-5.77.0.tar.xz
+3df88069e9e276e1a3d9ee3fb15f6951  khtml-5.77.0.tar.xz
+e20386bc2444ccf748405069ae6c509c  kjsembed-5.77.0.tar.xz
+896bd4400521378da00ea7db5cb1f212  kmediaplayer-5.77.0.tar.xz
+57abd00bddc445af5cc268cbbf486876  kross-5.77.0.tar.xz
+c59eaf24aa8562948fd391ce9eda44b2  kholidays-5.77.0.tar.xz
+7f7cb5fb7aef7fea4bf8bbd3f8858eba  purpose-5.77.0.tar.xz
+221abecad2ad845b4fda07b0da9deab1  syndication-5.77.0.tar.xz
+e5d8acac5cdb5cdea76071e5c7651d3a  kcalendarcore-5.77.0.tar.xz
+2c9da8790a2557b330d803698d91b65f  kcontacts-5.77.0.tar.xz
+b52e8fa1def1211a041f73b4af1ecf55  kquickcharts-5.77.0.tar.xz
+b3e3350b3ee60902cefb017c5e70fb3f  kdav-5.77.0.tar.xz</literal>
 EOF</userinput></screen>
 
@@ -320,18 +308,8 @@
       </para>
 
-      <screen role="root" revision="sysv"><userinput>mv -v /opt/kf5 /opt/kf5.old                         &amp;&amp;
+      <screen role="root"><userinput>mv -v /opt/kf5 /opt/kf5.old                         &amp;&amp;
 install -v -dm755           $KF5_PREFIX/{etc,share} &amp;&amp;
 ln -sfv /etc/dbus-1         $KF5_PREFIX/etc         &amp;&amp;
-ln -sfv /usr/share/dbus-1   $KF5_PREFIX/share       &amp;&amp;
-ln -sfv /usr/share/polkit-1 $KF5_PREFIX/share</userinput></screen>
-
-      <screen role="root" revision="systemd"><userinput>mv -v /opt/kf5 /opt/kf5.old                         &amp;&amp;
-install -v -dm755           $KF5_PREFIX/{etc,share} &amp;&amp;
-ln -sfv /etc/dbus-1         $KF5_PREFIX/etc         &amp;&amp;
-ln -sfv /usr/share/dbus-1   $KF5_PREFIX/share       &amp;&amp;
-ln -sfv /usr/share/polkit-1 $KF5_PREFIX/share       &amp;&amp;
-install -v -dm755           $KF5_PREFIX/lib         &amp;&amp;
-ln -sfv /usr/lib/systemd    $KF5_PREFIX/lib</userinput></screen>
-
+ln -sfv /usr/share/dbus-1   $KF5_PREFIX/share</userinput></screen>
     </caution>
 
@@ -361,9 +339,21 @@
     tar -xf $file
     pushd $packagedir
+<!-- the following statement is not needed in 5.77. Keeping in case
+     it becomes needed again
       case $name in
-        plasma-framework*)
-          sed -i 's/${EGL_TARGET}/GL EGL/' src/declarativeimports/core/CMakeLists.txt ;;
-      esac
-
+        kitemviews*) sed -i '/&lt;QList&gt;/a #include &lt;QPersistentModelIndex&gt;' \
+          src/kwidgetitemdelegatepool_p.h ;;
+        kplotting*) sed -i '/&lt;QHash&gt;/a #include &lt;QHelpEvent&gt;' \
+          src/kplotwidget.cpp ;;
+        knotifica*) sed -i '/&lt;QUrl&gt;/a #include &lt;QVariant&gt;' \
+          src/knotification.h ;;
+        kcompleti*) sed -i '/&lt;QClipboard&gt;/a #include &lt;QKeyEvent&gt;' \
+          src/klineedit.cpp ;;
+        kwayland*) sed -i '/&lt;wayland-xdg-output-server-proto/a #include &lt;QHash&gt;' \
+          src/server/xdgoutput_interface.cpp ;;
+        purpose*) sed -i 's/15,/16,/' \
+          src/externalprocess/purposeprocess_main.cpp ;;
+      esac  
+-->
       mkdir build
       cd    build
@@ -394,13 +384,4 @@
     </note>
 
-    <para revision="sysv">
-      Useless systemd units have been installed in
-      <filename class="directory">$KF5_PREFIX/lib</filename>. Remove
-      them now (as <systemitem class="username">root</systemitem>):
-    </para>
-
-<screen role="root"
-        revision="sysv"><userinput>rm -rf $KF5_PREFIX/lib/systemd</userinput></screen>
-
     <para>
       Sometimes the installation paths are hardcoded into installed files.
@@ -417,4 +398,10 @@
     <title>Command Explanations</title>
 
+<!-- the following statement is not needed in 5.77
+    <para>
+      <command>case ...</command>: Those modifications are required to build
+      with <xref linkend="qt5"/>.
+    </para>
+-->
     <para>
       <parameter>-DCMAKE_PREFIX_PATH=$QT5DIR</parameter>: This switch is used
@@ -568,4 +555,5 @@
           libKF5Style.so,
           libKF5Su.so,
+          libKF5Syndication.so,
           libKF5SyntaxHighlighting.so,
           libKF5TextEditor.so,
@@ -597,5 +585,5 @@
         <listitem>
           <para>
-            is a tool to check for syntax errors in KDE DocBook XML files
+            is a tool to check for syntax errors in KDE DocBook XML files.
           </para>
           <indexterm zone="kf5-frameworks checkXML5">
@@ -609,5 +597,5 @@
         <listitem>
           <para>
-            is a tool to generate a dependency diagram
+            is a tool to generate a dependency diagram.
           </para>
           <indexterm zone="kf5-frameworks depdiagram-generate">
@@ -621,5 +609,5 @@
         <listitem>
           <para>
-            is a tool to generate a dependency diagram for all frameworks at once
+            is a tool to generate a dependency diagram for all frameworks at once.
           </para>
           <indexterm zone="kf5-frameworks depdiagram-generate-all">
@@ -633,5 +621,5 @@
         <listitem>
           <para>
-            is a tool to prepare dot files
+            is a tool to prepare dot files.
           </para>
           <indexterm zone="kf5-frameworks depdiagram-prepare">
@@ -645,5 +633,5 @@
         <listitem>
           <para>
-            is a tool to convert a .desktop file to a .json file
+            is a tool to convert a .desktop file to a .json file.
           </para>
           <indexterm zone="kf5-frameworks desktoptojson">
@@ -658,5 +646,5 @@
           <para>
             rebuilds the KService desktop file system configuration
-       cache
+       cache.
           </para>
           <indexterm zone="kf5-frameworks kbuildsycoca5">
@@ -671,5 +659,5 @@
           <para>
             is a command line interface to the HTTP cookie store used by KDE,
-            a D-BUS service to store/retrieve/clean cookies
+            a D-BUS service to store/retrieve/clean cookies.
           </para>
           <indexterm zone="kf5-frameworks kcookiejar5">
@@ -683,5 +671,5 @@
         <listitem>
           <para>
-            consolidates several small services in one process
+            consolidates several small services in one process.
           </para>
           <indexterm zone="kf5-frameworks kded5">
@@ -696,5 +684,5 @@
           <para>
             is a process launcher somewhat similar to the famous init used
-            for booting UNIX
+            for booting UNIX.
           </para>
           <indexterm zone="kf5-frameworks kdeinit5">
@@ -709,5 +697,5 @@
           <para>
             is a command line program used to retrieve information about
-            KDE installation or user paths
+            KDE installation or user paths.
           </para>
           <indexterm zone="kf5-frameworks kf5-config">
@@ -722,5 +710,5 @@
           <para>
             executes kross scripts written in KDE Javascript, Python, Ruby,
-            Java and Falcon
+            Java and Falcon.
           </para>
           <indexterm zone="kf5-frameworks kf5kross">
@@ -746,5 +734,5 @@
         <listitem>
           <para>
-            generates widget plugins for Qt(TM) Designer
+            generates widget plugins for Qt(TM) Designer.
           </para>
           <indexterm zone="kf5-frameworks kgendesignerplugin">
@@ -759,5 +747,5 @@
           <para>
             is a daemon use to register the key bindings and for getting
-            notified when the action triggered
+            notified when the action triggered.
           </para>
           <indexterm zone="kf5-frameworks kglobalaccel5">
@@ -771,5 +759,5 @@
         <listitem>
           <para>
-            is KDE ECMAScript/JavaScript engine
+            is KDE ECMAScript/JavaScript engine.
           </para>
           <indexterm zone="kf5-frameworks kjs5">
@@ -783,5 +771,5 @@
         <listitem>
           <para>
-             is a tool for launching KJSEmbed scripts from the command line
+             is a tool for launching KJSEmbed scripts from the command line.
           </para>
           <indexterm zone="kf5-frameworks kjscmd5">
@@ -795,5 +783,5 @@
         <listitem>
           <para>
-            is a console for <command>kjs5</command>
+            is a console for <command>kjs5</command>.
           </para>
           <indexterm zone="kf5-frameworks kjsconsole">
@@ -831,5 +819,5 @@
         <listitem>
           <para>
-            is a command line kpackage tool
+            is a command line kpackage tool.
           </para>
           <indexterm zone="kf5-frameworks kpackagetool5">
@@ -844,5 +832,5 @@
           <para>
             is a command line tool to retrieve values from KDE
-            configuration files
+            configuration files.
           </para>
           <indexterm zone="kf5-frameworks kreadconfig5">
@@ -856,5 +844,5 @@
         <listitem>
           <para>
-            start applications via kdeinit
+            start applications via kdeinit.
           </para>
           <indexterm zone="kf5-frameworks kshell5">
@@ -868,5 +856,5 @@
         <listitem>
           <para>
-            is a telnet service
+            is a telnet service.
           </para>
           <indexterm zone="kf5-frameworks ktelnetservice5">
@@ -880,5 +868,5 @@
         <listitem>
           <para>
-            is a helper program to handle the KDE trash can
+            is a helper program to handle the KDE trash can.
           </para>
           <indexterm zone="kf5-frameworks ktrash5">
@@ -892,5 +880,5 @@
         <listitem>
           <para>
-           is the wallet manager daemon
+           is the wallet manager daemon.
           </para>
           <indexterm zone="kf5-frameworks kwalletd5">
@@ -905,5 +893,5 @@
           <para>
             is a command line tool to write values in KDE
-            configuration files
+            configuration files.
           </para>
           <indexterm zone="kf5-frameworks kwriteconfig5">
@@ -917,5 +905,5 @@
         <listitem>
           <para>
-            converts DocBook files to HTML
+            converts DocBook files to HTML.
           </para>
           <indexterm zone="kf5-frameworks meinproc5">
@@ -941,5 +929,5 @@
         <listitem>
           <para>
-            is a script to extract the text from a tips file
+            is a script to extract the text from a tips file.
           </para>
           <indexterm zone="kf5-frameworks preparetips5">
@@ -953,5 +941,5 @@
         <listitem>
           <para>
-            is a command line tool to investigate available devices
+            is a command line tool to investigate available devices.
          </para>
           <indexterm zone="kf5-frameworks solid-hardware5">
@@ -966,2 +954,3 @@
 
 </sect1>
+
Index: kde/kf5/kf5-intro.xml
===================================================================
--- kde/kf5/kf5-intro.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/kf5/kf5-intro.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+     <othername>$LastChangedBy$</othername>
      <date>$Date$</date>
   </sect1info>
@@ -161,45 +162,17 @@
     </indexterm>
 
-    <para revision="sysv">
-      Several <application>KDE Frameworks 5</application> and
-      <application>Plasma 5</application> packages install
-      files into <application>D-Bus</application> and
-      <application>Polkit</application> directories. When installing
+    <para>
+      Several <application>KDE Frameworks 5</application> packages install
+      files into <application>D-Bus</application> directories. When installing
       <application>KDE Frameworks 5</application> in a location other than
       <filename class="directory">/usr</filename>,
-      <application>D-Bus</application> and <application>Polkit</application>
-      need to be able to find these files.
+      <application>D-Bus</application> needs to be able to find these files.
       The easiest way to achieve this is to create the following symlinks (as
       the <systemitem class="username">root</systemitem> user):
     </para>
 
-<screen role="root"
-        revision="sysv"><userinput>install -v -dm755           $KF5_PREFIX/{etc,share} &amp;&amp;
+<screen role="root"><userinput>install -v -dm755           $KF5_PREFIX/{etc,share} &amp;&amp;
 ln -sfv /etc/dbus-1         $KF5_PREFIX/etc         &amp;&amp;
-ln -sfv /usr/share/dbus-1   $KF5_PREFIX/share       &amp;&amp;
-ln -sfv /usr/share/polkit-1 $KF5_PREFIX/share</userinput></screen>
-
-    <para revision="systemd">
-      Several <application>KDE Frameworks 5</application> and
-      <application>KDE Plasma 5</application> packages install
-      files into <application>D-Bus</application>,
-      <application>Polkit</application>, and
-      <application>systemd</application> directories. When installing
-      <application>KDE 5</application> in a location other than
-      <filename class="directory">/usr</filename>,
-      <application>D-Bus</application>, <application>Polkit</application>,
-      and <application>systemd</application>
-      need to be able to find these files.
-      The easiest way to achieve this is to create the following symlinks (as
-      the <systemitem class="username">root</systemitem> user):
-    </para>
-
-<screen role="root"
-        revision="systemd"><userinput>install -v -dm755           $KF5_PREFIX/{etc,share} &amp;&amp;
-ln -sfv /etc/dbus-1         $KF5_PREFIX/etc         &amp;&amp;
-ln -sfv /usr/share/dbus-1   $KF5_PREFIX/share       &amp;&amp;
-ln -sfv /usr/share/polkit-1 $KF5_PREFIX/share       &amp;&amp;
-install -v -dm755           $KF5_PREFIX/lib         &amp;&amp;
-ln -sfv /usr/lib/systemd    $KF5_PREFIX/lib</userinput></screen>
+ln -sfv /usr/share/dbus-1   $KF5_PREFIX/share</userinput></screen>
 
     <para>
@@ -241,2 +214,4 @@
 
 </sect1>
+
+
Index: kde/kf5/kf5.xml
===================================================================
--- kde/kf5/kf5.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/kf5/kf5.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
  %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="kf5">
Index: kde/libdbusmenuqt.xml
===================================================================
--- kde/libdbusmenuqt.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/libdbusmenuqt.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libdbusmenu-qt-download-http "https://launchpad.net/ubuntu/+archive/primary/+files/libdbusmenu-qt_&libdbusmenu-qt-version;.orig.tar.gz">
+  <!ENTITY libdbusmenu-qt-download-http "http://launchpad.net/ubuntu/+archive/primary/+files/libdbusmenu-qt_&libdbusmenu-qt-version;.orig.tar.gz">
   <!ENTITY libdbusmenu-qt-download-ftp  " ">
   <!ENTITY libdbusmenu-qt-md5sum        "8b90312bd8654e026d814d4db986ce5e">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/phonon-backend-gstreamer.xml
===================================================================
--- kde/phonon-backend-gstreamer.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/phonon-backend-gstreamer.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/phonon-backend-vlc.xml
===================================================================
--- kde/phonon-backend-vlc.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/phonon-backend-vlc.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY phonon-backend-vlc-download-http "&kde-download-http;phonon/phonon-backend-vlc/&phonon-backend-vlc-version;/phonon-backend-vlc-&phonon-backend-vlc-version;.tar.xz">
   <!ENTITY phonon-backend-vlc-download-ftp  " ">
-  <!ENTITY phonon-backend-vlc-md5sum        "5ed16d3290b1ca5ed0bafb90e2ffb02e">
-  <!ENTITY phonon-backend-vlc-size          "68 KB">
-  <!ENTITY phonon-backend-vlc-buildsize     "6.5 MB">
-  <!ENTITY phonon-backend-vlc-time          "0.2 SBU">
+  <!ENTITY phonon-backend-vlc-md5sum        "4214a10dad81ad9115df6fa09a008166">
+  <!ENTITY phonon-backend-vlc-size          "64 KB">
+  <!ENTITY phonon-backend-vlc-buildsize     "5.0 MB">
+  <!ENTITY phonon-backend-vlc-time          "0.1 SBU (Using parallism=4)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/phonon.xml
===================================================================
--- kde/phonon.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/phonon.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/plasma-wayland-protocols.xml
===================================================================
--- kde/plasma-wayland-protocols.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/plasma-wayland-protocols.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY plasma-wayland-protocols-download-http "&kde-download-http;plasma-wayland-protocols/plasma-wayland-protocols-&plasma-wayland-protocols-version;.tar.xz">
   <!ENTITY plasma-wayland-protocols-download-ftp  " ">
-  <!ENTITY plasma-wayland-protocols-md5sum        "ff5193b515decd1eb8393fed1cfa5bf3">
-  <!ENTITY plasma-wayland-protocols-size          "40 KB">
-  <!ENTITY plasma-wayland-protocols-buildsize     "672 KB">
+  <!ENTITY plasma-wayland-protocols-md5sum        "82207f4df5e4a91452339bcf7b983d7e">
+  <!ENTITY plasma-wayland-protocols-size          "38 KB">
+  <!ENTITY plasma-wayland-protocols-buildsize     "680 KB">
   <!ENTITY plasma-wayland-protocols-time          "less than 0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -33,5 +34,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/plasma5/plasma-all.xml
===================================================================
--- kde/plasma5/plasma-all.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/plasma5/plasma-all.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
  %general-entities;
 
-  <!ENTITY plasma5-download-http "https://download.kde.org/stable/plasma/&plasma5-version;">
+  <!ENTITY plasma5-download-http "http://download.kde.org/stable/plasma/&plasma5-version;">
   <!ENTITY plasma5-download-ftp  " ">
   <!ENTITY plasma5-md5sum        "See Below">
-  <!ENTITY plasma5-size          "140 MB">
-  <!ENTITY plasma5-buildsize     "1.6 GB (355 MB installed)">
-  <!ENTITY plasma5-time          "18 SBU (using parallelism=4)">
+  <!ENTITY plasma5-size          "118 MB">
+  <!ENTITY plasma5-buildsize     "535 MB (330 MB installed)">
+  <!ENTITY plasma5-time          "14 SBU (using parallelism=4)">
 ]>
 
@@ -17,5 +17,6 @@
 
   <sect1info>
-     <date>$Date$</date>
+     <othername>$LastChangedBy: bdubbs $</othername>
+     <date>$Date: 2015-09-24 16:44:04 -0500 (Thu, 24 Sep 2015) $</date>
   </sect1info>
 
@@ -31,5 +32,5 @@
   </para>
 
-  &lfs110a_checked;
+  &lfs10_checked;
 
   <para>
@@ -77,5 +78,5 @@
   <para role="required">
     <!--<xref linkend="fontforge"/>,-->
-    <!-- does not seem to be needed as of 5.22.4 <xref linkend="GConf"/>, -->
+    <xref linkend="GConf"/>,
     <xref linkend="gtk2"/>,
     <xref linkend="gtk3"/>,
@@ -100,5 +101,4 @@
     <xref linkend="libcanberra"/>,
     <xref linkend="libinput"/>,
-    <xref linkend="libpcap"/>,
     <xref linkend="linux-pam"/>,
     <xref linkend="lm_sensors"/>,
@@ -109,5 +109,4 @@
   <bridgehead renderas="sect4">Recommended (runtime)</bridgehead>
   <para role="recommended">
-    <xref role="runtime" linkend="accountsservice"/> and
     <xref role="runtime" linkend="smartmontools"/>
   </para>
@@ -117,5 +116,4 @@
     <xref linkend="glu"/>,
     <xref linkend='ibus'/>,
-    <xref linkend='qtwebengine'/>,
     <xref linkend="xorg-synaptics-driver"/>,
     <ulink url="http://distributions.freedesktop.org/wiki/AppStream">appstream-qt</ulink>, 
@@ -123,5 +121,5 @@
     <ulink url="https://gpsd.gitlab.io/gpsd/">libgps</ulink>,
     <ulink url="https://github.com/libhybris/libhybris">libhybris</ulink>,
-    <ulink url="https://sourceforge.net/projects/libraw1394/">libraw1394</ulink>,
+    <ulink url="http://sourceforge.net/projects/libraw1394/">libraw1394</ulink>,
     <ulink url="https://bitbucket.org/godsme/mockcpp">mockcpp</ulink>,
     <ulink url="https://www.freedesktop.org/software/PackageKit/releases/">packagekit-qt</ulink>,
@@ -132,13 +130,4 @@
   </para>
 
-  <note>
-    <para>
-      Only two plasma packages optionally use <xref linkend="qtwebengine"/>:
-      libksysguard and kdeplasma-addons. If QtWebEngine is installed later, 
-      only those two packages have to be rebuilt. This allows to provide
-      a more complete display in the system monitor application.
-    </para>
-  </note>
-
   <para condition="html" role="usernotes">User Notes:
   <ulink url="&blfs-wiki;/kf5"/></para>
@@ -152,5 +141,5 @@
     </para>
 
-<screen><userinput>url=https://download.kde.org/stable/plasma/&plasma5-version;/
+<screen><userinput>url=http://download.kde.org/stable/plasma/&plasma5-version;/
 wget -r -nH -nd -A '*.xz' -np $url</userinput>
 <literal>
@@ -173,57 +162,53 @@
 
 <screen><userinput>cat &gt; plasma-&plasma5-version;.md5 &lt;&lt; "EOF"
-<literal>7fab69fa5fc3211b35e3d03f1172831a  kdecoration-5.22.4.tar.xz
-a587fecf0473c225f39a7f8a7c611d3b  libkscreen-5.22.4.tar.xz
-115f8e14d6ef58715183eb8036c431c1  libksysguard-5.22.4.tar.xz
-516a58571f6daeb60a2509057e67712b  breeze-5.22.4.tar.xz
-3b06f3768fc345893625ef44d7e72a98  breeze-gtk-5.22.4.tar.xz
-049dabd694abed120b4f84d37f05de8c  layer-shell-qt-5.22.4.tar.xz
-17af84caeb942de9a8e3d819f20645b0  kscreenlocker-5.22.4.tar.xz
-ffe09b47f6cc20d13ec311edeb13a9b3  oxygen-5.22.4.tar.xz
-916bfa4ce6b40ca8ef80b75018d63ab1  kinfocenter-5.22.4.tar.xz
-365f7cd632d41447561ec1bdf7497bba  kwayland-server-5.22.4.tar.xz
-09cf360780185b33fca9561684a0f41f  kwin-5.22.4.tar.xz
-5cb1ab2a9d3ce0c05eba07ef4c8ac478  plasma-workspace-5.22.4.tar.xz
-75dd5e0fed93781f0ae031a091dcce4b  plasma-disks-5.22.4.tar.xz
-3d7abfe0952b356cc12cbd75be14f5e0  bluedevil-5.22.4.tar.xz
-2515439a0daaf325b0fcf9ce1a537660  kde-gtk-config-5.22.4.tar.xz
-8f2f4b902c98d7890dc1ec3756c27871  khotkeys-5.22.4.tar.xz
-aa03bf8d1c799a4410b567b44b47f6cd  kmenuedit-5.22.4.tar.xz
-6fab0d760e9e6a33255441aab3874b2f  kscreen-5.22.4.tar.xz
-3dae9ce525c52ac3bacaff464dc4264c  kwallet-pam-5.22.4.tar.xz
-fa9772ef7737037992aea52739aea95a  kwayland-integration-5.22.4.tar.xz
-51502b6a48f2b7790364881a578cdd1b  kwrited-5.22.4.tar.xz
-6d85652d5fa13953370bc4f37247e3b4  milou-5.22.4.tar.xz
-61c7fc4c00637715e8d0c4491298b5b7  plasma-nm-5.22.4.tar.xz
-31272515681adc5d0ca987a9dc182de5  plasma-pa-5.22.4.tar.xz
-95aefdbfd0a3cd6b871e50968ccf43d9  plasma-workspace-wallpapers-5.22.4.tar.xz
-9a36fb70a6d1f1f637d75a75e77eb9ba  polkit-kde-agent-1-5.22.4.tar.xz
-f7860ee18c994a8b87f39965b53f4f1f  powerdevil-5.22.4.tar.xz
-ba7687bdea331a62127f7cc69029c194  plasma-desktop-5.22.4.tar.xz
-9c393f6da042841ed8cf41f9ad126b5c  kdeplasma-addons-5.22.4.tar.xz
-bf508d7b503f1923fdb5fbd22f957981  kgamma5-5.22.4.tar.xz
-239d00ede4c0e941dc6407f8510f1678  ksshaskpass-5.22.4.tar.xz
-#ba59a194b4812db25022c189e129151f  plasma-sdk-5.22.4.tar.xz
-3ecfe0501ce2ec0f8c8bda3a01c78be7  sddm-kcm-5.22.4.tar.xz
-a81e62bd36f3db28712274da80ed52a4  discover-5.22.4.tar.xz
-#9abba589089c1088e1836cabe9e593f6  breeze-grub-5.22.4.tar.xz
-#d038d1db0f1ed5e80b9d22a537dd1872  breeze-plymouth-5.22.4.tar.xz
-7aef306ec8c2131f0fa22d2b558f73fb  kactivitymanagerd-5.22.4.tar.xz
-8c30da2b1dbcfbfaa715c050339b0e0a  plasma-integration-5.22.4.tar.xz
-006171ce3edae4b67d27b1577cdc84a1  plasma-tests-5.22.4.tar.xz
-#442fd33f46a982eeeb925fd6f7d919b1  plymouth-kcm-5.22.4.tar.xz
-900994c0628b8b3767c83db0b4f16e0c  xdg-desktop-portal-kde-5.22.4.tar.xz
-61ebe5891cf9adcd62d32c5069573ff0  drkonqi-5.22.4.tar.xz
-d464d91d37cf12da1721abc18ec94140  plasma-vault-5.22.4.tar.xz
-8c9a2286634cb89fb04d0278c6af8f8c  plasma-browser-integration-5.22.4.tar.xz
-257e25f2388014932ecf786dd9e49bd5  kde-cli-tools-5.22.4.tar.xz
-9314599d78ed6683018ff5a7b69d2a08  systemsettings-5.22.4.tar.xz
-3ea20e78932f2a487d932acd1eff10f7  plasma-thunderbolt-5.22.4.tar.xz
-#0ecfa8ed1962f4f842967ed7b66d14f8  plasma-nano-5.22.4.tar.xz
-#157a441ad0519936dcb75856ae83010e  plasma-phone-components-5.22.4.tar.xz
-71b0da480c6b91b6445b6bdbe452bdae  plasma-firewall-5.22.4.tar.xz
-026a4d3cd063ba86e77c9ffa711aa769  plasma-systemmonitor-5.22.4.tar.xz
-0d72d2e9f5d6a3975068e1a472ce9982  qqc2-breeze-style-5.22.4.tar.xz
-171c556167b17fd2b16783015c3f8ae6  ksystemstats-5.22.4.tar.xz</literal>
+<literal>af10a41b15cb81f3cc405e31ef9f17ed  kdecoration-5.20.4.tar.xz
+aee69339bac97b8b4c8ba073c48ac7ed  libkscreen-5.20.4.tar.xz
+44015317e6c496a2cbd0dbea00fafec5  libksysguard-5.20.4.tar.xz
+9000d1bfe0bb16ee499dbe5a5af9bb22  breeze-5.20.4.tar.xz
+f984413303ea9bfa8b09add47eea217a  breeze-gtk-5.20.4.tar.xz
+86f2e76c7408b2ccd327b4ffa7c81f41  kscreenlocker-5.20.4.tar.xz
+792f7f818c18f386118093bb0be035d1  oxygen-5.20.4.tar.xz
+b41353b8c832a2831f04fc180dbabadd  kinfocenter-5.20.4.tar.xz
+fd1267064fa9b085934cbe3f1e5aade7  ksysguard-5.20.4.tar.xz
+cf90264792369ba8bd4d4333a5b59c96  kwayland-server-5.20.4.tar.xz
+2e25eb98bbbc37eaa81d6061817bd164  kwin-5.20.4.tar.xz
+cb4867c20b81ffcd8adae56c3dec0d41  plasma-workspace-5.20.4.tar.xz
+2a177037483a9517c7ecbf003a2b7e5b  plasma-disks-5.20.4.tar.xz
+ac4730c9c47016c1db92e1b1c66b585f  bluedevil-5.20.4.tar.xz
+ea24ffd849444b5ceba4a48023939311  kde-gtk-config-5.20.4.tar.xz
+856e51dfb18f2b51ca39db5af2b9707b  khotkeys-5.20.4.tar.xz
+257cba142fc1c13d328d6817b65cdc3a  kmenuedit-5.20.4.tar.xz
+b8a5116c94ea717b3b71f2fdcc59a881  kscreen-5.20.4.tar.xz
+aea33684c4ed4241e01e3753fd0ea132  kwallet-pam-5.20.4.tar.xz
+65d449b6a51fbff45c9cc65d601536ac  kwayland-integration-5.20.4.tar.xz
+09c0ef8c927c1b0798a41ae7b6ca1397  kwrited-5.20.4.tar.xz
+92e9003a449866335ef154c748846f46  milou-5.20.4.tar.xz
+e05dbd9e6617b49290616d323bc54daf  plasma-nm-5.20.4.tar.xz
+1eebbc148709b42dc4862a2d98fff85b  plasma-pa-5.20.4.tar.xz
+d96c17d9d589cd2ba833d60ac55208e5  plasma-workspace-wallpapers-5.20.4.tar.xz
+44e98339dbe238045d1e72d26282a74d  polkit-kde-agent-1-5.20.4.tar.xz
+5fd24e129d01354d6abaf8aa8766ed85  powerdevil-5.20.4.tar.xz
+ddd01d3a85e5efb2967b7dfa4f162b6f  plasma-desktop-5.20.4.tar.xz
+6e4d4f4717c6149d0213bdc6fbe4cc0e  kdeplasma-addons-5.20.4.tar.xz
+9cf80a513951a8cb8f540d2cc2315664  kgamma5-5.20.4.tar.xz
+7ac6d7e0d6849ce23e86b2ee5ad5d888  ksshaskpass-5.20.4.tar.xz
+#717b10a56d338bb58383f0f3269fb531  plasma-sdk-5.20.4.tar.xz
+16f15fee8b435ac1ce0f304668f538b3  sddm-kcm-5.20.4.tar.xz
+f6f126e5f6d84d8f47516badc7fb7e9c  discover-5.20.4.tar.xz
+#b55f6f11e4fa29c39fce9c0d5568ca88  breeze-grub-5.20.4.tar.xz
+#7d6977a3d6dea4e43ce03b81fc09ba2d  breeze-plymouth-5.20.4.tar.xz
+a74cf024d2e05837b813703daa364713  kactivitymanagerd-5.20.4.tar.xz
+5478e5bb63b40271143166dfbc3c7552  plasma-integration-5.20.4.tar.xz
+ae3ae24c4145ef01680f0120ee2693b8  plasma-tests-5.20.4.tar.xz
+#791d267d4869ea743bbe4d47e798a4cb  plymouth-kcm-5.20.4.tar.xz
+c9a901323a72ccb071c1a2a9b20fe2d0  xdg-desktop-portal-kde-5.20.4.tar.xz
+4515e64c1758dc49a8ca9adb1113a37a  drkonqi-5.20.4.tar.xz
+594abf697ef7ba64ee5a2468a72c93dc  plasma-vault-5.20.4.tar.xz
+1832bd8fabaec98d880fa25ea2adc395  plasma-browser-integration-5.20.4.tar.xz
+3497d575211112126b26c50416ca1271  kde-cli-tools-5.20.4.tar.xz
+e1997939048be759b3344d05028c67bb  systemsettings-5.20.4.tar.xz
+3dd1492bd3ed8edf085a01b536c06a73  plasma-thunderbolt-5.20.4.tar.xz
+#e07b202527e67af36503e96149b974b0  plasma-nano-5.20.4.tar.xz
+#cda92e6b67f50ebf9bd9583593e9942d  plasma-phone-components-5.20.4.tar.xz</literal>
 EOF</userinput></screen>
 
@@ -328,13 +313,4 @@
 done--></userinput></screen>
 
-    <para revision="sysv">
-      Useless systemd units have been installed in
-      <filename class="directory">$KF5_PREFIX/lib</filename>. Remove
-      them now (as <systemitem class="username">root</systemitem>):
-    </para>
-
-<screen role="root"
-        revision="sysv"><userinput>rm -rf $KF5_PREFIX/lib/systemd</userinput></screen>
-
   </sect2>
 <!--
@@ -452,6 +428,5 @@
       press keys Alt-F7 (assuming that X was running on vt7).
     </para>
-<!-- Now the entry is "plasma (X11)" for Xorg, so I guess this is
-     not needed anymore:
+
     <para>
       If you intend to start <application>Plasma</application> using a
@@ -465,5 +440,5 @@
 
 <screen role="root"><userinput>sed '/^Name=/s/Plasma/Plasma on Xorg/' -i /usr/share/xsessions/plasma.desktop</userinput></screen>
--->
+
 
   </sect2>
@@ -479,5 +454,5 @@
       <seglistitem>
         <seg>
-           There are too many plasma programs (63 in /opt/kf5/bin) to list
+           There are too many plasma programs (61 in /opt/kf5/bin) to list
            separately here.
         </seg>
Index: kde/plasma5/plasma5.xml
===================================================================
--- kde/plasma5/plasma5.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/plasma5/plasma5.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
  %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="plasma5">
Index: kde/polkit-qt.xml
===================================================================
--- kde/polkit-qt.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ kde/polkit-qt.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY polkit-qt-download-http "&kde-download-http;polkit-qt-1/polkit-qt-1-&polkit-qt-version;.tar.xz">
   <!ENTITY polkit-qt-download-ftp  " ">
-  <!ENTITY polkit-qt-md5sum        "2d20b02bd7ad1cd3f6ce235fc6d7de60">
-  <!ENTITY polkit-qt-size          "6o KB">
-  <!ENTITY polkit-qt-buildsize     "3.5 MB">
-  <!ENTITY polkit-qt-time          "0.1 SBU">
+  <!ENTITY polkit-qt-md5sum        "eae8dfbe16015acf0edfe365bb676e51">
+  <!ENTITY polkit-qt-size          "64 KB">
+  <!ENTITY polkit-qt-buildsize     "3.0 MB">
+  <!ENTITY polkit-qt-time          "0.2 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: lxde/apps/apps.xml
===================================================================
--- lxde/apps/apps.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ lxde/apps/apps.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="lxde-apps">
Index: lxde/apps/gpicview.xml
===================================================================
--- lxde/apps/gpicview.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ lxde/apps/gpicview.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -153,5 +154,5 @@
         <listitem>
           <para>
-            is a lightweight image viewer
+            is a lightweight image viewer.
           </para>
           <indexterm zone="gpicview gpicview-prog">
Index: lxde/apps/lxappearance-obconf.xml
===================================================================
--- lxde/apps/lxappearance-obconf.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ lxde/apps/lxappearance-obconf.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: lxde/apps/lxinput.xml
===================================================================
--- lxde/apps/lxinput.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ lxde/apps/lxinput.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -135,5 +136,5 @@
         <listitem>
           <para>
-            is a program used to configure keyboard and mouse
+            is a program used to configure keyboard and mouse.
           </para>
           <indexterm zone="lxinput lxinput-prog">
Index: lxde/apps/lxrandr.xml
===================================================================
--- lxde/apps/lxrandr.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ lxde/apps/lxrandr.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -154,5 +155,5 @@
         <listitem>
           <para>
-            is a <application>GTK+</application> interface to XRandR
+            is a <application>GTK+</application> interface to XRandR.
           </para>
           <indexterm zone="lxrandr lxrandr-prog">
Index: lxde/apps/lxtask.xml
===================================================================
--- lxde/apps/lxtask.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ lxde/apps/lxtask.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -156,5 +157,5 @@
         <listitem>
           <para>
-            is a lightweight and desktop-independent task manager
+            is a lightweight and desktop-independent task manager.
           </para>
           <indexterm zone="lxtask lxtask-prog">
Index: lxde/apps/lxterminal.xml
===================================================================
--- lxde/apps/lxterminal.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ lxde/apps/lxterminal.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY lxterminal-download-http "&sourceforge-dl;/lxde/lxterminal-&lxterminal-version;.tar.xz">
   <!ENTITY lxterminal-download-ftp  " ">
-  <!ENTITY lxterminal-md5sum        "7938dbd50e3826c11f4735a742b278d3">
-  <!ENTITY lxterminal-size          "197 KB">
-  <!ENTITY lxterminal-buildsize     "4.5 MB">
+  <!ENTITY lxterminal-md5sum        "62e57c3aafb831505cc1638b2b737cc9">
+  <!ENTITY lxterminal-size          "196 KB">
+  <!ENTITY lxterminal-buildsize     "3.1 MB">
   <!ENTITY lxterminal-time          "less than 0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -155,5 +156,5 @@
           <para>
             a lightweight terminal emulator for the
-            <application>LXDE</application> desktop
+            <application>LXDE</application> desktop.
           </para>
           <indexterm zone="lxterminal lxterminal-prog">
Index: lxde/apps/vte2.xml
===================================================================
--- lxde/apps/vte2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ lxde/apps/vte2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -164,5 +165,5 @@
         <listitem>
           <para>
-            is a simple terminal emulator
+            is a simple terminal emulator.
           </para>
           <indexterm zone="vte2 vte2-prog">
@@ -176,5 +177,5 @@
         <listitem>
           <para>
-            contains the <application>Vte</application> API functions
+            contains the <application>Vte</application> API functions.
           </para>
           <indexterm zone="vte2 libvte2">
Index: lxde/desktop/desktop.xml
===================================================================
--- lxde/desktop/desktop.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ lxde/desktop/desktop.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="lxde-desktop">
Index: lxde/desktop/libfm-extra.xml
===================================================================
--- lxde/desktop/libfm-extra.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ lxde/desktop/libfm-extra.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,6 +7,6 @@
   <!ENTITY libfm-download-http "&sourceforge-dl;/pcmanfm/libfm-&libfm-extra-version;.tar.xz">
   <!ENTITY libfm-download-ftp  " ">
-  <!ENTITY libfm-md5sum        "c87a0ff41ae77825079b2f785ec0741e">
-  <!ENTITY libfm-size          "924 KB">
+  <!ENTITY libfm-md5sum        "c15ecd2c9317e2c385cd3f046d0b61ba">
+  <!ENTITY libfm-size          "920 KB">
   <!ENTITY libfm-buildsize     "11 MB">
   <!ENTITY libfm-time          "less than 0.1 SBU">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -126,12 +127,11 @@
 
     <para>
-      <parameter>--with-extra-only</parameter>: This switch disables all 
-      components except for the libfm-extra library.
+      <parameter>--with-extra-only</parameter> Disable all components but
+      libfm-extra library.
     </para>
 
     <para>
-      <parameter>--with-gtk=no</parameter>: This switch disables support for
-      <application>GTK+</application> because it is not necessary for this
-      package.
+      <parameter>--with-gtk=no</parameter> <application>Gtk</application> is
+      not necessary for this package.
     </para>
 
@@ -172,5 +172,5 @@
         <listitem>
           <para>
-            contains the <application>libfm-extra</application> API functions
+            contains the <application>libfm-extra</application> API functions.
           </para>
           <indexterm zone="libfm-extra libfm-extra-lib">
Index: lxde/desktop/libfm.xml
===================================================================
--- lxde/desktop/libfm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ lxde/desktop/libfm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY libfm-download-http "&sourceforge-dl;/pcmanfm/libfm-&libfm-version;.tar.xz">
   <!ENTITY libfm-download-ftp  " ">
-  <!ENTITY libfm-md5sum        "c87a0ff41ae77825079b2f785ec0741e">
-  <!ENTITY libfm-size          "924 KB">
-  <!ENTITY libfm-buildsize     "36 MB">
-  <!ENTITY libfm-time          "0.3 SBU">
+  <!ENTITY libfm-md5sum        "c15ecd2c9317e2c385cd3f046d0b61ba">
+  <!ENTITY libfm-size          "920 KB">
+  <!ENTITY libfm-buildsize     "30 MB">
+  <!ENTITY libfm-time          "0.4 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -175,5 +176,5 @@
           <para>
             sets preferred applications for programs based
-            on <application>libfm</application>
+            on <application>libfm</application>.
           </para>
           <indexterm zone="libfm libfm-pref-apps">
@@ -187,5 +188,5 @@
         <listitem>
           <para>
-            is a small program used to edit application shortcuts
+            is a small program used to edit application shortcuts.
           </para>
           <indexterm zone="libfm lxshortcut">
@@ -199,5 +200,5 @@
         <listitem>
           <para>
-            contains the <application>libfm</application> API functions
+            contains the <application>libfm</application> API functions.
           </para>
           <indexterm zone="libfm libfm-lib">
Index: lxde/desktop/libwnck2.xml
===================================================================
--- lxde/desktop/libwnck2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ lxde/desktop/libwnck2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -175,5 +176,5 @@
           <para>
             Prints, modifies, or interacts with  the properties of a 
-            screen/workspace/window
+            screen/workspace/window.
           </para>
           <indexterm zone="libwnck2 wnckprop-1">
@@ -187,5 +188,5 @@
         <listitem>
           <para>
-            contains functions for writing pagers and task lists
+            contains functions for writing pagers and task lists.
           </para>
           <indexterm zone="libwnck2 libwnck-1">
Index: lxde/desktop/lxappearance.xml
===================================================================
--- lxde/desktop/lxappearance.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ lxde/desktop/lxappearance.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -173,5 +174,5 @@
           <para>
             is a program used to change <application>GTK+</application>
-            themes, icon themes, and fonts used by applications
+            themes, icon themes, and fonts used by applications.
           </para>
           <indexterm zone="lxappearance lxappearance-prog">
Index: lxde/desktop/lxde-common.xml
===================================================================
--- lxde/desktop/lxde-common.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ lxde/desktop/lxde-common.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -223,5 +224,5 @@
           <para>
             is used to quit the desktop session for
-            <application>LXDE</application>
+            <application>LXDE</application>.
           </para>
           <indexterm zone="lxde-common lxde-logout">
@@ -236,5 +237,5 @@
           <para>
             is a wrapper script which runs <application>Openbox</application>
-            with <application>LXDE</application> specific config file
+            with <application>LXDE</application> specific config file.
           </para>
           <indexterm zone="lxde-common openbox-lxde">
@@ -249,5 +250,5 @@
           <para>
             is used to start the desktop session for
-            <application>LXDE</application>
+            <application>LXDE</application>.
           </para>
           <indexterm zone="lxde-common startlxde">
Index: lxde/desktop/lxmenu-data.xml
===================================================================
--- lxde/desktop/lxmenu-data.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ lxde/desktop/lxmenu-data.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: lxde/desktop/lxpanel.xml
===================================================================
--- lxde/desktop/lxpanel.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ lxde/desktop/lxpanel.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY lxpanel-download-http "&sourceforge-dl;/lxde/lxpanel-&lxpanel-version;.tar.xz">
   <!ENTITY lxpanel-download-ftp  " ">
-  <!ENTITY lxpanel-md5sum        "c922d044789c3d7ae028f0e80dea18b0">
+  <!ENTITY lxpanel-md5sum        "e6a1f9bd5cf39812e1c5d2453a34a7c5">
   <!ENTITY lxpanel-size          "1.5 MB">
-  <!ENTITY lxpanel-buildsize     "30 MB">
+  <!ENTITY lxpanel-buildsize     "24 MB">
   <!ENTITY lxpanel-time          "0.3 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -169,5 +170,5 @@
           <para>
             is a lightweight <application>GTK+</application> based
-            panel for the <application>LXDE</application> Desktop
+            panel for the <application>LXDE</application> Desktop.
           </para>
           <indexterm zone="lxpanel lxpanel-prog">
@@ -181,5 +182,5 @@
         <listitem>
           <para>
-            is a program that controls lxpanel
+            is a program that controls lxpanel.
           </para>
           <indexterm zone="lxpanel lxpanelctl">
Index: lxde/desktop/lxsession.xml
===================================================================
--- lxde/desktop/lxsession.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ lxde/desktop/lxsession.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -168,5 +169,5 @@
         <listitem>
           <para>
-            is a clipboard utility for LXSession and LXDE
+            is a clipboard utility for LXSession and LXDE.
           </para>
           <indexterm zone="lxsession lxclipboard">
@@ -180,5 +181,5 @@
         <listitem>
           <para>
-            locks the local X display until a password is entered
+            locks the local X display until a password is entered.
           </para>
           <indexterm zone="lxsession lxlock">
@@ -192,5 +193,5 @@
         <listitem>
           <para>
-            is a polkit agent
+            is a polkit agent.
           </para>
           <indexterm zone="lxsession lxpolkit">
@@ -204,5 +205,5 @@
         <listitem>
           <para>
-            is a lightweight X session manager
+            is a lightweight X session manager.
           </para>
           <indexterm zone="lxsession lxsession-prog">
@@ -217,5 +218,5 @@
           <para>
             is used to modify the database for managing
-            sessions in lxsession
+            sessions in lxsession.
           </para>
           <indexterm zone="lxsession lxsession-db">
@@ -229,5 +230,5 @@
         <listitem>
           <para>
-            launch default applications set by LXsession
+            launch default applications set by LXsession.
           </para>
           <indexterm zone="lxsession lxsession-default">
@@ -241,5 +242,5 @@
         <listitem>
           <para>
-            is an utility to configure lxsession and its default applications
+            is an utility to configure lxsession and its default applications.
           </para>
           <indexterm zone="lxsession lxsession-default-apps">
@@ -253,5 +254,5 @@
         <listitem>
           <para>
-            launch the default terminal set by LXSession
+            launch the default terminal set by LXSession.
           </para>
           <indexterm zone="lxsession lxsession-default-terminal">
@@ -265,5 +266,5 @@
         <listitem>
           <para>
-            is the standard session edit manager used by LXDE
+            is the standard session edit manager used by LXDE.
           </para>
           <indexterm zone="lxsession lxsession-edit">
@@ -277,5 +278,5 @@
         <listitem>
           <para>
-            is a program to logout from LXSession
+            is a program to logout from LXSession.
           </para>
           <indexterm zone="lxsession lxsession-logout">
@@ -289,5 +290,5 @@
         <listitem>
           <para>
-            handles the autostart spec of freedesktop.org
+            handles the autostart spec of freedesktop.org.
           </para>
           <indexterm zone="lxsession lxsession-xdg-autostart">
@@ -302,5 +303,5 @@
           <para>
             is a tool to configure gtk+ themes, keyboard, and mouse for you
-            on session startup
+            on session startup.
           </para>
           <indexterm zone="lxsession lxsession-xsettings">
@@ -314,5 +315,5 @@
         <listitem>
           <para>
-            is the settings daemon for LXsession
+            is the settings daemon for LXsession.
           </para>
           <indexterm zone="lxsession lxsettings-daemon">
Index: lxde/desktop/menu-cache.xml
===================================================================
--- lxde/desktop/menu-cache.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ lxde/desktop/menu-cache.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -174,5 +175,5 @@
         <listitem>
           <para>
-            contains the <application>menu-cache</application> API functions
+            contains the <application>menu-cache</application> API functions.
           </para>
           <indexterm zone="menu-cache libmenu-cache">
Index: lxde/desktop/pcmanfm.xml
===================================================================
--- lxde/desktop/pcmanfm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ lxde/desktop/pcmanfm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY pcmanfm-download-http "&sourceforge-dl;/pcmanfm/pcmanfm-&pcmanfm-version;.tar.xz">
   <!ENTITY pcmanfm-download-ftp  " ">
-  <!ENTITY pcmanfm-md5sum        "ef7c4417d2697ef138d175db7aeae15a">
+  <!ENTITY pcmanfm-md5sum        "d32ad2c9c7c52bff2004bbc120b53420">
   <!ENTITY pcmanfm-size          "416 KB">
-  <!ENTITY pcmanfm-buildsize     "11 MB">
-  <!ENTITY pcmanfm-time          "0.1 SBU">
+  <!ENTITY pcmanfm-buildsize     "8.0 MB">
+  <!ENTITY pcmanfm-time          "less than 0.1 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -145,5 +146,5 @@
           <para>
             is a lightweight <application>GTK+</application> based file
-            manager for X Window System
+            manager for X Window System.
           </para>
           <indexterm zone="pcmanfm pcmanfm-prog">
Index: lxde/lxde.xml
===================================================================
--- lxde/lxde.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ lxde/lxde.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <part id="lxde" xreflabel="LXDE">
Index: multimedia/audioutils/audacious.xml
===================================================================
--- multimedia/audioutils/audacious.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/audioutils/audacious.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,15 +8,15 @@
            "https://distfiles.audacious-media-player.org/audacious-&audacious-version;.tar.bz2">
   <!ENTITY audacious-download-ftp         " ">
-  <!ENTITY audacious-md5sum               "22fbe28b073682d55ee87698f283e195">
-  <!ENTITY audacious-size                 "576 KB">
-  <!ENTITY audacious-buildsize            "72 MB (with Qt user interface)">
-  <!ENTITY audacious-time                 "0.7 SBU (with Qt user interface)">
+  <!ENTITY audacious-md5sum               "a2e8420ce841cb18ff380d7ad0185651">
+  <!ENTITY audacious-size                 "564 KB">
+  <!ENTITY audacious-buildsize            "59 MB (with Qt user interface)">
+  <!ENTITY audacious-time                 "0.6 SBU (with Qt user interface)">
 
   <!ENTITY audacious-plugins-download
            "https://distfiles.audacious-media-player.org/audacious-plugins-&audacious-plugins-version;.tar.bz2">
-  <!ENTITY audacious-plugins-md5sum       "740d83757b49b82bc75e256c96b09bfd">
+  <!ENTITY audacious-plugins-md5sum       "b545aa271955cfd67630ea13655236a3">
   <!ENTITY audacious-plugins-size         "1.7 MB">
-  <!ENTITY audacious-plugins-buildsize    "157 MB (with Qt user interface)">
-  <!ENTITY audacious-plugins-time         "1.5 SBU (with Qt user interface)">
+  <!ENTITY audacious-plugins-buildsize    "129 MB (with Qt user interface)">
+  <!ENTITY audacious-plugins-time         "1.2 SBU (with Qt user interface)">
 ]>
 
@@ -25,4 +25,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -41,5 +42,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -129,5 +130,4 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libarchive"/> and
       <xref linkend="valgrind"/>
     </para>
@@ -153,19 +153,15 @@
       <xref linkend="pulseaudio"/>,
       <xref linkend="sdl"/>,
-      <ulink url="http://ampache-browser.org/">ampache-browser</ulink>,
       <ulink url="http://adplug.github.io/">adplug</ulink>,
-      <ulink url="https://sourceforge.net/projects/bs2b/">The Bauer
+      <ulink url="http://sourceforge.net/projects/bs2b/">The Bauer
         stereophonic-to-binaural DSP (bs2b) library</ulink>,
       <ulink url="https://sourceforge.net/projects/fluidsynth/">FluidSynth</ulink>,
       <ulink url="http://jackaudio.org/">JACK</ulink>
         (requires <xref linkend="libsamplerate"/>),
-      <ulink url="https://sourceforge.net/projects/libcue/">libcue</ulink>,
-      <ulink url="https://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink>,
-      <ulink url="https://sourceforge.net/projects/libmms">libmms</ulink>,
-      <ulink url="https://lib.openmpt.org/libopenmpt/">libopenmpt</ulink>,
+      <ulink url="http://sourceforge.net/projects/libcue/">libcue</ulink>,
+      <ulink url="http://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink>,
+      <ulink url="http://sourceforge.net/projects/libmms">libmms</ulink>,
       <ulink url="http://www.sourceforge.net/projects/sidplay-residfp/">libsidplayfp</ulink>,
-      <ulink url="http://www.lirc.org/">LIRC</ulink>,
-      <ulink url="https://sndio.org/">sndio</ulink>,
-      <ulink url="https://sourceforge.net/p/soxr/wiki/Home/">SoX</ulink>, and
+      <ulink url="http://www.lirc.org/">LIRC</ulink>, and
       <ulink url="http://www.wavpack.com/">WavPack</ulink>
     </para>
@@ -236,5 +232,5 @@
       output from <command>make</command> to a log file then the control
       characters used to color the text can make the logfile unreadable. This
-      option prevents <command>make</command> from coloring the text.
+      option stops it coloring the text.
     </para>
 
@@ -307,16 +303,12 @@
       <seglistitem>
         <seg>
-          audacious and 
-          audtool
+          audacious and audtool
         </seg>
         <seg>
-          libaudcore.so, 
-          libaudgui.so, 
-          libaudqt.so, 
-          libaudtag.so, 
-          and several plugin libraries under /usr/lib/audacious/ sub-directories
+          libaudcore.so, libaudqt.so, libaudtag.so, and several
+          plugin libraries under /usr/lib/audacious/ sub-directories
         </seg>
         <seg>
-          /usr/include/{audacious,libaudcore,libaudgui,libaudqt},
+          /usr/include/{audacious,libaudcore,libaudqt},
           /usr/lib/audacious and
           /usr/share/audacious
@@ -335,5 +327,5 @@
           <para>
             is a Qt port of <application>XMMS</application> based on the
-            <application>Beep Media Player</application>
+            <application>Beep Media Player</application>.
           </para>
           <indexterm zone="audacious audacious-prog">
@@ -348,5 +340,5 @@
           <para>
             is a small tool to modify the behavior of a running
-            <command>audacious</command> instance
+            <command>audacious</command> instance.
           </para>
           <indexterm zone="audacious audtool">
Index: multimedia/audioutils/audioutils.xml
===================================================================
--- multimedia/audioutils/audioutils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/audioutils/audioutils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="multimedia-audioutils">
Index: multimedia/audioutils/cdparanoia.xml
===================================================================
--- multimedia/audioutils/cdparanoia.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/audioutils/cdparanoia.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -166,5 +167,5 @@
           <para>
             is used for 'ripping' an audio-cd. Ripping is the process of
-            digitally extracting music from an audio CD
+            digitally extracting music from an audio CD.
           </para>
           <indexterm zone="cdparanoia cdparanoia-prog">
@@ -180,5 +181,5 @@
             contains functions used by <command>cdparanoia</command>, as
             well as other packages, which can automatically identify if a
-            CD device is CDDA compatible
+            CD device is CDDA compatible.
           </para>
           <indexterm zone="cdparanoia libcdda_interface">
@@ -194,5 +195,5 @@
             contains functions used by <command>cdparanoia</command>, as
             well as other packages, which provide data verification, synchronization,
-            error handling and scratch reconstruction capability
+            error handling and scratch reconstruction capability.
           </para>
           <indexterm zone="cdparanoia libcdda_paranoia">
Index: multimedia/audioutils/kwave.xml
===================================================================
--- multimedia/audioutils/kwave.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/audioutils/kwave.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY kwave-download-http "&kf5apps-download-http;/kwave-&kf5apps-version;.tar.xz">
   <!ENTITY kwave-download-ftp  " ">
-  <!ENTITY kwave-md5sum        "209c5d97cc34b79c284dbced10e250df">
+  <!ENTITY kwave-md5sum        "82bfe941d7fe680bc455d35b67c573d4">
   <!ENTITY kwave-size          "6.6 MB">
-  <!ENTITY kwave-buildsize     "69 MB">
-  <!ENTITY kwave-time          "0.9 SBU (using parallelism=4)">
+  <!ENTITY kwave-buildsize     "80 MB">
+  <!ENTITY kwave-time          "1 SBU (using parallelism=4)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -161,5 +162,5 @@
         <listitem>
           <para>
-            is a sound editor built on the KDE Frameworks 5
+            is a sound editor built on the KDE Frameworks 5.
           </para>
           <indexterm zone="kwave kwave-prog">
Index: multimedia/audioutils/lame.xml
===================================================================
--- multimedia/audioutils/lame.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/audioutils/lame.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -159,5 +160,5 @@
           <para>
             creates MP3 audio files from raw
-            PCM or <filename>.wav</filename> data
+            PCM or <filename>.wav</filename> data.
           </para>
           <indexterm zone="lame lame-prog">
@@ -171,5 +172,5 @@
         <listitem>
           <para>
-            is used to encode MP3 with RTP streaming of the output
+            is used to encode MP3 with RTP streaming of the output.
           </para>
           <indexterm zone="lame mp3rtp">
@@ -184,5 +185,5 @@
           <para>
             libraries provide the functions necessary to convert
-            raw PCM and WAV files to MP3 files
+            raw PCM and WAV files to MP3 files.
           </para>
           <indexterm zone="lame libmp3lame">
Index: multimedia/audioutils/mpg123.xml
===================================================================
--- multimedia/audioutils/mpg123.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/audioutils/mpg123.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY mpg123-download-http "&sourceforge-dl;/mpg123/mpg123-&mpg123-version;.tar.bz2">
   <!ENTITY mpg123-download-ftp  " ">
-  <!ENTITY mpg123-md5sum        "e4fce200d8072e6cfdeb1ec4c98655a0">
+  <!ENTITY mpg123-md5sum        "af2471bad7c59ebf5d3e8e0be1798375">
   <!ENTITY mpg123-size          "1.0 MB">
-  <!ENTITY mpg123-buildsize     "15 MB">
+  <!ENTITY mpg123-buildsize     "16 MB">
   <!ENTITY mpg123-time          "0.2 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -82,5 +83,5 @@
       <xref linkend="sdl"/>,
       <ulink url="http://jackaudio.org">JACK</ulink>,
-      <ulink url="https://openal.org/">OpenAL</ulink> and
+      <ulink url="http://kcat.strangesoft.net/openal-releases/">OpenAL</ulink> and
       <ulink url="http://www.portaudio.com">PortAudio</ulink>
     </para>
@@ -103,5 +104,5 @@
 
     <para>
-      To test the results, issue: <command>make check</command>.
+      This package does not come with a test suite.
     </para>
 
@@ -156,5 +157,5 @@
         <listitem>
           <para>
-            is used for playing MP3 files via the console
+            is used for playing MP3 files via the console.
           </para>
           <indexterm zone="mpg123 mpg123-prog">
@@ -206,5 +207,5 @@
         <listitem>
           <para>
-            contains the <application>mpg123</application> API functions
+            contains the <application>mpg123</application> API functions.
           </para>
           <indexterm zone="mpg123 libmpg123">
@@ -218,5 +219,5 @@
         <listitem>
           <para>
-            contains the <application>out123</application> API functions
+            contains the <application>out123</application> API functions.
           </para>
           <indexterm zone="mpg123 libout123">
Index: multimedia/audioutils/pavucontrol.xml
===================================================================
--- multimedia/audioutils/pavucontrol.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/audioutils/pavucontrol.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY pavucontrol-download-http "https://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-&pavucontrol-version;.tar.xz">
+  <!ENTITY pavucontrol-download-http "http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-&pavucontrol-version;.tar.xz">
   <!ENTITY pavucontrol-download-ftp  " ">
-  <!ENTITY pavucontrol-md5sum        "a4a5dc51dcf4d912443faf3fe8d32b55">
-  <!ENTITY pavucontrol-size          "192 KB">
-  <!ENTITY pavucontrol-buildsize     "14 MB">
-  <!ENTITY pavucontrol-time          "0.3 SBU">
+  <!ENTITY pavucontrol-md5sum        "9dcc2c76292e7e5e075d51b8dcb20202">
+  <!ENTITY pavucontrol-size          "164 KB">
+  <!ENTITY pavucontrol-buildsize     "18 MB">
+  <!ENTITY pavucontrol-time          "less than 0.1 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -140,5 +141,5 @@
           <para>
             is a GUI configuration tool for sound settings using
-            <application>pulsaudio</application>
+            <application>pulsaudio</application>.
           </para>
           <indexterm zone="pavucontrol pavucontrol-prog">
Index: multimedia/audioutils/pnmixer.xml
===================================================================
--- multimedia/audioutils/pnmixer.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/audioutils/pnmixer.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY pnmixer-download-http "https://github.com/nicklan/pnmixer/releases/download/v&pnmixer-version;/pnmixer-v&pnmixer-version;.tar.gz">
-  <!ENTITY pnmixer-download-ftp  " ">
+  <!ENTITY pnmixer-download-ftp  "">
   <!ENTITY pnmixer-md5sum        "e9f17f56c50de39393030a96e343427b">
   <!ENTITY pnmixer-size          "236 KB">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -140,5 +141,5 @@
         <listitem>
           <para>
-            is a lightweight volume control that sits in a tray
+            is a lightweight volume control that sits in a tray.
           </para>
           <indexterm zone="pnmixer pnmixer">
Index: multimedia/audioutils/vorbistools.xml
===================================================================
--- multimedia/audioutils/vorbistools.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/audioutils/vorbistools.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY vorbistools-download-http "https://downloads.xiph.org/releases/vorbis/vorbis-tools-&vorbistools-version;.tar.gz">
   <!ENTITY vorbistools-download-ftp  " ">
-  <!ENTITY vorbistools-md5sum        "998fca293bd4e4bdc2b96fb70f952f4e">
+  <!ENTITY vorbistools-md5sum        "567e0fb8d321b2cd7124f8208b8b90e6">
   <!ENTITY vorbistools-size          "1.3 MB">
-  <!ENTITY vorbistools-buildsize     "12 MB">
+  <!ENTITY vorbistools-buildsize     "11 MB">
   <!ENTITY vorbistools-time          "0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -71,5 +72,4 @@
     </itemizedlist>
 
-<!-- Applied in 1.4.2
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -81,5 +81,5 @@
       </listitem>
     </itemizedlist>
--->
+
     <bridgehead renderas="sect3">Vorbis Tools Dependencies</bridgehead>
 
@@ -99,6 +99,6 @@
       <xref linkend="curl"/>,
       <xref linkend="flac"/>,
-      <xref linkend="speex"/>, and
-      <ulink url="https://code.google.com/archive/p/libkate/">libkate</ulink>
+      <ulink url="https://code.google.com/archive/p/libkate/">libkate</ulink>, and
+      <xref linkend="speex"/>
     </para>
 
@@ -111,5 +111,4 @@
     <title>Installation of Vorbis Tools</title>
 
-<!-- Applied in 1.4.2
     <para>
       First, apply a patch to fix some security issues:
@@ -117,5 +116,4 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../vorbis-tools-&vorbistools-version;-security_fix-1.patch</userinput></screen>
--->
 
     <para>
@@ -227,5 +225,5 @@
         <listitem>
           <para>
-            is a command-line audio player for Ogg Vorbis streams
+            is a command-line audio player for Ogg Vorbis streams.
           </para>
           <indexterm zone="vorbistools ogg123">
@@ -240,5 +238,5 @@
           <para>
             is a simple decoder which converts Ogg Vorbis files into
-            PCM audio files (WAV or raw)
+            PCM audio files (WAV or raw).
           </para>
           <indexterm zone="vorbistools oggdec">
@@ -253,5 +251,5 @@
           <para>
             is an encoder that turns raw, WAV or
-            AIFF files into an Ogg Vorbis stream
+            AIFF files into an Ogg Vorbis stream.
           </para>
           <indexterm zone="vorbistools oggenc">
@@ -265,5 +263,5 @@
         <listitem>
           <para>
-            prints information stored in an audio file
+            prints information stored in an audio file.
           </para>
           <indexterm zone="vorbistools ogginfo">
@@ -277,5 +275,5 @@
         <listitem>
           <para>
-            splits a file into two files at a designated cut point
+            splits a file into two files at a designated cut point.
           </para>
           <indexterm zone="vorbistools vcut">
@@ -290,5 +288,5 @@
           <para>
             is an editor that changes information in the audio file
-            metadata tags
+            metadata tags.
           </para>
           <indexterm zone="vorbistools vorbiscomment">
Index: multimedia/cdwriteutils/cdrdao.xml
===================================================================
--- multimedia/cdwriteutils/cdrdao.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/cdwriteutils/cdrdao.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -143,5 +144,5 @@
           <para>
             records audio or data CD-Rs in disk-at-once (DAO) mode
-            based on a textual description of the CD contents
+            based on a textual description of the CD contents.
           </para>
           <indexterm zone="cdrdao cdrdao-prog">
@@ -155,5 +156,5 @@
         <listitem>
           <para>
-            converts CUE to TOC format for audio CDs
+            converts CUE to TOC format for audio CDs.
           </para>
           <indexterm zone="cdrdao cue2toc">
@@ -168,5 +169,5 @@
           <para>
             converts a <application>Cdrdao</application>
-            TOC file into a cddb file and prints it to stdout
+            TOC file into a cddb file and prints it to stdout.
           </para>
           <indexterm zone="cdrdao toc2cddb">
@@ -180,5 +181,5 @@
         <listitem>
           <para>
-            converts TOC to CUE format for audio CDs
+            converts TOC to CUE format for audio CDs.
           </para>
           <indexterm zone="cdrdao toc2cue">
@@ -193,5 +194,5 @@
           <para>
             converts an audio CD disk image (<filename>.toc</filename> file)
-            to MP3 files
+            to MP3 files.
           </para>
           <indexterm zone="cdrdao toc2mp3">
Index: multimedia/cdwriteutils/cdrtools.xml
===================================================================
--- multimedia/cdwriteutils/cdrtools.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/cdwriteutils/cdrtools.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -111,5 +112,5 @@
 make INS_BASE=/usr MANSUFF_LIB=3cdr DEFINSUSR=root DEFINSGRP=root install &amp;&amp;
 install -v -m755 -d /usr/share/doc/cdrtools-&cdrtools-version; &amp;&amp;
-install -v -m644 README.* READMEs/* ABOUT doc/*.ps \
+install -v -m644 README* ABOUT doc/*.ps \
                     /usr/share/doc/cdrtools-&cdrtools-version;</userinput></screen>
 
@@ -178,5 +179,5 @@
           <para>
             flashes the firmware on BTC DRW1008 DVD+/-RW recorder.
-            Please exercise care with this program
+            Please exercise care with this program.
           </para>
           <indexterm zone="cdrtools btcflash">
@@ -190,5 +191,5 @@
         <listitem>
           <para>
-            converts Compact Disc audio into WAV sound files
+            converts Compact Disc audio into WAV sound files.
           </para>
           <indexterm zone="cdrtools cdda2wav">
@@ -202,5 +203,5 @@
         <listitem>
           <para>
-            records audio or data Compact Discs
+            records audio or data Compact Discs.
           </para>
           <indexterm zone="cdrtools cdrecord">
@@ -215,5 +216,5 @@
           <para>
             is a diagnostic program used to dump an
-            ISO-9660 device or file in hex
+            ISO-9660 device or file in hex.
           </para>
           <indexterm zone="cdrtools devdump">
@@ -228,5 +229,5 @@
           <para>
             is used to display the command-line parameters used to create
-            an ISO-9660 image
+            an ISO-9660 image.
           </para>
           <indexterm zone="cdrtools isodebug">
@@ -241,5 +242,5 @@
           <para>
             is a diagnostic program used to dump a device or file based on
-            ISO-9660
+            ISO-9660.
           </para>
           <indexterm zone="cdrtools isodump">
@@ -253,5 +254,5 @@
         <listitem>
           <para>
-            is used to analyze or list an ISO-9660 image
+            is used to analyze or list an ISO-9660 image.
           </para>
           <indexterm zone="cdrtools isoinfo">
@@ -265,5 +266,5 @@
         <listitem>
           <para>
-            is used to verify an ISO-9660 image
+            is used to verify an ISO-9660 image.
           </para>
           <indexterm zone="cdrtools isovfy">
@@ -278,5 +279,5 @@
           <para>
             is a symbolic link to <command>mkisofs</command> used to
-            create ISO-9660/HFS hybrid filesystem images
+            create ISO-9660/HFS hybrid filesystem images.
           </para>
           <indexterm zone="cdrtools mkhybrid">
@@ -291,5 +292,5 @@
           <para>
             is used to create ISO-9660/JOLIET/HFS filesystem images,
-            optionally with Rock Ridge attributes
+            optionally with Rock Ridge attributes.
           </para>
           <indexterm zone="cdrtools mkisofs">
@@ -303,5 +304,5 @@
         <listitem>
           <para>
-            reads or writes Compact Discs
+            reads or writes Compact Discs.
           </para>
           <indexterm zone="cdrtools readcd">
@@ -315,5 +316,5 @@
         <listitem>
           <para>
-            is a remote SCSI manager
+            is a remote SCSI manager.
           </para>
           <indexterm zone="cdrtools rscsi">
@@ -328,5 +329,5 @@
           <para>
             is used to check and verify the Application Binary Interface
-            of <filename class="libraryfile">libscg</filename>
+            of <filename class="libraryfile">libscg</filename>.
           </para>
           <indexterm zone="cdrtools scgcheck">
@@ -337,8 +338,8 @@
 
       <varlistentry id="libscg">
-        <term><filename class="libraryfile">libscg.a</filename></term>
-        <listitem>
-          <para>
-            is a highly portable SCSI transport library
+        <term><filename class='libraryfile'>libscg.a</filename></term>
+        <listitem>
+          <para>
+            is a highly portable SCSI transport library.
           </para>
           <indexterm zone="cdrtools libscg">
Index: multimedia/cdwriteutils/cdwriteutils.xml
===================================================================
--- multimedia/cdwriteutils/cdwriteutils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/cdwriteutils/cdwriteutils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="multimedia-cdwriteutils">
Index: multimedia/cdwriteutils/dvd+rw-tools.xml
===================================================================
--- multimedia/cdwriteutils/dvd+rw-tools.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/cdwriteutils/dvd+rw-tools.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -129,5 +130,5 @@
       <xref linkend="xorriso"/>. The default was for it to use
       <command>mkisofs</command> from
-      <ulink url="https://sourceforge.net/projects/cdrtools/files/alpha/">Cdrtools</ulink>.
+      <ulink url="http://sourceforge.net/projects/cdrtools/files/alpha/">Cdrtools</ulink>.
     </para>
 
@@ -170,5 +171,5 @@
           <para>
             is a combined <command>mkisofs</command> frontend/DVD recording
-            program
+            program.
           </para>
           <indexterm zone="dvd-rw-tools growisofs">
@@ -179,4 +180,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: multimedia/cdwriteutils/libburn.xml
===================================================================
--- multimedia/cdwriteutils/libburn.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/cdwriteutils/libburn.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,9 +6,9 @@
 
   <!ENTITY libburn-download-http
-           "https://files.libburnia-project.org/releases/libburn-&libburn-version;.tar.gz">
+           "http://files.libburnia-project.org/releases/libburn-&libburn-version;.tar.gz">
   <!ENTITY libburn-download-ftp  " ">
-  <!ENTITY libburn-md5sum        "454d03ce31addb5b7dca62d213c9660e">
+  <!ENTITY libburn-md5sum        "096f4acfba00f1210a84fb7650f7693d">
   <!ENTITY libburn-size          "968 KB">
-  <!ENTITY libburn-buildsize     "17 MB">
+  <!ENTITY libburn-buildsize     "15 MB">
   <!ENTITY libburn-time          "0.1 SBU">
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -71,11 +72,4 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">libburn Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (to generate HTML documentation)
-    </para>
-
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/libburn"/>
@@ -95,11 +89,4 @@
 
     <para>
-      If you have installed <application>Doxygen</application> and wish to
-      generate the HTML documentation, issue the following command:
-    </para>
-
-<screen remap="doc"><userinput>doxygen doc/doxygen.conf</userinput></screen>
-
-    <para>
       This package does not come with a test suite.
     </para>
@@ -110,13 +97,4 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you have built the HTML documentation, install it by running the
-      following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root" remap="doc"><userinput>install -v -dm755 /usr/share/doc/libburn-&libburn-version; &amp;&amp;
-install -v -m644 doc/html/* /usr/share/doc/libburn-&libburn-version;</userinput></screen>
 
   </sect2>
@@ -153,5 +131,5 @@
           <para>
             burns preformatted data to CD, DVD, and BD via
-            <application>libburn</application>
+            <application>libburn</application>.
           </para>
           <indexterm zone="libburn cdrskin">
@@ -165,5 +143,5 @@
         <listitem>
           <para>
-            contains the <application>libburn</application> API functions
+            contains the <application>libburn</application> API functions.
           </para>
           <indexterm zone="libburn libburn-lib">
Index: multimedia/cdwriteutils/libisoburn.xml
===================================================================
--- multimedia/cdwriteutils/libisoburn.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/cdwriteutils/libisoburn.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,9 +6,9 @@
 
   <!ENTITY libisoburn-download-http
-           "https://files.libburnia-project.org/releases/libisoburn-&libisoburn-version;.tar.gz">
+           "http://files.libburnia-project.org/releases/libisoburn-&libisoburn-version;.tar.gz">
   <!ENTITY libisoburn-download-ftp  " ">
-  <!ENTITY libisoburn-md5sum        "b14473e8ec31a8ebd8d1c8b1b191908c">
-  <!ENTITY libisoburn-size          "1.6 MB">
-  <!ENTITY libisoburn-buildsize     "20 MB (with Tk and HTML documentation)">
+  <!ENTITY libisoburn-md5sum        "e14d470d9f859be8750d06d05559ae38">
+  <!ENTITY libisoburn-size          "1.5 MB">
+  <!ENTITY libisoburn-buildsize     "16 MB (with Tk and HTML documentation)">
   <!ENTITY libisoburn-time          "0.2 SBU (with Tk and HTML documentation)">
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -85,7 +86,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para>
-      <xref linkend="doxygen"/> (to generate HTML documentation),
-      <xref linkend="tk"/> (for <command>xorriso-tcltk</command>), and
-      <ulink url="https://www.einval.com/~steve/software/JTE/">libjte</ulink>
+      <xref linkend="doxygen"/> (to generate HTML documentation) and
+      <xref linkend="tk"/> (for <command>xorriso-tcltk</command>) 
     </para>
 
@@ -165,6 +165,5 @@
           xorrecord,
           xorriso,
-          xorriso-dd-target,
-          xorrisofs, and
+          xorrisofs and
           xorriso-tcltk
         </seg>
@@ -189,5 +188,5 @@
           <para>
             is a symbolic link to <command>xorriso</command> that copies files
-            from ISO image to a disk filesystem
+            from ISO image to a disk filesystem.
           </para>
           <indexterm zone="libisoburn osirrox">
@@ -202,5 +201,5 @@
           <para>
             is a symbolic link to <command>xorriso</command> that provides a
-            cdrecord type user interface
+            cdrecord type user interface.
           </para>
           <indexterm zone="libisoburn xorrecord">
@@ -215,5 +214,5 @@
           <para>
             is a program to create, load, manipulate, read, and write ISO 9660
-            filesystem images with Rock Ridge extensions
+            filesystem images with Rock Ridge extensions.
           </para>
           <indexterm zone="libisoburn xorriso">
@@ -223,17 +222,4 @@
       </varlistentry>
 
-      <varlistentry id="xorriso-dd-target">
-        <term><command>xorriso-dd-target</command></term>
-        <listitem>
-          <para>
-            is a program to check a USB or memory card device to see whether it
-            is suitable for image copying
-          </para>
-          <indexterm zone="libisoburn xorriso-dd-target">
-            <primary sortas="b-xorriso-dd-target">xorriso-dd-target</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="xorrisofs">
         <term><command>xorrisofs</command></term>
@@ -241,5 +227,5 @@
           <para>
             is a symbolic link to <command>xorriso</command> that that provides
-            a mkisofs type user interface
+            a mkisofs type user interface.
           </para>
           <indexterm zone="libisoburn xorrisofs">
@@ -253,5 +239,5 @@
         <listitem>
           <para>
-            is a frontend that operates xorriso in dialog mode
+            is a frontend that operates xorriso in dialog mode.
           </para>
           <indexterm zone="libisoburn xorriso-tcltk">
@@ -265,5 +251,5 @@
         <listitem>
           <para>
-            contains the <application>libisoburn</application> API functions
+            contains the <application>libisoburn</application> API functions.
           </para>
           <indexterm zone="libisoburn libisoburn-lib">
Index: multimedia/cdwriteutils/libisofs.xml
===================================================================
--- multimedia/cdwriteutils/libisofs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/cdwriteutils/libisofs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,9 +6,9 @@
 
   <!ENTITY libisofs-download-http
-           "https://files.libburnia-project.org/releases/libisofs-&libisofs-version;.tar.gz">
+           "http://files.libburnia-project.org/releases/libisofs-&libisofs-version;.tar.gz">
   <!ENTITY libisofs-download-ftp  " ">
-  <!ENTITY libisofs-md5sum        "c34fbf182e79af8fdaddda5e27d326ba">
-  <!ENTITY libisofs-size          "852 KB">
-  <!ENTITY libisofs-buildsize     "14 MB">
+  <!ENTITY libisofs-md5sum        "db86f85c639798b082ab967edfb9ce82">
+  <!ENTITY libisofs-size          "840 KB">
+  <!ENTITY libisofs-buildsize     "11 MB">
   <!ENTITY libisofs-time          "0.1 SBU">
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -71,12 +72,4 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">libisofs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (to generate HTML documentation) and
-      <ulink url="http://www.einval.com/~steve/software/JTE/">libjte</ulink>
-    </para>
-
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/libisofs"/>
@@ -96,11 +89,4 @@
 
     <para>
-      If you have installed <application>Doxygen</application> and wish to
-      generate the HTML documentation, issue the following command:
-    </para>
-
-<screen remap="doc"><userinput>doxygen doc/doxygen.conf</userinput></screen>
-
-    <para>
       This package does not come with a test suite.
     </para>
@@ -111,14 +97,4 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you have built the HTML documentation, install it by running the
-      following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root" remap="doc"><userinput>install -v -dm755 /usr/share/doc/libisofs-&libisofs-version; &amp;&amp;
-install -v -m644 doc/html/* /usr/share/doc/libisofs-&libisofs-version;</userinput></screen>
-
   </sect2>
 
@@ -161,5 +137,5 @@
         <listitem>
           <para>
-            contains the <application>libisofs</application> API functions
+            contains the <application>libisofs</application> API functions.
           </para>
           <indexterm zone="libisofs libisofs-lib">
Index: multimedia/libdriv/alsa-firmware.xml
===================================================================
--- multimedia/libdriv/alsa-firmware.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/alsa-firmware.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -16,4 +16,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -33,5 +34,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: multimedia/libdriv/alsa-lib.xml
===================================================================
--- multimedia/libdriv/alsa-lib.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/alsa-lib.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY alsa-lib-download-http "&alsa-download-http;/lib/alsa-lib-&alsa-lib-version;.tar.bz2">
   <!ENTITY alsa-lib-download-ftp  "&alsa-download-ftp;/lib/alsa-lib-&alsa-lib-version;.tar.bz2">
-  <!ENTITY alsa-lib-md5sum        "c8335793e7828803311edc48fb71662e">
+  <!ENTITY alsa-lib-md5sum        "875184646a96e34bbe7a91925cd7b2ba">
   <!ENTITY alsa-lib-size          "1.0 MB">
-  <!ENTITY alsa-lib-buildsize     "35 MB (with tests)">
+  <!ENTITY alsa-lib-buildsize     "37 MB (with tests)">
   <!ENTITY alsa-lib-time          "0.3 SBU (with tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -76,7 +77,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="python2"/>, and
-      <ulink url="https://www.alsa-project.org/files/pub/lib/">alsa-ucm-conf</ulink>
+      <xref linkend="doxygen"/> and
+      <xref linkend="python2"/>
     </para>
 
@@ -132,9 +132,10 @@
 
 <screen remap="doc"><userinput>make doc</userinput></screen>
-
+<!-- The test suite needs libasound.so now, otherwise both the config and
+     midi_event tests will fail.
     <para>
       To test the results, issue: <command>make check</command>.
     </para>
-
+-->
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
@@ -155,4 +156,10 @@
                 /usr/share/doc/alsa-lib-&alsa-lib-version;/html/search</userinput></screen>
 
+    <para>
+      The test suite requires the alsa-lib package to be installed to
+      link against some libraries. Now that alsa-lib is installed, if you wish
+      to run the tests, issue: <command>make check</command>.
+    </para>
+
   </sect2>
 
@@ -186,5 +193,5 @@
         sound device, you may need to create additional configuration files.
         For information on the available configuration parameters, visit
-        <ulink url="https://www.alsa-project.org/main/index.php/Asoundrc"/>.
+        <ulink url="http://www.alsa-project.org/main/index.php/Asoundrc"/>.
       </para>
 
@@ -226,5 +233,5 @@
         <listitem>
           <para>
-            is the ALSA server
+            is the ALSA server.
           </para>
           <indexterm zone="alsa-lib aserver">
@@ -238,5 +245,5 @@
         <listitem>
           <para>
-            contains the ALSA API functions
+            contains the ALSA API functions.
           </para>
           <indexterm zone="alsa-lib libasound">
@@ -250,5 +257,5 @@
         <listitem>
           <para>
-            contains API functions for the ALSA topologies
+            contains API functions for the ALSA topologies.
           </para>
           <indexterm zone="alsa-lib libatopology">
Index: multimedia/libdriv/alsa-oss.xml
===================================================================
--- multimedia/libdriv/alsa-oss.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/alsa-oss.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -145,5 +146,5 @@
             is a simple wrapper script which facilitates the use of the
             ALSA oss compatibility library. It just sets the appropriate
-            <envar>LD_PRELOAD</envar> path and then runs the command
+            <envar>LD_PRELOAD</envar> path and then runs the command.
           </para>
           <indexterm zone="alsa-oss aoss">
Index: multimedia/libdriv/alsa-plugins.xml
===================================================================
--- multimedia/libdriv/alsa-plugins.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/alsa-plugins.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY alsa-plugins-download-http "&alsa-download-http;/plugins/alsa-plugins-&alsa-plugins-version;.tar.bz2">
   <!ENTITY alsa-plugins-download-ftp  "&alsa-download-ftp;/plugins/alsa-plugins-&alsa-plugins-version;.tar.bz2">
-  <!ENTITY alsa-plugins-md5sum        "11d1bcc1b4eec26c1011ec965f4b54ba">
-  <!ENTITY alsa-plugins-size          "397 KB">
-  <!ENTITY alsa-plugins-buildsize     "5.3 MB">
+  <!ENTITY alsa-plugins-md5sum        "8455e3c6fbc47f62f070afabc14ba575">
+  <!ENTITY alsa-plugins-size          "400 KB">
+  <!ENTITY alsa-plugins-buildsize     "6.1 MB">
   <!ENTITY alsa-plugins-time          "less than 0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -173,5 +174,5 @@
           <para>
             Allows native <application>ALSA</application> applications to
-            run on <application>OSS</application>
+            run on <application>OSS</application>.
           </para>
           <indexterm zone="alsa-plugins libasound_module_pcm_oss.so">
@@ -185,5 +186,5 @@
         <listitem>
           <para>
-            Allows upmixing sound to 4 or 6 channels
+            Allows upmixing sound to 4 or 6 channels.
           </para>
           <indexterm zone="alsa-plugins libasound_module_pcm_upmix.so">
@@ -198,5 +199,5 @@
           <para>
             Allows downmixing sound from 4-6 channels to 2
-            channel stereo output
+            channel stereo output.
           </para>
           <indexterm zone="alsa-plugins libasound_module_pcm_vdownmix.so">
@@ -211,5 +212,5 @@
           <para>
             Allows native <application>ALSA</application> applications to
-            work with <command>jackd</command>
+            work with <command>jackd</command>.
           </para>
           <indexterm zone="alsa-plugins libasound_module_pcm_jack.so">
@@ -225,5 +226,5 @@
             Allows native <application>ALSA</application> applications
             to access a <application>PulseAudio</application> sound
-            daemon
+            daemon.
           </para>
           <indexterm zone="alsa-plugins libasound_module_pcm_pulse.so">
@@ -238,5 +239,5 @@
           <para>
             Converts S16 linear sound format to A52 compressed format
-            and sends it to an SPDIF output
+            and sends it to an SPDIF output.
           </para>
           <indexterm zone="alsa-plugins libasound_module_pcm_a52.so">
@@ -251,5 +252,5 @@
           <para>
             Provides an external rate converter through
-            <filename class="libraryfile">libsamplerate</filename>
+            <filename class="libraryfile">libsamplerate</filename>.
           </para>
           <indexterm zone="alsa-plugins libasound_module_rate_samplerate.so">
Index: multimedia/libdriv/alsa-tools.xml
===================================================================
--- multimedia/libdriv/alsa-tools.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/alsa-tools.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY alsa-tools-download-http "&alsa-download-http;/tools/alsa-tools-&alsa-tools-version;.tar.bz2">
   <!ENTITY alsa-tools-download-ftp  "&alsa-download-ftp;/tools/alsa-tools-&alsa-tools-version;.tar.bz2">
-  <!ENTITY alsa-tools-md5sum        "ce632a6c89ed47ee74ba415276a6a3cc">
+  <!ENTITY alsa-tools-md5sum        "4e6187d2c3a8c73a9d75d66a72faed27">
   <!ENTITY alsa-tools-size          "1.8 MB">
-  <!ENTITY alsa-tools-buildsize     "26 MB">
+  <!ENTITY alsa-tools-buildsize     "31 MB">
   <!ENTITY alsa-tools-time          "0.4 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -195,5 +196,5 @@
             is an assembler for the emu10k1 DSP chip present in the
             Creative SB Live, PCI 512, and emu APS sound cards. It is used
-            to make audio effects such as a flanger, chorus or reverb
+            to make audio effects such as a flanger, chorus or reverb.
           </para>
           <indexterm zone="alsa-tools as10k1">
@@ -208,5 +209,5 @@
           <para>
             is an SB16/AWE32 Creative Signal Processor (ASP/CSP) control
-            program
+            program.
           </para>
           <indexterm zone="alsa-tools cspctl">
@@ -223,5 +224,5 @@
             from Echoaudio. It is a tool to control all the features of any
             Echoaudio soundcard. This includes clock sources, input and output
-            gains, mixers, etc
+            gains, mixers, etc.
           </para>
           <indexterm zone="alsa-tools echomixer">
@@ -235,5 +236,5 @@
         <listitem>
           <para>
-            is a control tool for Envy24 (ice1712) based sound cards
+            is a control tool for Envy24 (ice1712) based sound cards.
           </para>
           <indexterm zone="alsa-tools envy24control">
@@ -249,5 +250,5 @@
             is a GUI to make it easy to retask your jacks - e g, turn your Mic
             jack into an extra Headphone, or why not make them both line outs
-            and connect them to your surround receiver
+            and connect them to your surround receiver.
           </para>
           <indexterm zone="alsa-tools hdajackretask">
@@ -262,5 +263,5 @@
           <para>
             is a small program to send HD-audio commands to the given
-            ALSA hwdep device on the hd-audio interface
+            ALSA hwdep device on the hd-audio interface.
           </para>
           <indexterm zone="alsa-tools hda-verb">
@@ -275,5 +276,5 @@
           <para>
             is a GUI to control the Hammerfall
-            HDSP Alsa Settings. Up to four hdsp cards are supported
+            HDSP Alsa Settings. Up to four hdsp cards are supported.
           </para>
           <indexterm zone="alsa-tools hdspconf">
@@ -288,5 +289,5 @@
           <para>
             is used to load the firmware required by the Hammerfall
-            HDSP sound cards
+            HDSP sound cards.
           </para>
           <indexterm zone="alsa-tools hdsploader">
@@ -302,5 +303,5 @@
             is the Linux equivalent of the Totalmix application from RME.
             It is a tool to control the advanced routing features of the RME
-            Hammerfall DSP soundcard series
+            Hammerfall DSP soundcard series.
           </para>
           <indexterm zone="alsa-tools hdspmixer">
@@ -315,5 +316,5 @@
           <para>
             allows you to control the volume of individual streams on sound
-            cards that use hardware mixing
+            cards that use hardware mixing.
           </para>
           <indexterm zone="alsa-tools hwmixvolume">
@@ -328,5 +329,5 @@
           <para>
             are tools used to initialize Creative Sound Blaster Audigy-series
-            cards
+            cards.
           </para>
           <indexterm zone="alsa-tools init_audigy_progs">
@@ -340,5 +341,5 @@
         <listitem>
           <para>
-            is a tool used to initialize Creative Sound Blaster Live cards
+            is a tool used to initialize Creative Sound Blaster Live cards.
           </para>
           <indexterm zone="alsa-tools init_live">
@@ -352,5 +353,5 @@
         <listitem>
           <para>
-            is the server of a EMU10K{1,2} patch loader for ALSA
+            is the server of a EMU10K{1,2} patch loader for ALSA.
           </para>
           <indexterm zone="alsa-tools ld10k1">
@@ -364,5 +365,5 @@
         <listitem>
           <para>
-            is the client of a EMU10K{1,2} patch loader for ALSA
+            is the client of a EMU10K{1,2} patch loader for ALSA.
           </para>
           <indexterm zone="alsa-tools lo10k1">
@@ -377,5 +378,5 @@
           <para>
             loads config dumps generated by <command>lo10k1</command>
-            and <command>ld10k1</command>
+            and <command>ld10k1</command>.
           </para>
           <indexterm zone="alsa-tools dl10k1">
@@ -390,5 +391,5 @@
           <para>
             is an init script for the <command>ld10k1</command>
-            patch loader
+            patch loader.
           </para>
           <indexterm zone="alsa-tools ld10k1d">
@@ -421,5 +422,5 @@
             require this program: snd-mixart. These drivers don't work
             properly at all until the certain firmwares are loaded, i.e. no
-            PCM nor mixer devices will appear
+            PCM nor mixer devices will appear.
           </para>
           <indexterm zone="alsa-tools mixartloader">
@@ -437,5 +438,5 @@
             modules require this program: snd-pcxhr. These drivers don't work
             properly at all until certain firmwares are loaded, i.e. no PCM
-            nor mixer devices will appear
+            nor mixer devices will appear.
           </para>
           <indexterm zone="alsa-tools pcxhrloader">
@@ -451,5 +452,5 @@
             is a control tool for RME Digi32 and RME Digi96 sound cards.
             It provides a graphical frontend for all the sound card controls
-            and switches
+            and switches.
           </para>
           <indexterm zone="alsa-tools rmedigicontrol">
@@ -463,5 +464,5 @@
         <listitem>
           <para>
-            is an OPL2/3 FM instrument loader for the ALSA sequencer
+            is an OPL2/3 FM instrument loader for the ALSA sequencer.
           </para>
           <indexterm zone="alsa-tools sbiload">
@@ -475,5 +476,5 @@
         <listitem>
           <para>
-            is an ALSA SoundScape control utility
+            is an ALSA SoundScape control utility.
           </para>
           <indexterm zone="alsa-tools sscape_ctl">
@@ -487,5 +488,5 @@
         <listitem>
           <para>
-            is a Tascam US-428 control program
+            is a Tascam US-428 control program.
           </para>
           <indexterm zone="alsa-tools us428control">
@@ -502,5 +503,5 @@
             the Tascam USX2Y USB sound cards. It has proven to work so far for
             the US122, US224 and US428. The snd-usb-usx2y module requires this
-            program
+            program.
           </para>
           <indexterm zone="alsa-tools usx2yloader">
@@ -519,5 +520,5 @@
           snd-vx222, snd-vxpocket, snd-vxp440. These drivers don't work properly at all
           until the certain firmwares are loaded, i.e. no PCM nor mixer devices will
-          appear
+          appear.
           </para>
           <indexterm zone="alsa-tools vxloader">
Index: multimedia/libdriv/alsa-utils.xml
===================================================================
--- multimedia/libdriv/alsa-utils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/alsa-utils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,6 +7,6 @@
   <!ENTITY alsa-utils-download-http "&alsa-download-http;/utils/alsa-utils-&alsa-utils-version;.tar.bz2">
   <!ENTITY alsa-utils-download-ftp  "&alsa-download-ftp;/utils/alsa-utils-&alsa-utils-version;.tar.bz2">
-  <!ENTITY alsa-utils-md5sum        "8f142bebff84ff05438b46a0e896f53a">
-  <!ENTITY alsa-utils-size          "1.3 MB">
+  <!ENTITY alsa-utils-md5sum        "39cde1fa4fde9f09366737fb089a9053">
+  <!ENTITY alsa-utils-size          "1.2 MB">
   <!ENTITY alsa-utils-buildsize     "16 MB">
   <!ENTITY alsa-utils-time          "0.1 SBU">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -263,5 +264,5 @@
           <para>
             is a utility for connecting and disconnecting two
-            existing ports in the ALSA sequencer system
+            existing ports in the ALSA sequencer system.
           </para>
           <indexterm zone="alsa-utils aconnect">
@@ -277,5 +278,5 @@
             is used to control advanced settings for ALSA sound card drivers.
             Use this if alsamixer cannot utilize all of your sound card's
-            features
+            features.
           </para>
           <indexterm zone="alsa-utils alsactl">
@@ -290,5 +291,5 @@
           <para>
             allows creation of a PCM loopback between a PCM capture
-            device and a PCM playback device
+            device and a PCM playback device.
           </para>
           <indexterm zone="alsa-utils alsaloop">
@@ -303,5 +304,5 @@
           <para>
             is an Ncurses based mixer program for use with
-            the ALSA sound card drivers
+            the ALSA sound card drivers.
           </para>
           <indexterm zone="alsa-utils alsamixer">
@@ -316,5 +317,5 @@
           <para>
             is a utility used to compile topology configuration files into
-            binary files for kernel drivers
+            binary files for kernel drivers.
           </para>
           <indexterm zone="alsa-utils alsatplg">
@@ -341,5 +342,5 @@
           <para>
             is used to read from and write to ALSA
-            RawMIDI ports
+            RawMIDI ports.
           </para>
           <indexterm zone="alsa-utils amidi">
@@ -354,5 +355,5 @@
           <para>
             allows command-line control of the mixers for the
-            ALSA sound card drivers
+            ALSA sound card drivers.
           </para>
           <indexterm zone="alsa-utils amixer">
@@ -367,5 +368,5 @@
           <para>
             is a command-line soundfile player for the
-            ALSA sound card drivers
+            ALSA sound card drivers.
           </para>
           <indexterm zone="alsa-utils aplay">
@@ -380,5 +381,5 @@
           <para>
             is a command-line utility that plays the specified
-            MIDI file(s) to one or more ALSA sequencer ports
+            MIDI file(s) to one or more ALSA sequencer ports.
           </para>
           <indexterm zone="alsa-utils aplaymidi">
@@ -393,5 +394,5 @@
           <para>
             is a command-line soundfile recorder for the
-            ALSA sound card drivers
+            ALSA sound card drivers.
           </para>
           <indexterm zone="alsa-utils arecord">
@@ -406,5 +407,5 @@
           <para>
             is a command-line utility that records a standard
-            MIDI file from one or more ALSA sequencer ports
+            MIDI file from one or more ALSA sequencer ports.
           </para>
           <indexterm zone="alsa-utils arecordmidi">
@@ -419,5 +420,5 @@
           <para>
             is a command-line utility that prints the sequencer events it
-            receives as text
+            receives as text.
           </para>
           <indexterm zone="alsa-utils aseqdump">
@@ -432,5 +433,5 @@
           <para>
             is an ALSA sequencer client which sends and
-            receives event packets over a network
+            receives event packets over a network.
           </para>
           <indexterm zone="alsa-utils aseqnet">
@@ -445,5 +446,5 @@
           <para>
             is a command-line recorder and player used to transfer audio frames
-            between sound devices and files
+            between sound devices and files.
           </para>
           <indexterm zone="alsa-utils axfer">
@@ -459,5 +460,5 @@
             is a small utility to set or dump the IEC958 (or so-called
             <quote>S/PDIF</quote>) status bits of the specified sound
-            card via the ALSA control API
+            card via the ALSA control API.
           </para>
           <indexterm zone="alsa-utils iecset">
@@ -471,5 +472,5 @@
         <listitem>
           <para>
-            is a command-line speaker test tone generator for ALSA
+            is a command-line speaker test tone generator for ALSA.
           </para>
           <indexterm zone="alsa-utils speaker-test">
Index: multimedia/libdriv/alsa.xml
===================================================================
--- multimedia/libdriv/alsa.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/alsa.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: multimedia/libdriv/audiofile.xml
===================================================================
--- multimedia/libdriv/audiofile.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/audiofile.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -102,5 +103,5 @@
     </para>
 
-<screen><userinput>CXXFLAGS="${CXXFLAGS:--O2 -g} -std=c++98" \
+<screen><userinput>CXXFLAGS=-std=c++98 \
 ./configure --prefix=/usr --disable-static &amp;&amp;
 
@@ -177,5 +178,5 @@
           <para>
             displays the sound file format, audio encoding, sampling
-            rate and duration for audio formats supported by this library
+            rate and duration for audio formats supported by this library.
           </para>
           <indexterm zone="audiofile sfinfo">
@@ -190,5 +191,5 @@
           <para>
             converts sound file formats where the original format and
-            destination format are supported by this library
+            destination format are supported by this library.
           </para>
           <indexterm zone="audiofile sfconvert">
@@ -203,5 +204,5 @@
           <para>
             contains functions used by programs to support AIFF,
-            AIFF-compressed, Sun/NeXT, WAV and BIC audio formats
+            AIFF-compressed, Sun/NeXT, WAV and BIC audio formats.
           </para>
           <indexterm zone="audiofile libaudiofile">
Index: multimedia/libdriv/faac.xml
===================================================================
--- multimedia/libdriv/faac.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/faac.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -209,5 +210,5 @@
         <listitem>
           <para>
-            is a command-line AAC encoder
+            is a command-line AAC encoder.
           </para>
           <indexterm zone="faac faac-prog">
@@ -218,8 +219,8 @@
 
       <varlistentry id="libfaac">
-        <term><filename class="libraryfile">libfaac.so</filename></term>
+        <term><filename class='libraryfile'>libfaac.so</filename></term>
         <listitem>
           <para>
-            contains functions for encoding AAC streams
+            contains functions for encoding AAC streams.
           </para>
           <indexterm zone="faac libfaac">
@@ -230,8 +231,8 @@
 
       <varlistentry id="libmp4v2">
-        <term><filename class="libraryfile">libmp4v2.so</filename></term>
+        <term><filename class='libraryfile'>libmp4v2.so</filename></term>
         <listitem>
           <para>
-            contains functions for creating and manipulating MP4 files
+            contains functions for creating and manipulating MP4 files.
           </para>
           <indexterm zone="faac libmp4v2">
Index: multimedia/libdriv/faad2.xml
===================================================================
--- multimedia/libdriv/faad2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/faad2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -175,5 +176,5 @@
         <listitem>
           <para>
-            is a command-line utility for decoding AAC and MP4 files
+            is a command-line utility for decoding AAC and MP4 files.
           </para>
           <indexterm zone="faad2 faad-prog">
@@ -184,8 +185,8 @@
 
       <varlistentry id="libfaad">
-        <term><filename class="libraryfile">libfaad.so</filename></term>
+        <term><filename class='libraryfile'>libfaad.so</filename></term>
         <listitem>
           <para>
-            contains functions for decoding AAC streams
+            contains functions for decoding AAC streams.
           </para>
           <indexterm zone="faad2 libfaad">
Index: multimedia/libdriv/fdk-aac.xml
===================================================================
--- multimedia/libdriv/fdk-aac.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/fdk-aac.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY fdk-aac-download-http "&sourceforge-dl;/opencore-amr/fdk-aac-&fdk-aac-version;.tar.gz">
   <!ENTITY fdk-aac-download-ftp  " ">
-  <!ENTITY fdk-aac-md5sum        "b41222194b31f570b3132bd622a9aef6">
-  <!ENTITY fdk-aac-size          "2.8 MB">
-  <!ENTITY fdk-aac-buildsize     "38 MB">
-  <!ENTITY fdk-aac-time          "0.6 SBU (Using parallelism=4)">
+  <!ENTITY fdk-aac-md5sum        "e8b0b38e837df455b8a1ba75417ff0ad">
+  <!ENTITY fdk-aac-size          "2.7 MB">
+  <!ENTITY fdk-aac-buildsize     "51 MB">
+  <!ENTITY fdk-aac-time          "0.6 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -138,5 +139,5 @@
         <listitem>
           <para>
-            provides the functions used to encode audio in AAC format
+            provides the functions used to encode audio in AAC format.
           </para>
           <indexterm zone="fdk-aac libfdk-aac">
Index: multimedia/libdriv/flac.xml
===================================================================
--- multimedia/libdriv/flac.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/flac.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -67,15 +68,4 @@
         <para>
           Estimated build time: &flac-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/flac-&flac-version;-security_fixes-1.patch"/>
         </para>
       </listitem>
@@ -107,8 +97,7 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../flac-&flac-version;-security_fixes-1.patch      &amp;&amp;
-./configure --prefix=/usr                                \
-            --disable-thorough-tests                     \
-            --docdir=/usr/share/doc/flac-&flac-version;          &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --disable-thorough-tests \
+            --docdir=/usr/share/doc/flac-&flac-version; &amp;&amp;
 make</userinput></screen>
 
@@ -167,5 +156,5 @@
           <para>
             is a command-line utility for encoding, decoding and
-            converting FLAC files
+            converting FLAC files.
           </para>
           <indexterm zone="flac flac-prog">
@@ -180,5 +169,5 @@
           <para>
             is a program for listing, adding, removing, or editing
-            metadata in one or more FLAC files
+            metadata in one or more FLAC files.
           </para>
           <indexterm zone="flac metaflac">
@@ -189,9 +178,9 @@
 
       <varlistentry id="libflac">
-        <term><filename class="libraryfile">libFLAC{,++}.so</filename></term>
+        <term><filename class='libraryfile'>libFLAC{,++}.so</filename></term>
         <listitem>
           <para>
             these libraries provide native FLAC and Ogg FLAC C/C++ APIs
-            for programs utilizing FLAC
+            for programs utilizing FLAC.
           </para>
           <indexterm zone="flac libflac">
@@ -203,5 +192,5 @@
 <!--
       <varlistentry id="libxmms-flac">
-        <term><filename class="libraryfile">libxmms-flac.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libxmms-flac.{so,a}</filename></term>
         <listitem>
           <para>
Index: multimedia/libdriv/frei0r.xml
===================================================================
--- multimedia/libdriv/frei0r.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/frei0r.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: multimedia/libdriv/gavl.xml
===================================================================
--- multimedia/libdriv/gavl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/gavl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -159,5 +160,5 @@
         <listitem>
           <para>
-            is the Gmerlin Audio Video Library
+            is the Gmerlin Audio Video Library.
           </para>
           <indexterm zone="gavl libgavl.so">
Index: multimedia/libdriv/gst10-libav.xml
===================================================================
--- multimedia/libdriv/gst10-libav.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/gst10-libav.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY gst10-libav-download-http "&gstreamer-dl;/gst-libav/gst-libav-&gst10-libav-version;.tar.xz">
   <!ENTITY gst10-libav-download-ftp  " ">
-  <!ENTITY gst10-libav-md5sum        "71bd312207411fb69364b19b4b249331">
-  <!ENTITY gst10-libav-size          "276 KB">
-  <!ENTITY gst10-libav-buildsize     "8.5 MB">
+  <!ENTITY gst10-libav-md5sum        "862f655444105719e6d7e888a398267e">
+  <!ENTITY gst10-libav-size          "272 KB">
+  <!ENTITY gst10-libav-buildsize     "8.2 MB">
   <!ENTITY gst10-libav-time          "less than 0.1 SBU (Using parallelism=4)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -113,6 +114,6 @@
 
 meson  --prefix=/usr       \
-       --buildtype=release \
-       -Dpackage-origin=https://www.linuxfromscratch.org/blfs/view/svn/ \
+       -Dbuildtype=release \
+       -Dpackage-origin=http://www.linuxfromscratch.org/blfs/view/svn/ \
        -Dpackage-name="GStreamer &gst10-libav-version; BLFS" &amp;&amp;
 ninja</userinput></screen>
@@ -130,10 +131,15 @@
   </sect2>
 
+  <!-- No longer included with Meson change
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
+    <para>
+      <option>- -with-libav-extra-configure="- -disable-yasm"</option>: Use this
+      switch if you don't have <application>yasm</application> installed.
+    </para>
+
   </sect2>
+  -->
 
   <sect2 role="content">
Index: multimedia/libdriv/gst10-plugins-bad.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-bad.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/gst10-plugins-bad.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,8 +8,8 @@
            "&gstreamer-dl;/gst-plugins-bad/gst-plugins-bad-&gst10-plugins-bad-version;.tar.xz">
   <!ENTITY gst10-plugins-bad-download-ftp  " ">
-  <!ENTITY gst10-plugins-bad-md5sum        "8a73b497613a9f778e880b8a9eb9c1a3">
+  <!ENTITY gst10-plugins-bad-md5sum        "606a819cfc9f1a0b94242914f48f5df5">
   <!ENTITY gst10-plugins-bad-size          "5.4 MB">
-  <!ENTITY gst10-plugins-bad-buildsize     "146 MB (with tests)">
-  <!ENTITY gst10-plugins-bad-time          "1.0 SBU (Using parallelism=4; with tests)">
+  <!ENTITY gst10-plugins-bad-buildsize     "131 MB (with tests)">
+  <!ENTITY gst10-plugins-bad-time          "0.8 SBU (Using parallelism=4; with tests)">
 ]>
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -94,12 +95,16 @@
     <para role="optional">
       <xref linkend="bluez"/>,
+      <xref linkend="clutter"/>,
       <xref linkend="curl"/>,
       <xref linkend="faac"/>,
       <xref linkend="faad2"/>,
       <xref linkend="fdk-aac"/>,
-      <xref linkend="gtk3"/> (for examples),
+      <xref linkend="gnutls"/>,
+      <xref linkend="gtk2"/> or
+      <xref linkend="gtk3"/>,
       <xref linkend="lcms2"/>,
       <xref linkend="libass"/>,
-      <xref linkend="libexif"/> (for one test),
+      <xref linkend="libexif"/>,
+      <xref linkend="libgcrypt"/>,
       <xref linkend="libgudev"/>,
       <xref linkend="libmpeg2"/>,
@@ -108,13 +113,13 @@
       <xref linkend="libssh2"/>,
       <xref linkend="libusb"/>,
+      <xref linkend="libvdpau"/>,
       <xref linkend="libwebp"/>,
       <xref linkend="libxkbcommon"/>,
       <xref linkend="neon"/>,
-      <xref linkend="nettle"/> or <xref linkend="libgcrypt"/>
-	  (for SSL support in hls plugin, if both are not installed OpenSSL will
-	  be used instead),
+      <xref linkend="nettle"/>,
       <xref linkend="opencv"/> (with additional modules),
       <xref linkend="openjpeg2"/>,
       <xref linkend="opus"/>,
+      <xref linkend="qt5"/> (for examples),
       <xref linkend="sbc"/>,
       <xref linkend="sdl"/>,
@@ -123,8 +128,9 @@
       compiled with wayland support),
       <xref linkend="x265"/>,
-      <xref linkend="xorg7-lib"/> (for one test),
+      <xref linkend="xorg7-lib"/>,
       <ulink url="https://aomedia.googlesource.com/aom/">aom</ulink>,
       <ulink url="http://bs2b.sourceforge.net/">bs2b</ulink>,
       <ulink url="https://acoustid.org/chromaprint">Chromaprint</ulink>,
+      <ulink url="https://www.xiph.org/daala/">daala</ulink>,
       <ulink url="https://github.com/kornelski/dssim">dssim</ulink>,
       <ulink url="http://www.speech.cs.cmu.edu/flite/">Flite</ulink>,
@@ -140,4 +146,5 @@
       <ulink url="https://code.google.com/archive/p/libkate/">libkate</ulink>,
       <ulink url="https://github.com/Intel-Media-SDK/MediaSDK">libmfx</ulink>,
+      <ulink url="https://sourceforge.net/projects/farsight/files/libmimic/">libmimic</ulink>,
       <ulink url="https://sourceforge.net/projects/libmms/">libmms</ulink>,
       <ulink url="https://github.com/Konstanty/libmodplug">libmodplug</ulink>,
@@ -149,12 +156,11 @@
       <ulink url="https://drobilla.net/software/lilv">lilv</ulink>,
       <ulink url="https://github.com/swh/LRDF">LRDF</ulink>,
-      <ulink url="https://github.com/x42/ltc-tools">ltc-tools</ulink>,
       <ulink url="https://github.com/videolabs/libmicrodns">microdns</ulink>,
       <ulink url="http://mjpeg.sourceforge.net/">MJPEG Tools</ulink>,
-      <ulink url="https://openal.org/">OpenAL</ulink>,
+      <ulink url="http://kcat.strangesoft.net/openal.html">OpenAL</ulink>,
       <ulink url="https://www.openexr.com/">OpenEXR</ulink>,
       <ulink url="https://www.openh264.org/">OpenH264</ulink>,
       <ulink url="https://gstreamer.freedesktop.org/src/orc/">Orc</ulink>,
-      <ulink url="https://rtmpdump.mplayerhq.hu/">rtmpdump</ulink>,
+      <ulink url="https://rtmpdump.mplayerhq.ru/">rtmpdump</ulink>,
       <ulink url="https://github.com/jart/spandsp">spandsp</ulink>,
       <ulink url="https://www.srtalliance.com">srt</ulink>,
@@ -194,6 +200,6 @@
 
 meson  --prefix=/usr       \
-       --buildtype=release \
-       -Dpackage-origin=https://www.linuxfromscratch.org/blfs/view/svn/ \
+       -Dbuildtype=release \
+       -Dpackage-origin=http://www.linuxfromscratch.org/blfs/view/svn/ \
        -Dpackage-name="GStreamer &gst10-plugins-bad-version; BLFS" &amp;&amp;
 ninja</userinput></screen>
@@ -209,11 +215,4 @@
 
 <screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
   </sect2>
 
@@ -266,5 +265,5 @@
         <listitem>
           <para>
-            is used to transcode a stream into a different format
+            is used to transcode a stream into a different format.
           </para>
           <indexterm zone="gst10-plugins-bad gst-transcoder-1.0">
@@ -279,5 +278,5 @@
           <para>
             is an example application used to sequentially play a list of
-            audio-video files
+            audio-video files.
           </para>
           <indexterm zone="gst10-plugins-bad playout">
Index: multimedia/libdriv/gst10-plugins-base.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-base.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/gst10-plugins-base.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,8 +8,8 @@
            "&gstreamer-dl;/gst-plugins-base/gst-plugins-base-&gst10-plugins-base-version;.tar.xz">
   <!ENTITY gst10-plugins-base-download-ftp  " ">
-  <!ENTITY gst10-plugins-base-md5sum        "523336ed6938b8b1004847cbbd5e31cb">
+  <!ENTITY gst10-plugins-base-md5sum        "aa1cd08a72f65298e5136a9c1620c2d1">
   <!ENTITY gst10-plugins-base-size          "3.0 MB">
-  <!ENTITY gst10-plugins-base-buildsize     "99 MB (with tests)">
-  <!ENTITY gst10-plugins-base-time          "1.0 SBU (Using parallelism=4; with tests)">
+  <!ENTITY gst10-plugins-base-buildsize     "83 MB (with tests)">
+  <!ENTITY gst10-plugins-base-time          "0.8 SBU (Using parallelism=4; with tests)">
 ]>
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -95,5 +96,4 @@
       <xref linkend="libtheora"/>,
       <xref linkend="libvorbis"/>,
-      <xref linkend="mesa"/>,
       <xref linkend="wayland-protocols"/>, and
       <xref linkend="xorg7-lib"/>
@@ -129,12 +129,4 @@
       href="../../xincludes/gst10-plugins.xml"/>
 
-    <para> <!-- upstream has a different fix for 0.18.5, see
-      https://www.linuxquestions.org/questions/slackware-14/regression-on-current-with-gst-plugins-base-4175694901/-->
-      First fix a build failure caused by a change in
-      <application>meson-0.58.0</application>:
-    </para>
-
-<screen><userinput>sed -i 's|implicit_include_directories : false||' gst-libs/gst/gl/meson.build</userinput></screen>
-
     <para>
       Install <application>GStreamer Base Plug-ins</application> by running the
@@ -146,6 +138,6 @@
 
 meson  --prefix=/usr       \
-       --buildtype=release \
-       -Dpackage-origin=https://www.linuxfromscratch.org/blfs/view/svn/ \
+       -Dbuildtype=release \
+       -Dpackage-origin=http://www.linuxfromscratch.org/blfs/view/svn/ \
        -Dpackage-name="GStreamer &gst10-plugins-base-version; BLFS"    \
        --wrap-mode=nodownload &amp;&amp;
@@ -174,15 +166,4 @@
 
 <screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-wrap-nodownload.xml"/>
-
   </sect2>
 
@@ -237,5 +218,5 @@
           <para>
             is a tool that can be used to print basic metadata and
-            stream information about a media file
+            stream information about a media file.
           </para>
           <indexterm zone="gst10-plugins-base gst-discoverer-1.0">
@@ -250,5 +231,5 @@
           <para>
             is a command line tool that can be used to test basic
-            playback using the playbin element
+            playback using the playbin element.
           </para>
           <indexterm zone="gst10-plugins-base gst-play-1.0">
Index: multimedia/libdriv/gst10-plugins-good.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-good.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/gst10-plugins-good.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,8 +8,8 @@
            "&gstreamer-dl;/gst-plugins-good/gst-plugins-good-&gst10-plugins-good-version;.tar.xz">
   <!ENTITY gst10-plugins-good-download-ftp  " ">
-  <!ENTITY gst10-plugins-good-md5sum        "4ecf1ac5cd422d9c13fe05dbf5e3df26">
+  <!ENTITY gst10-plugins-good-md5sum        "1a5ab378790d52a95551736db429251e">
   <!ENTITY gst10-plugins-good-size          "3.1 MB">
-  <!ENTITY gst10-plugins-good-buildsize     "101 MB (with tests)">
-  <!ENTITY gst10-plugins-good-time          "0.6 SBU (Using parallelism=4; with tests)">
+  <!ENTITY gst10-plugins-good-buildsize     "92 MB (with tests)">
+  <!ENTITY gst10-plugins-good-time          "0.5 SBU (Using parallelism=4; with tests)">
 ]>
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -74,14 +75,4 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Recommended patch (required if building against Qt5): <ulink
-          url="&patch-root;/gst-plugins-good-&gst10-plugins-good-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">GStreamer Good Plug-ins Dependencies</bridgehead>
 
@@ -98,14 +89,13 @@
       <xref linkend="cairo"/>,
       <xref linkend="flac"/>,
+      <xref linkend="lame"/>,
+      <xref linkend="mpg123"/>,
+      <xref linkend="mesa"/>,
       <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="lame"/>,
       <xref linkend="libgudev"/>,
       <xref linkend="libjpeg"/>,
       <xref linkend="libpng"/>,
       <xref linkend="libsoup"/>,
-      <xref linkend="libvpx"/>,
-      <xref linkend="mesa"/>,
-      <xref linkend="mpg123"/>,
-      <xref linkend="nasm"/>, and
+      <xref linkend="libvpx"/>, and
       <xref linkend="xorg7-lib"/> <!-- build time requirements only,
       you don't need either apps, fonts or xorg server to build this
@@ -127,6 +117,6 @@
       <xref linkend='v4l-utils'/>,
       <xref linkend="wayland"/>,
+      <ulink url="http://jackaudio.org/">JACK</ulink>,
       <ulink url="https://pypi.org/project/hotdoc/">hotdoc</ulink>,
-      <ulink url="http://jackaudio.org/">JACK</ulink>,
       <ulink url="http://caca.zoy.org/wiki/libcaca">libcaca</ulink>,
       <ulink url="https://sourceforge.net/projects/libavc1394/">libavc1394</ulink>,
@@ -158,12 +148,10 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../gst-plugins-good-&gst10-plugins-good-version;-upstream_fixes-1.patch &amp;&amp;
-
-mkdir build &amp;&amp;
+<screen><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
 
 meson  --prefix=/usr       \
-       --buildtype=release \
-       -Dpackage-origin=https://www.linuxfromscratch.org/blfs/view/svn/ \
+       -Dbuildtype=release \
+       -Dpackage-origin=http://www.linuxfromscratch.org/blfs/view/svn/ \
        -Dpackage-name="GStreamer &gst10-plugins-good-version; BLFS" &amp;&amp;
 ninja</userinput></screen>
@@ -179,11 +167,4 @@
 
 <screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
   </sect2>
 
Index: multimedia/libdriv/gst10-plugins-ugly.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-ugly.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/gst10-plugins-ugly.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,7 +8,7 @@
            "&gstreamer-dl;/gst-plugins-ugly/gst-plugins-ugly-&gst10-plugins-ugly-version;.tar.xz">
   <!ENTITY gst10-plugins-ugly-download-ftp  " ">
-  <!ENTITY gst10-plugins-ugly-md5sum        "e5fbd9a8a05632cfb9d0afd0ad856d52">
-  <!ENTITY gst10-plugins-ugly-size          "500 KB">
-  <!ENTITY gst10-plugins-ugly-buildsize     "9.8 MB (with tests)">
+  <!ENTITY gst10-plugins-ugly-md5sum        "5ca5beef76b5ae2208bcff56d702b06a">
+  <!ENTITY gst10-plugins-ugly-size          "496 KB">
+  <!ENTITY gst10-plugins-ugly-buildsize     "7.8 MB (with tests)">
   <!ENTITY gst10-plugins-ugly-time          "less than 0.1 SBU (with tests)">
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -99,5 +100,5 @@
       <ulink url="https://pypi.org/project/hotdoc/">hotdoc</ulink>,
       <ulink url="http://packages.debian.org/source/sid/libsidplay">libsidplay</ulink>,
-      <ulink url="https://sourceforge.net/projects/opencore-amr/">OpenCore AMR</ulink>,
+      <ulink url="http://sourceforge.net/projects/opencore-amr/">OpenCore AMR</ulink>,
       <ulink url="http://gstreamer.freedesktop.org/src/orc/">Orc</ulink>, and
       <ulink url="http://www.twolame.org/">TwoLame</ulink>
@@ -127,6 +128,6 @@
 
 meson  --prefix=/usr       \
-       --buildtype=release \
-       -Dpackage-origin=https://www.linuxfromscratch.org/blfs/view/svn/ \
+       -Dbuildtype=release \
+       -Dpackage-origin=http://www.linuxfromscratch.org/blfs/view/svn/ \
        -Dpackage-name="GStreamer &gst10-plugins-good-version; BLFS" &amp;&amp;
 ninja</userinput></screen>
@@ -141,11 +142,4 @@
 
 <screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
   </sect2>
 
Index: multimedia/libdriv/gstreamer10-vaapi.xml
===================================================================
--- multimedia/libdriv/gstreamer10-vaapi.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/gstreamer10-vaapi.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY gstreamer10-vaapi-download-http "&gstreamer-dl;/gstreamer-vaapi/gstreamer-vaapi-&gstreamer-vaapi-version;.tar.xz">
   <!ENTITY gstreamer10-vaapi-download-ftp  " ">
-  <!ENTITY gstreamer10-vaapi-md5sum        "07d334476b3a7195033692fdb42b78d5">
-  <!ENTITY gstreamer10-vaapi-size          "768 KB">
-  <!ENTITY gstreamer10-vaapi-buildsize     "16 MB">
+  <!ENTITY gstreamer10-vaapi-md5sum        "847e69c82dbf2fb63cc0f038311f1d06">
+  <!ENTITY gstreamer10-vaapi-size          "764 KB">
+  <!ENTITY gstreamer10-vaapi-buildsize     "15 MB">
   <!ENTITY gstreamer10-vaapi-time          "0.2 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -108,6 +109,6 @@
 
 meson  --prefix=/usr       \
-       --buildtype=release \
-       -Dpackage-origin=https://www.linuxfromscratch.org/blfs/view/svn/ &amp;&amp;
+       -Dbuildtype=release \
+       -Dpackage-origin=http://www.linuxfromscratch.org/blfs/view/svn/ &amp;&amp;
 ninja</userinput></screen>
 
@@ -122,11 +123,4 @@
 
 <screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
   </sect2>
 
Index: multimedia/libdriv/gstreamer10.xml
===================================================================
--- multimedia/libdriv/gstreamer10.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/gstreamer10.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY gstreamer10-download-http "&gstreamer-dl;/gstreamer/gstreamer-&gstreamer10-version;.tar.xz">
   <!ENTITY gstreamer10-download-ftp  " ">
-  <!ENTITY gstreamer10-md5sum        "fe381e1e910e622fee44692e865f7229">
+  <!ENTITY gstreamer10-md5sum        "729e3da87743d1ef04b2cdc9a5f1dc13">
   <!ENTITY gstreamer10-size          "2.6 MB">
-  <!ENTITY gstreamer10-buildsize     "60 MB (with tests)">
-  <!ENTITY gstreamer10-time          "0.5 SBU (Using parallelism=4; with tests)">
+  <!ENTITY gstreamer10-buildsize     "49 MB (with tests)">
+  <!ENTITY gstreamer10-time          "0.3 SBU (Using parallelism=4; with tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -102,5 +103,5 @@
     <para role="optional">
       <xref linkend="gtk3"/> (for examples),
-      <xref linkend="gsl"/> (used by one test if installed),
+      <xref linkend="gsl"/>,
       <xref linkend="valgrind"/>,
       <ulink url="https://github.com/scop/bash-completion/">bash-completion</ulink>,
@@ -130,7 +131,7 @@
 
 meson  --prefix=/usr       \
-       --buildtype=release \
+       -Dbuildtype=release \
        -Dgst_debug=false   \
-       -Dpackage-origin=https://www.linuxfromscratch.org/blfs/view/svn/ \
+       -Dpackage-origin=http://www.linuxfromscratch.org/blfs/view/svn/ \
        -Dpackage-name="GStreamer &gstreamer10-version; BLFS" &amp;&amp;
 ninja</userinput></screen>
@@ -158,11 +159,4 @@
 <screen role="root"><userinput>ninja install</userinput></screen>
 
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
   </sect2>
 
@@ -202,5 +196,5 @@
             <application>gstreamer</application> plugins,
             information about a particular plugin, or information
-            about a particular element
+            about a particular element.
           </para>
           <indexterm zone="gstreamer10 gst-inspect-1.0">
@@ -215,5 +209,5 @@
           <para>
             is a tool that builds and runs basic
-            <application>gstreamer</application> pipelines
+            <application>gstreamer</application> pipelines.
           </para>
           <indexterm zone="gstreamer10 gst-launch-1.0">
@@ -228,5 +222,5 @@
           <para>
             is a tool used to gather statistics about
-            <application>gstreamer</application> operations
+            <application>gstreamer</application> operations.
           </para>
           <indexterm zone="gstreamer10 gst-stats-1.0">
@@ -241,5 +235,5 @@
           <para>
             runs a test plan in TAP compatible format while integrating with
-            the meson test harness
+            the meson test harness.
           </para>
           <indexterm zone="gstreamer10 gst-tester-1.0">
@@ -255,5 +249,5 @@
             uses the <application>gstreamer</application> type finding system
             to determine the relevant <application>gstreamer</application>
-            plugin to parse or decode files, and the corresponding MIME type
+            plugin to parse or decode files, and the corresponding MIME type.
           </para>
           <indexterm zone="gstreamer10 gst-typefind-1.0">
@@ -268,5 +262,5 @@
           <para>
             provides some base classes to be extended by elements and utillity
-            classes that are most useful for plugin developers
+            classes that are most useful for plugin developers.
           </para>
           <indexterm zone="gstreamer10 libgstbase-1.0">
@@ -281,5 +275,5 @@
           <para>
             provides functionality for writing unit tests that use the check
-            framework
+            framework.
           </para>
           <indexterm zone="gstreamer10 libgstcheck-1.0">
@@ -293,5 +287,5 @@
         <listitem>
           <para>
-            provides functionality to animate element properties over time
+            provides functionality to animate element properties over time.
           </para>
           <indexterm zone="gstreamer10 libgstcontroller-1.0">
@@ -305,5 +299,5 @@
         <listitem>
           <para>
-            provides network elements and objects
+            provides network elements and objects.
           </para>
           <indexterm zone="gstreamer10 libgstnet-1.0">
@@ -320,5 +314,5 @@
             services, including initialization, plugin management and types, 
             as well as the object hierarchy that defines elements and bins, 
-            along with some more specialized elements
+            along with some more specialized elements.
           </para>
           <indexterm zone="gstreamer10 libgstreamer-1.0">
Index: multimedia/libdriv/id3lib.xml
===================================================================
--- multimedia/libdriv/id3lib.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/id3lib.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -161,5 +162,5 @@
         <listitem>
           <para>
-            converts between id3v1/v2 tagging formats
+            converts between id3v1/v2 tagging formats.
           </para>
           <indexterm zone="id3lib id3convert">
@@ -173,5 +174,5 @@
         <listitem>
           <para>
-            extracts id3v1/v2 tags from digital audio files
+            extracts id3v1/v2 tags from digital audio files.
           </para>
           <indexterm zone="id3lib id3cp">
@@ -185,5 +186,5 @@
         <listitem>
           <para>
-            prints id3v1/v2 tag contents
+            prints id3v1/v2 tag contents.
           </para>
           <indexterm zone="id3lib id3info">
@@ -197,5 +198,5 @@
         <listitem>
           <para>
-            is a utility for editing id3v1/v2 tags
+            is a utility for editing id3v1/v2 tags.
           </para>
           <indexterm zone="id3lib id3tag">
@@ -206,9 +207,9 @@
 
       <varlistentry id="libid3">
-        <term><filename class="libraryfile">libid3.so</filename></term>
+        <term><filename class='libraryfile'>libid3.so</filename></term>
         <listitem>
           <para>
             provides functions for the id3v1/v2 tag editing programs as well
-            as other external programs and libraries
+            as other external programs and libraries.
           </para>
           <indexterm zone="id3lib libid3">
Index: multimedia/libdriv/liba52.xml
===================================================================
--- multimedia/libdriv/liba52.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/liba52.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -93,5 +94,5 @@
             --enable-shared \
             --disable-static \
-            CFLAGS="${CFLAGS:--g -O2} $([ $(uname -m) = x86_64 ] &amp;&amp; echo -fPIC)" &amp;&amp;
+            CFLAGS="-g -O2 $([ $(uname -m) = x86_64 ] &amp;&amp; echo -fPIC)" &amp;&amp;
 make</userinput></screen>
 
@@ -156,5 +157,5 @@
         <listitem>
           <para>
-            plays ATSC A/52 audio streams
+            plays ATSC A/52 audio streams.
           </para>
           <indexterm zone="liba52 a52dec">
@@ -168,5 +169,5 @@
         <listitem>
           <para>
-            extracts ATSC A/52 audio from an MPEG stream
+            extracts ATSC A/52 audio from an MPEG stream.
           </para>
           <indexterm zone="liba52 extract_a52">
@@ -177,8 +178,8 @@
 
       <varlistentry id="liba52-lib">
-        <term><filename class="libraryfile">liba52.so</filename></term>
+        <term><filename class='libraryfile'>liba52.so</filename></term>
         <listitem>
           <para>
-            provides functions for the programs dealing with ATSC A/52 streams
+            provides functions for the programs dealing with ATSC A/52 streams.
           </para>
           <indexterm zone="liba52 liba52-lib">
@@ -189,4 +190,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: multimedia/libdriv/libao.xml
===================================================================
--- multimedia/libdriv/libao.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/libao.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -168,9 +169,9 @@
 
       <varlistentry id="libao-lib">
-        <term><filename class="libraryfile">libao.so</filename></term>
+        <term><filename class='libraryfile'>libao.so</filename></term>
         <listitem>
           <para>
             provides functions for programs wishing to output sound over
-            supported platforms
+            supported platforms.
           </para>
           <indexterm zone="libao libao-lib">
Index: multimedia/libdriv/libass.xml
===================================================================
--- multimedia/libdriv/libass.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/libass.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY libass-download-http "https://github.com/libass/libass/releases/download/&libass-version;/libass-&libass-version;.tar.xz">
   <!ENTITY libass-download-ftp  " ">
-  <!ENTITY libass-md5sum        "65e60f7bb7e881b453bede1faad10b77">
-  <!ENTITY libass-size          "364 KB">
-  <!ENTITY libass-buildsize     "5.6 MB">
-  <!ENTITY libass-time          "less than 0.1 SBU">
+  <!ENTITY libass-md5sum        "dab492ded0ecc83dd7cb65522801cffa">
+  <!ENTITY libass-size          "360 KB">
+  <!ENTITY libass-buildsize     "6.8 MB">
+  <!ENTITY libass-time          "0.1 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -163,5 +164,5 @@
         <listitem>
           <para>
-            provides the functions used to render ASS/SSA subtitle format
+            provides the functions used to render ASS/SSA subtitle format.
           </para>
           <indexterm zone="libass libass-lib">
Index: multimedia/libdriv/libcanberra.xml
===================================================================
--- multimedia/libdriv/libcanberra.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/libcanberra.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -207,5 +208,5 @@
         <listitem>
           <para>
-            is an application used for playing sound events
+            is an application used for playing sound events.
           </para>
           <indexterm zone="libcanberra canberra-gtk-play">
@@ -220,5 +221,5 @@
           <para>
             contains the <application>libcanberra</application> bindings
-            for <application>GTK+ 2</application>
+            for <application>GTK+ 2</application>.
           </para>
           <indexterm zone="libcanberra libcanberra-gtk">
@@ -233,5 +234,5 @@
           <para>
             contains the <application>libcanberra</application> bindings
-            for <application>GTK+ 3</application>
+            for <application>GTK+ 3</application>.
           </para>
           <indexterm zone="libcanberra libcanberra-gtk3">
@@ -242,8 +243,8 @@
 
       <varlistentry id="libcanberra-lib">
-        <term><filename class="libraryfile">libcanberra.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libcanberra</application> API functions
+        <term><filename class='libraryfile'>libcanberra.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>libcanberra</application> API functions.
           </para>
           <indexterm zone="libcanberra libcanberra-lib">
Index: multimedia/libdriv/libcddb.xml
===================================================================
--- multimedia/libdriv/libcddb.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/libcddb.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -129,5 +130,5 @@
         <listitem>
           <para>
-            provides a user interface to a CDDB server
+            provides a user interface to a CDDB server.
           </para>
           <indexterm zone="libcddb cddb_query">
@@ -139,4 +140,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: multimedia/libdriv/libcdio.xml
===================================================================
--- multimedia/libdriv/libcdio.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/libcdio.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -182,5 +183,5 @@
         <listitem>
           <para>
-            shows CD-ROM drive characteristics
+            shows CD-ROM drive characteristics.
           </para>
           <indexterm zone="libcdio cd-drive">
@@ -194,5 +195,5 @@
         <listitem>
           <para>
-            shows information about a CD or CD-image
+            shows information about a CD or CD-image.
           </para>
           <indexterm zone="libcdio cd-info">
@@ -207,5 +208,5 @@
           <para>
             is an audio CD reading utility which
-            includes extra data verification features
+            includes extra data verification features.
           </para>
           <indexterm zone="libcdio cd-paranoia">
@@ -219,5 +220,5 @@
         <listitem>
           <para>
-            reads Information from a CD or CD-image
+            reads Information from a CD or CD-image.
           </para>
           <indexterm zone="libcdio cd-read">
@@ -231,5 +232,5 @@
         <listitem>
           <para>
-            is a simple curses CD player
+            is a simple curses CD player.
           </para>
           <indexterm zone="libcdio cdda-player">
@@ -243,5 +244,5 @@
         <listitem>
           <para>
-            shows Information about an ISO 9660 image
+            shows Information about an ISO 9660 image.
           </para>
           <indexterm zone="libcdio iso-info">
@@ -255,5 +256,5 @@
         <listitem>
           <para>
-            reads portions of an ISO 9660 image
+            reads portions of an ISO 9660 image.
           </para>
           <indexterm zone="libcdio iso-read">
@@ -267,5 +268,5 @@
         <listitem>
           <para>
-            issues libcdio multimedia commands
+            issues libcdio multimedia commands.
           </para>
           <indexterm zone="libcdio mmc-tool">
@@ -279,5 +280,5 @@
         <listitem>
           <para>
-            contains the primary cdio API functions
+            contains the primary cdio API functions.
           </para>
           <indexterm zone="libcdio libcdio.so">
@@ -289,4 +290,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: multimedia/libdriv/libdiscid.xml
===================================================================
--- multimedia/libdriv/libdiscid.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/libdiscid.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -144,5 +145,5 @@
         <listitem>
           <para>
-            contains the DiscID API functions
+            contains the DiscID API functions.
           </para>
           <indexterm zone="libdiscid libdiscid-lib">
Index: multimedia/libdriv/libdriv.xml
===================================================================
--- multimedia/libdriv/libdriv.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/libdriv.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="multimedia-libdriv">
Index: multimedia/libdriv/libdv.xml
===================================================================
--- multimedia/libdriv/libdv.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/libdv.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -155,5 +156,5 @@
         <listitem>
           <para>
-            inserts audio into a digital video stream
+            inserts audio into a digital video stream.
           </para>
           <indexterm zone="libdv dubdv">
@@ -168,5 +169,5 @@
           <para>
             is a small utility to send or capture raw data from and to the
-            camcorder
+            camcorder.
           </para>
           <indexterm zone="libdv dvconnect">
@@ -180,5 +181,5 @@
         <listitem>
           <para>
-            encodes a series of images to a digital video stream
+            encodes a series of images to a digital video stream.
           </para>
           <indexterm zone="libdv encodedv">
@@ -201,9 +202,9 @@
 
       <varlistentry id="libdv-lib">
-        <term><filename class="libraryfile">libdv.so</filename></term>
+        <term><filename class='libraryfile'>libdv.so</filename></term>
         <listitem>
           <para>
             provides functions for programs interacting with the
-            Quasar DV CODEC
+            Quasar DV CODEC.
           </para>
           <indexterm zone="libdv libdv-lib">
Index: multimedia/libdriv/libdvdcss.xml
===================================================================
--- multimedia/libdriv/libdvdcss.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/libdvdcss.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY libdvdcss-download-http "https://get.videolan.org/libdvdcss/&libdvdcss-version;/libdvdcss-&libdvdcss-version;.tar.bz2">
   <!ENTITY libdvdcss-download-ftp  " ">
-  <!ENTITY libdvdcss-md5sum        "e98239a88af9b2204f9b9d987c2bc71a">
-  <!ENTITY libdvdcss-size          "380 KB">
-  <!ENTITY libdvdcss-buildsize     "3.3 MB">
+  <!ENTITY libdvdcss-md5sum        "7b74f2e142b13c9de6dc8d807ab912d4">
+  <!ENTITY libdvdcss-size          "360 KB">
+  <!ENTITY libdvdcss-buildsize     "3.2 MB">
   <!ENTITY libdvdcss-time          "less than 0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -148,5 +149,5 @@
           <para>
             provides the functionality that is required for transparent
-            DVD access with CSS decryption
+            DVD access with CSS decryption.
           </para>
           <indexterm zone="libdvdcss libdvdcss-lib">
Index: multimedia/libdriv/libdvdnav.xml
===================================================================
--- multimedia/libdriv/libdvdnav.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/libdvdnav.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,6 +7,6 @@
   <!ENTITY libdvdnav-download-http "https://get.videolan.org/libdvdnav/&libdvdnav-version;/libdvdnav-&libdvdnav-version;.tar.bz2">
   <!ENTITY libdvdnav-download-ftp  " ">
-  <!ENTITY libdvdnav-md5sum        "46c46cb0294fbd1fcb8a0181818dad15">
-  <!ENTITY libdvdnav-size          "360 KB">
+  <!ENTITY libdvdnav-md5sum        "8817ac12c13644df6ba2091c2dcaeed3">
+  <!ENTITY libdvdnav-size          "364 KB">
   <!ENTITY libdvdnav-buildsize     "3.7 MB">
   <!ENTITY libdvdnav-time          "less than 0.1 SBU">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -141,5 +142,5 @@
         <listitem>
           <para>
-            is the DVD navigation library
+            is the DVD navigation library.
           </para>
           <indexterm zone="libdvdnav libdvdnav-lib">
@@ -150,4 +151,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: multimedia/libdriv/libdvdread.xml
===================================================================
--- multimedia/libdriv/libdvdread.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/libdvdread.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,5 +7,5 @@
   <!ENTITY libdvdread-download-http "https://get.videolan.org/libdvdread/&libdvdread-version;/libdvdread-&libdvdread-version;.tar.bz2">
   <!ENTITY libdvdread-download-ftp  " ">
-  <!ENTITY libdvdread-md5sum        "034581479968405ed415c34a50d00224">
+  <!ENTITY libdvdread-md5sum        "09c7423568fb679279fd2a2bc6b10b6e">
   <!ENTITY libdvdread-size          "384 KB">
   <!ENTITY libdvdread-buildsize     "3.8 MB">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -132,5 +133,5 @@
         <listitem>
           <para>
-            provides functionality required to access DVDs
+            provides functionality required to access DVDs.
           </para>
           <indexterm zone="libdvdread libdvdread-lib">
@@ -141,4 +142,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: multimedia/libdriv/libmad.xml
===================================================================
--- multimedia/libdriv/libmad.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/libmad.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -172,8 +173,8 @@
 
       <varlistentry id="libmad-lib">
-        <term><filename class="libraryfile">libmad.so</filename></term>
+        <term><filename class='libraryfile'>libmad.so</filename></term>
         <listitem>
           <para>
-            is a MPEG audio decoder library
+            is a MPEG audio decoder library.
           </para>
           <indexterm zone="libmad libmad-lib">
Index: multimedia/libdriv/libmpeg2.xml
===================================================================
--- multimedia/libdriv/libmpeg2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/libmpeg2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -175,5 +176,5 @@
         <listitem>
           <para>
-            extracts MPEG video streams from a multiplexed stream
+            extracts MPEG video streams from a multiplexed stream.
           </para>
           <indexterm zone="libmpeg2 extract_mpeg2">
@@ -187,5 +188,5 @@
         <listitem>
           <para>
-            decodes MPEG1 and MPEG2 video streams
+            decodes MPEG1 and MPEG2 video streams.
           </para>
           <indexterm zone="libmpeg2 mpeg2dec">
@@ -196,8 +197,8 @@
 
       <varlistentry id="libmpeg2-lib">
-        <term><filename class="libraryfile">libmpeg2.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions used to decode MPEG video streams
+        <term><filename class='libraryfile'>libmpeg2.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions used to decode MPEG video streams.
           </para>
           <indexterm zone="libmpeg2 libmpeg2-lib">
@@ -208,9 +209,9 @@
 
       <varlistentry id="libmpeg2convert">
-        <term><filename class="libraryfile">libmpeg2convert.so</filename></term>
+        <term><filename class='libraryfile'>libmpeg2convert.so</filename></term>
         <listitem>
           <para>
             contains API functions used for color conversions of MPEG
-            video streams
+            video streams.
           </para>
           <indexterm zone="libmpeg2 libmpeg2convert">
Index: multimedia/libdriv/libmusicbrainz.xml
===================================================================
--- multimedia/libdriv/libmusicbrainz.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/libmusicbrainz.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -45,5 +46,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -113,5 +114,5 @@
 <screen><userinput>patch -Np1 -i ../libmusicbrainz-&libmusicbrainz-version;-missing-includes-1.patch &amp;&amp;
 
-CXXFLAGS="${CXXFLAGS:--O2 -g} -std=c++98" \
+CXXFLAGS=-std=c++98 \
 ./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
@@ -183,9 +184,9 @@
 
       <varlistentry id="libmusicbrainz-lib">
-        <term><filename class="libraryfile">libmusicbrainz.so</filename></term>
+        <term><filename class='libraryfile'>libmusicbrainz.so</filename></term>
         <listitem>
           <para>
             contains API functions to access the MusicBrainz database, both
-            for looking up data and also for submitting new data
+            for looking up data and also for submitting new data.
           </para>
           <indexterm zone="libmusicbrainz libmusicbrainz-lib">
Index: multimedia/libdriv/libmusicbrainz5.xml
===================================================================
--- multimedia/libdriv/libmusicbrainz5.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/libmusicbrainz5.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -186,5 +187,5 @@
         <listitem>
           <para>
-            contains API functions for accessing the MusicBrainz database
+            contains API functions for accessing the MusicBrainz database.
           </para>
           <indexterm zone="libmusicbrainz5 libmusicbrainz5-lib">
Index: multimedia/libdriv/libogg.xml
===================================================================
--- multimedia/libdriv/libogg.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/libogg.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY libogg-download-http "https://downloads.xiph.org/releases/ogg/libogg-&libogg-version;.tar.xz">
   <!ENTITY libogg-download-ftp  " ">
-  <!ENTITY libogg-md5sum        "3178c98341559657a15b185bf5d700a5">
+  <!ENTITY libogg-md5sum        "eadef24aad6e3e8379ba0d14971fd64a">
   <!ENTITY libogg-size          "420 KB">
-  <!ENTITY libogg-buildsize     "3.5 MB (with tests)">
+  <!ENTITY libogg-buildsize     "3.6 MB (with tests)">
   <!ENTITY libogg-time          "less than 0.1 SBU (with tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -130,9 +131,9 @@
 
       <varlistentry id="libogg-lib">
-        <term><filename class="libraryfile">libogg.so</filename></term>
+        <term><filename class='libraryfile'>libogg.so</filename></term>
         <listitem>
           <para>
             provides the functions required for programs to
-            read or write Ogg formatted bit streams
+            read or write Ogg formatted bit streams.
           </para>
           <indexterm zone="libogg libogg-lib">
Index: multimedia/libdriv/libquicktime.xml
===================================================================
--- multimedia/libdriv/libquicktime.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/libquicktime.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -31,5 +32,5 @@
     <para>
       The <application>libquicktime</application> package contains the
-      <filename class="libraryfile">libquicktime</filename> library, various
+      <filename class='libraryfile'>libquicktime</filename> library, various
       plugins and codecs, along with graphical and command line utilities used
       for encoding and decoding QuickTime files. This is useful for reading and
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -198,5 +199,5 @@
           <para>
             is a graphical front end to examine and configure the available
-            <application>libquicktime</application> audio and video codecs
+            <application>libquicktime</application> audio and video codecs.
           </para>
           <indexterm zone="libquicktime libquicktime_config">
@@ -210,5 +211,5 @@
         <listitem>
           <para>
-            is a simple QuickTime movie player for X Window System
+            is a simple QuickTime movie player for X Window System.
           </para>
           <indexterm zone="libquicktime lqtplay">
@@ -237,5 +238,5 @@
           <para>
             is a command-line program used to encode video and/or audio
-            files from one format to another
+            files from one format to another.
           </para>
           <indexterm zone="libquicktime lqt_transcode">
@@ -249,5 +250,5 @@
         <listitem>
           <para>
-            is used to dump all text strings from a quicktime file
+            is used to dump all text strings from a quicktime file.
           </para>
           <indexterm zone="libquicktime qt2text">
@@ -262,5 +263,5 @@
           <para>
             can take movies containing rgb frames and write them out as
-            ppm images
+            ppm images.
           </para>
           <indexterm zone="libquicktime qtdechunk">
@@ -274,5 +275,5 @@
         <listitem>
           <para>
-            displays the parsed contents of the provided file
+            displays the parsed contents of the provided file.
           </para>
           <indexterm zone="libquicktime qtdump">
@@ -299,5 +300,5 @@
         <listitem>
           <para>
-            concatenates input frames into a QuickTime movie
+            concatenates input frames into a QuickTime movie.
           </para>
           <indexterm zone="libquicktime qtrechunk">
@@ -312,5 +313,5 @@
           <para>
             is used to make a file streamable by placing the moov header at the
-            beginning of the file
+            beginning of the file.
           </para>
           <indexterm zone="libquicktime qtstreamize">
@@ -325,5 +326,5 @@
           <para>
             is used to write a YUV4 encoded movie as a planar YUV 4:2:0
-            file
+            file.
           </para>
           <indexterm zone="libquicktime qtyuv4toyuv">
@@ -334,5 +335,5 @@
 
       <varlistentry id="libquicktime-lib">
-        <term><filename class="libraryfile">libquicktime.so</filename></term>
+        <term><filename class='libraryfile'>libquicktime.so</filename></term>
         <listitem>
           <para>
@@ -341,5 +342,5 @@
             codecs. The library contains new functions integrated with all the
             original QuickTime 4 Linux library functions used to encode and
-            decode QuickTime files
+            decode QuickTime files.
           </para>
           <indexterm zone="libquicktime libquicktime-lib">
Index: multimedia/libdriv/libsamplerate.xml
===================================================================
--- multimedia/libdriv/libsamplerate.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/libsamplerate.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,10 +6,10 @@
 
   <!ENTITY libsamplerate-download-http
-  "https://github.com/libsndfile/libsamplerate/releases/download/&libsamplerate-version;/libsamplerate-&libsamplerate-version;.tar.bz2">
+  "http://www.mega-nerd.com/SRC/libsamplerate-&libsamplerate-version;.tar.gz">
   <!ENTITY libsamplerate-download-ftp  " ">
-  <!ENTITY libsamplerate-md5sum        "e29ca4f1bb8c0252e0f84725617dbe89">
-  <!ENTITY libsamplerate-size          "3.6 MB">
-  <!ENTITY libsamplerate-buildsize     "17 MB (add 1.2 MB for tests)">
-  <!ENTITY libsamplerate-time          "0.1 SBU (add 0.3 SBU for tests)">
+  <!ENTITY libsamplerate-md5sum        "2b78ae9fe63b36b9fbb6267fad93f259">
+  <!ENTITY libsamplerate-size          "4.1 MB">
+  <!ENTITY libsamplerate-buildsize     "17 MB">
+  <!ENTITY libsamplerate-time          "0.1 SBU">
 ]>
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -75,6 +76,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-       <xref linkend="alsa-lib"/>,
-       <xref linkend='libsndfile'/>, and
+       <xref linkend='libsndfile'/> and
        <xref linkend="fftw"/> (for tests)
     </para>
@@ -92,7 +92,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/libsamplerate-&libsamplerate-version; &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -105,5 +103,5 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make htmldocdir=/usr/share/doc/libsamplerate-&libsamplerate-version; install</userinput></screen>
   </sect2>
 
@@ -125,10 +123,10 @@
 
       <seglistitem>
-        <seg>None</seg>
+        <seg>sndfile-resample</seg>
         <seg>libsamplerate.so</seg>
         <seg>/usr/share/doc/libsamplerate-&libsamplerate-version;</seg>
       </seglistitem>
     </segmentedlist>
-<!--
+
     <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -147,6 +145,5 @@
         </listitem>
       </varlistentry>
-    </variablelist>-->
+    </variablelist>
   </sect2>
-
 </sect1>
Index: multimedia/libdriv/libsndfile.xml
===================================================================
--- multimedia/libdriv/libsndfile.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/libsndfile.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,10 +6,10 @@
 
   <!ENTITY libsndfile-download-http
-    "https://github.com/libsndfile/libsndfile/releases/download/&libsndfile-version;/libsndfile-&libsndfile-version;.tar.bz2">
+    "http://www.mega-nerd.com/libsndfile/files/libsndfile-&libsndfile-version;.tar.gz">
   <!ENTITY libsndfile-download-ftp  " ">
-  <!ENTITY libsndfile-md5sum        "3f3b2a86a032f064ef922a2c8c191f7b">
-  <!ENTITY libsndfile-size          "855 KB">
-  <!ENTITY libsndfile-buildsize     "13 MB (add 9 MB for tests)">
-  <!ENTITY libsndfile-time          "0.3 SBU (add 0.6 SBU for tests)">
+  <!ENTITY libsndfile-md5sum        "646b5f98ce89ac60cdb060fcd398247c">
+  <!ENTITY libsndfile-size          "1.1 MB">
+  <!ENTITY libsndfile-buildsize     "34 MB (with tests)">
+  <!ENTITY libsndfile-time          "0.6 SBU (with tests)">
 ]>
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -76,12 +77,11 @@
     <para role="recommended">
       <xref linkend="flac"/>,
-      <xref linkend="opus"/>, and
-      <xref linkend="libvorbis"/><!-- brings in libogg -->
+      <xref linkend="libogg"/>, and
+      <xref linkend="libvorbis"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="speex"/>, and
+      <xref linkend="alsa-lib"/> and
       <xref linkend="sqlite"/>
     </para>
@@ -142,5 +142,6 @@
           sndfile-metadata-get,
           sndfile-metadata-set,
-          sndfile-play, and
+          sndfile-play,
+          sndfile-regtest and
           sndfile-salvage
         </seg>
@@ -159,5 +160,5 @@
         <listitem>
           <para>
-            compares two audio files
+            compares two audio files.
           </para>
           <indexterm zone="libsndfile sndfile-cmp">
@@ -171,5 +172,5 @@
         <listitem>
           <para>
-            concatenates two or more audio files
+            concatenates two or more audio files.
           </para>
           <indexterm zone="libsndfile sndfile-concat">
@@ -183,5 +184,5 @@
         <listitem>
           <para>
-            converts a sound files from one format to another
+            converts a sound files from one format to another.
           </para>
           <indexterm zone="libsndfile sndfile-convert">
@@ -195,5 +196,5 @@
         <listitem>
           <para>
-            splits a multi-channel into multiple single channel files
+            splits a multi-channel into multiple single channel files.
           </para>
           <indexterm zone="libsndfile sndfile-deinterleave">
@@ -207,5 +208,5 @@
         <listitem>
           <para>
-            displays information about a sound file
+            displays information about a sound file.
           </para>
           <indexterm zone="libsndfile sndfile-info">
@@ -219,5 +220,5 @@
         <listitem>
           <para>
-            converts multiple single channel files into a multi-channel file
+            converts multiple single channel files into a multi-channel file.
           </para>
           <indexterm zone="libsndfile sndfile-interleave">
@@ -231,5 +232,5 @@
         <listitem>
           <para>
-            retrieves metadata from a sound file
+            retrieves metadata from a sound file.
           </para>
           <indexterm zone="libsndfile sndfile-metadata-get">
@@ -243,5 +244,5 @@
         <listitem>
           <para>
-            sets metadata in a sound file
+            sets metadata in a sound file.
           </para>
           <indexterm zone="libsndfile sndfile-metadata-set">
@@ -255,5 +256,5 @@
         <listitem>
           <para>
-            plays a sound file
+            plays a sound file.
           </para>
           <indexterm zone="libsndfile sndfile-play">
@@ -273,5 +274,5 @@
           </indexterm>
         </listitem>
-      </varlistentry>-->
+      </varlistentry>
 
       <varlistentry id="sndfile-salvage">
@@ -279,6 +280,5 @@
         <listitem>
           <para>
-            Salvages the audio data from WAV files which are more than
-            4G in length
+            does this .....
           </para>
           <indexterm zone="libsndfile sndfile-salvage">
@@ -286,11 +286,11 @@
           </indexterm>
         </listitem>
-      </varlistentry>
+      </varlistentry>-->
 
       <varlistentry id="libsndfile-lib">
-        <term><filename class="libraryfile">libsndfile.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libsndfile</application> API functions
+        <term><filename class='libraryfile'>libsndfile.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>libsndfile</application> API functions.
           </para>
           <indexterm zone="libsndfile libsndfile-lib">
Index: multimedia/libdriv/libtheora.xml
===================================================================
--- multimedia/libdriv/libtheora.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/libtheora.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -171,8 +172,8 @@
 
       <varlistentry id="libtheora-lib">
-        <term><filename class="libraryfile">libtheora*.so</filename></term>
+        <term><filename class='libraryfile'>libtheora*.so</filename></term>
         <listitem>
           <para>
-            contains the functions to read and write video files
+            contains the functions to read and write video files.
           </para>
           <indexterm zone="libtheora libtheora-lib">
Index: multimedia/libdriv/libvorbis.xml
===================================================================
--- multimedia/libdriv/libvorbis.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/libvorbis.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -165,5 +166,5 @@
         <listitem>
           <para>
-            provides the functions used to read and write sound files
+            provides the functions used to read and write sound files.
           </para>
           <indexterm zone="libvorbis libvorbis-lib">
Index: multimedia/libdriv/libvpx.xml
===================================================================
--- multimedia/libdriv/libvpx.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/libvpx.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY libvpx-download-http "https://github.com/webmproject/libvpx/archive/v&libvpx-version;/libvpx-&libvpx-version;.tar.gz">
   <!ENTITY libvpx-download-ftp  " ">
-  <!ENTITY libvpx-md5sum        "cded283be38dc0078c3fbe751722efc5">
-  <!ENTITY libvpx-size          "5.1 MB">
-  <!ENTITY libvpx-buildsize     "64 MB (add 1.3GB if running tests)">
-  <!ENTITY libvpx-time          "1.5 SBU, add 41 SBU if running tests, including download time">
+  <!ENTITY libvpx-md5sum        "e5fab59896984392124d0bfaffc36e14">
+  <!ENTITY libvpx-size          "5.0 MB">
+  <!ENTITY libvpx-buildsize     "63 MB (add 1.3GB if running tests)">
+  <!ENTITY libvpx-time          "0.5 SBU (using parallelism=4), add 14 SBU if running tests, including download time">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -73,7 +74,10 @@
     <bridgehead renderas="sect3">libvpx Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
       <xref linkend="yasm"/> or <xref role="nodep" linkend="nasm"/>, and 
+<!-- see
+http://lists.linuxfromscratch.org/pipermail/blfs-book/2019-August/083164.html
+and references therein -->
       <xref linkend="which"/> (so <command>configure</command> can find yasm)
     </para>
@@ -81,6 +85,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="curl"/> (to download test files) and 
-      <xref linkend="doxygen"/> (to build documentation)
+      <xref linkend="curl"/> (to download test files), 
+      <xref linkend="doxygen"/> and <xref linkend="php"/>
+      (to build the documentation)
     </para>
 
@@ -109,11 +114,12 @@
 
     <para>
-      To test the results, issue:
-      <command>LD_LIBRARY_PATH=. make test</command>.
-      The test suite downloads several files as part of its test process.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
+       To test the results, issue: <command>make test</command>. Four tests are
+       known to fail. The test suite downloads several files as part of it's
+       test process.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem>
+    user:
     </para>
 
@@ -148,16 +154,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--target=generic-gnu</option>: This switch disables
-      optimizations specific for x86 and x86-64, allowing to build this
-      package without <command>nasm</command> and <command>yasm</command>
-      installed.
-    </para>
-
-    <para>
-      <command>LD_LIBRARY_PATH=.</command>: This is needed for the testsuite
-      to use the just built library.
-    </para>
 
   </sect2>
@@ -187,5 +181,5 @@
         <listitem>
           <para>
-            is the WebM Project VP8 and VP9 decoder
+            is the WebM Project VP8 and VP9 decoder.
           </para>
           <indexterm zone="libvpx vpxdec">
@@ -199,5 +193,5 @@
         <listitem>
           <para>
-            is the WebM project VP8 and VP9 encoder
+            is the WebM project VP8 and VP9 encoder.
           </para>
           <indexterm zone="libvpx vpxenc">
@@ -208,8 +202,8 @@
 
       <varlistentry id="libvpx-lib">
-        <term><filename class="libraryfile">libvpx.so</filename></term>
+        <term><filename class='libraryfile'>libvpx.so</filename></term>
         <listitem>
           <para>
-            provides functions to use the VP8 and VP9 video codecs
+            provides functions to use the VP8 and VP9 video codecs.
           </para>
           <indexterm zone="libvpx libvpx-lib">
Index: multimedia/libdriv/mlt.xml
===================================================================
--- multimedia/libdriv/mlt.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/mlt.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY mlt-download-http "https://github.com/mltframework/mlt/releases/download/v&mlt-version;/mlt-&mlt-version;.tar.gz">
   <!ENTITY mlt-download-ftp  " ">
-  <!ENTITY mlt-md5sum        "c9cca34e75caee6aa31d42d5e141206b">
-  <!ENTITY mlt-size          "1.1 MB">
-  <!ENTITY mlt-buildsize     "22 MB">
-  <!ENTITY mlt-time          "0.1 SBU (Using parallelism=4)">
+  <!ENTITY mlt-md5sum        "ea8dca852e11ef317e3cac14e4d916f1">
+  <!ENTITY mlt-size          "1.3 MB">
+  <!ENTITY mlt-buildsize     "40 MB">
+  <!ENTITY mlt-time          "0.2 SBU (Using parallelism=4)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -90,5 +91,6 @@
       <ulink url="http://jackaudio.org">JACK</ulink>,
       <ulink url="http://www.ipswitch.com/moveit/">MOVEit</ulink>,
-      <ulink url="http://sox.sourceforge.net/">SoX</ulink>, and
+      <ulink url="http://sox.sourceforge.net/">SoX</ulink>, 
+      <ulink url="https://github.com/mltframework/swfdec">Swfdec</ulink>, and
       <ulink url="http://public.hronopik.de/vid.stab/">vid.stab</ulink>
 
@@ -103,15 +105,22 @@
     <title>Installation of MLT</title>
 
+    <!--
+    <para>
+      First, adapt MLT to changes in Qt-5.15.0:
+    </para>
+
+<screen><userinput remap="pre">sed -i '/#include "graph.h"/a #include &lt;QPainterPath&gt;' src/modules/qt/graph.cpp &amp;&amp;
+sed -i '/#include &lt;QPainter&gt;/a #include &lt;QPainterPath&gt;' src/modules/qt/{filter,producer}_qtext.cpp</userinput></screen>
+    -->
+
     <para>
       Install <application>MLT</application> by running the following commands:
     </para>
 
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -Wno-dev .. &amp;&amp;
-
+<screen><userinput>./configure --prefix=/usr     \
+            --enable-gpl      \
+            --enable-gpl3     \
+            --enable-opengl   \
+            --disable-gtk2    &amp;&amp;
 make</userinput></screen>
 
@@ -147,15 +156,12 @@
 
       <seglistitem>
-        <seg>melt-7 and 
-             melt (symlink to melt-7)</seg>
-        <seg>libmlt-7.so,
-             libmlt++-7.so, and
+        <seg>melt</seg>
+        <seg>libmlt.so,
+             libmlt++.so, and
              over twenty plugins</seg>
-        <seg>/usr/include/mlt-7,
-             /usr/include/melt-7/mlt++,
-             /usr/include/melt-7/framework,
-             /usr/lib/mlt-7,
-             /usr/lib/cmake/Mlt7, and
-             /usr/share/mlt-7
+        <seg>/usr/include/mlt,
+             /usr/include/mlt++,
+             /usr/lib/mlt, and
+             /usr/share/mlt
         </seg>
       </seglistitem>
@@ -171,5 +177,5 @@
         <listitem>
           <para>
-            is a test tool for MLT
+            is a test tool for MLT.
           </para>
           <indexterm zone="mlt melt">
Index: multimedia/libdriv/opus.xml
===================================================================
--- multimedia/libdriv/opus.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/opus.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -149,5 +150,5 @@
         <listitem>
           <para>
-            provides the functions used to read and write Opus format
+            provides the functions used to read and write Opus format.
           </para>
           <indexterm zone="opus libopus">
Index: multimedia/libdriv/pipewire.xml
===================================================================
--- multimedia/libdriv/pipewire.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/pipewire.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY pipewire-download-http "https://github.com/PipeWire/pipewire/archive/&pipewire-version;/pipewire-&pipewire-version;.tar.gz">
   <!ENTITY pipewire-download-ftp  " ">
-  <!ENTITY pipewire-md5sum        "9a9bc32228fc1c181686e64eb6e6af03">
-  <!ENTITY pipewire-size          "1.6 MB">
-  <!ENTITY pipewire-buildsize     "63 MB (with tests)">
-  <!ENTITY pipewire-time          "0.5 SBU (Using parallelism=4; with tests)">
+  <!ENTITY pipewire-md5sum        "7d9c5ee429c506316533d4a9db9620e4">
+  <!ENTITY pipewire-size          "1.2 MB">
+  <!ENTITY pipewire-buildsize     "119 MB (with tests)">
+  <!ENTITY pipewire-time          "0.3 SBU (Using parallelism=4; with tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -93,6 +94,4 @@
       <xref linkend="graphviz"/> (for documentation),
       <ulink url="https://jackaudio.org/">JACK</ulink>,
-      <ulink url="https://github.com/EHfive/ldacBT">ldacBT</ulink>,
-      <ulink url="https://libcamera.org/">libcamera</ulink>,
       <ulink url="https://vulkan.lunarg.com/sdk/home/">Vulkan</ulink>, and
       <ulink url="https://sourceforge.net/projects/xmltoman/">xmltoman</ulink>
@@ -115,5 +114,9 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr           \
+      -Djack=false            \
+      -Dpipewire-jack=false   \
+      -Dvulkan=false          \
+      ..                      &amp;&amp;
 ninja</userinput></screen>
 
@@ -132,9 +135,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
     <!-- Without these three parameters, Meson fails to run. -->
-    <!-- Not true anymore, commenting out as of 0.3.24
     <para>
       <parameter>-Djack=false</parameter>: This switch prevents building the
@@ -154,5 +153,4 @@
       <application>Vulkan</application> is not in BLFS.
     </para>
-    -->
 
     <para>
@@ -185,8 +183,4 @@
           pw-cli,
           pw-dot,
-          pw-dump,
-          pw-jack,
-          pw-link,
-          pw-loopback,
           pw-metadata,
           pw-mididump,
@@ -195,8 +189,6 @@
           <!--pw-pulse,-->
           pw-reserve,
-          pw-top,
           spa-acp-tool,
           spa-inspect,
-          spa-json-dump,
           spa-monitor, 
           spa-resample, and
@@ -247,5 +239,5 @@
           <para>
             is a service that allows access to multimedia devices and allows
-            sharing of multimedia files between applications
+            sharing of multimedia files between applications.
           </para>
           <indexterm zone="pipewire pipewire-prog">
@@ -260,5 +252,5 @@
           <para>
             is a service that allows a desktop environment to know when media
-            files are being played through pipewire
+            files are being played through pipewire.
           </para>
           <indexterm zone="pipewire pipewire-media-session">
@@ -273,5 +265,5 @@
           <para>
             starts a Pulseaudio-compatible version of 
-            the pipewire service
+            the pipewire service.
           </para>
           <indexterm zone="pipewire pipewire-pulse">
@@ -285,5 +277,5 @@
         <listitem>
           <para>
-            allows you to play or record media using a pipewire instance
+            allows you to play or record media using a pipewire instance.
           </para>
           <indexterm zone="pipewire pw-cat">
@@ -297,5 +289,5 @@
         <listitem>
           <para>
-            allows you to interact with a pipewire instance
+            allows you to interact with a pipewire instance.
           </para>
           <indexterm zone="pipewire pw-cli">
@@ -309,5 +301,5 @@
         <listitem>
           <para>
-            lists all of the daemons and objects in use by pipewire
+            lists all of the daemons and objects in use by pipewire.
           </para>
           <indexterm zone="pipewire pw-dot">
@@ -317,59 +309,9 @@
       </varlistentry>
 
-      <varlistentry id="pw-dump">
-        <term><command>pw-dump</command></term>
-        <listitem>
-          <para>
-            dumps debug messages from a local or remote pipewire instance to
-            the console
-          </para>
-          <indexterm zone="pipewire pw-dump">
-            <primary sortas="b-pw-dump">pw-dump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pw-jack">
-        <term><command>pw-jack</command></term>
-        <listitem>
-          <para>
-            runs JACK applications on a pipewire instance
-          </para>
-          <indexterm zone="pipewire pw-jack">
-            <primary sortas="b-pw-jack">pw-jack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pw-link">
-        <term><command>pw-link</command></term>
-        <listitem>
-          <para>
-            links pipewire ports together
-          </para>
-          <indexterm zone="pipewire pw-link">
-            <primary sortas="b-pw-link">pw-link</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pw-loopback">
-        <term><command>pw-loopback</command></term>
-        <listitem>
-          <para>
-            initializes a loopback link between two different pipewire ports.
-            This is useful for testing and debugging
-          </para>
-          <indexterm zone="pipewire pw-loopback">
-            <primary sortas="b-pw-loopback">pw-loopback</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="pw-metadata">
         <term><command>pw-metadata</command></term>
         <listitem>
           <para>
-            inspects, adds, and removes metadata for objects
+            inspects, adds, and removes metadata for objects.
           </para>
           <indexterm zone="pipewire pw-metadata">
@@ -383,5 +325,5 @@
         <listitem>
           <para>
-            dumps MIDI messages from a file to the screen
+            dumps MIDI messages from a file to the screen.
           </para>
           <indexterm zone="pipewire pw-mididump">
@@ -395,5 +337,5 @@
         <listitem>
           <para>
-            allows you to monitor pipewire instances
+            allows you to monitor pipewire instances.
           </para>
           <indexterm zone="pipewire pw-mon">
@@ -407,5 +349,5 @@
         <listitem>
           <para>
-            tracks memory usage and API calls used by pipewire
+            tracks memory usage and API calls used by pipewire.
           </para>
           <indexterm zone="pipewire pw-profiler">
@@ -433,5 +375,5 @@
         <listitem>
           <para>
-            reserves or monitors a device via D-Bus
+            reserves or monitors a device via D-Bus.
           </para>
           <indexterm zone="pipewire pw-reserve">
@@ -441,21 +383,9 @@
       </varlistentry>
 
-      <varlistentry id="pw-top">
-        <term><command>pw-top</command></term>
-        <listitem>
-          <para>
-            displays real-time performance information from pipewire
-          </para>
-          <indexterm zone="pipewire pw-top">
-            <primary sortas="b-pw-top">pw-top</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="spa-acp-tool">
         <term><command>spa-acp-tool</command></term>
         <listitem>
           <para>
-            inspects the card profile of a given sound card
+            inspects the card profile of a given sound card.
           </para>
           <indexterm zone="pipewire spa-acp-tool">
@@ -469,5 +399,5 @@
         <listitem>
           <para>
-            allows you to inspect pipewire plugins
+            allows you to inspect pipewire plugins.
           </para>
           <indexterm zone="pipewire spa-inspect">
@@ -477,21 +407,9 @@
       </varlistentry>
 
-      <varlistentry id="spa-json-dump">
-        <term><command>spa-json-dump</command></term>
-        <listitem>
-          <para>
-            dumps the current pipewire configuration in JSON format.
-          </para>
-          <indexterm zone="pipewire spa-json-dump">
-            <primary sortas="b-spa-json-dump">spa-json-dump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="spa-monitor">
         <term><command>spa-monitor</command></term>
         <listitem>
           <para>
-            allows you to monitor pipewire plugins
+            allows you to monitor pipewire plugins.
           </para>
           <indexterm zone="pipewire spa-monitor">
@@ -505,5 +423,5 @@
         <listitem>
           <para>
-            resamples a given file
+            resamples a given file.
           </para>
           <indexterm zone="pipewire spa-resample">
@@ -517,5 +435,5 @@
         <listitem>
           <para>
-            contains API functions for handling multimedia pipelines
+            contains API functions for handling multimedia pipelines.
           </para>
           <indexterm zone="pipewire libpipewire">
@@ -587,4 +505,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: multimedia/libdriv/pulseaudio.xml
===================================================================
--- multimedia/libdriv/pulseaudio.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/pulseaudio.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,8 +8,8 @@
            "https://www.freedesktop.org/software/pulseaudio/releases/pulseaudio-&pulseaudio-version;.tar.xz">
   <!ENTITY pulseaudio-download-ftp  " ">
-  <!ENTITY pulseaudio-md5sum        "bb888e7747b778c1c487c63b582ddf40">
-  <!ENTITY pulseaudio-size          "1.5 MB">
-  <!ENTITY pulseaudio-buildsize     "49 MB (add 1 MB for tests)">
-  <!ENTITY pulseaudio-time          "0.2 SBU (Using parallelism=4; add 0.2 SBU for tests)">
+  <!ENTITY pulseaudio-md5sum        "84a7776e63dd55c40db8fbd7c7e2e18e">
+  <!ENTITY pulseaudio-size          "1.9 MB">
+  <!ENTITY pulseaudio-buildsize     "76 MB (add 2 MB for tests)">
+  <!ENTITY pulseaudio-time          "0.1 SBU (Using parallelism=4; add 0.2 SBU for tests)">
 ]>
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -97,6 +98,6 @@
       <xref linkend="avahi"/>,
       <xref linkend="bluez"/>,
-      <xref linkend="doxygen"/> (for documentation),
       <xref linkend="fftw"/>,
+      <xref linkend="GConf"/>,
       <xref linkend="gtk3"/>,
       <xref linkend="libsamplerate"/>,
@@ -108,8 +109,8 @@
       <ulink url="http://gstreamer.freedesktop.org/src/orc/">ORC</ulink>,
       <ulink url="https://sourceforge.net/projects/soxr/">soxr</ulink>,
-      <ulink url="http://tdb.samba.org/">TDB</ulink>, and
+      <ulink url="http://tdb.samba.org/">TDB</ulink>,
       <ulink url="http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/">
-      WebRTC AudioProcessing</ulink>
-      <!--<ulink url="http://www.xenproject.org/">XEN</ulink>-->
+      WebRTC AudioProcessing</ulink> and
+      <ulink url="http://www.xenproject.org/">XEN</ulink>
     </para>
 
@@ -121,12 +122,5 @@
   <sect2 role="installation">
     <title>Installation of PulseAudio</title>
-<!--
-    <para>
-      If <xref linkend="doxygen"/> is not installed, workaround a building
-      issue because of the changes in meson-0.57.2:
-    </para>
-
-<screen><userinput>sed '/doxygen/d' -i meson.build</userinput></screen>
--->
+
     <para>
       Install <application>PulseAudio</application> by running the following
@@ -153,9 +147,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr       \
-      --buildtype=release \
-      -Ddatabase=gdbm     \
-      -Ddoxygen=false     \
-      -Dbluez5=disabled   &amp;&amp;
+meson  --prefix=/usr -Ddatabase=gdbm -Dbluez5=false &amp;&amp;
 ninja</userinput></screen>
 
@@ -172,8 +162,7 @@
 
     <!-- http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/ -->
-    <para>Running PulseAudio as a system-wide daemon is possible but not 
-      recommended. See <ulink 
-      url="https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"/>
-      for more information.
+    <para>Running PulseAudio as System-Wide Daemon is possible but not recommended.
+      See <ulink 
+      url="https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"/>.
       While still as the <systemitem class="username">root</systemitem>
       user, remove the <application>D-Bus</application> configuration file
@@ -187,7 +176,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -196,10 +182,4 @@
       are both installed but <xref linkend="bluez"/> is not installed.
       Remove this if you have installed all three packages.
-    </para>
-
-    <para>
-      <parameter>-Ddoxygen=false</parameter>: This allows the package to
-      compile if <xref linkend="doxygen"/> is not installed. Remove this
-      if you have installed this and wish to build the documentation.
     </para>
 <!--
@@ -288,5 +268,5 @@
         ~/.config/pulse/*</command> (and perhaps also
         <command>rm -rf ~/.pulse/*</command> if you have used a very old version
-        of pulse on this machine), then run <command>pulseaudio
+        of pulse on this machine, then run <command>pulseaudio
         --verbose</command> to restart it. If the daemon starts, restart the
         application. See <command>man pulseaudio</command> for more options.
@@ -306,8 +286,8 @@
       <seglistitem>
         <seg>
-          <!--esdcompat,--> pacat, pacmd, pactl, padsp, 
-          pamon (symlink to pacat), paplay (symlink to pacat), 
-          parec (symlink to pacat), parecord (symlink to pacat), qpaeq, 
-          pasuspender, pax11publish, pulseaudio, and
+          esdcompat, pacat, pacmd, pactl, padsp, pamon (symlink to pacat),
+          paplay (symlink to pacat), parec (symlink to pacat),
+          parecord (symlink to pacat), qpaeq, pasuspender,
+          pax11publish, pulseaudio, and
           <!-- it looks like the equalizer needs FFTW: qpaeq, -->
           start-pulseaudio-x11
@@ -337,5 +317,4 @@
       <?dbhtml list-presentation="table"?>
 
-<!--
       <varlistentry id="esdcompat">
         <term><command>esdcompat</command></term>
@@ -349,5 +328,4 @@
         </listitem>
       </varlistentry>
--->
 
       <varlistentry id="pacat">
@@ -356,5 +334,5 @@
           <para>
             plays back or records raw or encoded audio streams on a
-            <application>PulseAudio</application> sound server
+            <application>PulseAudio</application> sound server.
           </para>
           <indexterm zone="pulseaudio pacat">
@@ -369,5 +347,5 @@
           <para>
             is a tool used to reconfigure a <application>PulseAudio</application>
-            sound server during runtime
+            sound server during runtime.
           </para>
           <indexterm zone="pulseaudio pacmd">
@@ -382,5 +360,5 @@
           <para>
             is used to control a running <application>PulseAudio</application>
-            sound server
+            sound server.
           </para>
           <indexterm zone="pulseaudio pactl">
@@ -394,5 +372,5 @@
         <listitem>
           <para>
-            is the <application>PulseAudio</application> OSS Wrapper
+            is the <application>PulseAudio</application> OSS Wrapper.
           </para>
           <indexterm zone="pulseaudio padsp">
@@ -406,5 +384,5 @@
         <listitem>
           <para>
-            is a symbolic link to <command>pacat</command>
+            is a symbolic link to <command>pacat</command>.
            </para>
           <indexterm zone="pulseaudio pamon">
@@ -419,5 +397,5 @@
           <para>
             is used to play audio files on a
-            <application>PulseAudio</application> sound server
+            <application>PulseAudio</application> sound server.
           </para>
           <indexterm zone="pulseaudio paplay">
@@ -431,5 +409,5 @@
         <listitem>
           <para>
-            is a symbolic link to <command>pacat</command>
+            is a symbolic link to <command>pacat</command>.
           </para>
           <indexterm zone="pulseaudio parec">
@@ -443,5 +421,5 @@
         <listitem>
           <para>
-            is a symbolic link to <command>pacat</command>
+            is a symbolic link to <command>pacat</command>.
           </para>
           <indexterm zone="pulseaudio parecord">
@@ -458,5 +436,5 @@
             <application>PulseAudio</application> sound server to temporarily
             suspend access to the audio devices, to allow other applications
-            to access them directly
+            to access them directly.
           </para>
           <indexterm zone="pulseaudio pasuspender">
@@ -471,5 +449,5 @@
           <para>
             is the <application>PulseAudio</application>
-            X11 Credential Utility
+            X11 Credential Utility.
           </para>
           <indexterm zone="pulseaudio pax11publish">
@@ -479,22 +457,9 @@
       </varlistentry>
 
-      <varlistentry id="pa-info">
-        <term><command>pa-info</command></term>
-        <listitem>
-          <para>
-            is a shell script that prints various information relating to the
-            <application>Pulseaudio</application> server currently in use
-          </para>
-          <indexterm zone="pulseaudio pa-info">
-            <primary sortas="b-pa-info">pa-info</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="pulseaudio-prog">
         <term><command>pulseaudio</command></term>
         <listitem>
           <para>
-            is a networked low-latency sound server for Linux
+            is a networked low-latency sound server for Linux.
           </para>
           <indexterm zone="pulseaudio pulseaudio-prog">
@@ -511,5 +476,5 @@
             is an equalizer interface for
             <application>PulseAudio</application> equalizer sinks 
-            (Requires <xref linkend="fftw"/> at build time)
+            (Requires <xref linkend="fftw"/> at build time).
           </para>
           <indexterm zone="pulseaudio qpaeq">
@@ -538,5 +503,5 @@
           <para>
             starts <application>PulseAudio</application> and registers it to
-            the X11 session manager
+            the X11 session manager.
           </para>
           <indexterm zone="pulseaudio start-pulseaudio-x11">
Index: multimedia/libdriv/sbc.xml
===================================================================
--- multimedia/libdriv/sbc.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/sbc.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -148,5 +149,5 @@
         <listitem>
           <para>
-            is a SBC decoder utility
+            is a SBC decoder utility.
           </para>
           <indexterm zone="sbc sbcdec">
@@ -160,5 +161,5 @@
         <listitem>
           <para>
-            is a SBC encoder utility
+            is a SBC encoder utility.
           </para>
           <indexterm zone="sbc sbcenc">
@@ -172,5 +173,5 @@
         <listitem>
           <para>
-            is a subband codec (SBC) analyzer
+            is a subband codec (SBC) analyzer.
           </para>
           <indexterm zone="sbc sbcinfo">
@@ -184,5 +185,5 @@
         <listitem>
           <para>
-            contains the <application>SBC</application> API functions
+            contains the <application>SBC</application> API functions.
           </para>
           <indexterm zone="sbc libsbc">
Index: multimedia/libdriv/sdl.xml
===================================================================
--- multimedia/libdriv/sdl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/sdl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY sdl-download-http "https://www.libsdl.org/release/SDL-&sdl-version;.tar.gz">
+  <!ENTITY sdl-download-http "http://www.libsdl.org/release/SDL-&sdl-version;.tar.gz">
   <!ENTITY sdl-download-ftp  " ">
   <!ENTITY sdl-md5sum        "9d96df8417572a2afb781a7c4c811a85">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -218,5 +219,5 @@
             determines the compile and linker flags that should be used to
             compile and link programs that use
-            <filename class="libraryfile">libSDL</filename>
+            <filename class='libraryfile'>libSDL</filename>.
           </para>
           <indexterm zone="sdl sdl-config">
@@ -227,10 +228,10 @@
 
       <varlistentry id="libsdl">
-        <term><filename class="libraryfile">libSDL.so</filename></term>
+        <term><filename class='libraryfile'>libSDL.so</filename></term>
         <listitem>
           <para>
             contains functions that provide low level access to audio,
             keyboard, mouse, joystick, 3D hardware via OpenGL, and
-            2D frame buffer across multiple platforms
+            2D frame buffer across multiple platforms.
           </para>
           <indexterm zone="sdl libsdl">
Index: multimedia/libdriv/sdl2.xml
===================================================================
--- multimedia/libdriv/sdl2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/sdl2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY sdl2-download-http "https://www.libsdl.org/release/SDL2-&sdl2-version;.tar.gz">
+  <!ENTITY sdl2-download-http "http://www.libsdl.org/release/SDL2-&sdl2-version;.tar.gz">
   <!ENTITY sdl2-download-ftp  " ">
-  <!ENTITY sdl2-md5sum        "98b8a1535a757ea1d03ae44e2fb20247">
-  <!ENTITY sdl2-size          "6.9 MB">
-  <!ENTITY sdl2-buildsize     "132 MB (with docs)">
+  <!ENTITY sdl2-md5sum        "76ed4e6da9c07bd168b2acd9bfefab1b">
+  <!ENTITY sdl2-size          "5.8 MB">
+  <!ENTITY sdl2-buildsize     "178 MB (with docs)">
   <!ENTITY sdl2-time          "0.4 SBU (using parallelism=4; with docs)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -255,5 +256,5 @@
             determines the compile and linker flags that should be used to
             compile and link programs that use
-            <filename class="libraryfile">libSDL2</filename>
+            <filename class='libraryfile'>libSDL2</filename>.
           </para>
           <indexterm zone="sdl2 sdl2-config">
@@ -264,10 +265,10 @@
 
       <varlistentry id="libsdl2">
-        <term><filename class="libraryfile">libSDL2.so</filename></term>
+        <term><filename class='libraryfile'>libSDL2.so</filename></term>
         <listitem>
           <para>
             contains functions that provide low level access to audio,
             keyboard, mouse, joystick, 3D hardware via OpenGL, and
-            2D frame buffer across multiple platforms
+            2D frame buffer across multiple platforms.
           </para>
           <indexterm zone="sdl2 libsdl2">
Index: multimedia/libdriv/sound-theme-freedesktop.xml
===================================================================
--- multimedia/libdriv/sound-theme-freedesktop.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/sound-theme-freedesktop.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: multimedia/libdriv/soundtouch.xml
===================================================================
--- multimedia/libdriv/soundtouch.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/soundtouch.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY soundtouch-download-http "https://gitlab.com/soundtouch/soundtouch/-/archive/&soundtouch-version;/soundtouch-&soundtouch-version;.tar.bz2">
   <!ENTITY soundtouch-download-ftp  " ">
-  <!ENTITY soundtouch-md5sum        "628ef4723f09bba19fb87d7c0af8c8b6">
-  <!ENTITY soundtouch-size          "520 KB">
-  <!ENTITY soundtouch-buildsize     "6.8 MB">
+  <!ENTITY soundtouch-md5sum        "32c6c4461d31a5b42772a035b356dc1f">
+  <!ENTITY soundtouch-size          "516 KB">
+  <!ENTITY soundtouch-buildsize     "6.0 MB">
   <!ENTITY soundtouch-time          "0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -153,5 +154,5 @@
             is a program for processing WAV audio files by modifying
             sound tempo, pitch and playback rate properties independently
-            from each other
+            from each other.
           </para>
           <indexterm zone="soundtouch soundstretch">
@@ -165,5 +166,5 @@
         <listitem>
           <para>
-            contains <application>SoundTouch</application> API functions
+            contains <application>SoundTouch</application> API functions.
           </para>
           <indexterm zone="soundtouch libSoundTouch">
Index: multimedia/libdriv/speex.xml
===================================================================
--- multimedia/libdriv/speex.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/speex.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -25,4 +25,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -44,5 +45,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -230,5 +231,5 @@
           <para>
             decodes a <application>Speex</application> file and
-            produces a WAV or raw file
+            produces a WAV or raw file.
           </para>
           <indexterm zone="speex speexdec">
@@ -242,5 +243,5 @@
         <listitem>
           <para>
-            encodes a WAV or raw files using <application>Speex</application>
+            encodes a WAV or raw files using <application>Speex</application>.
           </para>
           <indexterm zone="speex speexenc">
@@ -251,8 +252,8 @@
 
       <varlistentry id="libspeex">
-        <term><filename class="libraryfile">libspeex.so</filename></term>
-        <listitem>
-          <para>
-            provides functions for the audio encoding/decoding programs
+        <term><filename class='libraryfile'>libspeex.so</filename></term>
+        <listitem>
+          <para>
+            provides functions for the audio encoding/decoding programs.
           </para>
           <indexterm zone="speex libspeex">
@@ -263,9 +264,9 @@
 
       <varlistentry id="libspeexdsp">
-        <term><filename class="libraryfile">libspeexdsp.so</filename></term>
+        <term><filename class='libraryfile'>libspeexdsp.so</filename></term>
         <listitem>
           <para>
             is a speech processing library that goes along with the
-            <application>Speex</application> codec
+            <application>Speex</application> codec.
           </para>
           <indexterm zone="speex libspeexdsp">
Index: multimedia/libdriv/taglib.xml
===================================================================
--- multimedia/libdriv/taglib.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/taglib.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY taglib-download-http "https://taglib.github.io/releases/taglib-&taglib-version;.tar.gz">
   <!ENTITY taglib-download-ftp  " ">
-  <!ENTITY taglib-md5sum        "4313ed2671234e029b7af8f97c84e9af">
-  <!ENTITY taglib-size          "1.3 MB">
-  <!ENTITY taglib-buildsize     "13 MB">
-  <!ENTITY taglib-time          "0.3 SBU">
+  <!ENTITY taglib-md5sum        "cee7be0ccfc892fa433d6c837df9522a">
+  <!ENTITY taglib-size          "1.2 MB">
+  <!ENTITY taglib-buildsize     "9.4 MB">
+  <!ENTITY taglib-time          "0.4 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -77,4 +78,9 @@
     <para role="required">
       <xref linkend="cmake"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="boost"/>
     </para>
 
@@ -143,5 +149,5 @@
         <listitem>
           <para>
-            is a tool used to print information about the taglib installation
+            is a tool used to print information about the taglib installation.
           </para>
           <indexterm zone="taglib taglib-config">
Index: multimedia/libdriv/v4l-utils.xml
===================================================================
--- multimedia/libdriv/v4l-utils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/v4l-utils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -70,5 +71,5 @@
       </listitem>
     </itemizedlist>
-
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist>
@@ -76,9 +77,9 @@
         <para>
           Required patch:
-          <ulink url="&patch-root;/v4l-utils-&v4l-utils-version;-upstream_fixes-1.patch"/>
+          <ulink url="&patch-root;/v4l-utils-&v4l-utils-version;-fix_sysmacros-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
-
+-->
     <bridgehead renderas="sect3">v4l-utils Dependencies</bridgehead>
 
@@ -111,11 +112,4 @@
 
     <para>
-      First, apply a patch to fix building with GCC-11.1 if 
-      <xref role="nodep" linkend="qt5"/> is installed:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../v4l-utils-&v4l-utils-version;-upstream_fixes-1.patch</userinput></screen>
-
-    <para>
       Install <application>v4l-utils</application> by running
       the following commands:
@@ -135,5 +129,5 @@
     </para>
 
-<screen role="root"><userinput>make -j1 install</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
@@ -164,5 +158,4 @@
           media-ctl,
           qv4l2,
-          qvidcap,
           rds-ctl,
           v4l2-compliance,
@@ -198,5 +191,5 @@
         <listitem>
           <para>
-            is a tool to handle cx18 based devices
+            is a tool to handle cx18 based devices.
           </para>
           <indexterm zone="v4l-utils cx18-ctl">
@@ -210,5 +203,5 @@
         <listitem>
           <para>
-            decodes multiplexed formats from TM5600/TM6000 USB devices
+            decodes multiplexed formats from TM5600/TM6000 USB devices.
           </para>
           <indexterm zone="v4l-utils decode_tm6000">
@@ -222,5 +215,5 @@
         <listitem>
           <para>
-            is a command line tool for digital TV services
+            is a command line tool for digital TV services.
           </para>
           <indexterm zone="v4l-utils dvb-fe-tool">
@@ -235,5 +228,5 @@
           <para>
             is a tool meant to convert among different file formats.  It is
-            compliant with version 5 of the DVB API
+            compliant with version 5 of the DVB API.
           </para>
           <indexterm zone="v4l-utils dvb-format-convert">
@@ -248,5 +241,5 @@
           <para>
             is a command line frequency scanning tool for digital TV
-            services that are compliant with version 5 of the DVB API
+            services that are compliant with version 5 of the DVB API.
           </para>
           <indexterm zone="v4l-utils dvbv5-scan">
@@ -261,5 +254,5 @@
           <para>
             is a command line tuning tool for digital TV services
-            that is compliant with version 5 of the DVB API
+            that is compliant with version 5 of the DVB API.
           </para>
           <indexterm zone="v4l-utils dvbv5-zap">
@@ -275,5 +268,5 @@
             is a tool that lists the Remote Controller devices, allows one
             to get/set IR keycode/scancode tables, test events generated by
-            IR, and to adjust other Remote Controller options
+            IR, and to adjust other Remote Controller options.
           </para>
           <indexterm zone="v4l-utils ir-keytable">
@@ -289,5 +282,5 @@
             is a utility that can control many card settings, like changing
             the inputs from tuner to svideo or composite, setting video
-            resolution or changing video mode (PAL, SECAM, NTSC)
+            resolution or changing video mode (PAL, SECAM, NTSC).
           </para>
           <indexterm zone="v4l-utils ivtv-ctl">
@@ -301,5 +294,5 @@
         <listitem>
           <para>
-            is a utility used to configure V4L2 devices
+            is a utility used to configure V4L2 devices.
           </para>
           <indexterm zone="v4l-utils media-ctl">
@@ -313,5 +306,5 @@
         <listitem>
           <para>
-            is used to test video4linux capture devices
+            is used to test video4linux capture devices.
           </para>
           <indexterm zone="v4l-utils qv4l2">
@@ -321,16 +314,4 @@
       </varlistentry>
 
-      <varlistentry id="qvidcap">
-        <term><command>qvidcap</command></term>
-        <listitem>
-          <para>
-            is used to capture video from a V4L2 device
-          </para>
-          <indexterm zone="v4l-utils qvidcap">
-            <primary sortas="b-qvidcap">qvidcap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="rds-ctl">
         <term><command>rds-ctl</command></term>
@@ -338,5 +319,5 @@
           <para>
             is a utility for decoding raw RDS data from V4L2 Radio devices
-            and offers simple ways to access the received RDS information
+            and offers simple ways to access the received RDS information.
           </para>
           <indexterm zone="v4l-utils rds-ctl">
@@ -350,5 +331,5 @@
         <listitem>
           <para>
-            is a compliance test tool
+            is a compliance test tool.
           </para>
           <indexterm zone="v4l-utils v4l2-compliance">
@@ -362,5 +343,5 @@
         <listitem>
           <para>
-            is a tool to control v4l2 controls from the cmdline
+            is a tool to control v4l2 controls from the cmdline.
           </para>
           <indexterm zone="v4l-utils v4l2-ctl">
@@ -374,5 +355,5 @@
         <listitem>
           <para>
-            is a tool to directly get and set registers of v4l2 devices
+            is a tool to directly get and set registers of v4l2 devices.
           </para>
           <indexterm zone="v4l-utils v4l2-dbg">
@@ -387,5 +368,5 @@
           <para>
             checks the media devices installed on a machine and the
-            corresponding device nodes
+            corresponding device nodes.
           </para>
           <indexterm zone="v4l-utils v4l2-sysfs-path">
Index: multimedia/libdriv/x264.xml
===================================================================
--- multimedia/libdriv/x264.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/x264.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY x264-download-http "&sources-anduin-http;/x264/x264-&x264-version;.tar.xz">
   <!ENTITY x264-download-ftp  " ">
-  <!ENTITY x264-md5sum        "e6dcb0f124af8d6841f307bdbba18aa3">
-  <!ENTITY x264-size          "668 KB">
+  <!ENTITY x264-md5sum        "2cfe147227bde2d89fc79891b29f4091">
+  <!ENTITY x264-size          "664 KB">
   <!ENTITY x264-buildsize     "14 MB">
-  <!ENTITY x264-time          "0.3 SBU (Using parallelism=4)">
+  <!ENTITY x264-time          "0.2 SBU (Using parallelism=4)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -162,5 +163,5 @@
           <para>
             provides the functions used to encode video streams into the
-            H.264/MPEG-4 AVC format
+            H.264/MPEG-4 AVC format.
           </para>
           <indexterm zone="x264 libx264">
Index: multimedia/libdriv/x265.xml
===================================================================
--- multimedia/libdriv/x265.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/x265.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -160,5 +161,5 @@
           <para>
             provides the functions used to encode video streams into the
-            H.265/HEVC format
+            H.265/HEVC format.
           </para>
           <indexterm zone="x265 libx265">
Index: multimedia/libdriv/xine-lib.xml
===================================================================
--- multimedia/libdriv/xine-lib.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/xine-lib.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -101,5 +102,4 @@
       <xref linkend="libmad"/>,
       <xref linkend="libmng"/>,
-      <xref linkend="libnsl"/>,
       <xref linkend="libtheora"/>,
       <xref linkend="libva"/> (requires <xref role="nodep" linkend="glu"/>),
@@ -118,5 +118,5 @@
       <ulink url="http://www.videolan.org/developers/libdca.html">libdca</ulink>,
       <ulink url="http://fame.sourceforge.net">libFAME</ulink>,
-      <ulink url="https://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink>,
+      <ulink url="http://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink>,
       <ulink url="http://www.musepack.net/">musepack</ulink>,
       <ulink url="&gnu-http;/vcdimager/">VCDImager</ulink>, and
@@ -246,5 +246,5 @@
           <para>
             provides information to programs trying to link with the
-            <application>xine</application> libraries
+            <application>xine</application> libraries.
           </para>
           <indexterm zone="xine-lib xine-config">
@@ -259,5 +259,5 @@
           <para>
             is used to get supported filetype information from
-            <application>xine-lib</application>
+            <application>xine-lib</application>.
           </para>
           <indexterm zone="xine-lib xine-list-1.2">
@@ -268,8 +268,8 @@
 
       <varlistentry id="libxine">
-        <term><filename class="libraryfile">libxine.so</filename></term>
+        <term><filename class='libraryfile'>libxine.so</filename></term>
         <listitem>
           <para>
-            provides the API for processing audio/video files
+            provides the API for processing audio/video files.
           </para>
           <indexterm zone="xine-lib libxine">
@@ -280,4 +280,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: multimedia/libdriv/xvid.xml
===================================================================
--- multimedia/libdriv/xvid.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/libdriv/xvid.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY xvid-download-http "https://downloads.xvid.com/downloads/xvidcore-&xvid-version;.tar.gz">
+  <!ENTITY xvid-download-http "http://downloads.xvid.com/downloads/xvidcore-&xvid-version;.tar.gz">
   <!ENTITY xvid-download-ftp  " ">
   <!ENTITY xvid-md5sum        "5c6c19324608ac491485dbb27d4da517">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -33,5 +34,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -73,5 +74,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="yasm"/> or <xref linkend="nasm"/>
+      <xref linkend="yasm"/>
     </para>
 
@@ -158,9 +159,9 @@
 
     <varlistentry id="libxvidcore">
-      <term><filename class="libraryfile">libxvidcore.so</filename></term>
+      <term><filename class='libraryfile'>libxvidcore.so</filename></term>
       <listitem>
         <para>
           provides functions to encode and decode most
-          MPEG-4 video data
+          MPEG-4 video data.
         </para>
         <indexterm zone="xvid libxvidcore">
Index: multimedia/multimedia.xml
===================================================================
--- multimedia/multimedia.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/multimedia.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <part id="multimedia" xreflabel="Multimedia">
Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/videoutils/ffmpeg.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY ffmpeg-download-http "https://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.xz">
+  <!ENTITY ffmpeg-download-http "http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.xz">
   <!ENTITY ffmpeg-download-ftp  " ">
-  <!ENTITY ffmpeg-md5sum        "7b9d5b652d20e8c5405304ad72636d4a">
-  <!ENTITY ffmpeg-size          "9.2 MB">
-  <!ENTITY ffmpeg-buildsize     "176 MB (add 2.4 GB for the FATE suite/tests, add 1.4 GB for documentation)">
-  <!ENTITY ffmpeg-time          "1.3 SBU (using parallelism=4; add 3.6 SBU (with THREADS=4) to run the FATE suite after sample files are downloaded; add 0.7 SBU for doxygen docs)">
+  <!ENTITY ffmpeg-md5sum        "5d1956bb552e91dc3b8287db346d0d58">
+  <!ENTITY ffmpeg-size          "8.9 MB">
+  <!ENTITY ffmpeg-buildsize     "170 MB (add 3.7 GB for the FATE suite/tests, add 1.3 GB for doxygen docs)">
+  <!ENTITY ffmpeg-time          "1.3 SBU (using parallelism=4; add 3.8 SBU (with THREADS=4) to run the FATE suite after sample files are downloaded; add 1.1 SBU for doxygen docs)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -41,5 +42,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -91,5 +92,5 @@
       <xref linkend="x264"/>,
       <xref linkend="x265"/>, and
-      <xref linkend="nasm"/> or <xref linkend="yasm"/>
+      <xref linkend="yasm"/>
     </para>
 
@@ -104,7 +105,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="doxygen"/>,
       <xref linkend="fontconfig"/>,
-      <xref linkend="fribidi"/>,
       <xref linkend="frei0r"/>,
       <xref linkend="libcdio"/> (to identify and play CDs),
@@ -115,5 +114,4 @@
       <xref linkend="gnutls"/>,
       <xref linkend="pulseaudio"/>,
-      <xref linkend="samba"/>,
       <xref linkend="speex"/>,
       <xref linkend="texlive"/>
@@ -130,20 +128,20 @@
       <ulink url="http://caca.zoy.org/">libcaca</ulink>,
       <ulink url="https://gitlab.xiph.org/xiph/celt">libcelt</ulink>,
-      <ulink url="https://sourceforge.net/projects/libdc1394">libdc1394</ulink>,
+      <ulink url="http://sourceforge.net/projects/libdc1394">libdc1394</ulink>,
       <ulink url="https://www.videolan.org/developers/libdca.html">libdca</ulink>,
       <ulink url="https://ieee1394.wiki.kernel.org/index.php/Libraries">libiec61883</ulink>,
       <ulink url="https://github.com/dekkers/libilbc">libilbc</ulink>,
-      <ulink url="https://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink>,
+      <ulink url="http://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink>,
       <ulink url="https://github.com/Distrotech/libnut">libnut</ulink> (Git checkout),
       <ulink url="http://rtmpdump.mplayerhq.hu/">librtmp</ulink>,
       <ulink url="http://www.libssh.org/">libssh</ulink>,
       <!--<ulink url="http://xavs.sourceforge.net/">libxavs</ulink> (SVN checkout),-->
-      <ulink url="https://openal.org/">OpenAL</ulink>,
-      <ulink url="https://sourceforge.net/projects/opencore-amr">OpenCore AMR</ulink>,
+      <ulink url="http://kcat.strangesoft.net/openal-releases/">OpenAL</ulink>,
+      <ulink url="http://sourceforge.net/projects/opencore-amr">OpenCore AMR</ulink>,
       <!--<ulink url="http://diracvideo.org/">Schroedinger</ulink>,-->
-      <ulink url="https://sourceforge.net/projects/schrodinger/">Schroedinger</ulink>,
+      <ulink url="http://sourceforge.net/projects/schrodinger/">Schroedinger</ulink>,
       <ulink url="http://www.twolame.org/">TwoLAME</ulink>,
-      <ulink url="https://sourceforge.net/projects/opencore-amr/files/vo-aacenc/">vo-aaenc</ulink>,
-      <ulink url="https://sourceforge.net/projects/opencore-amr/files/vo-amrwbenc/">vo-amrwbenc</ulink>, and
+      <ulink url="http://sourceforge.net/projects/opencore-amr/files/vo-aacenc/">vo-aaenc</ulink>,
+      <ulink url="http://sourceforge.net/projects/opencore-amr/files/vo-amrwbenc/">vo-amrwbenc</ulink>, and
       <!--<ulink url="http://www.videolan.org/developers/x265.html">x265 (H.265/MPEG-H HEVC)</ulink>, and-->
       <ulink url="http://zapping.sourceforge.net/ZVBI/">ZVBI</ulink>
@@ -183,5 +181,4 @@
             --enable-libx264     \
             --enable-libx265     \
-            --enable-openssl     \
             --docdir=/usr/share/doc/ffmpeg-&ffmpeg-version; &amp;&amp;
 
@@ -310,5 +307,5 @@
 
     <para>
-      <command>find ... ;</command>: Fixes permissions of documentation files
+      <command>find ... ;</command>: Fix permissions of documentation files
       and directories.
     </para>
@@ -400,13 +397,6 @@
 
     <para>
-      <parameter>--enable-openssl</parameter>:
+      <option>--enable-openssl</option> or <option>--enable-gnutls</option>:
       Enables HTTPS protocol for network streams.
-    </para>
-
-    <para>
-      <option>--enable-gnutls</option>: Use this option instead of
-      <parameter>--enable-openssl</parameter>, if you want to use
-      <application>GnuTLS</application> instead of
-      <application>OpenSSL</application> for HTTPS protocol.
     </para>
 
@@ -443,5 +433,4 @@
   </sect2>
 
-<!-- ffserver has been removed
   <sect2 role="configuration">
     <title>Configuring FFmpeg</title>
@@ -451,6 +440,6 @@
 
       <para>
-         <filename>/etc/ffserver.conf</filename>
-         <filename>~/.ffmpeg/ffserver-config</filename>
+        <filename>/etc/ffserver.conf</filename> and
+        <filename>~/.ffmpeg/ffserver-config</filename>
       </para>
 
@@ -472,5 +461,4 @@
 
   </sect2>
-  -->
 
   <sect2 role="content">
@@ -484,13 +472,13 @@
       <seglistitem>
         <seg>
-          ffmpeg, ffplay, ffprobe, <!--ffserver,--> and qt-faststart
+          ffmpeg, ffplay, ffprobe, ffserver, and qt-faststart
         </seg>
         <seg>
           libavcodec.so, libavdevice.so, libavfilter.so,
-          libavformat.so, libavutil.so, libavresample.so, libpostproc.so,
+          libavformat.so, libavutil.so, libpostproc.so,
           libswresample.so, and libswscale.so
         </seg>
         <seg>
-          /usr/include/libav{codec,device,filter,format,resample,util},
+          /usr/include/libav{codec,device,filter,format,util},
           /usr/include/libpostproc,
           /usr/include/libsw{resample,scale},
@@ -511,5 +499,5 @@
           <para>
             is a command-line tool to convert video files, network streams and
-            input from a TV card to several video formats
+            input from a TV card to several video formats.
           </para>
           <indexterm zone="ffmpeg ffmpeg-prog">
@@ -524,5 +512,5 @@
           <para>
             is a very simple and portable media player using the
-            <filename>ffmpeg</filename> libraries and the SDL library
+            <filename>ffmpeg</filename> libraries and the SDL library.
           </para>
           <indexterm zone="ffmpeg ffplay">
@@ -537,5 +525,5 @@
           <para>
             gathers information from multimedia streams and prints it in a human
-            and machine-readable fashion
+            and machine-readable fashion.
           </para>
           <indexterm zone="ffmpeg ffprobe">
@@ -545,5 +533,4 @@
       </varlistentry>
 
-<!-- Not found in 4.3.2
       <varlistentry id="ffserver">
         <term><command>ffserver</command></term>
@@ -551,5 +538,5 @@
           <para>
             is a streaming server for everything that <command>ffmpeg</command>
-            could use as input (files, streams, TV card input, webcam, etc)
+            could use as input (files, streams, TV card input, webcam, etc).
           </para>
           <indexterm zone="ffmpeg ffserver">
@@ -558,10 +545,10 @@
         </listitem>
       </varlistentry>
--->
+
       <varlistentry id="qt-faststart">
         <term><command>qt-faststart</command></term>
         <listitem>
           <para>
-            moves the index file to the front of quicktime (mov/mp4) videos
+            moves the index file to the front of quicktime (mov/mp4) videos.
           </para>
           <indexterm zone="ffmpeg qt-faststart">
@@ -576,5 +563,5 @@
           <para>
             is a library containing the <application>FFmpeg</application> codecs
-            (both encoding and decoding)
+            (both encoding and decoding).
           </para>
           <indexterm zone="ffmpeg libavcodec">
@@ -588,5 +575,5 @@
         <listitem>
           <para>
-            is the <application>FFmpeg</application> device handling library
+            is the <application>FFmpeg</application> device handling library.
           </para>
           <indexterm zone="ffmpeg libavdevice">
@@ -601,5 +588,5 @@
           <para>
             is a library of filters that can alter video or audio between the
-            decoder and the encoder (or output)
+            decoder and the encoder (or output).
           </para>
           <indexterm zone="ffmpeg libavfilter">
@@ -615,5 +602,5 @@
             is a library containing the file formats handling (mux and demux
             code for several formats) used by <command>ffplay</command> as well
-            as allowing the generation of  audio or video streams
+            as allowing the generation of  audio or video streams.
           </para>
           <indexterm zone="ffmpeg libavformat">
@@ -623,21 +610,9 @@
       </varlistentry>
 
-      <varlistentry id="libavresample">
-        <term><filename class="libraryfile">libavresample.so</filename></term>
-        <listitem>
-          <para>
-            is a library containing functions for resampling audio and video.
-          </para>
-          <indexterm zone="ffmpeg libavresample">
-            <primary sortas="c-libavresample">libavresample</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libavutil">
         <term><filename class="libraryfile">libavutil.so</filename></term>
         <listitem>
           <para>
-            is the <application>FFmpeg</application> utility library
+            is the <application>FFmpeg</application> utility library.
           </para>
           <indexterm zone="ffmpeg libavutil">
@@ -651,5 +626,5 @@
         <listitem>
           <para>
-            is the <application>FFmpeg</application> post processing library
+            is the <application>FFmpeg</application> post processing library.
           </para>
           <indexterm zone="ffmpeg libpostproc">
@@ -664,5 +639,5 @@
           <para>
             is the <application>FFmpeg</application> audio rescaling library,
-            it contains functions for converting audio sample formats
+            it contains functions for converting audio sample formats.
           </para>
           <indexterm zone="ffmpeg libswresample">
@@ -676,5 +651,5 @@
         <listitem>
           <para>
-            is the <application>FFmpeg</application> image rescaling library
+            is the <application>FFmpeg</application> image rescaling library.
           </para>
           <indexterm zone="ffmpeg libswscale">
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/videoutils/mplayer.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,18 +5,13 @@
   %general-entities;
 
-<!--
   <!ENTITY mplayer-download-http "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-&mplayer-version;.tar.xz">
   <!ENTITY mplayer-download-ftp  "ftp://ftp.mplayerhq.hu/MPlayer/releases/MPlayer-&mplayer-version;.tar.xz">
--->
-  <!ENTITY mplayer-download-http "&sources-anduin-http;/mplayer/mplayer-&mplayer-version;.tar.bz2">
-  <!ENTITY mplayer-download-ftp  " ">
-
-  <!ENTITY mplayer-md5sum        "887fa9fce21feecbe0f43388d49f4a93">
-  <!ENTITY mplayer-size          "5.7 MB">
+  <!ENTITY mplayer-md5sum        "58d39f72bf7f3ddaa9e019224bffcb74">
+  <!ENTITY mplayer-size          "14 MB">
   <!ENTITY mplayer-buildsize     "207 MB">
-  <!ENTITY mplayer-time          "0.4 SBU (Using parallelism=4)">
+  <!ENTITY mplayer-time          "1.4 SBU (Using parallelism=4)">
 
   <!ENTITY mplayer-skin          "Clearlooks-2.0">
-  <!ENTITY mplayer-skin-download-http "http://www.mplayerhq.hu/MPlayer/skins/&mplayer-skin;.tar.bz2">
+  <!ENTITY mplayer-skin-download-http "https://www.mplayerhq.hu/MPlayer/skins/&mplayer-skin;.tar.bz2">
   <!ENTITY mplayer-skin-download-ftp "ftp://ftp.mplayerhq.hu/MPlayer/skins/&mplayer-skin;.tar.bz2">
   <!ENTITY mplayer-skin-md5sum   "c82d4dbd7f0c36dfecd63dff972807c5">
@@ -28,4 +23,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -49,15 +45,5 @@
     </para>
 
-    <note>
-      <para>The latest <quote>stable</quote> version was released in April 
-      2019. That version no longer builds properly with the latest build tools
-      and system libraries. The version below is a snapshot that may not be 
-      available on the upstream server but was uploaded 
-      to our file server.  If you want to test a later version, check
-      <ulink url="http://www.mplayerhq.hu/MPlayer/releases/"/>.
-      </para>
-    </note>
-
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -151,6 +137,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="ffmpeg"/>,
-      <xref linkend="gtk2"/>, and
+      <xref linkend="gtk2"/> and
       <xref linkend="libvdpau-va-gl"/>
     </para>
@@ -178,5 +163,5 @@
       <ulink url="http://jackaudio.org/">JACK</ulink>,
       <ulink url="http://www.radscan.com/nas.html">NAS</ulink>, and
-      <ulink url="https://openal.org/">OpenAL</ulink>
+      <ulink url="http://kcat.strangesoft.net/openal-releases/">OpenAL</ulink>
     </para>
 
@@ -212,18 +197,18 @@
       <xref linkend="xvid"/>,
       <xref linkend="x264"/>,
-      <ulink url="https://packages.debian.org/source/sid/crystalhd">CrystalHD</ulink>,
+      <ulink url="https://www.broadcom.com/support/crystal-hd">CrystalHD</ulink>,
 <!--      <ulink url="http://diracvideo.org/download/dirac-research/">Dirac</ulink>,-->
-      <ulink url="https://sourceforge.net/projects/dirac/">Dirac</ulink>,
+      <ulink url="http://sourceforge.net/projects/dirac/">Dirac</ulink>,
       <ulink url="http://www.quut.com/gsm/">GSM</ulink>,
-      <ulink url="https://webrtc.github.io/webrtc-org/license/ilbc-freeware/">iLBC</ulink>,
+      <ulink url="http://www.ilbcfreeware.org/">iLBC</ulink>,
       <ulink url="http://www.videolan.org/developers/libdca.html">libdca</ulink>,
       <ulink url="http://wiki.multimedia.cx/index.php?title=NUT">libnut</ulink>,
       <ulink url="http://www.musepack.net/">libmpcdec</ulink>,
-      <ulink url="https://sourceforge.net/projects/opencore-amr/">OpenCore
+      <ulink url="http://sourceforge.net/projects/opencore-amr/">OpenCore
       Adaptive Multi Rate</ulink>,
 <!--      <ulink url="http://diracvideo.org/download/schroedinger/">Schroedinger</ulink>,-->
-      <ulink url="https://sourceforge.net/projects/schrodinger/">Schroedinger</ulink>,
+      <ulink url="http://sourceforge.net/projects/schrodinger/">Schroedinger</ulink>,
       <ulink url="http://wiki.xiph.org/Tremor">Tremor</ulink>, and
-      <ulink url="https://sourceforge.net/projects/twolame/">TwoLAME</ulink>
+      <ulink url="http://sourceforge.net/projects/twolame/">TwoLAME</ulink>
     </para>
 
@@ -243,5 +228,5 @@
       <!--LADSPA plugins and other sites of the maintainer are down.
       <ulink url="http://www.ladspa.org/">LADSPA</ulink>,-->
-      <ulink url="https://sourceforge.net/projects/bs2b/">libbs2b</ulink>, and
+      <ulink url="http://sourceforge.net/projects/bs2b/">libbs2b</ulink>, and
       <ulink url="http://www.lirc.org/">LIRC</ulink> (and
       <ulink url="http://www.dolda2000.com/~fredrik/lirccd/">LIRC Client Daemon</ulink>)
@@ -278,12 +263,9 @@
       </para>
 
-<screen><userinput>./configure --prefix=/usr                 \
-            --confdir=/etc/mplayer        \
-            --enable-dynamic-plugins      \
-            --disable-libmpeg2-internal   \
-            --disable-ffmpeg_a            \
-            --enable-menu                 \
-            --enable-runtime-cpudetection \
-            --enable-gui                  &amp;&amp;
+<screen><userinput>./configure --prefix=/usr            \
+            --confdir=/etc/mplayer   \
+            --enable-dynamic-plugins \
+            --enable-menu            \
+            --enable-gui             &amp;&amp;
 make</userinput></screen>
 
@@ -371,31 +353,21 @@
       on-screen display.
     </para>
-
-    <para>
-      <parameter>--enable-runtime-cpudetection</parameter>: This option makes
-      MPlayer run with a generic CPU type, preventing optimizations that may
-      cause runtime problems.
-    </para>
-
-    <para>
-      <option>--disable-ffmpeg_a</option>: You can use this option if you have
-      installed <xref linkend="ffmpeg"/>. <!--MPlayer includes a copy of the FFmpeg
+<!--Currently broken
+    <para>
+      <option>-\-disable-ffmpeg_a</option>: You can use this option if you have
+      installed <xref linkend="ffmpeg"/>. MPlayer includes a copy of the FFmpeg
       source and without this option it will statically compile the included
-      version of FFmpeg into itself.--> Dynamically linking to a system installed
-      FFmpeg makes MPlayer and Mencoder about 9MB smaller. <!--If MPlayer exhibits
+      version of FFmpeg into itself. Dynamically linking to a system installed
+      FFmpeg makes MPlayer and Mencoder about 9MB smaller. If MPlayer exhibits
       unstable behavior linked to a system installed FFmpeg, try recompiling MPlayer
       without this option (it is always more thoroughly tested with the included
-      FFmpeg).-->
-    </para>
-
-    <para>
-      <parameter>--disable-libmpeg2-internal</parameter>: This option makes
-      MPlayer run with a system version of libmpeg2.
-    </para>
+      FFmpeg).
+    </para>-->
 
     <para>
       <option>--language-doc="<replaceable>&lt;lang&gt;</replaceable>"</option>:
       This switch enables the language used for the documentation. Use
-      <command>./configure --help</command> for more information.
+      <command>./configure --help</command> to find out what additional
+      information.
     </para>
 
@@ -403,5 +375,6 @@
       <option>--language-man="<replaceable>&lt;lang&gt;</replaceable>"</option>:
       This switch enables the language used for the man pages. Use
-      <command>./configure --help</command> for more information.
+      <command>./configure --help</command> to find out what additional
+      information.
     </para>
 
@@ -409,5 +382,6 @@
       <option>--language-msg="<replaceable>&lt;lang&gt;</replaceable>"</option>:
       This switch enables the language used for the messages and the GUI. Use
-      <command>./configure --help</command> for more information
+      <command>./configure --help</command> to find out what additional
+      information.
     </para>
 
@@ -415,5 +389,5 @@
       <option>--language="<replaceable>&lt;lang&gt;</replaceable>"</option>:
       This switch defines the default language used. Use <command>./configure
-      --help</command> for more information.
+      --help</command> to find out what additional information.
     </para>
 
@@ -513,5 +487,5 @@
           <para>
             is a symlink to <command>mplayer</command> which brings up the
-            GTK+ 2 frontend of <application>MPlayer</application>
+            GTK+ 2 frontend of <application>MPlayer</application>.
           </para>
           <indexterm zone="mplayer gmplayer">
@@ -525,5 +499,5 @@
         <listitem>
           <para>
-            is the main MPlayer video player
+            is the main MPlayer video player.
           </para>
           <indexterm zone="mplayer mplayer-prog">
Index: multimedia/videoutils/transcode.xml
===================================================================
--- multimedia/videoutils/transcode.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/videoutils/transcode.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -53,5 +54,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -139,5 +140,5 @@
       <xref linkend="x264"/>,
       <xref linkend="xvid"/>
-      <ulink url="https://sourceforge.net/projects/mjpeg/">MJPEG Tools</ulink>, and
+      <ulink url="http://sourceforge.net/projects/mjpeg/">MJPEG Tools</ulink>, and
       <ulink url="http://www.netlib.org/pvm3/">PVM3</ulink>,
     </para>
@@ -255,5 +256,5 @@
         <listitem>
           <para>
-            fixes the header of an AVI file
+            fixes the header of an AVI file.
           </para>
           <indexterm zone="transcode avifix">
@@ -267,5 +268,5 @@
         <listitem>
           <para>
-            writes a text file describing the index of an AVI file
+            writes a text file describing the index of an AVI file.
           </para>
           <indexterm zone="transcode aviindex">
@@ -281,5 +282,5 @@
             merges AVI files of the same format. Do not try to merge AVI
             files of different formats, it will most likely result in errors
-            (and format means same bitrates, too!)
+            (and format means same bitrates, too!).
           </para>
           <indexterm zone="transcode avimerge">
@@ -293,5 +294,5 @@
         <listitem>
           <para>
-            splits AVI files into multiple files
+            splits AVI files into multiple files.
           </para>
           <indexterm zone="transcode avisplit">
@@ -306,5 +307,5 @@
           <para>
             can shift audio in AVI files for better synchronizing
-            of the audio and video data signal
+            of the audio and video data signal.
           </para>
           <indexterm zone="transcode avisync">
@@ -322,5 +323,5 @@
             for extracting VOB (Video OBject) files, either for
             a whole DVD or for selected Titles or Chapters, which
-            can then be played or recoded
+            can then be played or recoded.
           </para>
           <indexterm zone="transcode tccat">
@@ -335,5 +336,5 @@
           <para>
             is used to decode input files to raw video and PCM
-            audio streams
+            audio streams.
           </para>
           <indexterm zone="transcode tcdecode">
@@ -348,5 +349,5 @@
           <para>
             demultiplexes (separates) audio/video input that contains
-            multiple streams, e.g., VOB files
+            multiple streams, e.g., VOB files.
           </para>
           <indexterm zone="transcode tcdemux">
@@ -360,5 +361,5 @@
         <listitem>
           <para>
-            grabs single streams from a file containing multiple streams
+            grabs single streams from a file containing multiple streams.
           </para>
           <indexterm zone="transcode tcextract">
@@ -373,5 +374,5 @@
           <para>
             loads a supplied <application>Transcode</application> filter
-            module and prints its parameters
+            module and prints its parameters.
           </para>
           <indexterm zone="transcode tcmodinfo">
@@ -386,5 +387,5 @@
           <para>
             is a tool which can cut MP3 streams at milliseconds
-            positions
+            positions.
           </para>
           <indexterm zone="transcode tcmp3cut">
@@ -398,5 +399,5 @@
         <listitem>
           <para>
-            prints information about the input file format
+            prints information about the input file format.
           </para>
           <indexterm zone="transcode tcprobe">
@@ -410,5 +411,5 @@
         <listitem>
           <para>
-            performs several measurements on the given input data
+            performs several measurements on the given input data.
           </para>
           <indexterm zone="transcode tcscan">
@@ -422,5 +423,5 @@
         <listitem>
           <para>
-            checks information in a SMIL input file
+            checks information in a SMIL input file.
           </para>
           <indexterm zone="transcode tcxmlcheck">
@@ -437,5 +438,5 @@
             programs, being the glue between the modules. There are several
             well documented usage examples on both the homepage and the
-            documentation included in the package
+            documentation included in the package.
           </para>
           <indexterm zone="transcode transcode-prog">
Index: multimedia/videoutils/videoutils.xml
===================================================================
--- multimedia/videoutils/videoutils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/videoutils/videoutils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="multimedia-videoutils">
Index: multimedia/videoutils/vlc.xml
===================================================================
--- multimedia/videoutils/vlc.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/videoutils/vlc.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY vlc-download-http "https://download.videolan.org/vlc/&vlc-version;/vlc-&vlc-version;.tar.xz">
   <!ENTITY vlc-download-ftp  " ">
-  <!ENTITY vlc-md5sum        "efc5f7331c033bf81536531c6eba5aa5">
+  <!ENTITY vlc-md5sum        "f797dc97305639f6270df619fe1c5962">
   <!ENTITY vlc-size          "25 MB">
-  <!ENTITY vlc-buildsize     "849 MB (add 36 MB for tests)">
-  <!ENTITY vlc-time          "2.1 SBU (using parallelism=4; add 0.2 SBU for tests)">
+  <!ENTITY vlc-buildsize     "724 MB (add 13 MB for tests)">
+  <!ENTITY vlc-time          "1.9 SBU (using parallelism=4; add 0.2 SBU for tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -84,5 +85,5 @@
       <xref linkend="libgcrypt"/>
       <xref linkend="libmad"/>,
-      <xref linkend="lua52"/>, and
+      <xref linkend="lua"/>, and
       <xref linkend="x-window-system"/>,
     </para>
@@ -107,5 +108,5 @@
       <xref linkend="v4l-utils"/>,
       <ulink url="http://www.videolan.org/developers/libbluray.html">libbluray</ulink>,
-      <ulink url="https://sourceforge.net/projects/libdc1394/">libdc1394</ulink>,
+      <ulink url="http://sourceforge.net/projects/libdc1394/">libdc1394</ulink>,
       <ulink url="https://github.com/sahlberg/libnfs">libnfs</ulink>,
       <ulink url="https://github.com/libproxy/libproxy">libproxy</ulink>,
@@ -124,7 +125,7 @@
       <ulink url="http://dl.matroska.org/downloads/libmatroska/">libmatroska</ulink>
       (requires <ulink url="http://dl.matroska.org/downloads/libebml/">libebml</ulink>),
-      <ulink url="https://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink>,
+      <ulink url="http://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink>,
       <ulink url="http://www.musepack.net/">Musepack</ulink>, and
-      <ulink url="https://sourceforge.net/projects/sidplay2/">sidplay-libs</ulink>
+      <ulink url="http://sourceforge.net/projects/sidplay2/">sidplay-libs</ulink>
     </para>
 
@@ -145,16 +146,16 @@
       <ulink url="https://github.com/nkoriyama/aribb24">aribb24</ulink>,
       <ulink url="https://code.videolan.org/videolan/dav1d">dav1d</ulink>,
-      <ulink url="https://sourceforge.net/projects/dirac/">Dirac</ulink>,
+      <ulink url="http://sourceforge.net/projects/dirac/">Dirac</ulink>,
       <ulink url="https://github.com/divideconcept/FluidLite">FluidLite</ulink>,
-      <ulink url="https://sourceforge.net/projects/fluidsynth/">FluidSynth</ulink>,
+      <ulink url="http://sourceforge.net/projects/fluidsynth/">FluidSynth</ulink>,
       <ulink url="http://www.videolan.org/developers/libdca.html">libdca</ulink>,
       <ulink url="https://wiki.xiph.org/index.php/OggKate">libkate</ulink>,
       <ulink url="http://www.khronos.org/openmax/">OpenMAX</ulink>,
-      <ulink url="https://sourceforge.net/projects/schrodinger/">Schroedinger</ulink>,
+      <ulink url="http://sourceforge.net/projects/schrodinger/">Schroedinger</ulink>,
       <ulink url="https://github.com/toots/shine">Shine</ulink>,
       <ulink url="https://sourceforge.net/p/soxr/wiki/Home/">SoX</ulink>,
       <ulink url="http://wiki.xiph.org/Tremor">Tremor</ulink>,
       <ulink url="http://www.twolame.org/">Twolame</ulink>, and
-      <ulink url="https://sourceforge.net/projects/zapping/">Zapping VBI</ulink>
+      <ulink url="http://sourceforge.net/projects/zapping/">Zapping VBI</ulink>
     </para>
 
@@ -192,7 +193,7 @@
     <bridgehead renderas="sect4">Optional visualisations and video filter plugins</bridgehead>
     <para role="optional">
-      <ulink url="https://sourceforge.net/projects/goom/">Goom</ulink>,
+      <ulink url="http://sourceforge.net/projects/goom/">Goom</ulink>,
       <ulink url="https://www.vsxu.com">libvsxu</ulink>, and
-      <ulink url="https://sourceforge.net/projects/projectm/">projectM</ulink>
+      <ulink url="http://sourceforge.net/projects/projectm/">projectM</ulink>
     </para>
 
@@ -200,6 +201,6 @@
     <para role="optional">
       <xref linkend="avahi"/>,
-      <ulink url="https://sourceforge.net/projects/libmtp/">libmtp</ulink> and
-      <ulink url="https://sourceforge.net/projects/pupnp/">libupnp</ulink>
+      <ulink url="http://sourceforge.net/projects/libmtp/">libmtp</ulink> and
+      <ulink url="http://sourceforge.net/projects/pupnp/">libupnp</ulink>
     </para>
 
@@ -228,9 +229,11 @@
       Install <application>VLC</application> by running the following commands:
     </para>
-<!--
-<screen><userinput>sed -i '/vlc_demux.h/a #define LUA_COMPAT_APIINTCASTS' modules/lua/vlc.h   &amp;&amp;-->
-<screen><userinput>export LUAC=/usr/bin/luac5.2                   &amp;&amp;
-export LUA_LIBS="$(pkg-config --libs lua52)"   &amp;&amp;
-export CPPFLAGS="$(pkg-config --cflags lua52)" &amp;&amp;
+
+    <screen><userinput>sed -i '/vlc_demux.h/a #define LUA_COMPAT_APIINTCASTS' modules/lua/vlc.h   &amp;&amp;
+sed -i '/#include &lt;QWidget&gt;/a\#include &lt;QPainterPath&gt;/'            \
+    modules/gui/qt/util/timetooltip.hpp                            &amp;&amp;
+sed -i '/#include &lt;QPainter&gt;/a\#include &lt;QPainterPath&gt;/'           \
+    modules/gui/qt/components/playlist/views.cpp                   \
+    modules/gui/qt/dialogs/plugins.cpp                             &amp;&amp;
 
 BUILDCC=gcc ./configure --prefix=/usr    \
@@ -259,17 +262,13 @@
 
     <para>
-      <command>export ...</command>: These commands ensure building with
-      <xref linkend="lua52"/>.  Upstream does not support lua 5.4 yet.
-    </para>
-
-    <!--<para>
       <command>sed ... modules/lua/...</command>: This command allows
       building with the current version of <xref linkend="lua"/>.
-    </para>-->
-
-    <!--<para>
+    </para>
+
+    <para>
       <command>sed ... a\#include &lt;QPainterPath&gt;/ ...</command>: These two
       sed commands fix building with Qt-5.15.0.
-    </para>-->
+
+     </para>
 
     <para>
@@ -369,5 +368,5 @@
         <listitem>
           <para>
-            is a script to run VLC with the dummy interface
+            is a script to run VLC with the dummy interface.
           </para>
           <indexterm zone="vlc cvlc">
@@ -381,5 +380,5 @@
         <listitem>
           <para>
-            is a script to run VLC with the ncurses interface
+            is a script to run VLC with the ncurses interface.
           </para>
           <indexterm zone="vlc nvlc">
@@ -394,5 +393,5 @@
           <para>
             is a script to run <application>VLC</application> with the
-            <application>Qt</application> interface
+            <application>Qt</application> interface.
           </para>
           <indexterm zone="vlc qvlc">
@@ -407,5 +406,5 @@
           <para>
             is a script to run <application>VLC</application> with a command
-            line interface
+            line interface.
           </para>
           <indexterm zone="vlc rvlc">
@@ -420,5 +419,5 @@
           <para>
             is a script to run <application>VLC</application> with the skins
-            interface
+            interface.
           </para>
           <indexterm zone="vlc svlc">
@@ -432,5 +431,5 @@
         <listitem>
           <para>
-            is the <application>VLC</application> media player
+            is the <application>VLC</application> media player.
           </para>
           <indexterm zone="vlc vlc-prog">
@@ -444,5 +443,5 @@
         <listitem>
           <para>
-            is a wrapper to drop privileges with <application>VLC</application>
+            is a wrapper to drop privileges with <application>VLC</application>.
           </para>
           <indexterm zone="vlc vlc-wrapper">
Index: multimedia/videoutils/xine-ui.xml
===================================================================
--- multimedia/videoutils/xine-ui.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ multimedia/videoutils/xine-ui.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <note>
@@ -212,5 +213,5 @@
             is an ASCII art video player which utilizes
             <application>AAlib</application> as the frontend for the
-            <application>xine Libraries</application>
+            <application>xine Libraries</application>.
           </para>
           <indexterm zone="xine-ui aaxine">
@@ -226,5 +227,5 @@
             is a color ASCII art video player which utilizes
             <application>CACA</application> as the frontend for the
-            <application>xine Libraries</application>
+            <application>xine Libraries</application>.
           </para>
           <indexterm zone="xine-ui cacaxine">
@@ -239,5 +240,5 @@
           <para>
             is a frame buffer interface to the
-            <application>xine Libraries</application>
+            <application>xine Libraries</application>.
           </para>
           <indexterm zone="xine-ui fbxine">
@@ -253,5 +254,5 @@
             is a multimedia player designed to play MPEG streams (audio and
             video), MPEG elementary streams (MP3), MPEG transport streams, Ogg
-            files, AVI files, ASF files, some Quicktime files, VCDs and DVDs
+            files, AVI files, ASF files, some Quicktime files, VCDs and DVDs.
           </para>
           <indexterm zone="xine-ui xine">
@@ -266,5 +267,5 @@
           <para>
             produces a terse system description and guides you through the
-            process of reporting a bug
+            process of reporting a bug.
           </para>
           <indexterm zone="xine-ui xine-bugreport">
@@ -281,5 +282,5 @@
             common problems. It tests the operating system settings,
             installation of plugins, CD/DVD drive settings and video support
-            parameters
+            parameters.
           </para>
           <indexterm zone="xine-ui xine-check">
@@ -294,5 +295,5 @@
           <para>
             is a tool to connect to a <command>xine</command> remote control
-            server
+            server.
           </para>
           <indexterm zone="xine-ui xine-remote">
Index: networking/connect/advanced-network.xml
===================================================================
--- networking/connect/advanced-network.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/connect/advanced-network.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: networking/connect/connect.xml
===================================================================
--- networking/connect/connect.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/connect/connect.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="basicnet-connect">
Index: networking/connect/dhcp.xml
===================================================================
--- networking/connect/dhcp.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/connect/dhcp.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,7 +5,7 @@
   %general-entities;
 
-  <!ENTITY dhcp-download-http "https://ftp.isc.org/isc/dhcp/&dhcp-version;/dhcp-&dhcp-version;.tar.gz">
+  <!ENTITY dhcp-download-http " ">
   <!ENTITY dhcp-download-ftp  "ftp://ftp.isc.org/isc/dhcp/&dhcp-version;/dhcp-&dhcp-version;.tar.gz">
-  <!ENTITY dhcp-md5sum        "3089a1ebd20a802ec0870ae337d43907">
+  <!ENTITY dhcp-md5sum        "2afdaf8498dc1edaf3012efdd589b3e1">
   <!ENTITY dhcp-size          "9.4 MB">
   <!ENTITY dhcp-buildsize     "115 MB">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -166,6 +167,6 @@
    preserves CFLAGS if they are set in environment
 -->
-<screen><userinput>( export CFLAGS="${CFLAGS:--g -O2} -Wall -fno-strict-aliasing                 \
-        -D_PATH_DHCLIENT_SCRIPT='\"/usr/sbin/dhclient-script\"'     \
+<screen><userinput>( export CFLAGS="$CFLAGS -Wall -fno-strict-aliasing                 \
+        -D_PATH_DHCLIENT_SCRIPT='\"/sbin/dhclient-script\"'         \
         -D_PATH_DHCPD_CONF='\"/etc/dhcp/dhcpd.conf\"'               \
         -D_PATH_DHCLIENT_CONF='\"/etc/dhcp/dhclient.conf\"'"        &amp;&amp;
@@ -192,6 +193,7 @@
     </para>
 
-<screen role="root"><userinput>make -C client install             &amp;&amp;
-install -v -m755 client/scripts/linux /usr/sbin/dhclient-script</userinput></screen>
+<screen role="root"><userinput>make -C client install         &amp;&amp;
+mv -v /usr/sbin/dhclient /sbin &amp;&amp;
+install -v -m755 client/scripts/linux /sbin/dhclient-script</userinput></screen>
 
     <para>
@@ -219,6 +221,7 @@
     </para>
 
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 client/scripts/linux /usr/sbin/dhclient-script</userinput></screen>
+<screen role="root"><userinput>make install                   &amp;&amp;
+mv -v /usr/sbin/dhclient /sbin &amp;&amp;
+install -v -m755 client/scripts/linux /sbin/dhclient-script</userinput></screen>
 
   </sect2>
@@ -505,5 +508,5 @@
         <listitem>
           <para>
-            is the implementation of the DHCP client
+            is the implementation of the DHCP client.
           </para>
           <indexterm zone="dhcp dhclient">
@@ -518,5 +521,5 @@
           <para>
             is used by dhclient to (re)configure interfaces. It can make
-            extra changes by invoking custom dhclient-{entry,exit}-hooks
+            extra changes by invoking custom dhclient-{entry,exit}-hooks.
           </para>
           <indexterm zone="dhcp dhclient-script">
@@ -532,5 +535,5 @@
             implements Dynamic Host Configuration Protocol (DHCP) and
             Internet Bootstrap Protocol (BOOTP) requests for network
-            addresses
+            addresses.
           </para>
           <indexterm zone="dhcp dhcpd">
@@ -546,5 +549,5 @@
             provides a means to accept DHCP and BOOTP requests on a subnet
             without a DHCP server and relay them to a DHCP server on another
-            subnet
+            subnet.
           </para>
           <indexterm zone="dhcp dhcrelay">
@@ -560,5 +563,5 @@
             provides an interactive way to connect to, query and
             possibly change the ISC DHCP Server's state via OMAPI, the
-            Object Management API
+            Object Management API.
           </para>
           <indexterm zone="dhcp omshell">
Index: networking/connect/dhcpcd.xml
===================================================================
--- networking/connect/dhcpcd.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/connect/dhcpcd.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -22,4 +22,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -42,5 +43,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -118,9 +119,7 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr                \
-            --sysconfdir=/etc            \
-            --libexecdir=/usr/lib/dhcpcd \
-            --dbdir=/var/lib/dhcpcd      \
-            --privsepuser=dhcpcd         &amp;&amp;
+<screen><userinput>./configure --libexecdir=/lib/dhcpcd \
+            --dbdir=/var/lib/dhcpcd  \
+            --privsepuser=dhcpcd     &amp;&amp;
 make</userinput></screen>
 
@@ -153,6 +152,8 @@
 
     <para>
-      <parameter>--libexecdir=/usr/lib/dhcpcd</parameter>: Set a more proper
-      location for dhcpcd internal libraries.
+      <parameter>--libexecdir=/lib/dhcpcd</parameter>: The default
+      <filename class="directory">/libexec</filename> is not FHS-compliant.
+      Since this directory may need to be available early in the boot,
+      <filename class="directory">/usr/libexec</filename> cannot be used either.
     </para>
 
@@ -193,5 +194,5 @@
         To configure <command>dhcpcd</command>, you need to first install
         the network service script,
-        <filename>/usr/lib/services/dhcpcd</filename>
+        <filename>/lib/services/dhcpcd</filename>
         included in the <xref linkend="bootscripts"/> package
         (as user <systemitem class="username">root</systemitem>):
@@ -206,5 +207,5 @@
       <note>
         <para id="dhcpcd-config6">
-          the network service script <filename>/usr/lib/services/dhcpcd</filename>
+          the network service script <filename>/lib/services/dhcpcd</filename>
           contained in bootscripts up to blfs-bootscripts-20191204 is
           not compatible with latest dhcpcd, as the location of the pidfile
@@ -222,5 +223,5 @@
           and <filename>/etc/ntp.conf</filename>. These
           modifications to system files are done by hooks which are stored in
-          <filename class="directory">/usr/lib/dhcpcd/dhcpcd-hooks</filename>.
+          <filename class="directory">/lib/dhcpcd/dhcpcd-hooks</filename>.
           Setup <command>dhcpcd</command> by removing or adding hooks from/to
           that directory.  The execution of hooks can be disabled by using
@@ -381,6 +382,6 @@
       <seglistitem>
         <seg>dhcpcd</seg>
-        <seg>/usr/lib/dhcpcd/dev/udev.so</seg>
-        <seg>/{usr,var}/lib/dhcpcd and /usr/share/dhcpcd</seg>
+        <seg>/lib/dhcpcd/dev/udev.so</seg>
+        <seg>/{,var/}lib/dhcpcd and /usr/share/dhcpcd</seg>
       </seglistitem>
     </segmentedlist>
@@ -395,5 +396,5 @@
         <listitem>
           <para>
-            is an implementation of the DHCP client specified in RFC2131
+            is an implementation of the DHCP client specified in RFC2131.
           </para>
           <indexterm zone="dhcpcd dhcpcd-prog">
@@ -409,5 +410,5 @@
             adds udev support for interface arrival and departure; this is
             because udev likes to rename the interface, which it can't do if
-            dhcpcd grabs it first
+            dhcpcd grabs it first.
           </para>
           <indexterm zone="dhcpcd dhcpcd-udev">
Index: networking/mailnews/fetchmail.xml
===================================================================
--- networking/mailnews/fetchmail.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/mailnews/fetchmail.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY fetchmail-download-http "&sourceforge-dl;/fetchmail/fetchmail-&fetchmail-version;.tar.xz">
   <!ENTITY fetchmail-download-ftp  " ">
-  <!ENTITY fetchmail-md5sum        "091dcd5462f205dbc0597e7ad73d3e15">
+  <!ENTITY fetchmail-md5sum        "8c13d8f2045bbcdafc6747082041714d">
   <!ENTITY fetchmail-size          "1.3 MB">
-  <!ENTITY fetchmail-buildsize     "16 MB including tests">
+  <!ENTITY fetchmail-buildsize     "17 MB including tests">
   <!ENTITY fetchmail-time          "0.1 SBU including tests">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -84,6 +85,8 @@
       is dead. Debian had 3.2.1, git hub has a very old 3.1.
       libintl is part of gettext so enabled by default on LFS -->
-      <xref linkend="mitkrb"/> and
-      <ulink url="http://www.citi.umich.edu/projects/nfsv4/linux/">libgssapi</ulink>
+      <xref linkend="mitkrb"/>, and
+      <ulink url="http://www.citi.umich.edu/projects/nfsv4/linux/">
+        libgssapi
+      </ulink>
     </para>
 
@@ -119,5 +122,5 @@
 <screen><userinput>PYTHON=python3 \
 ./configure --prefix=/usr \
-            --enable-fallback=procmail &amp;&amp;
+ --enable-fallback=procmail &amp;&amp;
 make</userinput></screen>
 
@@ -173,13 +176,4 @@
     <sect3>
       <title>Configuration Information</title>
-
-      <note>
-        <para>
-          If you are connecting to a mailserver that supports SSL/TLS-wrapped
-          or "implicit" mode on a dedicated port (default 993) you should use
-          <command>fetchmail --ssl</command> or add the option 'ssl' in an
-          rcfile.
-        </para>
-      </note>
 
 <screen><userinput>cat &gt; ~/.fetchmailrc &lt;&lt; "EOF"
@@ -252,5 +246,5 @@
             when executed as a user, this will source
             <filename>~/.fetchmailrc</filename> and download the appropriate
-            mail
+            mail.
           </para>
           <indexterm zone="fetchmail fetchmail-prog">
@@ -269,5 +263,5 @@
             <application>Python</application> and the Tkinter module but is
             labelled with a WARNING that it needs to be updated
-            for fetchmail 6.4's SSL options and other recent new options
+            for fetchmail 6.4's SSL options and other recent new options.
           </para>
           <!-- keep this description commented but fetchmailconf
Index: networking/mailnews/mailnews.xml
===================================================================
--- networking/mailnews/mailnews.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/mailnews/mailnews.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="basicnet-mailnews">
Index: networking/mailnews/mailx.xml
===================================================================
--- networking/mailnews/mailx.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/mailnews/mailx.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,5 +8,5 @@
   but not making tarballs.  fedora have a script using CVS, but
   debian keep a tarball -->
-  <!ENTITY mailx-download-http "https://ftp.debian.org/debian/pool/main/h/heirloom-mailx/heirloom-mailx_&mailx-version;.orig.tar.gz">
+  <!ENTITY mailx-download-http "http://ftp.debian.org/debian/pool/main/h/heirloom-mailx/heirloom-mailx_&mailx-version;.orig.tar.gz">
   <!ENTITY mailx-download-ftp  " ">
   <!ENTITY mailx-md5sum        "29a6033ef1412824d02eb9d9213cb1f2">
@@ -20,4 +20,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -44,5 +45,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -218,5 +219,5 @@
             is a command-line mail user agent compatible with the
             <command>mailx</command> command found on commercial Unix
-            versions
+            versions.
           </para>
           <indexterm zone="mailx mailx-prog">
@@ -230,5 +231,5 @@
         <listitem>
           <para>
-            is a symbolic link to <command>mailx</command>
+            is a symbolic link to <command>mailx</command>.
           </para>
           <indexterm zone="mailx mail-mailx">
@@ -242,5 +243,5 @@
         <listitem>
           <para>
-            is a symbolic link to <command>mailx</command>
+            is a symbolic link to <command>mailx</command>.
           </para>
           <indexterm zone="mailx nail-mailx">
Index: networking/mailnews/mutt.xml
===================================================================
--- networking/mailnews/mutt.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/mailnews/mutt.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,6 +7,6 @@
   <!ENTITY mutt-download-http "https://bitbucket.org/mutt/mutt/downloads/mutt-&mutt-version;.tar.gz">
   <!ENTITY mutt-download-ftp  "ftp://ftp.mutt.org/pub/mutt/mutt-&mutt-version;.tar.gz">
-  <!ENTITY mutt-md5sum        "1573fd2154ab1b998363fff9ec9024f8">
-  <!ENTITY mutt-size          "5.2 MB">
+  <!ENTITY mutt-md5sum        "34be16eacfdd6aca5d54d67e1075b6a4">
+  <!ENTITY mutt-size          "5.1 MB">
   <!ENTITY mutt-buildsize     "47 MB">
   <!ENTITY mutt-time          "0.3 SBU">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -71,10 +72,10 @@
     </itemizedlist>
 
-<!--<bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <!--<bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
       <listitem>
         <para>
           Required patch: <ulink
-          url="&patch-root;/mutt-&mutt-version;-memleak-1.patch"/>
+          url="&patch-root;/mutt-&mutt-version;-upstream_fixes-1.patch"/>
         </para>
       </listitem>
@@ -166,10 +167,4 @@
     </para>
 
-<!--<para>
-      First apply the patch to prevent a memory leak:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../mutt-&mutt-version;-memleak-1.patch</userinput></screen>-->
-
     <para>
       To ensure that a plain text manual is created when using
@@ -411,5 +406,5 @@
         <listitem>
           <para>
-            is a script showing where to report bugs
+            is a script showing where to report bugs.
           </para>
           <indexterm zone="mutt flea">
@@ -424,5 +419,5 @@
           <para>
             is a Mail User Agent (MUA) which enables you to read, write
-            and delete your email
+            and delete your email.
           </para>
           <indexterm zone="mutt mutt-prog">
@@ -436,5 +431,5 @@
         <listitem>
           <para>
-            implements the mail spool file lock
+            implements the mail spool file lock.
           </para>
           <indexterm zone="mutt mutt_dotlock">
@@ -448,5 +443,5 @@
         <listitem>
           <para>
-            is a script identical to <command>flea</command>
+            is a script identical to <command>flea</command>.
           </para>
           <indexterm zone="mutt muttbug">
@@ -460,5 +455,5 @@
         <listitem>
           <para>
-            prepares a command line for the <xref linkend="gnupg2"/> utilities
+            prepares a command line for the <xref linkend="gnupg2"/> utilities.
           </para>
           <indexterm zone="mutt pgpewrap">
@@ -472,7 +467,7 @@
         <listitem>
           <para>
-            is a key ring dumper for
-            <ulink url="http://www.pgp.com/">PGP</ulink>. It is not needed for
-            <xref linkend="gnupg2"/>
+            is a key ring dumper for <ulink
+            url="http://www.pgp.com/">PGP</ulink>. It is not needed for
+            <xref linkend="gnupg2"/>.
           </para>
           <indexterm zone="mutt pgpring">
@@ -486,5 +481,5 @@
         <listitem>
           <para>
-            manages a keystore for S/MIME certificates
+            manages a keystore for S/MIME certificates.
           </para>
           <indexterm zone="mutt smime_keys">
Index: networking/mailnews/other.xml
===================================================================
--- networking/mailnews/other.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/mailnews/other.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: networking/mailnews/procmail.xml
===================================================================
--- networking/mailnews/procmail.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/mailnews/procmail.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
 <!--  <!ENTITY procmail-download-http "http://www.ring.gr.jp/archives/net/mail/procmail/procmail-&procmail-version;.tar.gz"> -->
-  <!ENTITY procmail-download-http "https://ftp.osuosl.org/pub/blfs/conglomeration/procmail/procmail-&procmail-version;.tar.gz"> 
+  <!ENTITY procmail-download-http "http://ftp.osuosl.org/pub/blfs/conglomeration/procmail/procmail-&procmail-version;.tar.gz"> 
   <!ENTITY procmail-download-ftp  " ">
   <!-- <!ENTITY procmail-download-ftp  "ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/procmail-&procmail-version;.tar.gz"> -->
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -201,5 +202,5 @@
         <listitem>
           <para>
-            is a filter that can be used to format mail into mailbox format
+            is a filter that can be used to format mail into mailbox format.
           </para>
           <indexterm zone="procmail formail">
@@ -214,5 +215,5 @@
           <para>
             is a utility that can lock a file for single use interactively or
-            in a script
+            in a script.
           </para>
           <indexterm zone="procmail lockfile">
@@ -228,5 +229,5 @@
             prints a summary report of mail that has been filtered by
             <command>procmail</command> since the last time
-            <command>mailstat</command> was ran
+            <command>mailstat</command> was ran.
           </para>
           <indexterm zone="procmail mailstat">
@@ -241,5 +242,5 @@
           <para>
             is an autonomous mail processor. It performs all the functions
-            of an MDA (Mail Delivery Agent)
+            of an MDA (Mail Delivery Agent).
           </para>
           <indexterm zone="procmail procmail-prog">
@@ -253,2 +254,3 @@
 
 </sect1>
+
Index: networking/netlibs/c-ares.xml
===================================================================
--- networking/netlibs/c-ares.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netlibs/c-ares.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY c-ares-download-http "https://c-ares.haxx.se/download/c-ares-&c-ares-version;.tar.gz">
   <!ENTITY c-ares-download-ftp  " ">
-  <!ENTITY c-ares-md5sum        "3802264830c6886411dac606c66fdbf8">
-  <!ENTITY c-ares-size          "1.5 MB">
-  <!ENTITY c-ares-buildsize     "11 MB">
-  <!ENTITY c-ares-time          "less than 0.1 SBU">
+  <!ENTITY c-ares-md5sum        "28f65c8ee6c097986bd902fd4f0804e2">
+  <!ENTITY c-ares-size          "1.4 MB">
+  <!ENTITY c-ares-buildsize     "10 MB">
+  <!ENTITY c-ares-time          "0.1 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -145,5 +146,5 @@
         <listitem>
           <para>
-            prints the country where an IPv4 address or host is located
+            prints the country where an IPv4 address or host is located.
           </para>
           <indexterm zone="c-ares acountry">
@@ -157,5 +158,5 @@
         <listitem>
           <para>
-            queries information from DNS servers
+            queries information from DNS servers.
           </para>
           <indexterm zone="c-ares adig">
@@ -170,5 +171,5 @@
           <para>
             prints the A or AAAA record associated with a hostname
-            or IP address
+            or IP address.
           </para>
           <indexterm zone="c-ares ahost">
@@ -179,8 +180,8 @@
 
       <varlistentry id="c-ares-lib">
-        <term><filename class="libraryfile">libcares.so</filename></term>
+        <term><filename class='libraryfile'>libcares.so</filename></term>
         <listitem>
           <para>
-            is a C library for asynchronous DNS requests
+            is a C library for asynchronous DNS requests.
           </para>
           <indexterm zone="c-ares c-ares-lib">
Index: networking/netlibs/curl.xml
===================================================================
--- networking/netlibs/curl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netlibs/curl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY curl-download-http "https://curl.se/download/curl-&curl-version;.tar.xz">
+  <!ENTITY curl-download-http "https://curl.haxx.se/download/curl-&curl-version;.tar.xz">
   <!ENTITY curl-download-ftp  " ">
-  <!ENTITY curl-md5sum        "419c2461366cf404160a820f7a902b7e">
-  <!ENTITY curl-size          "2.4 MB">
-  <!ENTITY curl-buildsize     "103 MB (add 17 MB for tests)">
+  <!ENTITY curl-md5sum        "448156d9cd05009b0097b43de639fd34">
+  <!ENTITY curl-size          "2.3 MB">
+  <!ENTITY curl-buildsize     "95 MB (add 17 MB for tests)">
   <!ENTITY curl-time          "0.3 SBU (add 14 SBU for tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -73,15 +74,4 @@
       </listitem>
     </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/curl-&curl-version;-function_naming-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
 
     <bridgehead renderas="sect3">cURL Dependencies</bridgehead>
@@ -145,5 +135,4 @@
 <screen><userinput>./configure --prefix=/usr                           \
             --disable-static                        \
-            --with-openssl                          \
             --enable-threaded-resolver              \
             --with-ca-path=/etc/ssl/certs &amp;&amp;
@@ -368,10 +357,4 @@
 
     <para>
-      <parameter>--with-openssl</parameter>: This parameter chooses
-      <application>OpenSSL</application> as SSL/TLS implementation.
-      This seems mandatory now.
-    </para>
-
-    <para>
       <option>--with-gssapi</option>: This parameter adds
       <application>Kerberos 5</application> support to
@@ -393,5 +376,5 @@
 
     <para>
-      <option>--with-libssh2</option>: This parameter adds
+      <option>--with-libssh2</option>: This paramater adds
       <application>SSH</application> support to cURL. This is disabled
       by default.
@@ -399,5 +382,5 @@
 
     <para>
-      <option>--enable-ares</option>: This parameter adds
+      <option>--enable-ares</option>: This paramater adds
       support for DNS resolution through the c-ares library. It is disabled
       by default, but does speed up DNS resolution queries.
@@ -443,5 +426,5 @@
         <listitem>
          <para>
-           is a command line tool for transferring files with URL syntax
+           is a command line tool for transferring files with URL syntax.
          </para>
           <indexterm zone="curl curl-prog">
@@ -456,5 +439,5 @@
           <para>
             prints information about the last compile, like libraries
-            linked to and prefix setting
+            linked to and prefix setting.
           </para>
           <indexterm zone="curl curl-config">
@@ -469,5 +452,5 @@
           <para>
             provides the API functions required by
-            <command>curl</command> and other programs
+            <command>curl</command> and other programs.
           </para>
           <indexterm zone="curl libcurl">
Index: networking/netlibs/geoclue2.xml
===================================================================
--- networking/netlibs/geoclue2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netlibs/geoclue2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -110,5 +111,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release -Dgtk-doc=false .. &amp;&amp;
+meson --prefix=/usr -Dgtk-doc=false .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -127,7 +128,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -153,10 +151,4 @@
       NMEA source. Use it if you have not installed the
       <application>Avahi</application> package.
-    </para>
-
-    <para>
-      <option>-Ddemo-agent=false</option>: This switch disables the
-      demo. Use it if you have not installed the
-      <application>libnotify</application> package.
     </para>
 
Index: networking/netlibs/glib-networking.xml
===================================================================
--- networking/netlibs/glib-networking.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netlibs/glib-networking.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,11 +6,10 @@
 
   <!ENTITY glib-networking-download-http
-    "&gnome-download-http;/glib-networking/2.68/glib-networking-&glib-networking-version;.tar.xz">
-  <!ENTITY glib-networking-download-ftp " ">
-<!--  <!ENTITY glib-networking-download-ftp
-    "&gnome-download-ftp;/glib-networking/2.66/glib-networking-&glib-networking-version;.tar.xz"> -->
-  <!ENTITY glib-networking-md5sum        "5c3b020db7d0937f75aac7654c38343f">
-  <!ENTITY glib-networking-size          "236 KB">
-  <!ENTITY glib-networking-buildsize     "5.2 MB (with tests)">
+    "&gnome-download-http;/glib-networking/2.66/glib-networking-&glib-networking-version;.tar.xz">
+  <!ENTITY glib-networking-download-ftp
+    "&gnome-download-ftp;/glib-networking/2.66/glib-networking-&glib-networking-version;.tar.xz">
+  <!ENTITY glib-networking-md5sum        "4740154ce6dcf7859fbbfd954fa5a226">
+  <!ENTITY glib-networking-size          "192 KB">
+  <!ENTITY glib-networking-buildsize     "5.8 MB (with tests)">
   <!ENTITY glib-networking-time          "less than 0.1 SBU (with tests)">
 ]>
@@ -20,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -87,12 +87,11 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="gnutls"/>
+      <xref linkend="glib2"/>,
+      <xref linkend="gnutls"/>, and
+      <xref linkend="gsettings-desktop-schemas"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="gsettings-desktop-schemas"/> (for the applications
-      using this package to use proxy server settings in GNOME) and
       <xref linkend="make-ca"/>
       <!-- p11-kit option no longer exists, and is pulled in by GnuTLS anyway -->
@@ -133,5 +132,5 @@
 
 meson --prefix=/usr          \
-      --buildtype=release    &amp;&amp;
+      -Dlibproxy=disabled .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -157,13 +156,19 @@
 
   </sect2>
-
+<!--
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para>
+      <parameter>- -without-ca-certificates</parameter>: This parameter forces
+      use of PKCS #11 modules for TLS certificate validation instead of a
+      bundle of certificates.
+    </para>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-  </sect2>
-
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+  -->
   <!-- This isn't needed anymore and breaks applications which use it.
   <sect2 role="configuration">
Index: networking/netlibs/ldns.xml
===================================================================
--- networking/netlibs/ldns.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netlibs/ldns.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY ldns-download-http "https://www.nlnetlabs.nl/downloads/ldns/ldns-&ldns-version;.tar.gz">
+  <!ENTITY ldns-download-http "http://www.nlnetlabs.nl/downloads/ldns/ldns-&ldns-version;.tar.gz">
   <!ENTITY ldns-download-ftp  " ">
   <!ENTITY ldns-md5sum        "166262a46995d9972aba417fd091acd5">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -198,5 +199,5 @@
             is a tool like <command>dig</command> from
             <xref linkend="bind-utils"/> designed to get all sorts of
-            information out of the DNS
+            information out of the DNS.
           </para>
           <indexterm zone="ldns drill">
@@ -210,5 +211,5 @@
         <listitem>
           <para>
-            shows compiler and linker flags for ldns usage
+            shows compiler and linker flags for ldns usage.
           </para>
           <indexterm zone="ldns ldns-config">
@@ -223,5 +224,5 @@
           <para>
             provides the <application>ldns</application> API functions to
-            programs
+            programs.
           </para>
           <indexterm zone="ldns libldns">
Index: networking/netlibs/libevent.xml
===================================================================
--- networking/netlibs/libevent.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netlibs/libevent.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -96,10 +97,4 @@
   <sect2 role="installation">
     <title>Installation of libevent</title>
-
-    <para>
-      First, fix an issue that prevents rpcgen_event.py from working:
-    </para>
-
-<screen><userinput remap="pre">sed -i 's/python/&amp;3/' event_rpcgen.py</userinput></screen>
 
     <para>
Index: networking/netlibs/libmnl.xml
===================================================================
--- networking/netlibs/libmnl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netlibs/libmnl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -98,5 +99,17 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install                 &amp;&amp;
+mv /usr/lib/libmnl.so.* /lib &amp;&amp;
+ln -sfv ../../lib/$(readlink /usr/lib/libmnl.so) /usr/lib/libmnl.so</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>mv -v /usr/lib/libmnl.so.* ...</command>: Move shared
+      libraries into /lib so they are available before /usr is mounted.
+    </para>
 
   </sect2>
@@ -125,5 +138,5 @@
           <para>
             provides functions for parsing, validating, constructing of both
-            the Netlink header and TLVs
+            the Netlink header and TLVs.
           </para>
           <indexterm zone="libmnl libmnl-lib">
Index: networking/netlibs/libndp.xml
===================================================================
--- networking/netlibs/libndp.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netlibs/libndp.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY libndp-download-http "http://libndp.org/files/libndp-&libndp-version;.tar.gz">
   <!ENTITY libndp-download-ftp  " ">
-  <!ENTITY libndp-md5sum        "c7e775fd5a9d676e8cba9c3732c4df93">
-  <!ENTITY libndp-size          "360 KB">
-  <!ENTITY libndp-buildsize     "2.5 MB">
+  <!ENTITY libndp-md5sum        "ea4a2a3351991c1d561623772364ae14">
+  <!ENTITY libndp-size          "356 KB">
+  <!ENTITY libndp-buildsize     "2.4 MB">
   <!ENTITY libndp-time          "less than 0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -126,5 +127,5 @@
         <listitem>
           <para>
-            is a tool for sending and receiving NDP messages
+            is a tool for sending and receiving NDP messages.
           </para>
           <indexterm zone="libndp ndptool">
@@ -138,5 +139,5 @@
         <listitem>
           <para>
-            provides a wrapper for the IPv6 Neighbor Discovery Protocol
+            provides a wrapper for the IPv6 Neighbor Discovery Protocol.
           </para>
           <indexterm zone="libndp libndp-lib">
Index: networking/netlibs/libnl.xml
===================================================================
--- networking/netlibs/libnl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netlibs/libnl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -23,4 +23,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -210,5 +211,5 @@
             queries the Generic Netlink controller in the kernel and prints
             a list of all registered Generic Netlink families including
-            the version of the interface that has been registered
+            the version of the interface that has been registered.
           </para>
           <indexterm zone="libnl genl-ctrl-list">
@@ -247,5 +248,5 @@
           <para>
             is used to resolve qdisc/class names to classid values and vice
-            versa
+            versa.
           </para>
           <indexterm zone="libnl nl-classid-lookup">
@@ -259,5 +260,5 @@
         <listitem>
           <para>
-            lists Traffic Classes
+            lists Traffic Classes.
           </para>
           <indexterm zone="libnl nl-class-list">
@@ -271,5 +272,5 @@
         <listitem>
           <para>
-            adds a classifier
+            adds a classifier.
           </para>
           <indexterm zone="libnl nl-cls-add">
@@ -283,5 +284,5 @@
         <listitem>
           <para>
-            deletes a classifier
+            deletes a classifier.
           </para>
           <indexterm zone="libnl nl-cls-delete">
@@ -295,5 +296,5 @@
         <listitem>
           <para>
-            lists classifiers
+            lists classifiers.
           </para>
           <indexterm zone="libnl nl-cls-list">
@@ -307,5 +308,5 @@
         <listitem>
           <para>
-            dumps link attributes
+            dumps link attributes.
           </para>
           <indexterm zone="libnl nl-link-list">
@@ -319,5 +320,5 @@
         <listitem>
           <para>
-            allows the lookup of packet location definitions
+            allows the lookup of packet location definitions.
           </para>
           <indexterm zone="libnl nl-pktloc-lookup">
@@ -331,5 +332,5 @@
         <listitem>
           <para>
-            adds queueing disciplines (qdiscs) in the kernel
+            adds queueing disciplines (qdiscs) in the kernel.
           </para>
           <indexterm zone="libnl nl-qdisc-add">
@@ -343,5 +344,5 @@
         <listitem>
           <para>
-             deletes queueing disciplines (qdiscs) in the kernel
+             deletes queueing disciplines (qdiscs) in the kernel.
           </para>
           <indexterm zone="libnl nl-qdisc-delete">
@@ -355,5 +356,5 @@
         <listitem>
           <para>
-            lists queueing disciplines (qdiscs) in the kernel
+            lists queueing disciplines (qdiscs) in the kernel.
           </para>
           <indexterm zone="libnl nl-qdisc-list">
@@ -368,5 +369,5 @@
           <para>
             These libraries contain API functions used to access Netlink
-            interfaces in Linux kernel
+            interfaces in Linux kernel.
           </para>
           <indexterm zone="libnl libnl-lib">
Index: networking/netlibs/libnma.xml
===================================================================
--- networking/netlibs/libnma.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netlibs/libnma.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY libnma-download-http "&gnome-download-http;/libnma/1.8/libnma-&libnma-version;.tar.xz">
   <!ENTITY libnma-download-ftp  "&gnome-download-ftp;/libnma/1.8/libnma-&libnma-version;.tar.xz">
-  <!ENTITY libnma-md5sum        "10505d481f650442246f9c957e90219b">
+  <!ENTITY libnma-md5sum        "e1ccac96405861ecab195be5524baae6">
   <!ENTITY libnma-size          "1.3 MB">
-  <!ENTITY libnma-buildsize     "24 MB">
+  <!ENTITY libnma-buildsize     "26 MB">
   <!ENTITY libnma-time          "0.1 SBU (with tests)">
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -108,5 +109,4 @@
 
 meson --prefix=/usr                             \
-      --buildtype=release                       \
       -Dgtk_doc=false                           \
       -Dmobile_broadband_provider_info=false .. &amp;&amp;
@@ -126,7 +126,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -175,5 +172,5 @@
         <listitem>
           <para>
-            contains the <application>NetworkManager</application> GUI library
+            contains the <application>NetworkManager</application> GUI library.
           </para>
           <indexterm zone="libnma libnma-lib">
@@ -184,4 +181,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: networking/netlibs/libnsl.xml
===================================================================
--- networking/netlibs/libnsl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netlibs/libnsl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY libnsl-download-http "https://github.com/thkukuk/libnsl/releases/download/v&libnsl-version;/libnsl-&libnsl-version;.tar.xz">
   <!ENTITY libnsl-download-ftp  " ">
-  <!ENTITY libnsl-md5sum        "1e8c0615071ea13202452304de1eaab9">
-  <!ENTITY libnsl-size          "280 KB">
-  <!ENTITY libnsl-buildsize     "3.2 MB">
-  <!ENTITY libnsl-time          "less than 0.1 SBU">
+  <!ENTITY libnsl-md5sum        "9214f674bd0c2bcfdd6c1da0cadb061f">
+  <!ENTITY libnsl-size          "314 KB">
+  <!ENTITY libnsl-buildsize     "8.4 MB">
+  <!ENTITY libnsl-time          "0.1 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -31,9 +32,9 @@
     <para>
       The <application>libnsl</application> package contains the public client
-      interface for NIS(YP). It replaces the NIS library that used to
+      interface for NIS(YP) and NIS+. It replaces the NIS library that used to
       be in glibc.
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -106,5 +107,6 @@
     </para>
 
-<screen><userinput>./configure --sysconfdir=/etc --disable-static &amp;&amp;
+<screen><userinput>autoreconf -fi                &amp;&amp;
+./configure --sysconfdir=/etc &amp;&amp;
 make</userinput></screen>
 
@@ -117,5 +119,7 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install                  &amp;&amp;
+mv /usr/lib/libnsl.so.2* /lib &amp;&amp;
+ln -sfv ../../lib/libnsl.so.2.0.1 /usr/lib/libnsl.so</userinput></screen>
 
   </sect2>
@@ -124,6 +128,12 @@
     <title>Command Explanations</title>
 
+<!-- there is no disable-static in the configure string
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
+-->
+    <para>
+      <command>mv -v /usr/lib/libnsl.so.2* ...</command>: Move shared
+      libraries into /lib so they are available before /usr is mounted.
+    </para>
 
   </sect2>
@@ -142,5 +152,5 @@
         </seg>
         <seg>
-          libnsl.so
+          libnsl.{a,so}
         </seg>
         <seg>
@@ -156,8 +166,8 @@
 
       <varlistentry id="libnsl-lib">
-        <term><filename class="libraryfile">libnsl.so</filename></term>
+        <term><filename class="libraryfile">libnsl.{a,so}</filename></term>
         <listitem>
           <para>
-            provides the NIS (YP) API functions required by other programs
+            provides the NIS (YP) API functions required by other programs.
           </para>
           <indexterm zone="libnsl libnsl-lib">
Index: networking/netlibs/libpcap.xml
===================================================================
--- networking/netlibs/libpcap.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netlibs/libpcap.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY libpcap-download-http "https://www.tcpdump.org/release/libpcap-&libpcap-version;.tar.gz">
+  <!ENTITY libpcap-download-http "http://www.tcpdump.org/release/libpcap-&libpcap-version;.tar.gz">
   <!ENTITY libpcap-download-ftp  " ">
-  <!ENTITY libpcap-md5sum        "28e17495004036567c2cc884b51eba45">
-  <!ENTITY libpcap-size          "916 KB">
-  <!ENTITY libpcap-buildsize     "9.7 MB">
+  <!ENTITY libpcap-md5sum        "21af603d9a591c7d96a6457021d84e6c">
+  <!ENTITY libpcap-size          "844 KB">
+  <!ENTITY libpcap-buildsize     "9.3 MB">
   <!ENTITY libpcap-time          "less than 0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -70,5 +71,4 @@
     </itemizedlist>
 
-<!-- Not needed with 1.10.0
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -81,5 +81,4 @@
       </listitem>
     </itemizedlist>
--->
 
     <bridgehead renderas="sect3">libpcap Dependencies</bridgehead>
@@ -109,5 +108,7 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>patch -Np1 -i ../libpcap-&libpcap-version;-enable_bluetooth-1.patch &amp;&amp;
+
+./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -130,10 +131,9 @@
   </sect2>
 
-<!--
   <sect2 role="commands">
     <title>Command Explanations</title>
 
     <para>
-      <option>- -enable-bluetooth=no</option>: Necessary, if the recommended
+      <option>--enable-bluetooth=no</option>: Necessary, if the recommended
       patch is not applied, because since 1.6.1 this application needs a fix,
       in order to build with <application>bluez-5.21</application>.
@@ -141,5 +141,4 @@
 
   </sect2>
--->
 
   <sect2 role="content">
@@ -156,5 +155,5 @@
         </seg>
         <seg>
-          libpcap.so
+          libpcap.so, libpcap.a (optional)
         </seg>
         <seg>
@@ -174,5 +173,5 @@
         <para>
           provides configuration information for
-          <application>libpcap</application>
+          <application>libpcap</application>.
         </para>
         <indexterm zone="libpcap pcap-config">
@@ -186,5 +185,5 @@
       <listitem>
         <para>
-          are libraries used for user-level packet capture
+          are libraries used for user-level packet capture.
         </para>
         <indexterm zone="libpcap libpcap-lib">
Index: networking/netlibs/libpsl.xml
===================================================================
--- networking/netlibs/libpsl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netlibs/libpsl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -151,5 +152,5 @@
         <listitem>
           <para>
-            queries the Public Suffix List
+            queries the Public Suffix List.
           </para>
           <indexterm zone="libpsl psl">
@@ -163,5 +164,5 @@
         <listitem>
           <para>
-            contains a library used to access the Public Suffix List
+            contains a library used to access the Public Suffix List.
           </para>
           <indexterm zone="libpsl libpsl-lib">
@@ -172,4 +173,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: networking/netlibs/libsoup.xml
===================================================================
--- networking/netlibs/libsoup.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netlibs/libsoup.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,11 +6,11 @@
 
   <!ENTITY libsoup-download-http
-           "&gnome-download-http;/libsoup/2.74/libsoup-&libsoup-version;.tar.xz">
+           "&gnome-download-http;/libsoup/2.72/libsoup-&libsoup-version;.tar.xz">
   <!ENTITY libsoup-download-ftp
-           "&gnome-download-ftp;/libsoup/2.74/libsoup-&libsoup-version;.tar.xz">
-  <!ENTITY libsoup-md5sum        "076f7ceeb73ebae2cc55a4c2877f6926">
+           "&gnome-download-ftp;/libsoup/2.72/libsoup-&libsoup-version;.tar.xz">
+  <!ENTITY libsoup-md5sum        "859380b76b51fb55d720daea3c76c945">
   <!ENTITY libsoup-size          "1.4 MB">
-  <!ENTITY libsoup-buildsize     "15 MB (with tests)"> 
-  <!ENTITY libsoup-time          "0.2 SBU (Using parallelism=4; with tests)">
+  <!ENTITY libsoup-buildsize     "24 MB (with tests)"> 
+  <!ENTITY libsoup-time          "0.3 SBU (Using parallelism=4; with tests)">
 ]>
 
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -73,5 +74,5 @@
       </listitem>
     </itemizedlist>
-<!--
+
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -83,5 +84,5 @@
       </listitem>
     </itemizedlist>
--->
+
     <bridgehead renderas="sect3">libsoup Dependencies</bridgehead>
 
@@ -96,5 +97,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="sysprof"/>, and
       <xref linkend="vala"/>
     </para>
@@ -105,9 +107,7 @@
       <xref linkend="brotli"/>,
       <xref linkend="curl"/> (required to run the test suite),
-      <xref linkend="sysprof"/> (for profiling),
       <xref linkend="mitkrb"/> (required to run the test suite),
       <xref linkend="gtk-doc"/>,
-         <!-- It seems that XMLRPC is part of PHP 5.4.10 -->
-      <xref linkend="php"/> compiled with XMLRPC-EPI 
+      <xref linkend="php"/> compiled with XMLRPC-EPI <!-- It seems that XMLRPC is part of PHP 5.4.10 -->
       support (only used for the XMLRPC regression tests), and
       <xref linkend="samba"/> (ntlm_auth is required to run the test suite)
@@ -121,5 +121,5 @@
   <sect2 role="installation">
     <title>Installation of libsoup</title>
-<!--
+
     <para>
       First, fix a problem in the testsuite caused by
@@ -128,5 +128,5 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../libsoup-&libsoup-version;-testsuite_fix-1.patch</userinput></screen>
--->
+
     <para>
       Install <application>libsoup</application> by running the following
@@ -137,10 +137,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr       \
-      --buildtype=release \
-      -Dvapi=enabled      \
-      -Dgssapi=disabled   \
-      -Dsysprof=disabled  \
-      ..                  &amp;&amp;
+meson --prefix=/usr -Dvapi=enabled -Dgssapi=disabled .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -159,7 +154,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -177,11 +169,5 @@
       <parameter>-Dgssapi=disabled</parameter>: libsoup defaults to building with GSSAPI support,
       which requires Kerberos (as does the test suite). If you are building GNOME or
-      have kerberos installed, remove this option.
-    </para>
-
-    <para>
-      <parameter>-Dsysprof=disabled</parameter>: libsoup will automatically download
-      a git version of <xref linkend="sysprof"/> if git is available or use the installed
-      version if available.  If you need profiling, remove this option.
+      have kerberos installed, remove this switch.
     </para>
 
@@ -221,5 +207,5 @@
         <listitem>
           <para>
-            provides functions for asynchronous HTTP connections
+            provides functions for asynchronous HTTP connections.
           </para>
           <indexterm zone="libsoup libsoup-2">
@@ -233,5 +219,5 @@
         <listitem>
           <para>
-            provides <application>GNOME</application> specific features
+            provides <application>GNOME</application> specific features.
           </para>
           <indexterm zone="libsoup libsoup-gnome-2">
Index: networking/netlibs/libtirpc.xml
===================================================================
--- networking/netlibs/libtirpc.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netlibs/libtirpc.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY libtirpc-download-http "&sourceforge-dl;/libtirpc/libtirpc-&libtirpc-version;.tar.bz2">
   <!ENTITY libtirpc-download-ftp  " ">
-  <!ENTITY libtirpc-md5sum        "cf4ca51f3fc401bea61c702c69171ab0">
+  <!ENTITY libtirpc-md5sum        "f222e258c129c6da2f8f9cfe7f1ed745">
   <!ENTITY libtirpc-size          "504 KB">
-  <!ENTITY libtirpc-buildsize     "6.7 MB">
-  <!ENTITY libtirpc-time          "less than 0.1 SBU">
+  <!ENTITY libtirpc-buildsize     "8.0 MB">
+  <!ENTITY libtirpc-time          "0.1 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -118,5 +119,7 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install &amp;&amp;
+mv -v /usr/lib/libtirpc.so.* /lib &amp;&amp;
+ln -sfv ../../lib/libtirpc.so.3.0.0 /usr/lib/libtirpc.so</userinput></screen>
 
   </sect2>
@@ -132,4 +135,9 @@
       no GSSAPI is installed. Remove this switch if you have one
       installed (for example <xref linkend="mitkrb"/>) and you wish to use it.
+    </para>
+
+    <para>
+      <command>mv -v /usr/lib/libtirpc.so.* ...</command>: Move shared
+      libraries into /lib so they are available before /usr is mounted.
     </para>
 
@@ -167,5 +175,5 @@
           <para>
             provides the Remote Procedure Call (RPC) API functions required by
-            other programs
+            other programs.
           </para>
           <indexterm zone="libtirpc libtirpc-lib">
Index: networking/netlibs/neon.xml
===================================================================
--- networking/netlibs/neon.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netlibs/neon.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -119,6 +120,7 @@
       <parameter>--with-ssl</parameter>: This switch enables SSL support
       using <application>OpenSSL</application> or
-      <application>GnuTLS</application> respectively. To force
-      <application>GnuTLS</application> usage when it is are present,
+      <application>GnuTLS</application> respectively. Remove it if
+      you don't have any of these installed. To force
+      <application>GnuTLS</application> usage when both are present,
       simply pass <option>--with-ssl=gnutls</option> and 
       <option>--with-ca-bundle=/etc/pki/tls/certs/ca-bundle.crt</option> to the
@@ -171,5 +173,5 @@
           <para>
             is a script that provide information about an installed copy
-            of the neon library
+            of the neon library.
           </para>
           <indexterm zone="neon neon-config">
@@ -184,5 +186,5 @@
           <para>
             is used as a high-level interface to common HTTP and WebDAV
-            methods
+            methods.
           </para>
           <indexterm zone="neon libneon">
Index: networking/netlibs/netlibs.xml
===================================================================
--- networking/netlibs/netlibs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netlibs/netlibs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="basicnet-netlibs">
Index: networking/netlibs/nghttp2.xml
===================================================================
--- networking/netlibs/nghttp2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netlibs/nghttp2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,6 +7,6 @@
   <!ENTITY nghttp2-download-http "https://github.com/nghttp2/nghttp2/releases/download/v&nghttp2-version;/nghttp2-&nghttp2-version;.tar.xz">
   <!ENTITY nghttp2-download-ftp  " ">
-  <!ENTITY nghttp2-md5sum        "d9702786d89ec8053a96ab4768a172e4">
-  <!ENTITY nghttp2-size          "3.8 MB">
+  <!ENTITY nghttp2-md5sum        "c38f1d230af8cec480ff9dd60c9e0db0">
+  <!ENTITY nghttp2-size          "3.9 MB">
   <!ENTITY nghttp2-buildsize     "21 MB">
   <!ENTITY nghttp2-time          "0.1 SBU">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -80,8 +81,7 @@
     <para role="optional">
       <xref linkend="boost"/>, <!--required for the C++ asio library)-->
-      <xref linkend="c-ares"/>, <!-- required to build the HPACK tools -->
       <xref linkend="jansson"/>, <!-- required to build the HPACK tools -->
       <xref linkend="libevent"/>, <!--required to build the examples-->
-      <!--<xref linkend="python2"/>,--> <!--required for the python bindings)-->
+      <xref linkend="python2"/>, <!--required for the python bindings)-->
 <!---      <phrase revision="systemd">
         <xref linkend="setuptools"/>, <!- -(required for the python bindings- ->
@@ -185,5 +185,5 @@
         <listitem>
           <para>
-            an implementation of the Hypertext Transfer Protocol version 2 in C
+            an implementation of the Hypertext Transfer Protocol version 2 in C.
           </para>
           <indexterm zone="nghttp2 libnghttp2">
Index: networking/netlibs/rpcsvc-proto.xml
===================================================================
--- networking/netlibs/rpcsvc-proto.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netlibs/rpcsvc-proto.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -130,5 +131,5 @@
         <listitem>
           <para>
-            Generates C code to implement the RPC protocol
+            Generates C code to implement the RPC protocol.
           </para>
           <indexterm zone="rpcsvc-proto rpcgen">
Index: networking/netlibs/serf.xml
===================================================================
--- networking/netlibs/serf.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netlibs/serf.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -184,5 +185,5 @@
         <listitem>
           <para>
-            contains the <application>Serf</application> API functions
+            contains the <application>Serf</application> API functions.
           </para>
           <indexterm zone="serf libserf-1">
Index: networking/netlibs/uhttpmock.xml
===================================================================
--- networking/netlibs/uhttpmock.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netlibs/uhttpmock.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY uhttpmock-download-http "https://tecnocode.co.uk/downloads/uhttpmock/uhttpmock-&uhttpmock-version;.tar.xz">
+  <!ENTITY uhttpmock-download-http "http://tecnocode.co.uk/downloads/uhttpmock/uhttpmock-&uhttpmock-version;.tar.xz">
   <!ENTITY uhttpmock-download-ftp  " ">
   <!ENTITY uhttpmock-md5sum        "dcbd66e80e1635e41b0e434b9852bd39">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -158,5 +159,5 @@
         <listitem>
           <para>
-            contains the <application>uhttpmock</application> API functions
+            contains the <application>uhttpmock</application> API functions.
           </para>
           <indexterm zone="uhttpmock libuhttpmock-0.0">
Index: networking/netprogs/bridgeutils.xml
===================================================================
--- networking/netprogs/bridgeutils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netprogs/bridgeutils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY bridge-download-http "&kernel-dl;/linux/utils/net/bridge-utils/bridge-utils-&bridgeutils-version;.tar.xz">
   <!ENTITY bridge-download-ftp  " ">
-  <!ENTITY bridge-md5sum        "3e1fee4dc22cac5457c2f6ffb990a518">
-  <!ENTITY bridge-size          "29 KB">
-  <!ENTITY bridge-buildsize     "1.1 MB">
+  <!ENTITY bridge-md5sum        "541ae1c50cc268056693608920e6c908">
+  <!ENTITY bridge-size          "32 KB">
+  <!ENTITY bridge-buildsize     "916 KB">
   <!ENTITY bridge-time          "less than 0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -246,5 +247,5 @@
           <para>
             is a program  used to set up, maintain, and inspect the
-            ethernet bridge configuration in the linux kernel
+            ethernet bridge configuration in the linux kernel.
           </para>
           <indexterm zone="bridgeutils brctl">
Index: networking/netprogs/cifsutils.xml
===================================================================
--- networking/netprogs/cifsutils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netprogs/cifsutils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY cifsutils-download-http "https://www.samba.org/ftp/linux-cifs/cifs-utils/cifs-utils-&cifsutils-version;.tar.bz2">
   <!ENTITY cifsutils-download-ftp  " ">
-  <!ENTITY cifsutils-md5sum        "4348921483c530826950e9503b08b033">
-  <!ENTITY cifsutils-size          "405 KB">
-  <!ENTITY cifsutils-buildsize     "3.3 MB">
+  <!ENTITY cifsutils-md5sum        "b49b10692bcae7f28669173a472077dd">
+  <!ENTITY cifsutils-size          "404 KB">
+  <!ENTITY cifsutils-buildsize     "4.7 MB">
   <!ENTITY cifsutils-time          "0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -84,5 +85,5 @@
       <xref linkend="samba"/>, and
       <xref linkend="libcap-pam"/> or
-      <ulink url="https://people.redhat.com/sgrubb/libcap-ng/">
+      <ulink url="http://people.redhat.com/sgrubb/libcap-ng/">
         libcap-ng
       </ulink>
@@ -125,10 +126,12 @@
     </para>
 
-<screen revision="sysv"><userinput>./configure --prefix=/usr \
+<screen revision="sysv"><userinput>autoreconf -fiv           &amp;&amp;
+./configure --prefix=/usr \
             --disable-pam \
             --disable-systemd &amp;&amp;
 make</userinput></screen>
 
-<screen revision="systemd"><userinput>./configure --prefix=/usr \
+<screen revision="systemd"><userinput>autoreconf -fiv           &amp;&amp;
+./configure --prefix=/usr \
             --disable-pam &amp;&amp;
 make</userinput></screen>
@@ -168,6 +171,6 @@
 
     <para>
-      <option>--with-pamdir=/usr/lib/security</option>: Install the PAM
-      module in <filename class="directory">/usr/lib/security</filename>.
+      <option>--with-pamdir=/lib/security</option>: Install the PAM
+      module in <filename class="directory">/lib/security</filename>.
     </para>
 
@@ -186,5 +189,5 @@
           mount.cifs, mount.smb3, setcifsacl, smb2-quota, and smbinfo</seg>
         <seg>/usr/lib/cifs-utils/idmapwb.so and optionally
-          PAM module /usr/lib/security/pam_cifscreds.so</seg>
+          PAM module /lib/security/pam_cifscreds.so</seg>
         <seg>/usr/lib/cifs-utils</seg>
       </seglistitem>
@@ -204,5 +207,5 @@
             itself. This program is a callout program that does these
             things for the kernel and then returns the result. It is not
-            intended to be run from the command-line
+            intended to be run from the command-line.
           </para>
           <indexterm zone="cifsutils cifs.idmap">
@@ -219,5 +222,5 @@
             filesystem. It is intended to be run when the kernel calls
             request-key for a particular key type.  It is not intended to be
-            run from the command-line
+            run from the command-line.
           </para>
           <indexterm zone="cifsutils cifs.upcall">
@@ -232,5 +235,5 @@
           <para>
             is a tool for managing credentials (username and password)
-            for the purpose of establishing sessions in multiuser mounts
+            for the purpose of establishing sessions in multiuser mounts.
           </para>
           <indexterm zone="cifsutils cifscreds">
@@ -245,5 +248,5 @@
           <para>
             is a userspace helper  to display an ACL in a security
-            descriptor for Common Internet File System (CIFS)
+            descriptor for Common Internet File System (CIFS).
           </para>
           <indexterm zone="cifsutils getcifsacl">
@@ -258,5 +261,5 @@
           <para>
             mounts a Linux CIFS filesystem. It is usually invoked
-            indirectly by the mount(8) command when using the "-t cifs" option
+            indirectly by the mount(8) command when using the "-t cifs" option.
           </para>
           <indexterm zone="cifsutils mount.cifs">
@@ -271,5 +274,5 @@
           <para>
             mounts a SMB3-based filesystem. It is usually invoked
-            indirectly by the mount(8) command when using the "-t smb3" option
+            indirectly by the mount(8) command when using the "-t smb3" option.
           </para>
           <indexterm zone="cifsutils mount.smb3">
@@ -284,5 +287,5 @@
           <para>
             is intended to alter an ACL of a security descriptor for a file
-            system object
+            system object.
           </para>
           <indexterm zone="cifsutils setcifsacl">
@@ -296,5 +299,5 @@
         <listitem>
           <para>
-            displays quota information for a SMB filesystem
+            displays quota information for a SMB filesystem.
           </para>
           <indexterm zone="cifsutils smb2-quota">
@@ -309,5 +312,5 @@
           <para>
             displays SMB-specific file information, such as security
-            descriptors and quotas
+            descriptors and quotas.
           </para>
           <indexterm zone="cifsutils smbinfo">
Index: networking/netprogs/iw.xml
===================================================================
--- networking/netprogs/iw.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netprogs/iw.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -139,5 +140,5 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make SBINDIR=/sbin install</userinput></screen>
 
   </sect2>
@@ -177,5 +178,5 @@
         <listitem>
           <para>
-            shows / manipulates wireless devices and their configuration
+            shows / manipulates wireless devices and their configuration.
           </para>
           <indexterm zone="iw iw-prog">
Index: networking/netprogs/ncftp.xml
===================================================================
--- networking/netprogs/ncftp.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netprogs/ncftp.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -237,5 +238,5 @@
         <listitem>
           <para>
-            is a browser program for File Transfer Protocol
+            is a browser program for File Transfer Protocol.
           </para>
           <indexterm zone="ncftp ncftp-prog">
@@ -249,5 +250,5 @@
         <listitem>
           <para>
-            is an individual batch FTP job processor
+            is an individual batch FTP job processor.
           </para>
           <indexterm zone="ncftp ncftpbatch">
@@ -262,5 +263,5 @@
           <para>
             is the <application>NcFTP</application> Bookmark Editor
-            (<application>NCurses</application>-based)
+            (<application>NCurses</application>-based).
           </para>
           <indexterm zone="ncftp ncftpbookmarks">
@@ -275,5 +276,5 @@
           <para>
             is an internet file transfer program for scripts used to
-            retrieve files
+            retrieve files.
           </para>
           <indexterm zone="ncftp ncftpget">
@@ -288,5 +289,5 @@
           <para>
             is an internet file transfer program for scripts used to
-            list files
+            list files.
           </para>
           <indexterm zone="ncftp ncftpls">
@@ -301,5 +302,5 @@
           <para>
             is an internet file transfer program for scripts used to
-            transfer files
+            transfer files.
           </para>
           <indexterm zone="ncftp ncftpput">
@@ -313,5 +314,5 @@
         <listitem>
           <para>
-            is a global batch FTP job processor daemon
+            is a global batch FTP job processor daemon.
           </para>
           <indexterm zone="ncftp ncftpspooler">
Index: networking/netprogs/net-tools.xml
===================================================================
--- networking/netprogs/net-tools.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netprogs/net-tools.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY net-tools-download-http "https://downloads.sourceforge.net/project/net-tools/net-tools-&net-tools-version;.tar.xz">
-  <!ENTITY net-tools-download-ftp  " ">
-  <!ENTITY net-tools-md5sum        "78aae762c95e2d731faf88d482e4cde5">
-  <!ENTITY net-tools-size          "228 KB">
-  <!ENTITY net-tools-buildsize     "7.5 MB">
+  <!ENTITY net-tools-download-http "&sources-anduin-http;/net-tools/net-tools-&net-tools-version;.tar.gz">
+  <!ENTITY net-tools-download-ftp  "&sources-anduin-ftp;/net-tools/net-tools-&net-tools-version;.tar.gz">
+  <!ENTITY net-tools-md5sum        "6be14ed473cacdd68edeaa9605adc469">
+  <!ENTITY net-tools-size          "288 KB">
+  <!ENTITY net-tools-buildsize     "7.0 MB">
   <!ENTITY net-tools-time          "less than 0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -69,5 +70,5 @@
       </listitem>
     </itemizedlist>
-<!--
+
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -79,5 +80,5 @@
       </listitem>
     </itemizedlist>
--->
+
 
     <para condition="html" role="usernotes">User Notes:
@@ -91,7 +92,7 @@
     <para id="net-tools-automate-example" xreflabel="Net-tools">
       The instructions below automate the configuration process by piping
-      <command>yes</command> to the <command>make</command> command.
+      <command>yes</command> to the <command>make config</command> command.
       If you wish to run the interactive configuration process (by changing
-      the instruction to just <command>make</command>), but you are
+      the instruction to just <command>make config</command>), but you are
       not sure how to answer all the questions, then just accept the defaults.
       This will be just fine in the majority of cases. What you're asked here
@@ -116,11 +117,8 @@
 
     <para>
-      For this package, we use the DESTDIR method of installation in order
-      to easily remove files from the build that overwrite those that we want
-      to keep or are not appropriate for our system.
-    </para>
-
-    <!-- When building with MAKEFLAGS set to a -j value higher than 1, a race
-         condition will occur. -renodr -->
+      The patch below cleans up the installation so that it does not
+      overwrite the <application>ifconfig</application> and
+      <application>hostname</application> programs that were installed in LFS.
+    </para>
 
     <para>
@@ -129,12 +127,9 @@
     </para>
 
-<screen><userinput>export BINDIR='/usr/bin' SBINDIR='/usr/bin' &amp;&amp;
-yes "" | make -j1                           &amp;&amp;
-make DESTDIR=$PWD/install -j1 install       &amp;&amp;
-rm    install/usr/bin/{nis,yp}domainname    &amp;&amp;
-rm    install/usr/bin/{hostname,dnsdomainname,domainname,ifconfig} &amp;&amp;
-rm -r install/usr/share/man/man1            &amp;&amp;
-rm    install/usr/share/man/man8/ifconfig.8 &amp;&amp;
-unset BINDIR SBINDIR</userinput></screen>
+<screen><userinput>patch -Np1 -i ../net-tools-&net-tools-version;-remove_dups-1.patch &amp;&amp;
+sed -i '/#include &lt;netinet\/ip.h&gt;/d'  iptunnel.c &amp;&amp;
+
+yes "" | make config &amp;&amp;
+make</userinput></screen>
 
     <para>
@@ -146,6 +141,5 @@
     </para>
 
-<screen role='root'><userinput>chown -R root:root install &amp;&amp;
-cp -a install/* /</userinput></screen>
+<screen role='root'><userinput>make update</userinput></screen>
 
   </sect2>
@@ -155,16 +149,24 @@
 
     <para>
-      <command>export BINDIR='/usr/bin' SBINDIR='/usr/bin'</command>:
-      Ensure the executables are installed in the correct location.
-    </para>
-
-    <para>
-      <command>yes "" | make </command>: Piping <command>yes</command>
+      <command>sed -i '/#include &lt;netinet\/ip.h&gt;/d' iptunnel.c</command>:
+      This fixes build breakage with linux-4.8 headers.
+    </para>
+<!--
+    <para>
+      <command>sed -i -e '/Token/s/y$/n/' config.in</command>: Change the
+      default for building obsolete token ring support to no.  This is a
+      simpler change than changing the location for the token ring headers.
+    </para>
+
+    <para>
+      <command>sed -i -e '/HAVE_HWSTRIP/s/y$/n/' config.in</command>:
+      Removes obsolete Metricom radio support that requires a header no longer
+      included in the kernel.
+    </para>
+-->
+    <para>
+      <command>yes "" | make config</command>: Piping <command>yes</command>
       to <command>make config</command> skips the interactive configuration and
       accepts the defaults.
-    </para>
-
-    <para>
-      <command>rm ...</command>: Remove unneeded programs and man pages.
     </para>
 
@@ -180,14 +182,7 @@
 
       <seglistitem>
-        <seg>arp, 
-        ipmaddr, 
-        iptunnel, 
-        mii-tool, 
-        nameif, 
-        netstat,
-        plipconfig, 
-        rarp, 
-        route, and 
-        slattach
+        <seg>arp,
+        ipmaddr, iptunnel, mii-tool, nameif, netstat,
+        plipconfig, rarp, route, and slattach
         </seg>
         <seg>None</seg>
@@ -206,5 +201,5 @@
           <para>
             is used to manipulate the kernel's ARP cache, usually
-            to add or delete an entry, or to dump the entire cache
+            to add or delete an entry, or to dump the entire cache.
           </para>
           <indexterm zone="net-tools arp">
@@ -213,10 +208,58 @@
         </listitem>
       </varlistentry>
-
+<!--
+      <varlistentry id="dnsdomainname">
+        <term><command>dnsdomainname</command></term>
+        <listitem>
+          <para>
+            reports the system's DNS domain name.
+          </para>
+          <indexterm zone="net-tools dnsdomainname">
+            <primary sortas="b-dnsdomainname">dnsdomainname</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="domainname">
+        <term><command>domainname</command></term>
+        <listitem>
+          <para>
+            reports or sets the system's NIS/YP domain name.
+          </para>
+          <indexterm zone="net-tools domainname">
+            <primary sortas="b-domainname">domainname</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="hostname">
+        <term><command>hostname</command></term>
+        <listitem>
+          <para>
+            reports or sets the name of the current host system.
+          </para>
+          <indexterm zone="net-tools hostname">
+            <primary sortas="b-hostname">hostname</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ifconfig">
+        <term><command>ifconfig</command></term>
+        <listitem>
+          <para>
+            is the main utility for configuring network interfaces.
+          </para>
+          <indexterm zone="net-tools ifconfig">
+            <primary sortas="b-ifconfig">ifconfig</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+-->
       <varlistentry id="ipmaddr">
         <term><command>ipmaddr</command></term>
         <listitem>
           <para>
-            adds, deletes and shows an interface's multicast addresses
+            adds, deletes and shows an interface's multicast addresses.
           </para>
           <indexterm zone="net-tools ipmaddr">
@@ -230,5 +273,5 @@
         <listitem>
           <para>
-            adds, changes, deletes and shows an interface's tunnels
+            adds, changes, deletes and shows an interface's tunnels.
           </para>
           <indexterm zone="net-tools iptunnel">
@@ -243,5 +286,5 @@
           <para>
             checks or sets the status of a network interface's Media
-            Independent Interface (MII) unit
+            Independent Interface (MII) unit.
           </para>
           <indexterm zone="net-tools mii-tool">
@@ -255,5 +298,5 @@
         <listitem>
           <para>
-            names network interfaces based on MAC addresses
+            names network interfaces based on MAC addresses.
           </para>
           <indexterm zone="net-tools nameif">
@@ -268,5 +311,5 @@
           <para>
             is used to report network connections, routing tables, and
-            interface statistics
+            interface statistics.
           </para>
           <indexterm zone="net-tools netstat">
@@ -275,5 +318,17 @@
         </listitem>
       </varlistentry>
-
+<!--
+      <varlistentry id="nisdomainname">
+        <term><command>nisdomainname</command></term>
+        <listitem>
+          <para>
+            does the same as <command>domainname</command>.
+          </para>
+          <indexterm zone="net-tools nisdomainname">
+            <primary sortas="b-nisdomainname">nisdomainname</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+-->
       <varlistentry id="plipconfig">
         <term><command>plipconfig</command></term>
@@ -281,5 +336,5 @@
           <para>
             is used to fine tune the PLIP device parameters, to
-            improve its performance
+            improve its performance.
           </para>
           <indexterm zone="net-tools plipconfig">
@@ -293,5 +348,5 @@
         <listitem>
           <para>
-            is used to manipulate the kernel's RARP table
+            is used to manipulate the kernel's RARP table.
           </para>
           <indexterm zone="net-tools rarp">
@@ -305,5 +360,5 @@
         <listitem>
           <para>
-            is used to manipulate the IP routing table
+            is used to manipulate the IP routing table.
           </para>
           <indexterm zone="net-tools route">
@@ -319,5 +374,5 @@
             attaches a network interface to a serial line. This allows you to
             use normal terminal lines for point-to-point links to others
-            computers
+            computers.
           </para>
           <indexterm zone="net-tools slattach">
@@ -326,4 +381,17 @@
         </listitem>
       </varlistentry>
+<!--
+      <varlistentry id="ypdomainname">
+        <term><command>ypdomainname</command></term>
+        <listitem>
+          <para>
+            does the same as <command>domainname</command>.
+          </para>
+          <indexterm zone="net-tools ypdomainname">
+            <primary sortas="b-ypdomainname">ypdomainname</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+-->
     </variablelist>
 
Index: networking/netprogs/netfs.xml
===================================================================
--- networking/netprogs/netfs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netprogs/netfs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: networking/netprogs/netprogs.xml
===================================================================
--- networking/netprogs/netprogs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netprogs/netprogs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="netprogs">
Index: networking/netprogs/nfs-utils.xml
===================================================================
--- networking/netprogs/nfs-utils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netprogs/nfs-utils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,7 +8,7 @@
   <!ENTITY nfs-utils-download-http "&nfs-utils-root;/&nfs-utils-version;/nfs-utils-&nfs-utils-version;.tar.xz">
   <!ENTITY nfs-utils-download-ftp  " ">
-  <!ENTITY nfs-utils-md5sum        "7e330130ac9677c34bba5ab512036bef">
-  <!ENTITY nfs-utils-size          "688 KB">
-  <!ENTITY nfs-utils-buildsize     "19 MB">
+  <!ENTITY nfs-utils-md5sum        "8c2a746325cb620f55751563356b0804">
+  <!ENTITY nfs-utils-size          "684 KB">
+  <!ENTITY nfs-utils-buildsize     "20 MB">
   <!ENTITY nfs-utils-time          "0.2 SBU">
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -85,6 +86,5 @@
       <xref linkend="cyrus-sasl"/> (for SASL authentication),
       <xref linkend="lvm2"/> (libdevmapper for NFSv4 support),
-      <!--<xref linkend="libnfsidmap"/> (for NFSv4 support),
-      This is now built in, as of 2.2.1-->
+      <xref linkend="libnfsidmap"/> (for NFSv4 support),
       <xref linkend="libnsl"/> (for NIS client support),
       <xref linkend="openldap"/> (for LDAP authentication),
@@ -200,5 +200,5 @@
 <screen><userinput>./configure --prefix=/usr          \
             --sysconfdir=/etc      \
-            --sbindir=/usr/sbin    \
+            --sbindir=/sbin        \
             --disable-nfsv4        \
             --disable-gss &amp;&amp;
@@ -218,5 +218,5 @@
 
 <screen role='root'><userinput>make install                      &amp;&amp;
-chmod u+w,go+r /usr/sbin/mount.nfs    &amp;&amp;
+chmod u+w,go+r /sbin/mount.nfs    &amp;&amp;
 chown nobody.nogroup /var/lib/nfs</userinput></screen>
 
@@ -242,11 +242,10 @@
       to fix a build issue with glibc-2.26 and later.
     </para>
-
-    <para>
-      <parameter>- -disable-nfsv4</parameter>: This allows the package to be
+-->
+    <para>
+      <parameter>--disable-nfsv4</parameter>: This allows the package to be
       built when libnfsidmap has not been installed.
     </para>
-    nfs-utils now carries libnfsidmap
--->
+
     <para>
       <parameter>--disable-gss</parameter>: Disables support for
@@ -478,5 +477,5 @@
         <listitem>
           <para>
-            maintains a list of NFS exported file systems
+            maintains a list of NFS exported file systems.
           </para>
           <indexterm zone="nfs-utils exportfs">
@@ -490,5 +489,5 @@
         <listitem>
           <para>
-            displays NFS client per-mount statistics
+            displays NFS client per-mount statistics.
           </para>
           <indexterm zone="nfs-utils mountstats">
@@ -502,5 +501,5 @@
         <listitem>
           <para>
-            is used to mount a network share using NFS
+            is used to mount a network share using NFS.
           </para>
           <indexterm zone="nfs-utils mount.nfs">
@@ -514,5 +513,5 @@
         <listitem>
           <para>
-            is used to mount a network share using NFSv4
+            is used to mount a network share using NFSv4.
           </para>
           <indexterm zone="nfs-utils mount.nfs4">
@@ -527,5 +526,5 @@
           <para>
             can be used to test for and retrieve configuration settings from
-            a range of nfs-utils configuration files
+            a range of nfs-utils configuration files.
           </para>
           <indexterm zone="nfs-utils nfsconf">
@@ -539,5 +538,5 @@
         <listitem>
           <para>
-            prints information about NFS clients
+            prints information about NFS clients.
           </para>
           <indexterm zone="nfs-utils nfsdclnts">
@@ -551,5 +550,5 @@
         <listitem>
           <para>
-            reports input/output statistics for network filesystems
+            reports input/output statistics for network filesystems.
           </para>
           <indexterm zone="nfs-utils nfsiostat-nfs-utils">
@@ -563,5 +562,5 @@
         <listitem>
           <para>
-            displays statistics kept about NFS client and server activity
+            displays statistics kept about NFS client and server activity.
           </para>
           <indexterm zone="nfs-utils nfsstat">
@@ -590,5 +589,5 @@
         <listitem>
           <para>
-            implements the NFS mount protocol on an NFS server
+            implements the NFS mount protocol on an NFS server.
           </para>
           <indexterm zone="nfs-utils rpc.mountd">
@@ -603,5 +602,5 @@
           <para>
             implements the user level part of the NFS
-            service on the server
+            service on the server.
           </para>
           <indexterm zone="nfs-utils rpc.nfsd">
@@ -616,5 +615,5 @@
           <para>
             is used by the NFS file locking service. Run on both sides,
-            client as well as server, when you want file locking enabled
+            client as well as server, when you want file locking enabled.
           </para>
           <indexterm zone="nfs-utils rpc.statd">
@@ -628,5 +627,5 @@
         <listitem>
           <para>
-            sets or clears the kernel's NFS client and server debug flags
+            sets or clears the kernel's NFS client and server debug flags.
           </para>
           <indexterm zone="nfs-utils rpcdebug">
@@ -640,5 +639,5 @@
         <listitem>
           <para>
-            displays mount information for an NFS server
+            displays mount information for an NFS server.
           </para>
           <indexterm zone="nfs-utils showmount">
@@ -652,5 +651,5 @@
         <listitem>
           <para>
-            is used to send Network Status Monitor reboot messages
+            is used to send Network Status Monitor reboot messages.
           </para>
           <indexterm zone="nfs-utils sm-notify">
@@ -666,5 +665,5 @@
             is a script called by nfsmount when mounting a filesystem with
             locking enabled, if statd does not appear to be running. It can be
-            customised with whatever flags are appropriate for the site
+            customised with whatever flags are appropriate for the site.
           </para>
           <indexterm zone="nfs-utils start-statd">
@@ -678,5 +677,5 @@
         <listitem>
           <para>
-            is used to unmount a network share using NFS
+            is used to unmount a network share using NFS.
           </para>
           <indexterm zone="nfs-utils umount.nfs">
@@ -690,5 +689,5 @@
         <listitem>
           <para>
-            is used to unmount a network share using NFSv4
+            is used to unmount a network share using NFSv4.
           </para>
           <indexterm zone="nfs-utils umount.nfs4">
Index: networking/netprogs/ntp.xml
===================================================================
--- networking/netprogs/ntp.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netprogs/ntp.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -127,16 +128,14 @@
 
     <para>
-      Now fix an issue introduced with glibc-2.34:
-    </para>
-
-<screen><userinput>sed -e 's/#ifndef __sun/#if !defined(__sun) \&amp;\&amp; !defined(__GLIBC__)/' \
-    -i libntp/work_thread.c</userinput></screen>
-
-    <para>
       Install <application>ntp</application> by running
       the following commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr         \
+<!--
+  Note: Check if -fcommon is still required on versions gtr 4.2.8p14
+        Its a "hack" for gcc-10
+-->
+<screen><userinput>./configure CFLAGS="-O2 -g -fPIC -fcommon $CFLAGS" \
+            --prefix=/usr         \
             --bindir=/usr/sbin    \
             --sysconfdir=/etc     \
@@ -242,5 +241,5 @@
 
 driftfile /var/lib/ntp/ntp.drift
-pidfile   /run/ntpd.pid
+pidfile   /var/run/ntpd.pid
 
 leapfile  /var/lib/ntp/ntp.leapseconds</literal>
@@ -347,5 +346,5 @@
         <listitem>
           <para>
-            calculates optimal value for tick given ntp drift file
+            calculates optimal value for tick given ntp drift file.
           </para>
           <indexterm zone="ntp calc_tickadj">
@@ -360,5 +359,5 @@
           <para>
             generates cryptographic data files used by the NTPv4 authentication
-            and identification schemes
+            and identification schemes.
           </para>
           <indexterm zone="ntp ntp-keygen">
@@ -373,5 +372,5 @@
           <para>
             is useful at boot time, to delay the boot sequence until
-            <command>ntpd</command> has set the time
+            <command>ntpd</command> has set the time.
           </para>
           <indexterm zone="ntp ntp-wait">
@@ -387,5 +386,5 @@
             is a ntp daemon that runs in the background and keeps
             the date and time synchronized based on response from configured
-            ntp servers. It also functions as a ntp server
+            ntp servers. It also functions as a ntp server.
           </para>
           <indexterm zone="ntp ntpd">
@@ -400,5 +399,5 @@
           <para>
             is a client program that sets the date and time based on
-            the response from an ntp server. This command is deprecated
+            the response from an ntp server. This command is deprecated.
           </para>
           <indexterm zone="ntp ntpdate">
@@ -413,5 +412,5 @@
           <para>
             is used to query the ntp daemon about its current state
-            and to request changes in that state
+            and to request changes in that state.
           </para>
           <indexterm zone="ntp ntpdc">
@@ -426,5 +425,5 @@
           <para>
             is a utility program used to monitor <command>ntpd</command>
-            operations and determine performance
+            operations and determine performance.
           </para>
           <indexterm zone="ntp ntpq">
@@ -438,5 +437,5 @@
         <listitem>
           <para>
-            reads and displays time-related kernel variables
+            reads and displays time-related kernel variables.
           </para>
           <indexterm zone="ntp ntptime">
@@ -450,5 +449,5 @@
         <listitem>
           <para>
-            traces a chain of ntp servers back to the primary source
+            traces a chain of ntp servers back to the primary source.
           </para>
           <indexterm zone="ntp ntptrace">
@@ -462,5 +461,5 @@
         <listitem>
           <para>
-            is a Simple Network Time Protocol (SNTP) client
+            is a Simple Network Time Protocol (SNTP) client.
           </para>
           <indexterm zone="ntp sntp">
@@ -476,5 +475,5 @@
             reads, and optionally modifies, several timekeeping-related
             variables in older kernels that do not have support for precision
-            timekeeping
+            timekeeping.
           </para>
           <indexterm zone="ntp tickadj">
@@ -489,5 +488,5 @@
           <para>
             is a script to verify and, if necessary, update the leap-second
-            definition file
+            definition file.
           </para>
           <indexterm zone="ntp update-leap">
Index: networking/netprogs/rpcbind.xml
===================================================================
--- networking/netprogs/rpcbind.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netprogs/rpcbind.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY rpcbind-download-http "&sourceforge-dl;/rpcbind/rpcbind-&rpcbind-version;.tar.bz2">
   <!ENTITY rpcbind-download-ftp  " ">
-  <!ENTITY rpcbind-md5sum        "2d84ebbb7d6fb1fc3566d2d4b37f214b">
+  <!ENTITY rpcbind-md5sum        "ed46f09b9c0fa2d49015f6431bc5ea7b">
   <!ENTITY rpcbind-size          "124 KB">
-  <!ENTITY rpcbind-buildsize     "1.6 MB">
+  <!ENTITY rpcbind-buildsize     "1.7 MB">
   <!ENTITY rpcbind-time          "less than 0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -120,13 +121,9 @@
     </para>
 
-<!-- Previously, there were switches for bindir= and sbindir= pointing to /sbin
-     However, with a DESTDIR= install after merged-/usr changes, I think we can
-     just run bindir=/usr/sbin to get rpcinfo in /usr/sbin, and leave sbindir=
-     alone. -renodr -->
-
 <screen revision="sysv"><userinput>patch -Np1 -i ../rpcbind-&rpcbind-version;-vulnerability_fixes-1.patch &amp;&amp;
 
 ./configure --prefix=/usr                                  \
-            --bindir=/usr/sbin                             \
+            --bindir=/sbin                                 \
+            --sbindir=/sbin                                \
             --with-rpcuser=root                            \
             --enable-warmstarts                            \
@@ -137,5 +134,6 @@
 
 ./configure --prefix=/usr       \
-            --bindir=/usr/sbin  \
+            --bindir=/sbin      \
+            --sbindir=/sbin     \
             --enable-warmstarts \
             --with-rpcuser=rpc  &amp;&amp;
@@ -233,5 +231,5 @@
             is a server that converts RPC program numbers into universal
             addresses.  It must be running on the host to be able to make RPC
-            calls on a server on that machine
+            calls on a server on that machine.
           </para>
           <indexterm zone="rpcbind rpcbind-prog">
@@ -246,5 +244,5 @@
           <para>
             makes an RPC call to an RPC server and reports data according
-            to the requested options
+            to the requested options.
           </para>
           <indexterm zone="rpcbind rpcinfo">
Index: networking/netprogs/rsync.xml
===================================================================
--- networking/netprogs/rsync.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netprogs/rsync.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -104,5 +105,5 @@
 
 <screen role="root"><userinput>groupadd -g 48 rsyncd &amp;&amp;
-useradd -c "rsyncd Daemon" -m -d /home/rsync -g rsyncd \
+useradd -c "rsyncd Daemon" -d /home/rsync -g rsyncd \
     -s /bin/false -u 48 rsyncd</userinput></screen>
 
@@ -312,5 +313,5 @@
             syncing remote files. It does this by sending just the differences
             in the files across the link, without requiring that both sets of
-            files are present at one end of the link beforehand
+            files are present at one end of the link beforehand.
           </para>
           <indexterm zone="rsync rsync-prog">
@@ -325,5 +326,5 @@
           <para>
             is a helper script used when connecting to an rsync daemon that
-            has SSL support built in
+            has SSL support built in.
           </para>
           <indexterm zone="rsync rsync-ssl">
Index: networking/netprogs/samba.xml
===================================================================
--- networking/netprogs/samba.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netprogs/samba.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY samba-download-http "https://www.samba.org/ftp/samba/stable/samba-&samba-version;.tar.gz">
   <!ENTITY samba-download-ftp  " ">
-  <!ENTITY samba-md5sum        "f0db8302944bb861b31f4163fd302f66">
+  <!ENTITY samba-md5sum        "8a412bc5b58f35cd4721fa6ec4629ce0">
   <!ENTITY samba-size          "18 MB">
-  <!ENTITY samba-buildsize     "622 MB (add 379 MB for quicktest)">
-  <!ENTITY samba-time          "3.1 SBU (using parallelism=4; add 4.9 SBU for quicktest)">
+  <!ENTITY samba-buildsize     "629 MB (add 380 MB for quicktest)">
+  <!ENTITY samba-time          "3.1 SBU (using parallelism=4; add 5.1 SBU for quicktest)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -93,8 +94,8 @@
       <xref linkend="gpgme"/>,
       <xref linkend="icu"/>,
-      <xref linkend="libtasn1"/>,
       <xref linkend="libxslt"/> (for documentation),
       <xref linkend="linux-pam"/>,
-      <xref linkend="perl-parse-yapp"/>, and
+      <xref linkend="perl-parse-yapp"/>,
+      <xref linkend="pycryptodome"/>, and
       <xref linkend="openldap"/>
     </para>
@@ -123,18 +124,15 @@
       <xref linkend="xfsprogs"/>,
       <ulink url="https://cmocka.org/">cmocka</ulink>,
-      <ulink url="https://cryptography.io/en/latest/">cryptography</ulink>,
       <ulink url="https://ctdb.samba.org/">ctdb</ulink> (included),
       <ulink url="https://cwrap.org/">cwrap</ulink>,
       <ulink url="&pypi;/dnspython/">dnspython</ulink>,
-      <ulink url="https://packages.debian.org/stretch/fam">FAM</ulink>,
+      <ulink url="https://packages.debian.org/stretch/fam/">FAM</ulink>,
       <ulink url="https://people.gnome.org/~veillard/gamin/">Gamin</ulink>,
       <ulink url="https://www.gluster.org/">GlusterFS</ulink>,
       <ulink url="https://github.com/heimdal/">Heimdal</ulink> (included),
-      <ulink url="https://pypi.org/project/iso8601/">iso8601</ulink>,
       <ulink url="http://www.nongnu.org/libunwind/">libunwind</ulink>,
       <ulink url="https://ldb.samba.org/">ldb</ulink> (included),
       <ulink url="&pypi;/m2crypto">M2Crypto</ulink> (required for ADS),
       <ulink url="http://www.openafs.org/">OpenAFS</ulink>,
-      <ulink url="https://pypi.org/project/pyasn1/">pyasn1</ulink>,
       <ulink url="&pypi;/pygpgme/">PyGPGME</ulink> (recommended for ADS),
       <ulink url="https://tevent.samba.org/">tevent</ulink> (included), and
@@ -178,10 +176,9 @@
 
     <para>
-      To support the test suite, set up a Python virtual environment
-      for some Python modules out of the scope of BLFS:
-    </para>
-
-<screen><userinput remap="pre">python3 -m venv pyvenv &amp;&amp;
-./pyvenv/bin/pip3 install cryptography pyasn1 iso8601</userinput></screen>
+      Fix a file that fails to compile with Glibc-2.32:
+    </para>
+
+<screen><userinput>sed -r 's/nss_(setpw|endpw|setgr|endgr)ent/my_&amp;/' \
+    -i nsswitch/nsstest.c</userinput></screen>
 
     <para>
@@ -196,32 +193,29 @@
     </para>
 
-<screen revision="sysv"><userinput>PYTHON=$PWD/pyvenv/bin/python3             \
-CPPFLAGS="-I/usr/include/tirpc"            \
-LDFLAGS="-ltirpc"                          \
-PATH=$PWD/pyvenv/bin:$PATH                 \
-./configure                                \
-    --prefix=/usr                          \
-    --sysconfdir=/etc                      \
-    --localstatedir=/var                   \
-    --with-piddir=/run/samba               \
-    --with-pammodulesdir=/usr/lib/security \
-    --enable-fhs                           \
-    --without-ad-dc                        \
-    --without-systemd                      \
-    --enable-selftest                      &amp;&amp;
+<screen revision="sysv"><userinput>CFLAGS="-I/usr/include/tirpc"          \
+LDFLAGS="-ltirpc"                      \
+./configure                            \
+    --prefix=/usr                      \
+    --sysconfdir=/etc                  \
+    --localstatedir=/var               \
+    --with-piddir=/run/samba           \
+    --with-pammodulesdir=/lib/security \
+    --enable-fhs                       \
+    --without-ad-dc                    \
+    --without-systemd                  \
+    --enable-selftest                  &amp;&amp;
 make</userinput></screen>
 
-<screen revision="systemd"><userinput>PYTHON=$PWD/pyvenv/bin/python3             \
-CPPFLAGS="-I/usr/include/tirpc"            \
-LDFLAGS="-ltirpc"                          \
-./configure                                \
-    --prefix=/usr                          \
-    --sysconfdir=/etc                      \
-    --localstatedir=/var                   \
-    --with-piddir=/run/samba               \
-    --with-pammodulesdir=/usr/lib/security \
-    --enable-fhs                           \
-    --without-ad-dc                        \
-    --enable-selftest                      &amp;&amp;
+<screen revision="systemd"><userinput>CFLAGS="-I/usr/include/tirpc"          \
+LDFLAGS="-ltirpc"                      \
+./configure                            \
+    --prefix=/usr                      \
+    --sysconfdir=/etc                  \
+    --localstatedir=/var               \
+    --with-piddir=/run/samba           \
+    --with-pammodulesdir=/lib/security \
+    --enable-fhs                       \
+    --without-ad-dc                    \
+    --enable-selftest                  &amp;&amp;
 make</userinput></screen>
 
@@ -229,9 +223,9 @@
       To test the results, as the
       <systemitem class="username">root</systemitem> user, issue:
-      <command>PATH=$PWD/pyvenv/bin:$PATH make quicktest</command>. The test
-      suite will produce lines that look like failures, but these are innocuous.
-      The last few lines of output should report <emphasis>"ALL OK"</emphasis>
-      for a good test run. A summary of any failures can be found in
-      <filename class="directory">./st/summary</filename>. With Samba-4.14.4,
+      <command>make quicktest</command>. The test suite will produce lines that
+      look like failures, but these are innocuous. The last few lines of output
+      should report <emphasis>"ALL OK"</emphasis> for a good test run. A summary
+      of any failures can be found in
+      <filename class="directory">./st/summary</filename>. With Samba-4.12.0,
       many tests are known to fail.
     </para>
@@ -251,6 +245,5 @@
       <para>
         Additionally, developer test suites are available. If you've installed
-        the optional python modules above in the Python virtual environment
-        for building this package, you can run these tests with
+        the optional python modules above, you can run these tests with
         <command>make test</command>. It is not recommended for the average
         builder at around 290 SBU and over a gigabyte of disk space, and you
@@ -260,30 +253,14 @@
 
     <para>
-      Fix a hard coded path to Python 3 interpreter:
-    </para>
-
-<screen><userinput>sed '1s@^.*$@#!/usr/bin/python3@' \
-    -i ./bin/default/source4/scripting/bin/samba-gpupdate.inst</userinput></screen>
-
-    <para>
-      If upgrading from an old version of samba, as the
-      <systemitem class="username">root</systemitem> user, remove the old
-      Python support files to prevent some issues:
-    </para>
-
-<screen role="root"><userinput>rm -rf /usr/lib/python&python3-majorver;/site-packages/samba</userinput></screen>
-
-    <para>
-      Still as the <systemitem class="username">root</systemitem> user,
-      install the package:
+      Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
 <screen role="root"><userinput>make install &amp;&amp;
 
+mv -v /usr/lib/libnss_win{s,bind}.so.*  /lib                       &amp;&amp;
+ln -v -sf ../../lib/libnss_winbind.so.2 /usr/lib/libnss_winbind.so &amp;&amp;
+ln -v -sf ../../lib/libnss_wins.so.2    /usr/lib/libnss_wins.so    &amp;&amp;
+
 install -v -m644    examples/smb.conf.default /etc/samba &amp;&amp;
-
-sed -e "s;log file =.*;log file = /var/log/samba/%m.log;" \
-    -e "s;path = /usr/spool/samba;path = /var/spool/samba;" \
-    -i /etc/samba/smb.conf.default &amp;&amp;
 
 mkdir -pv /etc/openldap/schema                        &amp;&amp;
@@ -329,5 +306,4 @@
     </para>
 
-<!-- FIXME removed during merged-/usr transition.
     <para>
       <command>mv -v /usr/lib/libnss_win{s,bind}.so* /lib</command>:
@@ -343,5 +319,4 @@
       libraries.
     </para>
--->
 
     <para>
@@ -457,6 +432,5 @@
           There is no need to run any <application>Samba</application>
           servers in this scenario, thus you don't need to install the provided
-          <phrase revision="sysv">bootscripts.</phrase>
-          <phrase revision="systemd">systemd units.</phrase>
+          bootscripts.
         </para>
 
@@ -474,5 +448,5 @@
         <para>
           In this case, the <filename>/etc/samba/smb.conf.default</filename>
-          file may be a good template to start from. Also, you should add the
+          file may be a good template to start from. Also add
           <quote>dos charset</quote> and <quote>unix charset</quote> parameters
           to the <quote>[global]</quote> section as described in Scenario 1 in
@@ -535,7 +509,5 @@
           Since the <command>smbd</command> and <command>nmbd</command> daemons
           are needed in this case, install the <filename>samba</filename>
-          <phrase revision="sysv">bootscript.</phrase>
-          <phrase revision="systemd">systemd unit.</phrase>
-          Be sure to run <command>smbpasswd</command> (with the
+          bootscript. Be sure to run <command>smbpasswd</command> (with the
           <option>-a</option> option to add users) to enable and set passwords
           for all accounts that need <application>Samba</application> access.
@@ -555,7 +527,6 @@
           covered in BLFS. Many complete books have been written on these topics
           alone. Note that in some domain membership scenarios, the
-          <command>winbindd</command> daemon and the corresponding
-          <phrase revision="sysv">bootscript</phrase>
-          <phrase revision="systemd">systemd unit</phrase> are needed.
+          <command>winbindd</command> daemon and the corresponding bootscript
+          are needed.
         </para>
 
@@ -762,5 +733,5 @@
         <listitem>
           <para>
-            is the dd command for SMB
+            is the dd command for SMB.
           </para>
           <indexterm zone="samba cifsdd">
@@ -775,5 +746,5 @@
           <para>
             is used to read and manipulate TDB/CTDB databases using
-            the dbwrap interface
+            the dbwrap interface.
           </para>
           <indexterm zone="samba dbwrap_tool">
@@ -789,5 +760,5 @@
             is used to write records to eventlogs from STDIN, add the
             specified source and DLL eventlog registry entries and display the
-            active eventlog names (from <filename>smb.conf</filename>)
+            active eventlog names (from <filename>smb.conf</filename>).
           </para>
           <indexterm zone="samba eventlogadm">
@@ -802,5 +773,5 @@
           <para>
             is used to list info about machines that respond to SMB name
-            queries on a subnet
+            queries on a subnet.
           </para>
           <indexterm zone="samba findsmb">
@@ -815,5 +786,5 @@
           <para>
             is used to run random generic SMB operations against two
-            SMB servers and show the differences in behavior
+            SMB servers and show the differences in behavior.
           </para>
           <indexterm zone="samba gentest">
@@ -828,5 +799,5 @@
           <para>
             is a command-line utility for adding records to an LDB
-            database
+            database.
           </para>
           <indexterm zone="samba ldbadd">
@@ -840,5 +811,5 @@
         <listitem>
           <para>
-            is a command-line program for deleting LDB database records
+            is a command-line program for deleting LDB database records.
           </para>
           <indexterm zone="samba ldbdel">
@@ -852,5 +823,5 @@
         <listitem>
           <para>
-            allows you to edit LDB databases using your preferred editor
+            allows you to edit LDB databases using your preferred editor.
           </para>
           <indexterm zone="samba ldbedit">
@@ -864,5 +835,5 @@
         <listitem>
           <para>
-            allows you to modify records in an LDB database
+            allows you to modify records in an LDB database.
           </para>
           <indexterm zone="samba ldbmodify">
@@ -876,5 +847,5 @@
         <listitem>
           <para>
-            allows you to rename LDB databases
+            allows you to rename LDB databases.
           </para>
           <indexterm zone="samba ldbrename">
@@ -889,5 +860,5 @@
           <para>
             searches an LDB database for records matching a specified
-            expression
+            expression.
           </para>
           <indexterm zone="samba ldbsearch">
@@ -901,5 +872,5 @@
         <listitem>
           <para>
-            is used to find differences in locking between two SMB servers
+            is used to find differences in locking between two SMB servers.
           </para>
           <indexterm zone="samba locktest">
@@ -914,5 +885,5 @@
           <para>
             is used to find differences in wildcard matching between
-            Samba's implementation and that of a remote server
+            Samba's implementation and that of a remote server.
           </para>
           <indexterm zone="samba masktest">
@@ -927,5 +898,5 @@
           <para>
             runs <application>Spotlight</application> searches against a SMB
-            server
+            server.
           </para>
           <indexterm zone="samba mdfind">
@@ -939,5 +910,5 @@
         <listitem>
           <para>
-            is used to recursively rename extended attributes
+            is used to recursively rename extended attributes.
           </para>
           <indexterm zone="samba mvxattr">
@@ -951,5 +922,5 @@
         <listitem>
           <para>
-            is a DCE/RPC Packet Parser and Dumper
+            is a DCE/RPC Packet Parser and Dumper.
           </para>
           <indexterm zone="samba ndrdump">
@@ -965,5 +936,5 @@
             is a tool for administration of <application>Samba</application>
             and remote CIFS servers, similar to the <command>net</command>
-            utility for DOS/Windows
+            utility for DOS/Windows.
           </para>
           <indexterm zone="samba net">
@@ -977,5 +948,5 @@
         <listitem>
           <para>
-            is the <application>Samba</application> NetBIOS name server
+            is the <application>Samba</application> NetBIOS name server.
           </para>
           <indexterm zone="samba nmbd">
@@ -989,5 +960,5 @@
         <listitem>
           <para>
-            is used to query NetBIOS names and map them to IP addresses
+            is used to query NetBIOS names and map them to IP addresses.
           </para>
           <indexterm zone="samba nmblookup">
@@ -1002,5 +973,5 @@
           <para>
             is a tool to allow external access to Winbind's
-            NTLM authentication function
+            NTLM authentication function.
           </para>
           <indexterm zone="samba ntlm_auth">
@@ -1014,5 +985,5 @@
         <listitem>
           <para>
-            converts LDAP schema's to LDB-compatible LDIF
+            converts LDAP schema's to LDB-compatible LDIF.
           </para>
           <indexterm zone="samba oLschema2ldif">
@@ -1026,5 +997,5 @@
         <listitem>
           <para>
-            is a tool used to manage the SAM database
+            is a tool used to manage the SAM database.
           </para>
           <indexterm zone="samba pdbedit">
@@ -1054,5 +1025,5 @@
           <para>
             is a utility that reports and changes SIDs in Windows
-            registry files. It currently only supports Windows NT
+            registry files. It currently only supports Windows NT.
           </para>
           <indexterm zone="samba profiles">
@@ -1066,5 +1037,5 @@
         <listitem>
           <para>
-            is a Diff program for Windows registry files
+            is a Diff program for Windows registry files.
           </para>
           <indexterm zone="samba regdiff">
@@ -1078,5 +1049,5 @@
         <listitem>
           <para>
-            applies registry patches to registry files
+            applies registry patches to registry files.
           </para>
           <indexterm zone="samba regpatch">
@@ -1090,5 +1061,5 @@
         <listitem>
           <para>
-            is a Windows registry file browser using readline
+            is a Windows registry file browser using readline.
           </para>
           <indexterm zone="samba regshell">
@@ -1102,5 +1073,5 @@
         <listitem>
           <para>
-            is a text-mode registry viewer
+            is a text-mode registry viewer.
           </para>
           <indexterm zone="samba regtree">
@@ -1114,5 +1085,5 @@
         <listitem>
           <para>
-            is used to execute MS-RPC client side functions
+            is used to execute MS-RPC client side functions.
           </para>
           <indexterm zone="samba rpcclient">
@@ -1127,5 +1098,5 @@
           <para>
             is a server to provide AD and SMB/CIFS services
-            to clients
+            to clients.
           </para>
           <indexterm zone="samba samba-prog">
@@ -1139,5 +1110,5 @@
         <listitem>
           <para>
-            is used to update the DNS names using TSIG-GSS
+            is used to update our DNS names using TSIG-GSS.
           </para>
           <indexterm zone="samba samba_dnsupdate">
@@ -1152,5 +1123,5 @@
           <para>
             downgrades the Samba AD database to be compatible with a previous
-            version of Samba
+            version of Samba.
           </para>
           <indexterm zone="samba samba_downgrade_db">
@@ -1165,5 +1136,5 @@
           <para>
             is a script used to compute your KCC (Knowledge
-            Consistency Checker) topology
+            Consistency Checker) topology.
           </para>
           <indexterm zone="samba samba_kcc">
@@ -1177,5 +1148,5 @@
         <listitem>
           <para>
-            allows you to edit Microsoft Group Policy Objects (GPOs)
+            allows you to edit Microsoft Group Policy Objects (GPOs).
           </para>
           <indexterm zone="samba samba-gpupdate">
@@ -1189,5 +1160,5 @@
         <listitem>
           <para>
-            is a ncurses based tool to manage the Samba registry
+            is a ncurses based tool to manage the Samba registry.
           </para>
           <indexterm zone="samba samba-regedit">
@@ -1202,5 +1173,5 @@
           <para>
             is a script to update the servicePrincipalName
-            names from spn_update_list
+            names from spn_update_list.
           </para>
           <indexterm zone="samba samba_spnupdate">
@@ -1214,5 +1185,5 @@
         <listitem>
           <para>
-            is the main Samba administration tool
+            is the main Samba administration tool.
           </para>
           <indexterm zone="samba samba-tool">
@@ -1226,5 +1197,5 @@
         <listitem>
           <para>
-            upgrades the DNS records in a Samba server to a newer version
+            upgrades the DNS records in a Samba server to a newer version.
           </para>
           <indexterm zone="samba samba_upgradedns">
@@ -1238,5 +1209,5 @@
         <listitem>
           <para>
-            manipulates share ACL permissions on SMB file shares
+            manipulates share ACL permissions on SMB file shares.
           </para>
           <indexterm zone="samba sharesec">
@@ -1250,5 +1221,5 @@
         <listitem>
           <para>
-            is used to manipulate Windows NT access control lists
+            is used to manipulate Windows NT access control lists.
           </para>
           <indexterm zone="samba smbcacls">
@@ -1262,5 +1233,5 @@
         <listitem>
           <para>
-            is a SMB/CIFS access utility, similar to FTP
+            is a SMB/CIFS access utility, similar to FTP.
           </para>
           <indexterm zone="samba smbclient">
@@ -1275,5 +1246,5 @@
           <para>
             is used to control running <command>smbd</command>,
-            <command>nmbd</command> and <command>winbindd</command> daemons
+            <command>nmbd</command> and <command>winbindd</command> daemons.
           </para>
           <indexterm zone="samba smbcontrol">
@@ -1287,5 +1258,5 @@
         <listitem>
           <para>
-            is used to manipulate Windows NT quotas on SMB file shares
+            is used to manipulate Windows NT quotas on SMB file shares.
           </para>
           <indexterm zone="samba smbcquotas">
@@ -1300,5 +1271,5 @@
           <para>
             is the main <application>Samba</application> daemon which
-            provides SMB/CIFS services to clients
+            provides SMB/CIFS services to clients.
           </para>
           <indexterm zone="samba smbd">
@@ -1314,5 +1285,5 @@
             is a simple utility with <command>wget</command>-like semantics,
             that can download files from SMB servers. You can specify the
-            files you would like to download on the command-line
+            files you would like to download on the command-line.
           </para>
           <indexterm zone="samba smbget">
@@ -1326,5 +1297,5 @@
         <listitem>
           <para>
-            changes a user's <application>Samba</application> password
+            changes a user's <application>Samba</application> password.
           </para>
           <indexterm zone="samba smbpasswd">
@@ -1338,5 +1309,5 @@
         <listitem>
           <para>
-            sends a print job to an SMB printer
+            sends a print job to an SMB printer.
           </para>
           <indexterm zone="samba smbspool">
@@ -1350,5 +1321,5 @@
         <listitem>
           <para>
-            reports current <application>Samba</application> connections
+            reports current <application>Samba</application> connections.
           </para>
           <indexterm zone="samba smbstatus">
@@ -1363,5 +1334,5 @@
           <para>
             is a shell script used for backing up SMB/CIFS shares
-            directly to Linux tape drives or a file
+            directly to Linux tape drives or a file.
           </para>
           <indexterm zone="samba smbtar">
@@ -1390,5 +1361,5 @@
         <listitem>
           <para>
-            is  a testsuite that runs several tests against a SMB server
+            is  a testsuite that runs several tests against a SMB server.
           </para>
           <indexterm zone="samba smbtorture">
@@ -1402,5 +1373,5 @@
         <listitem>
           <para>
-            is a text-based SMB network browser
+            is a text-based SMB network browser.
           </para>
           <indexterm zone="samba smbtree">
@@ -1415,5 +1386,5 @@
           <para>
             is a tool for backing up or validating the integrity of
-            <application>Samba</application> <filename>.tdb</filename> files
+            <application>Samba</application> <filename>.tdb</filename> files.
           </para>
           <indexterm zone="samba tdbbackup">
@@ -1428,5 +1399,5 @@
           <para>
             is a tool used to print the contents of a
-            <application>Samba</application> <filename>.tdb</filename> file
+            <application>Samba</application> <filename>.tdb</filename> file.
           </para>
           <indexterm zone="samba tdbdump">
@@ -1441,5 +1412,5 @@
           <para>
             is a tool for creating a <application>Samba</application>
-            <filename>.tdb</filename> file out of a ntdbdump
+            <filename>.tdb</filename> file out of a ntdbdump.
           </para>
           <indexterm zone="samba tdbrestore">
@@ -1454,5 +1425,5 @@
           <para>
             is a tool which allows simple database manipulation from the
-            command line
+            command line.
           </para>
           <indexterm zone="samba tdbtool">
@@ -1466,5 +1437,5 @@
         <listitem>
           <para>
-            checks an <filename>smb.conf</filename> file for proper syntax
+            checks an <filename>smb.conf</filename> file for proper syntax.
           </para>
           <indexterm zone="samba testparm">
@@ -1478,5 +1449,5 @@
         <listitem>
           <para>
-            queries a running <command>winbindd</command> daemon
+            queries a running <command>winbindd</command> daemon.
           </para>
           <indexterm zone="samba wbinfo">
@@ -1490,5 +1461,5 @@
         <listitem>
           <para>
-            resolves names from Windows NT servers
+            resolves names from Windows NT servers.
           </para>
           <indexterm zone="samba winbindd">
@@ -1499,9 +1470,9 @@
 
       <varlistentry id="libnss_winbind">
-        <term><filename class="libraryfile">libnss_winbind.so</filename></term>
+        <term><filename class='libraryfile'>libnss_winbind.so</filename></term>
         <listitem>
           <para>
             provides Name Service Switch API functions for resolving names
-            from NT servers
+            from NT servers.
           </para>
           <indexterm zone="samba libnss_winbind">
@@ -1512,9 +1483,9 @@
 
       <varlistentry id="libnss_wins">
-        <term><filename class="libraryfile">libnss_wins.so</filename></term>
+        <term><filename class='libraryfile'>libnss_wins.so</filename></term>
         <listitem>
           <para>
             provides API functions for Samba's implementation of the
-            Windows Internet Naming Service
+            Windows Internet Naming Service.
           </para>
           <indexterm zone="samba libnss_wins">
@@ -1525,9 +1496,9 @@
 
       <varlistentry id="libnetapi">
-        <term><filename class="libraryfile">libnetapi.so</filename></term>
-        <listitem>
-          <para>
-            provides API functions for the administration tools used
-            for Samba and remote CIFS servers
+        <term><filename class='libraryfile'>libnetapi.so</filename></term>
+        <listitem>
+          <para>
+            provides the API functions for the administration tools used
+            for Samba and remote CIFS servers.
           </para>
           <indexterm zone="samba libnetapi">
@@ -1538,8 +1509,8 @@
 
       <varlistentry id="libsmbclient">
-        <term><filename class="libraryfile">libsmbclient.so</filename></term>
-        <listitem>
-          <para>
-            provides API functions for the Samba SMB client tools
+        <term><filename class='libraryfile'>libsmbclient.so</filename></term>
+        <listitem>
+          <para>
+            provides the API functions for the Samba SMB client tools.
           </para>
           <indexterm zone="samba libsmbclient">
@@ -1550,5 +1521,5 @@
 <!--
       <varlistentry id="libsmbsharemodes">
-        <term><filename class="libraryfile">libsmbsharemodes.so</filename></term>
+        <term><filename class='libraryfile'>libsmbsharemodes.so</filename></term>
         <listitem>
           <para>
@@ -1562,8 +1533,8 @@
 
       <varlistentry id="libwbclient">
-        <term><filename class="libraryfile">libwbclient.so</filename></term>
-        <listitem>
-          <para>
-            provides API functions for Windows domain client services
+        <term><filename class='libraryfile'>libwbclient.so</filename></term>
+        <listitem>
+          <para>
+            provides API functions for Windows domain client services.
           </para>
           <indexterm zone="samba libwbclient">
Index: networking/netprogs/wget.xml
===================================================================
--- networking/netprogs/wget.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netprogs/wget.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -9,7 +9,7 @@
   <!ENTITY wget-download-ftp
            "&gnu-ftp;/wget/wget-&wget-version;.tar.gz">
-  <!ENTITY wget-md5sum        "b939ee54eabc6b9b0a8d5c03ace879c9">
+  <!ENTITY wget-md5sum        "3852118b7a771a7c9c0388883c8f5dbf">
   <!ENTITY wget-size          "4.6 MB">
-  <!ENTITY wget-buildsize     "76 MB (with tests)">
+  <!ENTITY wget-buildsize     "70 MB (with tests)">
   <!ENTITY wget-time          "0.5 SBU (with tests)">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -210,5 +211,5 @@
             retrieves files from the Web using the HTTP, HTTPS and FTP
             protocols.  It is designed to be non-interactive, for background or
-            unattended operations
+            unattended operations.
           </para>
           <indexterm zone="wget wget-prog">
Index: networking/netprogs/wireless-tools.xml
===================================================================
--- networking/netprogs/wireless-tools.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netprogs/wireless-tools.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -44,5 +45,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -195,5 +196,5 @@
         <listitem>
           <para>
-            renames network interfaces based on various static criteria
+            renames network interfaces based on various static criteria.
           </para>
           <indexterm zone="wireless_tools ifrename">
@@ -207,5 +208,5 @@
         <listitem>
           <para>
-            configures a wireless network interface
+            configures a wireless network interface.
           </para>
           <indexterm zone="wireless_tools iwconfig">
@@ -219,5 +220,5 @@
         <listitem>
           <para>
-            displays wireless events generated by drivers and setting changes
+            displays wireless events generated by drivers and setting changes.
           </para>
           <indexterm zone="wireless_tools iwevent">
@@ -231,5 +232,5 @@
         <listitem>
           <para>
-            reports ESSID, NWID or AP/Cell Address of wireless networks
+            reports ESSID, NWID or AP/Cell Address of wireless networks.
           </para>
           <indexterm zone="wireless_tools iwgetid">
@@ -243,5 +244,5 @@
         <listitem>
           <para>
-            gets detailed wireless information from a wireless interface
+            gets detailed wireless information from a wireless interface.
           </para>
           <indexterm zone="wireless_tools iwlist">
@@ -256,5 +257,5 @@
           <para>
             configures optional (private) parameters of a wireless network
-             interface
+             interface.
           </para>
           <indexterm zone="wireless_tools iwpriv">
@@ -268,5 +269,5 @@
         <listitem>
           <para>
-            gets wireless statistics from specific node
+            gets wireless statistics from specific node.
           </para>
           <indexterm zone="wireless_tools iwspy">
@@ -277,9 +278,9 @@
 
       <varlistentry id="libiw">
-        <term><filename class="libraryfile">libiw.so</filename></term>
+        <term><filename class='libraryfile'>libiw.so</filename></term>
         <listitem>
           <para>
             contains functions required by the wireless programs and
-            provides an API for other programs
+            provides an API for other programs.
           </para>
           <indexterm zone="wireless_tools libiw">
Index: networking/netprogs/wpa_supplicant.xml
===================================================================
--- networking/netprogs/wpa_supplicant.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netprogs/wpa_supplicant.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -197,5 +198,5 @@
 
 <screen><userinput>cd wpa_supplicant &amp;&amp;
-make BINDIR=/usr/sbin LIBDIR=/usr/lib</userinput></screen>
+make BINDIR=/sbin LIBDIR=/lib</userinput></screen>
 
     <para>
@@ -225,5 +226,5 @@
     </para>
 
-<screen role="root"><userinput>install -v -m755 wpa_{cli,passphrase,supplicant} /usr/sbin/ &amp;&amp;
+<screen role="root"><userinput>install -v -m755 wpa_{cli,passphrase,supplicant} /sbin/ &amp;&amp;
 install -v -m644 doc/docbook/wpa_supplicant.conf.5 /usr/share/man/man5/ &amp;&amp;
 install -v -m644 doc/docbook/wpa_{cli,passphrase,supplicant}.8 /usr/share/man/man8/</userinput></screen>
@@ -592,5 +593,5 @@
           <para>
             is a graphical frontend program for interacting with
-            <application>wpa_supplicant</application>
+            <application>wpa_supplicant</application>.
           </para>
           <indexterm zone="wpa_supplicant wpa_gui">
@@ -605,5 +606,5 @@
           <para>
             is a daemon that can connect to a password protected wireless
-            access point
+            access point.
           </para>
           <indexterm zone="wpa_supplicant wpa_supplicant-prog">
@@ -619,5 +620,5 @@
             takes an SSID and a password and generates a simple
             configuration that <command>wpa_supplicant</command> can
-            understand
+            understand.
           </para>
           <indexterm zone="wpa_supplicant wpa_passphrase">
@@ -632,5 +633,5 @@
           <para>
             is a command line interface used to control a running
-            <command>wpa_supplicant</command> daemon
+            <command>wpa_supplicant</command> daemon.
           </para>
           <indexterm zone="wpa_supplicant wpa_cli">
Index: networking/netutils/avahi.xml
===================================================================
--- networking/netutils/avahi.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netutils/avahi.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -142,13 +143,4 @@
 
     <para>
-      Fix a security vulnerabilty in <command>avahi-daemon</command>:
-    </para>
-
-<screen><userinput remap="pre">sed -i '426a if (events &amp; AVAHI_WATCH_HUP) { \
-client_free(c); \
-return; \
-}' avahi-daemon/simple-protocol.c</userinput></screen>
-
-    <para>
       Install <application>Avahi</application> by running the following
       commands:
@@ -181,5 +173,6 @@
             --disable-qt4        \
             --enable-core-docs   \
-            --with-distro=none   &amp;&amp;
+            --with-distro=none   \
+            --with-systemdsystemunitdir=/lib/systemd/system &amp;&amp;
 make</userinput></screen>
 
@@ -249,4 +242,10 @@
       daemon fails to start in BLFS, which does not support
       <application>systemd</application>.
+    </para>
+
+    <para revision="systemd">
+      <parameter>--with-systemdsystemunitdir=/lib/systemd/system</parameter>:
+      This parameter is used to set the correct installation directory for
+      systemd units.
     </para>
 
@@ -367,5 +366,5 @@
         <listitem>
           <para>
-            is a IPv4LL network address configuration daemon
+            is a IPv4LL network address configuration daemon.
           </para>
           <indexterm zone="avahi avahi-autoipd">
@@ -393,5 +392,5 @@
           <para>
             browses for mDNS/DNS-SD services using the
-            <application>Avahi</application> daemon
+            <application>Avahi</application> daemon.
           </para>
           <indexterm zone="avahi avahi-browse">
@@ -406,5 +405,5 @@
           <para>
             browses for mDNS/DNS-SD services using the
-            <application>Avahi</application> daemon
+            <application>Avahi</application> daemon.
           </para>
           <indexterm zone="avahi avahi-browse-domains">
@@ -418,5 +417,5 @@
         <listitem>
           <para>
-            is the <application>Avahi</application> mDNS/DNS-SD daemon
+            is the <application>Avahi</application> mDNS/DNS-SD daemon.
           </para>
           <indexterm zone="avahi avahi-daemon">
@@ -444,5 +443,5 @@
           <para>
             browses for mDNS/DNS-SD services using the
-            <application>Avahi</application> daemon
+            <application>Avahi</application> daemon.
           </para>
           <indexterm zone="avahi avahi-discover-standalone">
@@ -456,5 +455,5 @@
         <listitem>
           <para>
-            is a Unicast DNS server from mDNS/DNS-SD configuration daemon
+            is a Unicast DNS server from mDNS/DNS-SD configuration daemon.
           </para>
           <indexterm zone="avahi avahi-dnsconfd">
@@ -469,5 +468,5 @@
           <para>
             registers a mDNS/DNS-SD service or host name or address mapping
-            using the <application>Avahi</application> daemon
+            using the <application>Avahi</application> daemon.
           </para>
           <indexterm zone="avahi avahi-publish">
@@ -482,5 +481,5 @@
           <para>
             registers a mDNS/DNS-SD service or host name or address mapping
-            using the <application>Avahi</application> daemon
+            using the <application>Avahi</application> daemon.
           </para>
           <indexterm zone="avahi avahi-publish-address">
@@ -495,5 +494,5 @@
           <para>
             registers a mDNS/DNS-SD service or host name or address mapping
-            using the <application>Avahi</application> daemon
+            using the <application>Avahi</application> daemon.
           </para>
           <indexterm zone="avahi avahi-publish-service">
@@ -509,5 +508,5 @@
             resolves one or more mDNS/DNS host name(s) to IP address(es)
             (and vice versa) using the <application>Avahi</application>
-            daemon
+            daemon.
           </para>
           <indexterm zone="avahi avahi-resolve">
@@ -523,5 +522,5 @@
             resolves one or more mDNS/DNS host name(s) to IP address(es)
             (and vice versa) using the <application>Avahi</application>
-            daemon
+            daemon.
           </para>
           <indexterm zone="avahi avahi-resolve-address">
@@ -537,5 +536,5 @@
             resolves one or more mDNS/DNS host name(s) to IP address(es)
             (and vice versa) using the <application>Avahi</application>
-            daemon
+            daemon.
           </para>
           <indexterm zone="avahi avahi-resolve-host-name">
@@ -549,5 +548,5 @@
         <listitem>
           <para>
-            changes the mDNS host name
+            changes the mDNS host name.
           </para>
           <indexterm zone="avahi avahi-set-host-name">
@@ -573,5 +572,5 @@
         <listitem>
           <para>
-            browses for SSH servers on the local network
+            browses for SSH servers on the local network.
           </para>
           <indexterm zone="avahi bssh">
@@ -585,5 +584,5 @@
         <listitem>
           <para>
-            browses for VNC servers on the local network
+            browses for VNC servers on the local network.
           </para>
           <indexterm zone="avahi bvnc">
Index: networking/netutils/bind-utils.xml
===================================================================
--- networking/netutils/bind-utils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netutils/bind-utils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY bind-download-http   " ">
   <!ENTITY bind-download-ftp    "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.xz">
-  <!ENTITY bind-md5sum          "8025b8f8463b3b9d9c902bab27f185a2">
-  <!ENTITY bind-size            "4.8 MB">
-  <!ENTITY bind-utils-buildsize "136 MB">
-  <!ENTITY bind-utils-time      "0.6 SBU">
+  <!ENTITY bind-md5sum          "32463c0fe91abaf4894eee09a97f1ce6">
+  <!ENTITY bind-size            "3.1 MB">
+  <!ENTITY bind-utils-buildsize "112 MB">
+  <!ENTITY bind-utils-time      "0.5 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     client side applications.</para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: networking/netutils/netutils.xml
===================================================================
--- networking/netutils/netutils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netutils/netutils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="netutils">
Index: networking/netutils/network-manager-applet.xml
===================================================================
--- networking/netutils/network-manager-applet.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netutils/network-manager-applet.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,10 +6,10 @@
 
   <!ENTITY network-manager-applet-download-http
-           "&gnome-download-http;/network-manager-applet/1.24/network-manager-applet-&network-manager-applet-version;.tar.xz">
+           "&gnome-download-http;/network-manager-applet/1.18/network-manager-applet-&network-manager-applet-version;.tar.xz">
   <!ENTITY network-manager-applet-download-ftp
-           "&gnome-download-ftp;/network-manager-applet/1.24/network-manager-applet-&network-manager-applet-version;.tar.xz">
-  <!ENTITY network-manager-applet-md5sum    "55d4f8cf34b9192ba919ee7423e274d9">
-  <!ENTITY network-manager-applet-size      "1.8 MB">
-  <!ENTITY network-manager-applet-buildsize "47 MB (with tests)">
+           "&gnome-download-ftp;/network-manager-applet/1.18/network-manager-applet-&network-manager-applet-version;.tar.xz">
+  <!ENTITY network-manager-applet-md5sum    "1db711d29207f750985511eb8ca0a706">
+  <!ENTITY network-manager-applet-size      "1.9 MB">
+  <!ENTITY network-manager-applet-buildsize "53 MB (with tests)">
   <!ENTITY network-manager-applet-time      "0.3 SBU (with tests)">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -101,5 +102,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gnome-bluetooth"/> and
+      <xref linkend="gnome-bluetooth"/>,
+      <xref linkend="jansson"/>, and
       <ulink url="https://launchpad.net/libappindicator">libindicator</ulink>
     </para>
@@ -122,8 +124,8 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr       \
-      --buildtype=release \
-      -Dappindicator=no   \
-      -Dselinux=false     &amp;&amp;
+meson --prefix=/usr     \
+      -Dappindicator=no \
+      -Dselinux=false   \
+      -Dteam=false      .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -150,5 +152,4 @@
     </para>
 
-    <!-- Jansson is now included in NM as Required
     <para>
       <parameter>-Dteam=false</parameter>: This switch disables the team
@@ -156,5 +157,4 @@
       you have Jansson installed, remove this option or set it to "true".
     </para>
-    -->
 
     <para>
@@ -223,5 +223,5 @@
         <listitem>
           <para>
-            allows users to view and edit network connection settings
+            allows users to view and edit network connection settings.
           </para>
           <indexterm zone="network-manager-applet nm-connection-editor">
Index: networking/netutils/networkmanager.xml
===================================================================
--- networking/netutils/networkmanager.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netutils/networkmanager.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -9,8 +9,8 @@
   <!ENTITY NetworkManager-download-ftp
 "&gnome-download-ftp;/NetworkManager/&NetworkManager-minor;/NetworkManager-&NetworkManager-version;.tar.xz">
-  <!ENTITY NetworkManager-md5sum        "009372a92b916412d3fecb1d3b216346">
-  <!ENTITY NetworkManager-size          "5.1 MB">
-  <!ENTITY NetworkManager-buildsize     "285 MB (with tests)">
-  <!ENTITY NetworkManager-time          "0.8 SBU (with tests, using parallelism=4)">
+  <!ENTITY NetworkManager-md5sum        "3c4a70764ec3418a796b2c3f2a1f83e0">
+  <!ENTITY NetworkManager-size          "5.0 MB">
+  <!ENTITY NetworkManager-buildsize     "900 MB (with tests)">
+  <!ENTITY NetworkManager-time          "0.9 SBU (with tests, using parallelism=4)">
 ]>
 
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <note revision="systemd">
@@ -176,11 +177,9 @@
     -i meson.build</userinput></screen>
 
-<!--
     <para>
       Fix a missing meson.build file for initrd hooks (not used in BLFS):
     </para>
 
-<screen><userinput>sed '/initrd/d' -i src/core/meson.build</userinput></screen>
--->
+<screen><userinput>sed '/initrd/d' -i src/meson.build</userinput></screen>
 
     <para>
@@ -200,6 +199,5 @@
 
 CXXFLAGS+="-O2 -fPIC"            \
-meson --prefix=/usr              \
-      --buildtype=release        \
+meson --prefix /usr              \
       -Dlibaudit=no              \
       -Dlibpsl=false             \
@@ -208,4 +206,5 @@
       -Dppp=false                \
       -Dselinux=false            \
+      -Dudev_dir=/lib/udev       \
       -Dsession_tracking=elogind \
       -Dmodem_manager=false      \
@@ -220,6 +219,5 @@
 
 CXXFLAGS+="-O2 -fPIC"            \
-meson --prefix=/usr              \
-      --buildtype=release        \
+meson --prefix /usr              \
       -Dlibaudit=no              \
       -Dlibpsl=false             \
@@ -229,6 +227,8 @@
       -Dselinux=false            \
       -Dqt=false                 \
+      -Dudev_dir=/lib/udev       \
       -Dsession_tracking=systemd \
       -Dmodem_manager=false      \
+      -Dsystemdsystemunitdir=/lib/systemd/system \
       .. &amp;&amp;
 ninja</userinput></screen>
@@ -238,12 +238,11 @@
       with a bus address is necessary to run the tests. To test the results,
       as the root user, <!-- needs the "ip" command -->
-      issue: <command>ninja test</command>. Five tests,
-      <filename>platform/test-tc-linux</filename>,
-      <!--<filename>platform/test-core</filename>,-->
+      issue: <command>ninja test</command>. Six tests,
       <filename>test-l3cfg</filename>,
       <filename>devices/test-acd</filename>,
-      <filename>platform/test-route-linux</filename>, and
-      <filename>platform/test-link-linux</filename>,
-      <!--<filename>platform/test-cleanup-linux</filename>,--> are known to fail.
+      <filename>platform/test-tc-linux</filename>,
+      <filename>platform/test-route-linux</filename>,
+      <filename>platform/test-link-linux</filename>, and
+      <filename>platform/test-cleanup-linux</filename>, are known to fail.
     </para>
 
@@ -264,7 +263,4 @@
       necessary to build the Qt5 based examples.
     </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -550,5 +546,5 @@
             is a command-line tool for controlling
             <application>NetworkManager</application>
-            and getting its status
+            and getting its status.
           </para>
           <indexterm zone="NetworkManager nmcli">
@@ -562,5 +558,5 @@
         <listitem>
           <para>
-            is an utility to determine whether you are online
+            is an utility to determine whether you are online.
           </para>
           <indexterm zone="NetworkManager nm-online">
@@ -575,5 +571,5 @@
           <para>
             is an interactive ncurses-based user interface for
-            <application>nmcli</application>
+            <application>nmcli</application>.
           </para>
           <indexterm zone="NetworkManager nmtui">
@@ -588,5 +584,5 @@
           <para>
             is an interactive ncurses-based user interface to
-            activate/deactivate connections
+            activate/deactivate connections.
           </para>
           <indexterm zone="NetworkManager nmtui-connect">
@@ -600,5 +596,5 @@
         <listitem>
           <para>
-            is an interactive ncurses-based user interface to edit connections
+            is an interactive ncurses-based user interface to edit connections.
           </para>
           <indexterm zone="NetworkManager nmtui-edit">
@@ -612,5 +608,5 @@
         <listitem>
           <para>
-            is an interactive ncurses-based user interface to edit the hostname
+            is an interactive ncurses-based user interface to edit the hostname.
           </para>
           <indexterm zone="NetworkManager nmtui-hostname">
@@ -624,5 +620,5 @@
         <listitem>
           <para>
-            is the network management daemon
+            is the network management daemon.
           </para>
           <indexterm zone="NetworkManager NetworkManager-prog">
@@ -636,5 +632,5 @@
         <listitem>
           <para>
-            contains functions used by <application>NetworkManager</application>
+            contains functions used by <application>NetworkManager</application>.
           </para>
           <indexterm zone="NetworkManager libnm">
Index: networking/netutils/nmap.xml
===================================================================
--- networking/netutils/nmap.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netutils/nmap.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,8 +5,8 @@
   %general-entities;
 
-  <!ENTITY nmap-download-http "https://nmap.org/dist/nmap-&nmap-version;.tar.bz2">
+  <!ENTITY nmap-download-http "http://nmap.org/dist/nmap-&nmap-version;.tar.bz2">
   <!ENTITY nmap-download-ftp  " ">
-  <!ENTITY nmap-md5sum        "849f7298a786ce4cd5728db989cff763">
-  <!ENTITY nmap-size          "11 MB">
+  <!ENTITY nmap-md5sum        "239cef725863ab454590a1bb8793b72b">
+  <!ENTITY nmap-size          "10 MB">
   <!ENTITY nmap-buildsize     "148 MB (add 24 MB for tests)">
   <!ENTITY nmap-time          "0.3 SBU (Using parallelism=4; add 0.2 SBU for tests)">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -180,5 +181,5 @@
           <para>
             is a utility for reading and writing data across networks from
-            the command line
+            the command line.
           </para>
           <indexterm zone="nmap ncat">
@@ -192,5 +193,5 @@
         <listitem>
           <para>
-            is a tool to aid in the comparison of Nmap scans
+            is a tool to aid in the comparison of Nmap scans.
           </para>
           <indexterm zone="nmap ndiff">
@@ -205,5 +206,5 @@
           <para>
             is a utility for network exploration and security auditing. It
-            supports ping scanning, port scanning and TCP/IP fingerprinting
+            supports ping scanning, port scanning and TCP/IP fingerprinting.
           </para>
           <indexterm zone="nmap nmap-prog">
@@ -231,5 +232,5 @@
           <para>
             is an open-source tool for network packet generation, response
-            analysis and response time measurement
+            analysis and response time measurement.
           </para>
           <indexterm zone="nmap nping">
@@ -243,5 +244,5 @@
         <listitem>
           <para>
-            is a Python script to uninstall <command>ndiff</command>
+            is a Python script to uninstall <command>ndiff</command>.
           </para>
           <indexterm zone="nmap uninstall_ndiff">
@@ -255,5 +256,5 @@
         <listitem>
           <para>
-            is a Python script to uninstall <command>zenmap</command>
+            is a Python script to uninstall <command>zenmap</command>.
           </para>
           <indexterm zone="nmap uninstall_zenmap">
@@ -267,5 +268,5 @@
         <listitem>
           <para>
-            is a Python based graphical nmap frontend viewer
+            is a Python based graphical nmap frontend viewer.
           </para>
           <indexterm zone="nmap zenmap">
Index: networking/netutils/traceroute.xml
===================================================================
--- networking/netutils/traceroute.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netutils/traceroute.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -45,5 +46,5 @@
     </note>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -105,5 +106,6 @@
 
 <screen role='root'><userinput>make prefix=/usr install                                 &amp;&amp;
-ln -sv -f traceroute /usr/bin/traceroute6                &amp;&amp;
+mv /usr/bin/traceroute /bin                              &amp;&amp;
+ln -sv -f traceroute /bin/traceroute6                    &amp;&amp;
 ln -sv -f traceroute.8 /usr/share/man/man8/traceroute6.8 &amp;&amp;
 rm -fv /usr/share/man/man1/traceroute.1</userinput></screen>
@@ -144,5 +146,5 @@
             does basically what it says: it traces the route your packets
             take from the host you are working on to another host on a network,
-            showing all the intermediate hops (gateways) along the way
+            showing all the intermediate hops (gateways) along the way.
           </para>
           <indexterm zone="traceroute traceroute-prog">
@@ -156,5 +158,5 @@
         <listitem>
           <para>
-            is equivalent to <command>traceroute -6</command>
+            is equivalent to <command>traceroute -6</command>.
           </para>
           <indexterm zone="traceroute traceroute6-prog">
@@ -169,2 +171,3 @@
 
 </sect1>
+
Index: networking/netutils/whois.xml
===================================================================
--- networking/netutils/whois.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netutils/whois.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -143,5 +144,5 @@
           <para>
             is a client-side application which queries the whois directory
-            service for information pertaining to a particular domain name
+            service for information pertaining to a particular domain name.
           </para>
           <indexterm zone="whois whois-prog">
@@ -155,5 +156,5 @@
         <listitem>
           <para>
-            generates a new password, and optionally applies it to a user
+            generates a new password, and optionally applies it to a user.
           </para>
           <indexterm zone="whois mkpasswd-whois">
Index: networking/netutils/wireshark.xml
===================================================================
--- networking/netutils/wireshark.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/netutils/wireshark.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,18 +7,9 @@
   <!ENTITY wireshark-download-http "https://www.wireshark.org/download/src/all-versions/wireshark-&wireshark-version;.tar.xz">
   <!ENTITY wireshark-download-ftp  " ">
-  <!ENTITY wireshark-md5sum        "13aea3ee0edbc8f875971eccf2d11b20">
+  <!ENTITY wireshark-md5sum        "cf35d1413e7e3b1429ac7f12c823ccd4">
   <!ENTITY wireshark-size          "31 MB">
-  <!ENTITY wireshark-buildsize     "607 MB (with all optional dependencies available in the BLFS book)">
-  <!ENTITY wireshark-time          "2.2 SBU (with parallelism=4 and all optional dependencies available in the BLFS book)">
+  <!ENTITY wireshark-buildsize     "606 MB (with all optional dependencies available in the BLFS book)">
+  <!ENTITY wireshark-time          "2.0 SBU (with parallelism=4 and all optional dependencies available in the BLFS book)">
 ]>
-
-<!-- Gentler reminder: many Wireshark releases contain vulnerability fixes,
- we have not always been aware of these. At https://www.wireshark.org/security/
- there is a list of advisories and the version in which they were fixed.
-
- If you click on an advisory, after the bug number in the References:
- there may be a CVE number, although perhaps those get added some time after
- the release.  Perhaps as a general rule treat ALL their advisories for crashes
- etc as worthy of a security fix. -->
 
 <sect1 id="wireshark" xreflabel="Wireshark-&wireshark-version;">
@@ -26,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -52,5 +44,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -116,5 +108,4 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="asciidoctor"/>,
       <xref linkend="brotli"/>,
       <xref linkend="c-ares"/>,
@@ -130,7 +121,6 @@
       <xref linkend="sbc"/>,
       <xref linkend="speex"/>,
-      <!--<ulink url="https://asciidoctor.org/">Asciidoctor</ulink>,-->
+      <ulink url="https://asciidoctor.org/">Asciidoctor</ulink>,
       <ulink url="https://www.linphone.org/technical-corner/bcg729">BCG729</ulink>,
-      <ulink url="https://github.com/TimothyGu/libilbc">libilbc</ulink>,
       <ulink url="http://www.ibr.cs.tu-bs.de/projects/libsmi/">libsmi</ulink>,
       <ulink url="http://lz4.github.io/lz4/">lz4</ulink>,
@@ -353,5 +343,5 @@
             statistics about that file. It is able to detect and read any
             capture supported by the <application>Wireshark</application>
-            package
+            package.
           </para>
           <indexterm zone="wireshark capinfos">
@@ -365,5 +355,5 @@
         <listitem>
           <para>
-            prints the file types of capture files
+            prints the file types of capture files.
           </para>
           <indexterm zone="wireshark captype">
@@ -378,5 +368,5 @@
           <para>
             is a network traffic dump tool. It lets you capture packet data
-            from a live network and write the packets to a file
+            from a live network and write the packets to a file.
           </para>
           <indexterm zone="wireshark dumpcap">
@@ -394,5 +384,5 @@
             including those of <command>tcpdump</command>,
             <application>Wireshark</application> and other tools that write
-            captures in that format
+            captures in that format.
           </para>
           <indexterm zone="wireshark editcap">
@@ -411,8 +401,7 @@
             relies on two Python programs <command>wireshark_be.py</command>
             and <command>wireshark_gen.py</command>, which are not installed
-            by default. They have to be copied manually from the
-            <filename class="directory">tools</filename> directory to the
-            <filename class="directory">$PYTHONPATH/site-packages/</filename>
-            directory
+            by default. They have to be copied manually from the <filename
+            class="directory">tools</filename> directory to the <filename
+            class="directory">$PYTHONPATH/site-packages/</filename> directory.
           </para>
           <indexterm zone="wireshark idl2wrs">
@@ -426,5 +415,5 @@
         <listitem>
           <para>
-            combines multiple saved capture files into a single output file
+            combines multiple saved capture files into a single output file.
           </para>
           <indexterm zone="wireshark mergecap">
@@ -438,5 +427,5 @@
         <listitem>
           <para>
-            creates random-packet capture files
+            creates random-packet capture files.
           </para>
           <indexterm zone="wireshark randpkt">
@@ -450,5 +439,5 @@
         <listitem>
           <para>
-            dumps and analyzes raw libpcap data
+            dumps and analyzes raw libpcap data.
           </para>
           <indexterm zone="wireshark rawshark">
@@ -462,5 +451,5 @@
         <listitem>
           <para>
-            reorders timestamps of input file frames into an output file
+            reorders timestamps of input file frames into an output file.
           </para>
           <indexterm zone="wireshark reordercap">
@@ -474,5 +463,5 @@
         <listitem>
           <para>
-            is a daemon that listens on UNIX sockets
+            is a daemon that listens on UNIX sockets.
           </para>
           <indexterm zone="wireshark sharkd">
@@ -487,5 +476,5 @@
           <para>
             reads in an ASCII hex dump and writes the data described into a
-            <application>libpcap</application>-style capture file
+            <application>libpcap</application>-style capture file.
           </para>
           <indexterm zone="wireshark text2pcap">
@@ -501,5 +490,5 @@
             is a TTY-mode network protocol analyzer. It lets you capture
             packet data from a live network or read packets from a
-            previously saved capture file
+            previously saved capture file.
           </para>
           <indexterm zone="wireshark tshark">
@@ -515,5 +504,5 @@
             is the Qt GUI network protocol analyzer. It lets you interactively
             browse packet data from a live network or from a previously saved
-            capture file
+            capture file.
           </para>
           <indexterm zone="wireshark wireshark-prog">
@@ -538,9 +527,9 @@
 -->
       <varlistentry id="libwireshark">
-        <term><filename class="libraryfile">libwireshark.so</filename></term>
+        <term><filename class='libraryfile'>libwireshark.so</filename></term>
         <listitem>
           <para>
             contains functions used by the <application>Wireshark</application>
-            programs to perform filtering and packet capturing
+            programs to perform filtering and packet capturing.
           </para>
           <indexterm zone="wireshark libwireshark">
@@ -551,12 +540,12 @@
 
       <varlistentry id="libwiretap">
-        <term><filename class="libraryfile">libwiretap.so</filename></term>
+        <term><filename class='libraryfile'>libwiretap.so</filename></term>
         <listitem>
           <para>
             is a library being developed as a future replacement for
-            <filename class="libraryfile">libpcap</filename>, the current
+            <filename class='libraryfile'>libpcap</filename>, the current
             standard Unix library for packet capturing. For more information,
             see the <filename>README</filename> file in the source
-            <filename class="directory">wiretap</filename> directory
+            <filename class='directory'>wiretap</filename> directory.
           </para>
           <indexterm zone="wireshark libwiretap">
Index: networking/networking.xml
===================================================================
--- networking/networking.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/networking.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <part id="basicnet" xreflabel="Networking">
Index: networking/textweb/links.xml
===================================================================
--- networking/textweb/links.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/textweb/links.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY links-download-http "http://links.twibright.com/download/links-&links-version;.tar.bz2">
   <!ENTITY links-download-ftp  " ">
-  <!ENTITY links-md5sum        "64215ef5e6e35ae8b131d78fcb162f12">
+  <!ENTITY links-md5sum        "b88a46733d6932442ed8a6b751aac6b4">
   <!ENTITY links-size          "6.2 MB">
-  <!ENTITY links-buildsize     "36 MB">
-  <!ENTITY links-time          "0.3 SBU">
+  <!ENTITY links-buildsize     "35 MB">
+  <!ENTITY links-time          "0.2 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -195,5 +196,5 @@
         <listitem>
           <para>
-            is a text and graphics mode WWW browser
+            is a text and graphics mode WWW browser.
           </para>
           <indexterm zone="Links links">
Index: networking/textweb/lynx.xml
===================================================================
--- networking/textweb/lynx.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/textweb/lynx.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -33,5 +34,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -206,10 +207,4 @@
 
     <para>
-      <option>--enable-ipv6</option>: This switch allows
-      <application>Lynx</application> to use IPv6, along with IPv4.  Use
-      it if your ISP provides an IPv6 configuration.
-    </para>
-
-    <para>
       <option>--enable-nls</option>: This switch allows
       <application>Lynx</application> to print translated messages (such as
@@ -350,5 +345,5 @@
           <para>
             is a general purpose, text-based, distributed information
-            browser for the World Wide Web
+            browser for the World Wide Web.
           </para>
           <indexterm zone="lynx lynx-prog">
Index: networking/textweb/textweb.xml
===================================================================
--- networking/textweb/textweb.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ networking/textweb/textweb.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="basicnet-textweb">
Index: obfuscate.sh
===================================================================
--- obfuscate.sh	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ obfuscate.sh	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,6 @@
 #!/bin/bash
+
+# $LastChangedBy$
+# $Date$
 
 # obfuscate.sh
Index: packages.ent
===================================================================
--- packages.ent	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ packages.ent	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,2 +1,4 @@
+<!-- $LastChangedBy$ $Date$ -->
+
 <!-- Part II -->
 <!-- Chapter 4 -->
@@ -7,70 +9,73 @@
 <!ENTITY cracklib-version             "2.9.7">
 <!ENTITY cryptsetup-minor             "2.3">
-<!ENTITY cryptsetup-version           "&cryptsetup-minor;.6">
+<!ENTITY cryptsetup-version           "&cryptsetup-minor;.4">
 <!ENTITY cyrus-sasl-version           "2.1.27">
-<!ENTITY gnupg2-version               "2.2.29">
+<!ENTITY gnupg2-version               "2.2.26">
 <!ENTITY firewalld-version            "0.8.1">
-<!ENTITY gnutls-version               "3.7.2">
-<!ENTITY gpgme-version                "1.16.0">
-<!ENTITY haveged-version              "1.9.14">
-<!ENTITY iptables-version             "1.8.7">
-<!ENTITY libcap-version               "2.53">
+<!ENTITY gnutls-version               "3.7.0">
+<!ENTITY gpgme-version                "1.15.0">
+<!ENTITY haveged-version              "1.9.13">
+<!ENTITY iptables-version             "1.8.6">
+<!ENTITY libcap-version               "2.46">
 <!ENTITY liboauth-version             "1.0.3">
-<!ENTITY linux-pam-version            "1.5.2">
-<!ENTITY linux-pam-docs-version       "1.5.2">
+<!ENTITY linux-pam-version            "1.5.1">
+<!ENTITY linux-pam-docs-version       "1.5.1">
 <!ENTITY libpwquality-version         "1.4.4">
-<!ENTITY make-ca-version              "1.8.1">
-<!ENTITY mitkrb-major-version         "1.19">
-<!ENTITY mitkrb-version               "&mitkrb-major-version;.2">
+<!ENTITY make-ca-version              "1.7">
+<!ENTITY mitkrb-major-version         "1.18">
+<!ENTITY mitkrb-version               "&mitkrb-major-version;.3">
 <!ENTITY nftables-version             "0.9.3">
-<!ENTITY nettle-version               "3.7.3">
-
-<!ENTITY nss-minor-version            "69">
+<!ENTITY nettle-version               "3.6">
+
+<!ENTITY nss-minor-version            "60">
 <!ENTITY nss-micro-version            "0">
+<!--<!ENTITY nss-version                  "3.&nss-minor-version;.&nss-micro-version;">-->
 <!ENTITY nss-version                  "3.&nss-minor-version;">
-<!ENTITY openssh-version              "8.7p1">
-<!ENTITY p11-kit-version              "0.24.0">
-<!ENTITY polkit-version               "0.119">
+<!ENTITY openssh-version              "8.4p1">
+<!-- <!ENTITY openssl-version              "1.1.0g"> -->
+<!ENTITY openssl10-version            "1.0.2q">
+<!ENTITY p11-kit-version              "0.23.22">
+<!ENTITY polkit-version               "0.118">
 <!ENTITY polkit-gnome-version         "0.105">
-<!ENTITY shadow-version               "4.9">
+<!ENTITY shadow-version               "4.8.1">
 <!ENTITY ssh-askpass-version          "&openssh-version;">
-<!ENTITY stunnel-version              "5.60">
-<!ENTITY sudo-version                 "1.9.7p2">
+<!ENTITY stunnel-version              "5.57">
+<!ENTITY sudo-version                 "1.9.4p2">
 <!ENTITY tripwire-version             "2.4.3.7">
 <!ENTITY volume_key-version           "0.3.12">
 
 <!-- Chapter 5 -->
-<!ENTITY btrfs-progs-version          "5.13.1">
-<!ENTITY dosfstools-version           "4.2">
-<!ENTITY fuse3-version                "3.10.4">
+<!ENTITY btrfs-progs-version          "5.9">
+<!ENTITY dosfstools-version           "4.1">
+<!ENTITY fuse3-version                "3.10.1">
 <!ENTITY jfsutils-version             "1.1.15">
-<!ENTITY lvm2-version                 "2.03.13">
+<!ENTITY lvm2-version                 "2.03.10">
 <!ENTITY mdadm-version                "4.1">
-<!ENTITY ntfs-3g-version              "2021.8.22">
-<!ENTITY gptfdisk-version             "1.0.8">
-<!ENTITY parted-version               "3.4">
+<!ENTITY ntfs-3g-version              "2017.3.23">
+<!ENTITY gptfdisk-version             "1.0.5">
+<!ENTITY parted-version               "3.3">
 <!ENTITY reiser-version               "3.6.27">
 <!ENTITY smartmontools-version        "7.2">
-<!ENTITY sshfs-version                "3.7.2">
-<!ENTITY xfsprogs-version             "5.13.0">
+<!ENTITY sshfs-version                "3.7.1">
+<!ENTITY xfsprogs-version             "5.10.0">
 
 <!-- Chapter 6 -->
 <!ENTITY bluefish-version             "2.2.12">
-<!ENTITY ed-version                   "1.17">
-<!ENTITY emacs-version                "27.2">
-<!ENTITY gedit-version                "40.1">
+<!ENTITY ed-version                   "1.16">
+<!ENTITY emacs-version                "27.1">
+<!ENTITY gedit-version                "3.38.1">
 <!ENTITY joe-version                  "4.6">
 <!ENTITY juffed-version               "0.10.r71.gc3c1a3f">
-<!ENTITY nano-version                 "5.8">
-<!ENTITY vim-version                  "8.2.3337">
+<!ENTITY nano-version                 "5.4">
+<!ENTITY vim-version                  "8.2.2253">
 <!ENTITY vim-majmin                   "82">
 
 <!-- Chapter 7 -->
-<!ENTITY dash-version                 "0.5.11.4">
-<!ENTITY tcsh-version                 "6.22.04">
+<!ENTITY dash-version                 "0.5.11.3">
+<!ENTITY tcsh-version                 "6.22.03">
 <!ENTITY zsh-version                  "5.8">
 
 <!-- Chapter 8 Virtualization -->
-<!ENTITY qemu-version                 "6.1.0">
+<!ENTITY qemu-version                 "5.2.0">
 
 <!-- Part III -->
@@ -81,5 +86,5 @@
 
 <!ENTITY boost-major                  "1">
-<!ENTITY boost-minor                  "77">
+<!ENTITY boost-minor                  "75">
 <!ENTITY boost-patch                  "0">
 <!ENTITY boost-version                "&boost-major;.&boost-minor;.&boost-patch;">
@@ -88,29 +93,29 @@
 <!ENTITY brotli-version               "1.0.9">
 <!ENTITY clucene-version              "2.3.3.4">
-<!ENTITY dbus-glib-version            "0.112">
+<!ENTITY dbus-glib-version            "0.110">
 <!ENTITY double-conversion-version    "3.1.5">
-<!ENTITY enchant-version              "2.3.1">
+<!ENTITY enchant-version              "2.2.15">
 <!ENTITY exempi-version               "2.5.2">
 <!ENTITY expat-version                "2.1.0">
 <!ENTITY fftw-version                 "3.3.9">
 <!ENTITY gcab-version                 "0.7">
-<!ENTITY glib2-minor                  "2.68">
+<!ENTITY glib2-minor                  "2.66">
 <!ENTITY glib2-version                "&glib2-minor;.4">
-<!ENTITY glibmm-version               "2.66.1">
+<!ENTITY glibmm-version               "2.64.5">
 <!ENTITY gmime-version                "2.6.23">
 <!ENTITY gmime3-version               "3.2.7">
-<!ENTITY gobject-introspection-version "1.68.0">
+<!ENTITY gobject-introspection-version "1.66.1">
 <!ENTITY grantlee-version             "5.2.0">
-<!ENTITY gsl-version                  "2.7">
+<!ENTITY gsl-version                  "2.6">
 <!ENTITY gspell-version               "1.8.4">
 
-<!ENTITY icu-major                    "69">
-<!ENTITY icu-minor                    "1">
+<!ENTITY icu-major                    "68">
+<!ENTITY icu-minor                    "2">
 <!ENTITY icu-patch                    "0">
 <!ENTITY icu-version                  "&icu-major;.&icu-minor;"><!-- .&icu-patch;-->
 <!ENTITY icu-dl-version               "&icu-major;_&icu-minor;"><!-- _&icu-patch;-->
 
-<!ENTITY inih-version                 "53">
-<!ENTITY iso-codes-version            "4.7.0">
+<!ENTITY inih-version                 "52">
+<!ENTITY iso-codes-version            "4.5.0">
 <!ENTITY jansson-version              "2.13.1">
 <!--<!ENTITY JS52-version                 "52.2.1gnome1">-->
@@ -118,131 +123,126 @@
 <!--<!ENTITY JS68-version                 "68.12.0">-->
 <!-- for JS78 see firefox -->
-<!-- temporary, until JS91 is approved for gnome -->  
-<!ENTITY JS78-version                 "78.13.0">
 <!ENTITY json-c-version               "0.15">
-<!ENTITY json-glib-version            "1.6.6">
+<!ENTITY json-glib-version            "1.6.0">
 <!ENTITY keyutils-version             "1.6.1">
 <!ENTITY libaio-version               "0.3.112">
-<!ENTITY libarchive-version           "3.5.2">
-<!ENTITY libassuan-version            "2.5.5">
+<!ENTITY libarchive-version           "3.5.1">
+<!ENTITY libassuan-version            "2.5.4">
 <!ENTITY libatasmart-version          "0.19">
 <!ENTITY libatomic_ops-version        "7.6.10">
-<!ENTITY libblockdev-version          "2.26">
-<!ENTITY libbytesize-version          "2.6">
+<!ENTITY libblockdev-version          "2.24">
+<!ENTITY libbytesize-version          "2.4">
 <!--<!ENTITY libcroco-version             "0.6.13">-->
 <!ENTITY libdaemon-version            "0.14">
-<!ENTITY libdrm-version               "2.4.107">
+<!ENTITY libdrm-version               "2.4.103">
 <!ENTITY libepoxy-minor               "1.5">
-<!ENTITY libepoxy-version             "&libepoxy-minor;.9">
+<!ENTITY libepoxy-version             "&libepoxy-minor;.5">
 <!-- <!ENTITY libesmtp-version             "1.0.6"> -->
-<!ENTITY libgcrypt-version            "1.9.4">
+<!ENTITY libgcrypt-version            "1.8.7">
 <!ENTITY libglade-version             "2.6.4">
-<!ENTITY libgpg-error-version         "1.42">
+<!ENTITY libgpg-error-version         "1.41">
 <!ENTITY libgrss-version              "0.7.0">
 <!ENTITY libgsf-version               "1.14.47">
-<!ENTITY libgudev-version             "237">
-<!ENTITY libgusb-version              "0.3.7">
-<!ENTITY libical-version              "3.0.10">
-<!ENTITY libidn-version               "1.38">
-<!ENTITY libidn2-version              "2.3.2">
-<!ENTITY libiodbc-version             "3.52.15">
-<!ENTITY libksba-version              "1.6.0">
-<!ENTITY liblinear-version            "243">
-<!ENTITY libmbim-version              "1.26.0">
-<!--<!ENTITY libnfsidmap-version          "0.26">-->
+<!ENTITY libgudev-version             "234">
+<!ENTITY libgusb-version              "0.3.5">
+<!ENTITY libical-version              "3.0.8">
+<!ENTITY libidn-version               "1.36">
+<!ENTITY libidn2-version              "2.3.0">
+<!ENTITY libiodbc-version             "3.52.12">
+<!ENTITY libksba-version              "1.5.0">
+<!ENTITY liblinear-version            "242">
+<!ENTITY libmbim-version              "1.24.4">
+<!ENTITY libnfsidmap-version          "0.26">
 <!ENTITY libpaper-version             "1.1.24+nmu5">
-<!ENTITY libportal-version            "0.4">
-<!ENTITY libqmi-version               "1.30.0">
+<!ENTITY libportal-version            "0.3">
+<!ENTITY libqmi-version               "1.26.6">
 <!ENTITY libseccomp-version           "2.5.1">
-<!ENTITY libsigc-version              "2.10.7">
-<!ENTITY libsigc3-version             "3.0.7">
-<!ENTITY libsigsegv-version           "2.13">
+<!ENTITY libsigc-version              "2.10.6">
+<!ENTITY libsigc3-version             "3.0.6">
+<!ENTITY libsigsegv-version           "2.12">
 <!ENTITY libssh2-version              "1.9.0">
-<!ENTITY libstatgrab-version          "0.92.1">
-<!ENTITY libtasn1-version             "4.17.0">
-<!ENTITY libuninameslist-version      "20210626">
+<!ENTITY libstatgrab-version          "0.92">
+<!ENTITY libtasn1-version             "4.16.0">
+<!ENTITY libuninameslist-version      "20200413">
 <!ENTITY libunique-version            "1.1.6">
 <!ENTITY libunistring-version         "0.9.10">
 <!ENTITY libusb-version               "1.0.24">
 <!ENTITY libusb-compat-version        "0.1.5">
-<!ENTITY libuv-version                "1.42.0">
-<!ENTITY libxkbcommon-version         "1.3.0">
+<!ENTITY libuv-version                "1.40.0">
+<!ENTITY libxkbcommon-version         "1.0.3">
 <!-- the libxml2-version is also used for the python2 module,
 which is built separately after libxml2.so has been installed,
 to avoid building libxml2 twice, which is slow with all deps -->
-<!ENTITY libxml2-version              "2.9.12">
+<!ENTITY libxml2-version              "2.9.10">
 <!ENTITY libxslt-version              "1.1.34">
-<!ENTITY libwacom-version             "1.11">
-<!ENTITY libwpe-version               "1.10.1">
+<!ENTITY libwacom-version             "1.7">
 <!ENTITY lzo-version                  "2.10">
 <!ENTITY mtdev-version                "1.1.6">
-<!ENTITY nodejs-version               "14.17.5">
+<!ENTITY nodejs-version               "14.15.3">
 <!ENTITY npth-version                 "1.6">
-<!ENTITY nspr-version                 "4.32">
+<!ENTITY nspr-version                 "4.29">
 <!ENTITY openobex-version             "1.7.2">
-<!ENTITY pcre-version                 "8.45">
-<!ENTITY pcre2-version                "10.37">
+<!ENTITY pcre-version                 "8.44">
+<!ENTITY pcre2-version                "10.36">
 <!ENTITY popt-version                 "1.18">
 <!ENTITY pth-version                  "2.0.7">
 <!ENTITY ptlib-version                "2.10.11">
-<!ENTITY qca-version                  "2.3.3">
+<!ENTITY qca-version                  "2.3.1">
 <!ENTITY qjson-version                "0.8.1">
 <!ENTITY sbc-version                  "1.5">
-<!ENTITY talloc-version               "2.3.3">
-<!ENTITY telepathy-glib-version       "0.24.2">
+<!ENTITY talloc-version               "2.3.1">
+<!ENTITY telepathy-glib-version       "0.24.1">
 <!ENTITY uchardet-version             "0.0.7">
-<!ENTITY umockdev-version             "0.16.2">
-<!ENTITY wayland-version              "1.19.0">
-<!ENTITY wayland-protocols-version    "1.21">
-<!ENTITY wpebackend-fdo-version       "1.10.0">
+<!ENTITY umockdev-version             "0.15.3">
+<!ENTITY wayland-version              "1.18.0">
+<!ENTITY wayland-protocols-version    "1.20">
 <!ENTITY wv-version                   "1.2.9">
-<!ENTITY xapian-version               "1.4.18">
-<!ENTITY yaml-version                 "0.2.5">
+<!ENTITY xapian-version               "1.4.17">
+<!ENTITY yaml-version                 "0.2.4">
 
 <!-- Chapter 10 -->
 <!ENTITY aalib-version                "1.4rc5">
-<!ENTITY babl-version                 "0.1.88">
-<!ENTITY exiv2-version                "0.27.4">
-<!ENTITY freetype2-version            "2.11.0">
+<!ENTITY babl-version                 "0.1.84">
+<!ENTITY exiv2-version                "0.27.3">
+<!ENTITY freetype2-version            "2.10.4">
 <!ENTITY fontconfig-version           "2.13.1">  <!-- stable lt .90 micro version -->
 <!ENTITY fribidi-version              "1.0.9">
-<!ENTITY gegl-version                 "0.4.30">
+<!ENTITY gegl-version                 "0.4.28">
 <!ENTITY giflib-version               "5.2.1">
 <!ENTITY glm-version                  "0.9.9.8">
 <!ENTITY graphite2-version            "1.3.14">
-<!ENTITY harfbuzz-version             "2.9.0">
+<!ENTITY harfbuzz-version             "2.7.4">
 <!--<!ENTITY ijs-version                  "0.35">-->
-<!ENTITY jasper-version               "2.0.33">
+<!ENTITY jasper-version               "2.0.14">
 <!ENTITY lcms-version                 "1.19">
-<!ENTITY lcms2-version                "2.12">
+<!ENTITY lcms2-version                "2.11">
 <!ENTITY libexif-version              "0.6.22">
-<!ENTITY libgxps-version              "0.3.2">
-<!ENTITY libjpeg-turbo-version        "2.1.1">
+<!ENTITY libgxps-version              "0.3.1">
+<!ENTITY libjpeg-turbo-version        "2.0.6">
 <!ENTITY libmng-version               "2.0.3">
 <!ENTITY libmypaint-version           "1.6.1"> <!-- version 1 only -->
 <!ENTITY libpng-version               "1.6.37">
-<!ENTITY librsvg-version              "2.50.7">   <!-- Normally even minors -->
+<!ENTITY librsvg-version              "2.50.2">   <!-- Normally even minors -->
 <!ENTITY libraw-version               "0.20.2">
 <!ENTITY libspiro-version             "20200505">
-<!ENTITY libtiff-version              "4.3.0">
-<!ENTITY libwebp-version              "1.2.1">
+<!ENTITY libtiff-version              "4.2.0">
+<!ENTITY libwebp-version              "1.1.0">
 <!ENTITY mypaint-brushes-version      "1.3.0"> <!-- version 1 only -->
 <!ENTITY newt-version                 "0.52.21">
-<!ENTITY opencv-version               "4.5.3">
-<!ENTITY opencv-contrib-version       "4.5.3">
+<!ENTITY opencv-version               "4.5.1">
+<!ENTITY opencv-contrib-version       "4.5.1">
 <!ENTITY openjpeg-version             "1.5.2">
 <!ENTITY openjpeg2-version            "2.4.0">
 <!ENTITY pixman-version               "0.40.0">   <!-- Even minors only -->
-<!ENTITY poppler-version              "21.08.0">
+<!ENTITY poppler-version              "20.12.1">
 <!ENTITY potrace-version              "1.16">
-<!ENTITY qpdf-version                 "10.3.2">
+<!ENTITY qpdf-version                 "10.0.4">
 <!ENTITY qrencode-version             "4.1.1">
-<!ENTITY libsass-version              "3.6.5">
-<!ENTITY sassc-version                "3.6.2">
+<!ENTITY libsass-version              "3.6.4">
+<!ENTITY sassc-version                "3.6.1">
 <!ENTITY woff2-version                "1.0.2">
 
 <!-- Chapter 11 -->
-<!ENTITY asciidoc-version             "9.1.0">
-<!ENTITY asciidoctor-version          "2.0.16">
+<!ENTITY asciidoc-version             "9.0.4">
 <!ENTITY bogofilter-version           "1.2.5">
 <!ENTITY chrpath-version              "0.16">
@@ -250,16 +250,16 @@
 <!ENTITY desktop-file-utils-version   "0.26">
 <!ENTITY gperf-version                "3.0.4">
-<!ENTITY graphviz-version             "2.48.0">
+<!ENTITY graphviz-version             "2.44.1">   <!-- Even minors only -->
 <!ENTITY gtk-doc-major                "1.33">
-<!ENTITY gtk-doc-version              "1.33.2">
+<!ENTITY gtk-doc-version              "1.33.1">
 <!ENTITY gtkhtml-version              "4.10.0">
 <!ENTITY hd2u-version                 "1.0.4">
-<!ENTITY highlight-version            "4.1">
-<!ENTITY ibus-version                 "1.5.25">
+<!ENTITY highlight-version            "3.60">
+<!ENTITY ibus-version                 "1.5.23">
 <!ENTITY imagemagick6-version         "6.9.10">
-<!ENTITY imagemagick-version          "7.1.0">
+<!ENTITY imagemagick-version          "7.0.10">
 <!ENTITY intltool-version             "0.50.2">
 <!ENTITY lsof-version                 "4.91">
-<!ENTITY pinentry-version             "1.2.0">
+<!ENTITY pinentry-version             "1.1.0">
 <!ENTITY rarian-version               "0.8.1">
 <!ENTITY recode-version               "3.6">
@@ -269,5 +269,5 @@
 <!ENTITY telepathy-logger-version     "0.8.2">
 <!ENTITY telepathy-mission-control-version "5.16.6">
-<!ENTITY tidy-html5-version           "5.8.0">
+<!ENTITY tidy-html5-version           "5.6.0">
 <!ENTITY time-version                 "1.9">
 <!ENTITY tree-version                 "1.8.0">
@@ -278,27 +278,27 @@
 <!ENTITY accountsservice-version      "0.6.55">
 <!ENTITY acpid-version                "2.0.32">
-<!ENTITY at-version                   "3.2.2">
-<!ENTITY autofs-version               "5.1.7">
-<!ENTITY bluez-version                "5.61">
-<!ENTITY bubblewrap-version           "0.5.0">
+<!ENTITY at-version                   "3.2.1">
+<!ENTITY autofs-version               "5.1.6">
+<!ENTITY bluez-version                "5.55">
+<!ENTITY bubblewrap-version           "0.4.1">
 <!ENTITY colord-version               "1.4.5">
 <!ENTITY cpio-version                 "2.13">
 <!ENTITY cups-pk-helper-version       "0.2.6">
 <!ENTITY dbus-version                 "1.12.20">   <!-- Even minors only -->
-<!ENTITY elogind-version              "246.10">
+<!ENTITY elogind-version              "246.9.1">
 <!ENTITY blocaled-version             "0.3">
 <!ENTITY eudev-version                "1.7">
 <!ENTITY fcron-version                "3.2.1">
 <!ENTITY gpm-version                  "1.20.7">
-<!ENTITY hdparm-version               "9.62">
+<!ENTITY hdparm-version               "9.60">
 <!ENTITY hdwids-version               "20141022">
 <!ENTITY lm-sensors-version           "3-6-0">
-<!ENTITY logrotate-version            "3.18.1">
+<!ENTITY logrotate-version            "3.17.0">
 <!ENTITY lsb-tools-version            "0.9">
-<!ENTITY mc-version                   "4.8.27">
-<!ENTITY ModemManager-version         "1.16.10">
+<!ENTITY mc-version                   "4.8.25">
+<!ENTITY ModemManager-version         "1.14.8">
 <!ENTITY notification-daemon-version  "3.20.0">
 <!ENTITY obex-data-server-version     "0.4.6">
-<!ENTITY p7zip-version                "17.04">
+<!ENTITY p7zip-version                "16.02">
 <!ENTITY pax-version                  "20201030">
 <!ENTITY pciutils-version             "3.7.0">
@@ -307,54 +307,48 @@
 <!ENTITY rasqal-version               "0.9.33">
 <!ENTITY redland-version              "1.0.17">
-<!ENTITY sg3_utils-version            "1.46">
+<!ENTITY sg3_utils-version            "1.45">
 <!ENTITY strigi-version               "0.7.8">
-<!ENTITY sysstat-version              "12.5.4">
-<!ENTITY systemd-version              "249">
+<!ENTITY sysstat-version              "12.5.2">
+<!ENTITY systemd-version              "247">
 <!--<!ENTITY systemd-stable               "6b4878d"> Unused for now -->
 <!ENTITY udisks-version               "1.0.5">    <!-- stable lt .90 micro version -->
-<!ENTITY udisks2-version              "2.9.3">    <!-- stable lt .90 micro version -->
-<!ENTITY unrar-version                "6.0.7">
+<!ENTITY udisks2-version              "2.9.1">    <!-- stable lt .90 micro version -->
+<!ENTITY unrar-version                "6.0.3">
 <!ENTITY unzip-version                "6.0">
-<!ENTITY upower-version               "0_99_13">
-<!ENTITY usbutils-version             "014">
+<!ENTITY upower-version               "0.99.11">
+<!ENTITY usbutils-version             "013">
 <!ENTITY weston-version               "1.12.0">
 <!ENTITY which-version                "2.21">
 <!ENTITY zip-version                  "3.0">
 
-<!-- UEFI bootloaders -->
-<!ENTITY efivar-version               "37">
-<!ENTITY efibootmgr-version           "17">
-<!ENTITY grub-version                 "2.06">
-<!ENTITY unifont-version              "13.0.06">
-
 <!-- Chapter 13 -->
 <!ENTITY autoconf213-version          "2.13">
 <!ENTITY bazaar-version               "2.5.1">
-<!ENTITY cbindgen-version             "0.20.0">
+<!ENTITY cbindgen-version             "0.15.0">
 <!ENTITY check-version                "0.12.0">
 <!ENTITY clisp-version                "2.49">
-<!ENTITY cmake-major-version          "3.21">
+<!ENTITY cmake-major-version          "3.19">
 <!ENTITY cmake-minor-version          "2">
 <!ENTITY cmake-version                "&cmake-major-version;.&cmake-minor-version;">
 <!ENTITY dejagnu-version              "1.6.2">
-<!ENTITY doxygen-version              "1.9.2">
+<!ENTITY doxygen-version              "1.9.0">
 <!ENTITY elfutils-version             "0.170">
 <!ENTITY expect-version               "5.45.4">
-<!ENTITY gcc-version                  "11.2.0">
+<!ENTITY gcc-version                  "10.2.0">
 <!ENTITY gc-version                   "8.0.4">
-<!ENTITY gdb-version                  "10.2">
-<!ENTITY git-version                  "2.33.0">
-<!ENTITY guile-version                "3.0.7">
+<!ENTITY gdb-version                  "10.1">
+<!ENTITY git-version                  "2.30.0">
+<!ENTITY guile-version                "3.0.4">
 <!ENTITY librep-version               "0.92.7">
-<!ENTITY llvm-majmin-version          "12.0">
-<!ENTITY llvm-point-version           "1">
+<!ENTITY llvm-majmin-version          "11.0">
+<!ENTITY llvm-point-version           "0">
 <!ENTITY llvm-version                 "&llvm-majmin-version;.&llvm-point-version;">
-<!ENTITY lua-version                  "5.4.3">
+<!ENTITY lua-version                  "5.4.2">
 <!ENTITY lua52-version                "5.2.4">
-<!ENTITY mercurial-version            "5.9">
+<!ENTITY mercurial-version            "5.6.1">
 <!ENTITY nasm-version                 "2.15.05">
 <!ENTITY ninja-version                "1.9.0">
 <!ENTITY npapi-sdk-version            "0.27.2">
-<!ENTITY php-version                  "8.0.10">
+<!ENTITY php-version                  "8.0.0">
 
 <!ENTITY python2-majorver             "2.7">
@@ -364,5 +358,5 @@
 <!ENTITY python3-major                "3">
 <!ENTITY python3-minor                "9">
-<!ENTITY python3-patch                "6">
+<!ENTITY python3-patch                "1">
 <!ENTITY python3-majorver             "&python3-major;.&python3-minor;">
 <!ENTITY python3-version              "&python3-majorver;.&python3-patch;">
@@ -370,21 +364,20 @@
 
 <!ENTITY ruby-minor-version           "3.0">
-<!ENTITY ruby-patch-version           "2">
+<!ENTITY ruby-patch-version           "0">
 <!ENTITY ruby-version                 "&ruby-minor-version;.&ruby-patch-version;">
-<!ENTITY ruby-gemdir                  "/usr/lib/ruby/gems/&ruby-minor-version;.0">
-<!ENTITY rust-version                 "1.52.0">
-<!ENTITY scons-version                "4.2.0">
+<!ENTITY rust-version                 "1.47.0">
+<!ENTITY scons-version                "4.0.1">
 <!ENTITY slang-version                "2.3.2">
-<!ENTITY subversion-version           "1.14.1">
+<!ENTITY subversion-version           "1.14.0">
 <!ENTITY swig-version                 "4.0.2">
-<!ENTITY sysprof-version              "3.40.1">
-<!ENTITY tcl-version                  "8.6.11">
-<!ENTITY tk-version                   "8.6.11.1">
-<!ENTITY vala-major-version           "0.52">  <!-- even minors only -->
-<!ENTITY vala-version                 "&vala-major-version;.5">
-<!ENTITY valgrind-version             "3.17.0">
+<!ENTITY sysprof-version              "3.38.1">
+<!ENTITY tcl-version                  "8.6.10">
+<!ENTITY tk-version                   "8.6.10">
+<!ENTITY vala-major-version           "0.50">  <!-- even minors only -->
+<!ENTITY vala-version                 "&vala-major-version;.2">
+<!ENTITY valgrind-version             "3.16.1">
 <!ENTITY yasm-version                 "1.3.0">
 
-<!ENTITY apache-ant-version           "1.10.11">
+<!ENTITY apache-ant-version           "1.10.9">
 <!--
 <!ENTITY maven-version                "3.6.0">
@@ -393,5 +386,5 @@
 <!ENTITY hamcrest-version             "1.3">
 -->
-<!ENTITY openjdk-version              "16.0.2">
+<!ENTITY openjdk-version              "14.0.1">
 <!ENTITY openjdk-build                "7">
 
@@ -401,12 +394,12 @@
 <!ENTITY Archive-Zip-version          "1.68">
 <!ENTITY autovivification-version     "0.18">
-<!ENTITY Business-ISBN-version        "3.006">
-<!ENTITY Business-ISMN-version        "1.202">
+<!ENTITY Business-ISBN-version        "3.005">
+<!ENTITY Business-ISMN-version        "1.201">
 <!ENTITY Business-ISSN-version        "1.004">
 <!ENTITY Class-Accessor-version       "0.51">
 <!ENTITY Data-Compare-version         "1.27">
-<!ENTITY Data-Dump-version            "1.25">
+<!ENTITY Data-Dump-version            "1.23">
 <!ENTITY Data-Uniqid-version          "0.12">
-<!ENTITY DateTime-Calendar-Julian-version "0.104">
+<!ENTITY DateTime-Calendar-Julian-version "0.102">
 <!ENTITY DateTime-Format-Builder-version "0.83">
 <!ENTITY Encode-EUCJPASCII-version    "0.03">
@@ -416,17 +409,17 @@
 <!--<!ENTITY File-BaseDir-version         "0.08">-->
 <!ENTITY File-Slurper-version         "0.012">
-<!ENTITY File-Which-version           "1.27">
-<!ENTITY HTML-Parser-version          "3.76">
+<!ENTITY File-Which-version           "1.23">
+<!ENTITY HTML-Parser-version          "3.75">
 <!ENTITY HTTP-Daemon-version          "6.12">
-<!ENTITY IO-Socket-SSL-version        "2.072">
+<!ENTITY IO-Socket-SSL-version        "2.068">
 <!ENTITY IO-String-version            "1.08">
 <!ENTITY IPC-Run3-version             "0.048">
 <!ENTITY Lingua-Translit-version      "0.28">
-<!ENTITY List-AllUtils-version        "0.19">
+<!ENTITY List-AllUtils-version        "0.18">
 <!ENTITY List-MoreUtils-version       "0.430">
-<!ENTITY Log-Log4perl-version         "1.54">
+<!ENTITY Log-Log4perl-version         "1.53">
 <!ENTITY LWP-Protocol-https-version   "6.10">
 <!ENTITY Module-Build-version         "0.4231">
-<!ENTITY Net-DNS-version              "1.32">
+<!ENTITY Net-DNS-version              "1.29">
 <!ENTITY Parse-RecDescent-version     "1.967015">
 <!ENTITY Parse-Yapp-version           "1.21">
@@ -436,11 +429,11 @@
 <!ENTITY Sort-Key-version             "1.33">
 <!ENTITY Test-Command-version         "0.11">
-<!ENTITY Test-Differences-version     "0.68">
+<!ENTITY Test-Differences-version     "0.67">
 <!ENTITY Text-BibTeX-version          "0.88">
-<!ENTITY Text-CSV-version             "2.01">
+<!ENTITY Text-CSV-version             "2.00">
 <!ENTITY Text-Roman-version           "3.5">
-<!ENTITY Unicode-Collate-version      "1.31">
+<!ENTITY Unicode-Collate-version      "1.29">
 <!ENTITY Unicode-LineBreak-version    "2019.001">
-<!ENTITY URI-version                  "5.09">
+<!ENTITY URI-version                  "5.05">
 <!ENTITY XML-LibXML-Simple-version    "1.01">
 <!ENTITY XML-LibXSLT-version          "1.99">
@@ -451,45 +444,45 @@
     These should point to cpan.metacpan.org/authors and will not
     get automatically checked for newer versions -->
-<!ENTITY Algorithm-Diff-version       "1.201">
-<!ENTITY Alien-Build-version          "2.41">
-<!ENTITY Alien-Libxml2-version        "0.17">
+<!ENTITY Algorithm-Diff-version       "1.1903">
+<!ENTITY Alien-Build-version          "2.26">
+<!ENTITY Alien-Libxml2-version        "0.16">
 <!ENTITY B-COW-version                "0.004">
 <!ENTITY B-Hooks-EndOfScope-version   "0.24">
-<!ENTITY Business-ISBN-Data-version   "20210112.006">
+<!ENTITY Business-ISBN-Data-version   "20191107">
 <!ENTITY Capture-Tiny-version         "0.48">
 <!ENTITY Class-Data-Inheritable-version "0.08">
 <!ENTITY Class-Inspector-version      "1.36">
-<!ENTITY Class-Singleton-version      "1.6">
-<!ENTITY Class-Tiny-version           "1.008">
+<!ENTITY Class-Singleton-version      "1.5">
+<!ENTITY Class-Tiny-version           "1.006">
 <!ENTITY Clone-version                "0.45">
-<!ENTITY Config-AutoConf-version      "0.320">
+<!ENTITY Config-AutoConf-version      "0.318">
 <!ENTITY CPAN-Meta-Check-version      "0.014">
-<!ENTITY DateTime-version             "1.54">
-<!ENTITY DateTime-Format-Strptime-version "1.79">
-<!ENTITY DateTime-Locale-version      "1.32">
-<!ENTITY DateTime-TimeZone-version    "2.47">
+<!ENTITY DateTime-version             "1.52">
+<!ENTITY DateTime-Format-Strptime-version "1.77">
+<!ENTITY DateTime-Locale-version      "1.26">
+<!ENTITY DateTime-TimeZone-version    "2.39">
 <!ENTITY Devel-StackTrace-version     "2.04">
 <!ENTITY Dist-CheckConflicts-version  "0.11">
 <!ENTITY Encode-Locale-version        "1.05">
 <!ENTITY Eval-Closure-version         "0.14">
-<!ENTITY Exception-Class-version      "1.45">
+<!ENTITY Exception-Class-version      "1.44">
 <!ENTITY Exporter-Tiny-version        "1.002002">
 <!ENTITY ExtUtils-LibBuilder-version  "0.08">
-<!ENTITY FFI-CheckLib-version         "0.28">
+<!ENTITY FFI-CheckLib-version         "0.27">
 <!ENTITY File-chdir-version           "0.1010">
 <!ENTITY File-Copy-Recursive-version  "0.45">
 <!ENTITY File-Find-Rule-version       "0.34">
-<!ENTITY File-Listing-version         "6.14">
-<!ENTITY File-ShareDir-version        "1.118">
+<!ENTITY File-Listing-version         "6.04">
+<!ENTITY File-ShareDir-version        "1.116">
 <!ENTITY File-ShareDir-Install-version "0.13">
 <!ENTITY HTML-Tagset-version          "3.20">
-<!ENTITY HTTP-Cookies-version         "6.10">
+<!ENTITY HTTP-Cookies-version         "6.08">
 <!ENTITY HTTP-Date-version            "6.05">
-<!ENTITY HTTP-Message-version         "6.33">
+<!ENTITY HTTP-Message-version         "6.25">
 <!ENTITY HTTP-Negotiate-version       "6.01">
-<!ENTITY Importer-version             "0.026">
-<!ENTITY IO-HTML-version              "1.004">
+<!ENTITY Importer-version             "0.025">
+<!ENTITY IO-HTML-version              "1.001">
 <!ENTITY IPC-System-Simple-version    "1.30">
-<!ENTITY libwww-perl-version          "6.55">
+<!ENTITY libwww-perl-version          "6.46">
 <!ENTITY List-MoreUtils-XS-version    "0.430">
 <!ENTITY List-SomeUtils-version       "0.58">
@@ -504,19 +497,14 @@
 <!ENTITY namespace-autoclean-version  "0.29">
 <!ENTITY namespace-clean-version      "0.27">
-<!ENTITY Net-HTTP-version             "6.21">
-<!ENTITY Net-SSLeay-version           "1.90">
+<!ENTITY Net-HTTP-version             "6.19">
+<!ENTITY Net-SSLeay-version           "1.88">
 <!ENTITY Number-Compare-version       "0.03">
-<!ENTITY Package-Stash-version        "0.39">
-<!ENTITY Params-Validate-version      "1.30">
+<!ENTITY Package-Stash-version        "0.38">
+<!ENTITY Params-Validate-version      "1.29">
 <!ENTITY Params-ValidationCompiler-version "0.30">
-<!ENTITY Path-Tiny-version            "0.118">
-<!ENTITY Role-Tiny-version            "2.002004">
-<!-- FIXME - please check the included version of
- List/Utils when upgrading the perl version,
- Scalar-List-Utils is here because List-AllUtils
- needs a newer version at runtime than is in 5.34.0 -->
-<!ENTITY Scalar-List-Utils-version    "1.56">
+<!ENTITY Path-Tiny-version            "0.114">
+<!ENTITY Role-Tiny-version            "2.001004">
 <!ENTITY Scope-Guard-version          "0.21">
-<!ENTITY Specio-version               "0.47">
+<!ENTITY Specio-version               "0.46">
 <!ENTITY Sub-Exporter-Progressive-version "0.001013">
 <!ENTITY Sub-Identify-version         "0.14">
@@ -528,26 +516,26 @@
 <!ENTITY Test-Deep-version            "1.130">
 <!ENTITY Test-Exception-version       "0.43">
-<!ENTITY Test-Fatal-version           "0.016">
-<!ENTITY Test-File-version            "1.448">
+<!ENTITY Test-Fatal-version           "0.014">
+<!ENTITY Test-File-version            "1.443">
 <!ENTITY Test-File-ShareDir-version   "1.001002">
-<!ENTITY Test-LeakTrace-version       "0.17">
-<!ENTITY Test-MockModule-version      "v0.176.0">
-<!ENTITY Test-Needs-version           "0.002009">
+<!ENTITY Test-LeakTrace-version       "0.16">
+<!ENTITY Test-MockModule-version      "v0.173.0">
+<!ENTITY Test-Needs-version           "0.002006">
 <!ENTITY Test-Requires-version        "0.11">
 <!ENTITY Test-RequiresInternet-version "0.05">
 <!ENTITY Test-utf8-version            "1.02">
-<!ENTITY Test-Warnings-version        "0.031">
+<!ENTITY Test-Warnings-version        "0.030">
 <!ENTITY Test-Without-Module-version  "0.20">
 <!ENTITY Test2-Plugin-NoWarnings-version "0.09">
-<!ENTITY Test2-Suite-version          "0.000140">
-<!ENTITY Text-CSV_XS-version          "1.46">
+<!ENTITY Test2-Suite-version          "0.000130">
+<!ENTITY Text-CSV_XS-version          "1.44">
 <!ENTITY Text-Diff-version            "1.45">
 <!ENTITY Text-Glob-version            "0.11">
-<!ENTITY Tie-Cycle-version            "1.226">
+<!ENTITY Tie-Cycle-version            "1.225">
 <!ENTITY TimeDate-version             "2.33">
 <!ENTITY Try-Tiny-version             "0.30">
 <!ENTITY Variable-Magic-version       "0.62">
 <!ENTITY WWW-RobotRules-version       "6.02">
-<!ENTITY XML-LibXML-version           "2.0207">
+<!ENTITY XML-LibXML-version           "2.0205">
 <!ENTITY XML-NamespaceSupport-version "1.12">
 <!ENTITY XML-SAX-version              "1.02">
@@ -557,29 +545,29 @@
 <!-- Python module versions used in the Python Modules instructions -->
 <!-- <!ENTITY Beaker-version               "1.10.0"> -->
-<!ENTITY docutils-version             "0.17.1">
-<!ENTITY dbus-python-version          "1.2.18">
-<!ENTITY dbusmock-version             "0.23.1">
+<!ENTITY docutils-version             "0.16">
+<!ENTITY dbus-python-version          "1.2.16">
+<!ENTITY dbusmock-version             "0.21.0">
 <!-- <!ENTITY funcsigs-version             "1.0.2"> -->
-<!ENTITY decorator-version            "5.0.9">
-<!ENTITY Jinja2-version               "3.0.1">
+<!ENTITY decorator-version            "4.4.2">
+<!ENTITY Jinja2-version               "2.11.2">
 <!-- libxml2 for Python2 shares the version of libxml2 -->
-<!ENTITY lxml-version                 "4.6.3">
-<!ENTITY mako-version                 "1.1.5">
-<!ENTITY MarkupSafe-version           "2.0.1">
-<!ENTITY py3c-version                 "1.3.1">
-<!ENTITY pyatspi2-version             "2.38.1">
+<!ENTITY lxml-version                 "4.6.2">
+<!ENTITY mako-version                 "1.1.3">
+<!ENTITY MarkupSafe-version           "1.1.1">
+<!ENTITY py3c-version                 "1.3">
+<!ENTITY pyatspi2-version             "2.38.0">
 <!--<!ENTITY py2cairo-version             "1.10.0"> -->
 <!ENTITY pycairo2-version             "1.18.2">
-<!ENTITY pycairo-version              "1.20.1">
+<!ENTITY pycairo-version              "1.20.0">
 <!--<!ENTITY pycrypto-version             "2.6.1"> Replaced by pycryptodome -->
-<!ENTITY pycryptodome-version         "3.10.1">
-<!ENTITY pygments-version             "2.10.0">
+<!ENTITY pycryptodome-version         "3.9.9">
+<!ENTITY pygments-version             "2.7.3">
 <!ENTITY pygobject2-version           "2.28.7">
-<!ENTITY pygobject3-version           "3.40.1">
+<!ENTITY pygobject3-version           "3.38.0">
 <!ENTITY pygtk-version                "2.24.0">
 <!ENTITY pyxdg-version                "0.27">
 <!ENTITY PyYAML-version               "5.3.1">
 <!ENTITY scour-version                "0.38.2">
-<!ENTITY six-version                  "1.16.0">
+<!ENTITY six-version                  "1.15.0">
 <!ENTITY python-slip-version          "0.6.5">
 <!-- <!ENTITY setuptools-version           "30.2.0"> -->
@@ -589,18 +577,18 @@
 <!--<!ENTITY ppp-version                  "2.4.5">-->
 <!ENTITY dhcpcd-version               "9.4.0">
-<!ENTITY dhcp-version                 "4.4.2-P1">
+<!ENTITY dhcp-version                 "4.4.2">
 
 <!-- Chapter 15 -->
-<!ENTITY bridgeutils-version          "1.7.1">
-<!ENTITY cifsutils-version            "6.13">
+<!ENTITY bridgeutils-version          "1.6">
+<!ENTITY cifsutils-version            "6.12">
 <!ENTITY iw-version                   "5.9">
 <!ENTITY ncftp-version                "3.2.6">
-<!ENTITY net-tools-version            "2.10">
-<!ENTITY nfs-utils-version            "2.5.4">
+<!ENTITY net-tools-version            "CVS_20101030">
+<!ENTITY nfs-utils-version            "2.5.2">
 <!ENTITY ntp-version                  "4.2.8p15">
-<!ENTITY rpcbind-version              "1.2.6">
+<!ENTITY rpcbind-version              "1.2.5">
 <!ENTITY rsync-version                "3.2.3">
-<!ENTITY samba-version                "4.14.7">
-<!ENTITY wget-version                 "1.21.1">
+<!ENTITY samba-version                "4.13.3">
+<!ENTITY wget-version                 "1.21">
 <!ENTITY wireless-tools-version       "29">
 <!ENTITY wpa_supplicant-version       "2.9">
@@ -609,22 +597,22 @@
 <!ENTITY avahi-version                "0.8">
 <!ENTITY bind-minor-version           "9.16">
-<!ENTITY bind-version                 "&bind-minor-version;.20">
+<!ENTITY bind-version                 "&bind-minor-version;.10">
 <!ENTITY mod_dnssd-version            "0.6">
-<!ENTITY NetworkManager-minor         "1.32">
-<!ENTITY NetworkManager-version       "&NetworkManager-minor;.10">
-<!ENTITY network-manager-applet-version "1.24.0">
-<!ENTITY nmap-version                 "7.92">
+<!ENTITY NetworkManager-minor         "1.28">
+<!ENTITY NetworkManager-version       "&NetworkManager-minor;.0">
+<!ENTITY network-manager-applet-version "1.18.0">
+<!ENTITY nmap-version                 "7.91">
 <!ENTITY traceroute-version           "2.1.0">
 <!ENTITY whois-version                "5.4.3">
 <!ENTITY wicd-version                 "1.7.4">
-<!ENTITY wireshark-version            "3.4.8">  <!-- even minor versions only -->
+<!ENTITY wireshark-version            "3.4.2">  <!-- even minor versions only -->
 
 <!ENTITY wicd-major-version           "1.7">
 
 <!-- Chapter 17 -->
-<!ENTITY c-ares-version               "1.17.2">
-<!ENTITY curl-version                 "7.78.0">
+<!ENTITY c-ares-version               "1.17.1">
+<!ENTITY curl-version                 "7.74.0">
 <!ENTITY geoclue2-version             "2.5.7">
-<!ENTITY glib-networking-version      "2.68.2">
+<!ENTITY glib-networking-version      "2.66.0">
 <!ENTITY ldns-version                 "1.7.1">
 <!ENTITY libevent-version             "2.1.12">
@@ -633,14 +621,14 @@
 <!ENTITY libnl-version                "3.5.0">
 <!ENTITY libnl-dl-version             "3_5_0">
-<!ENTITY libnma-version               "1.8.32">
-<!ENTITY libnsl-version               "2.0.0">
-<!ENTITY libpcap-version              "1.10.1">
+<!ENTITY libnma-version               "1.8.30">
+<!ENTITY libnsl-version               "1.3.0">
+<!ENTITY libpcap-version              "1.9.1">
 <!ENTITY libpsl-version               "0.21.1">
-<!ENTITY libndp-version               "1.8">
+<!ENTITY libndp-version               "1.7">
 <!ENTITY libproxy-version             "0.4.7">
-<!ENTITY libsoup-version              "2.74.0">
-<!ENTITY libtirpc-version             "1.3.2">
+<!ENTITY libsoup-version              "2.72.0">
+<!ENTITY libtirpc-version             "1.3.1">
 <!ENTITY neon-version                 "0.31.2">
-<!ENTITY nghttp2-version              "1.44.0">
+<!ENTITY nghttp2-version              "1.42.0">
 <!ENTITY rpcsvc-proto-version         "1.4.2">
 <!ENTITY serf-version                 "1.3.9">
@@ -648,5 +636,5 @@
 
 <!-- Chapter 18 -->
-<!ENTITY links-version                "2.23">
+<!ENTITY links-version                "2.21">
 <!ENTITY lynx-version                 "2.8.9rel.1">
 <!ENTITY w3m-version                  "0.5.3">
@@ -655,37 +643,37 @@
 <!ENTITY mailx-version                "12.5">
 <!ENTITY procmail-version             "3.22">
-<!ENTITY fetchmail-version            "6.4.21">
-<!ENTITY mutt-version                 "2.1.2">
+<!ENTITY fetchmail-version            "6.4.14">
+<!ENTITY mutt-version                 "2.0.3">
 <!ENTITY alpine-version               "2.21">
 
 <!-- Part V -->
 <!-- Chapter 20 -->
-<!ENTITY apache-version               "2.4.48">
-<!ENTITY proftpd-version              "1.3.7c">
-<!ENTITY vsftpd-version               "3.0.5">
+<!ENTITY apache-version               "2.4.46">
+<!ENTITY proftpd-version              "1.3.7a">
+<!ENTITY vsftpd-version               "3.0.3">
 
 <!-- Chapter 21 -->
 <!ENTITY dovecot-major                "2">
 <!ENTITY dovecot-minor                "3">
-<!ENTITY dovecot-micro                "16">
-<!--<!ENTITY dovecot-nano                 "3">-->
-<!--<!ENTITY dovecot-version              "&dovecot-major;.&dovecot-minor;.&dovecot-micro;.&dovecot-nano;">-->
-<!ENTITY dovecot-version              "&dovecot-major;.&dovecot-minor;.&dovecot-micro;">
-
-<!ENTITY exim-version                 "4.94.2">
-<!ENTITY postfix-version              "3.6.2">
-<!ENTITY sendmail-version             "8.17.1">
+<!ENTITY dovecot-micro                "11">
+<!ENTITY dovecot-nano                 "3">
+<!ENTITY dovecot-version              "&dovecot-major;.&dovecot-minor;.&dovecot-micro;.&dovecot-nano;">
+<!--<!ENTITY dovecot-version              "&dovecot-major;.&dovecot-minor;.&dovecot-micro;"> -->
+
+<!ENTITY exim-version                 "4.94">
+<!ENTITY postfix-version              "3.5.8">
+<!ENTITY sendmail-version             "8.16.1">
 
 <!-- Chapter 22 -->
 <!ENTITY db-version                   "5.3.28">
-<!ENTITY lmdb-version                 "0.9.29">
-<!ENTITY mariadb-version              "10.6.4">
-<!ENTITY postgresql-version           "13.4">
-<!ENTITY sqlite-version               "3.36.0">
+<!ENTITY lmdb-version                 "0.9.24">
+<!ENTITY mariadb-version              "10.5.8">
+<!ENTITY postgresql-version           "13.1">
+<!ENTITY sqlite-version               "3.34.0">
 
 <!-- Chapter 23 -->
-<!ENTITY openldap-version             "2.5.7">
+<!ENTITY openldap-version             "2.4.56">
 <!ENTITY soprano-version              "2.9.4">
-<!ENTITY unbound-version              "1.13.2">
+<!ENTITY unbound-version              "1.13.0">
 <!ENTITY virtuoso-version             "6.1.8">
 <!ENTITY xinetd-version               "2.3.15">
@@ -694,6 +682,6 @@
 <!-- Chapter 24 -->                               <!-- stable lt .90 micro version -->
 <!ENTITY xorg-version                 "7">      <!-- applies to all xorg packages -->
-<!ENTITY util-macros-version          "1.19.3">
-<!ENTITY xorgproto-version            "2021.4">
+<!ENTITY util-macros-version          "1.19.2">
+<!ENTITY xorgproto-version            "2020.1">
 <!ENTITY libXau-version               "1.0.9">
 <!ENTITY libXdmcp-version             "1.1.3">
@@ -703,7 +691,7 @@
 <!ENTITY xbitmaps-version             "1.1.2">
 <!ENTITY xcursor-themes-version       "1.0.6">
-<!ENTITY xkeyboard-config-version     "2.33">
-<!ENTITY mesa-major-minor             "21.2">
-<!ENTITY mesa-version                 "&mesa-major-minor;.1">
+<!ENTITY xkeyboard-config-version     "2.31">
+<!ENTITY mesa-major-minor             "20.3">
+<!ENTITY mesa-version                 "&mesa-major-minor;.2">
 <!ENTITY xcb-util-version             "0.4.0">
 <!ENTITY xcb-util-image-version       "0.4.0">
@@ -712,11 +700,11 @@
 <!ENTITY xcb-util-wm-version          "0.4.1">
 <!ENTITY xcb-util-cursor-version      "0.1.3">
-<!ENTITY xorg-server-version          "1.20.13">
+<!ENTITY xorg-server-version          "1.20.10">
 <!ENTITY twm-version                  "1.0.11">
-<!ENTITY xterm-version                "368">
+<!ENTITY xterm-version                "363">
 <!ENTITY xclock-version               "1.0.9">
 <!ENTITY xinit-version                "1.4.1">
 
-<!ENTITY libva-version                "2.12.0">
+<!ENTITY libva-version                "2.10.0">
 <!ENTITY libva-intel-driver-version   "2.4.1"> <!-- intel-vaapi-driver -->
 <!ENTITY libvdpau-version             "1.4">
@@ -728,8 +716,8 @@
 <!ENTITY amtk-version                 "&amtk-minor;.0">
 <!ENTITY atk-version                  "2.36.0">
-<!ENTITY atkmm-version                "2.28.2">
-<!ENTITY at-spi2-core-version         "2.40.3">
+<!ENTITY atkmm-version                "2.28.1">
+<!ENTITY at-spi2-core-version         "2.38.0">
 <!ENTITY at-spi2-atk-version          "2.38.0">
-<!ENTITY cairo-version                "1.17.4">
+<!ENTITY cairo-version                "1.17.2+f93fc72c03e">
 <!ENTITY cairomm-1.0-version          "1.14.0">
 <!ENTITY cairomm-version              "1.16.0">
@@ -739,42 +727,41 @@
 <!ENTITY clutter-gtk-version          "1.8.4">
 <!ENTITY colord-gtk-version           "0.2.0">
-<!ENTITY fltk-version                 "1.3.7">
+<!ENTITY fltk-version                 "1.3.5">
 <!ENTITY freeglut-version             "3.2.1">
-<!ENTITY gdk-pixbuf-version           "2.42.6">
-<!ENTITY gdk-pixbuf-xlib-version      "2.40.2">
-<!ENTITY gdl-version                  "3.40.0">
-<!ENTITY glew-version                 "2.2.0">
-<!ENTITY glu-version                  "9.0.2">
-<!ENTITY goffice010-version           "0.10.50">
-<!ENTITY graphene-version             "1.10.6">
+<!ENTITY gdk-pixbuf-version           "2.42.2">
+<!ENTITY gdk-pixbuf-xlib-version      "3116b8ae">
+<!ENTITY gdl-version                  "3.34.0">
+<!ENTITY glew-version                 "2.1.0">
+<!ENTITY glu-version                  "9.0.1">
+<!ENTITY goffice010-version           "0.10.48">
+<!ENTITY graphene-version             "1.10.2">
 <!ENTITY gtk2-version                 "2.24.33">
-<!ENTITY gtk3-version                 "3.24.30">
-<!ENTITY gtk4-version                 "4.4.0">
+<!ENTITY gtk3-version                 "3.24.24">
 <!ENTITY gtk-engines-version          "2.20.2">
 <!ENTITY gtkmm2-version               "2.24.5">
-<!ENTITY gtkmm3-version               "3.24.5">
+<!ENTITY gtkmm3-version               "3.24.3">
 <!ENTITY gtksourceview-version        "3.24.11">
-<!ENTITY gtksourceview4-version       "4.8.1">
-<!ENTITY gtksourceview5-version       "5.0.0">
-<!ENTITY gtk-vnc-version              "1.2.0">
-<!ENTITY imlib2-version               "1.7.2">
+<!ENTITY gtksourceview4-version       "4.8.0">
+<!ENTITY gtk-vnc-version              "1.0.0">
+<!ENTITY imlib2-version               "1.7.1">
 <!ENTITY keybinder2-version           "0.3.1">
 <!ENTITY keybinder3-version           "0.3.2">
-<!ENTITY libdazzle-version            "3.40.0">
-<!ENTITY libhandy1-version            "1.2.3">
+<!ENTITY libdazzle-version            "3.38.0">
+<!--<!ENTITY libhandy-version             "0.0.13">-->
+<!ENTITY libhandy1-version            "1.0.3">
 <!ENTITY libnotify-version            "0.7.9">
 <!ENTITY libxklavier-version          "5.4">
-<!ENTITY pango-version                "1.48.9">
-<!ENTITY pangomm-version              "2.46.1">
+<!ENTITY pango-version                "1.48.0">
+<!ENTITY pangomm-version              "2.42.2">
 <!ENTITY qt5-major                    "5.15">
 <!ENTITY qt5-version                  "&qt5-major;.2">
 <!ENTITY qt5-url "https://download.qt.io/archive/qt/&qt5-major;/&qt5-version;/submodules">
-<!ENTITY qtwebengine-version          "&qt5-major;.6">
+<!ENTITY qtwebengine-version          "&qt5-major;.2">
 <!ENTITY qtwebkit-version             "5.9.0">
 <!ENTITY qscintilla-version           "2.10.4">
 <!ENTITY shared-mime-info-version     "2.1">
 <!ENTITY startup-notification-version "0.12">
-<!ENTITY tepl-version                 "6.00.0">
-<!ENTITY webkitgtk-version            "2.32.3">    <!-- Even minors only -->
+<!ENTITY tepl-version                 "5.0.1">
+<!ENTITY webkitgtk-version            "2.30.4">    <!-- Even minors only -->
 
 <!ENTITY gtk2-libdir                  "2.0/2.10.0">
@@ -783,5 +770,5 @@
 <!-- Chapter 26 -->
 <!ENTITY lightdm-version              "1.30.0">
-<!ENTITY lightdm-gtk-greeter-version  "2.0.8">
+<!ENTITY lightdm-gtk-greeter-version  "2.0.6">
 <!ENTITY lxdm-version                 "0.5.3">
 <!ENTITY sddm-version                 "0.16.0">
@@ -789,5 +776,5 @@
 <!-- Chapter 27 -->
 <!ENTITY fluxbox-version              "1.3.7">
-<!ENTITY icewm-version                "2.7.0">
+<!ENTITY icewm-version                "2.0.0">
 <!ENTITY openbox-version              "3.6.1">
 <!ENTITY sawfish-version              "1.12.0">
@@ -797,5 +784,5 @@
 <!ENTITY icon-naming-utils-version    "0.8.90">
 <!ENTITY hicolor-icon-theme-version   "0.17">
-<!ENTITY adwaita-icon-theme-version   "40.1.1">
+<!ENTITY adwaita-icon-theme-version   "3.38.0">
 <!ENTITY gnome-icon-theme-version     "3.12.0">
 <!ENTITY gnome-icon-theme-extras-version "3.12.0">
@@ -808,22 +795,22 @@
 <!ENTITY phonon-version               "4.11.1">
 <!ENTITY phonon-backend-gstreamer-version "4.10.0">
-<!ENTITY phonon-backend-vlc-version   "0.11.3">
-<!ENTITY polkit-qt-version            "0.114.0">
+<!ENTITY phonon-backend-vlc-version   "0.11.1">
+<!ENTITY polkit-qt-version            "0.113.0">
 <!ENTITY polkit-kde-agent-version     "0.99.0">
 <!ENTITY libdbusmenu-qt-version       "0.9.3+16.04.20160218">
 
 <!-- KF5 and Plasma -->
-<!ENTITY kf5-version           "5.85.0">
-<!ENTITY kf5-short-version     "5.85">
-<!ENTITY kf5-base              "5.85">
+<!ENTITY kf5-version           "5.77.0">
+<!ENTITY kf5-short-version     "5.77">
+<!ENTITY kf5-base              "5.77">
 <!ENTITY kf5-download-http     "https://download.kde.org/stable/frameworks/&kf5-base;">
 
-<!ENTITY kf5apps-version       "21.08.0">
+<!ENTITY kf5apps-version       "20.12.0">
 <!ENTITY kf5apps-download-http "https://download.kde.org/stable/release-service/&kf5apps-version;/src">
 <!ENTITY kf5apps-download-ftp  "ftp://ftp.kde.org/pub/kde/stable/&kf5apps-version;/src">
 
-<!ENTITY plasma5-version       "5.22.4">
-
-<!ENTITY plasma-wayland-protocols-version "1.3.0">
+<!ENTITY plasma5-version       "5.20.4">
+
+<!ENTITY plasma-wayland-protocols-version "1.1.1">
 
 <!-- Part VIII -->
@@ -838,26 +825,26 @@
 <!ENTITY xfconf-version               "4.16.0">
 <!ENTITY libxfce4ui-version           "4.16.0">
-<!ENTITY exo-version                  "4.16.2">
-<!ENTITY garcon-minor                 "4.16">
-<!ENTITY garcon-version               "4.16.1">
-<!ENTITY thunar-version               "4.16.8">
+<!ENTITY exo-version                  "4.16.0">
+<!ENTITY garcon-minor                 "0.8">
+<!ENTITY garcon-version               "0.8.0">
+<!ENTITY thunar-version               "4.16.1">
 <!ENTITY thunar-volman-version        "4.16.0">
 <!ENTITY tumbler-version              "4.16.0">
-<!ENTITY xfce4-appfinder-version      "4.16.1">
-<!ENTITY xfce4-panel-version          "4.16.3">
+<!ENTITY xfce4-appfinder-version      "4.16.0">
+<!ENTITY xfce4-panel-version          "4.16.0">
 <!ENTITY xfce4-power-manager-version  "4.16.0">
-<!ENTITY xfce4-settings-version       "4.16.2">
+<!ENTITY xfce4-settings-version       "4.16.0">
 <!ENTITY xfdesktop-version            "4.16.0">
-<!ENTITY xfwm4-version                "4.16.1">
+<!ENTITY xfwm4-version                "4.16.0">
 <!ENTITY xfce4-session-version        "4.16.0">
 
 <!-- Chapter 36 -->
 <!ENTITY midori-version               "0.5.11">
-<!ENTITY parole-version               "4.16.0">
-<!ENTITY mousepad-version             "0.5.6">
+<!ENTITY parole-version               "4.15.0">
+<!ENTITY mousepad-version             "0.5.1">
 <!ENTITY vte2-version                 "0.28.2">
 <!ENTITY xfce4-terminal-version       "0.8.10">
 <!ENTITY xfburn-version               "0.6.2">
-<!ENTITY ristretto-version            "0.11.0">
+<!ENTITY ristretto-version            "0.10.0">
 <!ENTITY xfce4-mixer-version          "4.10.0">
 <!ENTITY xfce4-notifyd-version        "0.6.2">
@@ -868,10 +855,10 @@
 <!-- Chapter 37 -->
 <!ENTITY lxmenu-data-version          "0.1.5">
-<!ENTITY libfm-extra-version          "1.3.2">
+<!ENTITY libfm-extra-version          "1.3.1">
 <!ENTITY menu-cache-version           "1.1.0">
 <!ENTITY libfm-version                "&libfm-extra-version;">
-<!ENTITY pcmanfm-version              "1.3.2">
+<!ENTITY pcmanfm-version              "1.3.1">
 <!ENTITY libwnck2-version             "2.30.7">
-<!ENTITY lxpanel-version              "0.10.1">
+<!ENTITY lxpanel-version              "0.10.0">
 <!ENTITY lxappearance-version         "0.6.3">
 <!ENTITY lxsession-version            "0.5.5">
@@ -884,5 +871,5 @@
 <!ENTITY lxrandr-version              "0.3.2">
 <!ENTITY lxtask-version               "0.1.10">
-<!ENTITY lxterminal-version           "0.4.0">
+<!ENTITY lxterminal-version           "0.3.2">
 
 <!-- Chapter 40 -->
@@ -916,51 +903,50 @@
 <!-- Part X -->
 <!-- Chapter 39 -->
-<!ENTITY AbiWord-version              "3.0.5">
-<!ENTITY gnumeric-version             "1.12.50">
+<!ENTITY AbiWord-version              "3.0.4">
+<!ENTITY gnumeric-version             "1.12.48">
 <!ENTITY gnucash-version              "2.4.11">
 
-<!ENTITY libreoffice-version          "7.2.0">
-<!ENTITY libreoffice-patch            ".4">
+<!ENTITY libreoffice-version          "7.0.4">
+<!ENTITY libreoffice-patch            ".2">
 <!ENTITY libreoffice-dlversion        "&libreoffice-version;&libreoffice-patch;">
 
 <!-- Chapter 40 -->
 <!--<!ENTITY chromium-version             "64.0.3282.186">-->
-<!ENTITY epiphany-version             "40.3">
+<!ENTITY epiphany-version             "3.38.2">
 <!ENTITY falkon-major-version         "3.1">
 <!ENTITY falkon-minor-version         "0">
 <!ENTITY falkon-version               "&falkon-major-version;.&falkon-minor-version;">
-<!-- for firefox-legacy-version use JS78-version -->
-<!ENTITY firefox-version              "91.0.1">
+<!ENTITY firefox-version              "78.6.0">
 <!ENTITY flashplayer-version          "27.0.0.187">
 <!ENTITY qupzilla-version             "2.2.6">
-<!ENTITY seamonkey-version            "2.53.9">
+<!ENTITY seamonkey-version            "2.53.5.1">
 
 <!-- Chapter 41 -->
-<!ENTITY balsa-version                "2.6.3">
+<!ENTITY balsa-version                "2.6.2">
 <!ENTITY ekiga-version                "4.0.1">
-<!ENTITY feh-version                  "3.7.1">
+<!ENTITY feh-version                  "3.6.1">
 <!--<!ENTITY fontforge-date               "2015-02-28">-->
 <!ENTITY fontforge-version            "20201107">
-<!ENTITY gparted-version              "1.3.1">
-<!ENTITY gimp-version                 "2.10.24">
+<!ENTITY gparted-version              "1.1.0">
+<!ENTITY gimp-version                 "2.10.22">
 <!ENTITY hexchat-version              "2.14.3">
 <!ENTITY icedtea-web-version          "1.7.1">
-<!ENTITY inkscape-minor-version       "1.1">
+<!ENTITY inkscape-minor-version       "1.0">
 <!-- For point versions -->
-<!-- <!ENTITY inkscape-version             "&inkscape-minor-version;.2"> -->
+<!ENTITY inkscape-version             "&inkscape-minor-version;.1">
 <!-- For minor versions -->
-<!ENTITY inkscape-version             "&inkscape-minor-version;">
+<!--<!ENTITY inkscape-version             "&inkscape-minor-version;">-->
 <!ENTITY pan-version                  "0.133">
-<!ENTITY pavucontrol-version          "5.0">
-<!ENTITY pidgin-version               "2.14.6">
+<!ENTITY pavucontrol-version          "4.0">
+<!ENTITY pidgin-version               "2.14.1">
 <!ENTITY rox-filer-version            "2.11">
-<!ENTITY rxvt-unicode-version         "9.26">
-<!ENTITY thunderbird-version          "91.0.3">
+<!ENTITY rxvt-unicode-version         "9.22">
+<!ENTITY thunderbird-version          "78.6.0">
 <!ENTITY tigervnc-version             "1.11.0">
 <!ENTITY transmission-version         "3.00">
-<!ENTITY xarchiver-version            "0.5.4.17">
+<!ENTITY xarchiver-version            "0.5.4.16">
 <!ENTITY xchat-version                "2.8.8">
 <!ENTITY xdg-utils-version            "1.1.3">
-<!ENTITY xscreensaver-version         "6.01">
+<!ENTITY xscreensaver-version         "5.45">
 
 <!-- Part XI -->
@@ -968,9 +954,9 @@
 <!ENTITY alsa-download-http           "https://www.alsa-project.org/files/pub">
 <!ENTITY alsa-download-ftp            "ftp://ftp.alsa-project.org/pub">
-<!ENTITY alsa-version                 "1.2.5">
-<!ENTITY alsa-lib-version             "1.2.5.1">
-<!ENTITY alsa-plugins-version         "1.2.5">
-<!ENTITY alsa-utils-version           "1.2.5.1">
-<!ENTITY alsa-tools-version           "1.2.5">
+<!ENTITY alsa-version                 "1.2.2">
+<!ENTITY alsa-lib-version             "1.2.4">
+<!ENTITY alsa-plugins-version         "1.2.2">
+<!ENTITY alsa-utils-version           "1.2.4">
+<!ENTITY alsa-tools-version           "1.2.2">
 <!ENTITY alsa-firmware-version        "1.2.4">
 <!ENTITY alsa-oss-version             "1.1.8">
@@ -978,27 +964,27 @@
 <!ENTITY faac-version                 "1_30">
 <!ENTITY faad2-version                "2_10_0">
-<!ENTITY fdk-aac-version              "2.0.2">
+<!ENTITY fdk-aac-version              "2.0.1">
 <!ENTITY flac-version                 "1.3.3">
 <!ENTITY frei0r-version               "1.7.0">
 <!ENTITY gavl-version                 "1.4.0">
-<!ENTITY gstreamer10-version          "1.18.4">  <!-- Even minors only -->
-<!ENTITY gst10-plugins-base-version   "1.18.4">  <!-- Even minors only -->
-<!ENTITY gst10-plugins-good-version   "1.18.4">  <!-- Even minors only -->
-<!ENTITY gst10-plugins-bad-version    "1.18.4">  <!-- Even minors only -->
-<!ENTITY gst10-plugins-ugly-version   "1.18.4">  <!-- Even minors only -->
-<!ENTITY gst10-libav-version          "1.18.4">  <!-- Even minors only -->
-<!ENTITY gstreamer-vaapi-version      "1.18.4">  <!-- Even minors only -->
+<!ENTITY gstreamer10-version          "1.18.2">  <!-- Even minors only -->
+<!ENTITY gst10-plugins-base-version   "1.18.2">  <!-- Even minors only -->
+<!ENTITY gst10-plugins-good-version   "1.18.2">  <!-- Even minors only -->
+<!ENTITY gst10-plugins-bad-version    "1.18.2">  <!-- Even minors only -->
+<!ENTITY gst10-plugins-ugly-version   "1.18.2">  <!-- Even minors only -->
+<!ENTITY gst10-libav-version          "1.18.2">  <!-- Even minors only -->
+<!ENTITY gstreamer-vaapi-version      "1.18.2">  <!-- Even minors only -->
 <!ENTITY icedtea-sound-version        "1.0.1">
 <!ENTITY id3lib-version               "3.8.3">
 <!ENTITY liba52-version               "0.7.4">
 <!ENTITY libao-version                "1.2.0">
-<!ENTITY libass-version               "0.15.1">
+<!ENTITY libass-version               "0.15.0">
 <!ENTITY libcanberra-version          "0.30">
 <!ENTITY libcddb-version              "1.3.2">
 <!ENTITY libcdio-version              "2.1.0">
 <!ENTITY libdiscid-version            "0.6.2">
-<!ENTITY libdvdcss-version            "1.4.3">
-<!ENTITY libdvdread-version           "6.1.2">
-<!ENTITY libdvdnav-version            "6.1.1">
+<!ENTITY libdvdcss-version            "1.4.2">
+<!ENTITY libdvdread-version           "6.1.1">
+<!ENTITY libdvdnav-version            "6.1.0">
 <!ENTITY libdv-version                "1.0.0">
 <!ENTITY libmad-version               "0.15.1b">
@@ -1007,26 +993,26 @@
 <!ENTITY libmusicbrainz3-version      "3.0.3">
 <!ENTITY libmusicbrainz5-version      "5.1.0">
-<!ENTITY libogg-version               "1.3.5">
+<!ENTITY libogg-version               "1.3.4">
 <!ENTITY libquicktime-version         "1.2.4">
-<!ENTITY libsamplerate-version        "0.2.1">
-<!ENTITY libsndfile-version           "1.0.31">
+<!ENTITY libsamplerate-version        "0.1.9">
+<!ENTITY libsndfile-version           "1.0.28">
 <!ENTITY libtheora-version            "1.1.1">
 <!ENTITY libvorbis-version            "1.3.7">
-<!ENTITY libvpx-version               "1.10.0">
-<!ENTITY mlt-version                  "7.0.1">
+<!ENTITY libvpx-version               "1.9.0">
+<!ENTITY mlt-version                  "6.24.0">
 <!ENTITY opal-version                 "3.10.10">
 <!ENTITY opus-version                 "1.3.1">
-<!ENTITY pipewire-version             "0.3.34">
-<!ENTITY pulseaudio-major-version     "15.0">
+<!ENTITY pipewire-version             "0.3.18">
+<!ENTITY pulseaudio-major-version     "14.0">
 <!ENTITY pulseaudio-version           "&pulseaudio-major-version;">
 <!ENTITY sdl-version                  "1.2.15">
-<!ENTITY sdl2-version                 "2.0.16">
+<!ENTITY sdl2-version                 "2.0.14">
 <!ENTITY sound-theme-freedesktop-version "0.8">
-<!ENTITY soundtouch-version           "2.3.0">
+<!ENTITY soundtouch-version           "2.2">
 <!ENTITY speex-version                "1.2.0">
 <!ENTITY speexdsp-version             "1.2.0">
-<!ENTITY taglib-version               "1.12">
+<!ENTITY taglib-version               "1.11.1">
 <!ENTITY v4l-utils-version            "1.20.0">
-<!ENTITY x264-version                 "20210814">
+<!ENTITY x264-version                 "20200819">
 <!ENTITY x265-version                 "3.4">
 <!ENTITY xine-lib-version             "1.2.11">
@@ -1034,20 +1020,20 @@
 
 <!-- Chapter 43 -->
-<!ENTITY mpg123-version               "1.28.2">
-<!ENTITY vorbistools-version          "1.4.2">
+<!ENTITY mpg123-version               "1.26.4">
+<!ENTITY vorbistools-version          "1.4.0">
 <!ENTITY lame-version                 "3.100">
 <!ENTITY CDParanoia-version           "III-10.2">
 <!--<!ENTITY freetts-version              "1.2.2">-->
-<!ENTITY audacious-version            "4.1">
-<!ENTITY audacious-plugins-version    "4.1">
+<!ENTITY audacious-version            "4.0.5">
+<!ENTITY audacious-plugins-version    "4.0.5">
 <!--<!ENTITY amarok-version               "2.8.0">-->
 <!ENTITY pnmixer-version              "0.7.2">
 
 <!-- Chapter 44 -->
-<!ENTITY ffmpeg-version               "4.4">
-<!ENTITY mplayer-version              "export-2021-07-29">
+<!ENTITY ffmpeg-version               "4.3.1">
+<!ENTITY mplayer-version              "1.4">
 <!ENTITY xine-ui-version              "0.99.12">
 <!ENTITY transcode-version            "1.1.7">
-<!ENTITY vlc-version                  "3.0.16">
+<!ENTITY vlc-version                  "3.0.11.1">
 
 <!-- Chapter 45 -->
@@ -1056,15 +1042,15 @@
 <!ENTITY dvd-rw-tools-version         "7.1">
 <!ENTITY k3b-version                  "2.0.3">
-<!ENTITY libburn-version              "1.5.4">
-<!ENTITY libisoburn-version           "1.5.4">
-<!ENTITY libisofs-version             "1.5.4">
+<!ENTITY libburn-version              "1.5.2">
+<!ENTITY libisoburn-version           "1.5.2">
+<!ENTITY libisofs-version             "1.5.2">
 <!ENTITY simpleburn-version           "1.8.1">
 
 <!-- Part XII -->
 <!-- Chapter 46 -->
-<!ENTITY cups-version                 "2.3.3op2">
-<!ENTITY cups-filters-version         "1.28.10">
-<!ENTITY gs-version                   "9.54.0">
-<!ENTITY gs-packver                   "9540">
+<!ENTITY cups-version                 "2.3.3">
+<!ENTITY cups-filters-version         "1.28.6">
+<!ENTITY gs-version                   "9.53.3">
+<!ENTITY gs-packver                   "9533">
 <!ENTITY gutenprint-version           "5.3.3">
 
@@ -1094,20 +1080,20 @@
 <!ENTITY psutils-version              "p17">
 <!ENTITY epdfview-version             "0.1.8">
-<!ENTITY fop-version                  "2.6">
+<!ENTITY fop-version                  "2.5">
 <!ENTITY mupdf-version                "1.18.0">
 <!ENTITY paps-version                 "0.7.1">
 
 <!-- Chapter 51 -->
-<!ENTITY texlive-version              "20210325">
-<!ENTITY texmf-version                "20210325">
-<!ENTITY tex-tlpdb-version            "20210325">
+<!ENTITY texlive-version              "20200406">
+<!ENTITY texmf-version                "20200406">
+<!ENTITY tex-tlpdb-version            "20200406">
 <!-- the year is used when setting up PATHs in the tl-installer
  page, as well as to reference the directory in texlive, also
  in asymptote, biber and xindy -->
-<!ENTITY texlive-year                 "2021">
-<!ENTITY asymptote-version            "2.70">
-<!ENTITY biber-version                "2.16">
-<!ENTITY biblatex-version             "3.16">
-<!ENTITY dvisvgm-version              "2.12">
+<!ENTITY texlive-year                 "2020">
+<!ENTITY asymptote-version            "2.68">
+<!ENTITY biber-version                "2.15">
+<!ENTITY biblatex-version             "3.15a">
+<!ENTITY dvisvgm-version              "2.11">
 <!ENTITY xindy-version                "2.5.1">
 
Index: postlfs/config/bootdisk.xml
===================================================================
--- postlfs/config/bootdisk.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/config/bootdisk.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -73,5 +74,5 @@
     <para>
       Also, the LFS Community has developed its own LiveCD available at
-      <ulink url='https://www.&lfs-domainname;/livecd/'/>.  This LiveCD, is no
+      <ulink url='http://www.&lfs-domainname;/livecd/'/>.  This LiveCD, is no
       longer capable of building an entire LFS/BLFS system, but is still a
       good rescue CD-ROM.  If you download the
Index: postlfs/config/config.xml
===================================================================
--- postlfs/config/config.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/config/config.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="postlfs-config" xreflabel="After LFS Configuration Issues">
Index: postlfs/config/console-fonts.xml
===================================================================
--- postlfs/config/console-fonts.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/config/console-fonts.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: postlfs/config/devices.xml
===================================================================
--- postlfs/config/devices.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/config/devices.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: postlfs/config/firmware.xml
===================================================================
--- postlfs/config/firmware.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/config/firmware.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -208,5 +209,5 @@
         and downloading the latest file there.  As of this writing the most
         secure version of the microcode, for those machines which can boot it,
-        is microcode-20210608.<!-- If you have a Skylake machine, please read the
+        is microcode-20201112.<!-- If you have a Skylake machine, please read the
         Caution in the 'Early loading of microcode' section below.-->  Extract this
         file in the normal way, the microcode is in the <filename>intel-ucode
@@ -293,22 +294,15 @@
         was created by temporarily booting without
         microcode, to show the current Firmware Bug messages, then the late load
-        shows it being updated to revision 0xea.
-      </para>
-
-<screen><literal>[    0.000000] Linux version 5.12.8 (lfs@leshp) (gcc (GCC) 11.1.0,
-               GNU ld (GNU Binutils) 2.36.1)
-               #2 SMP PREEMPT Fri Jun 4 01:25:02 BST 2021
-[    0.000000] Command line: BOOT_IMAGE=/vmlinuz-5.12.8-sda11 root=/dev/sda11 ro
-               resume=/dev/sda10
-[    0.028741] [Firmware Bug]: TSC_DEADLINE disabled due to Errata;
+        shows it being updated to revision 0xec.
+      </para>
+
+<screen><literal>[    0.000000] Linux version 5.9.8 (ken@leshp) (gcc (GCC) 10.2.0,
+               GNU ld (GNU Binutils) 2.35)
+               #1 SMP PREEMPT Mon Nov 16 20:42:42 GMT 2020
+[    0.000000] Command line: BOOT_IMAGE=/vmlinuz-5.9.8-sda11 root=/dev/sda11 ro
+[    0.028715] [Firmware Bug]: TSC_DEADLINE disabled due to Errata;
                please update microcode to version: 0xb2 (or later)
-[    0.115716] SRBDS: Vulnerable: No microcode
-[    0.115826] MDS: Vulnerable: Clear CPU buffers attempted, no microcode
-[    0.389005] microcode: sig=0x506e3, pf=0x2, revision=0x74
-[    0.389030] microcode: Microcode Update Driver: v2.2.
-[   70.089502] microcode: updated to revision 0xea, date = 2021-01-25
-[   70.089528] x86/CPU: CPU features have changed after loading microcode,
-               but might not take effect.
-[   70.089530] microcode: Reload completed, microcode revision: 0xea</literal></screen>
+[    0.111874] SRBDS: Vulnerable: No microcode
+[    0.111984] MDS: Vulnerable: Clear CPU buffers attempted, no microcode</literal></screen>
 
       <para>
@@ -489,11 +483,12 @@
       </para>
 
-<screen><literal>[    0.000000] microcode: microcode updated early to revision 0xea, date = 2021-01-25
-[    0.000000] Linux version 5.12.8 (lfs@leshp) (gcc (GCC) 11.1.0,
-               GNU ld (GNU Binutils) 2.36.1) #2 SMP PREEMPT Fri Jun 4 01:25:02 BST 2021
-[    0.000000] Command line: BOOT_IMAGE=/vmlinuz-5.12.8-sda11 root=/dev/sda11 ro
-               resume=/dev/sda10
-[    0.381420] microcode: sig=0x506e3, pf=0x2, revision=0xea
-[    0.381479] microcode: Microcode Update Driver: v2.2.</literal></screen>
+<screen><literal>[    0.000000] microcode: microcode updated early to revision 0xe2, date = 2020-07-14
+[    0.000000] Linux version 5.9.8 (ken@leshp) (gcc (GCC) 10.2.0,
+               GNU ld (GNU Binutils) 2.35)
+               #1 SMP PREEMPT Mon Nov 16 20:42:42 GMT 2020
+[    0.000000] Command line: BOOT_IMAGE=/vmlinuz-5.9.8-sda11 root=/dev/sda11 ro
+[    0.378287] microcode: sig=0x506e3, pf=0x2, revision=0xe2
+[    0.378315] microcode: Microcode Update Driver: v2.2.
+</literal></screen>
 
 
Index: postlfs/config/logon.xml
===================================================================
--- postlfs/config/logon.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/config/logon.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: postlfs/config/profile.xml
===================================================================
--- postlfs/config/profile.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/config/profile.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -155,16 +156,8 @@
 
 # Set the initial path
-export PATH=/usr/bin
-
-# Attempt to provide backward compatibility with LFS earlier than 11
-if [ ! -L /bin ]; then
-        pathappend /bin
-fi
+export PATH=/bin:/usr/bin
 
 if [ $EUID -eq 0 ] ; then
-        pathappend /usr/sbin
-        if [ ! -L /sbin ]; then
-                pathappend /sbin
-        fi
+        pathappend /sbin:/usr/sbin
         unset HISTFILE
 fi
Index: postlfs/config/random.xml
===================================================================
--- postlfs/config/random.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/config/random.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: postlfs/config/skel.xml
===================================================================
--- postlfs/config/skel.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/config/skel.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: postlfs/config/users.xml
===================================================================
--- postlfs/config/users.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/config/users.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -86,5 +87,5 @@
         <row><entry>gdm     </entry><entry>21</entry><entry>21</entry></row>
         <row><entry>fcron   </entry><entry>22</entry><entry>22</entry></row>
-        <row><entry>systemd-journal</entry><entry>23</entry><entry>23</entry></row>
+        <row><entry>systemd-journal</entry><entry></entry><entry>23</entry></row>
         <row><entry>apache  </entry><entry>25</entry><entry>25</entry></row>
         <row><entry>smmsp   </entry><entry>26</entry><entry>26</entry></row>
@@ -114,5 +115,4 @@
         <row><entry>svn     </entry><entry>56</entry><entry>56</entry></row>
         <row><entry>svntest </entry><entry>  </entry><entry>57</entry></row>
-        <row><entry>git     </entry><entry>58</entry><entry>58</entry></row>
         <!-- <row><entry>pulse   </entry><entry>58</entry><entry>58</entry></row>
         <row><entry>pulse-access</entry><entry></entry><entry>59</entry></row>
@@ -138,6 +138,4 @@
         <!-- End systemd specific users and groups -->
 
-        <row><entry>uuidd   </entry><entry>80</entry><entry>80</entry></row>
-        <row><entry>systemd-oom</entry><entry>81</entry><entry>81</entry></row>
         <row><entry>ldap    </entry><entry>83</entry><entry>83</entry></row>
         <row><entry>avahi   </entry><entry>84</entry><entry>84</entry></row>
Index: postlfs/config/vimrc.xml
===================================================================
--- postlfs/config/vimrc.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/config/vimrc.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: postlfs/editors/bluefish.xml
===================================================================
--- postlfs/editors/bluefish.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/editors/bluefish.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY bluefish-download-http "https://www.bennewitz.com/bluefish/stable/source/bluefish-&bluefish-version;.tar.bz2">
+  <!ENTITY bluefish-download-http "http://www.bennewitz.com/bluefish/stable/source/bluefish-&bluefish-version;.tar.bz2">
   <!ENTITY bluefish-download-ftp  " ">
   <!ENTITY bluefish-md5sum        "33dd8262c4d8a564a517f8c98c0cce19">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -178,5 +179,5 @@
           <para>
             is a <application>GTK+</application> text editor for markup and
-            programming
+            programming.
           </para>
           <indexterm zone="bluefish bluefish-prog">
Index: postlfs/editors/ed.xml
===================================================================
--- postlfs/editors/ed.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/editors/ed.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY ed-download-http "&gnu-http;/ed/ed-&ed-version;.tar.lz">
   <!ENTITY ed-download-ftp  "&gnu-ftp;/ed/ed-&ed-version;.tar.lz">
-  <!ENTITY ed-md5sum        "894748c9bbf35cb7c599f5317b1a8cdb">
+  <!ENTITY ed-md5sum        "ab480d982289064ca040bc5c75fceffd">
   <!ENTITY ed-size          "68 KB">
-  <!ENTITY ed-buildsize     "1.2 MB">
+  <!ENTITY ed-buildsize     "1.0 MB">
   <!ENTITY ed-time          "less than 0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -133,5 +134,5 @@
         <listitem>
           <para>
-            is a line-oriented text editor
+            is a line-oriented text editor.
           </para>
           <indexterm zone="ed ed-prog">
@@ -146,5 +147,5 @@
           <para>
             is a restricted <command>ed</command>&mdash;it can only edit
-            files in the current directory and cannot execute shell commands
+            files in the current directory and cannot execute shell commands.
           </para>
           <indexterm zone="ed red">
Index: postlfs/editors/editors.xml
===================================================================
--- postlfs/editors/editors.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/editors/editors.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="postlfs-editors">
Index: postlfs/editors/emacs.xml
===================================================================
--- postlfs/editors/emacs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/editors/emacs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,8 +8,8 @@
   <!ENTITY emacs-download-ftp  "&gnu-ftp;/emacs/emacs-&emacs-version;.tar.xz"> 
   <!ENTITY emacs-download-ftp  " "> 
-  <!ENTITY emacs-md5sum        "4c3d9ff35b2ab2fe518dc7eb3951e128">
-  <!ENTITY emacs-size          "43 MB">
-  <!ENTITY emacs-buildsize     "620 MB">
-  <!ENTITY emacs-time          "0.6 SBU (Using parallelism=4)">
+  <!ENTITY emacs-md5sum        "f1f25356b68ec69caccd41d95988d23d">
+  <!ENTITY emacs-size          "42 MB">
+  <!ENTITY emacs-buildsize     "480 MB">
+  <!ENTITY emacs-time          "0.7 SBU (Using parallelism=4)">
 ]>
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -75,8 +76,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="harfbuzz"/>,
       <xref linkend="giflib"/>,
-      <xref linkend="gnutls"/>,
-      <xref linkend="jansson"/>, and
+      <xref linkend="gnutls"/>, and
       <xref linkend="libtiff"/>
     </para>
@@ -86,5 +85,4 @@
       <xref linkend="x-window-system"/>,
       <xref linkend="alsa-lib"/>,
-      <xref linkend="cairo"/>,
       <xref linkend="dbus"/>,
       <xref linkend="GConf"/>,
@@ -94,5 +92,5 @@
       <xref role="nodep" linkend="gtk2"/> or <xref linkend="gtk3"/>,
       <xref linkend="imagemagick"/>,
-      <xref linkend="lcms2"/>,
+      <xref linkend="jansson"/>, <!-- for JSON support -->
       <xref linkend="libjpeg"/>,
       <xref linkend="libpng"/>,
@@ -103,9 +101,8 @@
       <ulink url="&gnu-http;/intlfonts/">intlfonts</ulink>,
       <ulink url="http://directory.fsf.org/wiki/Libungif">libungif</ulink>,
-      <ulink url="http://www.nongnu.org/m17n/">libotf</ulink>, and
+      <ulink url="http://www.nongnu.org/m17n/">libotf</ulink> and
       <ulink url="http://www.nongnu.org/m17n/">m17n-lib</ulink> - to correctly
       display such complex scripts as Indic and Khmer, and also for scripts
-      that require Arabic shaping support (Arabic and Farsi),
-      <ulink url="https://mailutils.org/">mailutils</ulink>, and
+      that require Arabic shaping support (Arabic and Farsi), and
       <ulink url="&xorg-download-http;/lib/">libXaw3d</ulink>
     </para>
@@ -120,19 +117,12 @@
 
     <para>
-      First, work around a portability bug in glibc 2.34, 
-      which no longer defines SIGSTKSZ.
-    </para>
-
-<screen><userinput>sed -e '/SIGSTKSZ/ s|^.*$|static max_align_t sigsegv_stack[\
-   (64 * 1024 + sizeof (max_align_t) - 1) / sizeof (max_align_t)];|' \
-    -i src/sysdep.c</userinput></screen>
-
-    <para>
       Install <application>Emacs</application> by running the following
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --localstatedir=/var &amp;&amp;
 make</userinput></screen>
+<!-- make bootstrap only necessary for development versions obtained with git
+-->
 
     <para>
@@ -162,11 +152,9 @@
     <title>Command Explanations</title>
 
-    <!-- With 27.2, it writes scores to ~/.emacs.d/games 
-    <para>
-      <parameter>- -localstatedir=/var</parameter>: Create game score files
+    <para>
+      <parameter>--localstatedir=/var</parameter>: Create game score files
       in <filename class='directory'>/var/games/emacs</filename> instead
       of <filename class='directory'>/usr/var/games/emacs</filename>.
     </para>
-    -->
 
     <para>
@@ -189,14 +177,4 @@
       <option>--with-gnutls=no</option>: Use this if you have not installed
       <xref linkend="gnutls"/>.
-    </para>
-
-    <para>
-      <option>--without-harfbuzz</option>: Use this if you have not installed
-      <xref linkend="harfbuzz"/>.
-    </para>
-
-    <para>
-      <option>--with-json=no</option>: Use this if you have not installed
-      <xref linkend="jansson"/>.
     </para>
 
@@ -216,9 +194,11 @@
              emacs (symlink),
              emacs-&emacs-version;,
-             emacsclient, and
-             etags</seg>
+             emacsclient,
+             etags, and
+             grep-changelog</seg>
         <seg>None</seg>
-        <seg>/usr/libexec/emacs and
-             /usr/share/emacs</seg>
+        <seg>/usr/libexec/emacs,
+             /usr/share/emacs, and
+             /var/games/emacs</seg>
       </seglistitem>
     </segmentedlist>
@@ -234,5 +214,5 @@
           <para>
             creates cross-reference tagfile database files
-            for source code
+            for source code.
           </para>
           <indexterm zone="emacs ctags">
@@ -247,5 +227,5 @@
           <para>
             permits browsing of C++ class hierarchies from
-            within <command>emacs</command>
+            within <command>emacs</command>.
           </para>
           <indexterm zone="emacs ebrowse">
@@ -259,5 +239,5 @@
         <listitem>
           <para>
-            is an editor
+            is an editor.
           </para>
           <indexterm zone="emacs emacs-prog">
@@ -272,5 +252,5 @@
           <para>
             attaches an <command>emacs</command> session to an already
-            running <command>emacsserver</command> instance
+            running <command>emacsserver</command> instance.
           </para>
           <indexterm zone="emacs emacsclient">
@@ -285,5 +265,5 @@
           <para>
             is another program to generate source code
-            cross-reference tagfiles
+            cross-reference tagfiles.
           </para>
           <indexterm zone="emacs etags">
@@ -293,5 +273,4 @@
       </varlistentry>
 
-<!-- Not seen with 27.2
       <varlistentry id="grep-changelog">
         <term><command>grep-changelog</command></term>
@@ -299,5 +278,5 @@
           <para>
             prints entries in Change Logs matching
-            various criteria
+            various criteria.
           </para>
           <indexterm zone="emacs grep-changelog">
@@ -306,5 +285,4 @@
         </listitem>
       </varlistentry>
--->
 <!--
       <varlistentry id="rcs-checkin">
Index: postlfs/editors/gedit.xml
===================================================================
--- postlfs/editors/gedit.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/editors/gedit.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY gedit-download-http "&gnome-download-http;/gedit/&gnome-40;/gedit-&gedit-version;.tar.xz">
-  <!ENTITY gedit-download-ftp  "&gnome-download-ftp;/gedit/&gnome-40;/gedit-&gedit-version;.tar.xz">
-  <!ENTITY gedit-md5sum        "e5cacbf3918f74dd2964fa4e174c82f3">
+  <!ENTITY gedit-download-http "&gnome-download-http;/gedit/&gnome-minor-38;/gedit-&gedit-version;.tar.xz">
+  <!ENTITY gedit-download-ftp  "&gnome-download-ftp;/gedit/&gnome-minor-38;/gedit-&gedit-version;.tar.xz">
+  <!ENTITY gedit-md5sum        "19dcfd1631256ab85d9394225dddf167">
   <!ENTITY gedit-size          "6.5 MB">
-  <!ENTITY gedit-buildsize     "55 MB (with tests)">
+  <!ENTITY gedit-buildsize     "74 MB (with tests)">
   <!ENTITY gedit-time          "0.3 SBU (using parallelism=4; with tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -95,5 +96,5 @@
       <xref linkend="gtk-doc"/>,
       <xref linkend="vala"/>, and
-      <ulink url="https://launchpad.net/zeitgeist">zeitgeist</ulink>
+      <ulink url="http://launchpad.net/zeitgeist">zeitgeist</ulink>
     </para>
 
@@ -114,5 +115,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr -Dbuildtype=release .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -134,7 +135,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -165,8 +163,8 @@
         </seg>
         <seg>
-          libgedit-40.0.so
+          libgedit-3.38.so
         </seg>
         <seg>
-          /usr/include/gedit-40.0 and
+          /usr/include/gedit-3.38 and
           /usr/{lib,share,share/gtk-doc/html,share/help/*}/gedit
         </seg>
@@ -184,5 +182,5 @@
           <para>
             is a lightweight text editor integrated with the
-            <application>GNOME</application> Desktop
+            <application>GNOME</application> Desktop.
           </para>
           <indexterm zone="gedit gedit-prog">
Index: postlfs/editors/joe.xml
===================================================================
--- postlfs/editors/joe.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/editors/joe.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -191,5 +192,5 @@
           <para>
             is a symbolic link to <command>joe</command> used to
-            launch <application>Emacs</application> emulation mode
+            launch <application>Emacs</application> emulation mode.
           </para>
           <indexterm zone="joe jmacs">
@@ -205,5 +206,5 @@
             is a small text editor capable of emulating
             WordStar, <application>Pico</application>, and
-            <application>Emacs</application>
+            <application>Emacs</application>.
           </para>
           <indexterm zone="joe joe-prog">
@@ -218,5 +219,5 @@
           <para>
             is a symbolic link to <command>joe</command> used to
-            launch <application>Pico</application> emulation mode
+            launch <application>Pico</application> emulation mode.
           </para>
           <indexterm zone="joe jpico">
@@ -231,5 +232,5 @@
           <para>
             is a symbolic link to <command>joe</command> used to
-            launch WordStar emulation mode
+            launch WordStar emulation mode.
           </para>
           <indexterm zone="joe jstar">
@@ -245,5 +246,5 @@
             is a symbolic link to <command>joe</command> that restricts
             <application>JOE</application> to editing only files which are
-            specified on the command-line
+            specified on the command-line.
           </para>
           <indexterm zone="joe rjoe">
@@ -259,5 +260,5 @@
             is a program used by <command>joe</command> to convert rc and
             .jsf files into a C file (see
-            /usr/share/doc/joe-&joe-version;/util/README)
+            /usr/share/doc/joe-&joe-version;/util/README).
           </para>
           <indexterm zone="joe stringify">
@@ -273,5 +274,5 @@
             is a program used by <command>joe</command> to generate the
             termcap index file (see
-            /usr/share/doc/joe-&joe-version;/util/README)
+            /usr/share/doc/joe-&joe-version;/util/README).
           </para>
           <indexterm zone="joe termidx">
@@ -289,5 +290,5 @@
             EastAsianWidth.txt and UnicodeData.txt (find them at
             /usr/share/doc/joe-&joe-version;/util; see 
-            usr/share/doc/joe-&joe-version;/util/README)
+            usr/share/doc/joe-&joe-version;/util/README).
           </para>
           <indexterm zone="joe uniproc">
Index: postlfs/editors/kate5.xml
===================================================================
--- postlfs/editors/kate5.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/editors/kate5.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,8 +6,8 @@
   <!ENTITY kate5-download-http "&kf5apps-download-http;/kate-&kf5apps-version;.tar.xz">
   <!ENTITY kate5-download-ftp  " ">
-  <!ENTITY kate5-md5sum        "5c04c4b3f078c08536fed1bd862934bd">
-  <!ENTITY kate5-size          "6.9 MB">
-  <!ENTITY kate5-buildsize     "99 MB">
-  <!ENTITY kate5-time          "1.0 SBU (using parallelism=4)">
+  <!ENTITY kate5-md5sum        "4b59ac62b5e1cddb411cbb4458befc34">
+  <!ENTITY kate5-size          "5.6 MB">
+  <!ENTITY kate5-buildsize     "108 MB">
+  <!ENTITY kate5-time          "0.9 SBU (using parallelism=4)">
 ]>
 
@@ -16,4 +16,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -33,5 +34,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -149,5 +150,5 @@
         <listitem>
           <para>
-            is an advanced text editor for kde
+            is an advanced text editor for kde.
           </para>
           <indexterm zone="kate5 kate5-prog">
@@ -162,5 +163,5 @@
           <para>
             is a text editor for KDE, that is a light version of
-            <command>kate</command>
+            <command>kate</command>.
           </para>
           <indexterm zone="kate5 kwrite5">
Index: postlfs/editors/mousepad.xml
===================================================================
--- postlfs/editors/mousepad.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/editors/mousepad.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,10 +6,10 @@
 
   <!ENTITY mousepad-download-http
-           "https://archive.xfce.org/src/apps/mousepad/0.5/mousepad-&mousepad-version;.tar.bz2">
+           "http://archive.xfce.org/src/apps/mousepad/0.5/mousepad-&mousepad-version;.tar.bz2">
   <!ENTITY mousepad-download-ftp  " ">
-  <!ENTITY mousepad-md5sum        "96fa4d1cb7a522104d7dd41943c8b382">
-  <!ENTITY mousepad-size          "896 KB">
-  <!ENTITY mousepad-buildsize     "16 MB">
-  <!ENTITY mousepad-time          "0.1 SBU">
+  <!ENTITY mousepad-md5sum        "3083c9f5627948714a46ef360e3ae27a">
+  <!ENTITY mousepad-size          "808 KB">
+  <!ENTITY mousepad-buildsize     "13 MB">
+  <!ENTITY mousepad-time          "less than 0.1 SBU">
 ]>
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -76,5 +77,6 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtksourceview4"/>
+      <xref linkend="gtksourceview"/> and 
+      <xref linkend="xfconf"/>
     </para>
 
@@ -153,5 +155,5 @@
         <listitem>
           <para>
-            is a simple <application>GTK+ 3</application> text editor
+            is a simple <application>GTK+ 3</application> text editor.
           </para>
           <indexterm zone="mousepad mousepad-prog">
Index: postlfs/editors/nano.xml
===================================================================
--- postlfs/editors/nano.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/editors/nano.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,6 +8,6 @@
   <!ENTITY nano-download-http "https://www.nano-editor.org/dist/v5/nano-&nano-version;.tar.xz">
   <!ENTITY nano-download-ftp  " ">
-  <!ENTITY nano-md5sum        "d2249e3dd108c830df00efd7c1b79d86">
-  <!ENTITY nano-size          "1.4 MB">
+  <!ENTITY nano-md5sum        "703d9b5317486c6f49918e27c435fbc9">
+  <!ENTITY nano-size          "1.3 MB">
   <!ENTITY nano-buildsize     "23 MB">
   <!ENTITY nano-time          "0.2 SBU">
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -209,5 +210,5 @@
             is a small, simple text editor which aims to replace
             <application>Pico</application>, the default editor in the
-            <application>Pine</application> package
+            <application>Pine</application> package.
           </para>
           <indexterm zone="nano nano-prog">
@@ -221,5 +222,5 @@
         <listitem>
           <para>
-            is a restricted mode for <command>nano</command>
+            is a restricted mode for <command>nano</command>.
           </para>
           <indexterm zone="nano rnano-prog">
Index: postlfs/editors/vim.xml
===================================================================
--- postlfs/editors/vim.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/editors/vim.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -9,8 +9,8 @@
   <!ENTITY vim-download-http "&sources-anduin-http;/vim/vim-&vim-version;.tar.gz">
   <!ENTITY vim-download-ftp  " ">
-  <!ENTITY vim-md5sum        "e0325a4988b1b99b9c2e46fa853c1980">
+  <!ENTITY vim-md5sum        "497890e1f563a65c6f7594c0b0f5c0b9">
   <!ENTITY vim-size          "15 MB">
-  <!ENTITY vim-buildsize     "109 MB (add 61 MB for tests)">
-  <!ENTITY vim-time          "0.3 SBU (with parallelism=4; add 2.1 SBU for tests)">
+  <!ENTITY vim-buildsize     "110 MB (add 71 MB for tests)">
+  <!ENTITY vim-time          "0.3 SBU (with parallelism=4; add 1.3 SBU for tests)">
 ]>
 
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -55,5 +56,5 @@
     </note>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -103,8 +104,8 @@
       <xref linkend="gpm"/>,
       <xref linkend="lua"/>,
-<!-- can use python3: don't advertise python2
       <xref linkend="python2"/>,
--->   <xref linkend="rsync"/>, and
-      <xref linkend="ruby"/>
+      <xref linkend="rsync"/> and
+      <xref linkend="ruby"/><!-- , and
+      <xref linkend="tcl"/> -->
     </para>
 
@@ -144,6 +145,6 @@
     <note>
       <para>
-        If you intend to run the tests and have not installed Xorg in /usr,
-        append LDFLAGS='-L$XORG_PREFIX/lib' to the configure line below.
+        If you intend to run the tests and have not installed Xorg in /usr, append
+        LDFLAGS='-L$XORG_PROFIX/lib' to the configure line below.
       </para>
     </note>
@@ -255,16 +256,10 @@
       <option>--enable-luainterp</option>,
       <option>--enable-perlinterp</option>,
-      <option>--enable-python3interp=dynamic</option>,
-      <option>--enable-tclinterp --with-tclsh=tclsh</option>,
+      <option>--enable-pythoninterp</option>,
+      <option>--enable-tclinterp</option>,
       <option>--enable-rubyinterp</option>:
-      These options include the Lua, Perl, Python3, Tcl, or Ruby interpreters
-      that allow using other application code in <application>vim</application>
-      scripts. All the <option>--enable-...</option> options can accept
-      <option>=dynamic</option> to dynamically load the interpreter when
-      needed. This is required for <application>Python 3</application> to
-      prevent segmentation faults. For <application>tcl</application>,
-      it is necessary to indicate the name of the <command>tclsh</command>
-      executable, since <command>configure</command> only searches versioned
-      names with old versions.
+      These options include the Lua, Perl, Python, Tcl, or Ruby interpreters that
+      allow using other application code in <application>vim</application>
+      scripts.
     </para>
 
@@ -376,7 +371,7 @@
     <para>
       A list of the reinstalled files, along with their short
-      descriptions can be found in the
-      <ulink url="&lfs-root;/chapter08/vim.html#contents-vim">LFS Vim
-      Installation Instructions</ulink>.
+      descriptions can be found in the <ulink
+      url="&lfs-root;/chapter08/vim.html#contents-vim">LFS Vim Installation
+      Instructions</ulink>
     </para>
 
@@ -402,5 +397,5 @@
         <listitem>
           <para>
-            starts <command>gvim</command> in read-only mode
+            starts <command>gvim</command> in read-only mode.
           </para>
           <indexterm zone="vim gview">
@@ -415,5 +410,5 @@
           <para>
             is the editor that runs under <application>X</application>
-            and includes a GUI
+            and includes a GUI.
           </para>
           <indexterm zone="vim gvim">
@@ -428,5 +423,5 @@
           <para>
             edits two or three versions of a file with
-            <command>gvim</command> and shows the differences
+            <command>gvim</command> and shows the differences.
           </para>
           <indexterm zone="vim gvimdiff">
@@ -441,5 +436,5 @@
           <para>
             teaches the basic keys and commands of
-            <command>gvim</command>
+            <command>gvim</command>.
           </para>
           <indexterm zone="vim gvimtutor">
@@ -453,5 +448,5 @@
         <listitem>
           <para>
-            is a restricted version of <command>gview</command>
+            is a restricted version of <command>gview</command>.
           </para>
           <indexterm zone="vim rgview">
@@ -465,5 +460,5 @@
         <listitem>
           <para>
-            is a restricted version of <command>gvim</command>
+            is a restricted version of <command>gvim</command>.
           </para>
           <indexterm zone="vim gvim">
Index: postlfs/filesystems/aboutlvm.xml
===================================================================
--- postlfs/filesystems/aboutlvm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/filesystems/aboutlvm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -133,18 +134,8 @@
 mount /dev/lfs-lvm/mysql /srv/mysql</userinput></screen>
 
-  <para>
-    It may be needed to activate those logical volumes, for them to
-    appear in <filename class="directory">/dev</filename>. They can all
-    be activated at the same time by issuing, as the
-    <systemitem class="username">root</systemitem> user:
-  </para>
-
-<screen role="root"><userinput>vgchange -a y</userinput></screen>
-
   <para revision="sysv">
-    The LFS boot scripts automatically make these logical volumes available to
-    the system in the <command>udev</command> script. Edit the
-    <filename>/etc/fstab</filename> file as required to automatically mount
-    them.
+    The LFS boot scripts automatically make these file systems available to
+    the system in the checkfs script. Edit the <filename>/etc/fstab</filename>
+    file as required to automatically mount them.
   </para>
 
@@ -193,10 +184,7 @@
 
   <para>
-    For more information about LVM, see the <ulink
+    For a more information about LVM, see the <ulink
     url="http://www.tldp.org/HOWTO/LVM-HOWTO/">LVM HOWTO</ulink> and
-    the lvm man pages. A good in-depth
-    <ulink url="https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/logical_volume_manager_administration/index">
-    guide</ulink> is available from RedHat<superscript>&reg;</superscript>,
-    although it makes sometimes reference to proprietary tools.
+    the lvm man pages.
   </para>
 
Index: postlfs/filesystems/aboutraid.xml
===================================================================
--- postlfs/filesystems/aboutraid.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/filesystems/aboutraid.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: postlfs/filesystems/btrfs-progs.xml
===================================================================
--- postlfs/filesystems/btrfs-progs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/filesystems/btrfs-progs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY btrfs-progs-download-http "&kernel-dl;/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v&btrfs-progs-version;.tar.xz">
   <!ENTITY btrfs-progs-download-ftp  " ">
-  <!ENTITY btrfs-progs-md5sum        "8ca78d6e62179ef177597422e27a58fc">
+  <!ENTITY btrfs-progs-md5sum        "0472036ca5ef729374c673e1d867476e">
   <!ENTITY btrfs-progs-size          "2.1 MB">
-  <!ENTITY btrfs-progs-buildsize     "54 MB (up to 2.7 GB are used during tests)">
-  <!ENTITY btrfs-progs-time          "0.2 SBU (add 5.9 SBU for tests, but will be longer on slow disks)">
+  <!ENTITY btrfs-progs-buildsize     "97 MB (add 2.7 GB for tests)">
+  <!ENTITY btrfs-progs-time          "0.2 SBU (add 6.3 SBU for tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -85,5 +86,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="lvm2"/> (<command>dmsetup</command> is used in tests) and
+      <xref linkend="lvm2"/> (<command>dmsetup</command> is used in tests),
+      <xref linkend="python2"/> (python bindings), and
       <xref linkend="reiserfs"/> (for tests)
     </para>
@@ -105,14 +107,11 @@
   &lt;*/M&gt; Btrfs filesystem support [CONFIG_BTRFS_FS]</literal></screen>
 
-    <para>
-      In addition to the above and to the options required for
-      <xref linkend="lvm2"/> and <xref linkend="reiserfs"/>, the following
-      options must be enabled for running tests:
-    </para>
-
-<screen><literal>File systems  ---&gt;
-  [*]   Btrfs POSIX Access Control Lists      [CONFIG_BTRFS_FS_POSIX_ACL]
-  [*]   ReiserFS extended attributes          [CONFIG_REISERFS_FS_XATTR]
-  [*]     ReiserFS POSIX Access Control Lists [CONFIG_REISERFS_FS_POSIX_ACL]</literal></screen>
+    <note>
+      <para>
+        CONFIG_BTRFS_FS_POSIX_ACL and 
+        CONFIG_REISERFS_FS_XATTR are required for some tests.
+        Other Btrfs options in the kernel are optional.
+      </para>
+    </note>
 
     <indexterm zone="btrfs-progs btrfs-progs-kernel">
@@ -130,5 +129,8 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --bindir=/bin \
+            --libdir=/lib \
+            --with-pkgconfigdir=/usr/lib/pkgconfig &amp;&amp;
 make</userinput></screen>
 
@@ -140,11 +142,20 @@
       </para>
     </note>
-<!-- Keeping this for now, but it seems that calling "make test" is
-     simpler and does the same thing -->
-    <para>
-      Before running tests, build a support program:
-    </para>
-
-<screen remap="test"><userinput>make fssum</userinput></screen>
+
+    <para>
+      Before running tests, build a support program and 
+      disable several that fail:
+    </para>
+
+<screen remap="test"><userinput>make fssum &amp;&amp;
+
+sed -i '/found/s/^/: #/' tests/convert-tests.sh &amp;&amp;
+
+mv tests/convert-tests/010-reiserfs-basic/test.sh{,.broken}               &amp;&amp;
+mv tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh{,.broken} &amp;&amp;
+mv tests/convert-tests/012-reiserfs-large-hole-extent/test.sh{,.broken}   &amp;&amp;
+mv tests/convert-tests/013-reiserfs-common-inode-flags/test.sh{,.broken}  &amp;&amp;
+mv tests/convert-tests/014-reiserfs-tail-handling/test.sh{,.broken}       &amp;&amp;
+mv tests/fuzz-tests/003-multi-check-unmounted/test.sh{,.broken}</userinput></screen> 
 
     <para>
@@ -154,43 +165,12 @@
 
 <screen role="root" remap="test"><userinput>pushd tests
-   ./fsck-tests.sh
-   ./mkfs-tests.sh
-   ./cli-tests.sh
-   ./convert-tests.sh
-   ./misc-tests.sh
-   ./fuzz-tests.sh
+   ./fsck-tests.sh    <!-- 43 tests  6m14s -->
+   ./mkfs-tests.sh    <!-- 20 tests  2m48s -->
+   ./cli-tests.sh     <!-- 12 tests  0m51s -->
+   ./convert-tests.sh <!-- 16 tests 13m36s -->
+   ./misc-tests.sh    <!-- 38 tests  3m18s -->
+   ./fuzz-tests.sh    <!--  8 tests  1m11s -->
 popd</userinput></screen>
 
-<!-- Template for failed test removal:
-    <para>
-      To test the results, first disable one test that fails and prevents
-      the other ones to run:
-    </para>
-
-<screen remap="test"><userinput>mv tests/fsck-tests/012-leaf-corruption/test.sh{,.broken}</userinput></screen>
-Substitute your test failure with the one above. 
-    <para>
-      To test the results, run (as the
-      <systemitem class="username">root</systemitem> user):
-    </para>
-
-<screen role="root" remap="test"><userinput>make -j1 -k test</userinput></screen>
--->
-    <note>
-      <para>
-        If the above mentioned kernel options are not enabled, some tests
-        fail, and prevent all the remaining tests to run, because the test
-        disk image is not cleanly unmounted.
-      </para>
-    </note>
-<!--
-    <para>
-      Two tests fail for unknown reasons in the
-      <command>test-libbtrfsutil</command> section. Tests take a very long
-      time, and it may be interesting to run only part of them. Running tests
-      only in one directory can be done with
-      <command>make TEST=&lt;DIR&gt; test</command>.
-    </para>
--->
     <para>
       Install the package as the <systemitem
@@ -198,5 +178,10 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install &amp;&amp;
+
+ln -sfv ../../lib/$(readlink /lib/libbtrfs.so) /usr/lib/libbtrfs.so &amp;&amp;
+ln -sfv ../../lib/$(readlink /lib/libbtrfsutil.so) /usr/lib/libbtrfsutil.so &amp;&amp;
+rm -fv /lib/libbtrfs.{a,so} /lib/libbtrfsutil.{a,so} &amp;&amp;
+mv -v /bin/{mkfs,fsck}.btrfs /sbin</userinput></screen>
 
   </sect2>
@@ -209,5 +194,5 @@
       is needed if the recommended dependencies are not installed.
     </para>
-<!-- not anymore in the commands
+
     <para>
       <command>mv tests/{cli,convert,misc,fuzz}-tests/ ...</command>: Disables
@@ -224,5 +209,5 @@
       library entries.
     </para>
--->
+
   </sect2>
 
@@ -267,5 +252,5 @@
         <listitem>
           <para>
-            is the main interface into btrfs filesystem operations
+            is the main interface into btrfs filesystem operations.
           </para>
           <indexterm zone="btrfs-progs btrfs-prog">
@@ -279,5 +264,5 @@
         <listitem>
           <para>
-            converts from an ext2/3/4 or reiserfs filesystem to btrfs
+            converts from an ext2/3/4 filesystem to btrfs.
           </para>
           <indexterm zone="btrfs-progs btrfs-convert">
@@ -291,5 +276,5 @@
         <listitem>
           <para>
-            is a filter to find btrfs root
+            is a filter to find btrfs root.
           </para>
           <indexterm zone="btrfs-progs btrfs-find-root">
@@ -303,5 +288,5 @@
         <listitem>
           <para>
-            maps btrfs logical extent to physical extent
+            maps btrfs logical extent to physical extent.
           </para>
           <indexterm zone="btrfs-progs btrfs-map-logical">
@@ -315,5 +300,5 @@
         <listitem>
           <para>
-            overwrites the primary superblock with a backup copy
+            overwrites the primary superblock with a backup copy.
           </para>
           <indexterm zone="btrfs-progs btrfs-select-super">
@@ -327,5 +312,5 @@
         <listitem>
           <para>
-            tunes various filesystem parameters
+            tunes various filesystem parameters.
           </para>
           <indexterm zone="btrfs-progs btrfstune">
@@ -339,5 +324,5 @@
         <listitem>
           <para>
-            does nothing, but is present for consistency with fstab
+            does nothing, but is present for consistency with fstab.
           </para>
           <indexterm zone="btrfs-progs fsck.btrfs">
@@ -351,5 +336,5 @@
         <listitem>
           <para>
-            creates a btrfs file system
+            creates a btrfs file system.
           </para>
           <indexterm zone="btrfs-progs mkfs.btrfs">
Index: postlfs/filesystems/dosfstools.xml
===================================================================
--- postlfs/filesystems/dosfstools.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/filesystems/dosfstools.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY dosfstools-download-http "https://github.com/dosfstools/dosfstools/releases/download/v&dosfstools-version;/dosfstools-&dosfstools-version;.tar.gz">
+  <!ENTITY dosfstools-download-http "https://github.com/dosfstools/dosfstools/releases/download/v&dosfstools-version;/dosfstools-&dosfstools-version;.tar.xz">
   <!ENTITY dosfstools-download-ftp  " ">
-  <!ENTITY dosfstools-md5sum        "49c8e457327dc61efab5b115a27b087a">
-  <!ENTITY dosfstools-size          "314 KB">
-  <!ENTITY dosfstools-buildsize     "3.5 MB">
+  <!ENTITY dosfstools-md5sum        "07a1050db1a898e9a2e03b0c4569c4bd">
+  <!ENTITY dosfstools-size          "176 KB">
+  <!ENTITY dosfstools-buildsize     "2.9 MB">
   <!ENTITY dosfstools-time          "less than 0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -102,5 +103,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr            \
+<screen><userinput>./configure --prefix=/               \
             --enable-compat-symlinks \
             --mandir=/usr/share/man  \
@@ -156,5 +157,5 @@
         <listitem>
           <para>
-            sets or gets a MS-DOS filesystem label from a given device
+            sets or gets a MS-DOS filesystem label from a given device.
           </para>
           <indexterm zone="dosfstools fatlabel">
@@ -168,5 +169,5 @@
         <listitem>
           <para>
-            checks and repairs MS-DOS filesystems
+            checks and repairs MS-DOS filesystems.
           </para>
           <indexterm zone="dosfstools fsckfat">
@@ -180,5 +181,5 @@
         <listitem>
           <para>
-            creates an MS-DOS filesystem under Linux
+            creates an MS-DOS filesystem under Linux.
           </para>
           <indexterm zone="dosfstools mkfsfat">
Index: postlfs/filesystems/filesystems.xml
===================================================================
--- postlfs/filesystems/filesystems.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/filesystems/filesystems.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="postlfs-filesystems">
@@ -37,9 +42,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sshfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="uefi-bootloaders/dummy.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="uefi-bootloaders/efivar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="uefi-bootloaders/efibootmgr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="uefi-bootloaders/grub-efi.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="uefi-bootloaders/grub-setup.xml"/>
 
 </chapter>
Index: postlfs/filesystems/fuse3.xml
===================================================================
--- postlfs/filesystems/fuse3.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/filesystems/fuse3.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY fuse3-download-http "https://github.com/libfuse/libfuse/releases/download/fuse-&fuse3-version;/fuse-&fuse3-version;.tar.xz">
   <!ENTITY fuse3-download-ftp  " ">
-  <!ENTITY fuse3-md5sum        "55b87e9ed691c2fa698e491241985b4a">
-  <!ENTITY fuse3-size          "2.7 MB">
-  <!ENTITY fuse3-buildsize     "150 MB">
+  <!ENTITY fuse3-md5sum        "e973012119e98b048307558271b5b296">
+  <!ENTITY fuse3-size          "1.8 MB">
+  <!ENTITY fuse3-buildsize     "135 MB">
   <!ENTITY fuse3-time          "0.1 SBU (add 0.4 SBU for tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -77,5 +78,5 @@
     <para role="optional">
       <xref linkend="doxygen"/> (to rebuild the API documentation) and
-      <ulink url="https://pypi.org/project/pytest/">pytest</ulink> (required for tests)
+      <ulink url="https://pypi.org/project/pytest/">pytest</ulink> (for tests)
     </para>
 
@@ -123,5 +124,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -132,7 +133,11 @@
     </para> 
 
-<screen remap="doc"><userinput>pushd .. &amp;&amp;
-  doxygen doc/Doxyfile &amp;&amp;
-popd</userinput></screen>
+<screen remap="doc"><userinput>doxygen doc/Doxyfile</userinput></screen>
+
+<!--
+    <para>
+      This package does not come with a test suite.
+    </para>
+-->
 
     <para>
@@ -146,5 +151,5 @@
     <para>
       The <ulink url="https://pypi.org/project/pytest/">pytest</ulink>
-       Python module is required for the tests.
+       Python module is needed for the tests.
     </para>
 
@@ -155,5 +160,10 @@
 <screen role="root"><userinput>ninja install                                             &amp;&amp;
 
-chmod u+s /usr/bin/fusermount3                &amp;&amp;
+mv -vf   /usr/lib/libfuse3.so.3*     /lib                 &amp;&amp;
+ln -sfvn ../../lib/libfuse3.so.&fuse3-version; /usr/lib/libfuse3.so &amp;&amp;
+
+mv -vf /usr/bin/fusermount3  /bin         &amp;&amp;
+mv -vf /usr/sbin/mount.fuse3 /sbin        &amp;&amp;
+chmod u+s /bin/fusermount3                &amp;&amp;
 
 install -v -m755 -d /usr/share/doc/fuse-&fuse3-version;      &amp;&amp;
@@ -172,7 +182,14 @@
     </para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
+    <para>
+      <command>mv ... libfuse3.so.3*; ln ... libfuse3.so</command>: 
+      These commands install the libraries in the /lib directory.
+    </para>
+<!--
+    <para>
+      <command>unzip ...</command>: This uncompresses the installed man pages
+      to be consistent with the rest of the man pages.
+    </para>
+-->
   </sect2>
 
@@ -221,5 +238,5 @@
       <seglistitem>
         <seg>
-          fusermount3 and mount.fuse3
+          fusermount3, mount.fuse3
         </seg>
         <seg>
@@ -241,5 +258,5 @@
         <listitem>
           <para>
-            is a suid root program to mount and unmount Fuse filesystems
+            is a suid root program to mount and unmount Fuse filesystems.
           </para>
           <indexterm zone="fuse3 fusermount3">
@@ -254,5 +271,5 @@
           <para>
             is the command <command>mount</command> calls to mount a Fuse
-            filesystem
+            filesystem.
           </para>
           <indexterm zone="fuse3 mount.fuse3">
@@ -266,5 +283,5 @@
         <listitem>
           <para>
-            contains the <application>FUSE</application> API functions
+            contains the <application>FUSE</application> API functions.
           </para>
           <indexterm zone="fuse3 libfuse3">
Index: postlfs/filesystems/gptfdisk.xml
===================================================================
--- postlfs/filesystems/gptfdisk.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/filesystems/gptfdisk.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY gptfdisk-download-http "&sourceforge-dl;/gptfdisk/gptfdisk-&gptfdisk-version;.tar.gz">
   <!ENTITY gptfdisk-download-ftp  " ">
-  <!ENTITY gptfdisk-md5sum        "74684c4eb0e6d5a1839e4bb0bba36fa2">
-  <!ENTITY gptfdisk-size          "208 KB">
-  <!ENTITY gptfdisk-buildsize     "2.5 MB">
-  <!ENTITY gptfdisk-time          "less than 0.1 SBU (0.2 SBU for tests)">
+  <!ENTITY gptfdisk-md5sum        "58dac67c85e46ca87b587231549aefe6">
+  <!ENTITY gptfdisk-size          "204 KB">
+  <!ENTITY gptfdisk-buildsize     "2.3 MB">
+  <!ENTITY gptfdisk-time          "less than 0.1 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -115,5 +116,4 @@
 <screen><userinput>patch -Np1 -i ../gptfdisk-&gptfdisk-version;-convenience-1.patch &amp;&amp;
 sed -i 's|ncursesw/||' gptcurses.cc &amp;&amp;
-sed -i 's|sbin|usr/sbin|' Makefile &amp;&amp;
 
 make</userinput></screen>
@@ -163,5 +163,5 @@
         <listitem>
           <para>
-            is an ncurses-based tool for manipulating GPT partitions
+            is an ncurses-based tool for manipulating GPT partitions.
           </para>
           <indexterm zone="gptfdisk cgdisk">
@@ -175,5 +175,5 @@
         <listitem>
           <para>
-            is an interactive text-mode tool for manipulating GPT partitions
+            is an interactive text-mode tool for manipulating GPT partitions.
           </para>
           <indexterm zone="gptfdisk gdisk">
@@ -187,5 +187,5 @@
         <listitem>
           <para>
-            repairs mis-formatted MBR based disk partitions
+            repairs mis-formatted MBR based disk partitions.
           </para>
           <indexterm zone="gptfdisk fixparts">
@@ -200,5 +200,5 @@
           <para>
             is a partition manipulation program for
-            GPT partitions similar to <command>sfdisk</command>
+            GPT partitions similar to <command>sfdisk</command>.
           </para>
           <indexterm zone="gptfdisk sgdisk">
@@ -210,4 +210,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: postlfs/filesystems/initramfs.xml
===================================================================
--- postlfs/filesystems/initramfs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/filesystems/initramfs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -56,5 +57,5 @@
       volume.  They do not support an encrypted root file system or mounting
       the rootfs over a network card.  For a more complete capability see
-      <ulink url="https://www.linuxfromscratch.org/hints/read.html"> the LFS
+      <ulink url="http://www.linuxfromscratch.org/hints/read.html"> the LFS
       Hints</ulink> or <ulink
       url="http://fedoraproject.org/wiki/Dracut">dracut</ulink>.
@@ -66,5 +67,5 @@
     </para>
 
-    <screen role="root"><userinput>cat &gt; /usr/sbin/mkinitramfs &lt;&lt; "EOF"
+    <screen role="root"><userinput>cat &gt; /sbin/mkinitramfs &lt;&lt; "EOF"
 <literal>#!/bin/bash
 # This file based in part on the mkinitramfs script for the LFS LiveCD
@@ -76,5 +77,5 @@
 
   if [ "$2" = "lib" ]; then
-    file=$(PATH=/usr/lib type -p $1)
+    file=$(PATH=/lib:/usr/lib type -p $1)
   else
     file=$(type -p $1)
@@ -82,5 +83,5 @@
 
   if [ -n "$file" ] ; then
-    cp $file $WDIR/usr/$2
+    cp $file $WDIR/$2
   else
     echo "Missing required file: $1 for directory $2"
@@ -97,5 +98,5 @@
 fi
 
-if [ -n "$KERNEL_VERSION" ] &amp;&amp; [ ! -d "/usr/lib/modules/$1" ] ; then
+if [ -n "$KERNEL_VERSION" ] &amp;&amp; [ ! -d "/lib/modules/$1" ] ; then
   echo "No modules directory named $1"
   exit 1
@@ -109,16 +110,16 @@
 
 # Systemd installs udevadm in /bin. Other udev implementations have it in /sbin
-if [ -x /usr/bin/udevadm ] ; then binfiles="$binfiles udevadm"; fi
+if [ -x /bin/udevadm ] ; then binfiles="$binfiles udevadm"; fi
 
 sbinfiles="modprobe blkid switch_root"
 
-# Optional files and locations
+#Optional files and locations
 for f in mdadm mdmon udevd udevadm; do
-  if [ -x /usr/sbin/$f ] ; then sbinfiles="$sbinfiles $f"; fi
+  if [ -x /sbin/$f ] ; then sbinfiles="$sbinfiles $f"; fi
 done
 
 # Add lvm if present (cannot be done with the others because it
 # also needs dmsetup
-if [ -x /usr/sbin/lvm ] ; then sbinfiles="$sbinfiles lvm dmsetup"; fi
+if [ -x /sbin/lvm ] ; then sbinfiles="$sbinfiles lvm dmsetup"; fi
 
 unsorted=$(mktemp /tmp/unsorted.XXXXXXXXXX)
@@ -131,11 +132,9 @@
 
 # Create base directory structure
-mkdir -p $WDIR/{dev,run,sys,proc,usr/{bin,lib/{firmware,modules},sbin}}
+mkdir -p $WDIR/{bin,dev,lib/firmware,run,sbin,sys,proc,usr}
 mkdir -p $WDIR/etc/{modprobe.d,udev/rules.d}
 touch $WDIR/etc/modprobe.d/modprobe.conf
-ln -s usr/bin  $WDIR/bin
-ln -s usr/lib  $WDIR/lib
-ln -s usr/sbin $WDIR/sbin
-ln -s lib      $WDIR/lib64
+ln -s lib $WDIR/lib64
+ln -s ../bin $WDIR/usr/bin
 
 # Create necessary device nodes
@@ -153,5 +152,5 @@
 
 # Install any firmware present
-cp -a /usr/lib/firmware $WDIR/usr/lib
+cp -a /lib/firmware $WDIR/lib
 
 # Copy the RAID configuration file if present
@@ -164,5 +163,5 @@
 
 if [  -n "$KERNEL_VERSION" ] ; then
-  if [ -x /usr/bin/kmod ] ; then
+  if [ -x /bin/kmod ] ; then
     binfiles="$binfiles kmod"
   else
@@ -174,47 +173,48 @@
 # Install basic binaries
 for f in $binfiles ; do
-  ldd /usr/bin/$f | sed "s/\t//" | cut -d " " -f1 &gt;&gt; $unsorted
-  copy /usr/bin/$f bin
+  if [ -e /bin/$f ]; then d="/bin"; else d="/usr/bin"; fi
+  ldd $d/$f | sed "s/\t//" | cut -d " " -f1 &gt;&gt; $unsorted
+  copy $d/$f bin
 done
 
 for f in $sbinfiles ; do
-  ldd /usr/sbin/$f | sed "s/\t//" | cut -d " " -f1 &gt;&gt; $unsorted
+  ldd /sbin/$f | sed "s/\t//" | cut -d " " -f1 &gt;&gt; $unsorted
   copy $f sbin
 done
 
-# Add udevd libraries if not in /usr/sbin
-if [ -x /usr/lib/udev/udevd ] ; then
-  ldd /usr/lib/udev/udevd | sed "s/\t//" | cut -d " " -f1 &gt;&gt; $unsorted
-elif [ -x /usr/lib/systemd/systemd-udevd ] ; then
-  ldd /usr/lib/systemd/systemd-udevd | sed "s/\t//" | cut -d " " -f1 &gt;&gt; $unsorted
+# Add udevd libraries if not in /sbin
+if [ -x /lib/udev/udevd ] ; then
+  ldd /lib/udev/udevd | sed "s/\t//" | cut -d " " -f1 &gt;&gt; $unsorted
+elif [ -x /lib/systemd/systemd-udevd ] ; then
+  ldd /lib/systemd/systemd-udevd | sed "s/\t//" | cut -d " " -f1 &gt;&gt; $unsorted
 fi
 
 # Add module symlinks if appropriate
-if [ -n "$KERNEL_VERSION" ] &amp;&amp; [ -x /usr/bin/kmod ] ; then
-  ln -s kmod $WDIR/usr/bin/lsmod
-  ln -s kmod $WDIR/usr/bin/insmod
+if [ -n "$KERNEL_VERSION" ] &amp;&amp; [ -x /bin/kmod ] ; then
+  ln -s kmod $WDIR/bin/lsmod
+  ln -s kmod $WDIR/bin/insmod
 fi
 
 # Add lvm symlinks if appropriate
 # Also copy the lvm.conf file
-if  [ -x /usr/sbin/lvm ] ; then
-  ln -s lvm $WDIR/usr/sbin/lvchange
-  ln -s lvm $WDIR/usr/sbin/lvrename
-  ln -s lvm $WDIR/usr/sbin/lvextend
-  ln -s lvm $WDIR/usr/sbin/lvcreate
-  ln -s lvm $WDIR/usr/sbin/lvdisplay
-  ln -s lvm $WDIR/usr/sbin/lvscan
-
-  ln -s lvm $WDIR/usr/sbin/pvchange
-  ln -s lvm $WDIR/usr/sbin/pvck
-  ln -s lvm $WDIR/usr/sbin/pvcreate
-  ln -s lvm $WDIR/usr/sbin/pvdisplay
-  ln -s lvm $WDIR/usr/sbin/pvscan
-
-  ln -s lvm $WDIR/usr/sbin/vgchange
-  ln -s lvm $WDIR/usr/sbin/vgcreate
-  ln -s lvm $WDIR/usr/sbin/vgscan
-  ln -s lvm $WDIR/usr/sbin/vgrename
-  ln -s lvm $WDIR/usr/sbin/vgck
+if  [ -x /sbin/lvm ] ; then
+  ln -s lvm $WDIR/sbin/lvchange
+  ln -s lvm $WDIR/sbin/lvrename
+  ln -s lvm $WDIR/sbin/lvextend
+  ln -s lvm $WDIR/sbin/lvcreate
+  ln -s lvm $WDIR/sbin/lvdisplay
+  ln -s lvm $WDIR/sbin/lvscan
+
+  ln -s lvm $WDIR/sbin/pvchange
+  ln -s lvm $WDIR/sbin/pvck
+  ln -s lvm $WDIR/sbin/pvcreate
+  ln -s lvm $WDIR/sbin/pvdisplay
+  ln -s lvm $WDIR/sbin/pvscan
+
+  ln -s lvm $WDIR/sbin/vgchange
+  ln -s lvm $WDIR/sbin/vgcreate
+  ln -s lvm $WDIR/sbin/vgscan
+  ln -s lvm $WDIR/sbin/vgrename
+  ln -s lvm $WDIR/sbin/vgck
   # Conf file(s)
   cp -a /etc/lvm $WDIR/etc
@@ -235,12 +235,12 @@
 done
 
-if [ -d /usr/lib/udev ]; then
-  cp -a /usr/lib/udev $WDIR/usr/lib
-fi
-if [ -d /usr/lib/systemd ]; then
-  cp -a /usr/lib/systemd $WDIR/usr/lib
-fi
-if [ -d /usr/lib/elogind ]; then
-  cp -a /usr/lib/elogind $WDIR/usr/lib
+if [ -d /lib/udev ]; then
+  cp -a /lib/udev $WDIR/lib
+fi
+if [ -d /lib/systemd ]; then
+  cp -a /lib/systemd $WDIR/lib
+fi
+if [ -d /lib/elogind ]; then
+  cp -a /lib/elogind $WDIR/lib
 fi
 
@@ -248,12 +248,12 @@
 if [ -n "$KERNEL_VERSION" ]; then
   find                                                                        \
-     /usr/lib/modules/$KERNEL_VERSION/kernel/{crypto,fs,lib}                      \
-     /usr/lib/modules/$KERNEL_VERSION/kernel/drivers/{block,ata,md,firewire}      \
-     /usr/lib/modules/$KERNEL_VERSION/kernel/drivers/{scsi,message,pcmcia,virtio} \
-     /usr/lib/modules/$KERNEL_VERSION/kernel/drivers/usb/{host,storage}           \
+     /lib/modules/$KERNEL_VERSION/kernel/{crypto,fs,lib}                      \
+     /lib/modules/$KERNEL_VERSION/kernel/drivers/{block,ata,md,firewire}      \
+     /lib/modules/$KERNEL_VERSION/kernel/drivers/{scsi,message,pcmcia,virtio} \
+     /lib/modules/$KERNEL_VERSION/kernel/drivers/usb/{host,storage}           \
      -type f 2&gt; /dev/null | cpio --make-directories -p --quiet $WDIR
 
-  cp /usr/lib/modules/$KERNEL_VERSION/modules.{builtin,order}                     \
-            $WDIR/usr/lib/modules/$KERNEL_VERSION
+  cp /lib/modules/$KERNEL_VERSION/modules.{builtin,order}                     \
+            $WDIR/lib/modules/$KERNEL_VERSION
 
   depmod -b $WDIR $KERNEL_VERSION
@@ -263,6 +263,6 @@
 
 # Prepare early loading of microcode if available
-if ls /usr/lib/firmware/intel-ucode/* &gt;/dev/null 2&gt;&amp;1 ||
-   ls /usr/lib/firmware/amd-ucode/*   &gt;/dev/null 2&gt;&amp;1; then
+if ls /lib/firmware/intel-ucode/* &gt;/dev/null 2&gt;&amp;1 ||
+   ls /lib/firmware/amd-ucode/*   &gt;/dev/null 2&gt;&amp;1; then
 
 # first empty WDIR to reuse it
@@ -272,10 +272,10 @@
   mkdir -p $DSTDIR
 
-  if [ -d /usr/lib/firmware/amd-ucode ]; then
-    cat /usr/lib/firmware/amd-ucode/microcode_amd*.bin &gt; $DSTDIR/AuthenticAMD.bin
+  if [ -d /lib/firmware/amd-ucode ]; then
+    cat /lib/firmware/amd-ucode/microcode_amd*.bin &gt; $DSTDIR/AuthenticAMD.bin
   fi
 
-  if [ -d /usr/lib/firmware/intel-ucode ]; then
-    cat /usr/lib/firmware/intel-ucode/* &gt; $DSTDIR/GenuineIntel.bin
+  if [ -d /lib/firmware/intel-ucode ]; then
+    cat /lib/firmware/intel-ucode/* &gt; $DSTDIR/GenuineIntel.bin
   fi
 
@@ -292,5 +292,5 @@
 EOF
 
-chmod 0755 /usr/sbin/mkinitramfs</userinput></screen>
+chmod 0755 /sbin/mkinitramfs</userinput></screen>
 
     <screen role="root"><userinput>mkdir -p /usr/share/mkinitramfs &amp;&amp;
@@ -298,5 +298,5 @@
 <literal>#!/bin/sh
 
-PATH=/usr/bin:/usr/sbin
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
 export PATH
 
Index: postlfs/filesystems/jfs.xml
===================================================================
--- postlfs/filesystems/jfs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/filesystems/jfs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -169,5 +170,5 @@
           <para>
             is used to replay the JFS transaction log, check a
-            JFS formatted device for errors, and fix any errors found
+            JFS formatted device for errors, and fix any errors found.
           </para>
           <indexterm zone="jfsutils fsck.jfs">
@@ -181,5 +182,5 @@
         <listitem>
           <para>
-            is a hard link to fsck.jfs
+            is a hard link to fsck.jfs.
           </para>
           <indexterm zone="jfsutils jfs_fsck">
@@ -193,5 +194,5 @@
         <listitem>
           <para>
-            constructs an JFS file system
+            constructs an JFS file system.
           </para>
           <indexterm zone="jfsutils mkfs.jfs">
@@ -205,5 +206,5 @@
         <listitem>
           <para>
-            is a hard link to mkfs.jfs
+            is a hard link to mkfs.jfs.
           </para>
           <indexterm zone="jfsutils jfs_mkfs">
@@ -218,5 +219,5 @@
           <para>
             is a program which can be used to perform various low-level
-            actions on a JFS formatted device
+            actions on a JFS formatted device.
           </para>
           <indexterm zone="jfsutils jfs_debugfs">
@@ -231,5 +232,5 @@
           <para>
             extracts a JFS fsck service log into a file and/or formats and
-            displays the extracted file
+            displays the extracted file.
           </para>
           <indexterm zone="jfsutils jfs_fscklog">
@@ -244,5 +245,5 @@
           <para>
             dumps the contents of the journal log from the specified
-            JFS formatted device into output file ./jfslog.dmp
+            JFS formatted device into output file ./jfslog.dmp.
           </para>
           <indexterm zone="jfsutils jfs_logdump">
@@ -256,5 +257,5 @@
         <listitem>
           <para>
-            adjusts tunable file system parameters on JFS file systems
+            adjusts tunable file system parameters on JFS file systems.
           </para>
           <indexterm zone="jfsutils jfs_tune">
Index: postlfs/filesystems/lvm2.xml
===================================================================
--- postlfs/filesystems/lvm2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/filesystems/lvm2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,11 +7,11 @@
   <!ENTITY lvm2-download-http "https://sourceware.org/ftp/lvm2/LVM2.&lvm2-version;.tgz">
   <!ENTITY lvm2-download-ftp  "ftp://sourceware.org/pub/lvm2/LVM2.&lvm2-version;.tgz">
-  <!ENTITY lvm2-md5sum        "c4be18fcb94c84c26f71ff4235917c28">
-  <!ENTITY lvm2-size          "2.5 MB">
-  <!ENTITY lvm2-buildsize     "37 MB (add 18 MB for tests; transient files can grow up to around 800 MB in the /tmp directory during tests)">
+  <!ENTITY lvm2-md5sum        "ffce8d4e86c74d8d44098a530410e843">
+  <!ENTITY lvm2-size          "2.4 MB">
+  <!ENTITY lvm2-buildsize     "34 MB (add 22 MB for tests; transient files can grow up to around 800 MB in the /tmp directory during tests)">
   <!-- My build size was 124 MB with tests, but I'll leave this here. -renodr
-       The files in /tmp are transient. I monitor /tmp with a loop during
+       The files in /tmp are transcient. I monitor /tmp with a loop during
        tests. -pierre, August 2020 -->
-  <!ENTITY lvm2-time          "0.2 SBU (using parallelism=4; add 9 to 48 SBU for tests, depending on disk speed)">
+  <!ENTITY lvm2-time          "0.2 SBU (using parallelism=4; add 16 to 45 SBU for tests, depending on disk speed)">
 ]>
 
@@ -20,4 +20,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -90,8 +91,7 @@
       <xref linkend='which'/>,
       <xref linkend='xfsprogs'/> (all five may be used, but are not required,
-        for tests),
+        for tests), and
       <ulink url='https://github.com/jthornber/thin-provisioning-tools'>
-        thin-provisioning-tools</ulink>, and
-        <ulink url="https://github.com/dm-vdo/vdo">vdo</ulink>
+        thin-provisioning-tools</ulink>
     </para>
 
@@ -123,10 +123,5 @@
     &lt;*/M&gt;   Snapshot target                               [CONFIG_DM_SNAPSHOT]
     &lt;*/M&gt;   Thin provisioning target                      [CONFIG_DM_THIN_PROVISIONING]
-    &lt;*/M&gt;   Cache target (EXPERIMENTAL)                   [CONFIG_DM_CACHE]
     &lt;*/M&gt;   Mirror target                                 [CONFIG_DM_MIRROR]
-    &lt;*/M&gt;   Zero target                                   [CONFIG_DM_ZERO]
-    &lt;*/M&gt;   I/O delaying target                           [CONFIG_DM_DELAY]
-  [*] Block devices ---&gt;
-    &lt;*/M&gt;   RAM block device support                      [CONFIG_BLK_DEV_RAM]
 Kernel hacking ---&gt;
   Generic Kernel Debugging Instruments ---&gt;
@@ -147,10 +142,14 @@
     </para>
 
-<screen><userinput>PATH+=:/usr/sbin                \
+<screen><userinput>SAVEPATH=$PATH                  &amp;&amp;
+PATH=$PATH:/sbin:/usr/sbin      &amp;&amp;
 ./configure --prefix=/usr       \
+            --exec-prefix=      \
             --enable-cmdlib     \
             --enable-pkgconfig  \
             --enable-udev_sync  &amp;&amp;
-make</userinput></screen>
+make                            &amp;&amp;
+PATH=$SAVEPATH                  &amp;&amp;
+unset SAVEPATH</userinput></screen>
 
     <para>
@@ -197,19 +196,13 @@
     Results for LVM2.2.03.09:
     ### 338 tests: 212 passed, 41 skipped, 0 timed out, 70 warned, 15 failed
-
-    Results for LVM2.2.03.11:
-    ### 357 tests: 231 passed, 32 skipped, 0 timed out, 77 warned, 17 failed
     -->
 
     <para>
       The tests do not implement the <quote>expected fail</quote> possibility,
-      and a small number of test failures is expected by upstream. 
-      <!-- 1 -->More failures may happen because some kernel options are missing. 
-      For example, the lack of the <emphasis>dm-delay</emphasis> device 
-      mapper target  explains some failures. 
-      <!-- 2 -->Some tests may fail if there is insufficient free space available 
-      in the partition with the /tmp directory.  At least one test fails if 16 TB 
-      is not available.
-      <!-- 3 -->Some tests are flagged  <quote>warned</quote> if
+      and a small number of test failures is expected by upstream. More
+      failures may happen because some kernel options are missing. For example,
+      the lack of the <emphasis>dm-delay</emphasis> device mapper target may
+      explain some failures. Some tests are flagged
+      <quote>warned</quote> if
       <ulink url='https://github.com/jthornber/thin-provisioning-tools'>
       thin-provisioning-tools</ulink> are not installed. A workaround is to
@@ -235,6 +228,6 @@
 
       <note><simpara>The checks create device nodes in the /tmp directory.  The
-      tests will fail if /tmp is mounted with the nodev option.
-      </simpara></note>
+      tests will fail if /tmp is mounted with the nodev
+      option.</simpara></note>
     </para>
 
@@ -254,6 +247,6 @@
 
     <para>
-      <command>PATH+=:/usr/sbin</command>: The path
-      must contain
+      <command>PATH=$PATH:/sbin:/usr/sbin</command>: The path
+      must contain <filename class="directory">/sbin</filename> and
       <filename class='directory'>/usr/sbin</filename> for proper system tool
       detection by the <command>configure</command> script. This instruction
@@ -328,5 +321,5 @@
         <listitem>
           <para>
-            is a utility to deactivate block devices
+            is a utility to deactivate block devices.
           </para>
           <indexterm zone="lvm2 blkdeactivate">
@@ -340,5 +333,5 @@
         <listitem>
           <para>
-            (optional) is the Device Mapper event daemon
+            (optional) is the Device Mapper event daemon.
           </para>
           <indexterm zone="lvm2 dmeventd">
@@ -352,5 +345,5 @@
         <listitem>
           <para>
-            is a low level logical volume management tool
+            is a low level logical volume management tool.
           </para>
           <indexterm zone="lvm2 dmsetup">
@@ -364,5 +357,5 @@
         <listitem>
           <para>
-            is a utility used to resize or check filesystem on a device
+            is a utility used to resize or check filesystem on a device.
           </para>
           <indexterm zone="lvm2 fsadm">
@@ -379,5 +372,5 @@
             Commands are implemented via sympolic links to this program to
             manage physical devices (pv*), volume groups (vg*) and logical
-            volumes (lv*)
+            volumes (lv*).
           </para>
           <indexterm zone="lvm2 lvm">
@@ -407,5 +400,5 @@
           <para>
             is a tool used to dump various information concerning
-            <application>LVM2</application>
+            <application>LVM2</application>.
           </para>
           <indexterm zone="lvm2 lvmdump">
@@ -419,5 +412,5 @@
         <listitem>
           <para>
-            is used to import a duplicated VG (e.g. hardware snapshot)
+            is used to import a duplicated VG (e.g. hardware snapshot).
           </para>
           <indexterm zone="lvm2 vgimportclone">
@@ -428,9 +421,9 @@
 
       <varlistentry id="libdevmapper">
-        <term><filename class="libraryfile">libdevmapper.so</filename></term>
+        <term><filename class='libraryfile'>libdevmapper.so</filename></term>
         <listitem>
           <para>
             contains the <application>Device Mapper</application> API
-            functions
+            functions.
           </para>
           <indexterm zone="lvm2 libdevmapper">
Index: postlfs/filesystems/mdadm.xml
===================================================================
--- postlfs/filesystems/mdadm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/filesystems/mdadm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -154,5 +155,5 @@
     </para>
 
-<screen role="root"><userinput>make BINDIR=/usr/sbin install</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
@@ -164,7 +165,6 @@
       <command>make everything</command>: This optional target creates extra
       programs, particularly a statically-linked version of
-      <command>mdadm</command>. <!-- and also versions of
-      <command>mdassemble</command>. These all need to be manually installed.-->
-      This needs to be manually installed.
+      <command>mdadm</command> and also versions of
+      <command>mdassemble</command>. These all need to be manually installed.
     </para>
 
@@ -202,5 +202,5 @@
 
       <seglistitem>
-        <seg>mdadm and mdmon <!--and optionally mdassemble--></seg>
+        <seg>mdadm, mdmon and optionally mdassemble</seg>
         <seg>None</seg>
         <seg>None</seg>
@@ -217,5 +217,5 @@
         <listitem>
           <para>
-            manages MD devices aka Linux Software RAID
+            manages MD devices aka Linux Software RAID.
           </para>
           <indexterm zone="mdadm mdadm-prog">
@@ -229,5 +229,5 @@
         <listitem>
           <para>
-            monitors MD external metadata arrays
+            monitors MD external metadata arrays.
           </para>
           <indexterm zone="mdadm mdmon">
@@ -237,5 +237,4 @@
       </varlistentry>
 
-      <!-- Seems to be removed without a trace in 4.1
       <varlistentry id="mdassemble">
         <term><command>mdassemble</command></term>
@@ -243,5 +242,5 @@
           <para>
             is a tiny program that can be used to assemble MD devices
-            inside an initial ramdisk (initrd) or initramfs
+            inside an initial ramdisk (initrd) or initramfs.
           </para>
           <indexterm zone="mdadm mdassemble">
@@ -250,5 +249,4 @@
         </listitem>
       </varlistentry>
-      -->
 
     </variablelist>
Index: postlfs/filesystems/ntfs-3g.xml
===================================================================
--- postlfs/filesystems/ntfs-3g.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/filesystems/ntfs-3g.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,7 +8,7 @@
            "https://tuxera.com/opensource/ntfs-3g_ntfsprogs-&ntfs-3g-version;.tgz">
   <!ENTITY ntfs-3g-download-ftp  " ">
-  <!ENTITY ntfs-3g-md5sum        "90da343e78877d388eb34cefae6799ae">
-  <!ENTITY ntfs-3g-size          "1.3 MB">
-  <!ENTITY ntfs-3g-buildsize     "22 MB">
+  <!ENTITY ntfs-3g-md5sum        "d97474ae1954f772c6d2fa386a6f462c">
+  <!ENTITY ntfs-3g-size          "1.2 MB">
+  <!ENTITY ntfs-3g-buildsize     "20 MB">
   <!ENTITY ntfs-3g-time          "0.2 SBU">
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -108,13 +109,4 @@
     <title>Installation of Ntfs-3g</title>
 
-<!--
-    <para>
-      First, adapt <application>Ntfs-3g</application> to the merged-/usr
-      changes:
-    </para>
-
-<screen><userinput remap="pre">sed -i 's|/sbin|$(rootsbindir)|' {ntfsprogs,src}/Makefile.in</userinput></screen>
--->
-
     <para>
       Install <application>Ntfs-3g</application> by running the following
@@ -137,5 +129,5 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-ln -sv ../bin/ntfs-3g /usr/sbin/mount.ntfs &amp;&amp;
+ln -sv ../bin/ntfs-3g /sbin/mount.ntfs &amp;&amp;
 ln -sv ntfs-3g.8 /usr/share/man/man8/mount.ntfs.8</userinput></screen>
 
@@ -147,5 +139,5 @@
     </para>
 
-<screen role="root"><userinput>chmod -v 4755 /usr/bin/ntfs-3g</userinput></screen>
+<screen role="root"><userinput>chmod -v 4755 /bin/ntfs-3g</userinput></screen>
 
   </sect2>
@@ -177,5 +169,5 @@
 
     <para>
-      <command>ln -sv ../bin/ntfs-3g /usr/sbin/mount.ntfs</command>: Creating
+      <command>ln -sv ../bin/ntfs-3g /sbin/mount.ntfs</command>: Creating
       /sbin/mount.ntfs makes <command>mount</command> default to using Ntfs-3g
       to mount NTFS partitions.
@@ -183,5 +175,5 @@
 
     <para>
-      <command>chmod -v 4755 /usr/bin/ntfs-3g</command>: Making mount.ntfs setuid
+      <command>chmod -v 4755 /bin/ntfs-3g</command>: Making mount.ntfs setuid
       root allows non root users to mount NTFS partitions.
     </para>
@@ -229,5 +221,6 @@
           lowntfs-3g, mkfs.ntfs, mkntfs, mount.lowntfs-3g,
           mount.ntfs, mount.ntfs-3g, ntfs-3g, ntfs-3g.probe,
-          ntfscat, ntfsclone, ntfscluster, ntfscmp, ntfscp, ntfsfix,
+          ntfs-3g.secaudit, ntfs-3g.usermap, ntfscat,
+          ntfsclone, ntfscluster, ntfscmp, ntfscp, ntfsfix,
           ntfsinfo, ntfslabel, ntfsls, ntfsresize and
           ntfsundelete
@@ -252,5 +245,5 @@
         <listitem>
           <para>
-            is similar to ntfs-3g but uses the Fuse low-level interface
+            is similar to ntfs-3g but uses the Fuse low-level interface.
           </para>
           <indexterm zone="ntfs-3g lowntfs-3g">
@@ -264,5 +257,5 @@
         <listitem>
           <para>
-            is a symlink to mkntfs
+            is a symlink to mkntfs.
           </para>
           <indexterm zone="ntfs-3g mkfs.ntfs">
@@ -276,5 +269,5 @@
         <listitem>
           <para>
-            creates an NTFS file system
+            creates an NTFS file system.
           </para>
           <indexterm zone="ntfs-3g mkntfs">
@@ -288,5 +281,5 @@
         <listitem>
           <para>
-            is a symlink to lowntfs-3g
+            is a symlink to lowntfs-3g.
           </para>
           <indexterm zone="ntfs-3g mount.lowntfs-3g">
@@ -300,5 +293,5 @@
         <listitem>
           <para>
-            mounts an NTFS filesystem
+            mounts an NTFS filesystem.
           </para>
           <indexterm zone="ntfs-3g mount.ntfs">
@@ -312,5 +305,5 @@
         <listitem>
           <para>
-            is a symbolic link to ntfs-3g
+            is a symbolic link to ntfs-3g.
           </para>
           <indexterm zone="ntfs-3g mount.ntfs-3g">
@@ -329,5 +322,5 @@
             files. It can also handle special files like symbolic links, devices, and
             FIFOs; moreover it provides standard management of file ownership
-            and permissions, including POSIX ACLs
+            and permissions, including POSIX ACLs.
           </para>
           <indexterm zone="ntfs-3g ntfs-3g-prog">
@@ -343,5 +336,5 @@
             tests if an NTFS volume is mountable read only or read-write, and
             exits with a status value accordingly. The volume can be a block
-            device or image file
+            device or image file.
           </para>
           <indexterm zone="ntfs-3g ntfs-3g.probe">
@@ -351,10 +344,9 @@
       </varlistentry>
 
-<!-- Not present in 2021.8.22
       <varlistentry id="ntfs-3g.secaudit">
         <term><command>ntfs-3g.secaudit</command></term>
         <listitem>
           <para>
-            audits NTFS Security Data
+            audits NTFS Security Data.
           </para>
           <indexterm zone="ntfs-3g ntfs-3g.secaudit">
@@ -370,5 +362,5 @@
             creates the file defining the mapping of Windows accounts to Linux
             logins for users who owns files which should be visible from both
-            Windows and Linux
+            Windows and Linux.
           </para>
           <indexterm zone="ntfs-3g ntfs-3g.usermap">
@@ -377,5 +369,4 @@
         </listitem>
       </varlistentry>
--->
 
       <varlistentry id="ntfscluster">
@@ -395,5 +386,5 @@
         <listitem>
           <para>
-            copies a file to an NTFS volume
+            copies a file to an NTFS volume.
           </para>
           <indexterm zone="ntfs-3g ntfscp">
@@ -407,5 +398,5 @@
         <listitem>
           <para>
-            fixes common errors and forces Windows to check an NTFS partition
+            fixes common errors and forces Windows to check an NTFS partition.
           </para>
           <indexterm zone="ntfs-3g ntfsfix">
@@ -419,5 +410,5 @@
         <listitem>
           <para>
-            lists directory contents on an NTFS filesystem
+            lists directory contents on an NTFS filesystem.
           </para>
           <indexterm zone="ntfs-3g ntfsls">
@@ -431,5 +422,5 @@
         <listitem>
           <para>
-            prints NTFS files and streams on the standard output
+            prints NTFS files and streams on the standard output.
           </para>
           <indexterm zone="ntfs-3g ntfscat">
@@ -443,5 +434,5 @@
         <listitem>
           <para>
-            clones an NTFS filesystem
+            clones an NTFS filesystem.
           </para>
           <indexterm zone="ntfs-3g ntfsclone">
@@ -455,5 +446,5 @@
         <listitem>
           <para>
-            compares two NTFS filesystems and shows the differences
+            compares two NTFS filesystems and tells the differences.
           </para>
           <indexterm zone="ntfs-3g ntfscmp">
@@ -467,5 +458,5 @@
         <listitem>
           <para>
-            dumps a file's attributes
+            dumps a file's attributes.
           </para>
           <indexterm zone="ntfs-3g ntfsinfo">
@@ -479,5 +470,5 @@
         <listitem>
           <para>
-            displays or changes the label on an ntfs file system
+            displays or changes the label on an ntfs file system.
           </para>
           <indexterm zone="ntfs-3g ntfslabel">
@@ -491,5 +482,5 @@
         <listitem>
           <para>
-            resizes an NTFS filesystem without data loss
+            resizes an NTFS filesystem without data loss.
           </para>
           <indexterm zone="ntfs-3g ntfsresize">
@@ -503,5 +494,5 @@
         <listitem>
           <para>
-            recovers a deleted file from an NTFS volume
+            recovers a deleted file from an NTFS volume.
           </para>
           <indexterm zone="ntfs-3g ntfsundelete">
@@ -515,5 +506,5 @@
         <listitem>
           <para>
-            contains the Ntfs-3g API functions
+            contains the Ntfs-3g API functions.
           </para>
           <indexterm zone="ntfs-3g libntfs-3g">
@@ -524,4 +515,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: postlfs/filesystems/parted.xml
===================================================================
--- postlfs/filesystems/parted.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/filesystems/parted.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY parted-download-http "&gnu-http;/parted/parted-&parted-version;.tar.xz">
   <!ENTITY parted-download-ftp  "&gnu-ftp;/parted/parted-&parted-version;.tar.xz">
-  <!ENTITY parted-md5sum        "357d19387c6e7bc4a8a90fe2d015fe80">
+  <!ENTITY parted-md5sum        "090655d05f3c471aa8e15a27536889ec">
   <!ENTITY parted-size          "1.7 MB">
-  <!ENTITY parted-buildsize     "34 MB (additional 3 MB for the tests and additional 2 MB for optional PDF and Postscript documentation)">
-  <!ENTITY parted-time          "0.3 SBU (additional 2.5 SBU for the tests)">
+  <!ENTITY parted-buildsize     "34 MB (additional 3 MB for the tests and additional 1 MB for optional PDF and Postscript documentation)">
+  <!ENTITY parted-time          "0.3 SBU (additional 1.7 SBU for the tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -131,5 +132,4 @@
 dvips                -o doc/parted.ps  doc/parted.dvi</userinput></screen>
 
-<!-- Not needed with 3.4!
     <para>
       If you wish to run the test suite, first remove a couple of tests
@@ -137,9 +137,9 @@
       scripts to use Python 3, in case Python 2 is not installed:
     </para>
- <!- - One of these is due to a C locale, and another is a problem in LVM. - ->
+ <!-- One of these is due to a C locale, and another is a problem in LVM. -->
 <screen remap="test"><userinput>sed -i '/t0251-gpt-unicode.sh/d' tests/Makefile &amp;&amp;
 sed -i '/t6002-dm-busy.sh/d' tests/Makefile &amp;&amp;
 sed -i '1s/python/&amp;3/' tests/{gpt-header-move,msdos-overlap}</userinput></screen>
--->
+
     <para>
       To test the results, issue, as the <systemitem
@@ -223,5 +223,5 @@
         <listitem>
           <para>
-            is a partition manipulation program
+            is a partition manipulation program.
           </para>
           <indexterm zone="parted parted-prog">
@@ -235,5 +235,5 @@
         <listitem>
           <para>
-            informs the OS of partition table changes
+            informs the OS of partition table changes.
           </para>
           <indexterm zone="parted partprobe">
@@ -244,8 +244,8 @@
 
       <varlistentry id="libparted">
-        <term><filename class="libraryfile">libparted.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Parted</application> API functions
+        <term><filename class='libraryfile'>libparted.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Parted</application> API functions.
           </para>
           <indexterm zone="parted libparted">
@@ -256,4 +256,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: postlfs/filesystems/reiser.xml
===================================================================
--- postlfs/filesystems/reiser.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/filesystems/reiser.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -101,7 +102,8 @@
 
 <screen><userinput>sed -i '/parse_time.h/i #define _GNU_SOURCE' lib/parse_time.c &amp;&amp;
-autoreconf -fiv           &amp;&amp;
-
-./configure --prefix=/usr &amp;&amp;
+autoreconf -fiv             &amp;&amp;
+./configure --prefix=/usr   \
+            --sbindir=/sbin &amp;&amp;
+
 make</userinput></screen>
 
@@ -126,11 +128,9 @@
     </para>
 
-    <!-- FIXME: Not needed with merged-/usr setup anymore.
-    <para>
-      <parameter>- -sbindir=/sbin</parameter>: This switch ensures that the
+    <para>
+      <parameter>--sbindir=/sbin</parameter>: This switch ensures that the
       <application>reiserfsprogs</application> utilities are installed in
       <filename class="directory">/sbin</filename>.
     </para>
-    -->
 
   </sect2>
@@ -165,5 +165,5 @@
             without options, it prints the super block of any
             <application>ReiserFS</application> file
-            system found on the device
+            system found on the device.
           </para>
           <indexterm zone="reiserfs debugreiserfs">
@@ -177,5 +177,5 @@
         <listitem>
           <para>
-            creates a <application>ReiserFS</application> file system
+            creates a <application>ReiserFS</application> file system.
           </para>
           <indexterm zone="reiserfs mkreiserfs">
@@ -190,5 +190,5 @@
           <para>
             is used to check or repair a
-            <application>ReiserFS</application> file system
+            <application>ReiserFS</application> file system.
           </para>
           <indexterm zone="reiserfs reiserfsck">
@@ -204,5 +204,5 @@
             is used for tuning the <application>ReiserFS</application>
             journal. <emphasis>WARNING</emphasis>: Don't use this utility
-            without first reading the man page thoroughly
+            without first reading the man page thoroughly.
           </para>
           <indexterm zone="reiserfs reiserfstune">
@@ -217,5 +217,5 @@
           <para>
             is used to resize an unmounted
-            <application>ReiserFS</application> file system
+            <application>ReiserFS</application> file system.
           </para>
           <indexterm zone="reiserfs resize_reiserfs">
Index: postlfs/filesystems/smartmontools.xml
===================================================================
--- postlfs/filesystems/smartmontools.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/filesystems/smartmontools.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -104,4 +105,5 @@
 <screen revision="systemd"><userinput>./configure --prefix=/usr           \
             --sysconfdir=/etc       \
+            --with-initscriptdir=no \
             --docdir=/usr/share/doc/smartmontools-&smartmontools-version; &amp;&amp;
 make</userinput></screen>
@@ -116,19 +118,4 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands" revision="sysv">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-initscriptdir=no</parameter>: This switch suppresses
-      the default initialization script.  See below for the BLFS script.
-    </para>
-
-    <para>
-      <parameter>--with-libsystemd=no</parameter>: This switch disables support
-      for the sd-notify notification system provided by systemd.
-    </para>
 
   </sect2>
@@ -159,9 +146,8 @@
     </sect3>
 
-    <sect3  id="smartmontoools-init">
-       <title><phrase revision="sysv">Boot Script</phrase>
-              <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">
+    <sect3  id="smartmontoools-init" revision="sysv">
+      <title>Boot Script</title>
+
+      <para>
         If you want the <application>smartd</application> daemon to
         start automatically when the system is booted, install the
@@ -170,21 +156,21 @@
       </para>
 
-
-      <para revision="systemd">
-        If you want the <application>smartd</application> daemon to
-        start automatically when the system is booted, enable the
-        systemd unit provided by the package by executing the
-        following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
       <indexterm zone="smartmontools smartmontoools-init">
         <primary sortas="f-smartd">smartd</primary>
       </indexterm>
 
-<screen role="root" revision="sysv"><userinput>make install-smartd</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable smartd</userinput></screen>
+<screen role="root"><userinput>make install-smartd</userinput></screen>
+
     </sect3>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--with-initscriptdir=no</parameter>: This switch suppresses
+      the default initialization script.  See above for the BLFS script.
+    </para>
 
   </sect2>
@@ -224,5 +210,5 @@
         <listitem>
           <para>
-            is the control and monitor utility for SMART Disks
+            is the control and monitor utility for SMART Disks.
           </para>
           <indexterm zone="smartmontools smartctl">
@@ -236,5 +222,5 @@
         <listitem>
           <para>
-            is the SMART disk monitoring daemon
+            is the SMART disk monitoring daemon.
           </para>
           <indexterm zone="smartmontools smartd">
@@ -248,5 +234,5 @@
         <listitem>
           <para>
-            is the update tool for the smartmontools drive database
+            is the update tool for the smartmontools drive database.
           </para>
           <indexterm zone="smartmontools update-smart-drivedb">
@@ -258,4 +244,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: postlfs/filesystems/sshfs.xml
===================================================================
--- postlfs/filesystems/sshfs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/filesystems/sshfs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,7 +8,7 @@
     "https://github.com/libfuse/sshfs/releases/download/sshfs-&sshfs-version;/sshfs-&sshfs-version;.tar.xz">
   <!ENTITY sshfs-download-ftp  " ">
-  <!ENTITY sshfs-md5sum        "86dcc81a1381c3e6863c97e684501bb6">
+  <!ENTITY sshfs-md5sum        "22ac23d05ca7c56fb568627f086374d0">
   <!ENTITY sshfs-size          "52 KB">
-  <!ENTITY sshfs-buildsize     "0.9 MB">
+  <!ENTITY sshfs-buildsize     "1.7 MB">
   <!ENTITY sshfs-time          "less than 0.1 SBU">
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -95,4 +96,15 @@
   <sect2 role="installation">
     <title>Installation of Sshfs</title>
+    <!--
+    <para>
+      If you are building on i686, <application>sshfs</application> needs
+      an extra CFLAGS setting to be defined. This prevents an integer
+      overflow. To do this, run the following command:
+    </para>
+
+<screen><userinput>if [ $(uname -m) = "i686" ]; then
+  export CFLAGS+="-D_FILE_OFFSET_BITS=64";
+fi</userinput></screen>
+    -->
 
     <para>
@@ -104,5 +116,5 @@
 cd    build &amp;&amp;
           
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -144,5 +156,5 @@
 
     <para>
-      See <command>man 1 sshfs</command> and <command>man 8 mount.fuse3</command>
+      See <command>man 1 sshfs</command> and <command>man 8 mount.fuse</command>
       for all available mount options.
     </para>
@@ -180,5 +192,5 @@
         <listitem>
           <para>
-            mounts an <command>ssh</command> server as a local file system
+            mounts an <command>ssh</command> server as a local file system.
           </para>
           <indexterm zone="sshfs sshfs-prog">
@@ -189,4 +201,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: stlfs/filesystems/uefi-bootloaders/dummy.xml
===================================================================
--- postlfs/filesystems/uefi-bootloaders/dummy.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,14 +1,0 @@
-<?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">
-
-<sect1 role="dummy">
-
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Packages for UEFI Boot</title>
-  <para/>
-</sect1>
-
Index: stlfs/filesystems/uefi-bootloaders/efibootmgr.xml
===================================================================
--- postlfs/filesystems/uefi-bootloaders/efibootmgr.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,179 +1,0 @@
-<?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 efibootmgr-download-http "https://github.com/rhboot/efibootmgr/archive/&efibootmgr-version;/efibootmgr-&efibootmgr-version;.tar.gz">
-  <!ENTITY efibootmgr-download-ftp  " ">
-  <!ENTITY efibootmgr-md5sum        "6ae315936d9bc8613b3a4cb8a4064128">
-  <!ENTITY efibootmgr-size          "44 KB">
-  <!ENTITY efibootmgr-buildsize     "592 KB">
-  <!ENTITY efibootmgr-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="efibootmgr" xreflabel="efibootmgr-&efibootmgr-version;">
-  <?dbhtml filename="efibootmgr.html"?>
-
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>efibootmgr-&efibootmgr-version;</title>
-
-  <indexterm zone="efibootmgr">
-    <primary sortas="a-efibootmgr">efibootmgr</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to efibootmgr</title>
-
-    <para>
-      The <application>efibootmgr</application> package provides tools and
-      libraries to manipulate EFI variables.
-    </para>
-
-    &lfs110a_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&efibootmgr-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&efibootmgr-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &efibootmgr-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &efibootmgr-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &efibootmgr-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &efibootmgr-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">efibootmgr Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="efivar"/> and
-      <xref linkend="popt"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/efibootmgr"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of efibootmgr</title>
-
-    <para>
-      At first, fix an outdated hotfix declaration causing compilation
-      failure:
-    </para>
-
-<screen><userinput>sed -e '/extern int efi_set_verbose/d' -i src/efibootmgr.c</userinput></screen>
-
-    <para>
-      Build <application>efibootmgr</application> with the following
-      commands:
-    </para>
-
-<screen><userinput>make EFIDIR=LFS EFI_LOADER=grubx64.efi</userinput></screen>
-
-    <para>
-      This package does not have a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install EFIDIR=LFS</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>EFIDIR=LFS</parameter>:
-      This option specifies the distro's subdirectory name under
-      <filename class="directory">/boot/efi/EFI</filename>.
-      The building system of this package needs it to be set explicitly.
-    </para>
-
-    <para>
-      <parameter>EFI_LOADER=grubx64.efi</parameter>:
-      This option specifies the name of the default EFI boot loader.  It is
-      set to match the EFI boot loader provided by GRUB
-      <!--xref linkend="grub-efi"/-->.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-
-      <seglistitem>
-        <seg>
-          efibootdump and efibootmgr
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="efibootdump">
-        <term><command>efibootdump</command></term>
-        <listitem>
-          <para>
-            is a tool to display individual UEFI boot options, from a file
-            or an UEFI variable
-          </para>
-          <indexterm zone="efibootdump">
-            <primary sortas="b-efibootdump">efibootdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="efibootmgr-prog">
-        <term><command>efibootmgr</command></term>
-        <listitem>
-          <para>
-            is a tool to manipulate the UEFI Boot Manager
-          </para>
-          <indexterm zone="efibootmgr efibootmgr-prog">
-            <primary sortas="b-efibootmgr">efibootmgr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/filesystems/uefi-bootloaders/efivar.xml
===================================================================
--- postlfs/filesystems/uefi-bootloaders/efivar.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,199 +1,0 @@
-<?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 efivar-download-http "https://github.com/rhboot/efivar/releases/download/&efivar-version;/efivar-&efivar-version;.tar.bz2">
-  <!ENTITY efivar-download-ftp  " ">
-  <!ENTITY efivar-md5sum        "9f067275c5f7aafdd75bfb364280ac9c">
-  <!ENTITY efivar-size          "108 KB">
-  <!ENTITY efivar-buildsize     "2.75 MB">
-  <!ENTITY efivar-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="efivar" xreflabel="efivar-&efivar-version;">
-  <?dbhtml filename="efivar.html"?>
-
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>efivar-&efivar-version;</title>
-
-  <indexterm zone="efivar">
-    <primary sortas="a-efivar">efivar</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to efivar</title>
-
-    <para>
-      The <application>efivar</application> package provides tools and
-      libraries to manipulate EFI variables.
-    </para>
-
-    &lfs110a_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&efivar-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&efivar-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &efivar-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &efivar-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &efivar-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &efivar-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/efivar-&efivar-version;-gcc_9-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/efivar"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of efivar</title>
-
-    <para>
-      First, apply a patch to fix an issue building with GCC 9 or later:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../efivar-37-gcc_9-1.patch</userinput></screen>
-
-    <para>
-      Build <application>efivar</application> with the following commands:
-    </para>
-
-<screen><userinput>make CFLAGS="-O2 -Wno-stringop-truncation"</userinput></screen>
-
-    <para>
-      The test suite of this package is dangerous.  Running it may trigger
-      firmware bugs and make your system unusable without using some special
-      hardware to reprogram the firmware.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install LIBDIR=/usr/lib</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>CFLAGS="-O2 -Wno-stringop-truncation"</parameter>:
-      This option overrides the default compiler flags to avoid a build failure.
-    </para>
-
-    <para>
-      <parameter>LIBDIR=/usr/lib</parameter>:
-      This option overrides the default library directory of the package
-      (<filename class="directory">/usr/lib64</filename>, which is not used
-      by LFS.)
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          efivar
-        </seg>
-        <seg>
-          libefiboot.so and libefivar.so
-        </seg>
-        <seg>
-          /usr/include/efivar
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="efivar-prog">
-        <term><command>efivar</command></term>
-        <listitem>
-          <para>
-            is a tool to manipulate UEFI variables
-          </para>
-          <indexterm zone="efivar efivar-prog">
-            <primary sortas="b-efivar">efivar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libefiboot">
-        <term><filename class="libraryfile">libefiboot.so</filename></term>
-        <listitem>
-          <para>
-            is a library used by <command>efibootmgr</command>
-          </para>
-          <indexterm zone="efivar libefiboot">
-            <primary sortas="c-libefiboot">libefiboot.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libefivar">
-        <term><filename class="libraryfile">libefivar.so</filename></term>
-        <listitem>
-          <para>
-            is a library for the manipulation of EFI variables
-          </para>
-          <indexterm zone="efivar libefiboot">
-            <primary sortas="c-libefiboot">libefiboot.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/filesystems/uefi-bootloaders/grub-efi.xml
===================================================================
--- postlfs/filesystems/uefi-bootloaders/grub-efi.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,211 +1,0 @@
-<?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 grub-efi-download-http "https://ftp.gnu.org/gnu/grub/grub-&grub-version;.tar.xz">
-  <!ENTITY grub-efi-download-ftp  " ">
-  <!ENTITY grub-efi-md5sum        "cf0fd928b1e5479c8108ee52cb114363">
-  <!ENTITY grub-efi-size          "6.3 MB">
-  <!ENTITY grub-efi-buildsize     "185 MB">
-  <!ENTITY grub-efi-time          "0.9 SBU">
-
-  <!ENTITY unifont-download-http  "https://unifoundry.com/pub/unifont/unifont-&unifont-version;/font-builds/unifont-&unifont-version;.pcf.gz">
-  <!ENTITY unifont-md5sum         "4fbc33c8d8d25985f1bcdd4d28bc2420">
-  <!ENTITY unifont-size           "1.3 MB">
-]>
-
-<sect1 id="grub-efi" xreflabel="GRUB-&grub-version; for EFI">
-  <?dbhtml filename="grub-efi.html"?>
-
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>GRUB-&grub-version; for EFI</title>
-
-  <indexterm zone="grub-efi">
-    <primary sortas="a-grub-efi">grub-efi</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GRUB</title>
-
-    <para>
-      The <application>GRUB</application> package provides GRand Unified
-      Bootloader.  In this page it will be built with UEFI support, which
-      is not enabled for GRUB built in LFS.
-    </para>
-
-    &lfs110a_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&grub-efi-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&grub-efi-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &grub-efi-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &grub-efi-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &grub-efi-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &grub-efi-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <title>Unicode font data used to display GRUB menu</title>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&unifont-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &unifont-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &unifont-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GRUB Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required (runtime)</bridgehead>
-    <para role="runtime">
-      <xref linkend="efibootmgr"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="freetype2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="lvm2"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/grub-efi"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GRUB</title>
-
-    <para>
-      First, install font data as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>mkdir -pv /usr/share/fonts/unifont &amp;&amp;
-gunzip -c ../unifont-&unifont-version;.pcf.gz > /usr/share/fonts/unifont/unifont.pcf</userinput></screen>
-
-    <warning>
-      <para>Unset any environment variables which may affect the build:</para>
-
-      <screen><userinput>unset {C,CPP,CXX,LD}FLAGS</userinput></screen>
-
-      <para>Don't try <quote>tuning</quote> this package with custom
-      compilation flags: this package is a bootloader, with low-level
-      operations in the source code which is likely to be broken by some
-      aggressive optimizations.</para>
-    </warning>
-
-    <para>
-      Build <application>GRUB</application> with the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --disable-efiemu     \
-            --enable-grub-mkfont \
-            --with-platform=efi  \
-            --disable-werror     &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not have a test suite providing meaningful results.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-grub-mkfont</parameter>: Build the tool named
-      <command>grub-mkfont</command> to generate the font file for the boot
-      loader from the font data we've installed.
-    </para>
-
-    <warning>
-      <para>If the recommended dependency <xref linkend="freetype2"/> is not
-      installed, it is possible to omit this option and build GRUB.  However,
-      if <command>grub-mkfont</command> is not built, or the unicode font
-      data is not avaliable at the time GRUB is built, GRUB won't install
-      any font for the boot loader.  The GRUB boot menu will be displayed
-      using a coarse font and the early stage of kernel initialization will be
-      in <quote>blind mode</quote> &mdash; you can't see any kernel messages before
-      the graphics card driver is initialized.  It will be very difficult to
-      diagnose some boot issues, especially if the graphics driver is
-      built as module.</para>
-    </warning>
-
-    <para>
-      <parameter>--with-platform=efi</parameter>: Ensures building GRUB with
-      EFI enabled.
-    </para>
-
-  </sect2>
-
-  <sect2>
-    <title>Configuring GRUB</title>
-
-    <para>
-      Using GRUB to make the LFS system bootable on UEFI platform will be
-      discussed in <xref linkend="grub-setup"/>.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <para>See the page for GRUB in LFS book.</para>
-  </sect2>
-
-</sect1>
Index: stlfs/filesystems/uefi-bootloaders/grub-setup.xml
===================================================================
--- postlfs/filesystems/uefi-bootloaders/grub-setup.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,429 +1,0 @@
-<?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;
-]>
-
-<sect1 id="grub-setup" xreflabel="Using GRUB to Set Up the Boot Process with UEFI">
-  <?dbhtml filename="grub-setup.html"?>
-
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Using GRUB to Set Up the Boot Process with UEFI</title>
-
-  <sect2>
-    <title>Turn Off Secure Boot</title>
-
-    <para>
-      BLFS does not have the essential packages to support Secure Boot. To
-      set up the boot process with GRUB for UEFI installed in BLFS, Secure
-      Boot must be turned off from the configuration interface of the
-      firmware.  Read the documentation provided by the manufacturer of your
-      system to find out how.
-    </para>
-  </sect2>
-
-  <sect2>
-    <title>Create an Emergency Boot Disk</title>
-
-    <para>
-      Ensure that an emergency boot disk is ready to <quote>rescue</quote>
-      the system in case the system becomes un-bootable.  To make an
-      emergency boot disk with GRUB for an EFI based system, find a spare
-      USB flash drive and create a
-      <systemitem class="filesystem">vfat</systemitem> file system on it.
-      Install <xref linkend="dosfstools"/> first, then
-      as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-    <warning>
-      <para>
-        The following command will erase all directories and files in the
-        partition.  Make sure your USB flash drive contains no data which
-        will be needed, and change <userinput>sdx1</userinput> to the
-        device node corresponding to the first partition of the USB flash
-        drive.  Be careful not to overwrite your hard drive with a typo!
-      </para>
-    </warning>
-
-    <screen role="nodump"><userinput>mkfs.vfat /dev/sdx1</userinput></screen>
-
-    <para>
-      Still as the <systemitem class="username">root</systemitem> user, use
-      the <command>fdisk</command> utility to set the first parition
-      of the USB flash drive to be an <quote>EFI system</quote> partition
-      (change <userinput>sdx</userinput> to the device node corresponding
-      to your USB flash drive):
-    </para>
-
-<screen role="nodump"><userinput>fdisk /dev/sdx</userinput>
-<literal>
-Welcome to fdisk (util-linux 2.36.2).
-Changes will remain in memory only, until you decide to write them.
-Be careful before using the write command.
-
-
-Command (m for help): </literal><userinput>t</userinput>
-<literal>Selected partition 1
-Hex code or alias (type L to list all): </literal><userinput>ef</userinput>
-<literal>Changed type of partition 'Linux' to 'EFI (FAT-12/16/32)'.
-
-Command (m for help): </literal><userinput>w</userinput>
-<literal>The partition table has been altered.
-Calling ioctl() to re-read partition table.
-Syncing disks.</literal></screen>
-
-    <para>
-      Still as the <systemitem class="username">root</systemitem> user,
-      create a mount point for the EFI partition on the USB flash drive
-      and mount it:
-    </para>
-
-<screen role="nodump"><userinput>mkdir -pv /mnt/rescue &amp;&amp;
-mount -v -t vfat /dev/sdx1 /mnt/rescue</userinput></screen>
-
-    <para>
-      Install GRUB for EFI on the partition:
-    </para>
-
-<screen role="nodump"><userinput>grub-install --removable --efi-directory=/mnt/rescue --boot-directory=/mnt/rescue/grub</userinput></screen>
-
-    <para>
-      Unmount the partition:
-    </para>
-
-<screen role="nodump"><userinput>umount /mnt/rescue</userinput></screen>
-
-    <para>
-      Now the USB flash drive can be used as a emergency boot disk on x86-64
-      UEFI platform.  It will boot the system and show the GRUB shell.  Then you
-      can type commands to boot your operating systems on the hard drive.
-      To learn how to select the boot device, read the manual of your
-      motherboard or laptop.
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="uefi-kernel">
-    <title>Kernel Configuration for UEFI support</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile
-      the kernel if necessary:
-    </para>
-
-<screen><literal>Processor type and features ---&gt;
-  [*] EFI runtime service support                              [CONFIG_EFI]
-  [*]   EFI stub support                                       [CONFIG_EFI_STUB]
-Firmware Drivers ---&gt;
-  EFI (Extensible Firmware Interface) Support ---&gt;
-    &lt; &gt; EFI Variable Support via sysfs                         [CONFIG_EFI_VARS]
-    [*] Export efi runtime maps to sysfs                       [CONFIG_EFI_RUNTIME_MAP]
-Enable the block layer ---&gt;
-  Partition Types ---&gt;
-    [*] Advanced partition selection                           [CONFIG_PARTITION_ADVANCED]
-    [*] EFI GUID Partition support                             [CONFIG_EFI_PARTITION]
-Device Drivers ---&gt;
-  Graphics support ---&gt;
-    Frame buffer Devices ---&gt;
-      Support for frame buffer devices ---&gt;                    [CONFIG_FB]
-        [*] EFI-based Framebuffer support                      [CONFIG_FB_EFI]
-    Console display driver support ---&gt;
-      [*] Framebuffer Console support                          [CONFIG_FRAMEBUFFER_CONSOLE]
-File systems ---&gt;
-  Pseudo filesystems ---&gt;
-    &lt;*/M&gt; EFI Variable filesystem                              [CONFIG_EFIVAR_FS]</literal></screen>
-
-    <variablelist>
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>CONFIG_EFI_STUB</parameter></term>
-        <listitem>
-          <para>Although the EFI stub is designed to boot a kernel directly from
-          the UEFI firmware (without a bootloader like GRUB), GRUB needs the
-          kernel to be loaded to support the EFI handover protocol enabled by
-          this option.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>CONFIG_EFI_VARS</parameter></term>
-        <listitem>
-          <para>Don't use this deprecated option because of a 1024-byte
-          variable size limit.  Its function is replaced by
-          <parameter>CONFIG_EFIVAR_FS</parameter>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>CONFIG_FB_EFI</parameter> and <parameter>CONFIG_FRAMEBUFFER_CONSOLE</parameter></term>
-        <listitem>
-          <para>The combination of these two options allows the kernel to
-          print debug messages (along with Tux logos) at the early stage of
-          the boot process with UEFI.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-  <sect2>
-    <title>Find or Create the EFI System Partition</title>
-
-    <para>
-      On EFI based system, the bootloaders are installed in a special FAT32
-      partition called an <emphasis>EFI System Partition</emphasis> (ESP).
-      If your system supports EFI, and a recent version of Linux
-      distribution or Windows is pre-installed, it's likely that the ESP
-      is already created.  As the
-      <systemitem class="username">root</systemitem> user, list all the
-      partitions on your hard drive (replace <userinput>sda</userinput>
-      with the device corresponding to the appropriate hard drive):
-    </para>
-
-    <screen role="nodump"><userinput>fdisk -l /dev/sda</userinput></screen>
-
-    <para>
-      The <quote>Type</quote> column of the ESP should be
-      <literal>EFI System</literal>.
-    </para>
-
-    <para>
-      If the system or the hard drive is new, or it's a first time 
-      install an UEFI booted OS on the system, the ESP may not exist.
-      In that case, create a new partition, make a
-      <systemitem class="filesystem">vfat</systemitem> file system on it,
-      and set the partition type to <quote>EFI system</quote>.  See the
-      instructions for the emergency boot device above as a reference.
-    </para>
-
-    <warning>
-      <para>
-        Some (old) UEFI implementations may demand the ESP to be the first
-        partition on the disk.
-      </para>
-    </warning>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user,
-      create the mount point for the ESP, and mount it (replace
-      <userinput>sda1</userinput> with the device node corresponding to
-      the ESP):
-    </para>
-
-<screen role="nodump"><userinput>mkdir -pv /boot/efi &amp;&amp;
-mount -v -t vfat /dev/sda1 /boot/efi</userinput></screen>
-
-    <para>
-      Add an entry for the ESP in
-      <filename>/etc/fstab</filename>, so it will be mounted automatically
-      during system boot:
-    </para>
-
-<screen role="nodump"><userinput>cat &gt;&gt; /etc/fstab &lt;&lt; EOF</userinput>
-<literal>/dev/sda1 /boot/efi vfat defaults 0 1</literal>
-<userinput>EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2>
-    <title>Mount the EFI Variable File System</title>
-
-    <para>
-      The installation of GRUB on a UEFI platform requires that the EFI Variable
-      file system, <systemitem class="filesystem">efivarfs</systemitem>, to be
-      mounted.  As the <systemitem class="username">root</systemitem> user,
-      mount it if it's not already mounted:
-    </para>
-
-<screen role="nodump"><userinput>mountpoint /sys/firmware/efi/efivars || mount -v -t efivarfs efivarfs /sys/firmware/efi/efivars</userinput></screen>
-
-    <note revision="systemd">
-      <para>
-        If the system is booted with UEFI and systemd,
-        <systemitem class="filesystem">efivarfs</systemitem> will be mounted
-        automatically.  However in the LFS chroot environment it still needs to
-        be mounted manually.
-      </para>
-    </note>
-
-    <para revision="sysv">
-      Now add an entry for the
-      <systemitem class="filesystem">efivarfs</systemitem> in
-      <filename>/etc/fstab</filename> so it will be mounted automatically
-      during system boot:
-    </para>
-
-<screen revision="sysv" role="nodump"><userinput>cat &gt;&gt; /etc/fstab &lt;&lt; EOF</userinput>
-<literal>efivarfs /sys/firmware/efi/efivars efivarfs defaults 0 0</literal>
-<userinput>EOF</userinput></screen>
-
-    <warning>
-      <para>
-        If the system is not booted with UEFI, the directory
-        <filename class="directory">/sys/firmware/efi</filename> will be
-        missing. In this case you should boot the system in UEFI mode with
-        the emergency boot disk created as above.
-      </para>
-    </warning>
-  </sect2>
-
-  <sect2>
-    <title>Setting Up the Configuration</title>
-
-    <para>
-      On UEFI based systems, GRUB works by installing an EFI application
-      (a special kind of executable) into
-      <filename class="directory">/boot/efi/EFI/[id]/grubx64.efi</filename>,
-      where <filename class="directory">/boot/efi</filename> is the mount
-      point of the ESP, and <literal>[id]</literal> is replaced with an
-      identifier specified in the <command>grub-install</command> command
-      line.  GRUB will create an entry in the EFI variables containing
-      the path <literal>EFI/[id]/grubx64.efi</literal> so the EFI firmware
-      can find <filename>grubx64.efi</filename> and load it.
-    </para>
-
-    <para>
-      <filename>grubx64.efi</filename> is very lightweight (136 KB with
-      GRUB-2.06~rc1) so it will not use much space in the ESP.  A typical ESP
-      size is 100 MB (for Windows boot manager, which uses about 50 MB in
-      the ESP). Once <filename>grubx64.efi</filename> loaded by the
-      firmware, it will load GRUB modules in the boot partition.
-      The default location is
-      <filename class="directory">/boot/grub</filename>.
-    </para>
-
-    <para>
-      As the <systemitem class="username">root</systemitem> user, install
-      the GRUB files into <filename>/boot/efi/EFI/LFS/grubx64.efi</filename>
-      and <filename class="directory">/boot/grub</filename>. Then set up the
-      boot entry in the EFI variables:
-    </para>
-
-<screen role="nodump"><userinput>grub-install --bootloader-id=LFS --recheck</userinput></screen>
-
-    <para>
-      If the installation is successful, the output should be:
-    </para>
-
-<screen role="nodump"><literal>Installing for x86_64-efi platform.
-Installation finished. No error reported.</literal></screen>
-
-    <para>
-      Issue <command>efibootmgr</command> to recheck the EFI boot
-      configuration.  An example of the output is:
-    </para>
-
-<screen role="nodump"><literal>BootCurrent: 0000
-Timeout: 1 seconds
-BootOrder: 0005,0000,0002,0001,0003,0004
-Boot0000* ARCH
-Boot0001* UEFI:CD/DVD Drive
-Boot0002* Windows Boot Manager
-Boot0003* UEFI:Removable Device
-Boot0004* UEFI:Network Device
-Boot0005* LFS</literal></screen>
-
-    <para>
-      Note that <literal>0005</literal> is the first in the
-      <literal>BootOrder</literal>, and <literal>Boot0005</literal>
-      is <literal>LFS</literal>. This means that on the next boot, the 
-      version of GRUB installed by LFS will be used to boot the system.
-    </para>
-
-  </sect2>
-
-  <sect2>
-    <title>Creating the GRUB Configuration File</title>
-
-    <indexterm zone="grub-setup grub-video">
-      <primary sortas="e-boot-grub-grub-cfg">/boot/grub/grub.cfg</primary>
-    </indexterm>
-
-    <para>
-      Generate <filename>/boot/grub/grub.cfg</filename> to configure the
-      boot menu of GRUB:
-    </para>
-
-<screen role="nodump"><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; EOF</userinput>
-<literal># Begin /boot/grub/grub.cfg
-set default=0
-set timeout=5
-
-insmod part_gpt
-insmod ext2
-set root=(hd0,2)
-
-if loadfont /boot/grub/fonts/unicode.pf2; then
-  set gfxmode=auto
-  insmod all_video
-  terminal_output gfxterm
-fi
-
-menuentry "GNU/Linux, Linux 5.10.17-lfs-10.1"  {
-  linux   /boot/vmlinuz-5.10.17-lfs-10.1 root=/dev/sda2 ro
-}
-
-menuentry "Firmware Setup" {
-  fwsetup
-}</literal>
-<userinput>EOF</userinput></screen>
-
-    <para>
-      <literal>(hd0,2)</literal>, <literal>sda2</literal>, and
-      <literal>5.10.17-lfs-10.1</literal> should be replaced to match your
-      configuration.
-    </para>
-
-    <note>
-      <para>
-        From GRUB's perspective, the files are relative to the partition
-        are used. If you used a separate /boot partition, remove /boot from the
-        above paths (to kernel and to <filename>unicode.pf2</filename>). You
-        will also need to change the set root line to point to the boot
-        partition.
-      </para>
-    </note>
-
-    <para>
-      The <literal>Firmware Setup</literal> entry can be used to enter the
-      configuration interface provided by the firmware (sometimes called
-      <quote>BIOS configuration</quote>).
-    </para>
-  </sect2>
-
-  <sect2>
-    <title>Dual-booting with Windows</title>
-
-    <para>
-      Add a menu entry for Windows into <filename>grub.cfg</filename>:
-    </para>
-
-<screen role="nodump"><userinput>cat &gt;&gt; /boot/grub/grub.cfg &lt;&lt; EOF</userinput>
-<literal># Begin Windows addition
-
-menuentry "Windows 10" {
-  insmod fat
-  insmod chain
-  set root=(hd0,1)
-  chainloader /EFI/Microsoft/Boot/bootmgfw.efi
-}</literal>
-<userinput>EOF</userinput></screen>
-
-    <para>
-      <literal>(hd0,1)</literal> should be replaced with the GRUB
-      designated name for the ESP.  The <literal>chainloader</literal>
-      directive can be used to tell GRUB to run another EFI executable,
-      in this case the Windows Boot Manager. You may put more usable tools
-      in EFI executable format (for example, an EFI shell) into the ESP and 
-      create GRUB entries for them.
-    </para>
-
-  </sect2>
-
-</sect1>
Index: postlfs/filesystems/xfsprogs.xml
===================================================================
--- postlfs/filesystems/xfsprogs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/filesystems/xfsprogs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY xfsprogs-download-http "&kernel-dl;/linux/utils/fs/xfs/xfsprogs/xfsprogs-&xfsprogs-version;.tar.xz">
   <!ENTITY xfsprogs-download-ftp  " ">
-  <!ENTITY xfsprogs-md5sum        "86777a5762f2e524bb9acfdead5a9045">
+  <!ENTITY xfsprogs-md5sum        "f4156af67a0e247833be88efaa2869f9">
   <!ENTITY xfsprogs-size          "1.2 MB">
-  <!ENTITY xfsprogs-buildsize     "50 MB">
-  <!ENTITY xfsprogs-time          "0.3 SBU (Using parallelism=4)">
+  <!ENTITY xfsprogs-buildsize     "57 MB">
+  <!ENTITY xfsprogs-time          "0.2 SBU (Using parallelism=4)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -127,5 +128,7 @@
 make PKG_DOC_DIR=/usr/share/doc/xfsprogs-&xfsprogs-version; install-dev &amp;&amp;
 
-rm -rfv /usr/lib/libhandle.{a,la}</userinput></screen>
+rm -rfv /usr/lib/libhandle.a                                &amp;&amp;
+rm -rfv /lib/libhandle.{a,la,so}                            &amp;&amp;
+ln -sfv ../../lib/libhandle.so.1 /usr/lib/libhandle.so</userinput></screen>
 
   </sect2>
@@ -183,5 +186,5 @@
           <para>
             simply exits with a zero status, since XFS
-            partitions are checked at mount time
+            partitions are checked at mount time.
           </para>
           <indexterm zone="xfsprogs fsck.xfs">
@@ -195,5 +198,5 @@
         <listitem>
           <para>
-            constructs an XFS file system
+            constructs an XFS file system.
           </para>
           <indexterm zone="xfsprogs mkfs.xfs">
@@ -207,5 +210,5 @@
         <listitem>
           <para>
-            changes the parameters of an XFS file system
+            changes the parameters of an XFS file system.
           </para>
           <indexterm zone="xfsprogs xfs_admin">
@@ -219,5 +222,5 @@
         <listitem>
           <para>
-            prints block mapping for an XFS file
+            prints block mapping for an XFS file.
           </para>
           <indexterm zone="xfsprogs xfs_bmap">
@@ -232,5 +235,5 @@
           <para>
             copies the contents of an XFS file system
-            to one or more targets in parallel
+            to one or more targets in parallel.
           </para>
           <indexterm zone="xfsprogs xfs_copy">
@@ -246,5 +249,5 @@
             for each directory argument, estimates the space that directory
             would take if it were copied to an XFS filesystem
-            (does not cross mount points)
+            (does not cross mount points).
           </para>
           <indexterm zone="xfsprogs xfs_estimate">
@@ -258,5 +261,5 @@
         <listitem>
           <para>
-            is used to debug an XFS file system
+            is used to debug an XFS file system.
           </para>
           <indexterm zone="xfsprogs xfs_db">
@@ -270,5 +273,5 @@
         <listitem>
           <para>
-            suspends access to an XFS file system
+            suspends access to an XFS file system.
           </para>
           <indexterm zone="xfsprogs xfs_freeze">
@@ -285,5 +288,5 @@
             mounted filesystems, the reorganization algorithm operates on one
             file at a time, compacting or othewise  improving the layout of the
-            file extents (contiguous blocks of file data)
+            file extents (contiguous blocks of file data).
           </para>
           <indexterm zone="xfsprogs xfs_fsr">
@@ -297,5 +300,5 @@
         <listitem>
           <para>
-            expands an XFS file system
+            expands an XFS file system.
           </para>
           <indexterm zone="xfsprogs xfs_growfs">
@@ -310,5 +313,5 @@
           <para>
             is equivalent to invoking <command>xfs_growfs</command>, but
-            specifying that no change to the file system is to be made
+            specifying that no change to the file system is to be made.
           </para>
           <indexterm zone="xfsprogs xfs_info">
@@ -324,5 +327,5 @@
             is a debugging tool like <command>xfs_db</command>, but is
             aimed at examining the regular file I/O path rather than the raw
-            XFS volume itself
+            XFS volume itself.
           </para>
           <indexterm zone="xfsprogs xfs_io">
@@ -336,5 +339,5 @@
         <listitem>
           <para>
-            prints the log of an XFS file system
+            prints the log of an XFS file system.
           </para>
           <indexterm zone="xfsprogs xfs_logprint">
@@ -348,5 +351,5 @@
         <listitem>
           <para>
-            restores an XFS metadump image to a filesystem image
+            restores an XFS metadump image to a filesystem image.
           </para>
           <indexterm zone="xfsprogs xfs_mdrestore">
@@ -360,5 +363,5 @@
         <listitem>
           <para>
-            copies XFS filesystem metadata to a file
+            copies XFS filesystem metadata to a file.
           </para>
           <indexterm zone="xfsprogs xfs_metadump">
@@ -372,5 +375,5 @@
         <listitem>
           <para>
-            creates an XFS file, padded with zeroes by default
+            creates an XFS file, padded with zeroes by default.
           </para>
           <indexterm zone="xfsprogs xfs_mkfile">
@@ -385,5 +388,5 @@
           <para>
             generates pathnames from inode numbers for an
-            XFS file system
+            XFS file system.
           </para>
           <indexterm zone="xfsprogs xfs_ncheck">
@@ -398,5 +401,5 @@
           <para>
             is a utility for reporting and editing various
-            aspects of filesystem quotas
+            aspects of filesystem quota.
           </para>
           <indexterm zone="xfsprogs xfs_quota">
@@ -410,5 +413,5 @@
         <listitem>
           <para>
-            repairs corrupt or damaged XFS file systems
+            repairs corrupt or damaged XFS file systems.
           </para>
           <indexterm zone="xfsprogs xfs_repair">
@@ -423,5 +426,5 @@
           <para>
             copies a file to the real-time partition on an
-            XFS file system
+            XFS file system.
           </para>
           <indexterm zone="xfsprogs xfs_rtcp">
@@ -436,5 +439,5 @@
           <para>
             checks and repairs the contents of a mounted
-            XFS file system
+            XFS file system.
           </para>
           <indexterm zone="xfsprogs xfs_scrub">
@@ -448,5 +451,5 @@
         <listitem>
           <para>
-            scrubs all mounted XFS file systems
+            scrubs all mounted XFS file systems.
           </para>
           <indexterm zone="xfsprogs xfs_scrub_all">
@@ -461,5 +464,5 @@
           <para>
             reports and controls free space usage in an
-            XFS file system
+            XFS file system.
           </para>
           <indexterm zone="xfsprogs xfs_spaceman">
@@ -475,5 +478,5 @@
             contains XFS-specific functions that provide a way to perform
             certain filesystem  operations without using a file descriptor to
-            access filesystem objects
+            access filesystem objects.
           </para>
           <indexterm zone="xfsprogs libhandle">
Index: postlfs/postlfs.xml
===================================================================
--- postlfs/postlfs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/postlfs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <part id="postlfs" xreflabel="Post LFS Configuration and Extra Software">
Index: postlfs/security/cracklib.xml
===================================================================
--- postlfs/security/cracklib.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/cracklib.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -23,4 +23,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -41,5 +42,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -120,4 +121,11 @@
     </important>
 
+    <bridgehead renderas="sect3">CrackLib Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="python2"/>
+    </para>
+
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/cracklib"/>
@@ -135,8 +143,7 @@
 <screen><userinput>sed -i '/skipping/d' util/packer.c &amp;&amp;
 
-PYTHON=python3 CPPFLAGS=-I/usr/include/python&python3-majorver; \
 ./configure --prefix=/usr    \
             --disable-static \
-            --with-default-dict=/usr/lib/cracklib/pw_dict &amp;&amp;
+            --with-default-dict=/lib/cracklib/pw_dict &amp;&amp;
 make</userinput></screen>
 
@@ -145,5 +152,7 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install                      &amp;&amp;
+mv -v /usr/lib/libcrack.so.* /lib &amp;&amp;
+ln -sfv ../../lib/$(readlink /usr/lib/libcrack.so) /usr/lib/libcrack.so</userinput></screen>
 
     <para>
@@ -163,5 +172,5 @@
 ln -v -sf cracklib-words /usr/share/dict/words                 &amp;&amp;
 echo $(hostname) >>      /usr/share/dict/cracklib-extra-words  &amp;&amp;
-install -v -m755 -d      /usr/lib/cracklib                     &amp;&amp;
+install -v -m755 -d      /lib/cracklib                         &amp;&amp;
 
 create-cracklib-dict     /usr/share/dict/cracklib-words \
@@ -199,15 +208,4 @@
 
     <para>
-      <envar>PYTHON=python3</envar>: This forces the installation of
-      python bindings for Python 3, even if Python 2 is installed.
-    </para>
-
-    <para>
-      <envar>CPPFLAGS=-I/usr/include/python&python3-majorver;</envar>:
-      This works around an issue caused by incorrect usage of Python 3
-      headers.
-    </para>
-
-    <para>
       <parameter>--with-default-dict=/lib/cracklib/pw_dict</parameter>:
       This parameter forces the installation of the
@@ -219,5 +217,4 @@
       href="../../xincludes/static-libraries.xml"/>
 
-    <!-- FIXME: No longer needed with merged-/usr configuration
     <para>
       <command>mv -v /usr/lib/libcrack.so.2* /lib</command> and
@@ -231,5 +228,4 @@
       pointing to the relocated file.
     </para>
-    -->
 
     <para>
@@ -277,6 +273,6 @@
         cracklib-unpacker and create-cracklib-dict</seg>
 
-        <seg>libcrack.so and the _cracklib.so
-          (<application>Python</application> module)</seg>
+        <seg>libcrack.so and the _cracklibmodule.so
+          <application>Python</application> module</seg>
 
         <seg>/lib/cracklib, /usr/share/dict and /usr/share/cracklib</seg>
@@ -293,5 +289,5 @@
         <listitem>
           <para>
-            is used to determine if a password is strong
+            is used to determine if a password is strong.
           </para>
           <indexterm zone="cracklib cracklib-check">
@@ -306,5 +302,5 @@
           <para>
             is used to format text files (lowercases all words,
-            removes control characters and sorts the lists)
+            removes control characters and sorts the lists).
           </para>
           <indexterm zone="cracklib cracklib-format">
@@ -318,5 +314,5 @@
         <listitem>
           <para>
-            creates a database with words read from standard input
+            creates a database with words read from standard input.
           </para>
           <indexterm zone="cracklib cracklib-packer">
@@ -330,5 +326,5 @@
         <listitem>
           <para>
-            displays on standard output the database specified
+            displays on standard output the database specified.
           </para>
           <indexterm zone="cracklib cracklib-packer">
@@ -343,5 +339,5 @@
           <para>
             is used to create the <application>CrackLib</application>
-            dictionary from the given word list(s)
+            dictionary from the given word list(s).
           </para>
           <indexterm zone="cracklib create-cracklib-dict">
@@ -356,5 +352,5 @@
           <para>
             provides a fast dictionary lookup method for strong
-            password enforcement
+            password enforcement.
           </para>
           <indexterm zone="cracklib libcrack">
Index: postlfs/security/cryptsetup.xml
===================================================================
--- postlfs/security/cryptsetup.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/cryptsetup.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY cryptsetup-download-http "&kernel-dl;/linux/utils/cryptsetup/v&cryptsetup-minor;/cryptsetup-&cryptsetup-version;.tar.xz">
   <!ENTITY cryptsetup-download-ftp  " ">
-  <!ENTITY cryptsetup-md5sum        "504d1ab22cbc4d1a59a8d8c7ee5ed3bf">
+  <!ENTITY cryptsetup-md5sum        "911272e73181fdc850bb4d25103a9f83">
   <!ENTITY cryptsetup-size          "11 MB">
-  <!ENTITY cryptsetup-buildsize     "29 MB (add 113 MB for tests)">
-  <!ENTITY cryptsetup-time          "0.2 SBU (add 14 SBU for tests)">
+  <!ENTITY cryptsetup-buildsize     "29 MB (add 115 MB for tests)">
+  <!ENTITY cryptsetup-time          "0.2 SBU (add 9 SBU for tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -94,4 +95,5 @@
     <para role="optional">
       <xref linkend="libpwquality"/>,
+      <xref linkend="python2"/>,
       <ulink url="https://github.com/P-H-C/phc-winner-argon2">argon2</ulink>, and
       <ulink url="http://www.openwall.com/passwdqc/">passwdqc</ulink>
@@ -238,5 +240,5 @@
         <listitem>
           <para>
-             is used to setup dm-crypt managed device-mapper mappings
+             is used to setup dm-crypt managed device-mapper mappings.
           </para>
           <indexterm zone="cryptsetup cryptsetup-prog">
@@ -250,5 +252,5 @@
         <listitem>
           <para>
-             is a tool for offline LUKS device re-encryption
+             is a for offline LUKS device re-encryption.
           </para>
           <indexterm zone="cryptsetup cryptsetup-reencrypt">
@@ -262,5 +264,5 @@
         <listitem>
           <para>
-             is a tool to manage dm-integrity (block level integrity) volumes
+             is a tool to manage dm-integrity (block level integrity) volumes.
           </para>
           <indexterm zone="cryptsetup integritysetup">
@@ -276,5 +278,5 @@
              is used to configure dm-verity managed device-mapper mappings.
              Device-mapper verity target provides read-only transparent integrity
-             checking of block devices using kernel crypto API
+             checking of block devices using kernel crypto API.
           </para>
           <indexterm zone="cryptsetup veritysetup">
Index: postlfs/security/cyrus-sasl.xml
===================================================================
--- postlfs/security/cyrus-sasl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/cyrus-sasl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <!-- To test this package at freeze, run the following command:
@@ -151,5 +152,4 @@
             --enable-auth-sasldb \
             --with-dbpath=/var/lib/sasl/sasldb2 \
-            --with-sphinx-build=no              \
             --with-saslauthd=/var/run/saslauthd &amp;&amp;
 make -j1</userinput></screen>
@@ -365,5 +365,5 @@
         <listitem>
           <para>
-            is used to list loadable SASL plugins and their properties
+            is used to list loadable SASL plugins and their properties.
           </para>
           <indexterm zone="cyrus-sasl pluginviewer">
@@ -377,5 +377,5 @@
         <listitem>
           <para>
-            is the SASL authentication server
+            is the SASL authentication server.
           </para>
           <indexterm zone="cyrus-sasl saslauthd">
@@ -390,5 +390,5 @@
           <para>
             is used to list the users in the SASL password database
-            <filename>sasldb2</filename>
+            <filename>sasldb2</filename>.
           </para>
           <indexterm zone="cyrus-sasl sasldblistusers2">
@@ -404,5 +404,5 @@
             is used to set and delete a user's SASL password and
             mechanism specific secrets in the SASL password
-            database <filename>sasldb2</filename>
+            database <filename>sasldb2</filename>.
           </para>
           <indexterm zone="cyrus-sasl saslpasswd2">
@@ -416,5 +416,5 @@
         <listitem>
           <para>
-            is a test utility for the SASL authentication server
+            is a test utility for the SASL authentication server.
           </para>
           <indexterm zone="cyrus-sasl testsaslauthd">
@@ -429,5 +429,5 @@
           <para>
             is a general purpose authentication library for server
-            and client applications
+            and client applications.
           </para>
           <indexterm zone="cyrus-sasl libsasl2">
Index: postlfs/security/firewalld.xml
===================================================================
--- postlfs/security/firewalld.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
+++ postlfs/security/firewalld.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -0,0 +1,336 @@
+<?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 firewalld-download-http "https://github.com/firewalld/firewalld/releases/download/v&firewalld-version;/firewalld-&firewalld-version;.tar.gz">
+  <!ENTITY firewalld-download-ftp  " ">
+  <!ENTITY firewalld-md5sum        "644a8970b43fcf875178ae3bec640db4">
+  <!ENTITY firewalld-size          "1.6 MB">
+  <!ENTITY firewalld-buildsize     "19 MB (additionall 2 MB for tests)">
+  <!ENTITY firewalld-time          "less than 0.1 SBU (add 6.2 SBU for tests)">
+]>
+
+<sect1 id="firewalld" xreflabel="firewalld-&firewalld-version;">
+  <?dbhtml filename="firewalld.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>firewalld-&firewalld-version;</title>
+
+  <indexterm zone="firewalld">
+    <primary sortas="a-firewalld">firewalld</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to firewalld</title>
+
+    <para>
+      The <application>firewalld</application> package provides a dynamically
+      managed firewall with support for network or firewall zones to define the
+      trust level of network connections or interfaces. It has support for
+      IPv4, IPv6 firewall settings and for ethernet bridges and a separation of
+      runtime and permanent configuration options. It also provides an
+      interface for services or applications to add nftables or iptables and
+      ebtables rules directly.
+    </para>
+
+    &lfs90_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&firewalld-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&firewalld-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &firewalld-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &firewalld-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &firewalld-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &firewalld-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">firewalld Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="nftables"/>,
+      and <xref linkend="python-slip"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="DocBook"/>,
+      <xref linkend="iptables"/>, and
+      <xref linkend="libxslt"/> (for building the manual pages)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk3" role="runtime"/> (runtime only, required for
+      <application>fireall-config</application>),
+      <xref linkend="qt5" role="runtime"/> (runtime only, required for 
+      <application>fireall-applet</application>), and
+      <ulink url="https://netfilter.org/projects/ipset/index.html">ipset</ulink>
+      for ipset support (only when used with iptables)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/firewalld"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of firewalld</title>
+
+    <para>
+      Install <application>firewalld</application> by
+      running the following commands:
+    </para>
+
+<screen revision="systemd"><userinput>PYTHON=/usr/bin/python3           \
+    ./configure --sysconfdir=/etc \
+                --without-ipset   &amp;&amp;
+make</userinput></screen>
+
+<screen revision="sysv"><userinput>PYTHON=/usr/bin/python3           \
+    ./configure --sysconfdir=/etc \
+                --without-ipset   \
+                --disable-systemd &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      The testsuite for <application>firewalld</application> is very dependent
+      on the running kernel and system configuration. It requires
+      <application>ipset</application> as well as both backends, and all
+      supported kernel options available.
+    </para>
+
+    <para>
+      If the above conditions are met, run the testsuite as the
+      <systemitem class="username">root</systemitem> user with the command
+      <command>make -C src check</command>. Any test failures are likely the
+      result of an incomplete configuration. Failed tests will give a detailed
+      failure status at
+      <filename>src/test/testsuite.dir/&lt;###&gt;/testsuite.log</filename>.
+    </para>
+
+    <para revision="sysv">
+      Prevent installation of the distributed firewalld init script with the
+      following command:
+    </para>
+
+<screen revision="sysv"><userinput>sed '/^am__append_3/,+1d' -i config/Makefile</userinput></screen>
+
+    <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>
+      <parameter>--without-ipset</parameter>: This switch disables use of the
+      <command>ipset</command> utility. Omit if it is installed.
+    </para>
+
+    <para revision="sysv">
+      <parameter>--disable-systemd</parameter>: This command prevents
+      installation of <application>systemd</application> services.
+    </para>
+
+    <para>
+      <option>--without-{ip{,6},eb}tables{,-restore}</option>: These switches
+      disable <application>iptables</application> support and are required if
+      you wish to build without iptables support.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring firewalld</title>
+
+    <sect3 id="firewalld-conf">
+      <title>Config Files</title>
+
+      <para>
+        <filename>/etc/firewall/applet.conf</filename>,
+        <filename>/etc/firewalld/firewalld.conf</filename>,
+        and <filename>/etc/sysconfig/firewalld</filename>
+      </para>
+
+      <indexterm zone="firewalld firewalld-conf">
+        <primary sortas="e-etc-firewalld.conf">/etc/firewalld/firewalld.conf</primary>
+      </indexterm>
+
+      <para>
+        Configuration of <application>firewalld</application> is generally done
+        without modification of the above configuration files using the
+        <command>firewall-cmd</command> command. Within the above configuration
+        files you can set daemon behavior only. E.g.: whether runtime rules are
+        retained on restart, which firewall backend to use (default is
+        nftables), or whether to turn on debugging.
+      </para>
+
+      <para>
+        Detailed documentation is provided by the
+        <application>firewalld</application> developers at
+        <ulink url="https://firewalld.org/documentation/"/>.
+      </para>
+
+    </sect3>
+
+    <sect3 id="firewalld-init">
+      <title><phrase revision="sysv">Init Script</phrase>
+             <phrase revision="systemd">Systemd Unit</phrase></title>
+
+      <para revision="sysv">
+        If you need to run the <command>firewalld</command> daemon at system
+        startup, install the <filename>/etc/rc.d/init.d/firewalld</filename>
+        init script included in the
+        <xref linkend="bootscripts"/> package using the following command:
+      </para>
+
+      <para revision="systemd">
+        If you need to run the <command>firewalld</command> daemon at system
+        startup, enable the previously installed
+        <filename>firewalld.service</filename> unit with the following command:
+      </para>
+
+      <indexterm zone="firewalld firewalld-init">
+        <primary sortas="f-firewalld">firewalld</primary>
+      </indexterm>
+
+<screen role="root" revision="sysv"><userinput>make install-firewalld</userinput></screen>
+
+<screen role="root" revision="systemd"><userinput>systemctl enable firewalld</userinput></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          firewall-applet, firewall-cmd, firewall-config, firewall-offline-cmd,
+          and firewalld
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /etc/firewalld,
+          /etc/firewall,
+          /usr/lib/firewalld, and
+          /usr/lib/python-&python3-version;/site-packages/firewall
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="firewall-applet">
+        <term><command>firewall-applet</command></term>
+        <listitem>
+          <para>
+            is a tray applet using QSettings backend.
+          </para>
+          <indexterm zone="firewalld firewall-applet">
+            <primary sortas="b-firewall-applet">firwall-applet</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="firewall-cmd">
+        <term><command>firewall-cmd</command></term>
+        <listitem>
+          <para>
+            is the primary command line frontend.
+          </para>
+          <indexterm zone="firewalld firewall-cmd">
+            <primary sortas="b-firewall-cmd">firewall-cmd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="firewall-config">
+        <term><command>firewall-config</command></term>
+        <listitem>
+          <para>
+            is a GUI configuration tool using GTK+-3.
+          </para>
+          <indexterm zone="firewalld firewall-config">
+            <primary sortas="b-firewall-config">firewall-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="firewall-offline-cmd">
+        <term><command>firewall-offline-cmd</command></term>
+        <listitem>
+          <para>
+            is a command line client used for permanent configuration while
+            firewalld is not running.
+          </para>
+          <indexterm zone="firewalld firewall-offline-cmd">
+            <primary sortas="b-firewall-offline-cmd">firewall-offline-cmd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="firewalld-daemon">
+        <term><command>firewalld</command></term>
+        <listitem>
+          <para>
+            is the Dynamic Firewall Manager daemon.
+          </para>
+          <indexterm zone="firewalld firewalld-daemon">
+            <primary sortas="b-firewalld">firewalld</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: postlfs/security/firewalling.xml
===================================================================
--- postlfs/security/firewalling.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/firewalling.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: postlfs/security/gnupg2.xml
===================================================================
--- postlfs/security/gnupg2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/gnupg2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY gnupg2-download-http "&gnupg-http;/gnupg/gnupg-&gnupg2-version;.tar.bz2">
   <!ENTITY gnupg2-download-ftp  "&gnupg-ftp;/gnupg/gnupg-&gnupg2-version;.tar.bz2">
-  <!ENTITY gnupg2-md5sum        "5db3334b528cf756b1e583db01319a24">
+  <!ENTITY gnupg2-md5sum        "9db554eabd13f83e941a9825e5af5fe6">
   <!ENTITY gnupg2-size          "6.9 MB">
-  <!ENTITY gnupg2-buildsize     "143 MB (with all tests; add 25 MB for docs)">
-  <!ENTITY gnupg2-time          "0.4 SBU (using parallelism=4; add 1.5 SBU for tests)">
+  <!ENTITY gnupg2-buildsize     "120 MB (with all tests; add 24 MB for docs)">
+  <!ENTITY gnupg2-time          "0.3 SBU (using parallelism=4; add 0.6 SBU for tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -87,6 +88,4 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="gnutls"/> (required to communicate with keyservers
-      using https or hkps protocol) and
       <xref linkend="pinentry"/> (Run-time requirement for most of
       the package's functionality)
@@ -97,4 +96,5 @@
       <xref linkend="curl"/>,
       <xref linkend="fuse3"/>,
+      <xref linkend="gnutls"/>,
       <xref linkend="imagemagick"/> (for the <command>convert</command> utility,
       used for generating the documentation),
@@ -126,15 +126,4 @@
     -i tools/Makefile.in</userinput></screen>
 
-<!-- Seems to be resolved in 2.2.29
-    <para>
-      Fix a issue causing build failure if
-      <application>OpenLDAP</application> is not installed:
-    </para>
-
-<screen><userinput>sed -e '737a #if USE_LDAP' \
-    -e '760a #endif' \
-    -i dirmngr/dirmngr.c</userinput></screen>
--->
-
     <para>
       Install <application>GnuPG</application> by running the following
@@ -143,6 +132,6 @@
 
 <screen><userinput>./configure --prefix=/usr            \
+            --enable-symcryptrun     \
             --localstatedir=/var     \
-            --sysconfdir=/etc        \
             --docdir=/usr/share/doc/gnupg-&gnupg2-version; &amp;&amp;
 make &amp;&amp;
@@ -208,13 +197,12 @@
     </para>
 
-<!-- Unrecognized in 2.2.26, seems to get built automatically now.
-    <para>
-      <parameter>- -enable-symcryptrun</parameter>: This switch enables
+    <para>
+      <parameter>--enable-symcryptrun</parameter>: This switch enables
       building the symcryptrun program.
     </para>
--->
-    <para>
-      <option>--enable-all-tests</option>: This switch allows more tests to be
-      run with <command>make check</command>.
+
+    <para>
+      <option>--enable-all-tests</option>: allows more tests to be run with
+      <command>make check</command>.
     </para>
 
@@ -238,5 +226,5 @@
         (optional), gpg-agent, gpg-connect-agent, gpg, gpgconf, gpgparsemail, 
         gpgscm, gpgsm, gpgsplit, gpgtar, gpgv, gpg-wks-server, gpg-zip, kbxutil, 
-        <!--symcryptrun,--> and watchgnupg</seg>
+        symcryptrun, and watchgnupg</seg>
         <seg>None</seg>
         <seg>/usr/share/doc/gnupg-&gnupg2-version; and
@@ -255,5 +243,5 @@
           <para>
             is used to create and populate a user's
-            <filename class="directory">~/.gnupg</filename> directories
+            <filename class='directory'>~/.gnupg</filename> directories
           </para>
           <indexterm zone="gnupg2 addgnupghome">
@@ -269,5 +257,5 @@
             is a wrapper script used to run <command>gpgconf</command>
             with the <parameter>--apply-defaults</parameter> parameter on all
-            user's GnuPG home directories
+            user's GnuPG home directories.
           </para>
           <indexterm zone="gnupg2 applygnupgdefaults">
@@ -281,5 +269,5 @@
         <listitem>
           <para>
-            is a tool that takes care of accessing the OpenPGP keyservers
+            is a tool that takes care of accessing the OpenPGP keyservers.
           </para>
           <indexterm zone="gnupg2 dirmngr">
@@ -294,5 +282,5 @@
           <para>
             is a tool to contact a running dirmngr and test whether a
-            certificate has been revoked
+            certificate has been revoked. 
           </para>
           <indexterm zone="gnupg2 dirmngr-client">
@@ -307,5 +295,5 @@
           <para>
             is a tool to create, mount or unmount an encrypted file system
-            container (optional)
+            container (optional).
           </para>
           <indexterm zone="gnupg2 g13">
@@ -321,6 +309,6 @@
             is a daemon used to manage secret (private) keys independently
             from any protocol. It is used as a backend for
-            <command>gpg</command> and <command>gpgsm</command> as well as
-            for a couple of other utilities
+            <command>gpg2</command> and <command>gpgsm</command> as well as
+            for a couple of other utilities.
           </para>
           <indexterm zone="gnupg2 gpg-agent">
@@ -335,5 +323,5 @@
           <para>
             is a utility used to communicate with a running
-            <command>gpg-agent</command>
+            <command>gpg-agent</command>.
           </para>
           <indexterm zone="gnupg2 gpg-connect-agent">
@@ -349,5 +337,5 @@
             is the OpenPGP part of the GNU Privacy Guard (GnuPG). It is a
             tool used to provide digital encryption and signing services using
-            the OpenPGP standard
+            the OpenPGP standard.
           </para>
           <indexterm zone="gnupg2 gpg">
@@ -363,7 +351,7 @@
             is a utility used to automatically and reasonably safely
             query and modify configuration files in the
-            <filename class="directory">~/.gnupg</filename> home directory. It
+            <filename class='directory'>~/.gnupg</filename> home directory. It
             is designed not to be invoked manually by the user, but
-            automatically by graphical user interfaces
+            automatically by graphical user interfaces.
           </para>
           <indexterm zone="gnupg2 gpgconf">
@@ -378,5 +366,5 @@
           <para>
             is a utility currently only useful for debugging. Run it with
-            <parameter>--help</parameter> for usage information
+            <parameter>--help</parameter> for usage information.
           </para>
           <indexterm zone="gnupg2 gpgparsemail">
@@ -390,5 +378,5 @@
         <listitem>
           <para>
-            executes the given scheme program or spawns an interactive shell
+            executes the given scheme program or spawns an interactive shell.
           </para>
           <indexterm zone="gnupg2 gpgscm">
@@ -402,8 +390,8 @@
         <listitem>
           <para>
-            is a tool similar to <command>gpg</command> used to provide
+            is a tool similar to <command>gpg2</command> used to provide
             digital encryption and signing services on X.509 certificates and
             the CMS protocol. It is mainly used as a backend for S/MIME mail
-            processing
+            processing.
           </para>
           <indexterm zone="gnupg2 gpgsm">
@@ -417,5 +405,5 @@
         <listitem>
           <para>
-            splits an OpenPGP message into packets
+            splits an OpenPGP message into packets.
           </para>
           <indexterm zone="gnupg2 gpgsplit">
@@ -429,5 +417,5 @@
         <listitem>
           <para>
-            is a tool to encrypt or sign files into an archive
+            is a tool to encrypt or sign files into an archive.
           </para>
           <indexterm zone="gnupg2 gpgtar">
@@ -441,5 +429,5 @@
         <listitem>
           <para>
-            is a verify only version of <command>gpg</command>
+            is a verify only version of <command>gpg2</command>.
           </para>
           <indexterm zone="gnupg2 gpgv">
@@ -454,5 +442,5 @@
           <para>
             provides a server for the
-            <application>Web Key Service</application> protocol
+            <application>Web Key Service</application> protocol.
           </para>
           <indexterm zone="gnupg2 gpg-wks-server">
@@ -466,5 +454,5 @@
         <listitem>
           <para>
-            encrypts or signs files into an archive
+            encrypts or signs files into an archive.
           </para>
           <indexterm zone="gnupg2 gpg-zip">
@@ -478,5 +466,5 @@
         <listitem>
           <para>
-            is used to list, export and import Keybox data
+            is used to list, export and import Keybox data.
           </para>
           <indexterm zone="gnupg2 kbxutil">
@@ -486,5 +474,4 @@
       </varlistentry>
 
- <!--
       <varlistentry id="symcryptrun">
         <term><command>symcryptrun</command></term>
@@ -498,5 +485,5 @@
         </listitem>
       </varlistentry>
--->
+
       <varlistentry id="watchgnupg">
         <term><command>watchgnupg</command></term>
@@ -504,5 +491,5 @@
           <para>
             is used to listen to a Unix Domain socket created by any of
-            the GnuPG tools
+            the GnuPG tools.
           </para>
           <indexterm zone="gnupg2 watchgnupg">
Index: postlfs/security/gnutls.xml
===================================================================
--- postlfs/security/gnutls.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/gnutls.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,8 +8,8 @@
   <!ENTITY gnutls-download-ftp  "&gnupg-ftp;/gnutls/v3.7/gnutls-&gnutls-version;.tar.xz">
   <!ENTITY gnutls-download-ftp  " ">
-  <!ENTITY gnutls-md5sum        "95c32a1af583ecfcb280648874c0fbd9">
+  <!ENTITY gnutls-md5sum        "1123a7bcc2fafd703e5a811bc1beb179">
   <!ENTITY gnutls-size          "5.8 MB">
-  <!ENTITY gnutls-buildsize     "139 MB (add 112 MB for tests)">
-  <!ENTITY gnutls-time          "0.9 SBU (add 2.9 SBU for tests; both using parallelism=4)">
+  <!ENTITY gnutls-buildsize     "163 MB (add 112 MB for tests)">
+  <!ENTITY gnutls-time          "0.9 SBU (using parallelism=4; add 7.7 SBU for tests)">
 ]>
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -54,5 +55,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -119,5 +120,5 @@
       <ulink url="&gnu-http;/autogen/">autogen</ulink>,
       <ulink url="https://cmocka.org/">cmocka</ulink> and
-      <ulink url="https://ftp.debian.org/debian/pool/main/d/datefudge/">datefudge</ulink> (used during the test suite if the DANE library is built), and
+      <ulink url="http://ftp.debian.org/debian/pool/main/d/datefudge/">datefudge</ulink> (used during the test suite if the DANE library is built), and
       <ulink url="&sourceforge-dl;/trousers/">Trousers</ulink> (Trusted Platform Module support)
     </para>
@@ -145,10 +146,15 @@
             --docdir=/usr/share/doc/gnutls-&gnutls-version; \
             --disable-guile \
-            --disable-rpath \
             --with-default-trust-store-pkcs11="pkcs11:" &amp;&amp;
 make</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make check</command>.
+      To test the results, issue: <command>make check</command>.  If a prior
+      version of <application>GnuTLS</application> (or the same version but
+      without all of the recommended dependencies) has been installed, some
+      tests may fail. If <filename>/usr/lib/libgnutls.so</filename> and the
+      target of that symlink are moved or renamed so that they cannot be found,
+      all tests should pass and the install procedure will restore
+      <filename>libgnutls.so</filename> and the versioned library it points to.
     </para>
 
@@ -186,11 +192,4 @@
       <parameter>--disable-guile</parameter>: This switch disables GUILE support,
       since GnuTLS does not support Guile-2.2.x yet.
-    </para>
-
-    <para>
-      <parameter>--disable-rpath</parameter>: This switch prevents building
-      GnuTLS utilities and tests with hardcoded runtime library search path.
-      Hardcoded rpath is unneeded for BLFS, and it causes test failures if
-      an old version of GnuTLS is installed.
     </para>
 
@@ -260,5 +259,5 @@
           <para>
             is used to generate X.509 certificates, certificate requests,
-            and private keys
+            and private keys.
           </para>
           <indexterm zone="gnutls certtool">
@@ -273,5 +272,5 @@
           <para>
             is a tool used to generate and check DNS resource records
-            for the DANE protocol
+            for the DANE protocol.
           </para>
           <indexterm zone="gnutls danetool">
@@ -286,5 +285,5 @@
           <para>
             is a simple client program to set up a TLS connection to some
-            other computer
+            other computer.
           </para>
           <indexterm zone="gnutls gnutls-cli">
@@ -299,5 +298,5 @@
           <para>
             is a simple client program to set up a TLS connection to some
-            other computer and produces very verbose progress results
+            other computer and produces very verbose progress results.
           </para>
           <indexterm zone="gnutls gnutls-cli-debug">
@@ -312,5 +311,5 @@
           <para>
             is a simple server program that listens to incoming TLS
-            connections
+            connections.
           </para>
           <indexterm zone="gnutls gnutls-serv">
@@ -325,5 +324,5 @@
           <para>
             is a program that can parse and print information about OCSP
-            requests/responses, generate requests and verify responses
+            requests/responses, generate requests and verify responses.
           </para>
           <indexterm zone="gnutls ocsptool">
@@ -338,5 +337,5 @@
           <para>
             is a program that allows handling data from PKCS #11 smart cards
-            and security modules
+            and security modules.
           </para>
           <indexterm zone="gnutls p11tool">
@@ -350,5 +349,5 @@
         <listitem>
           <para>
-            is a simple program that generates random keys for use with TLS-PSK
+            is a simple program that generates random keys for use with TLS-PSK.
           </para>
           <indexterm zone="gnutls psktool">
@@ -363,5 +362,5 @@
           <para>
             is a simple program that emulates the programs in the Stanford
-            SRP (Secure Remote Password) libraries using GnuTLS
+            SRP (Secure Remote Password) libraries using GnuTLS.
           </para>
           <indexterm zone="gnutls srptool">
@@ -375,5 +374,5 @@
         <listitem>
           <para>
-            contains the core API functions and X.509 certificate API functions
+            contains the core API functions and X.509 certificate API functions.
           </para>
           <indexterm zone="gnutls libgnutls">
Index: postlfs/security/gpgme.xml
===================================================================
--- postlfs/security/gpgme.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/gpgme.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,8 +8,8 @@
   <!ENTITY gpgme-download-ftp  "&gnupg-ftp;/gpgme/gpgme-&gpgme-version;.tar.bz2">
   <!ENTITY gpgme-download-ftp  " ">
-  <!ENTITY gpgme-md5sum        "e31b9e0efc5a2e1ec1bbed22e7a082a4">
+  <!ENTITY gpgme-md5sum        "32298e5ccd458f96b25ce7ae8e30780c">
   <!ENTITY gpgme-size          "1.6 MB">
-  <!ENTITY gpgme-buildsize     "222 MB">
-  <!ENTITY gpgme-time          "0.8 SBU (with parallelism=4; with all bindings, add 0.7 SBU for tests)">
+  <!ENTITY gpgme-buildsize     "256 MB">
+  <!ENTITY gpgme-time          "1.0 SBU (with parallelism=4; with all bindings, add 1.0 SBU for tests)">
 ]>
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -85,12 +86,10 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="doxygen"/> and
+      <xref linkend="doxygen"/> and 
       <xref linkend="graphviz"/> (for API documentation),
-      <xref linkend="gnupg2"/> (required if Qt or SWIG are installed;
+      <xref linkend="gnupg2"/> (required if Qt or SWIG are installed; 
         used during the testsuite),
-      <xref linkend="clisp"/>,<!--
-gpgme can still use python 2.7, but can use python3 as well,
-so do not advertise python2
-      <xref linkend="python2"/>,-->
+      <xref linkend="clisp"/>, 
+      <xref linkend="python2"/>, 
       <xref linkend="qt5"/>, and/or
       <xref linkend="swig"/> (for language bindings)
@@ -104,10 +103,4 @@
   <sect2 role="installation">
     <title>Installation of GPGME</title>
-
-    <para>
-      At first, fix an issue building the package with Glibc-2.34 or later:
-    </para>
-
-<screen><userinput>sed 's/defined(__sun.*$/1/' -i src/posix-io.c</userinput></screen>
 
     <para>
@@ -179,5 +172,5 @@
           <para>
             is used to obtain <application>GPGME</application> compilation and
-            linking information
+            linking information.
           </para>
           <indexterm zone="gpgme gpgme-config">
@@ -191,5 +184,5 @@
         <listitem>
           <para>
-            outputs <application>GPGME</application> commands in JSON format
+            outputs <application>GPGME</application> commands in JSON format.
           </para>
           <indexterm zone="gpgme gpgme-json">
@@ -203,7 +196,5 @@
         <listitem>
           <para>
-            is an assuan server exposing <application>GPGME</application>
-            operations, such as printing fingerprints and keyids with
-            keyservers
+            prints fingerprint and keyid with keyservers.
           </para>
           <indexterm zone="gpgme gpgme-tool">
@@ -232,5 +223,5 @@
         <listitem>
           <para>
-            contains the <application>GPGME</application> API functions
+            contains the <application>GPGME</application> API functions.
           </para>
           <indexterm zone="gpgme libgpgme">
@@ -244,5 +235,5 @@
         <listitem>
           <para>
-            contains the C++ <application>GPGME</application> API functions
+            contains the C++ <application>GPGME</application> API functions.
           </para>
           <indexterm zone="gpgme libgpgmepp">
@@ -257,5 +248,5 @@
           <para>
             contains API functions for handling GPG operations in
-            <application>Qt</application> applications
+            <application>Qt</application> applications.
           </para>
           <indexterm zone="gpgme libqgpgme">
Index: postlfs/security/haveged.xml
===================================================================
--- postlfs/security/haveged.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/haveged.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,5 +7,5 @@
   <!ENTITY haveged-download-http "https://github.com/jirka-h/haveged/archive/v&haveged-version;/haveged-&haveged-version;.tar.gz">
   <!ENTITY haveged-download-ftp  " ">
-  <!ENTITY haveged-md5sum        "f756474201bec9a46b41e8712f79468a">
+  <!ENTITY haveged-md5sum        "5391978794208b6cca6f53d7a6211c04">
   <!ENTITY haveged-size          "488 KB">
   <!ENTITY haveged-buildsize     "21 MB (with tests)">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -84,5 +85,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -168,5 +169,5 @@
             numbers harvested from the indirect effects of hardware events
             based on hidden processor states (caches, branch  predictors, memory
-            translation tables, etc)
+            translation tables, etc).
           </para>
           <indexterm zone="haveged haveged-prog">
Index: postlfs/security/iptables.xml
===================================================================
--- postlfs/security/iptables.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/iptables.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY iptables-download-http "http://www.netfilter.org/projects/iptables/files/iptables-&iptables-version;.tar.bz2">
   <!ENTITY iptables-download-ftp  "ftp://ftp.netfilter.org/pub/iptables/iptables-&iptables-version;.tar.bz2">
-  <!ENTITY iptables-md5sum        "602ba7e937c72fbb7b1c2b71c3b0004b">
-  <!ENTITY iptables-size          "704 KB">
-  <!ENTITY iptables-buildsize     "22 MB">
-  <!ENTITY iptables-time          "0.1 SBU">
+  <!ENTITY iptables-md5sum        "bc0f0adccc93c09dc5b7507ccba93148">
+  <!ENTITY iptables-size          "700 KB">
+  <!ENTITY iptables-buildsize     "17 MB">
+  <!ENTITY iptables-time          "0.2 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -31,8 +32,8 @@
     <para>
       <application>iptables</application> is a userspace command line program
-      used to configure the Linux 2.4 and later kernel packet filtering ruleset.
-    </para>
-
-    &lfs110a_checked;
+      used to configure Linux 2.4 and later kernel packet filtering ruleset.
+    </para>
+
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -77,9 +78,9 @@
       <xref linkend="libpcap"/> (required for nfsypproxy support),
       <ulink url="https://github.com/tadamdam/bpf-utils">bpf-utils</ulink>
-      (required for Berkeley Packet Filter support),
+      (required for Berkely Packet Filter support),
       <ulink url="https://netfilter.org/projects/libnfnetlink/">libnfnetlink</ulink>
       (required for connlabel support),
-      <ulink url="https://netfilter.org/projects/libnetfilter_conntrack/">libnetfilter_conntrack</ulink>
-      (required for connlabel support), and 
+      <ulink url="https://netfilter.org/projects/libnetfilter_conntrack/">libnetfilter_conntrack"</ulink>, and 
+      (required for connlabel support)
       <ulink url="https://netfilter.org/projects/nftables/">nftables</ulink>
     </para>
@@ -148,6 +149,8 @@
 
 <screen><userinput>./configure --prefix=/usr      \
+            --sbindir=/sbin    \
             --disable-nftables \
-            --enable-libipq    &amp;&amp;
+            --enable-libipq    \
+            --with-xtlibdir=/lib/xtables &amp;&amp;
 make</userinput></screen>
 
@@ -165,5 +168,12 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install &amp;&amp;
+ln -sfv ../../sbin/xtables-legacy-multi /usr/bin/iptables-xml &amp;&amp;
+
+for file in ip4tc ip6tc ipq xtables
+do
+  mv -v /usr/lib/lib${file}.so.* /lib &amp;&amp;
+  ln -sfv ../../lib/$(readlink /usr/lib/lib${file}.so) /usr/lib/lib${file}.so
+done</userinput></screen>
 
   </sect2>
@@ -174,5 +184,5 @@
     <para>
       <parameter>--disable-nftables</parameter>: This switch disables building
-      nftables compatibility. <!--Omit this switch if you have installed
+      nftables compat. <!--Omit this switch if you have installed
       <xref linkend="nftables"/>.-->
     </para>
@@ -185,6 +195,17 @@
 
     <para>
+      <parameter>--with-xtlibdir=/lib/xtables</parameter>: Ensure all
+      <application>iptables</application> modules are installed in the
+      <filename class="directory">/lib/xtables</filename> directory.
+    </para>
+
+    <para>
       <option>--enable-nfsynproxy</option>: This switch enables installation
       of <application>nfsynproxy</application> SYNPROXY configuration tool.
+    </para>
+
+    <para>
+      <command>ln -sfv ../../sbin/xtables-legacy-multi /usr/bin/iptables-xml</command>:
+      Ensure the symbolic link for <command>iptables-xml</command> is relative.
     </para>
 
@@ -220,5 +241,5 @@
       <para>
         A Personal Firewall is designed to let you access all the
-        services offered on the Internet while keeping your computer secure and
+        services offered on the Internet, but keep your box secure and
         your data private.
       </para>
@@ -229,5 +250,5 @@
         url="http://www.netfilter.org/documentation/HOWTO/packet-filtering-HOWTO.html">
         Linux 2.4 Packet Filtering HOWTO</ulink>. It is still applicable
-        to the Linux 5.x kernels.
+        to the Linux 3.x kernels.
       </para>
 
@@ -301,5 +322,5 @@
 iptables -A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
 
-# Log everything else.
+# Log everything else. What's Windows' latest exploitable vulnerability?
 iptables -A INPUT -j LOG --log-prefix "FIREWALL:INPUT "
 
@@ -379,5 +400,5 @@
 iptables -A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
 
-# Log everything else.
+# Log everything else. What's Windows' latest exploitable vulnerability?
 iptables -A INPUT -j LOG --log-prefix "FIREWALL:INPUT "
 
@@ -413,10 +434,10 @@
 
       <para>
-        A Network Firewall has two interfaces, one connected to an
+        A network Firewall has two interfaces, one connected to an
         intranet, in this example <emphasis role="strong">LAN1</emphasis>,
         and one connected to the Internet, here <emphasis
         role="strong">WAN1</emphasis>. To provide the maximum security
         for the firewall itself, make sure that there are no unnecessary
-        servers running on it such as <application>X11</application>.
+        servers running on it such as <application>X11</application> et al.
         As a general principle, the firewall itself should not access
         any untrusted service (think of a remote server giving answers that
@@ -439,5 +460,5 @@
 echo "You can find additional information"
 echo "about firewalls in Chapter 4 of the BLFS book."
-echo "https://www.&lfs-domainname;/blfs"
+echo "http://www.&lfs-domainname;/blfs"
 echo
 
@@ -735,5 +756,5 @@
         </listitem>
         <listitem>
-          <para id='fw-BB-4-ipt' xreflabel="BusyBox with iptables example number 4">
+          <para id='fw-BB-4-ipt' xreflabel="BusyBox with iptable example number 4">
             If you are frequently accessing FTP servers or enjoy chatting, you
             might notice delays because some implementations of these daemons
@@ -853,32 +874,12 @@
       <seglistitem>
         <seg>
-          ip6tables, 
-          ip6tables-apply,
-          ip6tables-legacy,
-          ip6tables-legacy-restore,
-          ip6tables-legacy-save,
-          ip6tables-restore, 
-          ip6tables-save, 
-          iptables, 
-          iptables-apply,
-          iptables-legacy,
-          iptables-legacy-restore,
-          iptables-legacy-apply,
-          iptables-restore,
-          iptables-save, 
-          iptables-xml, 
-          nfsynproxy (optional),
-          and xtables-multi
+          ip6tables, ip6tables-restore, ip6tables-save, iptables, iptables-restore,
+          iptables-save, iptables-xml, nfsynproxy (optional) and xtables-multi
         </seg>
         <seg>
-          libip4tc.so, 
-          libip6tc.so, 
-          libipq.so, 
-          libiptc.so,
-          and libxtables.so
+          libip4tc.so, libip6tc.so, libipq.so, libiptc.so, and libxtables.so
         </seg>
         <seg>
-          /lib/xtables and 
-          /usr/include/libiptc
+          /lib/xtables and /usr/include/libiptc
         </seg>
       </seglistitem>
@@ -895,5 +896,5 @@
           <para>
             is used to set up, maintain, and inspect the tables of
-            IP packet filter rules in the Linux kernel
+            IP packet filter rules in the Linux kernel.
           </para>
           <indexterm zone="iptables iptables-prog">
@@ -903,52 +904,4 @@
       </varlistentry>
 
-      <varlistentry id="iptables-apply">
-        <term><command>iptables-apply</command></term>
-        <listitem>
-          <para>
-            is a safer way to update iptables remotely
-          </para>
-          <indexterm zone="iptables iptables-apply">
-            <primary sortas="b-iptables-apply">iptables-apply</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iptables-legacy">
-        <term><command>iptables-legacy</command></term>
-        <listitem>
-          <para>
-            is used to interact with iptables using the legacy command set
-          </para>
-          <indexterm zone="iptables iptables-legacy">
-            <primary sortas="b-iptables-legacy">iptables-legacy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iptables-legacy-restore">
-        <term><command>iptables-legacy-restore</command></term>
-        <listitem>
-          <para>
-            is used to restore a set of legacy iptables rules
-          </para>
-          <indexterm zone="iptables iptables-legacy-restore">
-            <primary sortas="b-iptables-legacy-restore">iptables-legacy-restore</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iptables-legacy-save">
-        <term><command>iptables-legacy-save</command></term>
-        <listitem>
-          <para>
-            is used to save a set of legacy iptables rules
-          </para>
-          <indexterm zone="iptables iptables-legacy-save">
-            <primary sortas="b-iptables-legacy-save">iptables-legacy-save</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="iptables-restore">
         <term><command>iptables-restore</command></term>
@@ -957,5 +910,5 @@
             is used to restore IP Tables from data specified on
             STDIN. Use I/O redirection provided by your
-            shell to read from a file
+            shell to read from a file.
           </para>
           <indexterm zone="iptables iptables-restore">
@@ -971,5 +924,5 @@
             is used to dump the contents of an IP Table in easily
             parseable format to STDOUT. Use I/O-redirection
-            provided by your shell to write to a file
+            provided by your shell to write to a file.
           </para>
           <indexterm zone="iptables iptables-save">
@@ -986,5 +939,5 @@
             <command>iptables-save</command> to an XML format. Using the
             <filename>iptables.xslt</filename> stylesheet converts the XML
-            back to the format of <command>iptables-restore</command>
+            back to the format of <command>iptables-restore</command>.
           </para>
           <indexterm zone="iptables iptables-xml">
@@ -999,5 +952,5 @@
           <para>
             are a set of commands for IPV6 that parallel the iptables
-            commands above
+            commands above.
           </para>
           <indexterm zone="iptables ip6tables">
@@ -1013,5 +966,5 @@
             (optional) configuration tool. SYNPROXY target makes handling of
             large SYN floods possible without the large performance penalties
-            imposed by the connection tracking in such cases
+            imposed by the connection tracking in such cases.
           </para>
           <indexterm zone="iptables nfsynproxy">
@@ -1025,5 +978,5 @@
         <listitem>
           <para>
-            is a binary that behaves according to the name it is called by
+            is a binary that behaves according to the name it is called by.
           </para>
           <indexterm zone="iptables xtables-multi">
Index: postlfs/security/libcap.xml
===================================================================
--- postlfs/security/libcap.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/libcap.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY libcap-download-http "&kernel-dl;/linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
   <!ENTITY libcap-download-ftp  " ">
-  <!ENTITY libcap-md5sum        "094994d4554c6689cf98ae4f717b8e19">
-  <!ENTITY libcap-size          "155 KB">
-  <!ENTITY libcap-buildsize     "1.7 MB">
+  <!ENTITY libcap-md5sum        "58ffae7d6a3226d6648cdb5d6f389cbf">
+  <!ENTITY libcap-size          "128 KB">
+  <!ENTITY libcap-buildsize     "1.3 MB">
   <!ENTITY libcap-time          "less than 0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -113,5 +114,5 @@
     </para>
 
-<screen role="root"><userinput>install -v -m755 pam_cap/pam_cap.so /usr/lib/security &amp;&amp;
+<screen role="root"><userinput>install -v -m755 pam_cap/pam_cap.so /lib/security &amp;&amp;
 install -v -m644 pam_cap/capability.conf /etc/security</userinput></screen>
 
Index: postlfs/security/liboauth.xml
===================================================================
--- postlfs/security/liboauth.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/liboauth.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -193,5 +194,5 @@
             OAuth specifications and offers high-level functionality built
             on top to sign requests or verify signatures using either NSS or
-            OpenSSL for calculating the hash/signatures
+            OpenSSL for calculating the hash/signatures.
           </para>
           <indexterm zone="liboauth liboauth-lib">
Index: postlfs/security/libpwquality.xml
===================================================================
--- postlfs/security/libpwquality.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/libpwquality.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,5 +17,6 @@
 
   <sect1info>
-    <date>$Date$</date>
+    <othername>$LastChangedBy: fernando $</othername>
+    <date>$Date: 2015-09-25 08:48:24 -0500 (Fri, 25 Sep 2015) $</date>
   </sect1info>
 
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -83,10 +84,10 @@
       <xref linkend="linux-pam"/>
     </para>
-<!-- Do not advertise python 2 since python 3 can be used
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="python2"/>
     </para>
--->
+
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/libpwquality"/>
@@ -102,8 +103,8 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr                      \
-            --disable-static                   \
-            --with-securedir=/usr/lib/security \
-            --with-python-binary=python3       &amp;&amp;
+<screen><userinput>./configure --prefix=/usr                  \
+            --disable-static               \
+            --with-securedir=/lib/security \
+            --with-python-binary=python3 &amp;&amp;
 make</userinput></screen>
 
@@ -116,5 +117,8 @@
     </para>
     
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install                          &amp;&amp;
+
+mv -v /usr/lib/libpwquality.so.* /lib &amp;&amp;
+ln -sfv ../../lib/$(readlink /usr/lib/libpwquality.so) /usr/lib/libpwquality.so</userinput></screen>
 
   </sect2>
@@ -166,5 +170,5 @@
                                          dictcheck=1 usercheck=1 \
                                          enforcing=1 badwords="" \
-                                         dictpath=/usr/lib/cracklib/pw_dict
+                                         dictpath=/lib/cracklib/pw_dict
 # use sha512 hash for encryption, use shadow, and use the
 # authentication token (chosen password) set by pam_pwquality
@@ -210,5 +214,5 @@
           <para>
             is a simple configurable tool for generating random
-            and relatively easily pronounceable passwords
+            and relatively easily pronounceable passwords.
           </para>
           <indexterm zone="libpwquality pwmake">
@@ -222,5 +226,5 @@
         <listitem>
           <para>
-            is a simple tool for checking quality of a password
+            is a simple tool for checking quality of a password.
           </para>
           <indexterm zone="libpwquality pwscore">
@@ -234,5 +238,5 @@
         <listitem>
           <para>
-            contains API functions for checking the password quality
+            contains API functions for checking the password quality.
           </para>
           <indexterm zone="libpwquality libpwquality-lib">
@@ -247,5 +251,5 @@
           <para>
             is a <application>Linux PAM</application> module used to perform
-            password quality checking
+            password quality checking.
           </para>
           <indexterm zone="libpwquality pam_pwquality">
Index: postlfs/security/linux-pam.xml
===================================================================
--- postlfs/security/linux-pam.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/linux-pam.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,12 +7,12 @@
   <!ENTITY linux-pam-download-http "https://github.com/linux-pam/linux-pam/releases/download/v&linux-pam-version;/Linux-PAM-&linux-pam-version;.tar.xz">
   <!ENTITY linux-pam-download-ftp  " ">
-  <!ENTITY linux-pam-md5sum        "895e8adfa14af334f679bbeb28503f66">
-  <!ENTITY linux-pam-size          "966 KB">
-  <!ENTITY linux-pam-buildsize     "39 MB (with tests)">
+  <!ENTITY linux-pam-md5sum        "155f2a31d07077b2c63a1f135876c31b">
+  <!ENTITY linux-pam-size          "952 KB">
+  <!ENTITY linux-pam-buildsize     "37 MB (with tests)">
   <!ENTITY linux-pam-time          "0.4 SBU (with tests)">
 
   <!ENTITY linux-pam-docs-download "https://github.com/linux-pam/linux-pam/releases/download/v&linux-pam-version;/Linux-PAM-&linux-pam-docs-version;-docs.tar.xz">
-  <!ENTITY linux-pam-docs-md5sum   "ceb3dc248cb2f49a40904b93cb91db1b">
-  <!ENTITY linux-pam-docs-size     "433 KB">
+  <!ENTITY linux-pam-docs-md5sum   "eb03b8191fc886780411054115866ee2">
+  <!ENTITY linux-pam-docs-size     "432 KB">
   <!--
   <!ENTITY debian-pam-docs         "http://debian.securedservers.com/kernel/pub/linux/libs/pam">
@@ -24,4 +24,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -43,5 +44,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -172,8 +173,8 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr                        \
-            --sysconfdir=/etc                     \
-            --libdir=/usr/lib                      \
-            --enable-securedir=/usr/lib/security    \
+<screen><userinput>./configure --prefix=/usr                    \
+            --sysconfdir=/etc                \
+            --libdir=/usr/lib                \
+            --enable-securedir=/lib/security \
             --docdir=/usr/share/doc/Linux-PAM-&linux-pam-version; &amp;&amp;
 make</userinput></screen>
@@ -240,5 +241,11 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-chmod -v 4755 /usr/sbin/unix_chkpwd</userinput></screen>
+chmod -v 4755 /sbin/unix_chkpwd &amp;&amp;
+
+for file in pam pam_misc pamc
+do
+  mv -v /usr/lib/lib${file}.so.* /lib &amp;&amp;
+  ln -sfv ../../lib/$(readlink /usr/lib/lib${file}.so) /usr/lib/lib${file}.so
+done</userinput></screen>
 
   </sect2>
@@ -248,5 +255,5 @@
 
     <para>
-      <parameter>--enable-securedir=/usr/lib/security</parameter>:
+      <parameter>--enable-securedir=/lib/security</parameter>:
       This switch sets the installation location for the
       <application>PAM</application> modules.
@@ -265,5 +272,5 @@
 
     <para>
-      <command>chmod -v 4755 /usr/sbin/unix_chkpwd</command>:
+      <command>chmod -v 4755 /sbin/unix_chkpwd</command>:
       The <command>unix_chkpwd</command> helper program must be setuid
       so that non-<systemitem class="username">root</systemitem>
@@ -314,5 +321,5 @@
       <para>
         Now set up some generic files.  As the 
-        <systemitem class="username">root</systemitem> user:
+        <systemitem class="username">root:</systemitem> user
       </para>
 
@@ -478,5 +485,5 @@
         <seg>
           /etc/security,
-          /usr/lib/security,
+          /lib/security,
           /usr/include/security and
           /usr/share/doc/Linux-PAM-&linux-pam-version;
@@ -494,5 +501,5 @@
         <listitem>
           <para>
-            displays and modifies the authentication failure record files
+            displays and modifies the authentication failure record files.
           </para>
           <indexterm zone="linux-pam faillock">
@@ -506,5 +513,5 @@
         <listitem>
           <para>
-            is a helper binary that creates home directories
+            is a helper binary that creates home directories.
           </para>
           <indexterm zone="linux-pam mkhomedir_helper">
@@ -519,5 +526,5 @@
           <para>
             is a helper program used to configure a private namespace for a
-            user session
+            user session.
           </para>
           <indexterm zone="linux-pam pam_namespace_helper">
@@ -532,5 +539,5 @@
           <para>
             is a helper program that transfers password hashes from passwd or
-            shadow to opasswd
+            shadow to opasswd.
           </para>
           <indexterm zone="linux-pam pwhistory_helper">
@@ -583,5 +590,5 @@
         <listitem>
           <para>
-            is a helper binary that verifies the password of the current user
+            is a helper binary that verifies the password of the current user.
           </para>
           <indexterm zone="linux-pam unix_chkpwd">
@@ -595,5 +602,5 @@
         <listitem>
           <para>
-            is a helper binary that updates the password of a given user
+            is a helper binary that updates the password of a given user.
           </para>
           <indexterm zone="linux-pam unix_update">
@@ -608,5 +615,5 @@
           <para>
             provides the interfaces between applications and the
-            PAM modules
+            PAM modules.
           </para>
           <indexterm zone="linux-pam libpam">
Index: postlfs/security/make-ca.xml
===================================================================
--- postlfs/security/make-ca.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/make-ca.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -11,6 +11,6 @@
 
   <!ENTITY make-ca-download      "https://github.com/djlucas/make-ca/releases/download/v&make-ca-version;/make-ca-&make-ca-version;.tar.xz">
-  <!ENTITY make-ca-size          "30 KB">
-  <!ENTITY make-ca-md5sum        "957c39206ba0e9139807c5a47535747f">
+  <!ENTITY make-ca-size          "28.5 KB">
+  <!ENTITY make-ca-md5sum        "e0356f5ae5623f227a3f69b5e8848ec6">
 ]>
 
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -52,5 +53,5 @@
     </para>
 
-  &lfs110a_checked;
+  &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -221,17 +222,10 @@
     <para>
       The <filename class="directory">/etc/ssl/local</filename> directory
-      is available to add additional CA certificates to the system trust store.
-      This directory is also used to store certificates that were added to or
-      modified  in the system trust store by <xref linkend="p11-kit"/> so that
-      trust values are maintained across upgrades. Files in this directory must
-      be in the <application>OpenSSL</application> trusted certificate format.
-      Certificates imported using the <command>trust</command> utility from
-      <xref linkend="p11-kit"/> will utilize the x509 Extended Key Usage values
-      to assign default trust values for the system anchors.
-    </para>
-
-    <para>If you need to override trust values, or otherwise need to create
-      an <application>OpenSSL</application> trusted certificate manually
-      from a regular PEM encoded file, you need to add trust arguments to the
+      is available to add additional CA certificates to the system. For
+      instance, you might need to add an organization or government CA
+      certificate. Files in this directory must be in the
+      <application>OpenSSL</application> trusted certificate format. To
+      create an <application>OpenSSL</application> trusted certificate from
+      a regular PEM encoded file, you need to add trust arguments to the
       <command>openssl</command> command, and create a new certificate. For
       example, using the <ulink url="http://www.cacert.org/">CAcert</ulink>
@@ -250,5 +244,5 @@
         -addtrust serverAuth -addtrust emailProtection -addtrust codeSigning \
         > /etc/ssl/local/CAcert_Class_3_root.pem &amp;&amp;
-/usr/sbin/make-ca -r</userinput></screen>
+/usr/sbin/make-ca -r -f</userinput></screen>
 
     <bridgehead renderas="sect3">Overriding Mozilla Trust</bridgehead>
@@ -272,5 +266,5 @@
              -addreject codeSigning \
        > /etc/ssl/local/Disabled_Makebelieve_CA_Root.pem &amp;&amp;
-/usr/sbin/make-ca -r</userinput></screen>
+/usr/sbin/make-ca -r -f</userinput></screen>
 
   </sect2>
@@ -301,5 +295,5 @@
             is a shell script that adapts a current version of
             <filename>certdata.txt</filename>, and prepares it for use
-            as the system trust store
+            as the system trust store.
           </para>
           <indexterm zone="make-ca make-ca">
@@ -311,4 +305,3 @@
 
   </sect2>
-
 </sect1>
Index: postlfs/security/mitkrb.xml
===================================================================
--- postlfs/security/mitkrb.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/mitkrb.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY mitkrb-download-http "https://kerberos.org/dist/krb5/&mitkrb-major-version;/krb5-&mitkrb-version;.tar.gz">
   <!ENTITY mitkrb-download-ftp  " ">
-  <!ENTITY mitkrb-md5sum        "eb51b7724111e1a458a8c9a261d45a31">
+  <!ENTITY mitkrb-md5sum        "a64e8018a7572e0b4bd477c745129ffc">
   <!ENTITY mitkrb-size          "8.3 MB">
-  <!ENTITY mitkrb-buildsize     "95 MB (add 24 MB for tests)">
-  <!ENTITY mitkrb-time          "0.4 SBU (Using parallelism=4; add 1.6 SBU for tests)">
+  <!ENTITY mitkrb-buildsize     "138 MB (add 24 MB for tests)">
+  <!ENTITY mitkrb-time          "0.8 SBU (add 4.4 SBU for tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -79,5 +80,4 @@
     <para role="optional">
       <!-- <xref linkend="dejagnu"/> (for full test coverage), -->
-      <xref linkend="bind-utils"/>,
       <xref linkend="gnupg2"/> (to authenticate the package),
       <xref linkend="keyutils"/>,
@@ -86,5 +86,4 @@
       <xref linkend="rpcbind"/> (used during the testsuite),-->
       <xref linkend="valgrind"/> (used during the testsuite),
-      <xref linkend="yasm"/>,
       <ulink url="http://thrysoee.dk/editline/">libedit</ulink>,
       <ulink url="https://cmocka.org/">cmocka</ulink>,
@@ -116,13 +115,11 @@
 
 <screen><userinput>cd src &amp;&amp;
-
+ 
 sed -i -e 's@\^u}@^u cols 300}@' tests/dejagnu/config/default.exp     &amp;&amp;
 sed -i -e '/eq 0/{N;s/12 //}'    plugins/kdb/db2/libdb2/test/run.test &amp;&amp;
-sed -i '/t_iprop.py/d'           tests/Makefile.in                    &amp;&amp;
 
 ./configure --prefix=/usr            \
             --sysconfdir=/etc        \
             --localstatedir=/var/lib \
-            --runstatedir=/run       \
             --with-system-et         \
             --with-system-ss         \
@@ -139,6 +136,5 @@
       installed, it may happen that the test suite may pick up the installed
       versions of the libraries, rather than the newly built ones. If so, it is
-      better to run the tests after the installation. Some tests may fail with
-      the latest version of dejagnu and glibc.
+      better to run the tests after the installation.
       <!-- Note: on my laptop -j8 fails but -j1 passes -->
     </para>
@@ -149,4 +145,21 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
+
+for f in gssapi_krb5 gssrpc k5crypto kadm5clnt kadm5srv \
+         kdb5 kdb_ldap krad krb5 krb5support verto ; do
+
+    find /usr/lib -type f -name "lib$f*.so*" -exec chmod -v 755 {} \;    
+done          &amp;&amp;
+
+mv -v /usr/lib/libkrb5.so.3*        /lib &amp;&amp;
+mv -v /usr/lib/libk5crypto.so.3*    /lib &amp;&amp;
+mv -v /usr/lib/libkrb5support.so.0* /lib &amp;&amp;
+
+ln -v -sf ../../lib/libkrb5.so.3.3        /usr/lib/libkrb5.so        &amp;&amp;
+ln -v -sf ../../lib/libk5crypto.so.3.1    /usr/lib/libk5crypto.so    &amp;&amp;
+ln -v -sf ../../lib/libkrb5support.so.0.1 /usr/lib/libkrb5support.so &amp;&amp;
+
+mv -v /usr/bin/ksu /bin &amp;&amp;
+chmod -v 755 /bin/ksu   &amp;&amp;
 
 install -v -dm755 /usr/share/doc/krb5-&mitkrb-version; &amp;&amp;
@@ -159,23 +172,15 @@
 
     <para>
-      The first <command>sed</command> increases the width of the virtual 
-      terminal used for some tests to prevent some spurious text in the output
-      which is taken as a failure. The second <command>sed</command> removes a
-      test that is known to fail. The third <command>sed</command> removes a
-      test that is known to hang.
+      The first sed increases the width of the virtual terminal used for some
+      tests to prevent some spurious text in the output which is taken as a
+      failure. The second <command>sed</command> removes a test that is known
+      to fail.
     </para>
 
     <para>
       <parameter>--localstatedir=/var/lib</parameter>: This option is
-      used so that the Kerberos variable runtime data is located in
+      used so that the Kerberos variable run-time data is located in
       <filename class="directory">/var/lib</filename> instead of
       <filename class="directory">/usr/var</filename>.
-    </para>
-
-    <para>
-      <parameter>--runstatedir=/run</parameter>: This option is used so that
-      the Kerberos runtime state information is located in
-      <filename class="directory">/run</filename> instead of the deprecated
-      <filename class="directory">/var/run</filename>.
     </para>
 
@@ -210,5 +215,4 @@
     </para>
 
-    <!-- FIXME: Removed due to merged-/usr setup
     <para>
       <command>mv -v /usr/lib/libk... /lib </command> and 
@@ -232,5 +236,4 @@
       filesystem is not mounted.
     </para>
-    -->
 
   </sect2>
@@ -513,5 +516,5 @@
         <listitem>
           <para>
-            is a GSSAPI test client
+            is a GSSAPI test client.
           </para>
           <indexterm zone="mitkrb gss-client">
@@ -525,5 +528,5 @@
         <listitem>
           <para>
-            is a GSSAPI test server
+            is a GSSAPI test server.
           </para>
           <indexterm zone="mitkrb gss-server">
@@ -537,5 +540,5 @@
         <listitem>
           <para>
-            is a host keytable manipulation utility
+            is a host keytable manipulation utility.
           </para>
           <indexterm zone="mitkrb k5srvutil">
@@ -550,5 +553,5 @@
           <para>
             is an utility used to make modifications
-            to the Kerberos database
+            to the Kerberos database.
           </para>
           <indexterm zone="mitkrb kadmin">
@@ -565,5 +568,5 @@
             database is db2, the local client <command>kadmin.local</command>,
             is intended to run directly on the master KDC without Kerberos
-            authentication
+            authentication.
           </para>
           <indexterm zone="mitkrb kadmin.local">
@@ -578,5 +581,5 @@
           <para>
             is a server for administrative access
-            to a Kerberos database
+            to a Kerberos database.
           </para>
           <indexterm zone="mitkrb kadmind">
@@ -591,5 +594,5 @@
           <para>
             allows an administrator to manage realms, Kerberos services
-            and ticket policies
+            and ticket policies.
           </para>
           <indexterm zone="mitkrb kdb5_ldap_util">
@@ -603,5 +606,5 @@
         <listitem>
           <para>
-            is the KDC database utility
+            is the KDC database utility.
           </para>
           <indexterm zone="mitkrb kdb5_util">
@@ -615,5 +618,5 @@
         <listitem>
           <para>
-            removes the current set of tickets
+            removes the current set of tickets.
           </para>
           <indexterm zone="mitkrb kdestroy">
@@ -629,5 +632,5 @@
             is used to authenticate to the Kerberos server as a
             principal and acquire a ticket granting ticket that can
-            later be used to obtain tickets for other services
+            later be used to obtain tickets for other services.
           </para>
           <indexterm zone="mitkrb kinit">
@@ -642,5 +645,5 @@
           <para>
             reads and displays the current tickets in
-            the credential cache
+            the credential cache.
           </para>
           <indexterm zone="mitkrb klist">
@@ -654,5 +657,5 @@
         <listitem>
           <para>
-            is a program for changing Kerberos 5 passwords
+            is a program for changing Kerberos 5 passwords.
           </para>
           <indexterm zone="mitkrb kpasswd">
@@ -667,5 +670,5 @@
           <para>
             takes a principal database in a specified format and
-            converts it into a stream of database records
+            converts it into a stream of database records.
           </para>
           <indexterm zone="mitkrb kprop">
@@ -680,5 +683,5 @@
           <para>
             receives a database sent by <command>kprop</command>
-            and writes it as a local database
+            and writes it as a local database.
           </para>
           <indexterm zone="mitkrb kpropd">
@@ -693,5 +696,5 @@
           <para>
             displays the contents of the KDC database update log to standard
-            output
+            output.
           </para>
           <indexterm zone="mitkrb kproplog">
@@ -706,5 +709,5 @@
           <para>
             gives information on how to link programs against
-            libraries
+            libraries.
           </para>
           <indexterm zone="mitkrb krb5-config-prog2">
@@ -718,5 +721,5 @@
         <listitem>
           <para>
-            is the <application>Kerberos 5</application> server
+            is the <application>Kerberos 5</application> server.
           </para>
           <indexterm zone="mitkrb krb5kdc">
@@ -730,5 +733,5 @@
         <listitem>
           <para>
-            sends a problem report (PR) to a central support site
+            sends a problem report (PR) to a central support site.
           </para>
           <indexterm zone="mitkrb krb5-send-pr">
@@ -746,5 +749,5 @@
             <filename>/etc/shells</filename> and
             <filename>~/.k5login</filename> containing principals
-            authorized to become super users
+            authorized to become super users.
           </para>
           <indexterm zone="mitkrb ksu">
@@ -760,5 +763,5 @@
             makes the specified credential cache the
             primary cache for the collection, if a cache
-            collection is available
+            collection is available.
           </para>
           <indexterm zone="mitkrb kswitch">
@@ -772,5 +775,5 @@
         <listitem>
           <para>
-            is a program for managing Kerberos keytabs
+            is a program for managing Kerberos keytabs.
           </para>
           <indexterm zone="mitkrb ktutil">
@@ -784,5 +787,5 @@
         <listitem>
           <para>
-            prints keyversion numbers of Kerberos principals
+            prints keyversion numbers of Kerberos principals.
           </para>
           <indexterm zone="mitkrb kvno">
@@ -798,5 +801,5 @@
             is used to contact a sample server and authenticate to it
             using Kerberos 5 tickets, then display the server's
-            response
+            response.
           </para>
           <indexterm zone="mitkrb sclient">
@@ -811,5 +814,5 @@
           <para>
             is a simple UDP-based sample client program, for
-            demonstration
+            demonstration.
           </para>
           <indexterm zone="mitkrb sim_client">
@@ -824,5 +827,5 @@
           <para>
             is a simple UDP-based server application, for
-            demonstration
+            demonstration.
           </para>
           <indexterm zone="mitkrb sim_server">
@@ -836,5 +839,5 @@
         <listitem>
           <para>
-            is the sample Kerberos 5 server
+            is the sample Kerberos 5 server.
           </para>
           <indexterm zone="mitkrb sserver">
@@ -848,5 +851,5 @@
         <listitem>
           <para>
-            is another sample client
+            is another sample client.
           </para>
           <indexterm zone="mitkrb uuclient">
@@ -860,5 +863,5 @@
         <listitem>
           <para>
-            is another sample server
+            is another sample server.
           </para>
           <indexterm zone="mitkrb uuserver">
@@ -878,5 +881,5 @@
             underlying mechanisms and technologies and hence allowing
             source-level portability of applications to different
-            environments
+            environments.
           </para>
           <indexterm zone="mitkrb libgssapi_krb5">
@@ -891,5 +894,5 @@
           <para>
             contains the administrative authentication and password checking
-            functions required by Kerberos 5 client-side programs
+            functions required by Kerberos 5 client-side programs.
           </para>
           <indexterm zone="mitkrb libkadm5clnt">
@@ -904,5 +907,5 @@
           <para>
             contains the administrative authentication and password
-            checking functions required by Kerberos 5 servers
+            checking functions required by Kerberos 5 servers.
           </para>
           <indexterm zone="mitkrb libkadm5srv">
@@ -917,5 +920,5 @@
           <para>
             is a Kerberos 5 authentication/authorization database
-            access library
+            access library.
           </para>
           <indexterm zone="mitkrb libkdb5">
@@ -929,5 +932,5 @@
         <listitem>
           <para>
-            contains the internal support library for RADIUS functionality
+            contains the internal support library for RADIUS functionality.
           </para>
           <indexterm zone="mitkrb libkrad">
@@ -941,5 +944,5 @@
         <listitem>
           <para>
-            is an all-purpose <application>Kerberos 5</application> library
+            is an all-purpose <application>Kerberos 5</application> library.
           </para>
           <indexterm zone="mitkrb libkrb5">
Index: postlfs/security/nessus.xml
===================================================================
--- postlfs/security/nessus.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/nessus.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: postlfs/security/nettle.xml
===================================================================
--- postlfs/security/nettle.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/nettle.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,6 +7,6 @@
   <!ENTITY nettle-download-http "&gnu-http;/nettle/nettle-&nettle-version;.tar.gz">
   <!ENTITY nettle-download-ftp  "&gnu-ftp;/nettle/nettle-&nettle-version;.tar.gz">
-  <!ENTITY nettle-md5sum        "a60273d0fab9c808646fcf5e9edc2e8f">
-  <!ENTITY nettle-size          "2.3 MB">
+  <!ENTITY nettle-md5sum        "c45ee24ed7361dcda152a035d396fe8a">
+  <!ENTITY nettle-size          "2.2 MB">
   <!ENTITY nettle-buildsize     "87 MB (with tests)">
   <!ENTITY nettle-time          "0.4 SBU (with tests)">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -69,12 +70,12 @@
       </listitem>
     </itemizedlist>
-
+<!--
     <bridgehead renderas="sect3">Nettle Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="valgrind"/> (optional for the tests)
-    </para>
-
+      <xref linkend="openssl"/> (for examples)
+    </para>
+-->
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/nettle"/>
@@ -147,5 +148,5 @@
         <listitem>
           <para>
-            calculates a hash value using a specified algorithm
+            calculates a hash value using a specified algorithm.
           </para>
           <indexterm zone="nettle nettle-hash">
@@ -162,5 +163,5 @@
             using Knuth's lagged fibonacci generator. The stream is useful for
             testing, but should not be used to generate cryptographic keys or
-            anything else that needs real randomness
+            anything else that needs real randomness.
           </para>
           <indexterm zone="nettle nettle-lfib-stream">
@@ -174,8 +175,8 @@
         <listitem>
           <para>
-            is a password-based key derivation function that takes a password
-            or a passphrase as input and returns a strengthened password,
-            which is protected against pre-computation attacks by using
-            salting and other expensive computations.
+            password-based key derivation function that take as input a
+            password or passphrase and typically strengthen it and protect
+            against certain pre-computation attacks by using salting and
+            expensive computation.
           </para>
           <indexterm zone="nettle nettle-pbkdf2">
@@ -190,5 +191,5 @@
           <para>
             converts private and public RSA keys from PKCS #1 format to
-            sexp format
+            sexp format.
           </para>
           <indexterm zone="nettle pkcs1-conv">
@@ -202,5 +203,5 @@
         <listitem>
           <para>
-            converts an s-expression to a different encoding
+            converts an s-expression to a different encoding.
           </para>
           <indexterm zone="nettle sexp-conv">
Index: postlfs/security/nftables.xml
===================================================================
--- postlfs/security/nftables.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
+++ postlfs/security/nftables.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -0,0 +1,434 @@
+<?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 nftables-download-http "https://netfilter.org/projects/nftables/files/nftables-&nftables-version;.tar.bz2">
+  <!ENTITY nftables-download-ftp  " ">
+  <!ENTITY nftables-md5sum        "9913b2b46864394d41916b74638e0875">
+  <!ENTITY nftables-size          "772 KB">
+  <!ENTITY nftables-buildsize     "34 MB">
+  <!ENTITY nftables-time          "0.2 SBU">
+]>
+
+<sect1 id="nftables" xreflabel="nftables-&nftables-version;">
+  <?dbhtml filename="nftables.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>nftables-&nftables-version;</title>
+
+  <indexterm zone="nftables">
+    <primary sortas="a-nftables">nftables</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to nftables</title>
+
+    <para>
+      The <application>nftables</application> package, intended to be the
+      successor to <xref linkend="iptables"/>,  provides a low-level netlink
+      programming interface (API), and userspace uitlities for the in-kernel
+      nf_tables subsystem.
+    </para>
+
+    &lfs90_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&nftables-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&nftables-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &nftables-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &nftables-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &nftables-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &nftables-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">nftables Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libnftnl"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+        <xref linkend="jansson"/> (for JSON rules table support)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="iptables"/> and
+      <xref linkend="docbook-utils"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
+
+    <para role="optional">
+      <ulink url="https://netfilter.org/projects/conntrack-tools/index.html">
+      contrack-tools</ulink>
+      <ulink url="https://netfilter.org/projects/nfacct/index.html">
+      nfacct</ulink>
+      <ulink url="https://netfilter.org/projects/ulogd/index.html">
+      ulogd</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/nftables"/>
+    </para>
+  </sect2>
+
+    <sect2 role="kernel">
+      <title>Kernel Configuration</title>
+
+    <para>
+      Enable the following options in the kernel configuration and recompile the
+      kernel if necessary (add any additional nf_tables features as needed):
+    </para>
+
+<screen><literal>[*] Networking support [CONFIG_NET] ---&gt;
+    Networking options ---&gt;
+    [*] Network packet filtering framework (Netfilter) [CONFIG_NETFILTER] ---&gt;
+        Core Netfilter Configuration ---&gt;
+          &lt;*&gt; * protocol support [CONFIG_NF_CONNTRACK_*]
+          &lt;*&gt; Netfilter nf_tables support [CONFIG_NF_TABLES]
+          [*]   Netfilter nf_tables * support [CONFIG_NF_TABLES_*]</literal></screen>
+
+    <para>
+      Include any connection tracking protocols that will be used, and
+      any protocols that you wish to use for match suppport under the
+      "Core Netfilter Configuration" section. Additionally, include any
+      "Netfilter nf_tables * module" that will be used under the
+      "Netfilter nf_tables support" section.
+    </para>
+
+
+    </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of nftables</title>
+
+    <para>
+      Install <application>nftables</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr     \
+            --sbindir=/sbin   \
+            --sysconfdir=/etc \
+            --with-json       \
+            --with-python-bin=/usr/bin/python3 &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                   &amp;&amp;
+mv /usr/lib/libnftables.so.* /lib &amp;&amp;
+ln -sfv ../../lib/$(readlink /usr/lib/libnftables.so) /usr/lib/libnftables.so</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+<!-- there is no disable-static option in the configure string
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+-->
+    <para>
+      <parameter>--with-json</parameter>: build with support for JSON rules.
+      Omit if <xref linkend="jansson"/> is not available.
+    </para>
+
+    <para>
+      <parameter>--with-python-bin=/usr/bin/python3</parameter>: force use of
+      <application>Python3</application>.
+    </para>
+
+    <para>
+      <option>--enable-man-doc</option>: build man pages if
+      <xref linkend="asciidoc"/> is installed (required if adding
+      json support).
+    </para>
+
+    <para>
+      <option>--with-xtables</option>: build with
+      <xref linkend="iptables"/> libxtables support.
+    </para>
+
+    <para>
+      <command>mv -v /usr/lib/nftables.so.* ...</command>: Move shared
+      libraries into /lib so they are available before /usr is mounted.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring nftables</title>
+
+    <note>
+      <para>
+        If you intend to use <xref linkend="firewalld"/> to configure your
+        firewall rules, you should not use the example configuration provided
+        here, nor should you enable the
+        <phrase revision="sysv">bootscript.</phrase>
+        <phrase revision="systemd">systemd unit.</phrase>
+      </para>
+    </note>
+
+    <sect3 id="fw-masqRouter-nft"
+     xreflabel="Creating a Masquerading Router With nftables">
+      <title>Masquerading Router</title>
+
+      <para>
+        A network Firewall has two interfaces, one connected to an
+        intranet, in this example <emphasis role="strong">LAN1</emphasis>,
+        and one connected to the Internet, here <emphasis
+        role="strong">WAN1</emphasis>. You will need to adjust these value to
+        match your particular system. To provide the maximum security
+        for the firewall itself, make sure that there are no unnecessary
+        servers running on it such as <application>X11</application> et al.
+        As a general principle, the firewall itself should not access
+        any untrusted service (think of a remote server giving answers that
+        makes a daemon on your system crash, or even worse, that implements
+        a worm via a buffer-overflow).
+      </para>
+
+    <note>
+      <para>
+        In the following example configuration, <emphasis
+        role="strong">LAN1</emphasis> is used for the internal LAN interface,
+        and <emphasis role="strong">WAN1</emphasis> is used for the external
+        interface connected to the Internet. You will need to replace these
+        values with appropriate interface names for your system.
+      </para>
+    </note>
+
+
+<screen role="root"><?dbfo keep-together="auto"?><userinput>cat &gt; /etc/nftables/nftables.conf &lt;&lt; "EOF"
+<literal>#!/sbin/nft -f
+
+# You're using the example configuration for a setup of a firewall
+# from Beyond Linux From Scratch.
+#
+# This example is far from being complete, it is only meant
+# to be a reference.
+#
+# Firewall security is a complex issue, that exceeds the scope
+# of the configuration rules below.
+#
+# You can find additional information
+# about firewalls in Chapter 4 of the BLFS book.
+# http://www.&lfs-domainname;/blfs
+
+# Drop all existing rules
+flush ruleset
+
+# Filter for both ip4 and ip6 (inet)
+table inet filter {
+
+        # filter incomming packets
+        chain input {
+
+                # Drop everything that doesn't match policy
+                type filter hook input priority 0; policy drop;
+
+                # accept packets for established connections
+                ct state { established, related } accept
+
+                # Drop packets that have a connection state of invalid
+                ct state invalid drop
+
+                # Allow connections to the loopback adapter
+                iifname "lo" accept
+
+                # Allow connections to the LAN1 interface
+                iifname "LAN1" accept
+
+                # Accept icmp requests
+                ip protocol icmp accept
+
+                # Allow ssh connections on LAN1
+                iifname "LAN1" tcp dport ssh accept
+
+                # Drop everything else
+                drop
+        }
+
+        # Allow forwarding for external connections to WAN1
+        chain forward {
+
+                # Drop if it doesn't match policy
+                type filter hook forward priority 0; policy drop;
+
+                # Accept connections on WAN1
+                oifname "WAN1" accept
+
+                # Allow forwarding to another host via this interface
+                # Uncomment the following line to allow connections
+                # ip daddr 192.168.0.2 ct status dnat accept
+
+                # Allow established and related connections
+                iifname "WAN1" ct state { established, related } accept
+        }
+
+        # Filter output traffic
+        chain output {
+
+                # Allow everything outbound
+                type filter hook output priority 0; policy accept;
+        }
+}
+
+# Allow NAT for ip protocol (both ip4 and ip6)
+table ip nat {
+
+        chain prerouting {
+
+                # Accept on inbound interface for policy match
+                type nat hook prerouting priority 0; policy accept;
+
+                # Accept http and https on 192.168.0.2
+                # Uncomment the following line to allow http and https
+                #iifname "WAN1" tcp dport { http, https } dnat to 192.168.0.2
+        }
+
+        chain postrouting {
+
+                # accept outbound
+                type nat hook postrouting priority 0; policy accept;
+
+                # Masquerade on WAN1 outbound
+                oifname "WAN1" masquerade
+        }
+}</literal>
+EOF</userinput></screen>
+
+      <para>
+        With this configuration your intranet should be reasonably secure
+        against external attacks. No one should be able to setup a new
+        connection to any internal service not configured above.
+      </para>
+
+      <para>
+        There are several other examples in the
+        <filename class="directory">/etc/nftables</filename> directory.
+      </para>
+
+    </sect3>
+
+    <sect3  id="nftables-init">
+      <title><phrase revision="sysv">Boot Script</phrase>
+             <phrase revision="systemd">Systemd Unit</phrase></title>
+
+      <para revision="sysv">
+        To set up the nftables firewall at boot, install the
+        <filename>/etc/rc.d/init.d/nftables</filename> init script included
+        in the <xref linkend="bootscripts"/> package.
+      </para>
+
+      <para revision="systemd">
+        To set up the nftables firewall at boot, install the
+        <filename>nftables.service</filename> unit included in the
+        <xref linkend="systemd-units"/> package.
+      </para>
+
+      <indexterm zone="nftables nftables-init">
+        <primary sortas="f-nftables">nftables</primary>
+      </indexterm>
+
+<screen role="root"><userinput>make install-nftables</userinput></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          nft
+        </seg>
+        <seg>
+          libnftables.{a,so}
+        </seg>
+        <seg>
+          /etc/nftables
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="nft">
+        <term><filename>nft</filename></term>
+        <listitem>
+          <para>
+            command line interface for the nf_tables subsystem.
+          </para>
+          <indexterm zone="nftables nft">
+            <primary sortas="a-nft">nft</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libnftables">
+        <term><filename class="libraryfile">libnftables.{a,so}</filename></term>
+        <listitem>
+          <para>
+            provides functions for manipulating the nf_tables subsystem.
+          </para>
+          <indexterm zone="nftables libnftables">
+            <primary sortas="c-libnftables">libnftables.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: postlfs/security/nss.xml
===================================================================
--- postlfs/security/nss.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/nss.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -12,11 +12,12 @@
 
 <!-- no micro versions -->
-<!ENTITY nss-download-http "https://&nss-url;/NSS_3_&nss-minor-version;_RTM/src/nss-&nss-version;.tar.gz">
+  <!ENTITY nss-download-http "https://&nss-url;/NSS_3_&nss-minor-version;_RTM/src/nss-&nss-version;.tar.gz">
 
   <!ENTITY nss-download-ftp  " ">
-  <!ENTITY nss-md5sum        "df451e99d09589da6c3d4f103de877bc">
-  <!ENTITY nss-size          "79 MB">
-  <!ENTITY nss-buildsize     "305 MB (add 122 MB for tests)">
-  <!ENTITY nss-time          "5.8 SBU (with parallelism=4, add 17 SBU for tests)">
+  <!ENTITY nss-md5sum        "afbbb03ae4034a55d28de658ba4e18ff">
+  <!ENTITY nss-size          "78 MB">
+  <!-- 50 MB increase is due to new test files, see #12187 -->
+  <!ENTITY nss-buildsize     "294 MB (add 139 MB for tests)">
+  <!ENTITY nss-time          "2.6 SBU (with parallelism=4, add 24 SBU for tests)">
 ]>
 
@@ -25,4 +26,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -47,5 +49,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -118,11 +120,11 @@
          for more information. -->
 
-    <!-- And with another rebuild of nss-3.54, all is well again, but broken in 3.60 -->
-    <!-- fixed again in 3.62
+    <!-- And with another rebuild of nss-3.54, all is well again
     <note>
       <para>
         This package does not support parallel build.
       </para>
-    </note>-->
+    </note>
+   -->
 
     <para>
@@ -134,5 +136,5 @@
 cd nss &amp;&amp;
 
-make BUILD_OPT=1                  \
+make BUILD_OPT=1                      \
   NSPR_INCLUDE_DIR=/usr/include/nspr  \
   USE_SYSTEM_ZLIB=1                   \
@@ -144,45 +146,27 @@
     <para>
       <!-- the unittest files get compiled automatically since nss-3.31.0 -->
-      To run the tests, execute the following commands (1 test is known to fail):
+      <!-- The unit tests were run during the build.-->
+      To run the tests, execute the following commands:
     </para>
 
 <screen remap="test"><userinput>cd tests &amp;&amp;
-HOST=localhost DOMSUF=localdomain ./all.sh
+HOST=localhost DOMSUF=localdomain ./all.sh &amp;&amp;
 cd ../</userinput></screen>
     
-    <note>  
-      <para>Some information about the tests:</para>
-      <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-           HOST=localhost and DOMSUF=localdomain are required 
-           Without these variables, a FQDN is
-           required to specified and this generic way should work for
+    <!--   Some information about the tests:
+         - HOST=localhost and DOMSUF=localdomain require the changes done to
+           /etc/hosts in r11892 (LFS). Without these variables, a FQDN is
+           required to specified, and this generic way should work for
            everyone.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-           The tests take an extremely long time to run. If desired there is
-           information in the all.sh script about running subsets of the 
-           total test suite.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-           When interrupting the tests, the test suite
+         - With NSS-3.53, there were 53,866 tests. The tests take an
+           extremely long time to run. 
+         - Another interesting discovery has to do with interrupting the tests.
+           It was discovered that, when interrupting the tests, the test suite
            fails to spin down test servers that are run. This leads to an
            infinite loop in the tests where the test suite tries to kill a server
            that doesn't exist anymore because it pulls the wrong PID.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-           Test suite results (in HTML format!) can be found at 
-           ../../test_results/security/localhost.1/results.html
-        </para>
-      </listitem>
-      </itemizedlist>
-     </note>
+         - Test suite results (in HTML format!) can be found at 
+           ../../test_results/security/localhost.1/
+     -->
 
     <para>
@@ -327,5 +311,5 @@
             or change the password, generate new public and private key pairs,
             display the contents of the key database, or delete key pairs within
-            the key3.db file
+            the key3.db file.
           </para>
           <indexterm zone="nss certutil">
@@ -340,5 +324,5 @@
           <para>
             is used to determine the NSS library settings of the installed NSS
-            libraries
+            libraries.
           </para>
           <indexterm zone="nss nss-config">
@@ -354,5 +338,5 @@
             is a tool for importing certificates and keys from pkcs #12 files
             into NSS or exporting them. It can also list certificates and keys
-            in such files
+            in such files.
           </para>
           <indexterm zone="nss pk12util">
Index: postlfs/security/openssh.xml
===================================================================
--- postlfs/security/openssh.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/openssh.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,12 +6,12 @@
 
   <!ENTITY openssh-download-http
-           "https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-&openssh-version;.tar.gz">
+           "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-&openssh-version;.tar.gz">
   <!ENTITY openssh-download-ftp
            " "> <!-- at the moment, unable to connect via ftp: ken
            "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-&openssh-version;.tar.gz"> -->
-  <!ENTITY openssh-md5sum        "f545230799f131aecca04da56e61990a">
+  <!ENTITY openssh-md5sum        "8f897870404c088e4aa7d1c1c58b526b">
   <!ENTITY openssh-size          "1.7 MB">
-  <!ENTITY openssh-buildsize     "48 MB (add 18 MB for tests)">
-  <!ENTITY openssh-time          "0.3 SBU (Using parallelism=4; 
+  <!ENTITY openssh-buildsize     "48 MB (add 17 MB for tests)">
+  <!ENTITY openssh-time          "0.2 SBU (Using parallelism=4; 
                                   running the tests takes 20+ minutes,
                                   irrespective of processor speed)">
@@ -22,4 +22,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -43,5 +44,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -144,24 +145,4 @@
 <screen><userinput remap="pre">patch -Np1 -i ../openssh-&openssh-version;-glibc_2.31_fix-1.patch</userinput></screen>
 -->    
-
-<!-- Applied in 8.5p1
-    <para>
-      First, adapt <application>ssh-copy-id</application> to changes
-      in bash-5.1:
-    </para>
-
-<screen><userinput remap="pre">sed -e '/INSTALLKEYS_SH/s/)//' -e '260a\  )' -i contrib/ssh-copy-id</userinput></screen>
-
-    <para>
-      Next, fix an issue on platforms other than x86_64:
-    </para>
-    <screen><userinput remap="pre">if [ "$(uname -m)" != "x86_64" ]; then
-    l1="#ifdef __NR_pselect6_time64"
-    l2="    SC_ALLOW(__NR_pselect6_time64),"
-    l3="#endif"
-    sed -e "/^#ifdef __NR_read$/ i $l1\n$l2\n$l3" \
-        -i sandbox-seccomp-filter.c
-fi</userinput></screen>
--->
     <para>
       Install <application>OpenSSH</application> by running the following
@@ -169,11 +150,8 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr                            \
-            --sysconfdir=/etc/ssh                    \
-            --with-md5-passwords                     \
-            --with-privsep-path=/var/lib/sshd        \
-            --with-default-path=/usr/bin             \
-            --with-superuser-path=/usr/sbin:/usr/bin \
-            --with-pid-dir=/run
+<screen><userinput>./configure --prefix=/usr                     \
+            --sysconfdir=/etc/ssh             \
+            --with-md5-passwords              \
+            --with-privsep-path=/var/lib/sshd &amp;&amp;
 make</userinput></screen>
 
@@ -235,17 +213,4 @@
       <parameter>--with-md5-passwords</parameter>: This enables the use of MD5
       passwords.
-    </para>
-
-    <para>
-      <parameter>--with-default-path=/usr/bin</parameter> and
-      <parameter>--with-superuser-path=/usr/sbin:/usr/bin</parameter>:
-      These set <envar>PATH</envar> consistent with LFS and BLFS
-      <application>Shadow</application> package.
-    </para>
-
-    <para>
-      <parameter>--with-pid-dir=/run</parameter>: This prevents
-      <application>OpenSSH</application> from refering to deprecated
-      <filename class="directory">/var/run</filename>.
     </para>
 
@@ -394,5 +359,5 @@
       <seglistitem>
         <seg>
-          scp, sftp, <!--slogin (symlink to ssh),--> ssh, ssh-add, ssh-agent,
+          scp, sftp, slogin (symlink to ssh), ssh, ssh-add, ssh-agent,
           ssh-copy-id, ssh-keygen, ssh-keyscan, and sshd
         </seg>
@@ -418,5 +383,5 @@
           <para>
             is a file copy program that acts like <command>rcp</command> except
-            it uses an encrypted protocol
+            it uses an encrypted protocol.
           </para>
           <indexterm zone="openssh scp">
@@ -430,5 +395,5 @@
         <listitem>
           <para>
-            is an FTP-like program that works over the SSH1 and SSH2 protocols
+            is an FTP-like program that works over the SSH1 and SSH2 protocols.
           </para>
           <indexterm zone="openssh sftp">
@@ -437,10 +402,10 @@
         </listitem>
       </varlistentry>
-<!-- Not installed anymore as of 8.5p1
+
       <varlistentry id="slogin">
         <term><command>slogin</command></term>
         <listitem>
           <para>
-            is a symlink to <command>ssh</command>
+            is a symlink to <command>ssh</command>.
           </para>
           <indexterm zone="openssh slogin">
@@ -449,5 +414,5 @@
         </listitem>
       </varlistentry>
--->
+
       <varlistentry id="ssh">
         <term><command>ssh</command></term>
@@ -455,5 +420,5 @@
           <para>
             is an <command>rlogin</command>/<command>rsh</command>-like client
-            program except it uses an encrypted protocol
+            program except it uses an encrypted protocol.
           </para>
           <indexterm zone="openssh ssh">
@@ -467,5 +432,5 @@
         <listitem>
           <para>
-            is a daemon that listens for <command>ssh</command> login requests
+            is a daemon that listens for <command>ssh</command> login requests.
           </para>
           <indexterm zone="openssh sshd">
@@ -479,5 +444,5 @@
         <listitem>
           <para>
-            is a tool which adds keys to the <command>ssh-agent</command>
+            is a tool which adds keys to the <command>ssh-agent</command>.
           </para>
           <indexterm zone="openssh ssh-add">
@@ -491,5 +456,5 @@
         <listitem>
           <para>
-            is an authentication agent that can store private keys
+            is an authentication agent that can store private keys.
           </para>
           <indexterm zone="openssh ssh-agent">
@@ -503,5 +468,5 @@
         <listitem>
           <para>
-            is a script that enables logins on remote machines using local keys
+            is a script that enables logins on remote machine using local keys.
           </para>
           <indexterm zone="openssh ssh-copy-id">
@@ -515,5 +480,5 @@
         <listitem>
           <para>
-            is a key generation tool
+            is a key generation tool.
           </para>
           <indexterm zone="openssh ssh-keygen">
@@ -527,5 +492,5 @@
         <listitem>
           <para>
-            is a utility for gathering public host keys from a number of hosts
+            is a utility for gathering public host keys from a number of hosts.
           </para>
           <indexterm zone="openssh ssh-keyscan">
@@ -537,4 +502,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: postlfs/security/p11-kit.xml
===================================================================
--- postlfs/security/p11-kit.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/p11-kit.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY p11-kit-download-http "https://github.com/p11-glue/p11-kit/releases/download/&p11-kit-version;/p11-kit-&p11-kit-version;.tar.xz">
   <!ENTITY p11-kit-download-ftp  " ">
-  <!ENTITY p11-kit-md5sum        "8ccf11c4a2e2e505b8e516d8549e64a5">
-  <!ENTITY p11-kit-size          "816 KB">
-  <!ENTITY p11-kit-buildsize     "56 MB (with tests)">
+  <!ENTITY p11-kit-md5sum        "03f93a4eb62127b5d40e345c624a0665">
+  <!ENTITY p11-kit-size          "812 KB">
+  <!ENTITY p11-kit-buildsize     "47 MB (add 169 MB for tests)">
   <!ENTITY p11-kit-time          "0.2 SBU (add 0.6 SBU for tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -104,6 +105,6 @@
 /usr/libexec/make-ca/copy-trust-modifications
 
-# Update trust stores
-/usr/sbin/make-ca -r</literal>
+# Generate a new trust store
+/usr/sbin/make-ca -f -g</literal>
 EOF</userinput></screen>
 
@@ -113,14 +114,13 @@
     </para>
 
-<screen><userinput>mkdir p11-build &amp;&amp;
-cd    p11-build &amp;&amp;
-
-meson --prefix=/usr       \
-      --buildtype=release \
-      -Dtrust_paths=/etc/pki/anchors &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>. 
+<screen><userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --with-trust-paths=/etc/pki/anchors &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>. 
+      Many tests will fail if the test suite is run as the
+      <systemitem class="username"> root</systemitem> user.
     </para>
 
@@ -129,5 +129,5 @@
     </para>
 
-<screen role="root"><userinput>ninja install &amp;&amp;
+<screen role="root"><userinput>make install &amp;&amp;
 ln -sfv /usr/libexec/p11-kit/trust-extract-compat \
         /usr/bin/update-ca-certificates</userinput></screen>
@@ -138,14 +138,11 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dtrust_paths=/etc/pki/anchors</parameter>: this switch
+    <para>
+      <parameter>--with-trust-paths=/etc/pki/anchors</parameter>: this switch
       sets the location of trusted certificates used by libp11-kit.so.
     </para>
 
     <para>
-      <option>-Dhash_impl=freebl</option>: Use this switch if you want to
+      <option>--with-hash-impl=freebl</option>: Use this switch if you want to
       use the Freebl library from <application>NSS</application> for SHA1 and
       MD5 hashing.
@@ -153,5 +150,5 @@
 
     <para>
-      <option>-Dgtk_doc=true</option>: Use this switch if you have installed
+      <option>--enable-doc</option>: Use this switch if you have installed
       <xref linkend="gtk-doc"/> and <xref linkend="libxslt"/> and wish to
       rebuild the documentation and generate manual pages.
@@ -214,5 +211,5 @@
           <para>
             is a command line tool that can be used to perform operations
-            on PKCS#11 modules configured on the system
+            on PKCS#11 modules configured on the system.
           </para>
           <indexterm zone="p11-kit p11-kit-prog">
@@ -227,5 +224,5 @@
           <para>
             is a command line tool to examine and modify the shared trust
-            policy store
+            policy store.
           </para>
           <indexterm zone="p11-kit trust">
@@ -244,5 +241,5 @@
             the <parameter>--force</parameter> and <parameter>--get</parameter>
             flags to <command>make-ca</command> and should likely not be used
-            for automated updates
+            for automated updates.
           </para>
           <indexterm zone="p11-kit update-ca-certificates">
@@ -257,5 +254,5 @@
           <para>
             contains functions used to coordinate initialization and
-            finalization of any PKCS#11 module
+            finalization of any PKCS#11 module.
           </para>
           <indexterm zone="p11-kit libp11-kit">
@@ -269,5 +266,5 @@
         <listitem>
           <para>
-            is the PKCS#11 proxy module
+            is the PKCS#11 proxy module.
           </para>
           <indexterm zone="p11-kit p11-kit-proxy">
Index: postlfs/security/polkit-gnome.xml
===================================================================
--- postlfs/security/polkit-gnome.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/polkit-gnome.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -73,21 +74,9 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/polkit-gnome-&polkit-gnome-version;-consolidated_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">Polkit GNOME Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <!-- due to the patch -->
-      <xref linkend="accountsservice"/>,
-      <xref linkend="gtk3"/>, and
+      <xref linkend="gtk3"/> and
       <xref linkend="polkit"/>
     </para>
@@ -100,11 +89,4 @@
   <sect2 role="installation">
     <title>Installation of Polkit GNOME</title>
-
-    <para>
-      First, apply some fixes that allow for the proper user icon to be used,
-      as well as some security fixes:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../polkit-gnome-&polkit-gnome-version;-consolidated_fixes-1.patch</userinput></screen>
 
     <para>
@@ -197,8 +179,9 @@
         <listitem>
           <para>
-            is the <application>Polkit</application> authentication agent
+            is the <application>Polkit</application> authentication agent.
           </para>
           <indexterm zone="polkit-gnome polkit-gnome-authentication-agent-1">
-            <primary sortas="b-polkit-gnome-authentication-agent-1">polkit-gnome-authentication-agent-1</primary>
+            <primary
+            sortas="b-polkit-gnome-authentication-agent-1">polkit-gnome-authentication-agent-1</primary>
           </indexterm>
         </listitem>
Index: postlfs/security/polkit.xml
===================================================================
--- postlfs/security/polkit.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/polkit.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY polkit-download-http "https://www.freedesktop.org/software/polkit/releases/polkit-&polkit-version;.tar.gz">
   <!ENTITY polkit-download-ftp  " ">
-  <!ENTITY polkit-md5sum        "b945e683eb5d633745864af6c5746726">
-  <!ENTITY polkit-size          "1.3 MB">
-  <!ENTITY polkit-buildsize     "23 MB (add 2 MB for tests)">
-  <!ENTITY polkit-time          "0.2 SBU (Using parallelism=4; add 0.3 SBU for tests)">
+  <!ENTITY polkit-md5sum        "ae3f2a742740069922589ad20ffd54d2">
+  <!ENTITY polkit-size          "1.5 MB">
+  <!ENTITY polkit-buildsize     "17 MB (add 2 MB for tests)">
+  <!ENTITY polkit-time          "0.1 SBU (Using parallelism=4; add 0.3 SBU for tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -93,7 +94,5 @@
     <para role="recommended">
       <xref linkend="linux-pam"/>
-      <phrase revision="sysv">
-        and <xref role="first" linkend="elogind"/> 
-      </phrase>
+      <phrase revision="sysv">and <xref linkend="elogind"/></phrase>
     </para>
 
@@ -197,5 +196,5 @@
 
 <screen revision="sysv"><userinput>patch -Np1 -i ../polkit-&polkit-version;-fix_elogind_detection-1.patch &amp;&amp;
-autoreconf -fv</userinput></screen>
+autoreconf -fi</userinput></screen>
 
     <para>
@@ -331,5 +330,5 @@
         <listitem>
           <para>
-            is used to obtain information about registered PolicyKit actions
+            is used to obtain information about registered PolicyKit actions.
           </para>
           <indexterm zone="polkit pkaction">
@@ -343,5 +342,5 @@
         <listitem>
           <para>
-            is used to check whether a process is authorized for action
+            is used to check whether a process is authorized for action.
           </para>
           <indexterm zone="polkit pkcheck">
@@ -356,5 +355,5 @@
           <para>
             is an example program to test the <command>pkexec</command>
-            command
+            command.
           </para>
           <indexterm zone="polkit pk-example-frobnicate">
@@ -368,5 +367,5 @@
         <listitem>
           <para>
-            allows an authorized user to execute a command as another user
+            allows an authorized user to execute a command as another user.
           </para>
           <indexterm zone="polkit pkexec">
@@ -380,5 +379,5 @@
         <listitem>
           <para>
-            is used to start a textual authentication agent for the subject
+            is used to start a textual authentication agent for the subject.
           </para>
           <indexterm zone="polkit pkttyagent">
@@ -393,5 +392,5 @@
           <para>
             provides the org.freedesktop.PolicyKit1 <application>D-Bus</application>
-            service on the system message bus
+            service on the system message bus.
           </para>
           <indexterm zone="polkit polkitd">
@@ -402,9 +401,9 @@
 
       <varlistentry id="libpolkit-agent-1">
-        <term><filename class="libraryfile">libpolkit-agent-1.so</filename></term>
+        <term><filename class='libraryfile'>libpolkit-agent-1.so</filename></term>
         <listitem>
           <para>
             contains the <application>Polkit</application> authentication
-            agent API functions
+            agent API functions.
           </para>
           <indexterm zone="polkit libpolkit-agent-1">
@@ -415,8 +414,8 @@
 
       <varlistentry id="libpolkit-gobject-1">
-        <term><filename class="libraryfile">libpolkit-gobject-1.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Polkit</application> authorization API functions
+        <term><filename class='libraryfile'>libpolkit-gobject-1.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Polkit</application> authorization API functions.
           </para>
           <indexterm zone="polkit libpolkit-gobject-1">
Index: postlfs/security/security.xml
===================================================================
--- postlfs/security/security.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/security.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="postlfs-security">
Index: postlfs/security/shadow.xml
===================================================================
--- postlfs/security/shadow.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/shadow.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY shadow-download-http "https://github.com/shadow-maint/shadow/releases/download/v&shadow-version;/shadow-&shadow-version;.tar.xz">
+  <!ENTITY shadow-download-http "https://github.com/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz">
   <!ENTITY shadow-download-ftp  " ">
-  <!ENTITY shadow-md5sum        "126924090caf72f3de7e9261fd4e10ac">
-  <!ENTITY shadow-size          "1.6 MB">
-  <!ENTITY shadow-buildsize     "40 MB">
-  <!ENTITY shadow-time          "0.3 SBU">
+  <!ENTITY shadow-md5sum        "4b05eff8a427cf50e615bda324b5bc45">
+  <!ENTITY shadow-size          "1.5 MB">
+  <!ENTITY shadow-buildsize     "33 MB">
+  <!ENTITY shadow-time          "0.2 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -41,5 +42,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -118,10 +119,5 @@
     </para>
 
-<screen><userinput>sed -i.orig '/$(LIBTCB)/i $(LIBPAM) \\' libsubid/Makefile.am &amp;&amp;
-sed -i "224s/rounds/min_rounds/"        libmisc/salt.c       &amp;&amp;
-
-autoreconf -fiv &amp;&amp;
-
-sed -i 's/groups$(EXEEXT) //' src/Makefile.in &amp;&amp;
+<screen><userinput>sed -i 's/groups$(EXEEXT) //' src/Makefile.in &amp;&amp;
 
 find man -name Makefile.in -exec sed -i 's/groups\.1 / /'   {} \; &amp;&amp;
@@ -131,6 +127,7 @@
 sed -e 's@#ENCRYPT_METHOD DES@ENCRYPT_METHOD SHA512@' \
     -e 's@/var/spool/mail@/var/mail@'                 \
-    -e '/PATH=/{s@/sbin:@@;s@/bin:@@}'                \
     -i etc/login.defs                                 &amp;&amp;
+
+sed -i 's/1000/999/' etc/useradd                      &amp;&amp;
 
 ./configure --sysconfdir=/etc --with-group-name-max-length=32 &amp;&amp;
@@ -145,5 +142,5 @@
     </para>
 
-<screen role="root"><userinput>make exec_prefix=/usr install</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
        
   </sect2>
@@ -168,6 +165,5 @@
     <para>
       <command>sed -e 's@#ENCRYPT_METHOD DES@ENCRYPT_METHOD SHA512@' -e
-      's@/var/spool/mail@/var/mail@' -e '/PATH=/{s@/sbin:@@;s@/bin:@@}' 
-      -i etc/login.defs</command>: Instead of using
+      's@/var/spool/mail@/var/mail@' -i etc/login.defs</command>: Instead of using
       the default 'DES' method, this command modifies the installation to use
       the more secure 'SHA512' method of hashing passwords, which also allows
@@ -175,12 +171,10 @@
       <filename class="directory">/var/spool/mail</filename> location for user
       mailboxes that <application>Shadow</application> uses by default to the
-      <filename class="directory">/var/mail</filename> location. It also
-      changes the default path to be consistent with that set in LFS.
-    </para>
-
-    <para>
-      <command>sed ... libmisc/salt.c</command> and 
-      <command>sed ... libsubid/Makefile.am</command>: Fix a couple of errors
-      that were found after the package was released.
+      <filename class="directory">/var/mail</filename> location.
+    </para>
+
+    <para>
+      <command>sed -i 's/1000/999/' etc/useradd</command>: Make a minor change
+      to make the default useradd consistent with the LFS groups file.
     </para>
 
Index: postlfs/security/ssh-askpass.xml
===================================================================
--- postlfs/security/ssh-askpass.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/ssh-askpass.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,10 +6,10 @@
 
   <!ENTITY ssh-askpass-download-http
-    "https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-&ssh-askpass-version;.tar.gz">
+    "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-&ssh-askpass-version;.tar.gz">
   <!ENTITY ssh-askpass-download-ftp
     "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-&ssh-askpass-version;.tar.gz">
-  <!ENTITY ssh-askpass-md5sum        "f545230799f131aecca04da56e61990a">
+  <!ENTITY ssh-askpass-md5sum        "8f897870404c088e4aa7d1c1c58b526b">
   <!ENTITY ssh-askpass-size          "1.7 MB">
-  <!ENTITY ssh-askpass-buildsize     "9.8 MB">
+  <!ENTITY ssh-askpass-buildsize     "9.4 MB">
   <!ENTITY ssh-askpass-time          "less than 0.1 SBU">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     <application>OpenSSH</application> tarball.</para>
 
-  &lfs110a_checked;
+  &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -105,7 +106,9 @@
     </para>
 
-<screen role="root"><userinput>install -v -d -m755                    /usr/libexec/openssh/contrib  &amp;&amp;
-install -v -m755    gnome-ssh-askpass2 /usr/libexec/openssh/contrib  &amp;&amp;
-ln -sv -f contrib/gnome-ssh-askpass2   /usr/libexec/openssh/ssh-askpass</userinput></screen>
+<screen role="root"><userinput>install -v -d -m755 /usr/libexec/openssh/contrib  &amp;&amp;
+install -v -m755    gnome-ssh-askpass2 \
+                    /usr/libexec/openssh/contrib  &amp;&amp;
+ln -sv -f contrib/gnome-ssh-askpass2 \
+                    /usr/libexec/openssh/ssh-askpass</userinput></screen>
 
     <para>
Index: postlfs/security/stunnel.xml
===================================================================
--- postlfs/security/stunnel.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/stunnel.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,8 +10,8 @@
   <!-- Following ftp only has later release -->
 <!--   "ftp://ftp.stunnel.org/stunnel/stunnel-&stunnel-version;.tar.gz"> -->
-  <!ENTITY stunnel-md5sum        "d68ef1c93a1e44df9455e1185d7b7742">
+  <!ENTITY stunnel-md5sum        "6bbe921f8d2ab4967dc7ff42f6e5d45a">
   <!ENTITY stunnel-size          "964 KB">
-  <!ENTITY stunnel-buildsize     "7.2 MB">
-  <!ENTITY stunnel-time          "0.1 SBU">
+  <!ENTITY stunnel-buildsize     "7.3 MB">
+  <!ENTITY stunnel-time          "less than 0.1 SBU">
 ]>
 
@@ -20,4 +20,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -44,5 +45,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -139,5 +140,4 @@
     </para>
 
-<!-- Not needed, we're 10+ versions ahead of this now
     <note>
       <para>
@@ -155,5 +155,4 @@
       </para>
     </note>
--->
 
 <screen revision="sysv"><userinput>./configure --prefix=/usr        \
@@ -184,5 +183,5 @@
     </para>
 
-<screen role="root" revision="systemd"><userinput>install -v -m644 tools/stunnel.service /usr/lib/systemd/system</userinput></screen>
+<screen role="root" revision="systemd"><userinput>install -v -m644 tools/stunnel.service /lib/systemd/system</userinput></screen>
 
     <para>
@@ -261,5 +260,5 @@
       </para>
 
-<screen role="root"><userinput>cat &gt; /etc/stunnel/stunnel.conf &lt;&lt; "EOF" 
+<screen role="root"><userinput>cat &gt;/etc/stunnel/stunnel.conf &lt;&lt; "EOF" 
 <literal>; File: /etc/stunnel/stunnel.conf
 
@@ -374,5 +373,5 @@
             is a program designed to work as an SSL
             encryption wrapper between remote clients and local
-            (<command>{x}inetd</command>-startable) or remote servers
+            (<command>{x}inetd</command>-startable) or remote servers.
           </para>
           <indexterm zone="stunnel stunnel-prog">
@@ -388,5 +387,5 @@
             is a <application>Perl</application> wrapper script to use
             <command>stunnel</command> 3.x syntax with
-            <command>stunnel</command> 4.05 or later
+            <command>stunnel</command> 4.05 or later.
           </para>
           <indexterm zone="stunnel stunnel3">
@@ -397,9 +396,9 @@
 
       <varlistentry id="libstunnel">
-        <term><filename class="libraryfile">libstunnel.so</filename></term>
+        <term><filename class='libraryfile'>libstunnel.so</filename></term>
         <listitem>
           <para>
             contains the API functions required by
-            <application>stunnel</application>
+            <application>stunnel</application>.
           </para>
           <indexterm zone="stunnel libstunnel">
Index: postlfs/security/sudo.xml
===================================================================
--- postlfs/security/sudo.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/sudo.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY sudo-download-http "https://www.sudo.ws/dist/sudo-&sudo-version;.tar.gz">
+  <!ENTITY sudo-download-http "http://www.sudo.ws/dist/sudo-&sudo-version;.tar.gz">
   <!ENTITY sudo-download-ftp  "ftp://ftp.sudo.ws/pub/sudo/sudo-&sudo-version;.tar.gz">
-  <!ENTITY sudo-md5sum        "d6f8217bfd16649236e100c49e0a7cc4">
-  <!ENTITY sudo-size          "4.0 MB">
-  <!ENTITY sudo-buildsize     "43 MB (add 13 MB for tests)">
+  <!ENTITY sudo-md5sum        "d7fab0f99b9b2fd38df90b0788fc8dc9">
+  <!ENTITY sudo-size          "3.8 MB">
+  <!ENTITY sudo-buildsize     "41 MB (add 9 MB for tests)">
   <!ENTITY sudo-time          "0.4 SBU (add 0.1 SBU for tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -110,6 +111,6 @@
     <para>
       To test the results, issue: <command>env LC_ALL=C make check 2&gt;&amp;1
-      | tee make-check.log</command>. Check the results with <command>grep
-      failed make-check.log</command>. 
+      | tee ../make-check.log</command>. Check the results with <command>grep
+      failed ../make-check.log</command>. 
     </para>
 
@@ -208,5 +209,5 @@
 
       <para>
-        A couple of common configuration changes are to set the path for the
+        A couple of common configuration chanes are to set the path for the
         super user and to allow members of the wheel group to execute all
         commands after providing their own credientials. Use the following
@@ -217,5 +218,5 @@
 
 <screen role="root"><userinput>cat &gt; /etc/sudoers.d/sudo &lt;&lt; "EOF"
-<literal>Defaults secure_path="/usr/sbin:/usr/bin"
+<literal>Defaults secure_path="/usr/bin:/bin:/usr/sbin:/sbin"
 %wheel ALL=(ALL) ALL</literal>
 EOF</userinput></screen>
@@ -305,5 +306,5 @@
         <listitem>
           <para>
-            converts between sudoers file formats
+            converts between sudoers file formats.
           </para>
           <indexterm zone="sudo cvtsudoers">
@@ -318,5 +319,5 @@
           <para>
             executes a command as another user as permitted by
-            the <filename>/etc/sudoers</filename> configuration file
+            the <filename>/etc/sudoers</filename> configuration file.
           </para>
           <indexterm zone="sudo sudo">
@@ -330,5 +331,5 @@
         <listitem>
           <para>
-            is a sudo event and I/O log server
+            is a sudo event and I/O log server.
           </para>
           <indexterm zone="sudo sudo_logsrvd">
@@ -342,5 +343,5 @@
         <listitem>
           <para>
-            sends sudo I/O logs to the log server
+            sends sudo I/O log to the log server.
           </para>
           <indexterm zone="sudo sudo_sendlog">
@@ -355,5 +356,5 @@
           <para>
             is a symlink to <command>sudo</command> that implies the
-            <option>-e</option> option to invoke an editor as another user
+            <option>-e</option> option to invoke an editor as another user.
           </para>
           <indexterm zone="sudo sudoedit">
@@ -368,5 +369,5 @@
           <para>
             is used to play back or list the output
-            logs created by <command>sudo</command>
+            logs created by <command>sudo</command>.
           </para>
           <indexterm zone="sudo sudoreplay">
@@ -381,5 +382,5 @@
           <para>
             allows for safer editing of the <filename>sudoers</filename>
-            file
+            file.
           </para>
           <indexterm zone="sudo visudo">
Index: postlfs/security/syslog.xml
===================================================================
--- postlfs/security/syslog.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/syslog.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -2,4 +2,5 @@
   <?dbhtml filename="syslog.html"?>
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: postlfs/security/tripwire.xml
===================================================================
--- postlfs/security/tripwire.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/tripwire.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -109,5 +110,5 @@
 
 ./configure --prefix=/usr --sysconfdir=/etc/tripwire       &amp;&amp;
-make CPPFLAGS=-std=c++11</userinput></screen>
+make</userinput></screen>
 
     <note>
@@ -172,10 +173,4 @@
       <command>autoreconf -fi</command>: The build system is unusable as is, and
       has to be modified for the build to succeed.
-    </para>
-
-    <para>
-      <option>CPPFLAGS=-std=c++11</option>: Setting the C++ preprocessor
-      flags to version 11 is necessary to prevent a confict with the 
-      default version which is c++17 in recent version of gcc.
     </para>
 
@@ -363,5 +358,5 @@
           <para>
             is a signature gathering utility that displays
-            the hash function values for the specified files
+            the hash function values for the specified files.
           </para>
           <indexterm zone="tripwire siggen">
@@ -375,5 +370,5 @@
         <listitem>
           <para>
-            is the main file integrity checking program
+            is the main file integrity checking program.
           </para>
           <indexterm zone="tripwire tripwire">
@@ -390,5 +385,5 @@
             certain administrative functions related to
             <application>Tripwire</application> files and configuration
-            options
+            options.
           </para>
           <indexterm zone="tripwire twadmin">
@@ -403,5 +398,5 @@
           <para>
             prints <application>Tripwire</application>
-            database and report files in clear text format
+            database and report files in clear text format.
           </para>
           <indexterm zone="tripwire twprint">
Index: postlfs/security/volume_key.xml
===================================================================
--- postlfs/security/volume_key.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/volume_key.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,5 +17,6 @@
 
   <sect1info>
-    <date>$Date$</date>
+    <othername>$LastChangedBy: fernando $</othername>
+    <date>$Date: 2015-09-25 08:48:24 -0500 (Fri, 25 Sep 2015) $</date>
   </sect1info>
 
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -85,10 +86,10 @@
       <xref linkend="swig"/>
     </para>
-<!-- We prevent using Python2, so do not advertise it
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="python2"/>
     </para>
--->
+
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/volume_key"/>
@@ -174,5 +175,5 @@
         <listitem>
           <para>
-            manages encrypted volume keys and passphrases
+            manages encrypted volume keys and passphrases.
           </para>
           <indexterm zone="volume_key volume_key-prog">
@@ -186,5 +187,5 @@
         <listitem>
           <para>
-            contains API functions for managing encrypted volume keys
+            contains API functions for managing encrypted volume keys.
           </para>
           <indexterm zone="volume_key volume_key-lib">
Index: postlfs/security/vulnerabilities.xml
===================================================================
--- postlfs/security/vulnerabilities.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/security/vulnerabilities.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -64,13 +65,4 @@
 
     <para>
-      The editors now issue Security Advisories for packages in BLFS (and LFS),
-      which can be found at <ulink
-      url="https://www.linuxfromscratch.org/blfs/advisories/">BLFS Security
-      Advisories</ulink>, and grade the severity according to what upstream
-      reports, or to what is shown at <ulink
-      url="https://nvd.nist.gov/">nvd.nist.gov</ulink> if that has details.
-    </para>
-
-    <para>
       To keep track of what is being discovered, you may wish to follow the
       security announcements of one or more distributions. For example, Debian
Index: postlfs/shells/dash.xml
===================================================================
--- postlfs/shells/dash.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/shells/dash.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY dash-download-http "http://gondor.apana.org.au/~herbert/dash/files/dash-&dash-version;.tar.gz">
   <!ENTITY dash-download-ftp  " ">
-  <!ENTITY dash-md5sum        "39d6fb8ab465be82a2276060bc3759d3">
-  <!ENTITY dash-size          "236 KB">
-  <!ENTITY dash-buildsize     "2.7 MB">
+  <!ENTITY dash-md5sum        "c7016b513f701d88c70b3082eb183581">
+  <!ENTITY dash-size          "240 KB">
+  <!ENTITY dash-buildsize     "3.7 MB">
   <!ENTITY dash-time          "less than 0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -205,5 +206,5 @@
         <listitem>
           <para>
-            is a POSIX compliant shell
+            is a POSIX compliant shell.
           </para>
           <indexterm zone="dash dash-prog">
Index: postlfs/shells/shells.xml
===================================================================
--- postlfs/shells/shells.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/shells/shells.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="postlfs-shells">
Index: postlfs/shells/tcsh.xml
===================================================================
--- postlfs/shells/tcsh.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/shells/tcsh.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -12,7 +12,7 @@
   <!ENTITY tcsh-download-http " ">
   <!ENTITY tcsh-download-ftp  "ftp://ftp.astron.com/pub/tcsh/tcsh-&tcsh-version;.tar.gz">
-  <!ENTITY tcsh-md5sum        "fa2b347fa9ae866eb036e6e4bb85fe1a">
+  <!ENTITY tcsh-md5sum        "c9387b7c8cf958956e75b1fa4e59b612">
   <!ENTITY tcsh-size          "992 KB">
-  <!ENTITY tcsh-buildsize     "12 MB (with tests)">
+  <!ENTITY tcsh-buildsize     "15 MB (with tests)">
   <!ENTITY tcsh-time          "0.2 SBU (with tests)">
 ]>
@@ -22,4 +22,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -43,5 +44,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -289,5 +290,5 @@
             is an enhanced but completely compatible version of the
             Berkeley Unix C shell, <command>csh</command>. It is usable as
-            both an interactive shell and a script processor
+            both an interactive shell and a script processor.
           </para>
           <indexterm zone="tcsh tcsh-prog">
Index: postlfs/shells/zsh.xml
===================================================================
--- postlfs/shells/zsh.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/shells/zsh.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY zsh-download-http "https://www.zsh.org/pub/zsh-&zsh-version;.tar.xz">
+  <!ENTITY zsh-download-http "http://www.zsh.org/pub/zsh-&zsh-version;.tar.xz">
   <!ENTITY zsh-download-ftp  " ">
   <!ENTITY zsh-md5sum        "e02a5428620b3dd268800c7843b3dd4d">
@@ -20,4 +20,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -81,5 +82,5 @@
         <para>
           Optional Documentation: <ulink
-          url="https://www.zsh.org/pub/zsh-&zsh-version;-doc.tar.xz"/>
+          url="http://www.zsh.org/pub/zsh-&zsh-version;-doc.tar.xz"/>
         </para>
       </listitem>
@@ -100,5 +101,5 @@
         When there is a new <application>zsh</application> release, the old
         files shown above are moved to a new server directory:
-        <ulink url="https://www.zsh.org/pub/old/"/>.
+        <ulink url="http://www.zsh.org/pub/old/"/>.
       </para>
     </note>
@@ -142,4 +143,5 @@
 
 <screen><userinput>./configure --prefix=/usr         \
+            --bindir=/bin         \
             --sysconfdir=/etc/zsh \
             --enable-etcdir=/etc/zsh                  &amp;&amp;
@@ -207,4 +209,9 @@
 
     <para>
+      <parameter>--bindir=/bin</parameter>: This parameter places the
+      <command>zsh</command> binaries into the root filesystem.
+    </para>
+
+    <para>
       <option>--enable-cap</option>: This option enables
       POSIX capabilities.
@@ -221,4 +228,39 @@
       builtins.
     </para>
+
+    <sect3 id="mountpoints">
+      <title>Multiple partitions</title>
+
+      <para>
+        Linking <application>zsh</application> dynamically against
+        <application>pcre</application> and/or <application>gdbm</application>
+        produces runtime dependencies on <filename class='libraryfile'>
+        libpcre.so</filename> and/or <filename class='libraryfile'>libgdbm.so
+        </filename>respectively, which both reside in
+        <filename class='directory'>/usr</filename> hierarchy. If
+        <filename class='directory'>/usr</filename> is a separate mount point
+        and <application>zsh</application> needs to be available in boot time,
+        then its supporting libraries should be in
+        <filename class='directory'>/lib</filename> too. You can move the
+        libraries as follows:
+      </para>
+
+<screen role="root"><userinput>mv -v /usr/lib/libpcre.so.* /lib &amp;&amp;
+ln -v -sf ../../lib/libpcre.so.0 /usr/lib/libpcre.so
+
+mv -v /usr/lib/libgdbm.so.* /lib &amp;&amp;
+ln -v -sf ../../lib/libgdbm.so.3 /usr/lib/libgdbm.so</userinput>
+</screen>
+
+      <para>
+        Alternatively you can statically link <application>zsh</application>
+        against <application>pcre</application> and
+        <application>gdbm</application> if you modify the
+        <filename>config.modules</filename> file (you need first to run
+        configure to generate it).
+      </para>
+
+    </sect3>
+
   </sect2>
 
@@ -329,5 +371,5 @@
             is a shell which has command-line editing, built-in spelling
             correction, programmable command completion, shell functions (with
-            autoloading), a history mechanism, and a host of other features
+            autoloading), a history mechanism, and a host of other features.
           </para>
           <indexterm zone="zsh zsh-prog">
Index: postlfs/virtualization/qemu.xml
===================================================================
--- postlfs/virtualization/qemu.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/virtualization/qemu.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY qemu-download-http "https://download.qemu-project.org/qemu-&qemu-version;.tar.xz">
+  <!ENTITY qemu-download-http "http://download.qemu-project.org/qemu-&qemu-version;.tar.xz">
   <!ENTITY qemu-download-ftp  " ">
-  <!ENTITY qemu-md5sum        "47f776c276a24f42108ba512a2aa3013">
-  <!ENTITY qemu-size          "106 MB">
-  <!ENTITY qemu-buildsize     "1.9 GB">
-  <!ENTITY qemu-time          "1.2 SBU (using parallelism=4; add 0.3 SBU for tests)">
+  <!ENTITY qemu-md5sum        "179f86928835da857c237b42f4b2df73">
+  <!ENTITY qemu-size          "102 MB">
+  <!ENTITY qemu-buildsize     "1.7 GB">
+  <!ENTITY qemu-time          "0.9 SBU (using parallelism=4; add 0.3 SBU for tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -105,11 +106,5 @@
       <xref role="nodep" linkend="vte"/> or <xref linkend="vte2"/>, and
 <!-- libcacard has been a standalone project since qemu-2.5.-->
-      <ulink url="https://gitlab.freedesktop.org/spice/libcacard">libcacard</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional dependencies for installing the documentation</bridgehead>
-    <para role="optional">
-      <ulink url="https://www.sphinx-doc.org/en/master/index.html">sphinx</ulink> with the
-      <ulink url="https://pypi.org/project/sphinx-rtd-theme/">sphinx-rtd-theme</ulink> theme
+      <ulink url="https://www.spice-space.org/page/Libcacard">libcacard</ulink>
     </para>
 
@@ -228,5 +223,4 @@
 ../configure --prefix=/usr               \
              --sysconfdir=/etc           \
-             --localstatedir=/var        \
              --target-list=$QEMU_ARCH    \
              --audio-drv-list=alsa       \
@@ -350,5 +344,5 @@
 
     <para>
-      The virtual disk size and filename should be adjusted as desired. The
+      The virtual disk size and filename should be ajusted as desired. The
       actual size of the file will be less than specified, but will expand as
       needed, so it is safe to put a high value.
@@ -396,5 +390,5 @@
      -net nic,netdev=net0            \
      -netdev user,id=net0            \
-     -device ac97                    \
+     -soundhw ac97                   \
      -vga std                        \
      -serial mon:stdio               \
@@ -519,5 +513,5 @@
     <bridgehead renderas="sect3">Networking</bridgehead>
     <para>
-      The below solution for networking allows the guest to access the local
+      The above solution for networking allows the guest to access the local
       network through the host (and possibly to access internet through the
       local routers), but the converse is not true. Not even the host can
@@ -582,20 +576,18 @@
       <seglistitem>
         <seg>
-          elf2dmp,
+          ivshmem-client,
+          ivshmem-server,
           qemu (symlink),
-          qemu-edid,
           qemu-ga,
           qemu-img,
           qemu-io,
-          qemu-keymap,
           qemu-nbd,
-          qemu-pr-helper,
-          qemu-storage-daemon, and
-          qemu-system-&lt;arch&gt;
+          qemu-system-&lt;arch&gt;, and
+          virtfs-proxy-helper
         </seg>
         <seg>None</seg>
         <seg>
           /usr/share/qemu and
-          /usr/share/doc/qemu-&qemu-version; (optional)
+          /usr/share/doc/qemu-&qemu-version;
         </seg>
       </seglistitem>
@@ -607,21 +599,9 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="elf2dmp">
-        <term><command>elf2dmp</command></term>
-        <listitem>
-          <para>
-            Converts files from elf to dmp format
-          </para>
-          <indexterm zone="qemu elf2dmp">
-            <primary sortas="b-elf2dmp">elf2dmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!--
       <varlistentry id="ivshmem-client">
         <term><command>ivshmem-client</command></term>
         <listitem>
           <para>
-            is a standalone client for using the ivshmem device
+            is a standalone client for using the ivshmem device.
           </para>
           <indexterm zone="qemu ivshmem-client">
@@ -635,5 +615,5 @@
         <listitem>
           <para>
-            is an example server for the ivshmem device
+            is an example server for the ivshmem device.
           </para>
           <indexterm zone="qemu ivshmem-server">
@@ -642,10 +622,10 @@
         </listitem>
       </varlistentry>
--->
+
       <varlistentry id="qemu-edid">
         <term><command>qemu-edid</command></term>
         <listitem>
           <para>
-            is a test tool for the qemu EDID generator
+            is a test tool for the qemu EDID generator.
           </para>
           <indexterm zone="qemu qemu-edid">
@@ -661,5 +641,5 @@
             implements support for QMP (QEMU Monitor Protocol) commands and
             events that terminate and originate respectively within the guest
-            using an agent built as part of QEMU
+            using an agent built as part of QEMU.
           </para>
           <indexterm zone="qemu qemu-ga">
@@ -673,5 +653,5 @@
         <listitem>
           <para>
-            provides commands to manage QEMU disk images
+            provides commands to manage QEMU disk images.
           </para>
           <indexterm zone="qemu qemu-img">
@@ -686,5 +666,5 @@
           <para>
             is a diagnostic and manipulation program for (virtual) memory
-            media. It is still at an early stage of development
+            media.  It is still at an early stage of development.
           </para>
           <indexterm zone="qemu qemu-io">
@@ -694,18 +674,4 @@
       </varlistentry>
 
-      <varlistentry id="qemu-keymap">
-        <term><command>qemu-keymap</command></term>
-        <listitem>
-          <para>
-            generates qemu reverse keymaps from xkb keymaps,
-            which can be used with the qemu "-k" command line switch
-          </para>
-          <indexterm zone="qemu qemu-keymap">
-            <primary sortas="b-qemu-keymap">qemu-keymap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-
       <varlistentry id="qemu-nbd">
         <term><command>qemu-nbd</command></term>
@@ -713,5 +679,5 @@
           <para>
             exports Qemu disk images using the QEMU Disk Network Block
-            Device (NBD) protocol
+            Device (NBD) protocol.
           </para>
           <indexterm zone="qemu qemu-nbd">
@@ -721,34 +687,9 @@
       </varlistentry>
 
-      <varlistentry id="qemu-pr-helper">
-        <term><command>qemu-pr-helper</command></term>
-        <listitem>
-          <para>
-            Implements the persistent reservation helper for QEMU
-          </para>
-          <indexterm zone="qemu qemu-pr-helper">
-            <primary sortas="b-qemu-pr-helper">qemu-pr-helper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qemu-storage-daemon">
-        <term><command>qemu-storage-daemon</command></term>
-        <listitem>
-          <para>
-            allows to modify disk images using the QEMU Monitor Protocol (QMP)
-            without running a VM
-          </para>
-          <indexterm zone="qemu qemu-storage-daemon">
-            <primary sortas="b-qemu-storage-daemon">qemu-storage-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="qemu-system">
         <term><command>qemu-system-x86_64</command></term>
         <listitem>
           <para>
-            is the QEMU PC System emulator
+            is the QEMU PC System emulator.
           </para>
           <indexterm zone="qemu qemu-system">
@@ -757,13 +698,13 @@
         </listitem>
       </varlistentry>
-<!--
+
       <varlistentry id="virtfs-proxy-helper">
         <term><command>virtfs-proxy-helper</command></term>
         <listitem>
           <para>
-            creates a socket pair or a named socket. QEMU and the proxy helper
-            communicate using this socket. The QEMU proxy fs driver sends
-            filesystem requests to the proxy helper and receives the response
-            from it
+            creates a socket pair or a named socket. QEMU and proxy helper
+            communicate using this socket. QEMU proxy fs driver sends
+            filesystem request to proxy helper and receives the response
+            from it.
           </para>
           <indexterm zone="qemu virtfs-proxy-helper">
@@ -772,5 +713,5 @@
         </listitem>
       </varlistentry>
--->
+
     </variablelist>
 
Index: postlfs/virtualization/virtualization.xml
===================================================================
--- postlfs/virtualization/virtualization.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ postlfs/virtualization/virtualization.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="postlfs-virtualization">
Index: pst/printing/cups-filters.xml
===================================================================
--- pst/printing/cups-filters.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/printing/cups-filters.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,8 +8,8 @@
   "https://www.openprinting.org/download/cups-filters/cups-filters-&cups-filters-version;.tar.xz">
   <!ENTITY cups-filters-download-ftp  " ">
-  <!ENTITY cups-filters-md5sum        "828b8c81534ecb996d6c6b7e1332412f">
+  <!ENTITY cups-filters-md5sum        "87cde9cdd8edd7d7443ec0ed2e61ebd4">
   <!ENTITY cups-filters-size          "1.4 MB">
-  <!ENTITY cups-filters-buildsize     "55 MB (with tests), 17 MB installed">
-  <!ENTITY cups-filters-time          "0.2 SBU (Using parallelism=4; with tests)">
+  <!ENTITY cups-filters-buildsize     "60 MB (with tests), 17 MB installed">
+  <!ENTITY cups-filters-time          "0.4 SBU (with tests)">
 ]>
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -110,5 +111,5 @@
       <xref role="runtime" linkend="gutenprint"/> (for supported printers),
       or other printer drivers, such as <ulink role="runtime"
-      url="https://sourceforge.net/projects/hplip/files/hplip/">hplip</ulink>
+      url="http://sourceforge.net/projects/hplip/files/hplip/">hplip</ulink>
     </para>
 
@@ -121,5 +122,4 @@
     <title>Installation of CUPS Filters</title>
 
-<!--
     <para revision="systemd">
       First, fix the systemd unit file to work with
@@ -128,5 +128,4 @@
 
 <screen revision="systemd"><userinput>sed -i "s:cups.service:org.cups.cupsd.service:g" utils/cups-browsed.service</userinput></screen>
--->
 
     <para>
@@ -295,5 +294,5 @@
           <para>
             is a daemon for browsing the Bonjour and CUPS broadcasts of shared,
-            remote CUPS printers
+            remote CUPS printers.
           </para>
           <indexterm zone="cups-filters cups-browsed">
@@ -307,5 +306,5 @@
         <listitem>
           <para>
-            is a PPD generator utility for driverless printing
+            is a PPD generator utility for driverless printing.
           </para>
           <indexterm zone="cups-filters driverless">
@@ -319,5 +318,5 @@
         <listitem>
           <para>
-            is a wrapper to <command>driverless</command> for FAX type devices
+            is a wrapper to <command>driverless</command> for FAX type devices.
           </para>
           <indexterm zone="cups-filters driverless-fax">
@@ -332,5 +331,5 @@
           <para>
             is a universal print filter/RIP wrapper which can be used as CUPS
-            filter or stand-alone for spooler-less, direct printing
+            filter or stand-alone for spooler-less, direct printing.
           </para>
           <indexterm zone="cups-filters foomatic-rip">
@@ -344,5 +343,5 @@
         <listitem>
           <para>
-            contains <application>CUPS Filters</application> API functions
+            contains <application>CUPS Filters</application> API functions.
           </para>
           <indexterm zone="cups-filters libcupsfilters">
Index: pst/printing/cups.xml
===================================================================
--- pst/printing/cups.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/printing/cups.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,8 +5,8 @@
   %general-entities;
 
-  <!ENTITY cups-download-http "https://github.com/OpenPrinting/cups/releases/download/v&cups-version;/cups-&cups-version;-source.tar.gz">
+  <!ENTITY cups-download-http "https://github.com/apple/cups/releases/download/v&cups-version;/cups-&cups-version;-source.tar.gz">
   <!ENTITY cups-download-ftp  " ">
-  <!ENTITY cups-md5sum        "524266752cf243c968921547b18ee594">
-  <!ENTITY cups-size          "7.6 MB">
+  <!ENTITY cups-md5sum        "412434ceefbdf3ec71bc9188a035f589">
+  <!ENTITY cups-size          "7.8 MB">
   <!ENTITY cups-buildsize     "80 MB (Add 89 MB for tests)">
   <!ENTITY cups-time          "0.5 SBU (Add 0.9 SBU for tests)">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -92,5 +93,4 @@
       <xref linkend="avahi"/>,
       <xref linkend="libpaper"/>,
-      <xref linkend="llvm"/> (with <command>clang</command>),
       <xref linkend="mitkrb"/>,
       <xref linkend="openjdk"/>,
@@ -203,27 +203,12 @@
 
     <para>
-      Upstream perfers <command>clang</command> than <command>gcc</command>,
-      but the building system will try to use a compiler warning option
-      unsupported by <command>clang</command>.  If <command>clang</command> is
-      installed, remove this warning option:
-    </para>
-
-<screen><userinput>sed -e "s/-Wno-format-truncation//" \
-    -i configure \
-    -i config-scripts/cups-compiler.m4</userinput></screen>
-
-    <para>
       Build <application>Cups</application> by running the following commands:
     </para>
 
 
-<!-- This seems to be no longer required with OpenPrinting-cups.
-     Remove this comment when switch to OP is settled.
-
 <screen revision="sysv"><userinput>sed -i '/stat.h/a #include &lt;asm-generic/ioctls.h&gt;' tools/ipptool.c  &amp;&amp;
 
 CC=gcc CXX=g++ \
--->
-<screen revision="sysv"><userinput>./configure --libdir=/usr/lib            \
+./configure --libdir=/usr/lib            \
             --disable-systemd            \
             --with-rcdir=/tmp/cupsinit   \
@@ -232,11 +217,9 @@
 make</userinput></screen>
 
-<!-- same apply here:
-
 <screen revision="systemd"><userinput>sed -i '/stat.h/a #include &lt;asm-generic/ioctls.h&gt;' tools/ipptool.c   &amp;&amp;
 
 CC=gcc CXX=g++ \
--->
-<screen revision="systemd"><userinput>./configure --libdir=/usr/lib            \
+./configure --libdir=/usr/lib            \
+            --with-rcdir=/tmp/cupsinit   \
             --with-system-groups=lpadmin \
             --with-docdir=/usr/share/cups/doc-&cups-version; &amp;&amp;
@@ -246,6 +229,4 @@
       To test the results, issue: <command>LC_ALL=C make -k check</command>. An already
       active graphical session with bus address is necessary to run the tests.
-      Make sure that there is not other instance of <application>Cups</application>
-      running, otherwise at least 4 tests will fail with "address in use".
       <!--One test, <filename>httpAddrGetList</filename>, is known to fail.-->
     </para>
@@ -258,11 +239,6 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
+rm -rf /tmp/cupsinit &amp;&amp;
 ln -svnf ../cups/doc-&cups-version; /usr/share/doc/cups-&cups-version;</userinput></screen>
-
-    <para revision="sysv">
-      Remove the shipped bootscript, which is incompatible with LFS:
-    </para>
-
-<screen role="root" revision="sysv"><userinput>rm -rf /tmp/cupsinit &amp;&amp;</userinput></screen>
 
     <para>
@@ -283,19 +259,13 @@
 
     <para>
-      <command>sed ... configure</command>: This sed removes a compiler
-      option which is no longer supported. Leaving this change out, the
-      compilation will run thru but a warning about an invalid
-      warning option will be emitted on every compiler invocation.
-    </para>
-<!--
-    <para>
       <command>sed ... tools/ipptool.c</command>: This sed fixes a bug caused
       by glibc-2.30 changing the user-space API for sockets.
     </para>
--->
-    <para>
-      <envar>CC=gcc CXX=g++</envar>: Setting them if you prefer to use
-      <command>gcc</command> instead of <command>clang</command>, which is
-      now preferred by the upstream.
+
+    <para>
+      <envar>CC=gcc CXX=g++</envar>: This environment variable ensures that gcc is used,
+      if clang is installed. Remove it, if you prefer to use clang. Using clang
+      almost doubles build time and slightly decreases build disk space.
+      Installed disk space is not appreciably modified.
     </para>
 
@@ -305,5 +275,5 @@
     </para>
 
-    <para revision="sysv">
+    <para>
       <parameter>--with-rcdir=/tmp/cupsinit</parameter>: This switch tells the
       build process to install the shipped bootscript into <filename
@@ -434,5 +404,5 @@
 <screen role="root" revision="sysv"><userinput>make install-cups</userinput></screen>
 
-<screen role="root" revision="systemd"><userinput>systemctl enable cups</userinput></screen>
+<screen role="root" revision="systemd"><userinput>systemctl enable org.cups.cupsd</userinput></screen>
 
     </sect3>
@@ -452,5 +422,5 @@
            <!--accept,--> cancel, cupsaccept, <!--cupsaddsmb,--> cups-config, 
           cupsctl, cupsd, cupsdisable, cupsenable, cupsfilter, cupsreject,
-          <!--cupstestdsc,--> cupstestppd, ippeveprinter,<!-- ippfind--> ipptool, lp,
+          <!--cupstestdsc,--> cupstestppd, ippeveprinter, ippfind, ipptool, lp,
           lpadmin, lpc, lpinfo, lpmove, lpoptions, lpq, lpr, lprm, lpstat, ppdc,
           ppdhtml, ppdi, ppdmerge, and ppdpo <!--and reject-->
@@ -493,5 +463,5 @@
         <listitem>
           <para>
-            cancels existing print jobs from the print queues
+            cancels existing print jobs from the print queues.
           </para>
           <indexterm zone="cups cancel-cups">
@@ -505,5 +475,5 @@
         <listitem>
           <para>
-            accept jobs sent to a destination
+            accept jobs sent to a destination.
           </para>
           <indexterm zone="cups cupsaccept">
@@ -533,5 +503,5 @@
           <para>
             is a <application>Cups</application>
-            program configuration utility
+            program configuration utility.
           </para>
           <indexterm zone="cups cups-config-prog">
@@ -545,5 +515,5 @@
         <listitem>
           <para>
-            updates or queries the cupsd.conf file for a server
+            updates or queries the cupsd.conf file for a server.
           </para>
           <indexterm zone="cups cupsctl">
@@ -557,5 +527,5 @@
         <listitem>
           <para>
-            is the scheduler for the Common Unix Printing System
+            is the scheduler for the Common Unix Printing System.
           </para>
           <indexterm zone="cups cupsd">
@@ -569,5 +539,5 @@
         <listitem>
           <para>
-            stop printers and classes
+            stop printers and classes.
           </para>
           <indexterm zone="cups cupsdisable">
@@ -581,5 +551,5 @@
         <listitem>
           <para>
-            start printers and classes
+            start printers and classes.
           </para>
           <indexterm zone="cups cupsenable">
@@ -595,5 +565,5 @@
             is a front-end to the <application>Cups</application>
             filter subsystem which allows you to convert a file
-            to a specific format
+            to a specific format.
           </para>
           <indexterm zone="cups cupsfilter">
@@ -607,5 +577,5 @@
         <listitem>
           <para>
-            reject jobs sent to a destination
+            reject jobs sent to a destination.
           </para>
           <indexterm zone="cups cupsreject">
@@ -632,5 +602,5 @@
         <listitem>
           <para>
-            tests the conformance of PPD files
+            tests the conformance of PPD files.
           </para>
           <indexterm zone="cups cupstestppd">
@@ -644,5 +614,5 @@
         <listitem>
           <para>
-            is an IPP Everywhere printer for CUPS
+            is an IPP Everywhere printer for CUPS.
           </para>
           <indexterm zone="cups ippeveprinter">
@@ -651,10 +621,10 @@
         </listitem>
       </varlistentry>
-<!--
+
       <varlistentry id="ippfind">
         <term><command>ippfind</command></term>
         <listitem>
           <para>
-            finds internet printing protocol printers
+            finds internet printing protocol printers.
           </para>
           <indexterm zone="cups ippfind">
@@ -663,5 +633,5 @@
         </listitem>
       </varlistentry>
--->
+
       <varlistentry id="ipptool">
         <term><command>ipptool</command></term>
@@ -669,5 +639,5 @@
           <para>
             sends IPP requests to the specified URI and tests
-            and/or displays the results
+            and/or displays the results.
           </para>
           <indexterm zone="cups ipptool">
@@ -681,5 +651,5 @@
         <listitem>
           <para>
-            submits files for printing or alters a pending job
+            submits files for printing or alters a pending job.
           </para>
           <indexterm zone="cups lp-cups">
@@ -694,5 +664,5 @@
           <para>
             configures printer and class queues provided by
-            <application>Cups</application>
+            <application>Cups</application>.
           </para>
           <indexterm zone="cups lpadmin">
@@ -707,5 +677,5 @@
           <para>
             provides limited control over printer and class queues
-            provided by <application>Cups</application>
+            provided by <application>Cups</application>.
           </para>
           <indexterm zone="cups lpc-cups">
@@ -720,5 +690,5 @@
           <para>
             lists the available devices or drivers known to the
-            <application>Cups</application> server
+            <application>Cups</application> server.
           </para>
           <indexterm zone="cups lpinfo">
@@ -732,5 +702,5 @@
         <listitem>
           <para>
-            moves the specified job to a new destination
+            moves the specified job to a new destination.
           </para>
           <indexterm zone="cups lpmove">
@@ -744,5 +714,5 @@
         <listitem>
           <para>
-            displays or sets printer options and defaults
+            displays or sets printer options and defaults.
           </para>
           <indexterm zone="cups lpoptions">
@@ -756,5 +726,5 @@
         <listitem>
           <para>
-            shows the current print queue status on the named printer
+            shows the current print queue status on the named printer.
           </para>
           <indexterm zone="cups lpq-cups">
@@ -768,5 +738,5 @@
         <listitem>
           <para>
-            submits files for printing
+            submits files for printing.
           </para>
           <indexterm zone="cups lpr-cups">
@@ -780,5 +750,5 @@
         <listitem>
           <para>
-            cancels print jobs that have been queued for printing
+            cancels print jobs that have been queued for printing.
           </para>
           <indexterm zone="cups lprm-cups">
@@ -793,5 +763,5 @@
           <para>
             displays status information about the current classes, jobs,
-            and printers
+            and printers.
           </para>
           <indexterm zone="cups lpstat-cups">
@@ -805,5 +775,5 @@
         <listitem>
           <para>
-            compiles PPDC source files into one or more PPD files
+            compiles PPDC source files into one or more PPD files.
           </para>
           <indexterm zone="cups ppdc">
@@ -819,5 +789,5 @@
             reads a driver information file and produces a HTML summary
             page that lists all of the drivers in a file and the
-            supported options
+            supported options.
           </para>
           <indexterm zone="cups ppdhtml">
@@ -831,5 +801,5 @@
         <listitem>
           <para>
-            imports one or more PPD files into a PPD compiler source file
+            imports one or more PPD files into a PPD compiler source file.
           </para>
           <indexterm zone="cups ppdi">
@@ -844,5 +814,5 @@
           <para>
             merges two or more PPD files into a single, multi-language
-            PPD file
+            PPD file.
           </para>
           <indexterm zone="cups ppdmerge">
@@ -858,5 +828,5 @@
             extracts UI strings from PPDC source files and
             updates either a GNU gettext or Mac OS X strings
-            format message catalog source file for translation
+            format message catalog source file for translation.
           </para>
           <indexterm zone="cups ppdpo">
@@ -883,5 +853,5 @@
         <listitem>
           <para>
-            contains the <application>Cups</application> API functions
+            contains the <application>Cups</application> API functions.
           </para>
           <indexterm zone="cups libcups">
Index: pst/printing/gs.xml
===================================================================
--- pst/printing/gs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/printing/gs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,8 +10,8 @@
   "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs&gs-packver;/ghostscript-&gs-version;.tar.xz">
   <!ENTITY gs-download-ftp  " ">
-  <!ENTITY gs-md5sum        "72535d31018129a1a8ff636a47ba1f92">
-  <!ENTITY gs-size          "53 MB">
-  <!ENTITY gs-buildsize     "342 MB (with fonts and libgs.so)">
-  <!ENTITY gs-time          "1.8 SBU (Using parallelism=4; with libgs.so)">
+  <!ENTITY gs-md5sum        "bf0b41d6e19fdeb4b050afad309248d2">
+  <!ENTITY gs-size          "39 MB">
+  <!ENTITY gs-buildsize     "247 MB (with fonts and libgs.so)">
+  <!ENTITY gs-time          "0.7 SBU (Using parallelism=4; with libgs.so)">
 
   <!ENTITY gs-standard-fonts-download
@@ -30,4 +30,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -48,5 +49,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -85,11 +86,9 @@
 
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-<!-- Commenting this out since it's no longer needed, but keeping it for the
-         inevitable next time that we need a patch for this package. -->
     <itemizedlist spacing="compact">
       <listitem>
         <para>
           Required patch:
-          <ulink url="&patch-root;/ghostscript-&gs-version;-upstream_fix-1.patch"/>
+          <ulink url="&patch-root;/ghostscript-&gs-version;-freetype_fix-1.patch"/>
         </para>
       </listitem>
@@ -200,8 +199,8 @@
 
     <para>
-      Apply a patch to prevent a segfault when processing some PDF files:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../ghostscript-&gs-version;-upstream_fix-1.patch</userinput></screen>
+      Apply a patch to fix a problem introduced by changes in freetype-2.10.3:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../ghostscript-&gs-version;-freetype_fix-1.patch</userinput></screen>
 
     <para>
@@ -255,5 +254,5 @@
 
     <para>
-      Now make the documentation accessible from a standard place:
+      Now make the documentation accessible from the normal place:
     </para>
 <!-- Starting with 9.23, the install does not seem to copy the examples any more -->
@@ -266,5 +265,5 @@
       If you have downloaded the fonts, unpack them to
       <filename class="directory">/usr/share/ghostscript</filename> and ensure
-      the ownership of the files are
+      the ownerships of the files are
       <systemitem class="username">root</systemitem>:
       <systemitem class="groupname">root</systemitem>.
@@ -276,7 +275,7 @@
 
     <para>
-      You can now test the rendering of various postscript and pdf files from the
+      You can now test the rendering of various postscript  and pdf files from the
       <filename class="directory">/usr/share/ghostscript/&gs-version;/examples
-      </filename>. To do this, run the following command (in a X Windows display):
+      </filename>, for example (you need an X window system display):
     </para>
 
@@ -367,5 +366,5 @@
           <para>
             is an interpreter for Adobe Systems' PostScript(tm) and Portable
-            Document Format (PDF)
+            Document Format (PDF).
           </para>
           <indexterm zone="gs gplgs-prog">
@@ -382,5 +381,5 @@
             other programs, such as <application>GSView</application>,
             <application>ImageMagick</application>, and
-            <application>libspectre</application>
+            <application>libspectre</application>.
           </para>
           <indexterm zone="gs libgs.so">
@@ -398,4 +397,3 @@
     </para>
   </sect2>
-
 </sect1>
Index: pst/printing/gutenprint.xml
===================================================================
--- pst/printing/gutenprint.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/printing/gutenprint.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -216,5 +217,5 @@
 <screen role="root" revision="sysv"><userinput>/etc/rc.d/init.d/cups restart</userinput></screen>
 
-<screen role="root" revision="systemd"><userinput>systemctl restart cups</userinput></screen>
+<screen role="root" revision="systemd"><userinput>systemctl restart org.cups.cupsd</userinput></screen>
 
       <!-- <para>
@@ -272,5 +273,5 @@
             <application>Gutenprint</application>,
             <application>CUPS</application> or
-            <application>ESP Print Pro</application> drivers
+            <application>ESP Print Pro</application> drivers.
           </para>
           <indexterm zone="gutenprint cups-calibrate">
@@ -284,5 +285,5 @@
         <listitem>
           <para>
-            generates Gutenprint PPD files for use with CUPS
+            generates Gutenprint PPD files for use with CUPS.
           </para>
           <indexterm zone="gutenprint cups-genppd.5.2">
@@ -296,5 +297,5 @@
         <listitem>
           <para>
-            regenerates the Gutenprint PPD files in use by CUPS
+            regenerates the Gutenprint PPD files in use by CUPS.
           </para>
           <indexterm zone="gutenprint cups-genppdupdate">
@@ -309,5 +310,5 @@
           <para>
             is a command line utility to perform various maintenance
-            tasks on Epson Stylus inkjet printers
+            tasks on Epson Stylus inkjet printers.
           </para>
           <indexterm zone="gutenprint escputil">
@@ -336,5 +337,5 @@
         <listitem>
           <para>
-            is a test program to learn how to use libgutenprint
+            is a test program to learn how to use libgutenprint.
           </para>
           <indexterm zone="gutenprint testpattern">
Index: pst/printing/printing.xml
===================================================================
--- pst/printing/printing.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/printing/printing.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="pst-printing">
Index: pst/ps/enscript.xml
===================================================================
--- pst/ps/enscript.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/ps/enscript.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <caution>
@@ -206,5 +207,5 @@
           <para>
             converts <command>diff</command> output files to a format
-            suitable to be printed with <command>enscript</command>
+            suitable to be printed with <command>enscript</command>.
           </para>
           <indexterm zone="enscript diffpp">
@@ -220,5 +221,5 @@
             is a filter, used primarily by printing scripts, that
             converts ASCII text files to PostScript, HTML, RTF, ANSI and
-            overstrikes
+            overstrikes.
           </para>
           <indexterm zone="enscript enscript-prog">
@@ -232,5 +233,5 @@
         <listitem>
           <para>
-            creates a font map from a given file
+            creates a font map from a given file.
           </para>
           <indexterm zone="enscript mkafmmap">
@@ -245,5 +246,5 @@
           <para>
             is a script which calls <command>enscript</command> and
-            passes the correct parameters to create overstriked fonts
+            passes the correct parameters to create overstriked fonts.
           </para>
           <indexterm zone="enscript over">
@@ -257,5 +258,5 @@
         <listitem>
           <para>
-            slices documents with long lines
+            slices documents with long lines.
           </para>
           <indexterm zone="enscript sliceprint">
@@ -272,5 +273,5 @@
             with some state machine extensions. It is designed for program
             source code highlighting and for similar tasks where state
-            information helps input processing
+            information helps input processing.
           </para>
           <indexterm zone="enscript states">
Index: pst/ps/epdfview.xml
===================================================================
--- pst/ps/epdfview.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/ps/epdfview.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -189,5 +190,5 @@
           <para>
             is a <application>Gtk+-2</application> program for viewing PDF
-            documents
+            documents.
           </para>
           <indexterm zone="epdfview epdfview-prog">
@@ -198,4 +199,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: pst/ps/fop.xml
===================================================================
--- pst/ps/fop.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/ps/fop.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,23 +7,23 @@
   <!ENTITY fop-download-http "https://archive.apache.org/dist/xmlgraphics/fop/source/fop-&fop-version;-src.tar.gz">
   <!ENTITY fop-download-ftp  " ">
-  <!ENTITY fop-md5sum        "1d6bc84d2ab7f971bbc628080e3c307f">
+  <!ENTITY fop-md5sum        "5e7e87ef12845d31bce7a1fe8d61f501">
   <!ENTITY fop-size          "26 MB">
-  <!ENTITY fop-buildsize     "522 MB (including files downloaded to the user directory)">
+  <!ENTITY fop-buildsize     "491 MB ">
   <!ENTITY fop-time          "0.4 SBU">
 
-  <!ENTITY pdfbox-version    "2.0.24">
-  <!ENTITY pdfbox-download   "http://archive.apache.org/dist/pdfbox/&pdfbox-version;/pdfbox-&pdfbox-version;.jar">
-  <!ENTITY pdfbox-md5sum     "9e97fc59c662738a5fb82dcc447d1e2f">
-  <!ENTITY pdfbox-size       "2.7 MB">
-
-  <!ENTITY fontbox-download  "http://archive.apache.org/dist/pdfbox/&pdfbox-version;/fontbox-&pdfbox-version;.jar">
-  <!ENTITY fontbox-md5sum    "6c2066df0d706d85e950fe8c73d52ed8">
+  <!ENTITY pdfbox-version    "2.0.21">
+  <!ENTITY pdfbox-download   "http://mirror.reverse.net/pub/apache/pdfbox/&pdfbox-version;/pdfbox-&pdfbox-version;.jar">
+  <!ENTITY pdfbox-md5sum     "aa28f5d7a9a89bb46391643315d5307b">
+  <!ENTITY pdfbox-size       "2.6 MB">
+
+  <!ENTITY fontbox-download  "http://mirror.reverse.net/pub/apache/pdfbox/&pdfbox-version;/fontbox-&pdfbox-version;.jar">
+  <!ENTITY fontbox-md5sum    "5840ff3bcc1e2ea1d066b7f0114c359b">
   <!ENTITY fontbox-size      "1.5 MB">
 
   <!ENTITY maven-major        "3">
   <!ENTITY maven-version      "3.6.3">
-  <!ENTITY maven-download     "http://archive.apache.org/dist/maven/maven-&maven-major;/&maven-version;/binaries/apache-maven-&maven-version;-bin.tar.gz">
+  <!ENTITY maven-download     "http://mirror.reverse.net/pub/apache/maven/maven-&maven-major;/&maven-version;/binaries/apache-maven-&maven-version;-bin.tar.gz">
   <!ENTITY maven-md5sum       "9792c717f5845d952907d5144b8253c3">
-  <!ENTITY maven-size         "9.1 MB (additionally, about 82 MB are downloaded to the building user's directory)">
+  <!ENTITY maven-size         "9 MB (additionally, about 100 MB are downloaded to the building user's directory)">
 
   <!ENTITY offo-download     "&sourceforge-dl;/offo/2.2/offo-hyphenation.zip">
@@ -36,4 +36,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -58,5 +59,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -128,10 +129,10 @@
       </listitem>
     </itemizedlist>
-<!-- Using the archive above allows finding all versions
+
     <note><para>
       The pdfbox and fontbox packages may not be available at the above 
       location.  If not, they can be found at the BLFS files mirror sites.
     </para></note>
--->
+
     <itemizedlist spacing="compact">
       <title>Recommended packages</title>
@@ -228,5 +229,5 @@
 &lt;arg value="--ignore-source-errors"/&gt;' \
     fop/build.xml</userinput></screen>
-<!-- Seems to have been fixed in 2.6
+
       <para>
         The stack size set in <filename>build.xml</filename> for building the
@@ -236,10 +237,4 @@
 <screen><userinput>sed -e '/hyph\.stack/s/512k/1M/' \
     -i fop/build.xml</userinput></screen>
--->
-      <para>
-        Fix building with JDK-16 due to an outdated Apache Maven plugin:
-      </para>
-
-<screen><userinput remap="pre">sed -i 's/&lt;war.plugin.version&gt;2.2/&lt;war.plugin.version&gt;3.3.1/' pom.xml</userinput></screen>
 
       <para>
@@ -294,6 +289,6 @@
     <para>
       <command>sed -i ... build.xml</command>: This adds two switches to the
-      <command>javadoc</command> command, preventing some errors from occuring
-      when building the documentation.
+      <command>javadoc</command> command, preventing some errors to occur when
+      building the documentation.
     </para>
 
@@ -433,5 +428,5 @@
         <seg>fop</seg>
         <seg>fop.jar and numerous support library classes located in
-        <filename class="directory">/opt/fop/{build,lib}</filename>; JAI
+        <filename class='directory'>/opt/fop/{build,lib}</filename>; JAI
         components include libmlib_jai.so, jai_codec.jar, jai_core.jar, and
         mlibwrapper_jai.jar</seg>
@@ -451,5 +446,5 @@
             is a wrapper script to the <command>java</command> command
             which sets up the <application>fop</application>
-            environment and passes the required parameters
+            environment and passes the required parameters.
           </para>
           <indexterm zone="fop fop-prog">
@@ -460,9 +455,9 @@
 
       <varlistentry id="fop.jar">
-        <term><filename class="libraryfile">fop.jar</filename></term>
+        <term><filename class='libraryfile'>fop.jar</filename></term>
         <listitem>
           <para>
             contains all the <application>fop</application>
-            <application>Java</application> classes
+          <application>Java</application> classes.
           </para>
           <indexterm zone="fop fop.jar">
Index: pst/ps/mupdf.xml
===================================================================
--- pst/ps/mupdf.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/ps/mupdf.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,9 +7,9 @@
 <!--Using archive URL, because when a new version is released, older and new
 can be found there, no need to change directory -->
-  <!ENTITY mupdf-download-http "https://www.mupdf.com/downloads/archive/mupdf-&mupdf-version;-source.tar.gz">
+  <!ENTITY mupdf-download-http "http://www.mupdf.com/downloads/archive/mupdf-&mupdf-version;-source.tar.gz">
   <!ENTITY mupdf-download-ftp  " ">
   <!ENTITY mupdf-md5sum        "6f42be1365350f05270f8776517a3872">
   <!ENTITY mupdf-size          "69 MB">
-  <!ENTITY mupdf-buildsize     "320 MB">
+  <!ENTITY mupdf-buildsize     "322 MB">
   <!ENTITY mupdf-time          "0.2 SBU (Using parallelism=4)">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -71,19 +72,9 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Required Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch: <ulink
-          url="&patch-root;/mupdf-&mupdf-version;-security_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">MuPDF Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="glu"/> and <!-- previously recommended via system freeglut -->
+      <xref linkend="glu"/>, <!-- previously recommended via system freeglut -->
       <xref linkend="xorg7-lib"/>
     </para>
@@ -127,4 +118,5 @@
         s/$/ -lmupdf -L$(OUT)/
         }' Makefile</userinput></screen>
+
 
     <para>
@@ -148,7 +140,6 @@
 EOF
 
-export XCFLAGS=-fPIC                               &amp;&amp;
-patch -Np1 -i ../mupdf-&mupdf-version;-security_fix-1.patch &amp;&amp;
-make build=release shared=yes                      &amp;&amp;
+export XCFLAGS=-fPIC          &amp;&amp;
+make build=release shared=yes &amp;&amp;
 unset XCFLAGS</userinput></screen>
 
@@ -192,5 +183,5 @@
       <seglistitem>
         <seg>
-          mupdf (symlink), 
+          mupdf(symlink), 
           mupdf-gl, 
           mupdf-x11, 
@@ -219,5 +210,5 @@
           <para>
             is a program for viewing PDF, XPS, EPUB, and CBZ documents,
-            and various image formats such as PNG, JPEG, GIFF, and TIFF
+            and various image formats such as PNG, JPEG, GIFF, and TIFF.
           </para>
           <indexterm zone="mupdf mupdf-prog">
@@ -231,5 +222,5 @@
         <listitem>
           <para>
-            same as <command>mupdf</command>, using an opengl renderer
+            same as <command>mupdf</command>, using an opengl renderer.
           </para>
           <indexterm zone="mupdf mupdf-gl">
@@ -243,5 +234,5 @@
         <listitem>
           <para>
-            same as <command>mupdf</command>, using an X Window renderer
+            same as <command>mupdf</command>, using an X Window renderer.
           </para>
           <indexterm zone="mupdf mupdf-x11">
@@ -256,5 +247,5 @@
           <para>
             is a program used to perform rasterization tasks with PDF
-            documents
+            documents.
           </para>
           <indexterm zone="mupdf muraster">
@@ -269,5 +260,5 @@
           <para>
             is a program to perform various operations on PDF files, such
-            as merging and cleaning PDF documents
+            as merging and cleaning PDF documents.
           </para>
           <indexterm zone="mupdf mutool">
@@ -281,5 +272,5 @@
         <listitem>
           <para>
-            contains the mupdf API functions
+            contains the mupdf API functions.
           </para>
           <indexterm zone="mupdf libmupdf">
Index: pst/ps/paps.xml
===================================================================
--- pst/ps/paps.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/ps/paps.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -137,5 +138,5 @@
           <para>
             is a text to PostScript converter that supports UTF-8
-            character encoding
+            character encoding.
           </para>
           <indexterm zone="paps paps-prog">
Index: pst/ps/ps.xml
===================================================================
--- pst/ps/ps.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/ps/ps.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="pst-ps">
Index: pst/pst.xml
===================================================================
--- pst/pst.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/pst.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <part id="pst" xreflabel="Printing, Scanning and Typesetting">
Index: pst/scanning/sane.xml
===================================================================
--- pst/scanning/sane.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/scanning/sane.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -24,4 +24,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -51,5 +52,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Back Ends Package Information</bridgehead>
@@ -126,5 +127,5 @@
         <ulink url="https://gitlab.com/sane-project"/> but 
         the file URLs use embedded md5sums.  For convenience,
-        the packages have been copied to the location above.
+        the packages have been copied to the localion above.
       </para>
     </note>
@@ -173,5 +174,5 @@
       scanner will need the <xref linkend="libusb"/> package. For HP devices,
       you may need <ulink
-      url="https://sourceforge.net/projects/hplip/files/hplip/">hplip</ulink>.
+      url="http://sourceforge.net/projects/hplip/files/hplip/">hplip</ulink>.
       Ensure you have the necessary drivers properly configured to access
       the devices.
@@ -225,5 +226,5 @@
             --localstatedir=/var \
             --with-group=scanner \
-            --docdir=/usr/share/doc/sane-backends-&sane-version;" &amp;&amp;
+            --with-docdir=/usr/share/doc/sane-backends-&sane-version;" &amp;&amp;
 make</userinput></screen>
 
@@ -500,5 +501,5 @@
           <para>
             creates a gamma table in the format expected by
-            <command>scanimage</command>
+            <command>scanimage</command>.
           </para>
           <indexterm zone="sane gamma4scanimage">
@@ -514,5 +515,5 @@
             is a tool used to determine the compiler and linker
             flags that should be used to compile and link
-            <application>SANE</application>
+            <application>SANE</application>.
           </para>
           <indexterm zone="sane sane-config-prog">
@@ -528,5 +529,5 @@
             is the <application>SANE</application> daemon that
             allows remote clients to access image acquisition devices
-            available on the local host
+            available on the local host.
           </para>
           <indexterm zone="sane saned">
@@ -543,5 +544,5 @@
             USB scanners and determine their device files. Its primary
             purpose is to make sure that scanners can be detected by
-            <application>SANE</application> backends
+            <application>SANE</application> backends.
           </para>
           <indexterm zone="sane sane-find-scanner">
@@ -556,5 +557,5 @@
           <para>
             is a command-line interface to control image acquisition
-            devices which are equipped with an automatic document feeder (ADF)
+            devices which are equipped with an automatic document feeder (ADF).
           </para>
           <indexterm zone="sane scanadf">
@@ -570,5 +571,5 @@
             is a command line interface for scanning from image acquisition
             devices such as flatbed scanners or cameras. It is also used to
-            list the available backend devices
+            list the available backend devices.
           </para>
           <indexterm zone="sane scanimage">
@@ -583,5 +584,5 @@
           <para>
             is a graphical camera front end for
-            <application>SANE</application>
+            <application>SANE</application>.
           </para>
           <indexterm zone="sane xcam">
@@ -595,5 +596,5 @@
         <listitem>
           <para>
-            is a graphical user interface for scanning
+            is a graphical user interface for scanning.
           </para>
           <indexterm zone="sane xscanimage">
@@ -604,9 +605,9 @@
 
       <varlistentry id="libsane">
-        <term><filename class="libraryfile">libsane.so</filename></term>
+        <term><filename class='libraryfile'>libsane.so</filename></term>
         <listitem>
           <para>
             is the application programming interface that is used to
-            communicate between frontends and backends
+            communicate between frontends and backends.
           </para>
           <indexterm zone="sane libsane">
@@ -617,11 +618,11 @@
 
       <varlistentry id="libsane-module">
-        <term><filename class="libraryfile">libsane-*.so</filename></term>
+        <term><filename class='libraryfile'>libsane-*.so</filename></term>
         <listitem>
           <para>
             modules are backend scanning library plugins used to interface
-            with scanning devices. See
-            <ulink url="http://www.sane-project.org/sane-supported-devices.html"/>
-            for a list of supported backends
+            with scanning devices. See <ulink
+            url="http://www.sane-project.org/sane-supported-devices.html"/>
+            for a list of supported backends.
           </para>
           <indexterm zone="sane libsane-module">
Index: pst/scanning/scanning.xml
===================================================================
--- pst/scanning/scanning.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/scanning/scanning.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="pst-scanning">
Index: pst/scanning/xsane.xml
===================================================================
--- pst/scanning/xsane.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/scanning/xsane.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -214,5 +215,5 @@
           <para>
             is a graphical user-interface to control an image acquisition
-            device such as a flatbed scanner
+            device such as a flatbed scanner.
           </para>
           <indexterm zone="xsane xsane-prog">
Index: pst/sgml/docbook-3.1-dtd.xml
===================================================================
--- pst/sgml/docbook-3.1-dtd.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/sgml/docbook-3.1-dtd.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY sgml-dtd-3-download-http "https://www.docbook.org/sgml/&docbook-3.1-dtd-version;/docbk31.zip">
+  <!ENTITY sgml-dtd-3-download-http "http://www.docbook.org/sgml/&docbook-3.1-dtd-version;/docbk31.zip">
   <!ENTITY sgml-dtd-3-download-ftp  " ">
   <!ENTITY sgml-dtd-3-md5sum        "432749c0c806dbae81c8bcb70da3b5d3">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -210,5 +211,5 @@
             contains a document type definition which defines the element
             types and the attribute lists that can be used in the corresponding
-            SGML files
+            SGML files.
           </para>
           <indexterm zone="sgml-dtd-3 SGML-DTD-files">
@@ -223,5 +224,5 @@
           <para>
             contains components of the document type definition that are
-            sourced into the <filename>DTD</filename> files
+            sourced into the <filename>DTD</filename> files.
           </para>
           <indexterm zone="sgml-dtd-3 SGML-MOD-files">
Index: pst/sgml/docbook-4.5-dtd.xml
===================================================================
--- pst/sgml/docbook-4.5-dtd.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/sgml/docbook-4.5-dtd.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY sgml-dtd-download-http "https://www.docbook.org/sgml/&docbook-4.5-dtd-version;/docbook-&docbook-4.5-dtd-version;.zip">
+  <!ENTITY sgml-dtd-download-http "http://www.docbook.org/sgml/&docbook-4.5-dtd-version;/docbook-&docbook-4.5-dtd-version;.zip">
   <!ENTITY sgml-dtd-download-ftp  " ">
   <!ENTITY sgml-dtd-md5sum        "07c581f4bbcba6d3aac85360a19f95f7">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -206,5 +207,5 @@
             contains a document type definition which defines the element
             types and the attribute lists that can be used in the corresponding
-            SGML files
+            SGML files.
           </para>
           <indexterm zone="sgml-dtd SGML-DTD-files-4">
@@ -219,5 +220,5 @@
           <para>
             contains components of the document type definition that are
-            sourced into the <filename>DTD</filename> files
+            sourced into the <filename>DTD</filename> files.
           </para>
           <indexterm zone="sgml-dtd SGML-MOD-files-4">
Index: pst/sgml/docbook-dsssl.xml
===================================================================
--- pst/sgml/docbook-dsssl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/sgml/docbook-dsssl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -22,4 +22,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -42,5 +43,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -252,5 +253,5 @@
           <para>
             is a <application>Perl</application> script that creates a
-            DocBook index from raw index data
+            DocBook index from raw index data.
           </para>
           <indexterm zone="docbook-dsssl collateindex.pl">
Index: pst/sgml/docbook-utils.xml
===================================================================
--- pst/sgml/docbook-utils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/sgml/docbook-utils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -211,5 +212,5 @@
             are simple one-line wrapper scripts to <command>jw</command>.
             They are provided as easy-to-remember names used to convert
-            DocBook or other SGML files to the respective format
+            DocBook or other SGML files to the respective format.
           </para>
           <indexterm zone="docbook-utils docbook2">
@@ -225,5 +226,5 @@
             are symlinks pointing at the respectively named
             <command>docbook2*</command> commands, created to satisfy some
-            program's use of these names
+            program's use of these names.
           </para>
           <indexterm zone="docbook-utils db2">
@@ -240,5 +241,5 @@
             output formats. It hides most of
             <application>OpenJade</application>'s complexity and adds
-            comfortable features
+            comfortable features.
           </para>
           <indexterm zone="docbook-utils jw">
@@ -254,5 +255,5 @@
             is used to compare two SGML files and only return the differences
             in the markup. This is especially useful to compare files that
-            should be identical except for language differences in the content
+            should be identical except for language differences in the content.
           </para>
           <indexterm zone="docbook-utils sgmldiff">
Index: pst/sgml/openjade.xml
===================================================================
--- pst/sgml/openjade.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/sgml/openjade.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -114,5 +115,5 @@
     </para>
 
-<screen><userinput>export CXXFLAGS="${CXXFLAGS:--O2 -g} -fno-lifetime-dse"            &amp;&amp;
+<screen><userinput>export CXXFLAGS="$CXXFLAGS -fno-lifetime-dse"            &amp;&amp;
 ./configure --prefix=/usr                                \
             --mandir=/usr/share/man                      \
@@ -254,5 +255,5 @@
         <listitem>
           <para>
-            is a DSSSL engine used for transformations
+            is a DSSSL engine used for transformations.
           </para>
           <indexterm zone="openjade openjade-prog">
@@ -266,5 +267,5 @@
         <listitem>
           <para>
-            is a symlink to <command>openjade</command>
+            is a symlink to <command>openjade</command>.
           </para>
           <indexterm zone="openjade jade">
Index: pst/sgml/opensp.xml
===================================================================
--- pst/sgml/opensp.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/sgml/opensp.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -81,5 +82,4 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libnsl"/> and
       <xref linkend="xmlto"/>
     </para>
@@ -219,5 +219,5 @@
         <listitem>
           <para>
-            is used to process SGML files
+            is used to process SGML files.
           </para>
           <indexterm zone="opensp onsgmls">
@@ -233,5 +233,5 @@
             prints on the standard output a normalized document instance for
             the SGML document contained in the concatenation of the entities
-            with system identifiers .nf and .fi
+            with system identifiers .nf and .fi.
           </para>
           <indexterm zone="opensp osgmlnorm">
@@ -245,5 +245,5 @@
         <listitem>
           <para>
-            is a markup stream editor
+            is a markup stream editor.
           </para>
           <indexterm zone="opensp ospam">
@@ -257,5 +257,5 @@
         <listitem>
           <para>
-            prints effective system identifiers found in the catalogs
+            prints effective system identifiers found in the catalogs.
           </para>
           <indexterm zone="opensp ospcat">
@@ -270,5 +270,5 @@
           <para>
             provides access to <application>OpenSP</application>'s
-            entity manager
+            entity manager.
           </para>
           <indexterm zone="opensp ospent">
@@ -283,5 +283,5 @@
           <para>
             is an SGML normalizer or used to convert
-            SGML files to XML files
+            SGML files to XML files.
           </para>
           <indexterm zone="opensp osx">
@@ -295,5 +295,5 @@
         <listitem>
           <para>
-            is a symlink to <command>onsgmls</command>
+            is a symlink to <command>onsgmls</command>.
           </para>
           <indexterm zone="opensp nsgmls">
@@ -307,5 +307,5 @@
         <listitem>
           <para>
-            is a symlink to <command>osx</command>
+            is a symlink to <command>osx</command>.
           </para>
           <indexterm zone="opensp sgml2xml">
@@ -319,5 +319,5 @@
         <listitem>
           <para>
-            is a symlink to <command>osgmlnorm</command>
+            is a symlink to <command>osgmlnorm</command>.
           </para>
           <indexterm zone="opensp sgmlnorm">
@@ -331,5 +331,5 @@
         <listitem>
           <para>
-            is a symlink to <command>ospam</command>
+            is a symlink to <command>ospam</command>.
           </para>
           <indexterm zone="opensp spam">
@@ -343,5 +343,5 @@
         <listitem>
           <para>
-            is a symlink to <command>ospcat</command>
+            is a symlink to <command>ospcat</command>.
           </para>
           <indexterm zone="opensp spcat">
@@ -355,5 +355,5 @@
         <listitem>
           <para>
-            is a symlink to <command>ospent</command>
+            is a symlink to <command>ospent</command>.
           </para>
           <indexterm zone="opensp spent">
@@ -367,5 +367,5 @@
         <listitem>
           <para>
-            is a symlink to <command>osx</command>
+            is a symlink to <command>osx</command>.
           </para>
           <indexterm zone="opensp sx">
@@ -376,10 +376,10 @@
 
       <varlistentry id="libosp">
-        <term><filename class="libraryfile">libosp.so</filename></term>
+        <term><filename class='libraryfile'>libosp.so</filename></term>
         <listitem>
           <para>
             contains functions required by the
             <application>OpenSP</application> programs to parse, validate and
-            manipulate SGML and XML files
+            manipulate SGML and XML files.
           </para>
           <indexterm zone="opensp libosp">
@@ -390,9 +390,9 @@
 
       <varlistentry id="libsp">
-        <term><filename class="libraryfile">libsp.so</filename></term>
+        <term><filename class='libraryfile'>libsp.so</filename></term>
         <listitem>
           <para>
             is a symlink to
-            <filename class="libraryfile">libosp.so</filename>
+            <filename class='libraryfile'>libosp.so</filename>.
           </para>
           <indexterm zone="opensp libsp">
Index: pst/sgml/sgml-common.xml
===================================================================
--- pst/sgml/sgml-common.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/sgml/sgml-common.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -205,5 +206,5 @@
             catalogs scattered throughout the
             <filename class="directory">/usr/share/sgml</filename> directory
-          tree
+          tree.
           </para>
           <indexterm zone="sgml-common install-catalog">
@@ -217,5 +218,5 @@
         <listitem>
           <para>
-            prints to standard output the name of the main configuration file
+            prints to standard output the name of the main configuration file.
           </para>
           <indexterm zone="sgml-common sgmlwhich">
@@ -229,5 +230,5 @@
         <listitem>
           <para>
-            contains the basic character entities defined with SDATA entries
+            contains the basic character entities defined with SDATA entries.
           </para>
           <indexterm zone="sgml-common SGML-entities">
@@ -242,5 +243,5 @@
           <para>
             contains the basic character entities defined by a hexadecimal
-            representation of the Unicode character number
+            representation of the Unicode character number.
           </para>
           <indexterm zone="sgml-common XML-entities">
Index: pst/sgml/sgml.xml
===================================================================
--- pst/sgml/sgml.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/sgml/sgml.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="pst-sgml">
Index: pst/typesetting/asymptote.xml
===================================================================
--- pst/typesetting/asymptote.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/typesetting/asymptote.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,9 +7,9 @@
   <!ENTITY asymptote-download-http "&sourceforge-dl;/asymptote/asymptote-&asymptote-version;.src.tgz">
   <!ENTITY asymptote-download-ftp  " ">
-  <!ENTITY asymptote-md5sum        "b57e685568a7cca69024a86c7276eb6d">
+  <!ENTITY asymptote-md5sum        "33a1ac5172184109a40e4e15f46652d2">
   <!ENTITY asymptote-size          "4.5 MB">
   <!ENTITY asymptote-buildsize     "190 MB (with all the dependencies which are within BLFS)">
   <!-- with 2.68 the j1 time was 2.5 SBU, slow enough to use a parallel build -->
-  <!ENTITY asymptote-time          "0.9 SBU (using parallelism=4)">
+  <!ENTITY asymptote-time          "1.1 SBU (using parallelism=4)">
 ]>
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -133,7 +134,7 @@
 <!-- Editors: for testing this, the minimal latex functionality is
  covered by the cylinder and triangle tests in
- https://www.linuxfromscratch.org/~ken/tex-testfiles/latex-test-20190318.tar.xz
+ http://www.linuxfromscratch.org/~ken/tex-testfiles/latex-test-20190318.tar.xz
  but the more interesting stuff (WebM html, svg, png, pdf) is tested in
- https://www.linuxfromscratch.org/~ken/asy-nontex-testfiles/asy-test-20200123.tar.xz
+ http://www.linuxfromscratch.org/~ken/asy-nontex-testfiles/asy-test-20200123.tar.xz
 -->
 <!--<para>
@@ -250,5 +251,5 @@
         <listitem>
           <para>
-            is a vector graphics program
+            is a vector graphics program.
           </para>
           <indexterm zone="asymptote asy">
@@ -262,5 +263,5 @@
         <listitem>
           <para>
-            is a Python3 script providing a Qt5 GUI for asy
+            is a Python3 script providing a Qt5 GUI for asy.
           </para>
           <indexterm zone="asymptote xasy">
Index: pst/typesetting/biber.xml
===================================================================
--- pst/typesetting/biber.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/typesetting/biber.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -13,5 +13,5 @@
   <!ENTITY biber-download-http "https://github.com/plk/biber/archive/v&biber-version;/biber-&biber-version;.tar.gz">
   <!ENTITY biber-download-ftp  " ">
-  <!ENTITY biber-md5sum        "fafae81d8ae67314692e2b646024fa98">
+  <!ENTITY biber-md5sum        "3c964253bcab6c0af9acd3d2b3f501c2">
   <!ENTITY biber-size          "1.6 MB">
   <!-- Buildsize includes the installed biblatex, except that what matters is
@@ -19,14 +19,14 @@
     minimal. Copy full texmf to somewhere for working, measure with du -shm,
     then install biblatex over the top of it and remeasure.
-    For 3.16, texmf grows by 3MB -->
-  <!ENTITY biber-buildsize     "18 MB"> <!-- 14+1.6 rounds to 15M, add 3M for biblatex in texmf-->
-  <!ENTITY biber-time          "0.5 SBU including tests">
+    For 3.15a, texmf grows by 2MB -->
+  <!ENTITY biber-buildsize     "18 MB">
+  <!ENTITY biber-time          "0.4 SBU including tests">
 
   <!-- Check path.  Directory might not be &biblatex-version; if a suffixed update -->
-  <!-- for normal unsuffixed version: e.g. for 3.15a
-  <!ENTITY biblatex-download-http   "https://sourceforge.net/projects/biblatex/files/biblatex-3.15/biblatex-&biblatex-version;.tds.tgz"> -->
-  <!ENTITY biblatex-download-http   "https://sourceforge.net/projects/biblatex/files/biblatex-&biblatex-version;/biblatex-&biblatex-version;.tds.tgz">
+  <!-- for normal unsuffixed version:
+  <!ENTITY biblatex-download-http   "http://sourceforge.net/projects/biblatex/files/biblatex-&biblatex-version;/biblatex-&biblatex-version;.tds.tgz"> -->
+  <!ENTITY biblatex-download-http   "http://sourceforge.net/projects/biblatex/files/biblatex-3.15/biblatex-&biblatex-version;.tds.tgz">
   <!ENTITY biblatex-download-ftp    "">
-  <!ENTITY biblatex-md5sum          "30342c8ef5309e838968fcb06a314a36">
+  <!ENTITY biblatex-md5sum          "f27db2896d485c2c138fcc42e03a2f1c">
   <!ENTITY biblatex-size            "20 MB">
 
@@ -37,4 +37,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -54,9 +55,9 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <!-- note for editors: you can test this by using the latest version
          of the latex-test tarball from
-         https://www.linuxfromscratch.org/~ken/tex-testfiles/
+         http://www.linuxfromscratch.org/~ken/tex-testfiles/
          using ./configure (to create the Makefile) and then making the
          following targets:
@@ -147,5 +148,5 @@
     </note>
 
-    <bridgehead renderas="sect3">Required Additional Download</bridgehead>
+    <bridgehead renderas="sect3">Required Additional Downloads</bridgehead>
 
     <itemizedlist spacing="compact">
@@ -168,10 +169,10 @@
         </para>
       </listitem>
- <!-- <listitem>
+      <listitem>
         <para>
           Required patch:
           <ulink url="&patch-root;/biber-&biber-version;-test_fixes-1.patch"/>
         </para>
-      </listitem>-->
+      </listitem>
     </itemizedlist>
 
@@ -266,10 +267,10 @@
     </para>
 
-<!--<para>
+    <para>
       First apply a patch so that the testsuite will pass with
       the changes to hash formats in Unicode::Collates-1.29:
     </para>
 
-<screen><userinput remap="pre">patch -p1 -i ../biber-&biber-version;-test_fixes-1.patch</userinput></screen>-->
+<screen><userinput remap="pre">patch -p1 -i ../biber-&biber-version;-test_fixes-1.patch</userinput></screen>
 
 <screen><userinput>perl ./Build.PL &amp;&amp;
@@ -331,5 +332,5 @@
         <listitem>
           <para>
-            is used for producing bibliographies in LaTeX documents
+            is used for producing bibliographies in LaTeX documents.
           </para>
           <indexterm zone="biber biber-prog">
Index: pst/typesetting/dvisvgm.xml
===================================================================
--- pst/typesetting/dvisvgm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/typesetting/dvisvgm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY dvisvgm-download-http "https://github.com/mgieseki/dvisvgm/releases/download/&dvisvgm-version;/dvisvgm-&dvisvgm-version;.tar.gz">
   <!ENTITY dvisvgm-download-ftp  " ">
-  <!ENTITY dvisvgm-md5sum        "19f6b1fb0a9a8e9b93059c7c8592f799">
-  <!ENTITY dvisvgm-size          "3.1 MB">
-  <!ENTITY dvisvgm-buildsize     "274 MB (40 MB installed, add 706 MB for the tests)">
-  <!ENTITY dvisvgm-time          "0.9 SBU (add 0.6 SBU for the tests, both using parallelism=4)">
+  <!ENTITY dvisvgm-md5sum        "742d16960485468a8c744dee3762aa74">
+  <!ENTITY dvisvgm-size          "3.0 MB">
+  <!ENTITY dvisvgm-buildsize     "330 MB (49 MB installed, add 954 MB for the tests)">
+  <!ENTITY dvisvgm-time          "0.7 SBU (add 0.5 SBU for the tests, both using parallelism=4)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -108,5 +109,5 @@
 
 <!-- Editors: This is in the book for svg output from asymptote. tested in
- https://www.linuxfromscratch.org/~ken/asy-nontex-testfiles/asy-test-20200123.tar.xz
+ http://www.linuxfromscratch.org/~ken/asy-nontex-testfiles/asy-test-20200123.tar.xz
 -->
     <para>
@@ -119,5 +120,5 @@
 <screen role="root"><userinput>ln -svf /opt/texlive/&texlive-year;/lib/libkpathsea.so /usr/lib</userinput></screen>
 
-<!--<para>
+    <para>
       The testsuite assumes that a modern version of <application>Python</application>
       has been installed as plain <command>python</command>. Adjust it to use
@@ -127,22 +128,10 @@
 <screen><userinput>sed -i 's/python/&amp;3/' tests/Makefile.in</userinput></screen>
 
--->
-    <para>
-      The testsuite assumes that a modern version of <application>Python</application>
-      has been installed as plain <command>python</command>. Changing this to use
-      <command>python3</command> requires a sed to one of <filename>Makefile.in</filename>
-      files, but that gets regenerated when <command>autoreconf</command> is run, so
-      the sed must come after that.
-    </para>
-
-    <para>
-<!--  Now install <application>dvisvgm</application> by running the following-->
-      Install <application>dvisvgm</application> by running the following
+    <para>
+      Now install <application>dvisvgm</application> by running the following
       commands:
     </para>
 
-<screen><userinput>autoreconf -fiv                               &amp;&amp;
-sed -i 's/python/&amp;3/' tests/Makefile.in       &amp;&amp;
-./configure                                    \
+<screen><userinput>./configure                                    \
  --bindir=/opt/texlive/&texlive-year;/bin/${TEXARCH}     \
  --mandir=/opt/texlive/&texlive-year;/texmf-dist/doc/man \
@@ -168,13 +157,4 @@
       <command>ln -svf /opt/texlive/&texlive-year;/lib/libkpathsea.so /usr/lib</command>:
       Without this, the program will not link correctly,
-    </para>
-
-    <para>
-      <command>autoreconf -fiv</command>: The versions of
-      <application>autoconf</application> and <application>automake</application>
-      used when this package was created are older than the current versions in
-      LFS. That causes 'make' to fail when it reaches the 'tests' subdirectory
-      unless autoreconf is forced to install missing (i.e. newer) auxiliary
-      files.
     </para>
 
@@ -231,4 +211,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: pst/typesetting/tex-path.xml
===================================================================
--- pst/typesetting/tex-path.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/typesetting/tex-path.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: pst/typesetting/texlive.xml
===================================================================
--- pst/typesetting/texlive.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/typesetting/texlive.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,19 +6,19 @@
   <!ENTITY texlive-download-http " ">
   <!ENTITY texlive-download-ftp  "ftp://tug.org/texlive/historic/&texlive-year;/texlive-&texlive-version;-source.tar.xz">
-  <!ENTITY texlive-md5sum        "19da95538956e26570ef7fb202af258f">
+  <!ENTITY texlive-md5sum        "a5d992e3cb8554ce92c55adde03958ba">
   <!ENTITY texlive-size          "53 MB">
 
-  <!ENTITY texlive-buildsize      "8.1 GB including the additional download and the tests, 7.0 GB installed">
-  <!ENTITY texlive-time           "4.2 SBU including the additional download and the tests, building with parallelism=4">
+  <!ENTITY texlive-buildsize      "8.5 GB including the additional download and the tests, 6.4 GB installed">
+  <!ENTITY texlive-time           "5.8 SBU including the additional download and the tests, building with parallelism=4">
 
   <!ENTITY texlive-texmf-download-http " ">
   <!ENTITY texlive-texmf-download-ftp  "ftp://tug.org/texlive/historic/&texlive-year;/texlive-&texmf-version;-texmf.tar.xz">
-  <!ENTITY texlive-texmf-md5sum        "2426a62e43f8b07397ef2dd8367e0465">
-  <!ENTITY texlive-texmf-size          "3.3 GB">
+  <!ENTITY texlive-texmf-md5sum        "bca40df2ff11269fbcb2d1b4ff0278b1">
+  <!ENTITY texlive-texmf-size          "3.0 GB">
 
   <!ENTITY texlive-tlpdb-download-http " ">
   <!ENTITY texlive-tlpdb-download-ftp  "ftp://tug.org/texlive/historic/&texlive-year;/texlive-&tex-tlpdb-version;-tlpdb-full.tar.gz">
-  <!ENTITY texlive-tlpdb-md5sum        "af0240961ecd28be5fd30d0e99b341d5">
-  <!ENTITY texlive-tlpdb-size          "3.0 MB">
+  <!ENTITY texlive-tlpdb-md5sum        "d8cd997c1bba422b30c9bc225e508794">
+  <!ENTITY texlive-tlpdb-size          "2.9 MB">
 
 ]>
@@ -29,4 +29,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -64,5 +65,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -169,10 +170,10 @@
       </listitem>
 
-      <listitem>
+<!--  <listitem>
         <para>
           Required patch: <ulink url=
-          "&patch-root;/texlive-&texlive-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
+          "&patch-root;/texlive-&texlive-version;-source-upstream_fixes-1.patch"/>
+        </para>
+      </listitem>-->
     </itemizedlist>
 
@@ -223,5 +224,16 @@
     <caution>
       <para>
-        If you wish to upgrade to current <application>texlive</application>
+        The instructions here for dealing with <application>poppler</application>
+        will only work with versions of poppler used in BLFS-9.1 and later, i.e.
+        poppler &gt;= 0.83.0. If you wish to upgrade an older system, there
+        are versions of <filename>pdftoepdf{,-poppler*}.cc</filename> and
+        <filename>pdftosrc{,-newpoppler,-poppler*}.cc</filename> in <filename
+        class="directory">texk/web2c/pdftexdir</filename>. You should establish
+        which version of <application>poppler</application> is installed and use
+        the appropriate versions of these files.
+      </para>
+
+      <para>
+        Similarly, if you wish to upgrade to current <application>texlive</application>
         on an older system where extra packages (<application>asymptote</application>.
         <application>biber</application>, <application>dvisvgm</application> or
@@ -246,4 +258,45 @@
 EOF</userinput></screen>
 
+    <para>
+      <application>TexLive</application> ships with a very old version of
+      <application>poppler</application>, and some updated files for newer versions.
+      To use the system version, first identify it and then copy the correct
+      versions of the updated files (please read the Caution above):
+    </para>
+
+<!-- on a release, drop this back to current version but update the
+ Caution above and ideally keep this commented, every other (expletive
+ deleted) poppler update tends to break this.  Fortunately, upstream
+ has deleted the poppler directory from their source in
+ https://tug.org/svn/texlive?view=revision&revision=55138
+ so from TL2021 this aggravation should be gone. -->
+<screen><userinput>SYSPOP= &amp;&amp;
+MYPOPPLER_MAJOR=$(pkg-config --modversion poppler | cut -d '.' -f1)
+if [ "$MYPOPPLER_MAJOR" = "0" ]; then
+    # if major was >=20, minor could start with 0 and not fit in octal
+    # causing error from 'let' in bash.
+    let MYPOPPLER_MINOR=$(pkg-config --modversion poppler | cut -d '.' -f2)
+else
+    # force a value > 85
+    let MYPOPPLER_MINOR=99
+fi
+if [ "$MYPOPPLER_MINOR" -lt 85 ]; then
+    # BLFS-9.1 uses 0.85.0, ignore earlier versions in this script.
+    # If updating texlive on an older system, review the available
+    # variants for pdftoepdf and pdftosrc to use system poppler.
+    SYSPOP=
+else
+    SYSPOP="--with-system-poppler --with-system-xpdf"
+    if [ "$MYPOPPLER_MINOR" -lt 86 ]; then
+        mv -v texk/web2c/pdftexdir/pdftoepdf{-poppler0.83.0,}.cc
+    else # 0.86.0 or later, including 20.08.0.
+        mv -v texk/web2c/pdftexdir/pdftoepdf{-poppler0.86.0,}.cc
+    fi
+    # For pdftosrc BLFS-9.1 uses 0.83.0 and that is the latest variant.
+    mv -v texk/web2c/pdftexdir/pdftosrc{-poppler0.83.0,}.cc
+fi &amp;&amp;
+export SYSPOP &amp;&amp;
+unset MYPOPPLER_{MAJOR,MINOR}</userinput></screen>
+
     <note>
       <para>
@@ -257,42 +310,46 @@
       Now, as a normal user:
     </para>
-
-<screen><userinput>export TEXARCH=$(uname -m |
- sed -e 's/i.86/i386/' -e 's/$/-linux/')                 &amp;&amp;
-patch -Np1 -i ../texlive-&texlive-version;-upstream_fixes-1.patch &amp;&amp;
+<!-- after the export!
+patch -Np1 -i ../texlive-&texlive-version;-source-upstream_fixes-1.patch &amp;&amp;-->
+<screen><userinput>export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp;
 
 mkdir texlive-build &amp;&amp;
 cd texlive-build    &amp;&amp;
 
-../configure                                        \
-    --prefix=/opt/texlive/&texlive-year;                      \
-    --bindir=/opt/texlive/&texlive-year;/bin/$TEXARCH         \
-    --datarootdir=/opt/texlive/&texlive-year;                 \
-    --includedir=/opt/texlive/&texlive-year;/include          \
-    --infodir=/opt/texlive/&texlive-year;/texmf-dist/doc/info \
-    --libdir=/opt/texlive/&texlive-year;/lib                  \
-    --mandir=/opt/texlive/&texlive-year;/texmf-dist/doc/man   \
-    --disable-native-texlive-build                  \
-    --disable-static --enable-shared                \
-    --disable-dvisvgm                               \
-    --with-system-cairo                             \
-    --with-system-fontconfig                        \
-    --with-system-freetype2                         \
-    --with-system-gmp                               \
-    --with-system-graphite2                         \
-    --with-system-harfbuzz                          \
-    --with-system-icu                               \
-    --with-system-libgs                             \
-    --with-system-libpaper                          \
-    --with-system-libpng                            \
-    --with-system-mpfr                              \
-    --with-system-pixman                            \
-    --with-system-zlib                              \
+../configure                                                    \
+    --prefix=/opt/texlive/&texlive-year;                                  \
+    --bindir=/opt/texlive/&texlive-year;/bin/$TEXARCH                     \
+    --datarootdir=/opt/texlive/&texlive-year;                             \
+    --includedir=/opt/texlive/&texlive-year;/include                      \
+    --infodir=/opt/texlive/&texlive-year;/texmf-dist/doc/info             \
+    --libdir=/opt/texlive/&texlive-year;/lib                              \
+    --mandir=/opt/texlive/&texlive-year;/texmf-dist/doc/man               \
+    --disable-native-texlive-build                              \
+    --disable-static --enable-shared                            \
+    --disable-dvisvgm                                           \
+    --with-system-cairo                                         \
+    --with-system-fontconfig                                    \
+    --with-system-freetype2                                     \
+    --with-system-gmp                                           \
+    --with-system-graphite2                                     \
+    --with-system-harfbuzz                                      \
+    --with-system-icu                                           \
+    --with-system-libgs                                         \
+    --with-system-libpaper                                      \
+    --with-system-libpng                                        \
+    --with-system-mpfr                                          \
+    --with-system-pixman                                        \
+    ${SYSPOP}                                                   \
+    --with-system-zlib                                          \
     --with-banner-add=" - BLFS" &amp;&amp;
 
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
+make &amp;&amp;
+unset SYSPOP</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make -k check</command>.
+      One of the Kpathsea tests will fail because BLFS uses system
+      libraries.
+   <!--  https://tug.org/pipermail/tex-k/2019-August/003036.html -->
     </para>
 
@@ -328,17 +385,4 @@
 
     <para>
-      It has been established by debian that the <command>python</command>
-      scripts in <filename class="directory">latex-make</filename> will work
-      with <command>python3</command>, so update them to invoke that by running
-      the following command as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>for F in /opt/texlive/&texlive-year;/texmf-dist/scripts/latex-make/*.py ; do
-  sed -i 's%/usr/bin/env python%/usr/bin/python3%' $F
-done
-</userinput></screen>
-
-    <para>
       Still as the <systemitem class="username">root</systemitem> user,
       initialise the new system (the commands <command>fmtutil-sys
@@ -366,10 +410,9 @@
     <title>Command Explanations</title>
 
-    <para>
-      <!-- https://tug.org/pipermail/tlbuild/2021q2/004885.html -->
+<!--<para>
       <command>patch -Np1 -i ../texlive-&texlive-version;-source-upstream_fixes-1.patch</command>:
-      A small update to mpost and LuaTeX caused the binaries to be rebuilt.
-      This patch applies the same fixes.
-    </para>
+      various problems have come to light since the shipped source was frozen to
+      be committed to DVDs.
+    </para>-->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -483,5 +526,5 @@
           <para>
             (kpathsearch) exists to look up a file in a list of directories
-            and is used by <command>kpsewhich</command>
+            and is used by <command>kpsewhich</command>.
           </para>
           <indexterm zone="texlive libkpathsea">
@@ -495,5 +538,5 @@
         <listitem>
           <para>
-            is a library for Japanese pTeX (publishing TeX)
+            is a library for Japanese pTeX (publishing TeX).
           </para>
           <indexterm zone="texlive libptexenc">
@@ -507,5 +550,5 @@
         <listitem>
           <para>
-            is the SyncTeX (Synchronize TeXnology) parser library
+            is the SyncTeX (Synchronize TeXnology) parser library.
           </para>
           <indexterm zone="texlive libsynctex">
@@ -519,5 +562,5 @@
         <listitem>
           <para>
-            provides Lua 5.2, modified for use with LuaTeX
+            provides Lua 5.2, modified for use with LuaTeX.
           </para>
           <indexterm zone="texlive libtexlua52">
@@ -531,5 +574,5 @@
         <listitem>
           <para>
-            provides LuaJIT, modified for use with LuaJITTeX
+            provides LuaJIT, modified for use with LuaJITTeX.
           </para>
           <indexterm zone="texlive libtexluajit">
Index: pst/typesetting/tl-installer.xml
===================================================================
--- pst/typesetting/tl-installer.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/typesetting/tl-installer.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,12 +5,12 @@
   %general-entities;
 
-  <!ENTITY tl-installer-download-http   "https://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz">
+  <!ENTITY tl-installer-download-http   "http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz">
 
   <!ENTITY tl-installer-download-ftp    " ">
-  <!ENTITY tl-installer-md5sum          "868c661c8f3c6c1fd7665a3a609390df">
-  <!ENTITY tl-installer-date             "20210413"> <!-- in the directory name -->
-  <!ENTITY tl-installer-size            "6.0 MB">
-
-  <!ENTITY tl-installer-buildsize        "7.1 GB if everything is included">
+  <!ENTITY tl-installer-md5sum          "769eb3849f931ca3efcbeeca093b95c0">
+  <!ENTITY tl-installer-date             "20200406"> <!-- in the directory name -->
+  <!ENTITY tl-installer-size            "3.8 MB">
+
+  <!ENTITY tl-installer-buildsize        "6.6 GB if everything is included">
   <!ENTITY tl-installer-time            "varies, depending on network speed and traffic">
 ]>
@@ -20,4 +20,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -43,6 +44,6 @@
       This page is for people who wish to use the binary installer to
       provide the programs, the scripts, and a lot of supporting files and
-      documentation.  The installer is updated frequently, so any published
-      md5sum will soon be out of date.  Newer versions of the
+      documentation.  The installer is updated frequently, so its md5sum will
+      change if it is newer than what is shown below.  Newer versions of the
       installer are expected to work with these instructions, for so long as
       they install to a
@@ -61,5 +62,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -77,6 +78,5 @@
       <listitem>
         <para>
-          <!--Download MD5 sum: &tl-installer-md5sum; (for &tl-installer-date;)-->
-          Download MD5 sum: Varies frequently
+          Download MD5 sum: &tl-installer-md5sum; (for &tl-installer-date;)
         </para>
       </listitem>
@@ -125,5 +125,4 @@
        <xref role="nodep" linkend="epdfview"/>).
     </para>
-<!-- seems to not be needed in 2021
     <para role="recommended">
       the optional non-wide-character ncurses library (for "some binary-only
@@ -131,5 +130,5 @@
       page in LFS is needed
       for xindy.run which is used by <application>xindy</application>
-    </para> -->
+    </para>
     <para role="recommended">
       The binary version of <application>asy</application> needs
@@ -207,27 +206,8 @@
     </para>
 
-    <para>
-      It has been established by debian that the <command>python</command>
-      scripts in <filename class="directory">latex-make</filename> will work
-      with <command>python3</command>, so update them to invoke that by running
-      the following command as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>for F in /opt/texlive/&texlive-year;/texmf-dist/scripts/latex-make/*.py ; do
-  test -f $F &amp;&amp; sed -i 's%/usr/bin/env python%/usr/bin/python3%' $F || true
-done
-</userinput></screen>
-
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <command>test -f $F &amp;&amp; sed ...</command>: in a small install these
-      files might not be present, so test if they exist and if not return 'true'
-      to avoid any error if this command has been copied into one of your own install scripts.
-    </para>
 
     <para>
Index: pst/typesetting/typesetting.xml
===================================================================
--- pst/typesetting/typesetting.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/typesetting/typesetting.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="pst-typesetting">
Index: pst/typesetting/xindy.xml
===================================================================
--- pst/typesetting/xindy.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/typesetting/xindy.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -79,5 +80,5 @@
         <para>
           Required patch: <ulink
-          url="&patch-root;/xindy-&xindy-version;-upstream_fixes-2.patch"/>
+          url="&patch-root;/xindy-&xindy-version;-upstream_fixes-1.patch"/>
         </para>
       </listitem>
@@ -111,5 +112,5 @@
 sed -i 's%\(indexentry\)%\1\\%' make-rules/inputenc/make-inp-rules.pl &amp;&amp;
 
-patch -Np1 -i ../xindy-&xindy-version;-upstream_fixes-2.patch &amp;&amp;
+patch -Np1 -i ../xindy-&xindy-version;-upstream_fixes-1.patch &amp;&amp;
 
 ./configure --prefix=/opt/texlive/&texlive-year;              \
@@ -156,5 +157,5 @@
 
     <para>
-      <command>patch -Np1 -i ../xindy-&xindy-version;-upstream_fixes-2.patch</command>:
+      <command>patch -Np1 -i ../xindy-&xindy-version;-upstream_fixes-1.patch</command>:
       <application>Xindy</application> is now maintained at CTAN. This patch
       updates the source with some of the changes made there (but ignoring
@@ -214,5 +215,5 @@
         <listitem>
           <para>
-            transforms a LaTeX index file into a xindy raw index file
+            transforms a LaTeX index file into a xindy raw index file.
           </para>
           <indexterm zone="xindy tex2xindy">
@@ -226,5 +227,5 @@
         <listitem>
           <para>
-            is a wrapper for xindy that turns on many LaTeX conventions by default
+            is a wrapper for xindy that turns on many LaTeX conventions by default.
           </para>
           <indexterm zone="xindy texindy">
@@ -238,5 +239,5 @@
         <listitem>
           <para>
-            creates a sorted and tagged index from a raw LaTeX index
+            creates a sorted and tagged index from a raw LaTeX index.
           </para>
           <indexterm zone="xindy xindy">
Index: pst/xml/docbook-45-xml.xml
===================================================================
--- pst/xml/docbook-45-xml.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/xml/docbook-45-xml.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY DocBook-download-http "https://www.docbook.org/xml/&docBook-45-xml-version;/docbook-xml-&docBook-45-xml-version;.zip">
+  <!ENTITY DocBook-download-http "http://www.docbook.org/xml/&docBook-45-xml-version;/docbook-xml-&docBook-45-xml-version;.zip">
   <!ENTITY DocBook-download-ftp  " ">
   <!ENTITY DocBook-md5sum        "03083e288e87a7e829e437358da7ef9e">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -211,13 +212,4 @@
     <sect3>
       <title>Configuration Information</title>
- 
-      <caution>
-        <para>
-          Various BLFS packages request
-          <application>DocBook XML DTD</application> version 4.x before
-          V&docBook-45-xml-version;, so the following step must be done for
-          those packages to be built successfully.
-        </para>
-      </caution>
 
       <para>
@@ -289,5 +281,5 @@
             contain a document type definition which defines the element
             types and the attribute lists that can be used in the corresponding
-            <filename>XML</filename> files
+            <filename>XML</filename> files.
           </para>
           <indexterm zone="DocBook DTD-files">
@@ -302,5 +294,5 @@
           <para>
             contain components of the document type definition that
-            are sourced into the <filename>DTD</filename> files
+            are sourced into the <filename>DTD</filename> files.
           </para>
           <indexterm zone="DocBook MOD-files">
@@ -314,5 +306,5 @@
         <listitem>
           <para>
-            contain lists of named character entities allowed in HTML
+            contain lists of named character entities allowed in HTML.
           </para>
           <indexterm zone="DocBook ENT-files">
Index: pst/xml/docbook-xsl.xml
===================================================================
--- pst/xml/docbook-xsl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/xml/docbook-xsl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -24,4 +24,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -43,5 +44,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -128,5 +129,5 @@
       <xref role="runtime" linkend="zip"/> 
          (to produce <quote>epub3</quote> documents), and
-      <ulink url="https://sourceforge.net/projects/saxon/files/saxon6/">
+      <ulink url="http://sourceforge.net/projects/saxon/files/saxon6/">
         Saxon6
       </ulink> and
@@ -311,5 +312,5 @@
         <listitem>
           <para>
-            are used for performing transformations on XML files
+            are used for performing transformations on XML files.
           </para>
           <indexterm zone="docbook-xsl xsl-stylesheets">
Index: pst/xml/docbook5.xml
===================================================================
--- pst/xml/docbook5.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/xml/docbook5.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -370,5 +371,5 @@
             contain the DocBook 5.0 document type definitions which define the
             element types and the attribute lists that can be used in the
-            corresponding <filename>XML</filename> files
+            corresponding <filename>XML</filename> files.
           </para>
           <indexterm zone="docbook5 DTD5-files">
@@ -383,5 +384,5 @@
           <para>
             contain the Docbook 5.0 RelaxNG, RelaxNG Compact, and Schematron
-            schema definitions
+            schema definitions.
           </para>
           <indexterm zone="docbook5 Schema5-files">
@@ -395,5 +396,5 @@
         <listitem>
           <para>
-            files contain DocBook-5.0 Schematron rules
+            files contain DocBook-5.0 Schematron rules.
           </para>
           <indexterm zone="docbook5 XSD5-files">
Index: pst/xml/docbook51.xml
===================================================================
--- pst/xml/docbook51.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/xml/docbook51.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -286,5 +287,5 @@
         <listitem>
           <para>
-            is a script to convert DocBook 4.x filed to DocBook 5.1
+            is a script to convert DocBook 4.x filed to DocBook 5.1.
           </para>
           <indexterm zone="docbook51 db4-entries-pl">
@@ -299,5 +300,5 @@
           <para>
             contain the Docbook 5.1 RelaxNG, RelaxNG Compact, and Schematron
-            schema definitions
+            schema definitions.
           </para>
           <indexterm zone="docbook51 Schema51-files">
@@ -312,5 +313,5 @@
           <para>
             is an XSL stylesheet to assist in conversion from DocBook 4.x files
-            to DocBook 5.1
+            to DocBook 5.1.
           </para>
           <indexterm zone="docbook51 db4-upgrade-xsl">
Index: pst/xml/itstool.xml
===================================================================
--- pst/xml/itstool.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/xml/itstool.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -143,5 +144,5 @@
         <listitem>
           <para>
-            is used to create translated XML files
+            is used to create translated XML files.
           </para>
           <indexterm zone="itstool itstool-prog">
Index: pst/xml/xml.xml
===================================================================
--- pst/xml/xml.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/xml/xml.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="pst-xml">
Index: pst/xml/xmlto.xml
===================================================================
--- pst/xml/xmlto.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ pst/xml/xmlto.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -86,5 +87,5 @@
       <xref role="runtime" linkend="fop"/>,
 <!--    <ulink url="http://dblatex.sourceforge.net/">dblatex</ulink>, and -->
-      <ulink url="https://sourceforge.net/projects/dblatex/files/dblatex/">dblatex</ulink>, and
+      <ulink url="http://sourceforge.net/projects/dblatex/files/dblatex/">dblatex</ulink>, and
       <ulink url="http://www.garshol.priv.no/download/xmltools/prod/PassiveTeX.html">
       PassiveTeX</ulink>
@@ -171,5 +172,5 @@
         <listitem>
           <para>
-            is a conditional processing instructions for XML
+            is a conditional processing instructions for XML.
           </para>
           <indexterm zone="xmlto xmlif">
@@ -183,5 +184,5 @@
         <listitem>
           <para>
-            applies an XSL stylesheet to an XML document
+            applies an XSL stylesheet to an XML document.
           </para>
           <indexterm zone="xmlto xmlto-prog">
Index: server/databases/databases.xml
===================================================================
--- server/databases/databases.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ server/databases/databases.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="server-databases">
Index: server/databases/db.xml
===================================================================
--- server/databases/db.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ server/databases/db.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -75,5 +76,4 @@
     <para role="optional">
       <!-- <xref linkend="tcl"/> and -->
-      <xref linkend="libnsl"/> and
       <xref linkend="sharutils"/> (for the <command>uudecode</command> command)
 
@@ -291,5 +291,5 @@
         <listitem>
           <para>
-            prints the pathnames of log files that are no longer in use
+            prints the pathnames of log files that are no longer in use.
           </para>
           <indexterm zone="db db_archive">
@@ -303,5 +303,5 @@
         <listitem>
           <para>
-            is a daemon process used to monitor and checkpoint database logs
+            is a daemon process used to monitor and checkpoint database logs.
           </para>
           <indexterm zone="db db_checkpoint">
@@ -315,5 +315,5 @@
         <listitem>
           <para>
-            is used to abort lock requests when deadlocks are detected
+            is used to abort lock requests when deadlocks are detected.
           </para>
           <indexterm zone="db db_deadlock">
@@ -328,5 +328,5 @@
           <para>
             converts database files to a flat file format readable by
-            <command>db_load</command>
+            <command>db_load</command>.
           </para>
           <indexterm zone="db db_dump">
@@ -341,5 +341,5 @@
           <para>
             creates "hot backup" or "hot failover" snapshots of Berkeley DB
-            databases
+            databases.
           </para>
           <indexterm zone="db db_hotbackup">
@@ -354,5 +354,5 @@
           <para>
             is used to create database files from flat files created with
-            <command>db_dump</command>
+            <command>db_dump</command>.
           </para>
           <indexterm zone="db db_load">
@@ -366,5 +366,5 @@
         <listitem>
           <para>
-            verifies the log files of a database
+            verifies the log files of a database.
           </para>
           <indexterm zone="db db_log_verify">
@@ -378,5 +378,5 @@
         <listitem>
           <para>
-            converts database log files to human readable text
+            converts database log files to human readable text.
           </para>
           <indexterm zone="db db_printlog">
@@ -390,5 +390,5 @@
         <listitem>
           <para>
-            is used to restore a database to a consistent state after a failure
+            is used to restore a database to a consistent state after a failure.
           </para>
           <indexterm zone="db db_recover">
@@ -403,5 +403,5 @@
           <para>
             is a daemon process that provides replication/HA services on a
-            transactional environment
+            transactional environment.
           </para>
           <indexterm zone="db db_replicate">
@@ -415,5 +415,5 @@
         <listitem>
           <para>
-            displays database environment statistics
+            displays database environment statistics.
           </para>
           <indexterm zone="db db_stat">
@@ -428,5 +428,5 @@
           <para>
             analyzes the data in a btree database, and suggests a page size that
-            is likely to deliver optimal operation
+            is likely to deliver optimal operation.
           </para>
           <indexterm zone="db db_tuner">
@@ -441,5 +441,5 @@
           <para>
             is used to upgrade database files to a newer version of
-            <application>Berkeley DB</application>
+            <application>Berkeley DB</application>.
           </para>
           <indexterm zone="db db_upgrade">
@@ -453,5 +453,5 @@
         <listitem>
           <para>
-            is used to run consistency checks on database files
+            is used to run consistency checks on database files.
           </para>
           <indexterm zone="db db_verify">
@@ -462,4 +462,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: server/databases/lmdb.xml
===================================================================
--- server/databases/lmdb.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ server/databases/lmdb.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY lmdb-download-http "https://github.com/LMDB/lmdb/archive/LMDB_&lmdb-version;.tar.gz">
   <!ENTITY lmdb-download-ftp  " ">
-  <!ENTITY lmdb-md5sum        "84cc7cac4bf15486536560f171297a49">
+  <!ENTITY lmdb-md5sum        "c3e3474daf4a59685d154cc7fc5c99ad">
   <!ENTITY lmdb-size          "144 KB">
-  <!ENTITY lmdb-buildsize     "6.1 MB">
+  <!ENTITY lmdb-buildsize     "5.9 MB">
   <!ENTITY lmdb-time          "less than 0.1 SBU">
 ]>
@@ -17,5 +17,6 @@
 
   <sect1info>
-    <date>$Date$</date>
+    <othername>$LastChangedBy: bdubbs $</othername>
+    <date>$Date: 2015-10-18 13:08:53 -0500 (Sun, 18 Oct 2015) $</date>
   </sect1info>
 
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: server/databases/mariadb.xml
===================================================================
--- server/databases/mariadb.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ server/databases/mariadb.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,8 +8,8 @@
   <!ENTITY mariadb-download-http "https://downloads.mariadb.org/interstitial/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz"> 
   <!ENTITY mariadb-download-ftp  "ftp://mirrors.fe.up.pt/pub/mariadb/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz">
-  <!ENTITY mariadb-md5sum        "0eca3038fbcf56d157c248e6a8b0f5f2">
-  <!ENTITY mariadb-size          "81 MB">
-  <!ENTITY mariadb-buildsize     "2.3 GB (650 MB installed)">
-  <!ENTITY mariadb-time          "7.8 SBU (with parallelism=4, add 0.4 SBU for tests)">
+  <!ENTITY mariadb-md5sum        "83e6a957f9be5698dd711b64a509901f">
+  <!ENTITY mariadb-size          "84 MB">
+  <!ENTITY mariadb-buildsize     "2.3 GB (644 MB installed)">
+  <!ENTITY mariadb-time          "7.0 SBU (with parallelism=4, add 0.5 SBU for tests)">
 ]>
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -100,5 +101,5 @@
       <xref linkend="linux-pam"/>,
       <xref linkend="mitkrb"/>,
-      <xref linkend="pcre2"/>,
+      <xref linkend="pcre"/>,
       <xref linkend="ruby"/>,
       <xref linkend="unixodbc"/>,
@@ -106,10 +107,9 @@
       <ulink url="http://groonga.org/">Groonga</ulink>,
       <ulink url="http://www.phontron.com/kytea/">KyTea</ulink>,
-      <ulink url="https://sourceforge.net/projects/judy/">Judy</ulink>,
+      <ulink url="http://sourceforge.net/projects/judy/">Judy</ulink>,
       <ulink url="https://github.com/Cyan4973/lz4">lz4</ulink>,
       <ulink url="http://taku910.github.io/mecab">MeCab</ulink>,
       <ulink url="http://msgpack.org/">MessagePack</ulink>,
       <ulink url="http://www.mruby.org/">mruby</ulink>,
-      <ulink url="https://google.github.io/snappy/">Snappy</ulink>,
       <ulink url="http://sphinxsearch.com/downloads/">Sphinx</ulink>,
       <ulink url="https://mariadb.com/kb/en/mariadb/tokudb/">TokuDB</ulink>, and
@@ -142,11 +142,5 @@
 <screen role="root"><userinput>groupadd -g 40 mysql &amp;&amp;
 useradd -c "MySQL Server" -d /srv/mysql -g mysql -s /bin/false -u 40 mysql</userinput></screen>
-<!--
-    <para>
-      Fix a syntax error that causes CMake to fail:
-    </para>
-
-<screen><userinput remap="pre">sed -i 's/END()/ENDIF()/' libmariadb/cmake/ConnectorName.cmake</userinput></screen>
--->
+
     <para>
       Install <application>MariaDB</application> by running the
@@ -210,5 +204,5 @@
       <parameter>-DWITH_EMBEDDED_SERVER=ON</parameter>: This switch enables
       compiling the embedded server library needed by certain applications,
-      such as <application>Amarok</application>.
+      such as <application>Amarok</application>..
     </para>
 
@@ -420,12 +414,11 @@
           aria_s3_copy, galera_new_cluster, galera_recovery,
           innochecksum, mariabackup, mariadb, mariadbd, mariadb-access,
-          mariadb-admin, mariadb-backup, mariadb-binlog, mariadb-check,
-          mariadb-client-test, mariadb-client-test-embedded, mariadb-conv,
-          mariadb-convert-table-format, mariadb-find-rows, mariadbd-multi, 
-          mariadbd-safe, mariadbd-safe-helper, mariadb-dump, mariadb-dumpslow,
+          mariadb-admin, mariadb-binlog, mariadb-check, mariadb-client-test,
+          mariadb-client-test-embedded, mariadb-conv,
+          mariadb-convert-table-format, mariadbd-multi, mariadbd-safe,
+          mariadbd-safe-helper, mariadb-dump, mariadb-dumpslow,
           mariadb-embedded, mariadb-fix-extensions, mariadb-hotcopy,
           mariadb-import, mariadb-install-db, mariadb-ldb, mariadb-plugin,
-          mariadb-secure-installation, mariadb-setpermission,
-          mariadb-service-convert, mariadb-show,
+          mariadb-secure-installation, mariadb-setpermission, mariadb-show,
           mariadb-slap, mariadb-test, mariadb-test-embedded,
           mariadb-tzinfo-to-sql, mariadb-upgrade, mariadb-waitpid,
@@ -437,5 +430,5 @@
         </seg>
         <seg>
-          libmariadbclient.a, libmariadb.so, libmariadbd.so, libmysqlclient.a,
+          libmariadbclient.a, libmariadb.so, libmysqlclient.a,
           libmysqlclient_r.a (symbolic links to libmariadbclient.a),
           libmysqld.{so,a}, libmysqlservices.a,
@@ -444,6 +437,5 @@
         <seg>
           /etc/mysql,
-          /usr/{include,lib,share}/mysql,
-          /usr/share/groonga{-normalizer-mysql}, and
+          /usr/{include,lib,share}/mysql, and
           /usr/share/doc/mariadb-&mariadb-version;
         </seg>
@@ -482,5 +474,5 @@
           <para>
             is used to check, repair, optimize, sort and get information
-            about Aria tables
+            about Aria tables.
           </para>
           <indexterm zone="mariadb aria_chk-mariadb">
@@ -494,5 +486,5 @@
         <listitem>
           <para>
-            is a tool to dump the contents of Aria log pages
+            is a tool to dump content of Aria log pages.
           </para>
           <indexterm zone="mariadb aria_dump_log-mariadb">
@@ -506,5 +498,5 @@
         <listitem>
           <para>
-            displays full-text index information
+            displays full-text index information.
           </para>
           <indexterm zone="mariadb aria_ftdump-mariadb">
@@ -518,5 +510,5 @@
         <listitem>
           <para>
-            is a tool to generate compressed, read-only Aria tables
+            is a tool to generate compressed, read-only Aria tables.
           </para>
           <indexterm zone="mariadb aria_pack-mariadb">
@@ -530,5 +522,5 @@
         <listitem>
           <para>
-            displays Aria log file contents
+            displays Aria log file contents.
           </para>
           <indexterm zone="mariadb aria_read_log-mariadb">
@@ -542,5 +534,5 @@
         <listitem>
           <para>
-            copies an aria table to and from AWS S3
+            copies an aria table to and from AWS S3.
           </para>
           <indexterm zone="mariadb aria_s3_copy-mariadb">
@@ -554,5 +546,5 @@
          <listitem>
            <para>
-             bootstraps a new Galera cluster
+             bootstraps a new Galera cluster.
            </para>
            <indexterm zone="mariadb galera_new_cluster-mariadb">
@@ -566,5 +558,5 @@
         <listitem>
           <para>
-            recovers data from a Galera cluster
+            recovers data from a Galera cluster.
           </para>
           <indexterm zone="mariadb galera_recovery-mariadb">
@@ -578,5 +570,5 @@
         <listitem>
           <para>
-            prints checksums for InnoDB files
+            prints checksums for InnoDB files.
           </para>
           <indexterm zone="mariadb innochecksum-mariadb">
@@ -590,5 +582,5 @@
         <listitem>
           <para>
-            is an open source backup tool for InnoDB and XtraDB
+            is an open source backup tool for InnoDB and XtraDB.
           </para>
           <indexterm zone="mariadb mariabackup-mariadb">
@@ -602,5 +594,5 @@
         <listitem>
           <para>
-             is a simple SQL shell with input line editing capabilities
+             is a simple SQL shell with input line editing capabilities.
           </para>
           <indexterm zone="mariadb mariadb-mariadb">
@@ -614,5 +606,5 @@
         <listitem>
           <para>
-            is the MySQL server daemon
+            is the MySQL server daemon.
           </para>
           <indexterm zone="mariadb mariadbd-mariadb">
@@ -627,5 +619,5 @@
           <para>
             checks the access privileges for a host name, user name, and
-            database combination
+            database combination.
           </para>
           <indexterm zone="mariadb mariadb-access-mariadb">
@@ -639,5 +631,5 @@
         <listitem>
           <para>
-            is a client for performing administrative operations
+            is a client for performing administrative operations.
           </para>
           <indexterm zone="mariadb mariadb-admin-mariadb">
@@ -651,5 +643,5 @@
         <listitem>
           <para>
-            reads binary log files
+            read binary log files.
           </para>
           <indexterm zone="mariadb mariadb-binlog-mariadb">
@@ -664,5 +656,5 @@
           <para>
             performs table maintenance: It checks, repairs, optimizes,
-            or analyzes tables
+            or analyzes tables.
           </para>
           <indexterm zone="mariadb mariadb-check-mariadb">
@@ -677,5 +669,5 @@
           <para>
             is used for testing aspects of the MySQL client API that cannot be
-            tested using mysqltest and its test language
+            tested using mysqltest and its test language.
           </para>
           <indexterm zone="mariadb mariadb-client-test-mariadb">
@@ -689,5 +681,5 @@
         <listitem>
           <para>
-            is a tool to test the client API for the embedded server
+            is a tool to test client API for embedded server.
           </para>
           <indexterm zone="mariadb mariadb-client-test-embedded-mariadb">
@@ -701,5 +693,5 @@
         <listitem>
           <para>
-            converts character sets for use with MariaDB
+            converts character sets for use with MariaDB.
           </para>
           <indexterm zone="mariadb mariadb-conv-mariadb">
@@ -714,5 +706,5 @@
           <para>
             converts the tables in a database to use a particular storage
-            engine
+            engine.
           </para>
           <indexterm zone="mariadb mariadb-convert-table-format-mariadb">
@@ -727,5 +719,5 @@
           <para>
             is designed to manage several mysqld processes that listen for
-            connections on different Unix socket files and TCP/IP ports
+            connections on different Unix socket files and TCP/IP ports.
           </para>
           <indexterm zone="mariadb mariadbd-multi-mariadb">
@@ -740,5 +732,5 @@
           <para>
              is the recommended way to start a mysqld server on Unix
-             and NetWare
+             and NetWare.
           </para>
           <indexterm zone="mariadb mariadbd-safe-mariadb">
@@ -752,5 +744,5 @@
         <listitem>
           <para>
-            is a backup program
+            is a backup program.
           </para>
           <indexterm zone="mariadb mariadb-dump-mariadb">
@@ -765,5 +757,5 @@
           <para>
             parses MySQL slow query log files and prints a summary of their
-            contents
+            contents.
           </para>
           <indexterm zone="mariadb mariadb-dumpslow-mariadb">
@@ -778,5 +770,5 @@
           <para>
             is a MySQL client statically linked to
-            libmariadbd
+            libmariadbd.
           </para>
           <indexterm zone="mariadb mariadb-embedded-mariadb">
@@ -792,5 +784,5 @@
             reads files containing SQL statements and extracts statements that
             match a given regular expression or that contain USE db_name or
-            SET statements
+            SET statements.
           </para>
           <indexterm zone="mariadb mariadb-find-rows-mariadb">
@@ -805,5 +797,5 @@
           <para>
             converts the extensions for MyISAM (or ISAM) table files to
-            their canonical forms
+            their canonical forms.
           </para>
           <indexterm zone="mariadb mariadb-fix-extensions-mariadb">
@@ -817,6 +809,6 @@
         <listitem>
           <para>
-            locks the table, flushes the table and then performs a copy of
-            the database
+            locks the table, flush the table and then performs a copy of
+            the database.
           </para>
           <indexterm zone="mariadb mariadb-hotcopy-mariadb">
@@ -831,5 +823,5 @@
           <para>
             reads a range of data formats, and inserts the data into a
-            database
+            database.
           </para>
           <indexterm zone="mariadb mariadb-import-mariadb">
@@ -844,5 +836,5 @@
           <para>
             initializes the MySQL data directory and creates the system
-            tables that it contains, if they do not exist
+            tables that it contains, if they do not exist.
           </para>
           <indexterm zone="mariadb mariadb-install-db-mariadb">
@@ -856,5 +848,5 @@
         <listitem>
           <para>
-            is the RocksDB tool
+            is the RocksDB tool.
           </para>
           <indexterm zone="mariadb mariadb-ldb-mariadb">
@@ -869,5 +861,5 @@
           <para>
             is a utility that enables MySQL administrators to manage which
-            plugins a MySQL server loads
+            plugins a MySQL server loads.
           </para>
           <indexterm zone="mariadb mariadb-plugin-mariadb">
@@ -881,5 +873,5 @@
         <listitem>
           <para>
-            is a tool to improve MySQL installation security
+            is a tool to improve MySQL installation security.
           </para>
           <indexterm zone="mariadb mariadb-secure-installation-mariadb">
@@ -889,21 +881,9 @@
       </varlistentry>
 
-      <varlistentry id="mariadb-service-convert-mariadb">
-        <term><command>mariadb-service-convert</command></term>
-        <listitem>
-          <para>
-            generates a systemd unit based on the current mariadb settings
-          </para>
-          <indexterm zone="mariadb mariadb-service-convert-mariadb">
-            <primary sortas="b-mariadb-service-convert-mariadb">mariadb-service-convert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="mariadb-setpermission-mariadb">
         <term><command>mariadb-setpermission</command></term>
         <listitem>
           <para>
-            sets permissions in the MySQL grant tables
+            sets permissions in the MySQL grant tables.
           </para>
           <indexterm zone="mariadb mariadb-setpermission-mariadb">
@@ -917,5 +897,5 @@
         <listitem>
           <para>
-            shows the structure of a MariaDB database
+            shows the structure of a MariaDB database.
           </para>
           <indexterm zone="mariadb mariadb-show-mariadb">
@@ -930,5 +910,5 @@
           <para>
             is a diagnostic program designed to emulate client load for a
-            MySQL server and to report the timing of each stage
+            MySQL server and to report the timing of each stage.
           </para>
           <indexterm zone="mariadb mariadb-slap-mariadb">
@@ -943,5 +923,5 @@
           <para>
             runs a test case against a MySQL server and optionally compares
-            the output with a result file
+            the output with a result file.
           </para>
           <indexterm zone="mariadb mariadb-test-mariadb">
@@ -956,5 +936,5 @@
           <para>
             is similar to the <command>mysqltest</command> command but is built
-            with support for the libmysqld embedded server
+            with support for the libmysqld embedded server.
           </para>
           <indexterm zone="mariadb mariadb-test-embedded-mariadb">
@@ -968,5 +948,5 @@
         <listitem>
           <para>
-            loads the time zone tables in the mysql database
+            loads the time zone tables in the mysql database.
           </para>
           <indexterm zone="mariadb mariadb-tzinfo-to-sql-mariadb">
@@ -981,5 +961,5 @@
           <para>
             examines all tables in all databases for incompatibilities with
-            the current version of MySQL Server
+            the current version of MySQL Server.
           </para>
           <indexterm zone="mariadb mariadb-upgrade-mariadb">
@@ -993,5 +973,5 @@
         <listitem>
           <para>
-            signals a process to terminate and waits for the process to exit
+            signals a process to terminate and waits for the process to exit.
           </para>
           <indexterm zone="mariadb mariadb-waitpid-mariadb">
@@ -1005,5 +985,5 @@
         <listitem>
           <para>
-            gets compiler flags for using the MariaDB Connector/C
+            gets compiler flags for using the MariaDB Connector/C.
           </para>
           <indexterm zone="mariadb mariadb_config-mariadb">
@@ -1029,5 +1009,5 @@
         <listitem>
           <para>
-            is a tool to convert mSQL programs for use with MySQL
+            is a tool to convert mSQL programs for use with MySQL.
           </para>
           <indexterm zone="mariadb msql2mysql-mariadb">
@@ -1041,5 +1021,5 @@
         <listitem>
           <para>
-            displays the options from option groups of option files
+            displays the options from option groups of option files.
           </para>
           <indexterm zone="mariadb my_print_defaults-mariadb">
@@ -1053,5 +1033,5 @@
         <listitem>
           <para>
-            displays information about FULLTEXT indexes in MyISAM tables
+            displays information about FULLTEXT indexes in MyISAM tables.
           </para>
           <indexterm zone="mariadb myisam_ftdump-mariadb">
@@ -1066,5 +1046,5 @@
           <para>
             gets information about your database tables or checks, repairs,
-            or optimizes them
+            or optimizes them.
           </para>
           <indexterm zone="mariadb myisamchk-mariadb">
@@ -1078,5 +1058,5 @@
         <listitem>
           <para>
-            displays MyISAM log file contents
+            displays MyISAM log file contents.
           </para>
           <indexterm zone="mariadb myisamlog-mariadb">
@@ -1090,5 +1070,5 @@
         <listitem>
           <para>
-            is a tool for compressing MyISAM tables
+            is a tool for compressing MyISAM tables.
           </para>
           <indexterm zone="mariadb myisampack-mariadb">
@@ -1103,5 +1083,5 @@
           <para>
             provides you with useful information for compiling your MySQL
-            client and connecting it to MySQL
+            client and connecting it to MySQL.
           </para>
           <indexterm zone="mariadb mysql_config-mariadb">
@@ -1116,5 +1096,5 @@
           <para>
             is a console-based tool for monitoring the threads and overall
-            performance of a MySQL server
+            performance of a MySQL server.
           </para>
           <indexterm zone="mariadb mytop-mariadb">
@@ -1129,5 +1109,5 @@
           <para>
             is a utility that displays descriptions for system or storage
-            engine error codes
+            engine error codes.
           </para>
           <indexterm zone="mariadb perror-mariadb">
@@ -1141,5 +1121,5 @@
         <listitem>
           <para>
-            is a MariaDB/MySQL extension to the SQL standard
+            is a MariaDB/MySQL extension to the SQL standard.
           </para>
           <indexterm zone="mariadb replace-mariadb">
@@ -1153,5 +1133,5 @@
         <listitem>
           <para>
-            resolves a numeric stack dump to symbols
+            resolves a numeric stack dump to symbols.
           </para>
           <indexterm zone="mariadb resolve_stack_dump-mariadb">
@@ -1166,5 +1146,5 @@
           <para>
             is a utility for resolving IP addresses to host names and
-            vice versa
+            vice versa.
           </para>
           <indexterm zone="mariadb resolveip-mariadb">
@@ -1178,5 +1158,5 @@
         <listitem>
           <para>
-            dumps the content of sst files (the format used by RocksDB)
+            dumps the content of sst files (the format used by RocksDB).
           </para>
           <indexterm zone="mariadb sst_sump-mariadb">
Index: server/databases/postgresql.xml
===================================================================
--- server/databases/postgresql.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ server/databases/postgresql.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,11 +5,11 @@
   %general-entities;
 
-  <!ENTITY postgresql-download-http "https://ftp.postgresql.org/pub/source/v&postgresql-version;/postgresql-&postgresql-version;.tar.bz2">
+  <!ENTITY postgresql-download-http "http://ftp.postgresql.org/pub/source/v&postgresql-version;/postgresql-&postgresql-version;.tar.bz2">
   <!--  <!ENTITY postgresql-download-ftp  "ftp://ftp.postgresql.org/pub/source/v&postgresql-version;/postgresql-&postgresql-version;.tar.bz2"> -->
   <!ENTITY postgresql-download-ftp  " ">
-  <!ENTITY postgresql-md5sum        "7bda65a37c46b8b2c1933d9d1cd677f2">
+  <!ENTITY postgresql-md5sum        "d843a4fcc0ed1493511028aa6c17117a">
   <!ENTITY postgresql-size          "20 MB">
-  <!ENTITY postgresql-buildsize     "193 MB (add 38 MB for tests)">
-  <!ENTITY postgresql-time          "0.6 SBU (with parallelism=4, add 0.1 SBU for tests)">
+  <!ENTITY postgresql-buildsize     "239 MB (add 38 MB for tests)">
+  <!ENTITY postgresql-time          "0.7 SBU (with parallelism=4, add 0.1 SBU for tests)">
 ]>
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -78,5 +79,4 @@
       <xref linkend="python2"/>,
       <!-- <xref linkend="tcl"/>, -->
-      <xref linkend="icu"/>,
       <xref linkend="libxml2"/>,
       <xref linkend="libxslt"/>,
@@ -200,5 +200,5 @@
 
     <para>
-      <command>sed -i ...</command>: This sed changes the server socket location
+      <command>sed -i ...</command>: This sed changes server socket location
       from <filename class="directory">/tmp</filename> to
       <filename class="directory">/run/postgresql</filename><!-- and fix up the
@@ -355,5 +355,5 @@
           pg_config, pg_controldata, pg_ctl, pg_dump, pg_dumpall, pg_isready,
           pg_receivewal, pg_recvlogical, pg_resetwal, pg_restore, pg_rewind,
-          pg_test_fsync, pg_test_timing, pg_upgrade, pg_verifybackup,
+          pg_test_fsync, pg_test_timing, pg_upgrade, pg_verify_backup,
           pg_waldump, pgbench,
           postgres, postmaster (deprecated), psql, reindexdb, vacuumdb,
@@ -388,5 +388,5 @@
           <para>
             is a utility for reclustering tables in a
-            <application>PostgreSQL</application> database
+            <application>PostgreSQL</application> database.
           </para>
           <indexterm zone="postgresql clusterdb">
@@ -401,5 +401,5 @@
           <para>
             creates a new <application>PostgreSQL</application>
-            database
+            database.
           </para>
           <indexterm zone="postgresql createdb">
@@ -414,5 +414,5 @@
           <para>
             defines a new <application>PostgreSQL</application>
-            user account
+            user account.
           </para>
           <indexterm zone="postgresql createuser">
@@ -426,5 +426,5 @@
         <listitem>
           <para>
-            removes a <application>PostgreSQL</application> database
+            removes a <application>PostgreSQL</application> database.
           </para>
           <indexterm zone="postgresql dropdb">
@@ -438,5 +438,5 @@
         <listitem>
           <para>
-            removes a <application>PostgreSQL</application> user account
+            removes a <application>PostgreSQL</application> user account.
           </para>
           <indexterm zone="postgresql dropuser">
@@ -450,5 +450,5 @@
         <listitem>
           <para>
-            is the embedded SQL preprocessor
+            is the embedded SQL preprocessor.
           </para>
           <indexterm zone="postgresql ecpg">
@@ -462,5 +462,5 @@
         <listitem>
           <para>
-            creates a new database cluster
+            creates a new database cluster.
           </para>
           <indexterm zone="postgresql initdb">
@@ -475,5 +475,5 @@
           <para>
             resolves OIDs (Object IDs) and file nodes in a PostgreSQL data
-            directory
+            directory.
           </para>
           <indexterm zone="postgresql oid2name">
@@ -487,5 +487,5 @@
         <listitem>
           <para>
-            cleans up PostgreSQL WAL (write-ahead log) archive files
+            cleans up PostgreSQL WAL (write-ahead log) archive files.
           </para>
           <indexterm zone="postgresql pg_archivecleanup">
@@ -500,5 +500,5 @@
           <para>
             takes base backups of a running
-            <application>PostgreSQL</application> cluster
+            <application>PostgreSQL</application> cluster.
           </para>
           <indexterm zone="postgresql pg_basebackup">
@@ -513,5 +513,5 @@
           <para>
             enables, disables, or checks data checksums in a
-            <application>PostgreSQL</application> database cluster
+            <application>PostgreSQL</application> database cluster.
           </para>
           <indexterm zone="postgresql pg_checksums">
@@ -526,5 +526,5 @@
           <para>
             retrieves <application>PostgreSQL</application> version
-            information
+            information.
           </para>
           <indexterm zone="postgresql pg_config">
@@ -539,5 +539,5 @@
           <para>
             returns information initialized during <command>initdb</command>,
-            such as the catalog version and server locale
+            such as the catalog version and server locale.
           </para>
           <indexterm zone="postgresql pg_controldata">
@@ -551,5 +551,5 @@
         <listitem>
           <para>
-            controls stopping and starting the database server
+            controls stopping and starting the database server.
           </para>
           <indexterm zone="postgresql pg_ctl">
@@ -564,5 +564,5 @@
           <para>
             dumps database data and metadata into scripts which are used
-            to recreate the database
+            to recreate the database.
           </para>
           <indexterm zone="postgresql pg_dump">
@@ -577,5 +577,5 @@
           <para>
             recursively calls <command>pg_dump</command> for each
-            database in a cluster
+            database in a cluster.
           </para>
           <indexterm zone="postgresql pg_dumpall">
@@ -589,5 +589,5 @@
         <listitem>
           <para>
-            checks the connection status of a PostgreSQL server
+            checks the connection status of a PostgreSQL server.
           </para>
           <indexterm zone="postgresql pg_isready">
@@ -601,5 +601,5 @@
         <listitem>
           <para>
-            is used to stream write-ahead logs from a PostgreSQL server
+            is used to stream write-ahead logs from a PostgreSQL server.
           </para>
           <indexterm zone="postgresql pg_receivewal">
@@ -613,5 +613,5 @@
         <listitem>
           <para>
-            controls PostgreSQL logical decoding streams
+            controls PostgreSQL logical decoding streams.
           </para>
           <indexterm zone="postgresql pg_recvlogical">
@@ -626,5 +626,5 @@
           <para>
             resets the write-ahead log and other control information
-            of a PostgreSQL database cluster
+            of a PostgreSQL database cluster.
           </para>
           <indexterm zone="postgresql pg_resetwal">
@@ -639,5 +639,5 @@
           <para>
             creates databases from dump files created by
-            <command>pg_dump</command>
+            <command>pg_dump</command>.
           </para>
           <indexterm zone="postgresql pg_restore">
@@ -652,5 +652,5 @@
           <para>
             synchronizes a PostgreSQL data directory with another data
-            directory that was forked from the first one
+            directory that was forked from the first one.
           </para>
           <indexterm zone="postgresql pg_rewind">
@@ -664,5 +664,5 @@
         <listitem>
           <para>
-            supports the creation of a PostgreSQL warm standby server
+            supports the creation of a PostgreSQL warm standby server.
           </para>
           <indexterm zone="postgresql pg_standby">
@@ -676,5 +676,5 @@
         <listitem>
           <para>
-            determines the fastest wal_sync method for PostgreSQL
+            determines fastest wal_sync method for PostgreSQL.
           </para>
           <indexterm zone="postgresql pg_test_fsync">
@@ -688,5 +688,5 @@
         <listitem>
           <para>
-            measures timing overhead
+            measures timing overhead.
           </para>
           <indexterm zone="postgresql pg_test_timing">
@@ -700,5 +700,5 @@
         <listitem>
           <para>
-            upgrades a PostgreSQL server instance
+            upgrades a PostgreSQL server instance.
           </para>
           <indexterm zone="postgresql pg_upgrade">
@@ -712,5 +712,5 @@
         <listitem>
           <para>
-            verifies the integrity of a base backup of a PostgreSQL cluster
+            verifies the integrity of a base backup of a PostgreSQL cluster.
           </para>
           <indexterm zone="postgresql pg_verifybackup">
@@ -725,5 +725,5 @@
           <para>
             displays a human-readable rendering of the write-ahead log of a
-            PostgreSQL database cluster
+            PostgreSQL database cluster.
           </para>
           <indexterm zone="postgresql pg_waldump">
@@ -737,5 +737,5 @@
         <listitem>
           <para>
-            runs a benchmark test on PostgreSQL
+            runs a benchmark test on PostgreSQL.
           </para>
           <indexterm zone="postgresql pgbench">
@@ -751,7 +751,7 @@
             is a support script used to delete a module from a
             PL/<application>Tcl</application> table. The command
-            requires the
-            <ulink url="http://flightaware.github.io/Pgtcl/">Pgtcl</ulink>
-            package to be installed
+            requires the <ulink
+            url="http://flightaware.github.io/Pgtcl/">Pgtcl</ulink>
+            package to be installed also.
           </para>
           <indexterm zone="postgresql pltcl_delmod">
@@ -767,7 +767,7 @@
             is a support script used to list the modules in a
             PL/<application>Tcl</application> table. The command
-            requires the
-            <ulink url="http://gborg.postgresql.org/project/pgtcl/">Pgtcl</ulink>
-            package to be installed
+            requires the <ulink
+            url="http://gborg.postgresql.org/project/pgtcl/">Pgtcl</ulink>
+            package to be installed also.
           </para>
           <indexterm zone="postgresql pltcl_listmod">
@@ -783,7 +783,7 @@
             is a support script used to load a module into a
             PL/<application>Tcl</application> table. The command
-            requires the
-            <ulink url="http://gborg.postgresql.org/project/pgtcl/">Pgtcl</ulink>
-            package to be installed too
+            requires the <ulink
+            url="http://gborg.postgresql.org/project/pgtcl/">Pgtcl</ulink>
+            package to be installed also.
           </para>
           <indexterm zone="postgresql pltcl_loadmod">
@@ -797,5 +797,5 @@
         <listitem>
           <para>
-            is the PostgreSQL database server
+            is the PostgreSQL database server.
           </para>
           <indexterm zone="postgresql postgres">
@@ -810,5 +810,5 @@
           <para>
             (deprecated, a symlink to <command>postgres</command>) is a
-            multi-user database daemon
+            multi-user database daemon.
           </para>
           <indexterm zone="postgresql postmaster">
@@ -822,5 +822,5 @@
         <listitem>
           <para>
-            is a console based database shell
+            is a console based database shell.
           </para>
           <indexterm zone="postgresql psql">
@@ -834,5 +834,5 @@
         <listitem>
           <para>
-            is a utility for rebuilding indexes in a database
+            is a utility for rebuilding indexes in a database.
           </para>
           <indexterm zone="postgresql reindexdb">
@@ -846,5 +846,5 @@
         <listitem>
           <para>
-            compacts databases and generates statistics for the query analyzer
+            compacts databases and generates statistics for the query analyzer.
           </para>
           <indexterm zone="postgresql vacuumdb">
@@ -858,5 +858,5 @@
         <listitem>
           <para>
-            removes orphaned large objects from a PostgreSQL database
+            removes orphaned large objects from a PostgreSQL database.
           </para>
           <indexterm zone="postgresql vacuumlo">
@@ -867,8 +867,8 @@
 
       <varlistentry id="libecpg">
-        <term><filename class="libraryfile">libecpg.{so,a}</filename></term>
-        <listitem>
-          <para>
-            contains functions to support embedded SQL in C programs
+        <term><filename class='libraryfile'>libecpg.{so,a}</filename></term>
+        <listitem>
+          <para>
+            contains functions to support embedded SQL in C programs.
           </para>
           <indexterm zone="postgresql libecpg">
@@ -879,8 +879,8 @@
 
       <varlistentry id="libecpg_compat">
-        <term><filename class="libraryfile">libecpg_compat.{so,a}</filename></term>
-        <listitem>
-          <para>
-            is the ecpg compatibility library
+        <term><filename class='libraryfile'>libecpg_compat.{so,a}</filename></term>
+        <listitem>
+          <para>
+            is the ecpg compatibility library.
           </para>
           <indexterm zone="postgresql libecpg_compat">
@@ -891,8 +891,8 @@
 
       <varlistentry id="libgport">
-        <term><filename class="libraryfile">libgport.a</filename></term>
-        <listitem>
-          <para>
-            is the port-specific subsystem of the Postgres backend
+        <term><filename class='libraryfile'>libgport.a</filename></term>
+        <listitem>
+          <para>
+            is the port-specific subsystem of the Postgres backend.
           </para>
           <indexterm zone="postgresql libgport">
@@ -903,8 +903,8 @@
 
       <varlistentry id="libpgtypes">
-        <term><filename class="libraryfile">libpgtypes.{so,a}</filename></term>
-        <listitem>
-          <para>
-            contains functions for dealing with Postgres data types
+        <term><filename class='libraryfile'>libpgtypes.{so,a}</filename></term>
+        <listitem>
+          <para>
+            contains functions for dealing with Postgres data types.
           </para>
           <indexterm zone="postgresql libpgtypes">
@@ -915,8 +915,8 @@
 
       <varlistentry id="libpq">
-        <term><filename class="libraryfile">libpq.{so,a}</filename></term>
-        <listitem>
-          <para>
-            is the C programmer's API to Postgres
+        <term><filename class='libraryfile'>libpq.{so,a}</filename></term>
+        <listitem>
+          <para>
+            is the C programmer's API to Postgres.
           </para>
           <indexterm zone="postgresql libpq">
Index: server/databases/sqlite.xml
===================================================================
--- server/databases/sqlite.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ server/databases/sqlite.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,19 +5,19 @@
   %general-entities;
 
-  <!ENTITY sqlite-dl-version    "3360000">
-  <!ENTITY sqlite-doc-version   "3360000">
+  <!ENTITY sqlite-dl-version    "3340000">
+  <!ENTITY sqlite-doc-version   "3340000">
 
 <!-- When updating, do not forget the above entities -->
 
-  <!ENTITY sqlite-download-http "https://sqlite.org/2021/sqlite-autoconf-&sqlite-dl-version;.tar.gz">
+  <!ENTITY sqlite-download-http "https://sqlite.org/2020/sqlite-autoconf-&sqlite-dl-version;.tar.gz">
   <!ENTITY sqlite-download-ftp  " ">
-  <!ENTITY sqlite-md5sum        "f5752052fc5b8e1b539af86a3671eac7">
-  <!ENTITY sqlite-size          "2.9 MB">
-  <!ENTITY sqlite-buildsize     "140 MB">
-  <!ENTITY sqlite-time          "0.4 SBU (Using parallelism=4)">
-
-  <!ENTITY sqlite-docs-download "https://sqlite.org/2021/sqlite-doc-&sqlite-doc-version;.zip">
-  <!ENTITY sqlite-docs-md5sum   "9abe65c7295fd0a2462f7c61f95400fd">
-  <!ENTITY sqlite-docs-size     "12 MB">
+  <!ENTITY sqlite-md5sum        "7f33c9db7b713957fcb9271fe9049fef">
+  <!ENTITY sqlite-size          "2.8 MB">
+  <!ENTITY sqlite-buildsize     "88 MB">
+  <!ENTITY sqlite-time          "0.3 SBU (Using parallelism=4)">
+
+  <!ENTITY sqlite-docs-download "https://sqlite.org/2020/sqlite-doc-&sqlite-doc-version;.zip">
+  <!ENTITY sqlite-docs-md5sum   "9da21afe29aa66f98328d4f67cd76db3">
+  <!ENTITY sqlite-docs-size     "9.7 MB">
 ]>
 
@@ -26,4 +26,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -44,5 +45,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -131,11 +132,12 @@
             --disable-static  \
             --enable-fts5     \
-            CPPFLAGS="-DSQLITE_ENABLE_FTS3=1            \
-                      -DSQLITE_ENABLE_FTS4=1            \
-                      -DSQLITE_ENABLE_COLUMN_METADATA=1 \
-                      -DSQLITE_ENABLE_UNLOCK_NOTIFY=1   \
-                      -DSQLITE_ENABLE_DBSTAT_VTAB=1     \
-                      -DSQLITE_SECURE_DELETE=1          \
-                      -DSQLITE_ENABLE_FTS3_TOKENIZER=1" &amp;&amp;
+            CFLAGS="-g -O2                    \
+            -DSQLITE_ENABLE_FTS3=1            \
+            -DSQLITE_ENABLE_FTS4=1            \
+            -DSQLITE_ENABLE_COLUMN_METADATA=1 \
+            -DSQLITE_ENABLE_UNLOCK_NOTIFY=1   \
+            -DSQLITE_ENABLE_DBSTAT_VTAB=1     \
+            -DSQLITE_SECURE_DELETE=1          \
+            -DSQLITE_ENABLE_FTS3_TOKENIZER=1" &amp;&amp;
 make</userinput></screen>
 
@@ -172,5 +174,6 @@
 
     <para>
-      <parameter>CPPFLAGS="-DSQLITE_ENABLE_FTS3=1
+      <parameter>CFLAGS="-g -O2
+      -DSQLITE_ENABLE_FTS3=1
       -DSQLITE_ENABLE_FTS3_TOKENIZER=1
       -DSQLITE_ENABLE_FTS4=1
@@ -182,8 +185,9 @@
       to be turned on.
       The only way to do this is to include them in
-      the <envar>CFLAGS</envar> or <envar>CPPFLAGS</envar>.
-      We use the latter so the default value (or any value set by the user)
-      of <envar>CFLAGS</envar> won't be affected.
-      For further information on what can be specified see <ulink
+      the CFLAGS.
+      By default, these are set to <literal>"-g -O2"</literal> so we
+      specify that to preserve those settings. You may, of course, wish to omit
+      the <literal>'-g'</literal> if you do not wish to create debugging
+      information. For further information on what can be specified see <ulink
       url="http://www.sqlite.org/compile.html"/>.
     </para>
@@ -221,7 +225,7 @@
         <listitem>
           <para>
-            is a terminal-based front-end to the <application>SQLite</application>
+            A terminal-based front-end to the <application>SQLite</application>
             library that can evaluate queries interactively and display the
-            results
+            results.
           </para>
           <indexterm zone="sqlite sqlite3">
@@ -235,5 +239,5 @@
         <listitem>
           <para>
-            contains the <application>SQLite</application> API functions
+            contains the <application>SQLite</application> API functions.
           </para>
           <indexterm zone="sqlite libsqlite3">
Index: server/mail/dovecot.xml
===================================================================
--- server/mail/dovecot.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ server/mail/dovecot.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,8 +8,8 @@
   "https://www.dovecot.org/releases/&dovecot-major;.&dovecot-minor;/dovecot-&dovecot-version;.tar.gz">
   <!ENTITY dovecot-download-ftp  " ">
-  <!ENTITY dovecot-md5sum        "946dc6a89db0d11d0061f0d4447263dc">
-  <!ENTITY dovecot-size          "7.3 MB">
-  <!ENTITY dovecot-buildsize     "205 MB">
-  <!ENTITY dovecot-time          "4.8 SBU">
+  <!ENTITY dovecot-md5sum        "f06f2272fad04e7b0207f8d00a291f66">
+  <!ENTITY dovecot-size          "7.0 MB">
+  <!ENTITY dovecot-buildsize     "222 MB">
+  <!ENTITY dovecot-time          "8.8 SBU">
 ]>
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -73,15 +74,4 @@
       </listitem>
     </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/dovecot-&dovecot-version;-lua_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
 
     <bridgehead renderas="sect3">Dovecot Dependencies</bridgehead>
@@ -132,10 +122,11 @@
         -g dovenull -s /bin/false dovenull</userinput></screen>
 
-    <para>
-      First, apply a patch to fix compilation with Lua-5.4:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../dovecot-&dovecot-version;-lua_fixes-1.patch</userinput></screen>
-
+<!--
+    <para>
+      First, adapt the Lua plugin to Lua-5.4:
+    </para>
+
+<screen><userinput remap="pre">sed -i 's/lua_newuserdata/lua_newuserdatauv/' src/lib-lua/dlua-dovecot.c</userinput></screen>
+-->
 
     <para>
@@ -144,5 +135,5 @@
     </para>
 
-<screen revision="sysv"><userinput>CPPFLAGS="-I/usr/include/tirpc" \
+<screen revision="sysv"><userinput>CFLAGS+=" -I/usr/include/tirpc" \
 LDFLAGS+=" -ltirpc" \
 ./configure --prefix=/usr                          \
@@ -153,5 +144,5 @@
 make</userinput></screen>
 
-<screen revision="systemd"><userinput>CPPFLAGS="-I/usr/include/tirpc" \
+<screen revision="systemd"><userinput>CFLAGS+=" -I/usr/include/tirpc" \
 LDFLAGS+=" -ltirpc" \
 ./configure --prefix=/usr                          \
@@ -159,5 +150,6 @@
             --localstatedir=/var                   \
             --docdir=/usr/share/doc/dovecot-&dovecot-version; \
-            --disable-static                       &amp;&amp;
+            --disable-static                       \
+            --with-systemdsystemunitdir=/lib/systemd/system &amp;&amp;
 make</userinput></screen>
 
@@ -180,5 +172,5 @@
 
     <para>
-      <command>CPPFLAGS=... LDFLAGS+=...</command>: build with libtirpc
+      <command>CFLAGS+=...LDFLAGS+=...</command>: build with libtirpc
       instead of the recently removed RPC code provided by GlibC.
     </para>
@@ -187,11 +179,9 @@
       href="../../xincludes/static-libraries.xml"/>
 
-    <!-- With merged-/usr, /usr/lib/systemd/system is set by default.
     <para revision="systemd">
-      <parameter>- -with-systemdsystemunitdir=/lib/systemd/system</parameter>:
+      <parameter>--with-systemdsystemunitdir=/lib/systemd/system</parameter>:
       This switch is used to set the correct installation directory for
       systemd units.
     </para>
-    -->
 
     <para>
@@ -295,5 +285,5 @@
         You will definitely want to read the official documentation at <ulink
         url="http://wiki2.dovecot.org/"/> if you plan to use
-        <application>Dovecot</application> in a production environment.
+        <application>Dovecot</application> in production environment.
       </para>
 
@@ -342,6 +332,6 @@
         </seg>
         <seg>
-          various internal plugins in
-          <filename class="directory">/usr/lib/dovecot</filename>
+          various internal plugins in <filename
+          class="directory">/usr/lib/dovecot</filename>
         </seg>
         <seg>
@@ -362,5 +352,5 @@
         <listitem>
           <para>
-            is the <application>Dovecot</application> administration tool
+            is the <application>Dovecot</application> administration tool.
           </para>
           <indexterm zone="dovecot doveadm">
@@ -375,5 +365,5 @@
           <para>
             is <application>Dovecot</application>'s configuration dumping
-            utility
+            utility.
           </para>
           <indexterm zone="dovecot doveconf">
@@ -387,5 +377,5 @@
         <listitem>
           <para>
-            is the IMAP and POP server
+            is the IMAP and POP server.
           </para>
           <indexterm zone="dovecot dovecot-prog">
@@ -400,5 +390,5 @@
           <para>
             prints system information that is useful to the Dovecot developers
-            when submitting bug reports upstream
+            when submitting bug reports upstream.
           </para>
           <indexterm zone="dovecot dovecot-sysreport">
@@ -413,5 +403,5 @@
           <para>
             is <application>Dovecot</application>'s mailbox synchronization
-            utility
+            utility.
           </para>
           <indexterm zone="dovecot dsync">
Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ server/mail/exim.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,7 +10,7 @@
   <!-- if above don't work, please use one of the official mirrors at
        http://www.exim.org/mirmon/ftp_mirrors.html -->
-  <!ENTITY exim-md5sum          "4fbf1ebb36f0f43bb94ed0848eb13256">
+  <!ENTITY exim-md5sum          "4d4bfd56e2e9f25ceab23f623ed2f84a">
   <!ENTITY exim-size            "1.8 MB">
-  <!ENTITY exim-buildsize       "16 MB">
+  <!ENTITY exim-buildsize       "20 MB">
   <!ENTITY exim-time            "0.2 SBU">
 
@@ -22,4 +22,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -97,5 +98,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="https://sourceforge.net/projects/tdb">TDB</ulink>
+      <ulink url="http://sourceforge.net/projects/tdb">TDB</ulink>
       (alternative to GDBM, built in LFS),
       <xref linkend="cyrus-sasl"/>,
@@ -461,5 +462,5 @@
         <listitem>
           <para>
-            cycles <application>Exim</application> log files
+            cycles <application>Exim</application> log files.
           </para>
           <indexterm zone="exim exicyclog">
@@ -473,5 +474,5 @@
         <listitem>
           <para>
-            searches <application>Exim</application> log files
+            searches <application>Exim</application> log files.
           </para>
           <indexterm zone="exim exigrep">
@@ -486,5 +487,5 @@
           <para>
             is a symlink to the <command>exim-&exim-daemon-version;</command>
-            MTA daemon
+            MTA daemon.
           </para>
           <indexterm zone="exim exim-prog">
@@ -498,5 +499,5 @@
         <listitem>
           <para>
-            is the <application>Exim</application> mail transport agent daemon
+            is the <application>Exim</application> mail transport agent daemon.
           </para>
           <indexterm zone="exim exim-current_version">
@@ -511,5 +512,5 @@
           <para>
             states whether a given recipient address from a given host is
-            acceptable or not
+            acceptable or not.
           </para>
           <indexterm zone="exim exim_checkaccess">
@@ -523,5 +524,5 @@
         <listitem>
           <para>
-            creates and rebuilds <application>Exim</application> databases
+            creates and rebuilds <application>Exim</application> databases.
           </para>
           <indexterm zone="exim exim_dbmbuild">
@@ -536,5 +537,5 @@
           <para>
             writes the contents of <application>Exim</application>
-            databases to the standard output
+            databases to the standard output.
           </para>
           <indexterm zone="exim exim_dumpdb">
@@ -548,5 +549,5 @@
         <listitem>
           <para>
-            modifies data in <application>Exim</application> databases
+            modifies data in <application>Exim</application> databases.
           </para>
           <indexterm zone="exim exim_fixdb">
@@ -560,5 +561,5 @@
         <listitem>
           <para>
-            locks a mailbox file
+            locks a mailbox file.
           </para>
           <indexterm zone="exim exim_lock">
@@ -573,5 +574,5 @@
           <para>
             removes old records from <application>Exim</application>
-            databases
+            databases.
           </para>
           <indexterm zone="exim exim_tidydb">
@@ -586,5 +587,5 @@
           <para>
             generates mail statistics from <application>Exim</application>
-            log files
+            log files.
           </para>
           <indexterm zone="exim eximstats">
@@ -598,5 +599,5 @@
         <listitem>
           <para>
-            queries remote host retry times
+            queries remote host retry times.
           </para>
           <indexterm zone="exim exinext">
@@ -610,5 +611,5 @@
         <listitem>
           <para>
-            selects messages based on various criteria
+            selects messages based on various criteria.
           </para>
           <indexterm zone="exim exipick">
@@ -622,5 +623,5 @@
         <listitem>
           <para>
-            is a utility for selective queue listing
+            is a utility for selective queue listing.
           </para>
           <indexterm zone="exim exiqgrep">
@@ -634,5 +635,5 @@
         <listitem>
           <para>
-            produces a summary of the messages in the mail queue
+            produces a summary of the messages in the mail queue.
           </para>
           <indexterm zone="exim exiqsumm">
@@ -647,5 +648,5 @@
           <para>
             queries running <application>Exim</application>
-          processes
+          processes.
           </para>
           <indexterm zone="exim exiwhat">
@@ -661,5 +662,5 @@
             is a start-up shell script for <command>eximon.bin</command>
             used to set the required environment variables before running the
-            program
+            program.
           </para>
           <indexterm zone="exim eximon">
@@ -676,5 +677,5 @@
             <application>X</application> window, and also contains a menu
             interface to <application>Exim</application>'s command line
-            administration options
+            administration options.
           </para>
           <indexterm zone="exim eximon.bin">
Index: server/mail/mail.xml
===================================================================
--- server/mail/mail.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ server/mail/mail.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
  %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="server-mail" xreflabel="MTA">
Index: server/mail/postfix.xml
===================================================================
--- server/mail/postfix.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ server/mail/postfix.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY postfix-download-http " ">
   <!ENTITY postfix-download-ftp  "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-&postfix-version;.tar.gz">
-  <!ENTITY postfix-md5sum        "4718b498fa4285cf275f506c169f4746">
-  <!ENTITY postfix-size          "4.5 MB">
-  <!ENTITY postfix-buildsize     "149 MB">
+  <!ENTITY postfix-md5sum        "c7c55ccc1db2a30d35c3867c21fe7109">
+  <!ENTITY postfix-size          "4.4 MB">
+  <!ENTITY postfix-buildsize     "160 MB">
   <!ENTITY postfix-time          "0.2 SBU (Using parallelism=4)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -147,12 +148,13 @@
 
 <screen><userinput>sed -i 's/.\x08//g' README_FILES/*</userinput></screen>
-
-      <para>
-        Make an adjustment to allow <application>Postfix</application> to compile
-        on <application>Glibc-2.34</application> and later:
-      </para>
-
-<screen><userinput>sed -i '/&lt;linux/i #define HAS_CLOSEFROM' src/util/sys_defs.h</userinput></screen>
-
+<!--
+      <para>
+        Apply a patch to allow <application>Postfix</application> to compile
+        on <application>Glibc-2.30</application> where some macros were
+        dropped:
+      </para>
+
+<screen><userinput>patch -Np1 -i ../postfix-&postfix-version;-glibc230_fix-1.patch</userinput></screen>
+-->
       <para>
         The <application>Postfix</application> source tree does not contain a
@@ -363,5 +365,5 @@
         Create (or append to an existing) <filename>/etc/aliases</filename>
         with the following command. Change
-        <replaceable>&lt;LOGIN&gt;</replaceable> to your non-root login
+        <replaceable>&lt;LOGIN&gt;</replaceable> for your non-root login
         identity so mail addressed to
         <systemitem class="username">root</systemitem> can be forwarded to you.
@@ -483,5 +485,5 @@
         <listitem>
           <para>
-            A symlink to <filename>sendmail</filename>
+            A symlink to <filename>sendmail</filename>.
           </para>
           <indexterm zone="postfix mailq">
@@ -495,5 +497,5 @@
         <listitem>
           <para>
-            A symlink to <filename>sendmail</filename>
+            A symlink to <filename>sendmail</filename>.
           </para>
           <indexterm zone="postfix newaliases">
@@ -521,5 +523,5 @@
           <para>
             Prints the contents of files from the
-            <application>Postfix</application> queue in human readable format
+            <application>Postfix</application> queue in human readable format.
           </para>
           <indexterm zone="postfix postcat">
@@ -534,5 +536,5 @@
           <para>
             Displays or changes the value of
-            <application>Postfix</application> configuration parameters
+            <application>Postfix</application> configuration parameters.
           </para>
           <indexterm zone="postfix postconf">
@@ -547,5 +549,5 @@
           <para>
             Creates a file in the maildrop directory and copies its standard
-            input to the file
+            input to the file.
           </para>
           <indexterm zone="postfix postdrop">
@@ -559,5 +561,5 @@
         <listitem>
           <para>
-            is the <application>Postfix</application> control program
+            is the <application>Postfix</application> control program.
           </para>
           <indexterm zone="postfix postfix-bin">
@@ -572,5 +574,5 @@
           <para>
             Sends requests to the specified service over a local transport
-            channel
+            channel.
           </para>
           <indexterm zone="postfix postkick">
@@ -585,5 +587,5 @@
           <para>
             Locks a mail folder for exclusive use, and executes commands passed
-            to it
+            to it.
           </para>
           <indexterm zone="postfix postlock">
@@ -598,5 +600,5 @@
           <para>
             A <application>Postfix</application>-compatible logging interface
-            for use in, for example, shell scripts
+            for use in, for example, shell scripts.
           </para>
           <indexterm zone="postfix postlog">
@@ -611,5 +613,5 @@
           <para>
             Creates or queries one or more Postfix lookup tables, or updates an
-            existing one
+            existing one.
           </para>
           <indexterm zone="postfix postmap">
@@ -625,5 +627,5 @@
             is the <application>Postfix</application> multi-instance manager.
             It allows a system administrator to manage multiple
-            <application>Postfix</application> instances on a single host
+            <application>Postfix</application> instances on a single host.
           </para>
           <indexterm zone="postfix postmulti">
@@ -638,5 +640,5 @@
           <para>
             The <application>Postfix</application> user interface for
-            queue management
+            queue management.
           </para>
           <indexterm zone="postfix postqueue">
@@ -651,5 +653,5 @@
           <para>
             The <application>Postfix</application> user interface for
-            superuser queue management
+            superuser queue management.
           </para>
           <indexterm zone="postfix postsuper">
@@ -664,5 +666,5 @@
           <para>
             is the <application>Postfix</application> to
-            <application>Sendmail</application> compatibility interface
+            <application>Sendmail</application> compatibility interface.
           </para>
           <indexterm zone="postfix sendmail-postfix">
Index: server/mail/sendmail.xml
===================================================================
--- server/mail/sendmail.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ server/mail/sendmail.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -9,7 +9,7 @@
   <!ENTITY sendmail-download-http " ">
   <!ENTITY sendmail-download-ftp  "ftp://ftp.sendmail.org/pub/sendmail/sendmail.&sendmail-version;.tar.gz">
-  <!ENTITY sendmail-md5sum        "cd3c3f7b2db60c362f07eecbebd99bf4">
-  <!ENTITY sendmail-size          "2.2 MB">
-  <!ENTITY sendmail-buildsize     "20 MB">
+  <!ENTITY sendmail-md5sum        "055f1d76c8027993a01ab6425aea4ae7">
+  <!ENTITY sendmail-size          "2.1 MB">
+  <!ENTITY sendmail-buildsize     "19 MB">
   <!ENTITY sendmail-time          "0.2 SBU">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -135,5 +136,5 @@
 
 <screen><userinput>cat &gt;&gt; devtools/Site/site.config.m4 &lt;&lt; "EOF"
-<literal>APPENDDEF(`confENVDEF',`-DSTARTTLS -DSASL -DLDAPMAP -DHASFLOCK')
+<literal>APPENDDEF(`confENVDEF',`-DSTARTTLS -DSASL -DLDAPMAP')
 APPENDDEF(`confLIBS', `-lssl -lcrypto -lsasl2 -lldap -llber -ldb')
 APPENDDEF(`confINCDIRS', `-I/usr/include/sasl')</literal>
@@ -392,5 +393,5 @@
         <listitem>
           <para>
-            queries and edits <application>sendmail</application> map files
+            queries and edits <application>sendmail</application> map files.
           </para>
           <indexterm zone="sendmail editmap">
@@ -404,5 +405,5 @@
         <listitem>
           <para>
-            prints <application>sendmail</application>'s persistent host status
+            prints <application>sendmail</application>'s persistent host status.
           </para>
           <indexterm zone="sendmail hoststat">
@@ -416,5 +417,5 @@
         <listitem>
           <para>
-            displays <application>sendmail</application> statistics
+            displays <application>sendmail</application> statistics.
           </para>
           <indexterm zone="sendmail mailstats">
@@ -428,5 +429,5 @@
         <listitem>
           <para>
-            prints a summary of outbound mail messages waiting for delivery
+            prints a summary of outbound mail messages waiting for delivery.
           </para>
           <indexterm zone="sendmail mailq-sendmail">
@@ -440,5 +441,5 @@
         <listitem>
           <para>
-            creates <application>sendmail</application> map files
+            creates <application>sendmail</application> map files.
           </para>
           <indexterm zone="sendmail makemap">
@@ -453,5 +454,5 @@
           <para>
             rebuilds <filename>/etc/mail/aliases.db</filename> from the
-            contents of <filename>/etc/mail/aliases</filename>
+            contents of <filename>/etc/mail/aliases</filename>.
           </para>
           <indexterm zone="sendmail newaliases-sendmail">
@@ -465,5 +466,5 @@
         <listitem>
           <para>
-            displays current <application>sendmail</application> aliases
+            displays current <application>sendmail</application> aliases.
           </para>
           <indexterm zone="sendmail praliases">
@@ -478,5 +479,5 @@
           <para>
             causes <application>sendmail</application> to clear (purge)
-            all its host-status information
+            all its host-status information.
           </para>
           <indexterm zone="sendmail purgestat">
@@ -490,5 +491,5 @@
         <listitem>
           <para>
-            is the <application>sendmail</application> mail transport agent
+            is the <application>sendmail</application> mail transport agent.
           </para>
           <indexterm zone="sendmail sendmail-prog-sendmail">
@@ -502,5 +503,5 @@
         <listitem>
           <para>
-            is a restricted shell for <application>sendmail</application>
+            is a restricted shell for <application>sendmail</application>.
           </para>
           <indexterm zone="sendmail smrsh">
@@ -514,5 +515,5 @@
         <listitem>
           <para>
-            is an email auto responder
+            is an email auto responder.
           </para>
           <indexterm zone="sendmail vacation-sendmail">
Index: server/major/apache.xml
===================================================================
--- server/major/apache.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ server/major/apache.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,5 +8,5 @@
            "https://archive.apache.org/dist/httpd/httpd-&apache-version;.tar.bz2">
   <!ENTITY apache-download-ftp  " ">
-  <!ENTITY apache-md5sum        "a7088cec171b0d00bf43394ce64d3909">
+  <!ENTITY apache-md5sum        "7d661ea5e736dac5e2761d9f49fe8361">
   <!ENTITY apache-size          "6.9 MB">
   <!ENTITY apache-buildsize     "130 MB">
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -129,4 +130,10 @@
 useradd -c "Apache Server" -d /srv/www -g apache \
         -s /bin/false -u 25 apache</userinput></screen>
+
+    <para>
+      Adapt the Lua module to API changes in Lua-5.4:
+    </para>
+
+<screen><userinput remap="pre">sed -i 's/lua_resume(a, NULL, b)/lua_resume(a, NULL, b, NULL)/' modules/lua/mod_lua.h</userinput></screen>
 
     <para>
@@ -338,5 +345,5 @@
           <para>
             is a tool for benchmarking your <application>Apache</application>
-            HTTP server
+            HTTP server.
           </para>
           <indexterm zone="apache ab">
@@ -352,5 +359,5 @@
             is a front end to the <application>Apache</application> HTTP server
             which is designed to help the administrator control the functioning
-            of the <application>Apache</application> httpd daemon
+            of the <application>Apache</application> httpd daemon.
           </para>
           <indexterm zone="apache apachectl">
@@ -365,5 +372,5 @@
           <para>
             is a tool for building and installing extension modules for the
-            <application>Apache</application> HTTP server
+            <application>Apache</application> HTTP server.
           </para>
           <indexterm zone="apache apxs">
@@ -380,5 +387,5 @@
             specified. This is to see if it is a valid group for Apache2 to use
             at runtime. If the user (should be run as superuser) is in that
-            group, or can setgid to it, it will return 0
+            group, or can setgid to it, it will return 0.
           </para>
           <indexterm zone="apache checkgid">
@@ -393,5 +400,5 @@
           <para>
             is used to create and update the DBM format files used to store
-            usernames and passwords for basic authentication of HTTP users
+            usernames and passwords for basic authentication of HTTP users.
           </para>
           <indexterm zone="apache dbmmanage">
@@ -405,5 +412,5 @@
         <listitem>
           <para>
-            is a tool to start a FastCGI program
+            is a tool to start a FastCGI program.
           </para>
           <indexterm zone="apache fcgistarter">
@@ -417,5 +424,5 @@
         <listitem>
           <para>
-            is used to clean up the disk cache
+            is used to clean up the disk cache.
           </para>
           <indexterm zone="apache htcacheclean">
@@ -429,5 +436,5 @@
         <listitem>
           <para>
-            is used to manipulate the DBM password databases
+            is used to manipulate the DBM password databases.
           </para>
           <indexterm zone="apache htdbm">
@@ -442,5 +449,5 @@
           <para>
             is used to create and update the flat-files used to store usernames,
-            realms and passwords for digest authentication of HTTP users
+            realms and passwords for digest authentication of HTTP users.
           </para>
           <indexterm zone="apache htdigest">
@@ -455,5 +462,5 @@
           <para>
             is used to create and update the flat-files used to store usernames
-            and passwords for basic authentication of HTTP users
+            and passwords for basic authentication of HTTP users.
           </para>
           <indexterm zone="apache htpasswd">
@@ -467,5 +474,5 @@
         <listitem>
           <para>
-            is the <application>Apache</application> HTTP server program
+            is the <application>Apache</application> HTTP server program.
           </para>
           <indexterm zone="apache httpd">
@@ -479,5 +486,5 @@
         <listitem>
           <para>
-            is used to generate DBM files from text, for use in RewriteMap
+            is used to generate DBM files from text, for use in RewriteMap.
           </para>
           <indexterm zone="apache httxt2dbm">
@@ -492,5 +499,5 @@
           <para>
             is a post-processing program to resolve IP-addresses in
-            <application>Apache</application>'s access log files
+            <application>Apache</application>'s access log files.
           </para>
           <indexterm zone="apache logresolve">
@@ -505,5 +512,5 @@
           <para>
             is a simple program for use in conjunction with
-            <application>Apache</application>'s piped log file feature
+            <application>Apache</application>'s piped log file feature.
           </para>
           <indexterm zone="apache rotatelogs">
@@ -517,5 +524,5 @@
         <listitem>
           <para>
-            allows users to run CGI and SSI applications as a different user
+            allows users to run CGI and SSI applications as a different user.
           </para>
           <indexterm zone="apache suexec">
Index: server/major/bind.xml
===================================================================
--- server/major/bind.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ server/major/bind.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY bind-download-http " ">
   <!ENTITY bind-download-ftp  "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.xz">
-  <!ENTITY bind-md5sum        "8025b8f8463b3b9d9c902bab27f185a2">
-  <!ENTITY bind-size          "4.8 MB">
-  <!ENTITY bind-buildsize     "117 MB (20 MB installed)">
-  <!ENTITY bind-time          "0.8 SBU (with parallelism=4; add 30+ minutes, somewhat processor independent, to run the complete test suite)">
+  <!ENTITY bind-md5sum        "32463c0fe91abaf4894eee09a97f1ce6">
+  <!ENTITY bind-size          "3.1 MB">
+  <!ENTITY bind-buildsize     "124 MB (23 MB installed)">
+  <!ENTITY bind-time          "0.8 SBU (with parallelism=4; add 29+ minutes, somewhat processor independent, to run the complete test suite)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -70,15 +71,5 @@
       </listitem>
     </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/bind-&bind-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
+
     <bridgehead renderas="sect3">BIND Dependencies</bridgehead>
 
@@ -104,6 +95,5 @@
       <ulink url="https://github.com/cjheath/geoip">geoip</ulink>,
       <ulink url="https://docs.pytest.org/en/stable/">pytest</ulink>,
-      <ulink url="https://pypi.python.org/pypi/Sphinx">Sphinx</ulink>, and
-      <ulink url="&w3m-url;">w3m</ulink>
+      <ulink url="https://pypi.python.org/pypi/Sphinx">Sphinx</ulink>
     </para>
 
@@ -144,16 +134,4 @@
 
 <screen role="root"><userinput>pip3 install ply</userinput></screen>
-<!--
-    <para>
-      First, fix a few regressions that were reported upstream:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../bind-&bind-version;-upstream_fixes-1.patch</userinput></screen>
--->
-    <para>
-      Fix a regression identified upstream:
-    </para>
-
-<screen><userinput remap="pre">sed -i 's/MAPAPI=2.0/MAPAPI=3.0/' lib/dns/mapapi</userinput></screen>
 
     <para>
@@ -191,6 +169,5 @@
       what configuration options are used. Some tests are marked
       <quote>UNTESTED</quote> if <xref linkend="perl-net-dns"/> is not
-      installed. <!--One test, <quote>CPU</quote>, is known to fail.-->
-      To run the tests, as an unprivileged user, execute:
+      installed. To run the tests, as an unprivileged user, execute:
     </para>
 
@@ -338,5 +315,5 @@
         controlling <command>named</command> operations with the
         <command>rndc</command> utility. Generate a key for use in the
-        <filename>named.conf</filename> and <filename>rndc.conf</filename>
+        <filename>named.conf</filename> and <filename>rdnc.conf</filename>
         with the <command>rndc-confgen</command> command:
       </para>
@@ -566,5 +543,5 @@
         lookups. Consult the <application>BIND</application> Administrator
         Reference Manual located at 
-        <ulink url="https://bind9.readthedocs.io/en/v9_16/"/>
+        <ulink url="https://kb.isc.org/docs/bind-916-administrative-reference-manual"/>
         for further configuration options.
       </para>
@@ -597,6 +574,5 @@
 
         <seg>/usr/include/{bind9,dns,dst,irs,isc,isccc,isccfg,ns,pk11,pkcs11},
-        /usr/lib/named, /usr/lib/python&python3-majorver;/site-packages/isc,
-        and /srv/named</seg>
+        /usr/lib/named, and /srv/named</seg>
       </seglistitem>
     </segmentedlist>
@@ -611,5 +587,5 @@
         <listitem>
           <para>
-            translates IP addresses to the corresponding ARPA names
+            translates IP addresses to the corresponding ARPA names.
           </para>
           <indexterm zone="bind arpaname">
@@ -637,5 +613,5 @@
         <listitem>
           <para>
-            generates a key for use by nsupdate and named
+            generates a key for use by nsupdate and named.
           </para>
           <indexterm zone="bind ddns-confgen">
@@ -650,5 +626,5 @@
           <para>
             is a new debugging tool that is a successor to
-            <command>dig</command>
+            <command>dig</command>.
           </para>
           <indexterm zone="bind delv">
@@ -662,5 +638,5 @@
         <listitem>
           <para>
-            interrogates DNS servers
+            interrogates DNS servers.
           </para>
           <indexterm zone="bind dig">
@@ -675,5 +651,5 @@
           <para>
             changes DS records for a child zone based on
-            CDS/CDNSKEY
+            CDS/CDNSKEY.
           </para>
           <indexterm zone="bind dnssec-cds">
@@ -687,5 +663,5 @@
         <listitem>
           <para>
-            is a DNSSEC delegation consistency checking tool
+            is a DNSSEC delegation consistency checking tool.
           </para>
           <indexterm zone="bind dnssec-checkds">
@@ -701,5 +677,5 @@
             verifies that the DNSSEC keys for a given zone or a set of zones
             have timing metadata set properly to ensure no future lapses
-            in DNSSEC coverage
+            in DNSSEC coverage.
           </para>
           <indexterm zone="bind dnssec-coverage">
@@ -713,5 +689,5 @@
         <listitem>
           <para>
-            outputs the Delegation Signer (DS) resource record (RR)
+            outputs the Delegation Signer (DS) resource record (RR).
           </para>
           <indexterm zone="bind dnssec-dsfromkey">
@@ -726,5 +702,5 @@
           <para>
              reads a public DNSKEY record and generates a pair of
-             .key/.private files
+             .key/.private files.
           </para>
           <indexterm zone="bind dnssec-importkey">
@@ -738,6 +714,6 @@
         <listitem>
           <para>
-            gets keys with the given label from a cryptography hardware device
-            and builds key files for DNSSEC
+            gets keys with the given label from a crypto hardware and builds
+            key files for DNSSEC.
           </para>
           <indexterm zone="bind dnssec-keyfromlabel">
@@ -751,5 +727,5 @@
         <listitem>
           <para>
-            is a key generator for secure DNS
+            is a key generator for secure DNS.
           </para>
           <indexterm zone="bind dnssec-keygen">
@@ -763,5 +739,5 @@
         <listitem>
           <para>
-            ensures correct DNSKEY coverage based on a defined policy
+            ensures correct DNSKEY coverage based on a defined policy.
           </para>
           <indexterm zone="bind dnssec-keymgr">
@@ -775,5 +751,5 @@
         <listitem>
           <para>
-            sets the REVOKED bit on a DNSSEC key
+            sets the REVOKED bit on a DNSSEC key.
           </para>
           <indexterm zone="bind dnssec-revoke">
@@ -787,5 +763,5 @@
         <listitem>
           <para>
-            sets the key timing metadata for a DNSSEC key
+            sets the key timing metadata for a DNSSEC key.
           </para>
           <indexterm zone="bind dnssec-settime">
@@ -799,5 +775,5 @@
         <listitem>
           <para>
-            generates signed versions of zone files
+            generates signed versions of zone files.
           </para>
           <indexterm zone="bind dnssec-signzone">
@@ -813,5 +789,5 @@
             verifies that a zone is fully signed for each algorithm found
             in the DNSKEY RRset for the zone, and that the NSEC / NSEC3
-            chains are complete
+            chains are complete.
           </para>
           <indexterm zone="bind dnssec-verify">
@@ -839,5 +815,5 @@
         <listitem>
           <para>
-            is a utility for DNS lookups
+            is a utility for DNS lookups.
           </para>
           <indexterm zone="bind host">
@@ -889,5 +865,5 @@
         <listitem>
           <para>
-            is a version of dig that allows multiple queries at once
+            is a version of dig that allows multiple queries at once.
           </para>
           <indexterm zone="bind mdig">
@@ -901,5 +877,5 @@
         <listitem>
           <para>
-            is the name server daemon
+            is the name server daemon.
           </para>
           <indexterm zone="bind named">
@@ -914,5 +890,5 @@
           <para>
             checks the syntax of <filename>named.conf</filename>
-            files
+            files.
           </para>
           <indexterm zone="bind named-checkconf">
@@ -926,5 +902,5 @@
         <listitem>
           <para>
-            checks zone file validity
+            checks zone file validity.
           </para>
           <indexterm zone="bind named-checkzone">
@@ -939,5 +915,5 @@
           <para>
             is similar to <command>named-checkzone</command>, but it always
-            dumps the zone contents to a specified file in a specified format
+            dumps the zone contents to a specified file in a specified format.
           </para>
           <indexterm zone="bind named-compilezone">
@@ -951,5 +927,5 @@
         <listitem>
           <para>
-            prints the zone journal in human-readable form
+            prints the zone journal in human-readable form.
           </para>
           <indexterm zone="bind named-journalprint">
@@ -964,5 +940,5 @@
           <para>
             reads an individual DNS resource record from standard input and
-            checks if it is syntactically correct
+            checks if it is syntactically correct.
           </para>
           <indexterm zone="bind named-rrchecker">
@@ -976,5 +952,5 @@
         <listitem>
           <para>
-            converts an NZD database to NZF text format
+            converts an NZD database to NZF text format.
           </para>
           <indexterm zone="bind named-nzd2nzf">
@@ -988,5 +964,5 @@
         <listitem>
           <para>
-            generates an NSEC3 hash based on a set of NSEC3 parameters
+            generates an NSEC3 hash based on a set of NSEC3 parameters.
           </para>
           <indexterm zone="bind nsec3hash">
@@ -1000,5 +976,5 @@
         <listitem>
           <para>
-            is a program used to query Internet domain nameservers
+            is a program used to query Internet domain nameservers.
           </para>
           <indexterm zone="bind nslookup">
@@ -1012,5 +988,5 @@
         <listitem>
           <para>
-            is used to submit DNS update requests
+            is used to submit DNS update requests.
           </para>
           <indexterm zone="bind nsupdate">
@@ -1024,5 +1000,5 @@
         <listitem>
           <para>
-            controls the operation of <application>BIND</application>
+            controls the operation of <application>BIND</application>.
           </para>
           <indexterm zone="bind rndc">
@@ -1036,5 +1012,5 @@
         <listitem>
           <para>
-            generates <filename>rndc.conf</filename> files
+            generates <filename>rndc.conf</filename> files.
           </para>
           <indexterm zone="bind rndc-confgen">
@@ -1048,5 +1024,5 @@
         <listitem>
           <para>
-            is a symlink to <command>ddns-confgen</command>
+            is a symlink to <command>ddns-confgen</command>.
           </para>
           <indexterm zone="bind tsig-keygen">
Index: server/major/major.xml
===================================================================
--- server/major/major.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ server/major/major.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
  %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="server-major">
Index: server/major/proftpd.xml
===================================================================
--- server/major/proftpd.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ server/major/proftpd.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY proftpd-download-http " ">
   <!ENTITY proftpd-download-ftp  "ftp://ftp.proftpd.org/distrib/source/proftpd-&proftpd-version;.tar.gz">
-  <!ENTITY proftpd-md5sum        "bee3df0bc3c945c62657410610fedeb3">
-  <!ENTITY proftpd-size          "19.4 MB">
-  <!ENTITY proftpd-buildsize     "76 MB">
+  <!ENTITY proftpd-md5sum        "4a9b8877b2e9b08d70e71ad56c19e2c9">
+  <!ENTITY proftpd-size          "19 MB">
+  <!ENTITY proftpd-buildsize     "68 MB">
   <!ENTITY proftpd-time          "0.3 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -319,7 +320,5 @@
         </seg>
         <seg>
-          /usr/{include,lib}/proftpd,
-          /usr/share/doc/proftpd-&proftpd-version;, and
-          /srv/ftp
+          /usr/{include,lib}/proftpd
         </seg>
       </seglistitem>
@@ -335,5 +334,5 @@
         <listitem>
           <para>
-            is the FTP daemon
+            is the FTP daemon.
           </para>
           <indexterm zone="proftpd proftpd-prog">
@@ -347,5 +346,5 @@
         <listitem>
           <para>
-            shows the current number of connections
+            shows the current number of connections.
           </para>
           <indexterm zone="proftpd ftpcount">
@@ -359,5 +358,5 @@
         <listitem>
           <para>
-            is used to control the  proftpd daemon while it is running
+            is used to control the  proftpd daemon while it is running.
           </para>
           <indexterm zone="proftpd ftpdctl">
@@ -372,5 +371,5 @@
           <para>
             is a Perl script designed to create and manage
-            AuthUserFiles and AuthGroupFiles of the correct format for proftpd
+            AuthUserFiles and AuthGroupFiles of the correct format for proftpd.
           </para>
           <indexterm zone="proftpd ftpasswd">
@@ -384,5 +383,5 @@
         <listitem>
           <para>
-            is a Perl script for sending email based on the proftpd TransferLog
+            is a Perl script for sending email based on the proftpd TransferLog.
           </para>
           <indexterm zone="proftpd ftpmail">
@@ -398,5 +397,5 @@
             is a Perl script designed to create and manage limits and tally
             files for the mod_quotatab + mod_quotatab_file module combination
-            for proftpd
+            for proftpd.
           </para>
           <indexterm zone="proftpd ftpquota">
@@ -410,5 +409,5 @@
         <listitem>
           <para>
-            provides a way to scrub the scoreboard file on demand
+            provides a way to scrub the scoreboard file on demand.
           </para>
           <indexterm zone="proftpd ftpscrub">
@@ -423,5 +422,5 @@
           <para>
             shuts down all <application>proftpd</application> servers
-            at a given time
+            at a given time.
           </para>
           <indexterm zone="proftpd ftpshut">
@@ -435,5 +434,5 @@
         <listitem>
           <para>
-            displays running status on connections
+            displays running status on connections.
           </para>
           <indexterm zone="proftpd ftptop">
@@ -447,5 +446,5 @@
         <listitem>
           <para>
-            shows current process information for each session
+            shows current process information for each session.
           </para>
           <indexterm zone="proftpd ftpwho">
@@ -461,5 +460,5 @@
             is a Perl script designed to compile and install third-party
             modules, from source code, as DSO modules for the installed
-            proftpd
+            proftpd.
           </para>
           <indexterm zone="proftpd prxs">
Index: server/major/vsftpd.xml
===================================================================
--- server/major/vsftpd.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ server/major/vsftpd.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY vsftpd-download-http "https://security.appspot.com/downloads/vsftpd-&vsftpd-version;.tar.gz">
   <!ENTITY vsftpd-download-ftp  " ">
-  <!ENTITY vsftpd-md5sum        "efbf362a65bec771bc15ad311f5a982e">
-  <!ENTITY vsftpd-size          "210 KB">
-  <!ENTITY vsftpd-buildsize     "1.9 MB">
+  <!ENTITY vsftpd-md5sum        "da119d084bd3f98664636ea05b5bb398">
+  <!ENTITY vsftpd-size          "196 KB">
+  <!ENTITY vsftpd-buildsize     "2 MB">
   <!ENTITY vsftpd-time          "less than 0.1 SBU">
   <!ENTITY vsftpd-empty         "/usr/share/vsftpd/empty">
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -217,4 +218,5 @@
 <screen role="root"><userinput>cat &gt;&gt; /etc/vsftpd.conf &lt;&lt; "EOF"
 <literal>background=YES
+listen=YES
 nopriv_user=vsftpd
 secure_chroot_dir=&vsftpd-empty;</literal>
@@ -317,5 +319,5 @@
         <listitem>
           <para>
-            is the FTP daemon
+            is the FTP daemon.
           </para>
           <indexterm zone="vsftpd vsftpd-prog">
Index: server/other/openldap.xml
===================================================================
--- server/other/openldap.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ server/other/openldap.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY openldap-download-http "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-&openldap-version;.tgz">
   <!ENTITY openldap-download-ftp  "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-&openldap-version;.tgz">
-  <!ENTITY openldap-md5sum        "e7847d1463ce4cdc8e3fd831d1cd267c">
-  <!ENTITY openldap-size          "6.1 MB">
-  <!ENTITY openldap-buildsize     "52 MB (client), 98 MB (server)">
-  <!ENTITY openldap-time          "0.4 SBU (client), 0.9 SBU (server)">
+  <!ENTITY openldap-md5sum        "82a7dcf7aeaf95fdad16017c0ed9983a">
+  <!ENTITY openldap-size          "5.7 MB">
+  <!ENTITY openldap-buildsize     "54 MB (client), 91 MB (server)">
+  <!ENTITY openldap-time          "0.5 SBU (client), 1.0 SBU (server)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -95,6 +96,5 @@
         <xref linkend="postgresql"/> or
         <ulink url="http://www.mysql.com/">MySQL</ulink>,
-      <ulink url="http://www.openslp.org/">OpenSLP</ulink>,
-      <ulink url="https://docs.mongodb.com/manual/core/wiredtiger/">WiredTiger</ulink>, and
+      <ulink url="http://www.openslp.org/">OpenSLP</ulink>, and
       <xref linkend="db"/> (for slapd, but deprecated)
     </para>
@@ -123,5 +123,4 @@
             --disable-static  \
             --enable-dynamic  \
-            --enable-versioning  \
             --disable-debug   \
             --disable-slapd &amp;&amp;
@@ -163,5 +162,4 @@
             --libexecdir=/usr/lib \
             --disable-static      \
-            --enable-versioning   \
             --disable-debug       \
             --with-tls=openssl    \
@@ -176,5 +174,7 @@
             --disable-ndb         \
             --disable-sql         \
-            --disable-wt          \
+            --disable-shell       \
+            --disable-bdb         \
+            --disable-hdb         \
             --enable-overlays=mod &amp;&amp;
 
@@ -227,10 +227,4 @@
 
     <para>
-      <parameter>--enable-versioning</parameter>: This switch enables 
-      symbol versioning in the <application>OpenLDAP</application> libraries.
-      Without this, some applications might generate a warning about missing symbol versions. 
-    </para>
-
-    <para>
       <parameter>--enable-crypt</parameter>: This switch enables using
       <command>crypt(3)</command> passwords.
@@ -273,10 +267,4 @@
       disables the SQL backend.  Omit this switch if a SQL server is
       installed and you are going to use a SQL backend.
-    </para>
-
-    <para>
-      <parameter>--disable-wt</parameter>: This switch explicitly
-      disables the WiredTiger backend.  Omit this switch if WiredTiger is
-      installed and you are going to use a WiredTiger backend.
     </para>
 
@@ -419,5 +407,5 @@
         <listitem>
           <para>
-            The <ulink url="http://www.openldap.org/doc/admin25/"> OpenLDAP 2.5
+            The <ulink url="http://www.openldap.org/doc/admin24/"> OpenLDAP 2.4
             Administrator's Guide</ulink> (also installed locally in
             <filename class="directory">
@@ -541,10 +529,11 @@
         <seg>
           ldapadd, ldapcompare, ldapdelete, ldapexop, ldapmodify, ldapmodrdn,
-          ldappasswd, ldapsearch, ldapurl, ldapvc, ldapwhoami, slapacl, slapadd,
-          slapauth, slapcat, slapd, slapdn, slapindex, slapmodify, slappasswd,
-          slapschema, and slaptest
+          ldappasswd, ldapsearch, ldapurl, ldapwhoami, slapacl, slapadd,
+          slapauth, slapcat, slapd, slapdn, slapindex, slappasswd, slapschema,
+          and slaptest
         </seg>
         <seg>
-          liblber.so, libldap.so, and several under /usr/lib/openldap
+          liblber.so, libldap.so, libldap_r.so,
+          and several under /usr/lib/openldap
         </seg>
         <seg>
@@ -565,5 +554,5 @@
         <listitem>
           <para>
-            opens a connection to an LDAP server, binds and adds entries
+            opens a connection to an LDAP server, binds and adds entries.
           </para>
           <indexterm zone="openldap ldapadd">
@@ -578,5 +567,5 @@
           <para>
             opens a connection to an LDAP server, binds and performs
-            a compare using specified parameters
+            a compare using specified parameters.
           </para>
           <indexterm zone="openldap ldapcompare">
@@ -591,5 +580,5 @@
           <para>
             opens a connection to an LDAP server, binds and deletes
-            one or more entries
+            one or more entries.
           </para>
           <indexterm zone="openldap ldapdelete">
@@ -605,5 +594,5 @@
             issues the LDAP extended operation specified by
             oid or one of the  special  keywords  whoami,
-            cancel, or refresh
+            cancel, or refresh.
           </para>
           <indexterm zone="openldap ldapexop">
@@ -617,5 +606,5 @@
         <listitem>
           <para>
-            opens a connection to an LDAP server, binds and modifies entries
+            opens a connection to an LDAP server, binds and modifies entries.
           </para>
           <indexterm zone="openldap ldapmodify">
@@ -630,5 +619,5 @@
           <para>
             opens a connection to an LDAP server, binds and modifies
-            the RDN of entries
+            the RDN of entries.
           </para>
           <indexterm zone="openldap ldapmodrdn">
@@ -642,5 +631,5 @@
         <listitem>
           <para>
-            is a tool used to set the password of an LDAP user
+            is a tool used to set the password of an LDAP user.
           </para>
           <indexterm zone="openldap ldappasswd">
@@ -655,5 +644,5 @@
           <para>
             opens a connection to an LDAP server, binds and performs
-            a search using specified parameters
+            a search using specified parameters.
           </para>
           <indexterm zone="openldap ldapsearch">
@@ -668,5 +657,5 @@
           <para>
             is a command that allows to either compose or
-            decompose LDAP URIs
+            decompose LDAP URIs.
           </para>
           <indexterm zone="openldap ldapurl">
@@ -676,16 +665,4 @@
       </varlistentry>
 
-      <varlistentry id="ldapvc">
-        <term><command>ldapvc</command></term>
-        <listitem>
-          <para>
-            verifies LDAP credentials
-          </para>
-          <indexterm zone="openldap ldapvc">
-            <primary sortas="b-ldapvc">ldapvc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="ldapwhoami">
         <term><command>ldapwhoami</command></term>
@@ -693,5 +670,5 @@
           <para>
             opens a connection to an LDAP server, binds and displays
-            whoami information
+            whoami information.
           </para>
           <indexterm zone="openldap ldapwhoami">
@@ -707,5 +684,5 @@
             is used to check the behavior of slapd by verifying
             access to directory data according to the access control
-            list directives defined in its configuration
+            list directives defined in its configuration.
           </para>
           <indexterm zone="openldap slapacl">
@@ -720,5 +697,5 @@
           <para>
             is used to add entries specified in LDAP Directory Interchange
-            Format (LDIF) to an LDAP database
+            Format (LDIF) to an LDAP database.
           </para>
           <indexterm zone="openldap slapadd">
@@ -734,5 +711,5 @@
             is used to check the behavior of the slapd
             in mapping identities for authentication and
-            authorization purposes, as specified in slapd.conf
+            authorization purposes, as specified in slapd.conf.
           </para>
           <indexterm zone="openldap slapauth">
@@ -747,5 +724,5 @@
           <para>
             is used to generate an LDAP LDIF output based upon the
-            contents of a slapd database
+            contents of a slapd database.
           </para>
           <indexterm zone="openldap slapcat">
@@ -759,5 +736,5 @@
         <listitem>
           <para>
-            is the standalone LDAP server
+            is the standalone LDAP server.
           </para>
           <indexterm zone="openldap slapd">
@@ -771,5 +748,5 @@
         <listitem>
           <para>
-            checks a list of string-represented DNs based on schema syntax
+            checks a list of string-represented DNs based on schema syntax.
           </para>
           <indexterm zone="openldap slapdn">
@@ -784,5 +761,5 @@
           <para>
             is used to regenerate slapd indexes based upon the current
-            contents of a database
+            contents of a database.
           </para>
           <indexterm zone="openldap slapindex">
@@ -792,21 +769,9 @@
       </varlistentry>
 
-      <varlistentry id="slapmodify">
-        <term><command>slapmodify</command></term>
-        <listitem>
-          <para>
-            modifies entries in a slapd database
-          </para>
-          <indexterm zone="openldap slapmodify">
-            <primary sortas="b-slapmodify">slapmodify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="slappasswd">
         <term><command>slappasswd</command></term>
         <listitem>
           <para>
-            is an <application>OpenLDAP</application> password utility
+            is an <application>OpenLDAP</application> password utility.
           </para>
           <indexterm zone="openldap slappasswd">
@@ -821,5 +786,5 @@
           <para>
             is used to check schema compliance of the contents
-            of a slapd database
+            of a slapd database.
           </para>
           <indexterm zone="openldap slapschema">
@@ -833,5 +798,5 @@
         <listitem>
           <para>
-            checks the sanity of the <filename>slapd.conf</filename> file
+            checks the sanity of the <filename>slapd.conf</filename> file.
           </para>
           <indexterm zone="openldap slaptest">
@@ -850,5 +815,5 @@
             Encoding Rules defined by LDAP. They are not normally used directly
             by an LDAP application program except in the handling of controls
-            and extended operations
+            and extended operations.
           </para>
           <indexterm zone="openldap liblber">
@@ -863,5 +828,5 @@
           <para>
             supports the LDAP programs and provide functionality for
-            other programs interacting with LDAP
+            other programs interacting with LDAP.
           </para>
           <indexterm zone="openldap libldap">
@@ -871,5 +836,4 @@
       </varlistentry>
 
-      <!--
       <varlistentry id="libldap_r">
         <term><filename class="libraryfile">libldap_r.so</filename></term>
@@ -877,5 +841,5 @@
           <para>
             contains the functions required by the LDAP programs to
-            produce the results from LDAP requests
+            produce the results from LDAP requests.
           </para>
           <indexterm zone="openldap libldap_r">
@@ -884,5 +848,4 @@
         </listitem>
       </varlistentry>
-      -->
 
     </variablelist>
Index: server/other/other.xml
===================================================================
--- server/other/other.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ server/other/other.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
  %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="server-other">
Index: server/other/unbound.xml
===================================================================
--- server/other/unbound.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ server/other/unbound.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY unbound-download-http "https://nlnetlabs.nl/downloads/unbound/unbound-&unbound-version;.tar.gz">
+  <!ENTITY unbound-download-http "http://www.unbound.net/downloads/unbound-&unbound-version;.tar.gz">
   <!ENTITY unbound-download-ftp  " ">
-  <!ENTITY unbound-md5sum        "5a63b7228141f45f2ab3169662f7ee13">
-  <!ENTITY unbound-size          "5.8 MB">
-  <!ENTITY unbound-buildsize     "132 MB (with docs; add 11 MB for tests)">
+  <!ENTITY unbound-md5sum        "5a522f10c65332efe627098d2d24f947">
+  <!ENTITY unbound-size          "5.7 MB">
+  <!ENTITY unbound-buildsize     "176 MB (with docs; add 10 MB for tests)">
   <!ENTITY unbound-time          "0.5 SBU (Using parallelism=4; with docs; add 0.3 SBU for tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -110,5 +111,5 @@
 
 <screen role="root"><userinput>groupadd -g 88 unbound &amp;&amp;
-useradd -c "Unbound DNS Resolver" -d /var/lib/unbound -u 88 \
+useradd -c "Unbound DNS resolver" -d /var/lib/unbound -u 88 \
         -g unbound -s /bin/false unbound</userinput></screen>
 
@@ -287,5 +288,5 @@
         <listitem>
           <para>
-            is a DNS resolver daemon
+            is a DNS resolver daemon.
           </para>
           <indexterm zone="unbound unbound-prog">
@@ -300,5 +301,5 @@
           <para>
             performs setup or update of the root trust anchor for DNSSEC
-            validation
+            validation.
           </para>
           <indexterm zone="unbound unbound-anchor">
@@ -312,6 +313,6 @@
         <listitem>
           <para>
-            checks the <command>unbound</command> configuration file for syntax
-            and other errors
+            checks <command>unbound</command> configuration file for syntax
+            and other errors.
           </para>
           <indexterm zone="unbound unbound-checkconf">
@@ -326,5 +327,5 @@
           <para>
             performs remote administration on the <command>unbound</command> DNS
-            resolver
+            resolver.
           </para>
           <indexterm zone="unbound unbound-control">
@@ -339,5 +340,5 @@
           <para>
             generates a self-signed certificate and private keys for the server
-            and client
+            and client.
           </para>
           <indexterm zone="unbound unbound-control-setup">
@@ -352,5 +353,5 @@
           <para>
             is a DNS lookup utility similar to <command>host</command> from
-            <xref linkend="bind-utils"/>
+            <xref linkend="bind-utils"/>.
           </para>
           <indexterm zone="unbound unbound-host">
@@ -365,5 +366,5 @@
           <para>
             provides the <application>Unbound</application> API functions to
-            programs
+            programs.
           </para>
           <indexterm zone="unbound libunbound">
Index: server/server.xml
===================================================================
--- server/server.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ server/server.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
  %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <part id="server" xreflabel="Servers">
Index: stylesheets/blfs-chunked.xsl
===================================================================
--- stylesheets/blfs-chunked.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/blfs-chunked.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/blfs-nochunks.xsl
===================================================================
--- stylesheets/blfs-nochunks.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/blfs-nochunks.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/blfs-pdf.xsl
===================================================================
--- stylesheets/blfs-pdf.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/blfs-pdf.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/dump-commands.xsl
===================================================================
--- stylesheets/dump-commands.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/dump-commands.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -4,4 +4,9 @@
     extension-element-prefixes="exsl"
     version="1.0">
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <!-- XSLT stylesheet to extract commands from [B,H]LFS books. -->
Index: stylesheets/lfs-xsl/chunk-master.xsl
===================================================================
--- stylesheets/lfs-xsl/chunk-master.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/chunk-master.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/chunk-slave.xsl
===================================================================
--- stylesheets/lfs-xsl/chunk-slave.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/chunk-slave.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/chunkfast.xsl
===================================================================
--- stylesheets/lfs-xsl/chunkfast.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/chunkfast.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/common.xsl
===================================================================
--- stylesheets/lfs-xsl/common.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/common.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/lfs-l10n.xml
===================================================================
--- stylesheets/lfs-xsl/lfs-l10n.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/lfs-l10n.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -2,4 +2,5 @@
 
 <!--
+$LastChangedBy$
 $Date$
 -->
Index: stylesheets/lfs-xsl/lfs-print.css
===================================================================
--- stylesheets/lfs-xsl/lfs-print.css	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/lfs-print.css	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,2 +1,6 @@
+/*
+$LastChangedBy$
+$Date$
+*/
 @import url(lfs.css);
 
Index: stylesheets/lfs-xsl/lfs.css
===================================================================
--- stylesheets/lfs-xsl/lfs.css	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/lfs.css	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,2 +1,6 @@
+/*
+$LastChangedBy$
+$Date$
+*/
 /* Global settings */
 body {
Index: stylesheets/lfs-xsl/nochunks.xsl
===================================================================
--- stylesheets/lfs-xsl/nochunks.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/nochunks.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/pdf.xsl
===================================================================
--- stylesheets/lfs-xsl/pdf.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/pdf.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/pdf/lfs-admon.xsl
===================================================================
--- stylesheets/lfs-xsl/pdf/lfs-admon.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/pdf/lfs-admon.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/pdf/lfs-index.xsl
===================================================================
--- stylesheets/lfs-xsl/pdf/lfs-index.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/pdf/lfs-index.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <!DOCTYPE xsl:stylesheet [
Index: stylesheets/lfs-xsl/pdf/lfs-lists.xsl
===================================================================
--- stylesheets/lfs-xsl/pdf/lfs-lists.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/pdf/lfs-lists.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/pdf/lfs-mixed.xsl
===================================================================
--- stylesheets/lfs-xsl/pdf/lfs-mixed.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/pdf/lfs-mixed.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl
===================================================================
--- stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/pdf/lfs-xref.xsl
===================================================================
--- stylesheets/lfs-xsl/pdf/lfs-xref.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/pdf/lfs-xref.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/profile.xsl
===================================================================
--- stylesheets/lfs-xsl/profile.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/profile.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/xhtml/lfs-admon.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-admon.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/xhtml/lfs-admon.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/xhtml/lfs-index.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-index.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/xhtml/lfs-index.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <!DOCTYPE xsl:stylesheet [
Index: stylesheets/lfs-xsl/xhtml/lfs-legalnotice.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-legalnotice.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/xhtml/lfs-legalnotice.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/xhtml/lfs-sections.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-sections.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/xhtml/lfs-sections.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/xhtml/lfs-titles.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-titles.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/xhtml/lfs-titles.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/xhtml/lfs-toc.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-toc.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/xhtml/lfs-toc.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/lfs-xsl/xhtml/lfs-xref.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-xref.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/lfs-xsl/xhtml/lfs-xref.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Index: stylesheets/patcheslist.xsl
===================================================================
--- stylesheets/patcheslist.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/patcheslist.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -4,4 +4,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <!--
@@ -19,5 +24,5 @@
     <!-- Allow select the dest dir at runtime -->
   <xsl:param name="dest.dir">
-    <xsl:value-of select="concat('/srv/www/', substring-after('&patch-root;', 'https://'))"/>
+    <xsl:value-of select="concat('/srv/www/', substring-after('&patch-root;', 'http://'))"/>
   </xsl:param>
 
@@ -41,5 +46,5 @@
     <xsl:text>&#x0a;chgrp lfswww *.patch &amp;&amp;&#x0a;</xsl:text>
     <xsl:text>if [ `wc -l copyerrs|sed 's/ *//' |cut -f1 -d' '` -gt 0 ]; then
-  mail -s "Missing BLFS patches" blfs-book@lists.linuxfromscratch.org &lt; copyerrs
+  mail -s "Missing BLFS patches" blfs-book@linuxfromscratch.org &lt; copyerrs
 fi</xsl:text>
     <xsl:text>&#x0a;exit&#x0a;</xsl:text>
@@ -83,8 +88,4 @@
           <xsl:text>/x265</xsl:text>
         </xsl:when>
-          <!-- node -->
-        <xsl:when test="contains($patch.name, 'node')">
-          <xsl:text>/node</xsl:text>
-        </xsl:when>
           <!-- General rule -->
         <xsl:otherwise>
Index: stylesheets/wget-list.xsl
===================================================================
--- stylesheets/wget-list.xsl	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ stylesheets/wget-list.xsl	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,3 +1,8 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <!-- Create a list of upstream URLs for packages and patches to be used
Index: template/README
===================================================================
--- template/README	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
+++ template/README	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -0,0 +1,10 @@
+$LastChangedBy$
+$Date$
+
+This is a generic template.
+
+Makes a copy of the file and edit as needed.
+
+don't forget to:
+
+svn propset svn:keywords "LastChangedBy Date" path/to/new/page.xml
Index: template/template.xml
===================================================================
--- template/template.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ template/template.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -29,6 +29,9 @@
 
   <sect1info>
-    <!-- this part gets updated when rendering the book on rivendell.
-      In your local copy, it is just $Date$ -->
+    <!-- this part gets updated when you commit, IFF you set the properties:
+      first, svn add path/to/thisfile.xml and then
+      svn propset svn:mime-type text/plain path/to/thisfile.xml and
+      svn propset svn:keywords "Date LastChangedBy" path/to/thisfile.xml -->
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -411,5 +414,5 @@
         <listitem>
           <para>
-            does this ..... (no period at the end)
+            does this ..... (end the sentence with a period).
           </para>
           <indexterm zone="TEMPLATE PROGRAM1">
@@ -423,5 +426,5 @@
         <listitem>
           <para>
-            does this ..... (no period at the end)
+            does this ..... (end the sentence with a period).
           </para>
           <indexterm zone="TEMPLATE PROGRAM2">
@@ -435,5 +438,5 @@
         <listitem>
           <para>
-            contains functions that ..... (no period at the end)
+            contains functions that ..... (end the sentence with a period).
           </para>
           <indexterm zone="TEMPLATE libLIBRARY1">
Index: tidy.conf
===================================================================
--- tidy.conf	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ tidy.conf	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -1,4 +1,6 @@
 # Tidy configuration file
 #
+# $LastChangedBy$
+# $Date$
 
 indent-spaces: 2
Index: x/dm/dm.xml
===================================================================
--- x/dm/dm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/dm/dm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,9 @@
 
   <title>Display Managers</title>
+
+  <!--
+  $LastChangedBy$
+  $Date$
+  -->
 
   <para>
Index: x/dm/lightdm.xml
===================================================================
--- x/dm/lightdm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/dm/lightdm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -14,9 +14,9 @@
 
 <!-- lightdm-gtk-greeter -->
-  <!ENTITY lightdm-gtk-greeter-download-http "https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-&lightdm-gtk-greeter-version;/lightdm-gtk-greeter-&lightdm-gtk-greeter-version;.tar.gz">
+  <!ENTITY lightdm-gtk-greeter-download-http "https://launchpad.net/lightdm-gtk-greeter/2.0/&lightdm-gtk-greeter-version;/+download/lightdm-gtk-greeter-&lightdm-gtk-greeter-version;.tar.gz">
   <!ENTITY lightdm-gtk-greeter-download-ftp  " ">
-  <!ENTITY lightdm-gtk-greeter-md5sum        "373c73c67367df511eb544e09a2da281">
-  <!ENTITY lightdm-gtk-greeter-size          "569.7 KB">
-  <!ENTITY lightdm-gtk-greeter-buildsize     "5.5 MB">
+  <!ENTITY lightdm-gtk-greeter-md5sum        "36dc961f14cc3b0baef3ddb1c494eb16">
+  <!ENTITY lightdm-gtk-greeter-size          "564 KB">
+  <!ENTITY lightdm-gtk-greeter-buildsize     "5.0 MB">
   <!ENTITY lightdm-gtk-greeter-time          "less than 0.1 SBU ">
 ]>
@@ -26,4 +26,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -43,5 +44,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Lightdm Package Information</bridgehead>
@@ -233,5 +234,4 @@
    --disable-libindicator        \
    --disable-static              \
-   --disable-maintainer-mode     \
    --docdir=/usr/share/doc/lightdm-gtk-greeter-&lightdm-gtk-greeter-version; &amp;&amp;
 
@@ -243,15 +243,4 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-
-  <note>
-    <para>
-      If you installed Xorg in /opt, you will need to create a symbolic
-      link so lightdm can find the Xorg server.  As the 
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-    <screen><userinput>ln -sf /opt/xorg/bin/Xorg /usr/bin/X</userinput></screen>
-  </note>
-
 
   </sect2>
@@ -272,4 +261,9 @@
       <command>configure</command> throws an error if it is not found on the
       system. This parameter prevents the error.
+    </para>
+
+    <para>
+      <parameter>CFLAGS=...</parameter>: those two switches ensures some
+      warnings are not treated as errors.
     </para>
 
@@ -424,5 +418,5 @@
         <listitem>
           <para>
-            is a display and login manager
+            is a display and login manager.
           </para>
           <indexterm zone="lightdm lightdm-prog">
@@ -439,5 +433,5 @@
             a graphical user interface that performs user
             authentication and initiates the selected window manager
-            or display environment
+            or display environment.
           </para>
           <indexterm zone="lightdm lightdm-gtk-greeter">
Index: x/dm/lxdm.xml
===================================================================
--- x/dm/lxdm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/dm/lxdm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/icons/adwaita-icon-theme.xml
===================================================================
--- x/icons/adwaita-icon-theme.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/icons/adwaita-icon-theme.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,11 +6,11 @@
 
   <!ENTITY adwaita-icon-theme-download-http
-   "&gnome-download-http;/adwaita-icon-theme/&gnome-40;/adwaita-icon-theme-&adwaita-icon-theme-version;.tar.xz">
+   "&gnome-download-http;/adwaita-icon-theme/&gnome-minor-38;/adwaita-icon-theme-&adwaita-icon-theme-version;.tar.xz">
   <!ENTITY adwaita-icon-theme-download-ftp
-   "&gnome-download-ftp;/adwaita-icon-theme/&gnome-40;/adwaita-icon-theme-&adwaita-icon-theme-version;.tar.xz">
-  <!ENTITY adwaita-icon-theme-md5sum        "6f1248c72896ac9364a408cfa7261370">
+   "&gnome-download-ftp;/adwaita-icon-theme/&gnome-minor-38;/adwaita-icon-theme-&adwaita-icon-theme-version;.tar.xz">
+  <!ENTITY adwaita-icon-theme-md5sum        "b3c1d078ba20f179e0cddfc3453db6ee">
   <!ENTITY adwaita-icon-theme-size          "16 MB">
-  <!ENTITY adwaita-icon-theme-buildsize     "91 MB">
-  <!ENTITY adwaita-icon-theme-time          "0.5 SBU (Using parallelism=4)">
+  <!ENTITY adwaita-icon-theme-buildsize     "133 MB">
+  <!ENTITY adwaita-icon-theme-time          "0.6 SBU">
 ]>
 
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/icons/breeze-icons.xml
===================================================================
--- x/icons/breeze-icons.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/icons/breeze-icons.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY breeze-icons-download-http "&kf5-download-http;/breeze-icons-&kf5-version;.tar.xz">
   <!ENTITY breeze-icons-download-ftp  " ">
-  <!ENTITY breeze-icons-md5sum        "42665314255bdf88736973c28c8c0a65">
-  <!ENTITY breeze-icons-size          "2.0 MB">
-  <!ENTITY breeze-icons-buildsize     "300 MB">
+  <!ENTITY breeze-icons-md5sum        "6d4cd111ecaaf18137b3d927ee319aa0">
+  <!ENTITY breeze-icons-size          "1.9 MB">
+  <!ENTITY breeze-icons-buildsize     "406 MB">
   <!ENTITY breeze-icons-time          "0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/icons/gnome-icon-theme-extras.xml
===================================================================
--- x/icons/gnome-icon-theme-extras.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/icons/gnome-icon-theme-extras.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/icons/gnome-icon-theme-symbolic.xml
===================================================================
--- x/icons/gnome-icon-theme-symbolic.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/icons/gnome-icon-theme-symbolic.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/icons/gnome-icon-theme.xml
===================================================================
--- x/icons/gnome-icon-theme.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/icons/gnome-icon-theme.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/icons/gnome-themes-extra.xml
===================================================================
--- x/icons/gnome-themes-extra.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/icons/gnome-themes-extra.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -159,5 +160,5 @@
         <listitem>
           <para>
-            is the Adwaita <application>GTK+-2</application> engine theme
+            is the Adwaita <application>GTK+-2</application> engine theme.
           </para>
           <indexterm zone="gnome-themes-extra libadwaita">
Index: x/icons/hicolor-icon-theme.xml
===================================================================
--- x/icons/hicolor-icon-theme.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/icons/hicolor-icon-theme.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -123,5 +124,5 @@
         <listitem>
           <para>
-            contains icon definitions used as defaults
+            contains icon definitions used as defaults.
           </para>
         </listitem>
Index: x/icons/icon-naming-utils.xml
===================================================================
--- x/icons/icon-naming-utils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/icons/icon-naming-utils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-   &lfs110a_checked;
+   &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -145,5 +146,5 @@
             backwards compatibility with current desktop icon themes,
             while migrating to the names specified in the Icon Naming
-            Specification
+            Specification.
           </para>
           <indexterm zone="icon-naming-utils icon-name-mapping">
Index: x/icons/icons.xml
===================================================================
--- x/icons/icons.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/icons/icons.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,9 @@
 
   <title>Icons</title>
+
+  <!--
+  $LastChangedBy$
+  $Date$
+  -->
 
   <para>
Index: x/icons/lxde-icon-theme.xml
===================================================================
--- x/icons/lxde-icon-theme.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/icons/lxde-icon-theme.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/icons/oxygen-icons5.xml
===================================================================
--- x/icons/oxygen-icons5.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/icons/oxygen-icons5.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY oxygen-icons5-download-http "&kf5-download-http;/oxygen-icons5-&kf5-version;.tar.xz">
   <!ENTITY oxygen-icons5-download-ftp  " ">
-  <!ENTITY oxygen-icons5-md5sum        "b6cad03903a685db1b323db2165355eb">
-  <!ENTITY oxygen-icons5-size          "228 MB">
-  <!ENTITY oxygen-icons5-buildsize     "452 MB">
+  <!ENTITY oxygen-icons5-md5sum        "750e034aaf3a2a87f9823dfec211e068">
+  <!ENTITY oxygen-icons5-size          "225 MB">
+  <!ENTITY oxygen-icons5-buildsize     "885 MB">
   <!ENTITY oxygen-icons5-time          "less than 0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/TTF-and-OTF-fonts.xml
===================================================================
--- x/installing/TTF-and-OTF-fonts.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/TTF-and-OTF-fonts.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -401,5 +402,5 @@
     <para>
       When KDE Frameworks 5 was first released, it used the <ulink url=
-      "https://download.kde.org/stable/plasma/5.4.3/oxygen-fonts-5.4.3.tar.xz">
+      "http://download.kde.org/stable/plasma/5.4.3/oxygen-fonts-5.4.3.tar.xz">
       Oxygen fonts</ulink>
       which were designed for integrated use with the KDE desktop. Those fonts
Index: x/installing/installing.xml
===================================================================
--- x/installing/installing.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/installing.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -8,4 +8,9 @@
 <chapter id="x-window-system" xreflabel="X Window System">
   <?dbhtml filename="installing.html" ?>
+
+  <!--
+  $LastChangedBy$
+  $Date$
+  -->
 
   <title>X Window System Environment</title>
Index: x/installing/libXau.xml
===================================================================
--- x/installing/libXau.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/libXau.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -127,8 +128,8 @@
 
       <varlistentry id="libXau-x7">
-        <term><filename class="libraryfile">libXau.so</filename></term>
+        <term><filename class='libraryfile'>libXau.so</filename></term>
         <listitem>
           <para>
-            is the library of X authority database routines
+            is the library of X authority database routines.
           </para>
           <indexterm zone="libXau libXau-x7">
Index: x/installing/libXdmcp.xml
===================================================================
--- x/installing/libXdmcp.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/libXdmcp.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -134,8 +135,8 @@
 
       <varlistentry id="libXdmcp-x7">
-        <term><filename class="libraryfile">libXdmcp.so</filename></term>
+        <term><filename class='libraryfile'>libXdmcp.so</filename></term>
         <listitem>
           <para>
-            is the X Display Manager Control Protocol library
+            is the X Display Manager Control Protocol library.
           </para>
           <indexterm zone="libXdmcp libXdmcp-x7">
Index: x/installing/libevdev.xml
===================================================================
--- x/installing/libevdev.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/libevdev.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,11 +5,11 @@
   %general-entities;
 
-  <!ENTITY libevdev-version "1.11.0">
+  <!ENTITY libevdev-version "1.10.0">
 
   <!ENTITY libevdev-download-http "https://www.freedesktop.org/software/libevdev/libevdev-&libevdev-version;.tar.xz">
   <!ENTITY libevdev-download-ftp  " ">
-  <!ENTITY libevdev-md5sum        "b09838ec120dabeebc08fa6a1943594f">
+  <!ENTITY libevdev-md5sum        "c6239ef0d61c4f4911f25bb8426a0b82">
   <!ENTITY libevdev-size          "436 KB">
-  <!ENTITY libevdev-buildsize     "9.1 MB (with tests)">
+  <!ENTITY libevdev-buildsize     "8.5 MB (with tests)">
   <!ENTITY libevdev-time          "0.2 SBU (with tests)">
 ]>
@@ -19,4 +19,5 @@
 
   <sect2info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect2info>
@@ -36,5 +37,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -162,5 +163,5 @@
           <listitem>
             <para>
-              is a tool to change some kernel device properties
+              is a tool to change some kernel device properties.
             </para>
             <indexterm zone="libevdev libevdev-tweak-device">
@@ -174,5 +175,5 @@
           <listitem>
             <para>
-              is a tool to estimate the resolution of a mouse
+              is a tool to estimate the resolution of a mouse.
             </para>
             <indexterm zone="libevdev mouse-dpi-tool">
@@ -188,5 +189,5 @@
               touchpad-edge-detector is a tool that reads the touchpad events
               from the kernel and calculates the minimum and maximum for the x
-              and y coordinates, respectively
+              and y coordinates, respectively.
             </para>
             <indexterm zone="libevdev touchpad-edge-detector">
@@ -200,5 +201,5 @@
           <listitem>
             <para>
-              is a library of Xorg driver input functions
+              is a library of Xorg driver input functions.
             </para>
             <indexterm zone="libevdev libevdev-lib">
@@ -213,2 +214,3 @@
 
   </sect2>
+  <!-- End Xorg Evdev Driver -->
Index: x/installing/libinput.xml
===================================================================
--- x/installing/libinput.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/libinput.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,109 +5,110 @@
   %general-entities;
 
-  <!ENTITY libinput-version "1.18.1">
+  <!ENTITY libinput-version "1.16.4">
 
   <!ENTITY libinput-download-http "https://www.freedesktop.org/software/libinput/libinput-&libinput-version;.tar.xz">
   <!ENTITY libinput-download-ftp  " ">
-  <!ENTITY libinput-md5sum        "17057507ddbcad69ecc5de0dd9a05e47">
-  <!ENTITY libinput-size          "608 KB">
-  <!ENTITY libinput-buildsize     "13 MB">
+  <!ENTITY libinput-md5sum        "1fdc670e62a08bcebceabd23af3d639a">
+  <!ENTITY libinput-size          "584 KB">
+  <!ENTITY libinput-buildsize     "15 MB">
   <!ENTITY libinput-time          "less than 0.1 SBU">
 ]>
 
-  <sect2 id="libinput" xreflabel="libinput-&libinput-version;">
-    <?dbhtml filename="libinput.html"?>
-
-    <sect2info>
-      <date>$Date$</date>
-    </sect2info>
-
-    <title>libinput-&libinput-version;</title>
-
-    <indexterm zone="libinput">
-      <primary sortas="a-libinput">libinput</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to libinput</title>
-
-      <para>
-        <application>libinput</application> is a library that handles
-        input devices for display servers and other applications that
-        need to directly deal with input devices.
-      </para>
-
-      &lfs110a_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&libinput-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&libinput-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &libinput-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &libinput-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &libinput-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &libinput-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">libinput Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="libevdev"/> and
-        <xref linkend="mtdev"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="valgrind"/> (to run the tests), 
-        <ulink url="http://sphinx-doc.org/">Sphinx</ulink> (required to build documentation),
-        <xref linkend="gtk3"/> (to build the GUI event viewer),
-        <ulink url="http://www.nongnu.org/libunwind/">libunwind</ulink> (required for tests),
-        <xref linkend="libwacom"/>, and
-        <ulink url="https://pypi.org/project/pyparsing/">PyParsing</ulink> (for one non-root test)
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/libinput"/>
-      </para>
-    </sect3>
-
-    <sect3 role="kernel" id="libinput-kernel">
-      <title>kernel configuration for running the libinput testsuite</title>
-
-      <para>
-        Although libinput works with the same kernel configuration used by <xref
-        linkend="libevdev"/>, its extensive testsuite requires the presence of
-        <filename>/dev/uinput</filename>  (as well as both <xref linkend="valgrind"/>
-        and <ulink url="http://www.nongnu.org/libunwind/">libunwind</ulink>).
-      </para>
-
-      <para>
-        If you wish to run the full tests, enable the following option in the kernel
-        configuration and recompile the kernel if necessary:
-      </para>
+<sect2 id="libinput" xreflabel="libinput-&libinput-version;">
+  <?dbhtml filename="libinput.html"?>
+
+  <sect2info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect2info>
+
+  <title>libinput-&libinput-version;</title>
+
+  <indexterm zone="libinput">
+    <primary sortas="a-libinput">libinput</primary>
+  </indexterm>
+
+  <sect3 role="package">
+    <title>Introduction to libinput</title>
+
+    <para>
+      <application>libinput</application> is a library that handles
+      input devices for display servers and other applications that
+      need to directly deal with input devices.
+    </para>
+
+    &lfs10_checked;
+
+    <bridgehead renderas="sect4">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libinput-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libinput-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libinput-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libinput-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libinput-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libinput-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect4">libinput Dependencies</bridgehead>
+
+    <bridgehead renderas="sect5">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libevdev"/> and
+      <xref linkend="mtdev"/>
+    </para>
+
+    <bridgehead renderas="sect5">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="valgrind"/> (to run the tests), 
+      <ulink url="http://sphinx-doc.org/">Sphinx</ulink> (required to build documentation),
+      <xref linkend="gtk3"/> (to build the GUI event viewer),
+      <ulink url="http://www.nongnu.org/libunwind/">libunwind</ulink> (required for tests),
+      <xref linkend="libwacom"/>, and
+      <ulink url="https://pypi.org/project/pyparsing/">PyParsing</ulink> (for one non-root test)
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libinput"/>
+    </para>
+  </sect3>
+
+  <sect3 role="kernel" id="libinput-kernel">
+    <title>kernel configuration for running the libinput testsuite</title>
+
+    <para>
+      Although libinput works with the same kernel configuration used by <xref
+      linkend="libevdev"/>, its extensive testsuite requires the presence of
+      <filename>/dev/uinput</filename>  (as well as both <xref linkend="valgrind"/>
+      and <ulink url="http://www.nongnu.org/libunwind/">libunwind</ulink>).
+    </para>
+
+    <para>
+      If you wish to run the full tests, enable the following option in the kernel
+      configuration and recompile the kernel if necessary:
+    </para>
 
 <screen><literal>Device Drivers ---&gt;
@@ -116,30 +117,30 @@
     &lt;*/M&gt;   User level driver support        [CONFIG_INPUT_UINPUT]</literal></screen>
 
-      <para>
-        If you build this as a module, it needs to be inserted before the testsuite
-        runs.
-      </para>
-
-      <para>
-        On an Xorg system you will also need to prevent the events generated
-        during the testsuite from interfering with your desktop.  Copy the
-        file <filename>test/50-litest.conf</filename> into
-        <filename class="directory">${XORG_PREFIX}/share/X11/xorg.conf.d</filename>
-        and restart X. For further information see
-        <ulink url="https://wayland.freedesktop.org/libinput/doc/&libinput-version;/test-suite.html">libinput test suite</ulink>.
-      </para>
-
-      <indexterm zone="libinput libinput-kernel">
-        <primary sortas="d-libinput">libinput</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of libinput</title>
-
-      <para>
-        Install <application>libinput</application> by running the following
-        commands:
-      </para>
+    <para>
+      If you build this as a module, it needs to be inserted before the testsuite
+      runs.
+    </para>
+
+    <para>
+      On an Xorg system you will also need to prevent the events generated
+      during the testsuite from interfering with your desktop.  Copy the
+      file <filename>test/50-litest.conf</filename> into
+      <filename class="directory">${XORG_PREFIX}/share/X11/xorg.conf.d</filename>
+      and restart X. For further information see
+      <ulink url="https://wayland.freedesktop.org/libinput/doc/&libinput-version;/test-suite.html">libinput test suite</ulink>.
+    </para>
+
+    <indexterm zone="libinput libinput-kernel">
+      <primary sortas="d-libinput">libinput</primary>
+    </indexterm>
+  </sect3>
+
+  <sect3 role="installation">
+    <title>Installation of libinput</title>
+
+    <para>
+      Install <application>libinput</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>mkdir build &amp;&amp;
@@ -147,5 +148,5 @@
 
 meson --prefix=$XORG_PREFIX \
-      --buildtype=release   \
+      -Dudev-dir=/lib/udev  \
       -Ddebug-gui=false     \
       -Dtests=false         \
@@ -155,32 +156,32 @@
 ninja</userinput></screen>
 
-      <note>
-        <para>
-          If you want to run the full tests, remove -Dtests from the
-          <command>meson</command> command above. Please read "kernel
-          configuration for running the libinput testsuite" (above).
-        </para>
-
-        <para>
-          If you have enabled the full tests, you can run the main tests
-          <emphasis>as the root user</emphasis> by executing:
-          <command>ninja test</command>. A very large number of tests will
-          be run, about 20 fail (at least on an Xorg system).
-        </para>
-      </note>
-
+    <note>
       <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
+        If you want to run the full tests, remove -Dtests from the
+        <command>meson</command> command above. Please read "kernel
+        configuration for running the libinput testsuite" (above).
       </para>
 
+      <para>
+        If you have enabled the full tests, you can run the main tests
+        <emphasis>as the root user</emphasis> by executing:
+        <command>ninja test</command>. A very large number of tests will
+        be run, about 20 fail (at least on an Xorg system).
+      </para>
+    </note>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
 <screen role="root"><userinput>ninja install</userinput></screen>
 
-      <para>
-        If <xref linkend="doxygen"/>, <xref linkend="graphviz"/>, and 
-        <ulink url="http://sphinx-doc.org/">Sphinx</ulink> were
-        present during the build, you can install the generated documentation
-        by running the following commands as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
+    <para>
+      If <xref linkend="doxygen"/>, <xref linkend="graphviz"/>, and 
+      <ulink url="http://sphinx-doc.org/">Sphinx</ulink> were
+      present during the build, you can install the generated documentation
+      by running the following commands as the <systemitem
+      class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"
@@ -189,163 +190,164 @@
 cp -rv api/*           /usr/share/doc/libinput-&libinput-version;/api</userinput></screen>
 
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-        href="../../xincludes/meson-buildtype-release.xml"/>
-
-      <para>
-        <parameter>-Ddebug-gui=false</parameter>: This switch
-        disables creation of a visual debug helper for libinput. Remove
-        if you want it, and you have <xref linkend="gtk3"/> installed.
-      </para>
-
-      <para>
-        <parameter>-Dtests=false</parameter>: This switch disables compilation of
-        the main tests.  Even with the tests defined as false, you can still run
-        the first four minor tests, as a regular user, but one will be skipped if
-        <ulink url="https://pypi.org/project/pyparsing">PyParsing</ulink> is not
-        installed.
-      </para>
-
-      <para>
-        <parameter>-Ddocumentation=false</parameter>: This switch disables
-        generation of the documentation. Remove if you want to generate it, and
-        you have <xref linkend="doxygen"/> and <xref linkend="graphviz"/>
-        installed.
-      </para>
-
-      <para>
-        <parameter>-Dlibwacom=false</parameter>: Remove this option if you
-        have <xref linkend="libwacom"/> installed, or if you are installing
-        GNOME.
-      </para>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            libinput
-            <!-- libinput-debug-events, libinput-list-devices, libinput-measure*,
-            libinput-record, libinput-replay Library Executables -->
-          </seg>
-          <seg>
-            libinput.so
-          </seg>
-          <seg>
-            $XORG_PREFIX/libexec/libinput,
-            /etc/libinput,
-            /usr/share/libinput, and (optionally)
-            /usr/share/doc/libinput-&libinput-version;
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="libinput-prog">
-          <term><command>libinput</command></term>
-          <listitem>
-            <para>
-              is a set of tools to interface with the
-              <application>libinput</application> library
-            </para>
-            <indexterm zone="libinput libinput-prog">
-              <primary sortas="b-libinput-prog">libinput</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
+  </sect3>
+
+  <sect3 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>-Dudev-dir=/lib/udev</parameter>: This switch
+      specifies where UDev rules and hwdb files will be installed.
+    </para>
+
+    <para>
+      <parameter>-Ddebug-gui=false</parameter>: This switch
+      disables creation of a visual debug helper for libinput. Remove
+      if you want it, and you have <xref linkend="gtk3"/> installed.
+    </para>
+
+    <para>
+      <parameter>-Dtests=false</parameter>: This switch disables compilation of
+      the main tests.  Even with the tests defined as false, you can still run
+      the first four minor tests, as a regular user, but one will be skipped if
+      <ulink url="https://pypi.org/project/pyparsing">PyParsing</ulink> is not
+      installed.
+    </para>
+
+    <para>
+      <parameter>-Ddocumentation=false</parameter>: This switch disables
+      generation of the documentation. Remove if you want to generate it, and
+      you have <xref linkend="doxygen"/> and <xref linkend="graphviz"/>
+      installed.
+    </para>
+
+    <para>
+      <parameter>-Dlibwacom=false</parameter>: Remove this option if you
+      have <xref linkend="libwacom"/> installed, or if you are installing
+      GNOME.
+    </para>
+
+  </sect3>
+
+  <sect3 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          libinput
+          <!-- libinput-debug-events, libinput-list-devices, libinput-measure*,
+          libinput-record, libinput-replay Library Executables -->
+        </seg>
+        <seg>
+          libinput.so
+        </seg>
+        <seg>
+          $XORG_PREFIX/libexec/libinput,
+          /usr/share/libinput, and (optionally)
+          /usr/share/doc/libinput-&libinput-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libinput-prog">
+        <term><command>libinput</command></term>
+        <listitem>
+          <para>
+            is a set of tools to interface with the
+            <application>libinput</application> library.
+          </para>
+          <indexterm zone="libinput libinput-prog">
+            <primary sortas="b-libinput-prog">libinput</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 <!--
-        <varlistentry id="libinput-debug-events">
-          <term><command>libinput-debug-events</command></term>
-          <listitem>
-            <para>
-              is a debug helper for <application>libinput</application>.
-            </para>
-            <indexterm zone="libinput libinput-debug-events">
-              <primary sortas="b-libinput-debug-events">libinput-debug-events</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="libinput-list-devices">
-          <term><command>libinput-list-devices</command></term>
-          <listitem>
-            <para>
-              lists local devices as recognized by
-              <application>libinput</application>.
-            </para>
-            <indexterm zone="libinput libinput-list-devices">
-              <primary sortas="b-libinput-list-devices">libinput-list-devices</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="libinput-measure">
-          <term><command>libinput-measure</command></term>
-          <listitem>
-            <para>
-              is the entry to a set of debugging programs to measure
-              the properties of one or more devices.
-            </para>
-            <indexterm zone="libinput libinput-measure">
-              <primary sortas="b-libinput-measure">libinput-measure</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="libinput-record">
-          <term><command>libinput-record</command></term>
-          <listitem>
-            <para>
-              records kernel events from a device in a form that can later be
-              replayed by libinput-replay.
-            </para>
-            <indexterm zone="libinput libinput-record">
-              <primary sortas="b-libinput-record">libinput-record</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="libinput-replay">
-          <term><command>libinput-replay</command></term>
-          <listitem>
-            <para>
-              replays kernel events from a recording made by libinput-record.
-            </para>
-            <indexterm zone="libinput libinput-replay">
-              <primary sortas="b-libinput-replay">libinput-replay</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
+      <varlistentry id="libinput-debug-events">
+        <term><command>libinput-debug-events</command></term>
+        <listitem>
+          <para>
+            is a debug helper for <application>libinput</application>.
+          </para>
+          <indexterm zone="libinput libinput-debug-events">
+            <primary sortas="b-libinput-debug-events">libinput-debug-events</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libinput-list-devices">
+        <term><command>libinput-list-devices</command></term>
+        <listitem>
+          <para>
+            lists local devices as recognized by
+            <application>libinput</application>.
+          </para>
+          <indexterm zone="libinput libinput-list-devices">
+            <primary sortas="b-libinput-list-devices">libinput-list-devices</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libinput-measure">
+        <term><command>libinput-measure</command></term>
+        <listitem>
+          <para>
+            is the entry to a set of debugging programs to measure
+            the properties of one or more devices.
+          </para>
+          <indexterm zone="libinput libinput-measure">
+            <primary sortas="b-libinput-measure">libinput-measure</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libinput-record">
+        <term><command>libinput-record</command></term>
+        <listitem>
+          <para>
+            records kernel events from a device in a form that can later be
+            replayed by libinput-replay.
+          </para>
+          <indexterm zone="libinput libinput-record">
+            <primary sortas="b-libinput-record">libinput-record</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libinput-replay">
+        <term><command>libinput-replay</command></term>
+        <listitem>
+          <para>
+            replays kernel events from a recording made by libinput-record.
+          </para>
+          <indexterm zone="libinput libinput-replay">
+            <primary sortas="b-libinput-replay">libinput-replay</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 -->
-        <varlistentry id="libinput-lib">
-          <term><filename class="libraryfile">libinput.so</filename></term>
-          <listitem>
-            <para>
-              contains API functions for handling input devices
-            </para>
-            <indexterm zone="libinput libinput-lib">
-              <primary sortas="c-libinput-lib">libinput.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
+      <varlistentry id="libinput-lib">
+        <term><filename class="libraryfile">libinput.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions for handling input devices.
+          </para>
+          <indexterm zone="libinput libinput-lib">
+            <primary sortas="c-libinput-lib">libinput.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect3>
+
+</sect2>
Index: x/installing/libva.xml
===================================================================
--- x/installing/libva.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/libva.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY libva-download-http "https://github.com/intel/libva/releases/download/&libva-version;/libva-&libva-version;.tar.bz2">
   <!ENTITY libva-download-ftp  " ">
-  <!ENTITY libva-md5sum        "602b7583ebab2a3ee7cfcd8f984b4a81">
-  <!ENTITY libva-size          "488 KB">
-  <!ENTITY libva-buildsize     "12 MB">
+  <!ENTITY libva-md5sum        "ad5d5cf8d86b5521944995bdf8a133cd">
+  <!ENTITY libva-size          "476 KB">
+  <!ENTITY libva-buildsize     "7.9 MB">
   <!ENTITY libva-time          "less than 0.1 SBU">
 
@@ -21,163 +21,164 @@
 ]>
 
-  <sect2 id="libva" xreflabel="libva-&libva-version;">
-
-    <sect2info>
-      <date>$Date$</date>
-    </sect2info>
-
-    <title>libva-&libva-version;</title>
-
-    <indexterm zone="libva">
-      <primary sortas="a-libva">libva</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to libva</title>
-
+<sect2 id="libva" xreflabel="libva-&libva-version;">
+
+  <sect2info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect2info>
+
+  <title>libva-&libva-version;</title>
+
+  <indexterm zone="libva">
+    <primary sortas="a-libva">libva</primary>
+  </indexterm>
+
+  <sect3 role="package">
+    <title>Introduction to libva</title>
+
+    <para>
+       The <application>libva</application> package contains a library which
+       provides access to hardware accelerated video processing, using hardware
+       to accelerate video processing in order to offload the central
+       processing unit (CPU) to decode and encode compressed digital video. The VA
+       API video decode/encode interface is platform and window system
+       independent targeted at Direct Rendering Infrastructure (DRI) in the X
+       Window System however it can potentially also be used with direct
+       framebuffer and graphics sub-systems for video output. Accelerated
+       processing includes support for video decoding, video encoding,
+       subpicture blending, and rendering.
+    </para>
+
+    &lfs10_checked;
+
+    <bridgehead renderas="sect4">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libva-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libva-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libva-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libva-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libva-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libva-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect4">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Intel Driver Download (HTTP): <ulink url="&libva-intel-driver-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Intel Driver Download (FTP): <ulink url="&libva-intel-driver-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Intel Driver Download MD5 sum: &libva-intel-driver-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Intel Driver Download size: &libva-intel-driver-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libva-intel-driver-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libva-intel-driver-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect4">libva Dependencies</bridgehead>
+
+    <bridgehead renderas="sect5">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libdrm"/>
+    </para>
+
+    <bridgehead renderas="sect5">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="mesa"/>
+    </para>
+
+    <bridgehead renderas="sect5">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/>,
+      <xref linkend="wayland"/>, and
+      <ulink url="https://gitlab.freedesktop.org/drm/igt-gpu-tools">intel-gpu-tools</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libva"/>
+    </para>
+  </sect3>
+
+  <sect3 role="installation">
+    <title>Installation of libva</title>
+
+    <caution>
       <para>
-         The <application>libva</application> package contains a library which
-         provides access to hardware accelerated video processing, using hardware
-         to accelerate video processing in order to offload the central
-         processing unit (CPU) to decode and encode compressed digital video. The VA
-         API video decode/encode interface is platform and window system
-         independent targeted at Direct Rendering Infrastructure (DRI) in the X
-         Window System however it can potentially also be used with direct
-         framebuffer and graphics sub-systems for video output. Accelerated
-         processing includes support for video decoding, video encoding,
-         subpicture blending, and rendering.
+        If you are reinstalling this package, you will need 
+        to remove the older versions of the libraries.  These are in the
+        form of libva*.so.1 and any symbolic links pointing to them.  In
+        addition, any packages that use these files need to be rebuilt.
       </para>
-
-      &lfs110a_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&libva-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&libva-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &libva-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &libva-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &libva-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &libva-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Additional Downloads</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Intel Driver Download (HTTP): <ulink url="&libva-intel-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Intel Driver Download (FTP): <ulink url="&libva-intel-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Intel Driver Download MD5 sum: &libva-intel-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Intel Driver Download size: &libva-intel-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &libva-intel-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &libva-intel-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">libva Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="libdrm"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="mesa"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="doxygen"/>,
-        <xref linkend="wayland"/>, and
-        <ulink url="https://gitlab.freedesktop.org/drm/igt-gpu-tools">intel-gpu-tools</ulink>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/libva"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of libva</title>
-
-      <caution>
-        <para>
-          If you are reinstalling this package, you will need 
-          to remove the older versions of the libraries.  These are in the
-          form of libva*.so.1 and any symbolic links pointing to them.  In
-          addition, any packages that use these files need to be rebuilt.
-        </para>
-      </caution>
-
-      <para>
-        Install <application>libva</application> by running the following
-        commands:
-      </para>
+    </caution>
+
+    <para>
+      Install <application>libva</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure $XORG_CONFIG &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>
+    <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>
 
-    <bridgehead renderas="sect3">Installation of intel-vaapi-driver</bridgehead>
-
-      <para>
-        The <application>intel-vaapi-driver</application> is designed
-        specifically for video cards based on an Intel GPU.
-        Unpack the intel-vaapi tarball:
-      </para>
+  <bridgehead renderas="sect3">Installation of intel-vaapi-driver</bridgehead>
+
+    <para>
+      The <application>intel-vaapi-driver</application> is designed
+      specifically for video cards based on an Intel GPU.
+      Unpack the intel-vaapi tarball:
+    </para>
 
 <screen><userinput>tar -xvf ../intel-vaapi-driver-&libva-intel-driver-version;.tar.bz2 &amp;&amp;
@@ -185,7 +186,7 @@
 
 <!-- Fixed in intel-vaapi-driver-2.4.1
-      <para>
-        Fix building with GCC-10 and above:
-      </para>
+    <para>
+      Fix building with GCC-10 and above:
+    </para>
 
 <screen><userinput>sed -e 's/const/extern &amp;/' \
@@ -193,73 +194,73 @@
 -->
 
-      <para>
-        Install the driver by running the following commands:
-      </para>
+    <para>
+      Install the driver by running the following commands:
+    </para>
 
 <screen><userinput>./configure $XORG_CONFIG &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>
+    <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>
 
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Driver</segtitle>
-        <segtitle>Installed Directory</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            libva-drm.so, 
-            libva-glx.so, 
-            libva.so,
-            libva-wayland.so, and 
-            libva-x11.so
-          </seg>
-          <seg>
-            i965_drv_video.so
-          </seg>
-          <seg>
-            $XORG_PREFIX/include/va
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="libva-lib">
-          <term><filename class="libraryfile">libva.so</filename></term>
-          <listitem>
-            <para>
-              contains API functions which provide access to hardware
-              accelerated video processing
-            </para>
-            <indexterm zone="libva libva-lib">
-              <primary sortas="c-libva">libva.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
+  </sect3>
+
+  <sect3 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Driver</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libva-drm.so, 
+          libva-glx.so, 
+          libva.so,
+          libva-wayland.so, and 
+          libva-x11.so
+        </seg>
+        <seg>
+          i965_drv_video.so
+        </seg>
+        <seg>
+          $XORG_PREFIX/include/va
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libva-lib">
+        <term><filename class="libraryfile">libva.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions which provide access to hardware
+            accelerated video processing.
+          </para>
+          <indexterm zone="libva libva-lib">
+            <primary sortas="c-libva">libva.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect3>
+
+</sect2>
Index: x/installing/libvdpau-va-gl.xml
===================================================================
--- x/installing/libvdpau-va-gl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/libvdpau-va-gl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -13,98 +13,99 @@
 ]>
 
-  <sect2 id="libvdpau-va-gl" xreflabel="libvdpau-va-gl-&libvdpau-va-gl-version;">
+<sect2 id="libvdpau-va-gl" xreflabel="libvdpau-va-gl-&libvdpau-va-gl-version;">
 
-    <sect2info>
-      <date>$Date$</date>
-    </sect2info>
+  <sect2info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect2info>
 
-    <title>libvdpau-va-gl-&libvdpau-va-gl-version;</title>
+  <title>libvdpau-va-gl-&libvdpau-va-gl-version;</title>
 
-    <indexterm zone="libvdpau-va-gl">
-      <primary sortas="a-libvdpau-va-gl">libvdpau-va-gl</primary>
-    </indexterm>
+  <indexterm zone="libvdpau-va-gl">
+    <primary sortas="a-libvdpau-va-gl">libvdpau-va-gl</primary>
+  </indexterm>
 
-    <sect3 role="package">
-      <title>Introduction to libvdpau-va-gl</title>
+  <sect3 role="package">
+    <title>Introduction to libvdpau-va-gl</title>
 
-      <para>
-        The <application>libvdpau-va-gl</application> package contains a library
-        which implements the VDPAU library.  Libvdpau_va_gl uses OpenGL under the
-        hood to accelerate drawing and scaling and the VA-API (if available) to
-        accelerate video decoding. For now VA-API is available on some Intel
-        chips, and on some AMD video adapters with the help of the libvdpau
-        driver.
-      </para>
+    <para>
+      The <application>libvdpau-va-gl</application> package contains a library
+      which implements the VDPAU library.  Libvdpau_va_gl uses OpenGL under the
+      hood to accelerate drawing and scaling and the VA-API (if available) to
+      accelerate video decoding. For now VA-API is available on some Intel
+      chips, and on some AMD video adapters with the help of the libvdpau
+      driver.
+    </para>
 
-      &lfs110a_checked;
+    &lfs10_checked;
 
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Libvdpau-va-gl Driver Download (HTTP): <ulink url="&libvdpau-va-gl-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Libvdpau-va-gl Driver Download (FTP): <ulink url="&libvdpau-va-gl-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Libvdpau-va-gl Driver Download MD5 sum: &libvdpau-va-gl-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Libvdpau-va-gl Driver Download size: &libvdpau-va-gl-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &libvdpau-va-gl-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &libvdpau-va-gl-time;
-          </para>
-        </listitem>
-      </itemizedlist>
+    <bridgehead renderas="sect4">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Libvdpau-va-gl Driver Download (HTTP): <ulink url="&libvdpau-va-gl-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Libvdpau-va-gl Driver Download (FTP): <ulink url="&libvdpau-va-gl-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Libvdpau-va-gl Driver Download MD5 sum: &libvdpau-va-gl-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Libvdpau-va-gl Driver Download size: &libvdpau-va-gl-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libvdpau-va-gl-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libvdpau-va-gl-time;
+        </para>
+      </listitem>
+    </itemizedlist>
 
-      <bridgehead renderas="sect4">libvdpau-va-gl Dependencies</bridgehead>
+    <bridgehead renderas="sect4">libvdpau-va-gl Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="cmake"/>,
-        <xref linkend="ffmpeg"/>,
-        <xref linkend="libvdpau"/>, and
-        <xref linkend="libva"/>
-      </para>
+    <bridgehead renderas="sect5">Required</bridgehead>
+    <para role="required">
+      <xref linkend="cmake"/>,
+      <xref linkend="ffmpeg"/>,
+      <xref linkend="libvdpau"/>, and
+      <xref linkend="libva"/>
+    </para>
 
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="doxygen"/>,
-        <xref linkend="graphviz"/>, and
-        <xref linkend="texlive"/> or <xref linkend="tl-installer"/>
-      </para>
+    <bridgehead renderas="sect5">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/>,
+      <xref linkend="graphviz"/>, and
+      <xref linkend="texlive"/> or <xref linkend="tl-installer"/>
+    </para>
 
-      <bridgehead renderas="sect5">Runtime Dependency</bridgehead>
-      <para role="optional">
-        <xref role="runtime" linkend="mesa"/>
-      </para>
+    <bridgehead renderas="sect5">Runtime Dependency</bridgehead>
+    <para role="optional">
+      <xref role="runtime" linkend="mesa"/>
+    </para>
 
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/libvdpau"/>
-      </para>
-    </sect3>
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libvdpau"/>
+    </para>
+  </sect3>
 
-    <sect3 role="installation">
-      <title>Installation of libvdpau-va-gl</title>
+  <sect3 role="installation">
+    <title>Installation of libvdpau-va-gl</title>
 
-      <para>
-        Install <application>libvdpau-va-gl</application> by running the following
-        commands:
-      </para>
+    <para>
+      Install <application>libvdpau-va-gl</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>mkdir build &amp;&amp;
@@ -114,71 +115,72 @@
 make</userinput></screen>
 
-      <para>
-        To test the results, issue: <command>make check</command>.  The tests must
-        be run from an Xorg environment.
-      </para>
+    <para>
+      To test the results, issue: <command>make check</command>.  The tests must
+      be run from an Xorg environment.
+    </para>
 
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
-    </sect3>
+  </sect3>
 
-    <sect3 role="configuration">
-      <title>Configuration</title>
+  <sect3 role="configuration">
+    <title>Configuration</title>
 
-      <para>
-        To allow libvdpau to find libvdpau-va-gl, set an environment variable.
-        As the <systemitem class="username">root</systemitem> user:
-      </para>
+    <para>
+      To allow libvdpau to find libvdpau-va-gl, set an environment variable.
+      As the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>echo "export VDPAU_DRIVER=va_gl" >> /etc/profile.d/xorg.sh</userinput></screen>
 
-    </sect3>
+  </sect3>
 
-    <sect3 role="content">
-      <title>Contents</title>
 
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Directories</segtitle>
+  <sect3 role="content">
+    <title>Contents</title>
 
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            libvdpau_va_gl.so
-          </seg>
-          <seg>
-            None
-          </seg>
-        </seglistitem>
-      </segmentedlist>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libvdpau_va_gl.so
+        </seg>
+        <seg>
+          None
+        </seg>
+      </seglistitem>
+    </segmentedlist>
 
-        <varlistentry id="libvdpau-va-gl-lib">
-          <term><filename class="libraryfile">libvdpau_va_gl.so</filename></term>
-          <listitem>
-            <para>
-              contains functions to implement the OpenGL backend to
-              the VDPAU (Video Decode and Presentation API for Unix) API
-            </para>
-            <indexterm zone="libvdpau-va-gl libvdpau-va-gl-lib">
-              <primary sortas="c-libvdpau-va-gl">libvdpau.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-      </variablelist>
+      <varlistentry id="libvdpau-va-gl-lib">
+        <term><filename class="libraryfile">libvdpau_va_gl.so</filename></term>
+        <listitem>
+          <para>
+            contains functions to implement the OpenGL backend to
+            the VDPAU (Video Decode and Presentation API for Unix) API.
+          </para>
+          <indexterm zone="libvdpau-va-gl libvdpau-va-gl-lib">
+            <primary sortas="c-libvdpau-va-gl">libvdpau.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-    </sect3>
+    </variablelist>
 
-  </sect2>
+  </sect3>
+
+</sect2>
Index: x/installing/libvdpau.xml
===================================================================
--- x/installing/libvdpau.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/libvdpau.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -9,116 +9,117 @@
   <!ENTITY libvdpau-md5sum        "a664cc2cfe9c30536d2e11c928cbea35">
   <!ENTITY libvdpau-size          "140 KB">
-  <!ENTITY libvdpau-buildsize     "4.2 MB (with tests)">
+  <!ENTITY libvdpau-buildsize     "4.3 MB (with tests)">
   <!ENTITY libvdpau-time          "less than 0.1 SBU (with tests)">
 ]>
 
-  <sect2 id="libvdpau" xreflabel="libvdpau-&libvdpau-version;">
+<sect2 id="libvdpau" xreflabel="libvdpau-&libvdpau-version;">
 
-    <sect2info>
-      <date>$Date$</date>
-    </sect2info>
+  <sect2info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect2info>
 
-    <title>libvdpau-&libvdpau-version;</title>
+  <title>libvdpau-&libvdpau-version;</title>
 
-    <indexterm zone="libvdpau">
-      <primary sortas="a-libvdpau">libvdpau</primary>
-    </indexterm>
+  <indexterm zone="libvdpau">
+    <primary sortas="a-libvdpau">libvdpau</primary>
+  </indexterm>
 
-    <sect3 role="package">
-      <title>Introduction to libvdpau</title>
+  <sect3 role="package">
+    <title>Introduction to libvdpau</title>
 
-      <para>
-        The <application>libvdpau</application> package contains a library which
-        implements the VDPAU library.
-      </para>
+    <para>
+      The <application>libvdpau</application> package contains a library which
+      implements the VDPAU library.
+    </para>
 
-      <para>
-        VDPAU (Video Decode and Presentation API for Unix) is an open source
-        library (libvdpau) and API originally designed by Nvidia for its GeForce
-        8 series and later GPU hardware targeted at the X Window System
-        This VDPAU API allows video programs to offload portions of the video
-        decoding process and video post-processing to the GPU video-hardware.
-     </para>
+    <para>
+      VDPAU (Video Decode and Presentation API for Unix) is an open source
+      library (libvdpau) and API originally designed by Nvidia for its GeForce
+      8 series and later GPU hardware targeted at the X Window System
+      This VDPAU API allows video programs to offload portions of the video
+      decoding process and video post-processing to the GPU video-hardware.
+   </para>
 
-     <para>
-        Currently, the portions capable of being offloaded by VDPAU onto the GPU
-        are motion compensation (mo comp), inverse discrete cosine transform
-        (iDCT), VLD (variable-length decoding) and deblocking for MPEG-1, MPEG-2,
-        MPEG-4 ASP (MPEG-4 Part 2), H.264/MPEG-4 AVC and VC-1, WMV3/WMV9 encoded
-        videos.  Which specific codecs of these that can be offloaded to the
-        GPU depends on the version of the GPU hardware; specifically,
-        to also decode MPEG-4 ASP (MPEG-4 Part 2), Xvid/OpenDivX (DivX 4), and
-        DivX 5 formats, a GeForce 200M (2xxM) Series (the eleventh generation of
-        Nvidia's GeForce graphics processing units) or newer GPU hardware is
-        required.
-      </para>
+   <para>
+      Currently, the portions capable of being offloaded by VDPAU onto the GPU
+      are motion compensation (mo comp), inverse discrete cosine transform
+      (iDCT), VLD (variable-length decoding) and deblocking for MPEG-1, MPEG-2,
+      MPEG-4 ASP (MPEG-4 Part 2), H.264/MPEG-4 AVC and VC-1, WMV3/WMV9 encoded
+      videos.  Which specific codecs of these that can be offloaded to the
+      GPU depends on the version of the GPU hardware; specifically,
+      to also decode MPEG-4 ASP (MPEG-4 Part 2), Xvid/OpenDivX (DivX 4), and
+      DivX 5 formats, a GeForce 200M (2xxM) Series (the eleventh generation of
+      Nvidia's GeForce graphics processing units) or newer GPU hardware is
+      required.
+    </para>
 
-      &lfs110a_checked;
+    &lfs10_checked;
 
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&libvdpau-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&libvdpau-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &libvdpau-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &libvdpau-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &libvdpau-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &libvdpau-time;
-          </para>
-        </listitem>
-      </itemizedlist>
+    <bridgehead renderas="sect4">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libvdpau-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libvdpau-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libvdpau-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libvdpau-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libvdpau-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libvdpau-time;
+        </para>
+      </listitem>
+    </itemizedlist>
 
-      <bridgehead renderas="sect4">libvdpau Dependencies</bridgehead>
+    <bridgehead renderas="sect4">libvdpau Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg7-lib"/>
-      </para>
+    <bridgehead renderas="sect5">Required</bridgehead>
+    <para role="required">
+      <xref linkend="xorg7-lib"/>
+    </para>
 
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="doxygen"/>,
-        <xref linkend="graphviz"/>, and
-        <xref linkend="texlive"/> or <xref linkend="tl-installer"/>
-      </para>
+    <bridgehead renderas="sect5">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/>,
+      <xref linkend="graphviz"/>, and
+      <xref linkend="texlive"/> or <xref linkend="tl-installer"/>
+    </para>
 
-      <bridgehead renderas="sect5">Runtime Dependency</bridgehead>
-      <para role="optional">
-        <xref role="runtime" linkend="mesa"/>
-      </para>
+    <bridgehead renderas="sect5">Runtime Dependency</bridgehead>
+    <para role="optional">
+      <xref role="runtime" linkend="mesa"/>
+    </para>
 
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/libvdpau"/>
-      </para>
-    </sect3>
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libvdpau"/>
+    </para>
+  </sect3>
 
-    <sect3 role="installation">
-      <title>Installation of libvdpau</title>
+  <sect3 role="installation">
+    <title>Installation of libvdpau</title>
 
-      <para>
-        Install <application>libvdpau</application> by running the following
-        commands:
-      </para>
+    <para>
+      Install <application>libvdpau</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>mkdir build &amp;&amp;
@@ -128,60 +129,58 @@
 ninja</userinput></screen>
 
-      <para>
-        To test the results, issue: <command>ninja test</command>.
-        There is only one test for this package, dlclose, and it is known to 
-        fail on some systems.
-      </para>
+    <para>
+      To test the results, issue: <command>ninja test</command>.
+    </para>
 
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>ninja install</userinput></screen>
 
-    </sect3>
+  </sect3>
 
-    <sect3 role="content">
-      <title>Contents</title>
+  <sect3 role="content">
+    <title>Contents</title>
 
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Directories</segtitle>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            libvdpau.so
-          </seg>
-          <seg>
-            $XORG_PREFIX/{include,lib}/vdpau 
-          </seg>
-        </seglistitem>
-      </segmentedlist>
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libvdpau.so
+        </seg>
+        <seg>
+          $XORG_PREFIX/{include,lib}/vdpau 
+        </seg>
+      </seglistitem>
+    </segmentedlist>
 
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-        <varlistentry id="libvdpau-lib">
-          <term><filename class="libraryfile">libvdpau.so</filename></term>
-          <listitem>
-            <para>
-              contains functions to offload portions of the video decoding
-              process and video post-processing to the GPU video-hardware
-            </para>
-            <indexterm zone="libvdpau libvdpau-lib">
-              <primary sortas="c-libvdpau">libvdpau.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
+      <varlistentry id="libvdpau-lib">
+        <term><filename class="libraryfile">libvdpau.so</filename></term>
+        <listitem>
+          <para>
+            contains functions to offload portions of the video decoding
+            process and video post-processing to the GPU video-hardware.
+          </para>
+          <indexterm zone="libvdpau libvdpau-lib">
+            <primary sortas="c-libvdpau">libvdpau.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-      </variablelist>
+    </variablelist>
 
-    </sect3>
+  </sect3>
 
-  </sect2>
+</sect2>
Index: x/installing/libxcb.xml
===================================================================
--- x/installing/libxcb.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/libxcb.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -104,7 +105,5 @@
     </para>
 
-<screen><userinput>CFLAGS="${CFLAGS:--O2 -g} -Wno-error=format-extra-args" \
-PYTHON=python3                \
-./configure $XORG_CONFIG      \
+<screen><userinput>CFLAGS=-Wno-error=format-extra-args ./configure $XORG_CONFIG      \
             --without-doxygen \
             --docdir='${datadir}'/doc/libxcb-&libxcb-version; &amp;&amp;
@@ -127,12 +126,7 @@
 
     <para>
-      <parameter>CFLAGS=...</parameter>: This variable fixes building this
-      package with GCC-10 and later.
-    </para>
-
-    <para>
-      <parameter>PYTHON=python3</parameter>: This variable forces configure to
-      use python3 instead of python2. The configure script for this package
-      will automatically default to python2 if it is present.
+      <command>sed "s/pthread-stubs//" -i configure</command>: This sed
+      removes a dependency on the libpthread-stubs package which is useless on
+      Linux.
     </para>
 
@@ -183,5 +177,5 @@
         <listitem>
           <para>
-            is an interface to the X Window System protocol
+            is an interface to the X Window System protocol.
           </para>
           <indexterm zone="libxcb libxcb-lib">
Index: x/installing/mesa.xml
===================================================================
--- x/installing/mesa.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/mesa.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,9 +7,8 @@
   <!ENTITY mesa-download-http "https://mesa.freedesktop.org/archive/mesa-&mesa-version;.tar.xz">
   <!ENTITY mesa-download-ftp  "ftp://ftp.freedesktop.org/pub/mesa/mesa-&mesa-version;.tar.xz">
-  <!ENTITY mesa-md5sum        "f81336168864b1f890edfa5db8587f2b">
-  <!ENTITY mesa-size          "15 MB">
-  <!ENTITY mesa-buildsize     "799 MB (with docs, add 376 MB if running the tests)">
-                              <!-- using NINJAJOBS=6 -->
-  <!ENTITY mesa-time          "5.1 SBU (on a 4-core machine with docs)">
+  <!ENTITY mesa-md5sum        "b378394df26fc6b4d58888f9f1ef1bdb">
+  <!ENTITY mesa-size          "14 MB">
+  <!ENTITY mesa-buildsize     "481 MB (with docs), add 317 MB for tests">
+  <!ENTITY mesa-time          "2.5 SBU (with parallelism=4 and docs). Add 0.5 SBU for tests">
 ]>
 
@@ -18,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -42,5 +42,5 @@
     </note>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -111,5 +111,5 @@
       drivers and for swrast, the software rasterizer which is sometimes referred
       to as llvmpipe. See <ulink role="nodep"
-      url="https://docs.mesa3d.org/systems.html"/> for more information), and
+      url="http://www.mesa3d.org/systems.html"/> for more information), and
       <xref linkend="wayland-protocols"/> (required for 
         <xref role="nodep" linkend='plasma5-build'/>,
@@ -130,8 +130,7 @@
       <ulink url="http://omxil.sourceforge.net/">Bellagio OpenMAX Integration
       Layer</ulink> (for mobile platforms), 
-      <ulink url="http://www.nongnu.org/libunwind/">libunwind</ulink>,
+      <ulink url="http://www.nongnu.org/libunwind/">libunwind</ulink>, and
       <ulink url="https://github.com/tizonia/tizonia-openmax-il/wiki/Tizonia-OpenMAX-IL/">
-      libtizonia</ulink>,  and
-      <ulink url="https://www.vulkan.org/">libvulkan</ulink> (for the zink driver)
+      libtizonia</ulink>
     </para>
 
@@ -187,10 +186,9 @@
     <para>
       Now, select the drivers you wish to install. For the X86 architecture, the
-      available gallium drivers are auto (<emphasis>in 21.2.1 this does not select
-      crocus </emphasis>), <emphasis>or alternatively a choice from</emphasis>
-      crocus, i915, iris, nouveau, r300, r600, radeonsi, svga, swrast, and virgl. The
-      latter is recommended if you intend to run the system under
-      <xref linkend="qemu"/>.<!-- If you wish to build all available gallium drivers,
-      use 'auto'. FIXME : does not build crocus in 21.2.1 -->
+      available gallium drivers are auto, <emphasis>or alternatively a choice
+      from</emphasis> i915, nouveau, r300, r600, radeonsi, svga, swrast, and
+      virgl. The latter is recommended if you intend to run the system under
+      <xref linkend="qemu"/>. If you wish to build all available gallium drivers,
+      use 'auto'.
     </para>
 
@@ -212,8 +210,5 @@
       Modify the commands below for your desired drivers.  The drivers listed
       below will cover most modern video cards and virtual machines.  For help in
-      selecting drivers see <ulink url="https://docs.mesa3d.org/systems.html"/>.
-      <!-- these two don't seem to be mentioned in that mesa link -->
-      For intel drivers, specify crocus for i965 gen 4 through to haswell, iris
-      for broadwell and later.
+      selecting drivers see <ulink url='http://www.mesa3d.org/systems.html'/>.
     </para>
 
@@ -225,5 +220,5 @@
     </note>
 
-<screen><userinput>GALLIUM_DRV="crocus,i915,iris,nouveau,r600,radeonsi,svga,swrast,virgl"
+<screen><userinput>GALLIUM_DRV="i915,iris,nouveau,r600,radeonsi,svga,swrast,virgl"
 DRI_DRIVERS="i965,nouveau"</userinput></screen>
 
@@ -237,11 +232,12 @@
 
 meson --prefix=$XORG_PREFIX          \
-      --buildtype=release            \
+      -Dbuildtype=release            \
       -Ddri-drivers=$DRI_DRIVERS     \
       -Dgallium-drivers=$GALLIUM_DRV \
       -Dgallium-nine=false           \
       -Dglx=dri                      \
-      -Dvalgrind=disabled            \
-      -Dlibunwind=disabled           \
+      -Dosmesa=gallium               \
+      -Dvalgrind=false               \
+      -Dlibunwind=false              \
       ..                             &amp;&amp;
 
@@ -253,6 +249,5 @@
       If you built the tests (see 'Command Explanations'), to run them issue:
       <command>ninja test</command>. 
-      All 33 subtests tests in the mesa:compiler+glsl / glsl compiler warnings
-      suite are known to fail.
+      Two tests in the llvmpipe suite are known to fail.
     </para>
 
@@ -278,5 +273,5 @@
 
     <para>
-      <parameter>--buildtype=release</parameter>: This switch ensures a
+      <parameter>-Dbuildtype=release</parameter>: This switch ensures a
       fully-optimized build, and disables debug assertions which will
       severely slow down the libraries in certain use-cases. Without this
@@ -299,11 +294,10 @@
       this support is desired.
     </para>
-<!--
-    <para>
-      <parameter>-Dosmesa=true</parameter>: This switch enables building
+
+    <para>
+      <parameter>-Dosmesa=gallium</parameter>: This switch enables building
       the <filename class="libraryfile">libOSMesa</filename> library and
       provides Gallium3D support in it. It requires the swrast gallium driver.
     </para>
--->
 <!--
     <para>
@@ -314,5 +308,5 @@
 -->
     <para>
-      <parameter>-Dvalgrind=disabled</parameter>: This parameter disables
+      <parameter>-Dvalgrind=false</parameter>: This parameter disables
       the usage of Valgrind during the build process. Remove this parameter
       if you have Valgrind installed, and wish to check for memory leaks.
@@ -320,5 +314,5 @@
 
     <para>
-      <parameter>-Dlibunwind=disabled</parameter>: This parameter disables
+      <parameter>-Dlibunwind=false</parameter>: This parameter disables
       the usage of libunwind.
     </para>
@@ -343,5 +337,5 @@
     <para>
       <option>-Dbuild-tests=true</option>: This option will cause the test code
-      to be enabled. To run the tests, issue: <command>ninja test</command>.
+      to be enabled.
     </para>
 
@@ -379,9 +373,7 @@
         </seg>
         <seg>
-          <!-- Begini gallium DRI drivers : this is the full set -->
+          <!-- Begin DRI drivers : this is the full set from auto -->
           d3dadapter9.so (optional), <!-- For Windows games. This is DirectX's
                                           Direct3D -->
-          crocus_dri.so,
-          i830_dri.so,
           i915_dri.so,
           i965_dri.so,
@@ -395,5 +387,5 @@
           r600_dri.so,
           r600_drv_video.so,
-          radeon_dri.so (optional),
+          radeon_dri.so,
           radeonsi_dri.so,
           radeonsi_drv_video.so,
@@ -408,5 +400,4 @@
           libvdpau_radeonsi.so
           <!-- End VDPAU drivers -->
-          (Many of these drivers are hard-linked).
         </seg>
         <seg>
@@ -433,5 +424,5 @@
           <para>
             is a GL demo useful for troubleshooting graphics
-            problems
+            problems.
           </para>
           <indexterm zone="mesa glxgears">
@@ -446,5 +437,5 @@
           <para>
             is a diagnostic program that displays information about the
-            graphics hardware and installed GL libraries
+            graphics hardware and installed GL libraries.
           </para>
           <indexterm zone="mesa glxinfo">
@@ -459,5 +450,5 @@
           <para>
             provides a native platform graphics interface as
-            defined by the EGL-1.4 specification
+            defined by the EGL-1.4 specification.
           </para>
           <indexterm zone="mesa libEGL">
@@ -472,5 +463,5 @@
           <para>
             is the <application>Mesa</application> Graphics Buffer
-            Manager library
+            Manager library.
           </para>
           <indexterm zone="mesa libgbm">
@@ -484,5 +475,5 @@
         <listitem>
           <para>
-            is the <application>Mesa</application> OpenGL ES 1.1 library
+            is the <application>Mesa</application> OpenGL ES 1.1 library.
           </para>
           <indexterm zone="mesa libGLESv1_CM">
@@ -496,5 +487,5 @@
         <listitem>
           <para>
-            is the <application>Mesa</application> OpenGL ES 2.0 library
+            is the <application>Mesa</application> OpenGL ES 2.0 library.
           </para>
           <indexterm zone="mesa libGLES2">
@@ -508,5 +499,5 @@
         <listitem>
           <para>
-            is the main <application>Mesa</application> OpenGL library
+            is the main <application>Mesa</application> OpenGL library.
           </para>
           <indexterm zone="mesa libGL">
@@ -520,5 +511,5 @@
         <listitem>
           <para>
-            is the <application>Mesa</application> Off-screen Rendering library
+            is the <application>Mesa</application> Off-screen Rendering library.
           </para>
           <indexterm zone="mesa libOSMesa">
Index: x/installing/tuning-fontconfig.xml
===================================================================
--- x/installing/tuning-fontconfig.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/tuning-fontconfig.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -329,9 +330,9 @@
     <para>
       For more examples see the blfs-support thread which started at <ulink
-      url="https://lists.linuxfromscratch.org/sympa/arc/blfs-support/2016-09/msg00128.html">2016-09/00128</ulink>,
+      url="http://lists.linuxfromscratch.org/pipermail/blfs-support/2016-September/078422.html">/2016-September/078422</ulink>,
       particularly <ulink
-      url="https://lists.linuxfromscratch.org/sympa/arc/blfs-support/2016-09/msg00137.html">2016-09/00137</ulink>,
+      url="http://lists.linuxfromscratch.org/pipermail/blfs-support/2016-September/078425.html">2016-September/078425</ulink>,
       and the original poster's preferred solution at <ulink
-      url="https://lists.linuxfromscratch.org/sympa/arc/blfs-support/2016-09/msg00147.html">2016-09/00147</ulink>.
+      url="http://lists.linuxfromscratch.org/pipermail/blfs-support/2016-November/078658.html">2016-November/078658</ulink>.
       There are other examples in <xref linkend="arch-fontconfig"/> and <xref
       linkend="gentoo-fontconfig"/>.
Index: x/installing/twm.xml
===================================================================
--- x/installing/twm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/twm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     &not-katamari;
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -146,5 +147,5 @@
         <listitem>
           <para>
-            is the Tab Window Manager for the X Window System
+            is the Tab Window Manager for the X Window System.
           </para>
           <indexterm zone="twm twm">
Index: x/installing/util-macros.xml
===================================================================
--- x/installing/util-macros.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/util-macros.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY util-macros-download-http "&xorg-download-http;/util/util-macros-&util-macros-version;.tar.bz2">
   <!ENTITY util-macros-download-ftp  "&xorg-download-ftp;/util/util-macros-&util-macros-version;.tar.bz2">
-  <!ENTITY util-macros-md5sum        "4be6df7e6af52e28e13dc533244eb9d7">
-  <!ENTITY util-macros-size          "84 KB">
-  <!ENTITY util-macros-buildsize     "632 KB">
+  <!ENTITY util-macros-md5sum        "58edef899364f78fbde9479ded20211e">
+  <!ENTITY util-macros-size          "88 KB">
+  <!ENTITY util-macros-buildsize     "508 KB">
   <!ENTITY util-macros-time          "less than 0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/x7app.xml
===================================================================
--- x/installing/x7app.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/x7app.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -68,6 +68,6 @@
   <!ENTITY xinput-md5sum                   "ac6b7432726008b2f50eba82b0e2dbe4">
 
-  <!ENTITY xkbcomp-version                 "1.4.5">
-  <!ENTITY xkbcomp-md5sum                  "c45e9f7971a58b8f0faf10f6d8f298c0">
+  <!ENTITY xkbcomp-version                 "1.4.4">
+  <!ENTITY xkbcomp-md5sum                  "41d0b6d370f907615364a6330b8f42ff">
 
   <!ENTITY xkbevd-version                  "1.1.4">
@@ -101,6 +101,6 @@
   <!ENTITY xrandr-md5sum                   "fe40f7a4fd39dd3a02248d3e0b1972e4">
 
-  <!ENTITY xrdb-version                    "1.2.1">
-  <!ENTITY xrdb-md5sum                     "85f04a810e2fb6b41ab872b421dce1b1">
+  <!ENTITY xrdb-version                    "1.2.0">
+  <!ENTITY xrdb-md5sum                     "34ae801ef994d192c70fcce2bdb2a1b2">
 
   <!ENTITY xrefresh-version                "1.0.6">
@@ -116,6 +116,6 @@
   <!ENTITY xvinfo-md5sum                   "b13afec137b9b331814a9824ab03ec80">
 
-  <!ENTITY xwd-version                     "1.0.8">
-  <!ENTITY xwd-md5sum                      "f783a209f2e3fa13253cedb65eaf9cdb">
+  <!ENTITY xwd-version                     "1.0.7">
+  <!ENTITY xwd-md5sum                      "11794a8eba6d295a192a8975287fd947">
 
   <!ENTITY xwininfo-version                "1.1.5">
@@ -131,4 +131,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -148,5 +149,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -359,5 +360,5 @@
         <listitem>
           <para>
-	    is the ICE authority file utility
+	    is the ICE authority file utility.
           </para>
           <indexterm zone="xorg7-app iceauth-x7">
@@ -371,5 +372,5 @@
         <listitem>
           <para>
-	    provides locale and ISO 2022 support for Unicode terminals
+	    provides locale and ISO 2022 support for Unicode terminals.
           </para>
           <indexterm zone="xorg7-app luit-x7">
@@ -383,5 +384,5 @@
         <listitem>
           <para>
-	    creates an index of X font files in a directory
+	    creates an index of X font files in a directory.
           </para>
           <indexterm zone="xorg7-app mkfontdir-x7">
@@ -395,5 +396,5 @@
         <listitem>
           <para>
-	    creates an index of scalable font files for X
+	    creates an index of scalable font files for X.
           </para>
           <indexterm zone="xorg7-app mkfontscale-x7">
@@ -407,5 +408,5 @@
         <listitem>
           <para>
-	    manages utmp/wtmp entries for non-init clients
+	    manages utmp/wtmp entries for non-init clients.
           </para>
           <indexterm zone="xorg7-app sessreg-x7">
@@ -419,5 +420,5 @@
         <listitem>
           <para>
-	    sets the keyboard using the X Keyboard Extension
+	    sets the keyboard using the X Keyboard Extension.
           </para>
           <indexterm zone="xorg7-app setxkbmap-x7">
@@ -431,5 +432,5 @@
         <listitem>
           <para>
-	    is the Session Manager Proxy
+	    is the Session Manager Proxy.
           </para>
           <indexterm zone="xorg7-app smproxy-x7">
@@ -443,5 +444,5 @@
         <listitem>
           <para>
-	    is an X11 server performance test program
+	    is an X11 server performance test program.
           </para>
           <indexterm zone="xorg7-app x11perf-x7">
@@ -455,5 +456,5 @@
         <listitem>
           <para>
-	    is an X11 server performance comparison program
+	    is an X11 server performance comparison program.
           </para>
           <indexterm zone="xorg7-app x11perfcomp-x7">
@@ -467,5 +468,5 @@
         <listitem>
           <para>
-	    is the X authority file utility
+	    is the X authority file utility.
           </para>
           <indexterm zone="xorg7-app xauth-x7">
@@ -479,5 +480,5 @@
         <listitem>
           <para>
-	    adjusts backlight brightness using RandR extension
+	    adjusts backlight brightness using RandR extension.
           </para>
           <indexterm zone="xorg7-app xbacklight-x7">
@@ -492,5 +493,5 @@
           <para>
 	    is the Device Color Characterization utility for the X
-            Color Management System
+            Color Management System.
           </para>
           <indexterm zone="xorg7-app xcmsdb-x7">
@@ -504,5 +505,5 @@
         <listitem>
           <para>
-	    creates an X cursor file from a collection of PNG images
+	    creates an X cursor file from a collection of PNG images.
           </para>
           <indexterm zone="xorg7-app xcursorgen-x7">
@@ -516,5 +517,5 @@
         <listitem>
           <para>
-	    dumps an X window directly to a printer
+	    dumps an X window directly to a printer.
           </para>
           <indexterm zone="xorg7-app xdpr-x7">
@@ -528,5 +529,5 @@
         <listitem>
           <para>
-	    is a display information utility for X
+	    is a display information utility for X.
           </para>
           <indexterm zone="xorg7-app xdpyinfo-x7">
@@ -540,5 +541,5 @@
         <listitem>
           <para>
-	    queries configuration information of DRI drivers
+	    queries configuration information of DRI drivers.
           </para>
           <indexterm zone="xorg7-app xdriinfo-x7">
@@ -552,5 +553,5 @@
         <listitem>
           <para>
-	    prints contents of X events
+	    prints contents of X events.
           </para>
           <indexterm zone="xorg7-app xev-x7">
@@ -564,5 +565,5 @@
         <listitem>
           <para>
-	    alters a monitor's gamma correction through the X server
+	    alters a monitor's gamma correction through the X server.
           </para>
           <indexterm zone="xorg7-app xgamma-x7">
@@ -576,5 +577,5 @@
         <listitem>
           <para>
-	    is a server access control program for X
+	    is a server access control program for X.
           </para>
           <indexterm zone="xorg7-app xhost-x7">
@@ -588,5 +589,5 @@
         <listitem>
           <para>
-	    is a utility to configure and test X input devices
+	    is a utility to configure and test X input devices.
           </para>
           <indexterm zone="xorg7-app xinput-x7">
@@ -600,5 +601,5 @@
         <listitem>
           <para>
-	    is an XKB utility program that raises a bell event
+	    is an XKB utility program that raises a bell event.
           </para>
           <indexterm zone="xorg7-app xkbbell-x7">
@@ -612,5 +613,5 @@
         <listitem>
           <para>
-	    compiles an XKB keyboard description
+	    compiles an XKB keyboard description.
           </para>
           <indexterm zone="xorg7-app xkbcomp-x7">
@@ -624,5 +625,5 @@
         <listitem>
           <para>
-	    is the XKB event daemon
+	    is the XKB event daemon.
           </para>
           <indexterm zone="xorg7-app xkbevd-x7">
@@ -636,5 +637,5 @@
         <listitem>
           <para>
-	    shows the XKB status of keyboard LEDs
+	    shows the XKB status of keyboard LEDs.
           </para>
           <indexterm zone="xorg7-app xkbvleds-x7">
@@ -648,5 +649,5 @@
         <listitem>
           <para>
-	    monitors modifier keys and LEDs
+	    monitors modifier keys and LEDs.
           </para>
           <indexterm zone="xorg7-app xkbwatch-x7">
@@ -660,5 +661,5 @@
         <listitem>
           <para>
-	    kills a client by its X resource
+	    kills a client by its X resource.
           </para>
           <indexterm zone="xorg7-app xkill-x7">
@@ -672,5 +673,5 @@
         <listitem>
           <para>
-	    lists interned atoms defined on the server
+	    lists interned atoms defined on the server.
           </para>
           <indexterm zone="xorg7-app xlsatoms-x7">
@@ -684,5 +685,5 @@
         <listitem>
           <para>
-	    lists client applications running on a display
+	    lists client applications running on a display.
           </para>
           <indexterm zone="xorg7-app xlsclients-x7">
@@ -696,5 +697,5 @@
         <listitem>
           <para>
-	    displays a message or query in a window
+	    displays a message or query in a window.
           </para>
           <indexterm zone="xorg7-app xmessage-x7">
@@ -709,5 +710,5 @@
           <para>
 	    is a utility for modifying keymaps and pointer button
-            mappings in X
+            mappings in X.
           </para>
           <indexterm zone="xorg7-app xmodmap-x7">
@@ -721,5 +722,5 @@
         <listitem>
           <para>
-	    prints an X window dump
+	    prints an X window dump.
           </para>
           <indexterm zone="xorg7-app xpr-x7">
@@ -733,5 +734,5 @@
         <listitem>
           <para>
-	    is a property displayer for X
+	    is a property displayer for X.
           </para>
           <indexterm zone="xorg7-app xprop-x7">
@@ -745,5 +746,5 @@
         <listitem>
           <para>
-	    is a primitive command line interface to RandR extension
+	    is a primitive command line interface to RandR extension.
           </para>
           <indexterm zone="xorg7-app xrandr-x7">
@@ -757,5 +758,5 @@
         <listitem>
           <para>
-	    is the X server resource database utility
+	    is the X server resource database utility.
           </para>
           <indexterm zone="xorg7-app xrdb-x7">
@@ -769,5 +770,5 @@
         <listitem>
           <para>
-	    refreshes all or part of an X screen
+	    refreshes all or part of an X screen.
           </para>
           <indexterm zone="xorg7-app xrefresh-x7">
@@ -781,5 +782,5 @@
         <listitem>
           <para>
-	    is the user preference utility for X
+	    is the user preference utility for X.
           </para>
           <indexterm zone="xorg7-app xset-x7">
@@ -793,5 +794,5 @@
         <listitem>
           <para>
-	    is the root window parameter setting utility for X
+	    is the root window parameter setting utility for X.
           </para>
           <indexterm zone="xorg7-app xsetroot-x7">
@@ -805,5 +806,5 @@
         <listitem>
           <para>
-	    prints out X-Video extension adaptor information
+	    prints out X-Video extension adaptor information.
           </para>
           <indexterm zone="xorg7-app xvinfo-x7">
@@ -817,5 +818,5 @@
         <listitem>
           <para>
-	    dumps an image of an X window
+	    dumps an image of an X window.
           </para>
           <indexterm zone="xorg7-app xwd-x7">
@@ -829,5 +830,5 @@
         <listitem>
           <para>
-	    is a window information utility for X
+	    is a window information utility for X.
           </para>
           <indexterm zone="xorg7-app xwininfo-x7">
@@ -841,5 +842,5 @@
         <listitem>
           <para>
-	    is an image displayer for X
+	    is an image displayer for X.
 	  </para>
           <indexterm zone="xorg7-app xwud-x7">
Index: x/installing/x7driver-amdgpu.xml
===================================================================
--- x/installing/x7driver-amdgpu.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/x7driver-amdgpu.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,13 +6,13 @@
 
   <!ENTITY radeon-wiki "http://wiki.x.org/wiki/RadeonFeature">
-  <!ENTITY radeon-marketing-names "&radeon-wiki;#decoderringforengineeringvsmarketingnames">
-
-  <!ENTITY xorg-amdgpu-driver-version "21.0.0">
+  <!ENTITY radeon-marketing-names "&radeon-wiki;#Decoder_ring_for_engineering_vs_marketing_names">
+
+  <!ENTITY xorg-amdgpu-driver-version "19.1.0">
 
   <!ENTITY xorg-amdgpu-driver-download-http "&xorg-download-http;/driver/xf86-video-amdgpu-&xorg-amdgpu-driver-version;.tar.bz2">
   <!ENTITY xorg-amdgpu-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-amdgpu-&xorg-amdgpu-driver-version;.tar.bz2">
-  <!ENTITY xorg-amdgpu-driver-md5sum        "61a4af51082a58c63af8970b06c3f4be">
-  <!ENTITY xorg-amdgpu-driver-size          "440 KB">
-  <!ENTITY xorg-amdgpu-driver-buildsize     "6.0 MB">
+  <!ENTITY xorg-amdgpu-driver-md5sum        "55ad19b858e186a2cf4e91ed832c05e7">
+  <!ENTITY xorg-amdgpu-driver-size          "432 KB">
+  <!ENTITY xorg-amdgpu-driver-buildsize     "8.4 MB">
   <!ENTITY xorg-amdgpu-driver-time          "less than 0.1 SBU">
 ]>
@@ -22,4 +22,5 @@
 
   <sect2info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect2info>
@@ -41,5 +42,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <note>
@@ -182,4 +183,11 @@
 
       <para>
+        First, adapt the <application>Xorg AMDGPU Driver</application> to
+        changes in GCC-10:
+      </para>
+
+<screen><userinput remap="pre">sed -i 's/^miPointerSpriteFuncRec/extern &amp;/' src/drmmode_display.h</userinput></screen>
+
+      <para>
         Install <application>Xorg AMDGPU Driver</application> by running the following
         commands:
@@ -208,5 +216,5 @@
         <seglistitem>
           <seg>
-            amdgpu_drv.so
+            &emsp;amdgpu_drv.so
           </seg>
         </seglistitem>
@@ -222,5 +230,5 @@
           <listitem>
             <para>
-              is an Xorg video driver for latest AMD Radeon video cards
+              is an Xorg video driver for latest AMD Radeon video cards.
             </para>
             <indexterm zone="xorg-amdgpu-driver amdgpu_drv">
@@ -235,2 +243,3 @@
 
   </sect2>
+  <!-- End Xorg AMDGPU Driver -->
Index: x/installing/x7driver-ati.xml
===================================================================
--- x/installing/x7driver-ati.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/x7driver-ati.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -22,4 +22,5 @@
 
   <sect2info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect2info>
@@ -40,5 +41,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <note>
@@ -85,14 +86,4 @@
           <para>
             Estimated build time: &xorg-ati-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Additional Downloads</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Required patch:
-            <ulink url="&patch-root;/xf86-video-ati-&xorg-ati-driver-version;-upstream_fixes-1.patch"/>
           </para>
         </listitem>
@@ -193,7 +184,6 @@
 
 <!--
-  Note: Fixed upstream, should be unneeded for versions gtr 19.1.0.
-  Patch also includes the fix.
-
+  Note: Fixed upstream, should be unneeded for versions gtr 19.1.0
+-->
       <para>
         First, fix an issue exposed by GCC 10 and later:
@@ -202,12 +192,4 @@
 <screen><userinput>sed -e 's/miPointer/extern &amp;/' \
     -i src/drmmode_display.h</userinput></screen>
--->
-
-      <para>
-        First, apply a patch including fixes for known performance regressions
-        and future problems with Xorg-Server.
-      </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../xf86-video-ati-&xorg-ati-driver-version;-upstream_fixes-1.patch</userinput></screen>
 
       <para>
@@ -308,5 +290,5 @@
               is a wrapper driver for ATI video cards that autodetects ATI
               video hardware and loads the radeon, mach64 or r128 driver
-              depending on which video card is in use
+              depending on which video card is in use.
             </para>
             <indexterm zone="xorg-ati-driver ati_drv">
@@ -320,5 +302,5 @@
           <listitem>
             <para>
-              is an Xorg video driver for ATI Radeon based video cards
+              is an Xorg video driver for ATI Radeon based video cards.
             </para>
             <indexterm zone="xorg-ati-driver radeon_drv">
@@ -333,2 +315,3 @@
 
   </sect2>
+  <!-- End Xorg ATI Driver -->
Index: x/installing/x7driver-evdev.xml
===================================================================
--- x/installing/x7driver-evdev.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/x7driver-evdev.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect2info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect2info>
@@ -38,5 +39,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -157,5 +158,5 @@
           <listitem>
             <para>
-              is an Xorg input driver for Linux generic event devices
+              is an Xorg input driver for Linux generic event devices.
             </para>
             <indexterm zone="xorg-evdev-driver evdev_drv">
@@ -170,2 +171,3 @@
 
   </sect2>
+  <!-- End Xorg Evdev Driver -->
Index: x/installing/x7driver-fbdev.xml
===================================================================
--- x/installing/x7driver-fbdev.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/x7driver-fbdev.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect2info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect2info>
@@ -40,5 +41,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -132,5 +133,5 @@
           <listitem>
             <para>
-              is an Xorg video driver for framebuffer devices
+              is an Xorg video driver for framebuffer devices.
             </para>
             <indexterm zone="xorg-fbdev-driver fbdev_drv">
@@ -145,2 +146,3 @@
 
   </sect2>
+  <!-- End Xorg Fbdev Driver -->
Index: x/installing/x7driver-intel.xml
===================================================================
--- x/installing/x7driver-intel.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/x7driver-intel.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -13,9 +13,9 @@
 
   <!--<!ENTITY xorg-intel-driver-version "2.99.917">-->
-  <!ENTITY xorg-intel-driver-version "20210222">
+  <!ENTITY xorg-intel-driver-version "20200817">
 
   <!ENTITY xorg-intel-driver-download-http "&sources-anduin-http;/xf86-video-intel/xf86-video-intel-&xorg-intel-driver-version;.tar.xz">
   <!ENTITY xorg-intel-driver-download-ftp  "&sources-anduin-ftp;/xf86-video-intel/xf86-video-intel-&xorg-intel-driver-version;.tar.xz">
-  <!ENTITY xorg-intel-driver-md5sum        "8795a5d17ece4dea4763e61be7805882">
+  <!ENTITY xorg-intel-driver-md5sum        "3203b1344cea5d0e377d1a9ff1fea871">
   <!ENTITY xorg-intel-driver-size          "948 KB">
   <!ENTITY xorg-intel-driver-buildsize     "77 MB">
@@ -23,88 +23,89 @@
 ]>
 
-  <sect2 id="xorg-intel-driver" xreflabel="Xorg Intel Driver-&xorg-intel-driver-version;">
-
-    <sect2info>
-      <date>$Date$</date>
-    </sect2info>
-
-    <title>Xorg Intel Driver-&xorg-intel-driver-version;</title>
-
-    <indexterm zone="xorg-intel-driver">
-      <primary sortas="a-xorg-intel-driver">xorg-intel-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg Intel Driver</title>
-
+<sect2 id="xorg-intel-driver" xreflabel="Xorg Intel Driver-&xorg-intel-driver-version;">
+
+  <sect2info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect2info>
+
+  <title>Xorg Intel Driver-&xorg-intel-driver-version;</title>
+
+  <indexterm zone="xorg-intel-driver">
+    <primary sortas="a-xorg-intel-driver">xorg-intel-driver</primary>
+  </indexterm>
+
+  <sect3 role="package">
+    <title>Introduction to Xorg Intel Driver</title>
+
+    <para>
+      The <application>Xorg Intel Driver</application> package contains the
+      X.Org Video Driver for Intel integrated video chips including 8xx, 9xx,
+      Gxx, Qxx, HD, Iris, and Iris Pro graphics processors.
+    </para>
+
+    &lfs10_checked;
+
+    <note>
       <para>
-        The <application>Xorg Intel Driver</application> package contains the
-        X.Org Video Driver for Intel integrated video chips including 8xx, 9xx,
-        Gxx, Qxx, HD, Iris, and Iris Pro graphics processors.
+        This is a development version of the Intel driver
+        which is needed to work properly with the latest hardware.
       </para>
-
-      &lfs110a_checked;
-
-      <note>
-        <para>
-          This is a development version of the Intel driver
-          which is needed to work properly with the latest hardware.
-        </para>
-      </note>
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-intel-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-intel-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-intel-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-intel-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-intel-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-intel-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg Intel Driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xcb-util"/> and
-        <xref linkend="xorg-server"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/xorg-intel-driver"/>
-      </para>
-    </sect3>
-
-    <sect3 role="kernel" id="xorg-intel-driver-kernel">
-      <title>Kernel Configuration</title>
-
-      <para>
-        Enable the following options in the kernel configuration. 
-        Recompile the kernel if necessary:
-      </para>
+    </note>
+
+    <bridgehead renderas="sect4">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&xorg-intel-driver-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&xorg-intel-driver-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &xorg-intel-driver-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &xorg-intel-driver-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &xorg-intel-driver-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &xorg-intel-driver-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect4">Xorg Intel Driver Dependencies</bridgehead>
+
+    <bridgehead renderas="sect5">Required</bridgehead>
+    <para role="required">
+      <xref linkend="xcb-util"/> and
+      <xref linkend="xorg-server"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/xorg-intel-driver"/>
+    </para>
+  </sect3>
+
+  <sect3 role="kernel" id="xorg-intel-driver-kernel">
+    <title>Kernel Configuration</title>
+
+    <para>
+      Enable the following options in the kernel configuration. 
+      Recompile the kernel if necessary:
+    </para>
 
 <screen><literal>Device Drivers  ---&gt;
@@ -113,16 +114,16 @@
    &lt;*&gt; Intel 8xx/9xx/G3x/G4x/HD Graphics                   [CONFIG_DRM_I915]</literal></screen>
 
-      <indexterm zone="xorg-intel-driver xorg-intel-driver-kernel">
-        <primary sortas="d-xorg-intel-driver">xorg-intel-driver</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg Intel Driver</title>
+    <indexterm zone="xorg-intel-driver xorg-intel-driver-kernel">
+      <primary sortas="d-xorg-intel-driver">xorg-intel-driver</primary>
+    </indexterm>
+  </sect3>
+
+  <sect3 role="installation">
+    <title>Installation of Xorg Intel Driver</title>
 
 <!-- appears to be in the current git version, but commenting since I do not have an 32-bit
-      <para>
-        If you are building on i686, apply a sed to fix a type mismatch.
-      </para>
+    <para>
+      If you are building on i686, apply a sed to fix a type mismatch.
+    </para>
 
 <screen><userinput remap="pre">case $(uname -m) in
@@ -131,8 +132,8 @@
 esac</userinput></screen>-->
 
-      <para>
-        Install <application>Xorg Intel Driver</application> by running the
-        following commands:
-      </para>
+    <para>
+      Install <application>Xorg Intel Driver</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>./autogen.sh $XORG_CONFIG     \
@@ -142,11 +143,11 @@
 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>
+    <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 &amp;&amp;
@@ -157,24 +158,24 @@
 sed -i '/\.TH/s/4/1/' /usr/share/man/man1/intel-virtual-output.1</userinput></screen>
 
-    </sect3>
-
-    <sect3>
-      <title>Working around problems with the Intel driver</title>
-
-      <para>
-        The SandyBridge New Acceleration (SNA) code is intended to replace the
-        old UXA (UMA Acceleration Architecture), but it is a large body of code
-        and may cause problems.  However, the version of the code in the
-        version control system listed above has been tested successfully with
-        both SNA and UXA capabilities.
-      </para>
-
-      <para>
-        To work around this problem, as well as enabling support for UXA, it is
-        necessary to force UXA to be used by creating a configuration file.  If
-        this problem applies to you, create the following file as the
-        <systemitem class="username">root</systemitem> user and modify it as
-        needed:
-      </para>
+  </sect3>
+
+  <sect3>
+    <title>Working around problems with the Intel driver</title>
+
+    <para>
+      The SandyBridge New Acceleration (SNA) code is intended to replace the
+      old UXA (UMA Acceleration Architecture), but it is a large body of code
+      and may cause problems.  However, the version of the code in the
+      version control system listed above has been tested successfully with
+      both SNA and UXA capabilities.
+    </para>
+
+    <para>
+      To work around this problem, as well as enabling support for UXA, it is
+      necessary to force UXA to be used by creating a configuration file.  If
+      this problem applies to you, create the following file as the
+      <systemitem class="username">root</systemitem> user and modify it as
+      needed:
+    </para>
 
 <screen role="root"><userinput>cat &gt;&gt; /etc/X11/xorg.conf.d/20-intel.conf &lt;&lt; "EOF"
@@ -188,75 +189,75 @@
 EOF</userinput></screen>
 
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <parameter>--enable-kms-only</parameter>: This switch omits the UMS
-        (User Mode Setting) code.
-      </para>
-
-      <para>
-        <parameter>--enable-uxa</parameter>: This switch allows the old UXA code
-        to be compiled in addition to the default SNA.
-      </para>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Program</segtitle>
-        <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Xorg Driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            intel-virtual-output
-          </seg>
-          <seg>
-            libIntelXvMC.so
-          </seg>
-          <seg>
-            intel_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="intel-virtual-output">
-          <term><command>intel-virtual-output</command></term>
-          <listitem>
-            <para>
-              is a utility to connect the integrated Intel GPU to discrete
-              outputs on hybrid systems
-            </para>
-            <indexterm zone="xorg-intel-driver intel-virtual-output">
-              <primary sortas="b-intel-virtual-output">intel-virtual-output</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="intel_drv">
-          <term><filename class="libraryfile">intel_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg video driver for Intel integrated graphics chipsets
-            </para>
-            <indexterm zone="xorg-intel-driver intel_drv">
-              <primary sortas="c-intel_drv">intel_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
+  </sect3>
+
+  <sect3 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--enable-kms-only</parameter>: This switch omits the UMS
+      (User Mode Setting) code.
+    </para>
+
+    <para>
+      <parameter>--enable-uxa</parameter>: This switch allows the old UXA code
+      to be compiled in addition to the default SNA.
+    </para>
+
+  </sect3>
+
+  <sect3 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Xorg Driver</segtitle>
+
+      <seglistitem>
+        <seg>
+          intel-virtual-output
+        </seg>
+        <seg>
+          libIntelXvMC.so
+        </seg>
+        <seg>
+          intel_drv.so
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect4">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="intel-virtual-output">
+        <term><command>intel-virtual-output</command></term>
+        <listitem>
+          <para>
+            is a utility to connect the integrated Intel GPU to discrete
+            outputs on hybrid systems.
+          </para>
+          <indexterm zone="xorg-intel-driver intel-virtual-output">
+            <primary sortas="b-intel-virtual-output">intel-virtual-output</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="intel_drv">
+        <term><filename class="libraryfile">intel_drv.so</filename></term>
+        <listitem>
+          <para>
+            is an Xorg video driver for Intel integrated graphics chipsets.
+          </para>
+          <indexterm zone="xorg-intel-driver intel_drv">
+            <primary sortas="c-intel_drv">intel_drv.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect3>
+
+</sect2>
Index: x/installing/x7driver-libinput.xml
===================================================================
--- x/installing/x7driver-libinput.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/x7driver-libinput.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,11 +5,11 @@
   %general-entities;
 
-  <!ENTITY xorg-libinput-driver-version "1.1.0">
+  <!ENTITY xorg-libinput-driver-version "0.30.0">
 
   <!ENTITY xorg-libinput-driver-download-http "&xorg-download-http;/driver/xf86-input-libinput-&xorg-libinput-driver-version;.tar.bz2">
   <!ENTITY xorg-libinput-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-input-libinput-&xorg-libinput-driver-version;.tar.bz2">
-  <!ENTITY xorg-libinput-driver-md5sum        "0997116b1203d3152aee746e4faf0d31">
+  <!ENTITY xorg-libinput-driver-md5sum        "11dcfa2cc39f790731a9545fcdeea717">
   <!ENTITY xorg-libinput-driver-size          "372 KB">
-  <!ENTITY xorg-libinput-driver-buildsize     "4.0 MB (with tests)">
+  <!ENTITY xorg-libinput-driver-buildsize     "3.6 MB (with tests)">
   <!ENTITY xorg-libinput-driver-time          "less than 0.1 SBU (with tests)">
 ]>
@@ -19,4 +19,5 @@
 
   <sect2info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect2info>
@@ -38,5 +39,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -132,5 +133,5 @@
             <para>
               is an Xorg input driver for mouse, keyboard, touchpad,
-              touchscreen, and tablet devices
+              touchscreen, and tablet devices.
             </para>
             <indexterm zone="xorg-libinput-driver libinput_drv">
@@ -145,2 +146,3 @@
 
   </sect2>
+  <!-- End Xorg Libinput Driver -->
Index: x/installing/x7driver-nouveau.xml
===================================================================
--- x/installing/x7driver-nouveau.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/x7driver-nouveau.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,11 +5,11 @@
   %general-entities;
 
-  <!ENTITY xorg-nouveau-driver-version "1.0.17">
+  <!ENTITY xorg-nouveau-driver-version "1.0.16">
 
   <!ENTITY xorg-nouveau-driver-download-http "&xorg-download-http;/driver/xf86-video-nouveau-&xorg-nouveau-driver-version;.tar.bz2">
   <!ENTITY xorg-nouveau-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-nouveau-&xorg-nouveau-driver-version;.tar.bz2">
-  <!ENTITY xorg-nouveau-driver-md5sum        "b08633be9af9ee819077c278dfc55648">
-  <!ENTITY xorg-nouveau-driver-size          "620 KB">
-  <!ENTITY xorg-nouveau-driver-buildsize     "14 MB">
+  <!ENTITY xorg-nouveau-driver-md5sum        "ecd9be89d853301167e3d564c49f7a8e">
+  <!ENTITY xorg-nouveau-driver-size          "616 KB">
+  <!ENTITY xorg-nouveau-driver-buildsize     "15 MB">
   <!ENTITY xorg-nouveau-driver-time          "0.1 SBU">
 ]>
@@ -19,4 +19,5 @@
 
   <sect2info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect2info>
@@ -39,5 +40,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -187,5 +188,5 @@
           <listitem>
             <para>
-              is an Xorg video driver for nVidia video cards
+              is an Xorg video driver for nVidia video cards.
             </para>
             <indexterm zone="xorg-nouveau-driver nouveau_drv">
@@ -200,2 +201,3 @@
 
   </sect2>
+  <!-- End Xorg Nouveau Driver -->
Index: x/installing/x7driver-synaptics.xml
===================================================================
--- x/installing/x7driver-synaptics.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/x7driver-synaptics.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect2info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect2info>
@@ -40,5 +41,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -138,5 +139,5 @@
             <para>
               is a command line utility used to query and modify Synaptics
-              driver options
+              driver options.
             </para>
             <indexterm zone="xorg-synaptics-driver synclient">
@@ -151,5 +152,5 @@
             <para>
               is a program that monitors keyboard activity and disables the
-              touchpad when the keyboard is being used
+              touchpad when the keyboard is being used.
             </para>
             <indexterm zone="xorg-synaptics-driver syndaemon">
@@ -163,5 +164,5 @@
           <listitem>
             <para>
-              is an Xorg input driver for touchpads
+              is an Xorg input driver for touchpads.
             </para>
             <indexterm zone="xorg-synaptics-driver synaptics_drv">
@@ -176,2 +177,4 @@
 
   </sect2>
+  <!-- End Xorg Synaptics Driver -->
+
Index: x/installing/x7driver-vmware.xml
===================================================================
--- x/installing/x7driver-vmware.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/x7driver-vmware.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect2info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect2info>
@@ -36,5 +37,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -155,5 +156,5 @@
           <listitem>
             <para>
-              is an Xorg video driver for VMware SVGA virtual video card
+              is an Xorg video driver for VMware SVGA virtual video card.
             </para>
             <indexterm zone="xorg-vmware-driver vmware_drv">
@@ -168,2 +169,3 @@
 
   </sect2>
+  <!-- End Xorg VMware Driver -->
Index: x/installing/x7driver-wacom.xml
===================================================================
--- x/installing/x7driver-wacom.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/x7driver-wacom.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY xorg-wacom-driver-version "0.40.0">
+  <!ENTITY xorg-wacom-driver-version "0.39.0">
 
   <!ENTITY xorg-wacom-driver-download-http "https://github.com/linuxwacom/xf86-input-wacom/releases/download/xf86-input-wacom-&xorg-wacom-driver-version;/xf86-input-wacom-&xorg-wacom-driver-version;.tar.bz2">
   <!ENTITY xorg-wacom-driver-download-ftp  " ">
-  <!ENTITY xorg-wacom-driver-md5sum        "e97a5230d1875d288010b3df1b332ed5">
-  <!ENTITY xorg-wacom-driver-size          "616 KB">
+  <!ENTITY xorg-wacom-driver-md5sum        "9ee7bf6969002d6cfe9301354a72d7b0">
+  <!ENTITY xorg-wacom-driver-size          "608 KB">
   <!ENTITY xorg-wacom-driver-buildsize     "12 MB (with tests)">
   <!ENTITY xorg-wacom-driver-time          "0.1 SBU (with tests)">
@@ -19,4 +19,5 @@
 
   <sect2info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect2info>
@@ -39,5 +40,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs10_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -117,5 +118,4 @@
       <title>Installation of Xorg Wacom Driver</title>
 
-<!-- Fixed in 0.40.0
       <para>
         First, adapt the <application>Xorg Wacom Driver</application> to
@@ -124,5 +124,5 @@
 
 <screen><userinput remap="pre">sed -i 's/ACTION!="add|change"/ACTION=="remove"/' conf/wacom.rules</userinput></screen>
--->
+
       <para>
         Install <application>Xorg Wacom Driver</application> by running the following
@@ -130,8 +130,11 @@
       </para>
 
-<screen revision="sysv"><userinput>./configure $XORG_CONFIG --with-systemd-unit-dir=no &amp;&amp;
+<screen revision="sysv"><userinput>./configure $XORG_CONFIG --with-systemd-unit-dir=no \
+            --with-udev-rules-dir=/lib/udev/rules.d &amp;&amp;
 make</userinput></screen>
 
-<screen revision="systemd"><userinput>./configure $XORG_CONFIG &amp;&amp;
+<screen revision="systemd"><userinput>./configure $XORG_CONFIG \
+            --with-udev-rules-dir=/lib/udev/rules.d \
+            --with-systemd-unit-dir=/lib/systemd/system &amp;&amp;
 make</userinput></screen>
 
@@ -174,5 +177,5 @@
             <para>
               is a commandline utility used to query
-              and modify wacom driver settings
+              and modify wacom driver settings.
             </para>
             <indexterm zone="xorg-wacom-driver xsetwacom">
@@ -186,5 +189,5 @@
           <listitem>
             <para>
-              is an Xorg input driver for Wacom devices
+              is an Xorg input driver for Wacom devices.
             </para>
             <indexterm zone="xorg-wacom-driver wacom_drv">
@@ -199,2 +202,3 @@
 
   </sect2>
+  <!-- End Xorg Wacom Driver -->
Index: x/installing/x7driver.xml
===================================================================
--- x/installing/x7driver.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/x7driver.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -4,5 +4,5 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-  <!ENTITY BLFS76 "https://www.linuxfromscratch.org/blfs/view/7.6/x/x7driver.html">
+  <!ENTITY BLFS76 "http://www.linuxfromscratch.org/blfs/view/7.6/x/x7driver.html">
 
 ]>
@@ -12,4 +12,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: x/installing/x7font.xml
===================================================================
--- x/installing/x7font.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/x7font.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -44,4 +44,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -64,5 +65,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -213,5 +214,5 @@
         <listitem>
           <para>
-            generates a truncated BDF font from an ISO 10646-1 encoded BDF font
+            generates a truncated BDF font from an ISO 10646-1 encoded BDF font.
           </para>
           <indexterm zone="xorg7-font bdftruncate-x7">
@@ -226,5 +227,5 @@
           <para>
             generates BDF fonts in any encoding from an ISO 10646-1 encoded
-            BDF font
+            BDF font.
           </para>
           <indexterm zone="xorg7-font ucs2any-x7">
Index: x/installing/x7legacy.xml
===================================================================
--- x/installing/x7legacy.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/x7legacy.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -37,4 +37,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -74,5 +75,5 @@
       <para revision="sysv">
         Please consult the BLFS-7.10 book at <ulink
-        url="https://www.linuxfromscratch.org/blfs/view/7.10/x/x7font.html"/>
+        url="http://www.linuxfromscratch.org/blfs/view/7.10/x/x7font.html"/>
         if you wish to install any of those other fonts.
       </para>
@@ -80,10 +81,10 @@
       <para revision="systemd">
         Please consult the BLFS-7.10 systemd book at <ulink url=
-        "https://www.linuxfromscratch.org/blfs/view/7.10-systemd/x/x7font.html"/>
+        "http://www.linuxfromscratch.org/blfs/view/7.10-systemd/x/x7font.html"/>
         if you wish to install any of those other fonts.
       </para>
     </note>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -223,5 +224,5 @@
           <para>
             converts an X font from Bitmap Distribution Format to Portable
-            Compiled Format
+            Compiled Format.
           </para>
           <indexterm zone="xorg7-legacy bdftopcf-x7">
Index: x/installing/x7lib.xml
===================================================================
--- x/installing/x7lib.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/x7lib.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -14,6 +14,6 @@
   <!ENTITY xtrans-md5sum                   "ce2fb8100c6647ee81451ebe388b17ad">
 
-  <!ENTITY libX11-version                  "1.7.2">
-  <!ENTITY libX11-md5sum                   "a9a24be62503d5e34df6b28204956a7b">
+  <!ENTITY libX11-version                  "1.7.0">
+  <!ENTITY libX11-md5sum                   "f46572566e2cec801609d25f735285b7">
 
   <!ENTITY libXext-version                 "1.3.4">
@@ -32,6 +32,6 @@
   <!ENTITY libXScrnSaver-md5sum            "eeea9d5af3e6c143d0ea1721d27a5e49">
 
-  <!ENTITY libXt-version                   "1.2.1">
-  <!ENTITY libXt-md5sum                    "b122ff9a7ec70c94dbbfd814899fffa5">
+  <!ENTITY libXt-version                   "1.2.0">
+  <!ENTITY libXt-md5sum                    "a9019421d3ee8b4937b6afd9025f018a">
 
   <!ENTITY libXmu-version                  "1.1.3">
@@ -41,9 +41,9 @@
   <!ENTITY libXpm-md5sum                   "6f0ecf8d103d528cfc803aa475137afa">
 
-  <!ENTITY libXaw-version                  "1.0.14">
-  <!ENTITY libXaw-md5sum                   "c1ce21c296bbf3da3e30cf651649563e">
-
-  <!ENTITY libXfixes-version               "6.0.0">
-  <!ENTITY libXfixes-md5sum                "86f182f487f4f54684ef6b142096bb0f">
+  <!ENTITY libXaw-version                  "1.0.13">
+  <!ENTITY libXaw-md5sum                   "e5e06eb14a608b58746bdd1c0bd7b8e3">
+
+  <!ENTITY libXfixes-version               "5.0.3">
+  <!ENTITY libXfixes-md5sum                "07e01e046a0215574f36a3aacb148be0">
 
   <!ENTITY libXcomposite-version           "0.4.5">
@@ -62,9 +62,9 @@
   <!ENTITY libfontenc-md5sum               "6447db6a689fb530c218f0f8328c3abc">
 
-  <!ENTITY libXfont2-version               "2.0.5">
-  <!ENTITY libXfont2-md5sum                "bdf528f1d337603c7431043824408668">
-
-  <!ENTITY libXft-version                  "2.3.4">
-  <!ENTITY libXft-md5sum                   "5004d8e21cdddfe53266b7293c1dfb1b">
+  <!ENTITY libXfont2-version               "2.0.4">
+  <!ENTITY libXfont2-md5sum                "00516bed7ec1453d56974560379fff2f">
+
+  <!ENTITY libXft-version                  "2.3.3">
+  <!ENTITY libXft-md5sum                   "4a433c24627b4ff60a4dd403a0990796">
 
   <!ENTITY libXi-version                   "1.7.10">
@@ -77,6 +77,6 @@
   <!ENTITY libXrandr-md5sum                "18f3b20d522f45e4dadd34afb5bea048">
 
-  <!ENTITY libXres-version                 "1.2.1">
-  <!ENTITY libXres-md5sum                  "e142ef0ed0366ae89c771c27cfc2ccd1">
+  <!ENTITY libXres-version                 "1.2.0">
+  <!ENTITY libXres-md5sum                  "5d6d443d1abc8e1f6fc1c57fb27729bb">
 
   <!ENTITY libXtst-version                 "1.2.3">
@@ -112,4 +112,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -129,5 +130,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -175,5 +176,4 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="asciidoc"/>,
       <xref linkend="xmlto"/> with one or more of the following:
       <xref linkend="fop"/>,
@@ -420,5 +420,5 @@
         <listitem>
           <para>
-            checks the format of an XPM file
+            checks the format of an XPM file.
           </para>
           <indexterm zone="xorg7-lib cxpm">
@@ -432,5 +432,5 @@
         <listitem>
           <para>
-            shows an XPM file and/or converts XPM 1 or 2 files to XPM 3
+            shows an XPM file and/or converts XPM 1 or 2 files to XPM 3.
           </para>
           <indexterm zone="xorg7-lib sxpm">
@@ -445,5 +445,5 @@
           <para>
             is the X Window System DMX (Distributed Multihead X) extension
-            library
+            library.
           </para>
           <indexterm zone="xorg7-lib libdmx">
@@ -457,5 +457,5 @@
         <listitem>
           <para>
-            is the X11 font encoding library
+            is the X11 font encoding library.
           </para>
           <indexterm zone="xorg7-lib libfontenc">
@@ -469,5 +469,5 @@
         <listitem>
           <para>
-            is the library interface to the X Font Server
+            is the library interface to the X Font Server.
           </para>
           <indexterm zone="xorg7-lib libFS">
@@ -481,5 +481,5 @@
         <listitem>
           <para>
-            is the X Inter Client Exchange Library
+            is the X Inter Client Exchange Library.
           </para>
           <indexterm zone="xorg7-lib libICE">
@@ -493,5 +493,5 @@
         <listitem>
           <para>
-            is the generic PCI Access library for X
+            is the generic PCI Access library for X.
           </para>
           <indexterm zone="xorg7-lib libpciaccess">
@@ -505,5 +505,5 @@
         <listitem>
           <para>
-            is the X Session Management Library
+            is the X Session Management Library.
           </para>
           <indexterm zone="xorg7-lib libSM">
@@ -517,5 +517,5 @@
         <listitem>
           <para>
-            is the Xlib Library
+            is the Xlib Library.
           </para>
           <indexterm zone="xorg7-lib libX11">
@@ -529,5 +529,5 @@
         <listitem>
           <para>
-            is the X Athena Widgets Library, version 6
+            is the X Athena Widgets Library, version 6.
           </para>
           <indexterm zone="xorg7-lib libXaw6">
@@ -541,5 +541,5 @@
         <listitem>
           <para>
-            is the X Athena Widgets Library, version 7
+            is the X Athena Widgets Library, version 7.
           </para>
           <indexterm zone="xorg7-lib libXaw7">
@@ -554,5 +554,5 @@
           <para>
             are symbolic links to the current X Athena Widgets Library,
-            version 7
+            version 7.
           </para>
           <indexterm zone="xorg7-lib libXaw">
@@ -566,5 +566,5 @@
         <listitem>
           <para>
-            is the X Composite Library
+            is the X Composite Library.
           </para>
           <indexterm zone="xorg7-lib libXcomposite">
@@ -578,5 +578,5 @@
         <listitem>
           <para>
-            is the X Cursor management library
+            is the X Cursor management library.
           </para>
           <indexterm zone="xorg7-lib libXcursor">
@@ -590,5 +590,5 @@
         <listitem>
           <para>
-            is the X Damage Library
+            is the X Damage Library.
           </para>
           <indexterm zone="xorg7-lib libXdamage">
@@ -602,5 +602,5 @@
         <listitem>
           <para>
-            is the Misc X Extension Library
+            is the Misc X Extension Library.
           </para>
           <indexterm zone="xorg7-lib libXext">
@@ -614,5 +614,5 @@
         <listitem>
           <para>
-            provides augmented versions of core protocol requests
+            provides augmented versions of core protocol requests.
           </para>
           <indexterm zone="xorg7-lib libXfixes">
@@ -626,5 +626,5 @@
         <listitem>
           <para>
-            is the X font library
+            is the X font library.
           </para>
           <indexterm zone="xorg7-lib libXfont2">
@@ -638,5 +638,5 @@
         <listitem>
           <para>
-            is the X FreeType interface library
+            is the X FreeType interface library.
           </para>
           <indexterm zone="xorg7-lib libXft">
@@ -650,5 +650,5 @@
         <listitem>
           <para>
-            is the Xinerama Library
+            is the Xinerama Library.
           </para>
           <indexterm zone="xorg7-lib libXinerama">
@@ -662,5 +662,5 @@
         <listitem>
           <para>
-            is the X Input Extension Library
+            is the X Input Extension Library.
           </para>
           <indexterm zone="xorg7-lib libXi">
@@ -674,5 +674,5 @@
         <listitem>
           <para>
-            is the xkbfile Library
+            is the xkbfile Library.
           </para>
           <indexterm zone="xorg7-lib libxkbfile">
@@ -687,5 +687,5 @@
           <para>
             is the X interface library for miscellaneous utilities not
-            part of the Xlib standard
+            part of the Xlib standard.
           </para>
           <indexterm zone="xorg7-lib libXmu">
@@ -699,5 +699,5 @@
         <listitem>
           <para>
-            is the Mini Xmu Library
+            is the Mini Xmu Library.
           </para>
           <indexterm zone="xorg7-lib libXmuu">
@@ -711,5 +711,5 @@
         <listitem>
           <para>
-            is the X Pixmap Library
+            is the X Pixmap Library.
           </para>
           <indexterm zone="xorg7-lib libXpm">
@@ -723,5 +723,5 @@
         <listitem>
           <para>
-            is the X Resize, Rotate and Reflection extension library
+            is the X Resize, Rotate and Reflection extension library.
           </para>
           <indexterm zone="xorg7-lib libXrandr">
@@ -735,5 +735,5 @@
         <listitem>
           <para>
-            is the X Render Library
+            is the X Render Library.
           </para>
           <indexterm zone="xorg7-lib libXrender">
@@ -747,5 +747,5 @@
         <listitem>
           <para>
-            is the X-Resource extension client library
+            is the X-Resource extension client library.
           </para>
           <indexterm zone="xorg7-lib libXRes">
@@ -759,5 +759,5 @@
         <listitem>
           <para>
-            exposes an event API on top of Linux futexes
+            exposes an event API on top of Linux futexes.
           </para>
           <indexterm zone="xorg7-lib libxshmfence">
@@ -771,5 +771,5 @@
         <listitem>
           <para>
-            is the X11 Screen Saver extension client library
+            is the X11 Screen Saver extension client library.
           </para>
           <indexterm zone="xorg7-lib libXss">
@@ -783,5 +783,5 @@
         <listitem>
           <para>
-            is the X Toolkit Library
+            is the X Toolkit Library.
           </para>
           <indexterm zone="xorg7-lib libXt">
@@ -795,5 +795,5 @@
         <listitem>
           <para>
-            is the Xtst Library
+            is the Xtst Library.
           </para>
           <indexterm zone="xorg7-lib libXtst">
@@ -807,5 +807,5 @@
         <listitem>
           <para>
-            is the X-Video Motion Compensation Library
+            is the X-Video Motion Compensation Library.
           </para>
           <indexterm zone="xorg7-lib libXvMC">
@@ -819,5 +819,5 @@
         <listitem>
           <para>
-            is the XvMC Wrapper including the Nonstandard VLD extension
+            is the XvMC Wrapper including the Nonstandard VLD extension.
           </para>
           <indexterm zone="xorg7-lib libXvMCW">
@@ -831,5 +831,5 @@
         <listitem>
           <para>
-            is the X Window System video extension library
+            is the X Window System video extension library.
           </para>
           <indexterm zone="xorg7-lib libXv">
@@ -843,5 +843,5 @@
         <listitem>
           <para>
-            is the client library for the XFree86-DGA extension
+            is the client library for the XFree86-DGA extension.
           </para>
           <indexterm zone="xorg7-lib libXxf86dga">
@@ -855,5 +855,5 @@
         <listitem>
           <para>
-            is the client library for the XFree86-VidMode X extension
+            is the client library for the XFree86-VidMode X extension.
           </para>
           <indexterm zone="xorg7-lib libXxf86vm">
Index: x/installing/xbitmaps.xml
===================================================================
--- x/installing/xbitmaps.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/xbitmaps.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xcb-proto.xml
===================================================================
--- x/installing/xcb-proto.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/xcb-proto.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -92,5 +93,5 @@
     </para>
 
-<screen><userinput>PYTHON=python3 ./configure $XORG_CONFIG</userinput></screen>
+<screen><userinput>./configure $XORG_CONFIG</userinput></screen>
 
     <para>
Index: x/installing/xcb-util-cursor.xml
===================================================================
--- x/installing/xcb-util-cursor.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/xcb-util-cursor.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,5 +17,6 @@
 
   <sect1info>
-    <date>$Date$</date>
+    <othername>$LastChangedBy: bdubbs $</othername>
+    <date>$Date: 2015-09-20 17:38:20 -0500 (Sun, 20 Sep 2015) $</date>
   </sect1info>
 
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -132,8 +133,8 @@
 
       <varlistentry id="libxcb-cursor">
-        <term><filename class="libraryfile">libxcb-cursor.so</filename></term>
+        <term><filename class='libraryfile'>libxcb-cursor.so</filename></term>
         <listitem>
           <para>
-             Is a port of Xlib's libXcursor functions
+             Is a port of Xlib's libXcursor functions.
           </para>
           <indexterm zone="xcb-util-cursor libxcb-cursor">
Index: x/installing/xcb-util-image.xml
===================================================================
--- x/installing/xcb-util-image.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/xcb-util-image.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -132,8 +133,8 @@
 
       <varlistentry id="libxcb-image">
-        <term><filename class="libraryfile">libxcb-image.so</filename></term>
+        <term><filename class='libraryfile'>libxcb-image.so</filename></term>
         <listitem>
           <para>
-             Is a port of Xlib's XImage and XShmImage functions
+             Is a port of Xlib's XImage and XShmImage functions.
           </para>
           <indexterm zone="xcb-util-image libxcb-image">
Index: x/installing/xcb-util-keysyms.xml
===================================================================
--- x/installing/xcb-util-keysyms.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/xcb-util-keysyms.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -144,5 +145,5 @@
           <para>
              provides the standard X key constants and API functions for
-             conversion to/from keycodes
+             conversion to/from keycodes.
           </para>
           <indexterm zone="xcb-util-keysyms libxcb-keysyms">
Index: x/installing/xcb-util-renderutil.xml
===================================================================
--- x/installing/xcb-util-renderutil.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/xcb-util-renderutil.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -131,8 +132,8 @@
 
       <varlistentry id="libxcb-render-util">
-        <term><filename class="libraryfile">libxcb-render-util.so</filename></term>
+        <term><filename class='libraryfile'>libxcb-render-util.so</filename></term>
         <listitem>
           <para>
-            Provides convenience functions for the Render extension
+            Provides convenience functions for the Render extension.
           </para>
           <indexterm zone="xcb-util-renderutil libxcb-render-util">
Index: x/installing/xcb-util-wm.xml
===================================================================
--- x/installing/xcb-util-wm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/xcb-util-wm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -143,5 +144,5 @@
         <listitem>
           <para>
-            provides the client and window-manager helpers for EWMH
+            provides the client and window-manager helpers for EWMH.
           </para>
           <indexterm zone="xcb-util-wm libxcb-ewmh">
@@ -155,5 +156,5 @@
         <listitem>
           <para>
-            provides the client and window-manager helpers for ICCCM
+            provides the client and window-manager helpers for ICCCM.
           </para>
           <indexterm zone="xcb-util-wm libxcb-icccm">
Index: x/installing/xcb-util.xml
===================================================================
--- x/installing/xcb-util.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/xcb-util.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -133,8 +134,8 @@
 
       <varlistentry id="libxcb-util">
-        <term><filename class="libraryfile">libxcb-util.so</filename></term>
+        <term><filename class='libraryfile'>libxcb-util.so</filename></term>
         <listitem>
           <para>
-            Provides utility functions for other XCB utilities
+            Provides utility functions for other XCB utilities.
           </para>
           <indexterm zone="xcb-util libxcb-util">
Index: x/installing/xclock.xml
===================================================================
--- x/installing/xclock.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/xclock.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     &not-katamari;
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -131,5 +132,5 @@
         <listitem>
           <para>
-            is an analog/digital clock for X
+            is an analog/digital clock for X.
           </para>
           <indexterm zone="xclock xclock">
Index: x/installing/xcursor-themes.xml
===================================================================
--- x/installing/xcursor-themes.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/xcursor-themes.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xinit.xml
===================================================================
--- x/installing/xinit.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/xinit.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     &not-katamari;
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -141,5 +142,5 @@
       </para>
       
-<screen role="nodump"><userinput>sed -i '/$serverargs $vtarg/ s/serverargs/: #&amp;/' $XORG_PREFIX/bin/startx</userinput></screen>
+<screen role="nodump"><userinput>sed -1 '/$serverargs $vtarg/ s/serverargs/: #&amp;/' $XORG_PREFIX/bin/startx</userinput></screen>
 
       <para>
@@ -176,5 +177,5 @@
         <listitem>
           <para>
-            initializes an X session
+            initializes an X session.
           </para>
           <indexterm zone="xinit startx">
@@ -188,5 +189,5 @@
         <listitem>
           <para>
-            is the X Window System initializer
+            is the X Window System initializer.
           </para>
           <indexterm zone="xinit xinit">
Index: x/installing/xkeyboard-config.xml
===================================================================
--- x/installing/xkeyboard-config.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/xkeyboard-config.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -9,7 +9,7 @@
   <!ENTITY xkeyboard-config-download-ftp
   "&xorg-download-ftp;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
-  <!ENTITY xkeyboard-config-md5sum        "49282f120fd22c6c860004931c03c595">
-  <!ENTITY xkeyboard-config-size          "1.7 MB">
-  <!ENTITY xkeyboard-config-buildsize     "21 MB">
+  <!ENTITY xkeyboard-config-md5sum        "f10b4753dfd8f18036167c1f87c63ee7">
+  <!ENTITY xkeyboard-config-size          "1.6 MB">
+  <!ENTITY xkeyboard-config-buildsize     "14 MB">
   <!ENTITY xkeyboard-config-time          "less than 0.1 SBU">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xorg-config.xml
===================================================================
--- x/installing/xorg-config.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/xorg-config.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -9,4 +9,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,33 +39,4 @@
       </para>
     </note>
-
-    <warning>
-      <para>
-        If Xorg hangs for some reason (for example, lacking a proper
-        input driver), the system may stop responsing to any user input.
-        As a precaution, you can enable a magic <keycap>SysRq</keycap> key
-        before testing Xorg.  As the
-        <systemitem class="username">root</systemitem> user, issue:
-      </para>
-
-<screen><userinput>echo 4 > /proc/sys/kernel/sysrq</userinput></screen>
-
-      <para>
-        Then if Xorg hangs, it's possible to use
-        <keycombo>
-          <keycap>Alt</keycap>
-          <keycap>SysRq</keycap>
-          <keycap>R</keycap>
-        </keycombo>
-        to reset the keyboard mode.  Now it should be able to use
-        <keycombo>
-          <keycap>Ctrl</keycap>
-          <keycap>Alt</keycap>
-          <keycap>Fx</keycap>
-        </keycombo>
-        (replace x with a VT number) to switch to another VT.
-		If it works, login and kill Xorg using command line in the new VT.
-      </para>
-    </warning>
 
     <para>
Index: x/installing/xorg-server.xml
===================================================================
--- x/installing/xorg-server.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/xorg-server.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY xorg-server-download-http "&xorg-download-http;/xserver/xorg-server-&xorg-server-version;.tar.xz">
-  <!ENTITY xorg-server-download-ftp  "&xorg-download-ftp;/xserver/xorg-server-&xorg-server-version;.tar.xz">
-  <!ENTITY xorg-server-md5sum        "9acb2a51507e6056b09e3d3f19565419">
-  <!ENTITY xorg-server-size          "4.9 MB">
-  <!ENTITY xorg-server-buildsize     "193 MB (with tests)">
-  <!ENTITY xorg-server-time          "0.7 SBU (using parallelism=4; with tests)">
+  <!ENTITY xorg-server-download-http "&xorg-download-http;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
+  <!ENTITY xorg-server-download-ftp  "&xorg-download-ftp;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
+  <!ENTITY xorg-server-md5sum        "8cf8bd1f33e3736bc8dd279b20a32399">
+  <!ENTITY xorg-server-size          "6.0 MB">
+  <!ENTITY xorg-server-buildsize     "350 MB (with tests)">
+  <!ENTITY xorg-server-time          "0.9 SBU (using parallelism=4; with tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -252,5 +253,5 @@
         <listitem>
           <para>
-            calculates VESA CVT mode lines
+            calculates VESA CVT mode lines.
           </para>
           <indexterm zone="xorg-server cvt-x7">
@@ -264,5 +265,5 @@
         <listitem>
           <para>
-            are various tools used for manipulating the dmx server
+            are various tools used for manipulating the dmx server.
           </para>
           <indexterm zone="xorg-server dmx-x7">
@@ -276,5 +277,5 @@
         <listitem>
           <para>
-            calculates VESA GTF mode lines
+            calculates VESA GTF mode lines.
           </para>
           <indexterm zone="xorg-server gtf-x7">
@@ -289,5 +290,5 @@
           <para>
             is a tool used to convert VDL config files to DMX config
-            files
+            files.
           </para>
           <indexterm zone="xorg-server vdltodmx-x7">
@@ -301,5 +302,5 @@
         <listitem>
           <para>
-            is a symbolic link to Xorg
+            is a symbolic link to Xorg.
           </para>
           <indexterm zone="xorg-server X-x7">
@@ -314,5 +315,5 @@
           <para>
             is a proxy X server that uses one or more other X servers as
-            its display devices
+            its display devices.
           </para>
           <indexterm zone="xorg-server Xdmx">
@@ -326,5 +327,5 @@
         <listitem>
           <para>
-            is a nested X server which supports modern X extensions
+            is a nested X server which supports modern X extensions.
           </para>
           <indexterm zone="xorg-server Xephyr-x7">
@@ -338,5 +339,5 @@
         <listitem>
           <para>
-            is a nested X server
+            is a nested X server.
           </para>
           <indexterm zone="xorg-server Xnest-x7">
@@ -350,5 +351,5 @@
         <listitem>
           <para>
-            is the X11R7 X Server
+            is the X11R7 X Server.
           </para>
           <indexterm zone="xorg-server Xorg-x7">
@@ -362,5 +363,5 @@
         <listitem>
           <para>
-            is the virtual framebuffer X server for X Version 11
+            is the virtual framebuffer X server for X Version 11.
           </para>
           <indexterm zone="xorg-server Xvfb-x7">
@@ -374,5 +375,5 @@
         <listitem>
           <para>
-            is a graphical configuration utility for the dmx server
+            is a graphical configuration utility for the dmx server.
           </para>
           <indexterm zone="xorg-server xdmxconfig-x7">
@@ -388,5 +389,5 @@
             allows the X server to run X clients under wayland (i.e. wayland
             provides the input devices and handles the presentation of the
-            windows)
+            windows).
           </para>
           <indexterm zone="xorg-server Xwayland-x7">
@@ -402,5 +403,5 @@
             provides a video driver for machines using Kernel Mode Setting (KMS).
             This will use glamor if that has been enabled and the hardware offers
-            acceleration
+            acceleration.
           </para>
           <indexterm zone="xorg-server modesetting_drv-x7">
Index: x/installing/xorg7.xml
===================================================================
--- x/installing/xorg7.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/xorg7.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
Index: x/installing/xorgproto.xml
===================================================================
--- x/installing/xorgproto.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/xorgproto.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,6 +7,6 @@
   <!ENTITY xorgproto-download-http "https://xorg.freedesktop.org/archive/individual/proto/xorgproto-&xorgproto-version;.tar.bz2">
   <!ENTITY xorgproto-download-ftp  " ">
-  <!ENTITY xorgproto-md5sum        "fb7593911f90727adc03d731e286c685">
-  <!ENTITY xorgproto-size          "864 KB">
+  <!ENTITY xorgproto-md5sum        "c29f4fa78f53b52b3efdc71ebd9506b6">
+  <!ENTITY xorgproto-size          "832 KB">
   <!ENTITY xorgproto-buildsize     "8.2 MB">
   <!ENTITY xorgproto-time          "less than 0.1 SBU">
@@ -17,5 +17,6 @@
 
   <sect1info>
-    <date>$Date$</date>
+    <othername>$LastChangedBy: bdubbs $</othername>
+    <date>$Date: 2018-02-18 22:04:14 +0100 (dim. 18 févr. 2018) $</date>
   </sect1info>
 
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xterm.xml
===================================================================
--- x/installing/xterm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/installing/xterm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY xterm-download-http "https://invisible-mirror.net/archives/xterm/xterm-&xterm-version;.tgz">
+  <!ENTITY xterm-download-http "http://invisible-mirror.net/archives/xterm/xterm-&xterm-version;.tgz">
   <!--<!ENTITY xterm-download-ftp  "ftp://invisible-island.net/xterm/xterm-&xterm-version;.tgz">-->
   <!ENTITY xterm-download-ftp  " ">
-  <!ENTITY xterm-md5sum        "3a4126006085ff22f4c73f716a9a03a7">
+  <!ENTITY xterm-md5sum        "81e2d19bd74288f4ddd2476b466c3269">
   <!ENTITY xterm-size          "1.4 MB">
-  <!ENTITY xterm-buildsize     "17 MB">
+  <!ENTITY xterm-buildsize     "14 MB">
   <!ENTITY xterm-time          "0.2 SBU">
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     &not-katamari;
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -89,5 +90,4 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="emacs"/>, <!-- looks for ctags/etags -->
       <xref linkend="pcre"/> or <xref linkend="pcre2"/>,
       <xref linkend="valgrind"/> and
@@ -219,5 +219,5 @@
         <listitem>
           <para>
-            is a wrapper script to set up xterm with a KOI8-R locale
+            is a wrapper script to set up xterm with a KOI8-R locale.
           </para>
           <indexterm zone="xterm2 koi8rxterm">
@@ -233,5 +233,5 @@
             prints a shell command for setting the TERM and TERMCAP
             environment  variables to indicate the current size of xterm
-            window
+            window.
           </para>
           <indexterm zone="xterm2 resize">
@@ -246,5 +246,5 @@
           <para>
             is a wrapper script that modifies the current locale to use
-            UTF-8 and starts xterm with the proper settings
+            UTF-8 and starts xterm with the proper settings.
           </para>
           <indexterm zone="xterm2 uxterm">
@@ -258,5 +258,5 @@
         <listitem>
           <para>
-            is a terminal emulator for the X Window System
+            is a terminal emulator for the X Window System.
           </para>
           <indexterm zone="xterm2 xterm2">
Index: x/lib/amtk.xml
===================================================================
--- x/lib/amtk.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/amtk.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -150,5 +151,5 @@
         <listitem>
           <para>
-            provides a basic GTKUIManager replacement API based on GAction
+            provides a basic GTKUIManager replacement API based on GAction.
           </para>
           <indexterm zone="amtk libamtk-5">
@@ -159,4 +160,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: x/lib/at-spi2-atk.xml
===================================================================
--- x/lib/at-spi2-atk.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/at-spi2-atk.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -96,5 +97,5 @@
 cd build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -113,11 +114,4 @@
       href="../../xincludes/gsettings-destdir.xml"/>
 
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
   </sect2>
 
@@ -153,5 +147,5 @@
         <listitem>
           <para>
-            is the Accessibility Toolkit <application>GTK+</application> module
+            is the Accessibility Toolkit <application>GTK+</application> module.
           </para>
           <indexterm zone="at-spi2-atk libatk-bridge">
@@ -166,5 +160,5 @@
           <para>
             Contains the common functions used by <application>GTK+</application>
-            Accessibility Toolkit Bridge
+            Accessibility Toolkit Bridge.
           </para>
           <indexterm zone="at-spi2-atk libatk-bridge-2">
@@ -179,2 +173,3 @@
 
 </sect1>
+
Index: x/lib/at-spi2-core.xml
===================================================================
--- x/lib/at-spi2-core.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/at-spi2-core.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,11 +6,11 @@
 
   <!ENTITY at-spi2-core-download-http
-           "&gnome-download-http;/at-spi2-core/2.40/at-spi2-core-&at-spi2-core-version;.tar.xz">
+           "&gnome-download-http;/at-spi2-core/2.38/at-spi2-core-&at-spi2-core-version;.tar.xz">
   <!ENTITY at-spi2-core-download-ftp
-           "&gnome-download-ftp;/at-spi2-core/2.40/at-spi2-core-&at-spi2-core-version;.tar.xz">
-  <!ENTITY at-spi2-core-md5sum        "db4f7caceb5d663ec3adb715408b2303">
-  <!ENTITY at-spi2-core-size          "196 KB">
-  <!ENTITY at-spi2-core-buildsize     "9.8 MB (with tests)">
-  <!ENTITY at-spi2-core-time          "less than 0.1 SBU (using parallelism=4, with tests)">
+           "&gnome-download-ftp;/at-spi2-core/2.38/at-spi2-core-&at-spi2-core-version;.tar.xz">
+  <!ENTITY at-spi2-core-md5sum        "ae060dc0a042822b3f07c786c5d5aab7">
+  <!ENTITY at-spi2-core-size          "188 KB">
+  <!ENTITY at-spi2-core-buildsize     "9.6 MB (with tests)">
+  <!ENTITY at-spi2-core-time          "0.1 SBU (using parallelism=4, with tests)">
 ]>
 
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -110,6 +111,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr       \
-      --buildtype=release \
+meson --prefix=/usr     \
       -Dsystemd_user_dir=/tmp .. &amp;&amp;
 ninja</userinput></screen>
@@ -118,13 +118,12 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
     <para>
       A session bus address, normally available in an Xorg terminal,
-      is necessary to run the tests. And, the test suite requires the 
-      glib schemas of the package already installed. To test the results,
-      install the package first, then issue: <command>ninja test</command>.
-      The memory test is known to timeout.
+      is necessary to run the tests. To test the results,
+      issue: <command>ninja test</command>. The memory test is known
+      to timeout.
     </para>
 <!-- [pierre Sep 5th, 2020] the memory test passed for me with 2.36.1. -->
@@ -151,12 +150,4 @@
       use this file.
     </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
   </sect2>
@@ -211,5 +202,5 @@
         <listitem>
           <para>
-            contains the <application>At-Spi2</application> API functions
+            contains the <application>At-Spi2</application> API functions.
           </para>
           <indexterm zone="at-spi2-core libatspi">
Index: x/lib/atk.xml
===================================================================
--- x/lib/atk.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/atk.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -105,5 +106,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -118,11 +119,4 @@
 <screen role="root"><userinput>ninja install</userinput></screen>
 
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
   </sect2>
 
@@ -158,5 +152,5 @@
           <para>
             contains functions that are used by assistive technologies
-            to interact with the desktop applications
+            to interact with the desktop applications.
           </para>
           <indexterm zone="atk libatk">
Index: x/lib/atkmm.xml
===================================================================
--- x/lib/atkmm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/atkmm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY atkmm-download-http "&gnome-download-http;/atkmm/2.28/atkmm-&atkmm-version;.tar.xz">
   <!ENTITY atkmm-download-ftp  "&gnome-download-ftp;/atkmm/2.28/atkmm-&atkmm-version;.tar.xz">
-  <!ENTITY atkmm-md5sum        "c1dc581b9cf14a8f3cd088a7563d0d3e">
+  <!ENTITY atkmm-md5sum        "03d9d02736645083cbb824c926750624">
   <!ENTITY atkmm-size          "676 KB">
-  <!ENTITY atkmm-buildsize     "11 MB">
-  <!ENTITY atkmm-time          "0.2 SBU">
+  <!ENTITY atkmm-buildsize     "15 MB">
+  <!ENTITY atkmm-time          "0.1 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -91,8 +92,8 @@
     </para>
 
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
+<screen><userinput>mkdir bld &amp;&amp;
+cd    bld &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -140,5 +141,5 @@
         <listitem>
           <para>
-            contains the <application>ATK</application> API classes
+            contains the <application>ATK</application> API classes.
           </para>
           <indexterm zone="atkmm libatkmm-1">
Index: x/lib/cairo.xml
===================================================================
--- x/lib/cairo.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/cairo.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,11 +5,13 @@
   %general-entities;
 
-  <!ENTITY cairo-download-http "https://www.cairographics.org/snapshots/cairo-&cairo-version;.tar.xz">  
-  <!--<!ENTITY cairo-download-http "&sources-anduin-http;/cairo/cairo-&cairo-version;.tar.xz">-->
+  <!--
+  <!ENTITY cairo-download-http "https://www.cairographics.org/releases/cairo-&cairo-version;.tar.xz">
+  -->
+  <!ENTITY cairo-download-http "&sources-anduin-http;/cairo/cairo-&cairo-version;.tar.xz">
   <!ENTITY cairo-download-ftp  " ">
-  <!ENTITY cairo-md5sum        "bf9d0d324ecbd350d0e9308125fa4ce0">
+  <!ENTITY cairo-md5sum        "23a9420780f74ad0ca1e9885e53ee022">
   <!ENTITY cairo-size          "40 MB">
-  <!ENTITY cairo-buildsize     "154 MB">
-  <!ENTITY cairo-time          "0.8 SBU">
+  <!ENTITY cairo-buildsize     "148 MB">
+  <!ENTITY cairo-time          "0.9 SBU">
 ]>
 
@@ -18,4 +20,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -48,5 +51,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -95,5 +98,5 @@
     <para role="recommended">
       <xref linkend="fontconfig"/>,
-      <xref linkend="glib2"/> (required for most GUIs), and
+      <xref linkend="glib2"/> (required for most GUIs) and
       <xref linkend="xorg7-lib"/>
     </para>
@@ -141,5 +144,6 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr    \
+<screen><userinput>autoreconf -fiv             &amp;&amp;
+./configure --prefix=/usr    \
             --disable-static \
             --enable-tee &amp;&amp;
@@ -148,8 +152,4 @@
     <para>
       This package does not have a working testsuite.
-      <!-- The test suite can be run with 'make check', but 488 tests fail and
-      59 tests pass. This seems to be due to minute changes in the expected
-      output, similar to librsvg's tests. Since it's a huge chunk of the tests,
-      let's keep it as "broken" for now.-->
     </para>
 
@@ -164,12 +164,10 @@
     <title>Command Explanations</title>
 
-<!-- Not needed with 1.17.4
-    <para>
-      <parameter>autoreconf -fv</parameter>: This prevents
+    <para>
+      <parameter>autoreconf -fiv</parameter>: This prevents
       <command>configure</command> ending in error with the current version
       of <application>automake</application> because the AM_INIT_AUTOMAKE
       definitions came from a previous version.
     </para>
--->
 
     <para>
@@ -184,5 +182,7 @@
     <para>
       <option>--enable-xlib-xcb</option>: This switch enables several
-      experimental Xlib/XCB functions used by some window managers.
+      experimental Xlib/XCB functions used by some window managers. Note that
+      using this option will break some applications such as
+      <xref role="nodep" linkend="epiphany"/>.
     </para>
 
@@ -196,12 +196,6 @@
     </para>
 
-<!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gtk-doc-rebuild.xml"/>
-      NOTE: For this version, no docs are installed by default -->
-
-    <para>
-      <option>--enable-gtk-doc</option>: Use this parameter if GTK-Doc is
-      installed and you wish to create and install the documentation.
-    </para>
 
   </sect2>
@@ -217,5 +211,5 @@
       <seglistitem>
         <seg>
-          cairo-trace
+          cairo-sphinx and cairo-trace
         </seg>
         <seg>
@@ -234,10 +228,9 @@
       <?dbhtml list-presentation="table"?>
 
-<!--
      <varlistentry id="cairo-sphinx">
         <term><command>cairo-sphinx</command></term>
         <listitem>
           <para>
-            is an internal utility for regression analysis
+            is an internal utility for regression analysis.
           </para>
           <indexterm zone="cairo cairo-sphinx">
@@ -246,5 +239,4 @@
         </listitem>
       </varlistentry>
--->
 
       <varlistentry id="cairo-trace">
@@ -253,5 +245,5 @@
           <para>
             generates a log of all calls made by an application to
-            <application>Cairo</application>
+            <application>Cairo</application>.
           </para>
           <indexterm zone="cairo cairo-trace">
@@ -266,5 +258,5 @@
           <para>
             contains the 2D graphics functions required for rendering to the
-            various output targets
+            various output targets.
           </para>
           <indexterm zone="cairo libcairo">
@@ -280,5 +272,5 @@
             contains functions that integrate
             <application>Cairo</application> with 
-            <application>Glib</application>'s GObject type system
+            <application>Glib</application>'s GObject type system.
           </para>
           <indexterm zone="cairo libcairo-gobject">
@@ -293,5 +285,5 @@
           <para>
             contains the script interpreter functions for executing and
-            manipulating <application>Cairo</application> execution traces
+            manipulating <application>Cairo</application> execution traces.
           </para>
           <indexterm zone="cairo libcairo-script-interpreter">
Index: x/lib/cairomm-1.0.xml
===================================================================
--- x/lib/cairomm-1.0.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/cairomm-1.0.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -9,5 +9,5 @@
   <!ENTITY cairomm-1.0-md5sum        "75a08d50eb08b97667e4ea2be6efa1ad">
   <!ENTITY cairomm-1.0-size          "592 KB">
-  <!ENTITY cairomm-1.0-buildsize     "9.5 MB (with tests)">
+  <!ENTITY cairomm-1.0-buildsize     "27 MB (with tests)">
   <!ENTITY cairomm-1.0-time          "less than 0.1 SBU (with tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -105,5 +106,4 @@
 
 meson --prefix=/usr       \
-      --buildtype=release \
       -Dbuild-tests=true  \
       -Dboost-shared=true \
@@ -176,5 +176,5 @@
         <listitem>
           <para>
-            contains the <application>Cairo</application> API classes
+            contains the <application>Cairo</application> API classes.
           </para>
           <indexterm zone="cairomm-1.0 libcairomm-1">
Index: x/lib/cairomm.xml
===================================================================
--- x/lib/cairomm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
+++ x/lib/cairomm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -0,0 +1,190 @@
+<?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 cairomm-download-http "https://www.cairographics.org/releases/cairomm-&cairomm-version;.tar.xz">
+  <!ENTITY cairomm-download-ftp  " ">
+  <!ENTITY cairomm-md5sum        "7b5c3d7ca5578f0de7d05aef756f97f1">
+  <!ENTITY cairomm-size          "568 KB">
+  <!ENTITY cairomm-buildsize     "29 MB (with tests)">
+  <!ENTITY cairomm-time          "0.2 SBU (with tests)">
+]>
+
+<sect1 id="cairomm" xreflabel="Cairomm-&cairomm-version;">
+  <?dbhtml filename="cairomm.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Cairomm-&cairomm-version;</title>
+
+  <indexterm zone="cairomm">
+    <primary sortas="a-Cairomm">Cairomm</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Cairomm</title>
+
+    <para>
+      The <application>Cairomm</application> package provides a C++
+      interface to <application>Cairo</application>.
+    </para>
+
+    &lfs10_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&cairomm-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&cairomm-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &cairomm-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &cairomm-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &cairomm-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &cairomm-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Cairomm Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="cairo"/> and
+      <xref linkend="libsigc3"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="boost"/> (for tests)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/cairomm"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Cairomm</title>
+
+    <para>
+      Install <application>Cairomm</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>mkdir bld &amp;&amp;
+cd    bld &amp;&amp;
+
+meson --prefix=/usr       \
+      -Dbuild-tests=true  \
+      -Dboost-shared=true \
+      ..                  &amp;&amp;
+ninja</userinput></screen>
+
+    <para>
+      To run the test suite, run: <command>ninja test</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>ninja install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>-Dbuild-tests=true</parameter>: This switch is for building
+      the unit tests. Remove if you have not installed <xref linkend="boost"/>.
+    </para>
+
+    <para>
+      <parameter>-Dboost-shared=true</parameter>: This switch has the package
+      use the shared version of boost libraries. It is required if you have
+      not installed the boost static libraries, and you have passed
+      <parameter>-Dbuild-tests=true</parameter>.
+    </para>
+
+    <para>
+      <option>-Dbuild-documentation=true</option>: This switch builds the
+      html documentation if doxygen is installed.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libcairomm-1.16.so
+        </seg>
+        <seg>
+          /usr/{lib,include}/cairomm-1.16 and
+          /usr/share/{devhelp/books,doc}/cairomm-1.16 (optional)
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libcairomm-1.16">
+        <term><filename class="libraryfile">libcairomm-1.16.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Cairo</application> API classes.
+          </para>
+          <indexterm zone="cairomm libcairomm-1.16">
+            <primary sortas="c-libcairomm-1.16">libcairomm-1.16.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: x/lib/clutter-gst.xml
===================================================================
--- x/lib/clutter-gst.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/clutter-gst.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -160,5 +161,5 @@
         <listitem>
           <para>
-            contains the <application>Clutter Gst</application> API functions
+            contains the <application>Clutter Gst</application> API functions.
           </para>
           <indexterm zone="clutter-gst libclutter-gst-3">
Index: x/lib/clutter-gtk.xml
===================================================================
--- x/lib/clutter-gtk.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/clutter-gtk.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -155,8 +156,9 @@
 
       <varlistentry id="libclutter-gtk-1">
-        <term><filename class="libraryfile">libclutter-gtk-1.0.so</filename></term>
+        <term><filename
+        class="libraryfile">libclutter-gtk-1.0.so</filename></term>
         <listitem>
           <para>
-            contains the <application>Clutter Gtk</application> API functions
+            contains the <application>Clutter Gtk</application> API functions.
           </para>
           <indexterm zone="clutter-gtk libclutter-gtk-1">
Index: x/lib/clutter.xml
===================================================================
--- x/lib/clutter.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/clutter.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <note>
@@ -137,7 +138,6 @@
 
     <para>
-      To test the results, issue: <command>make -j1 -k check</command> (you must be
+      To test the results, issue: <command>make -k check</command> (you must be
       in an xterm or similar to do this, because it launches some windows).
-      <!-- The tests will hang if run at more than -j1.-->
       <!-- The test named actor-offscreen-redirect may hang.-->
       <!-- Two tests have been observed to indicate ERROR, but each is flagged twice. 
@@ -168,5 +168,5 @@
 
     <para>
-      <parameter>--enable-wayland-backend</parameter> and
+      <parameter>--enable-wayland</parameter> and
       <parameter>--enable-wayland-compositor</parameter>: These
       switches enable the experimental <application>Wayland</application> API
@@ -211,5 +211,5 @@
         <listitem>
           <para>
-            contains the <application>Clutter</application> API functions
+            contains the <application>Clutter</application> API functions.
           </para>
           <indexterm zone="clutter libclutter-1">
Index: x/lib/cogl.xml
===================================================================
--- x/lib/cogl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/cogl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -23,4 +23,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -42,5 +43,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -138,5 +139,7 @@
     &parallel_issues;
 
-<screen><userinput>./configure --prefix=/usr  \
+<screen><userinput>autoreconf &amp;&amp;
+
+./configure --prefix=/usr  \
             --enable-gles1 \
             --enable-gles2 \
@@ -230,5 +233,5 @@
           <para>
             is the OpenGL ES 2.0 integration library for
-            <application>Cogl</application>
+            <application>Cogl</application>.
           </para>
           <indexterm zone="cogl libcogl-gles2">
@@ -243,5 +246,5 @@
           <para>
             is the <application>Pango</application> integration library
-            for <application>Cogl</application>
+            for <application>Cogl</application>.
           </para>
           <indexterm zone="cogl libcogl-pango">
@@ -255,5 +258,5 @@
         <listitem>
           <para>
-            is an object oriented GL/GLES Abstraction/Utility Layer library
+            is an object oriented GL/GLES Abstraction/Utility Layer library.
           </para>
           <indexterm zone="cogl libcogl">
Index: x/lib/colord-gtk.xml
===================================================================
--- x/lib/colord-gtk.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/colord-gtk.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -102,5 +103,5 @@
     <warning>
       <para>
-        If building the documentation <command>ninja -j1</command> must be used.
+        If building the documentation <command>make -j1</command> must be used.
       </para>
     </warning>
@@ -114,10 +115,9 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr       \
-      --buildtype=release \
-      -Dgtk2=true         \
-      -Dvapi=true         \
-      -Ddocs=false        \
-      -Dman=false ..      &amp;&amp;
+meson --prefix=/usr  \
+      -Dgtk2=true    \
+      -Dvapi=true    \
+      -Ddocs=false   \
+      -Dman=false .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -141,7 +141,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -208,5 +205,5 @@
         <listitem>
           <para>
-            is a Color Manager Testing Tool
+            is a Color Manager Testing Tool.
           </para>
           <indexterm zone="colord-gtk cd-convert">
@@ -221,5 +218,5 @@
           <para>
             contains the <application>Colord</application>
-            <application>GTK+</application> bindings
+            <application>GTK+</application> bindings.
           </para>
           <indexterm zone="colord-gtk libcolord-gtk">
@@ -234,5 +231,5 @@
           <para>
             contains the <application>Colord</application>
-            <application>GTK+-2</application> bindings
+            <application>GTK+-2</application> bindings.
           </para>
           <indexterm zone="colord-gtk libcolord-gtk2">
Index: x/lib/fltk.xml
===================================================================
--- x/lib/fltk.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/fltk.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,9 +6,9 @@
 
   <!-- Watch directory when updating -->
-  <!ENTITY fltk-download-http "https://fltk.org/pub/fltk/&fltk-version;/fltk-&fltk-version;-source.tar.gz">
+  <!ENTITY fltk-download-http "http://fltk.org/pub/fltk/1.3.5/fltk-&fltk-version;-source.tar.gz">
   <!ENTITY fltk-download-ftp  " ">
-  <!ENTITY fltk-md5sum        "8483e58b2312a348c0f66101eead1409">
+  <!ENTITY fltk-md5sum        "e85017defd5a03ae82e634311db87bbf">
   <!ENTITY fltk-size          "5.1 MB">
-  <!ENTITY fltk-buildsize     "119 MB (with documentation)">
+  <!ENTITY fltk-buildsize     "117 MB (with documentation)">
   <!ENTITY fltk-time          "0.2 SBU (Using parallelism=4)">
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -202,5 +203,5 @@
         <listitem>
           <para>
-            is a FLTK-based block elimination game
+            is a FLTK-based block elimination game.
           </para>
           <indexterm zone="fltk blocks">
@@ -214,5 +215,5 @@
         <listitem>
           <para>
-            is a FLTK-based version of the game of checkers
+            is a FLTK-based version of the game of checkers.
           </para>
           <indexterm zone="fltk checkers">
@@ -227,5 +228,5 @@
           <para>
             is a utility script that can be used to get information about the
-            current version  of  FLTK that is installed on the system
+            current version  of  FLTK that is installed on the system.
           </para>
           <indexterm zone="fltk fltk-config">
@@ -239,5 +240,5 @@
         <listitem>
           <para>
-            is an interactive GUI designer for FLTK
+            is an interactive GUI designer for FLTK.
           </para>
           <indexterm zone="fltk fluid">
@@ -251,5 +252,5 @@
         <listitem>
           <para>
-            is an implementation of the popular Sudoku game
+            is an implementation of the popular Sudoku game.
           </para>
           <indexterm zone="fltk sudoku">
@@ -264,5 +265,5 @@
           <para>
             contains functions that provide an API to implement graphical user
-            interfaces
+            interfaces.
           </para>
           <indexterm zone="fltk libfltk">
Index: x/lib/freeglut.xml
===================================================================
--- x/lib/freeglut.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/freeglut.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -187,5 +188,5 @@
           <para>
             contains functions that implement the OpenGL Utility
-            Toolkit
+            Toolkit.
           </para>
           <indexterm zone="freeglut libglut">
Index: x/lib/gdk-pixbuf-xlib.xml
===================================================================
--- x/lib/gdk-pixbuf-xlib.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/gdk-pixbuf-xlib.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,8 @@
   %general-entities;
 
-  <!ENTITY gdk-pixbuf-xlib-download-http
-           "&gnome-download-http;/gdk-pixbuf-xlib/2.40/gdk-pixbuf-xlib-&gdk-pixbuf-xlib-version;.tar.xz">
-  <!ENTITY gdk-pixbuf-xlib-download-ftp
-           "&gnome-download-ftp;/gdk-pixbuf-xlib/2.40/gdk-pixbuf-xlib-&gdk-pixbuf-xlib-version;.tar.xz">
-  <!ENTITY gdk-pixbuf-xlib-md5sum        "fbd57e867e039a8cf9164d145c0f0434">
-  <!ENTITY gdk-pixbuf-xlib-size          "53 KB">
+  <!ENTITY gdk-pixbuf-xlib-download-http "&sources-anduin-http;/gdk-pixbuf-xlib/gdk-pixbuf-xlib-3116b8ae.tar.xz">
+  <!ENTITY gdk-pixbuf-xlib-download-ftp  "&sources-anduin-ftp;/gdk-pixbuf-xlib/gdk-pixbuf-xlib-3116b8ae.tar.xz">
+  <!ENTITY gdk-pixbuf-xlib-md5sum        "c9a46e43baa132b3ecc0636a50689a80">
+  <!ENTITY gdk-pixbuf-xlib-size          "52 KB">
   <!ENTITY gdk-pixbuf-xlib-buildsize     "1.5 MB">
   <!ENTITY gdk-pixbuf-xlib-time          "less than 0.1 SBU">
@@ -19,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -157,5 +156,5 @@
         <listitem>
           <para>
-            provides a Xlib interface to gdk-pixbuf
+            provides a Xlib interface to gdk-pixbuf.
           </para>
           <indexterm zone="gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0">
@@ -166,4 +165,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: x/lib/gdk-pixbuf.xml
===================================================================
--- x/lib/gdk-pixbuf.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/gdk-pixbuf.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -9,8 +9,8 @@
   <!ENTITY gdk-pixbuf-download-ftp
            "&gnome-download-ftp;/gdk-pixbuf/2.42/gdk-pixbuf-&gdk-pixbuf-version;.tar.xz">
-  <!ENTITY gdk-pixbuf-md5sum        "7cd2fdaa3c55e2302316fe36968f7425">
-  <!ENTITY gdk-pixbuf-size          "7.4 MB">
-  <!ENTITY gdk-pixbuf-buildsize     "71 MB (with tests)">
-  <!ENTITY gdk-pixbuf-time          "0.2 SBU (Using parallelism=4; with tests)">
+  <!ENTITY gdk-pixbuf-md5sum        "7d7617db8dae8ce313160384ab0a71db">
+  <!ENTITY gdk-pixbuf-size          "6.2 MB">
+  <!ENTITY gdk-pixbuf-buildsize     "36 MB (with tests)">
+  <!ENTITY gdk-pixbuf-time          "less than 0.1 SBU (Using parallelism=4; with tests)">
 ]>
 
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -101,7 +102,5 @@
     <para role="optional">
        <!--<xref linkend="jasper"/> and-->
-  <!--<xref linkend="gtk-doc"/> and-->
-      <ulink url="https://gitlab.gnome.org/ebassi/gi-docgen">gi-docgen</ulink>
-      (to generate documentation)
+      <xref linkend="gtk-doc"/>
     </para>
 
@@ -122,5 +121,5 @@
 cd build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release --wrap-mode=nofallback .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -151,18 +150,9 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <!-- gi-docgen can get installed without this, if deps exist -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-wrap-nofallback.xml"/>
-
-    <!-- gtk_doc replaced by gi-docgen
     <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.
-      <!\-\- -Dgtk_doc is set to "yield=true" in meson_options.txt \-\->
-    </para>-->
+    </para>
 <!-- Removed in 2.42.0
     <para>
@@ -195,5 +185,4 @@
         <seg>
           /usr/{include,lib}/gdk-pixbuf-2.0,
-          /usr/libexec/installed-tests/gdk-pixbuf,
           /usr/share/installed-tests/gdk-pixbuf, 
           /usr/share/gtk-doc/html/gdk-pixbuf, and
@@ -213,5 +202,5 @@
           <para>
             is a small utility that generates C code containing images, used
-            for compiling images directly into programs
+            for compiling images directly into programs.
           </para>
           <indexterm zone="gdk-pixbuf gdk-pixbuf-csource">
@@ -225,5 +214,5 @@
         <listitem>
           <para>
-            is a tool used to convert GdkPixbuf to GdkPixdata
+            is a tool used to convert GdkPixbuf to GdkPixdata.
           </para>
           <indexterm zone="gdk-pixbuf gdk-pixbuf-pixdata">
@@ -239,5 +228,5 @@
             collects information about loadable modules for
             <application>Gdk Pixbuf</application> and writes it
-            to the default cache file location, or to stdout
+            to the default cache file location, or to stdout.
           </para>
           <indexterm zone="gdk-pixbuf gdk-pixbuf-query-loaders">
@@ -251,5 +240,5 @@
         <listitem>
           <para>
-            creates thumbnails of pictures for use in other applications
+            creates thumbnails of pictures for use in other applications.
           </para>
           <indexterm zone="gdk-pixbuf gdk-pixbuf-thumbnailer">
@@ -263,5 +252,5 @@
         <listitem>
           <para>
-            contains functions used to load and render images
+            contains functions used to load and render images.
           </para>
           <indexterm zone="gdk-pixbuf libgdk_pixbuf-2">
@@ -271,5 +260,4 @@
       </varlistentry>
 
-      <!-- Split off into gdk-pixbuf-xlib
       <varlistentry id="libgdk_pixbuf_xlib-2">
         <term><filename class="libraryfile">libgdk_pixbuf_xlib-2.0.so</filename></term>
@@ -277,5 +265,5 @@
           <para>
             contains functions used to manipulate images and interfaces with
-            <application>Xlib</application>
+            <application>Xlib</application>.
           </para>
           <indexterm zone="gdk-pixbuf libgdk_pixbuf_xlib-2">
@@ -284,5 +272,5 @@
         </listitem>
       </varlistentry>
-      -->
+
     </variablelist>
 
Index: x/lib/gdl.xml
===================================================================
--- x/lib/gdl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/gdl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY gdl-download-http "&gnome-download-http;/gdl/&gnome-minor-40;/gdl-&gdl-version;.tar.xz">
-  <!ENTITY gdl-download-ftp  "&gnome-download-ftp;/gdl/&gnome-minor-40;/gdl-&gdl-version;.tar.xz">
-  <!ENTITY gdl-md5sum        "21df1254b49b74a498feb99be57364d0">
-  <!ENTITY gdl-size          "524 KB">
-  <!ENTITY gdl-buildsize     "9.8 MB">
+  <!ENTITY gdl-download-http "&gnome-download-http;/gdl/&gnome-minor-34;/gdl-&gdl-version;.tar.xz">
+  <!ENTITY gdl-download-ftp  "&gnome-download-ftp;/gdl/&gnome-minor-34;/gdl-&gdl-version;.tar.xz">
+  <!ENTITY gdl-md5sum        "d624f2ca85555402828d5c4a98912b82">
+  <!ENTITY gdl-size          "520 KB">
+  <!ENTITY gdl-buildsize     "14 MB">
   <!ENTITY gdl-time          "0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -155,4 +156,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: x/lib/glew.xml
===================================================================
--- x/lib/glew.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/glew.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,8 +5,9 @@
   %general-entities;
 
-  <!ENTITY glew-download-http "https://downloads.sourceforge.net/glew/glew-&glew-version;.tgz">
+  <!ENTITY glew-download-http "https://downloads.sourceforge.net/glew/glew-&glew-version;.tgz
+">
   <!ENTITY glew-download-ftp  " ">
-  <!ENTITY glew-md5sum        "3579164bccaef09e36c0af7f4fd5c7c7">
-  <!ENTITY glew-size          "820 KB">
+  <!ENTITY glew-md5sum        "b2ab12331033ddfaa50dc39345343980">
+  <!ENTITY glew-size          "747 KB">
   <!ENTITY glew-buildsize     "16 MB">
   <!ENTITY glew-time          "less than 0.1 SBU">
@@ -17,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -33,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -139,11 +141,11 @@
       <seglistitem>
         <seg>
-          glewinfo and visualinfo
+          glewinfo, visualinfo.
         </seg>
         <seg>
-          libGLEW.so
+          libGLEW.so.
         </seg>
         <seg>
-          /usr/include/GL
+          /usr/include/GL.
         </seg>
       </seglistitem>
@@ -163,5 +165,5 @@
         <listitem>
           <para>
-            provides information about the supported extensions
+            provides information about the supported extensions.
           </para>
           <indexterm zone="glew glewinfo">
@@ -175,5 +177,5 @@
         <listitem>
           <para>
-            is an extended version of glxinfo
+            is an extended version of glxinfo.
           </para>
           <indexterm zone="glew visualinfo">
@@ -187,5 +189,5 @@
         <listitem>
           <para>
-            provides functions to access OpenGL extensions
+            provides functions to access OpenGL extensions.
           </para>
           <indexterm zone="glew libGLEW.so">
@@ -196,4 +198,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: x/lib/glu.xml
===================================================================
--- x/lib/glu.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/glu.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY glu-download-http " ">
   <!ENTITY glu-download-ftp  "ftp://ftp.freedesktop.org/pub/mesa/glu/glu-&glu-version;.tar.xz">
-  <!ENTITY glu-md5sum        "2b0f13fa5b949bfb3a995927c6e35125">
+  <!ENTITY glu-md5sum        "151aef599b8259efe9acd599c96ea2a3">
   <!ENTITY glu-size          "428 KB">
-  <!ENTITY glu-buildsize     "9.2 MB">
+  <!ENTITY glu-buildsize     "13 MB">
   <!ENTITY glu-time          "0.2 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -33,5 +34,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -90,9 +91,6 @@
     </para>
 
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson --prefix=$XORG_PREFIX -Dgl_provider=gl --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
+<screen><userinput>./configure --prefix=$XORG_PREFIX --disable-static &amp;&amp;
+make</userinput></screen>
 
     <para>
@@ -104,10 +102,8 @@
     </para>
 
-<screen role="root"><userinput>ninja install &amp;&amp;
-rm -vf /usr/lib/libGLU.a</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
 
-  <!--
   <sect2 role="commands">
     <title>Command Explanations</title>
@@ -117,5 +113,4 @@
 
   </sect2>
-  -->
 
   <sect2 role="content">
@@ -150,5 +145,5 @@
           <para>
             is the <application>Mesa</application> OpenGL
-            Utility library
+            Utility library.
           </para>
           <indexterm zone="glu libGLU">
Index: x/lib/goffice010.xml
===================================================================
--- x/lib/goffice010.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/goffice010.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -9,7 +9,7 @@
   <!ENTITY goffice010-download-ftp
             "&gnome-download-ftp;/goffice/0.10/goffice-&goffice010-version;.tar.xz">
-  <!ENTITY goffice010-md5sum        "3b9ec1e1cb59dfb9ff107acc3a8972fb">
+  <!ENTITY goffice010-md5sum        "34c5dcc651ce7003921170f6fa0696bd">
   <!ENTITY goffice010-size          "2.3 MB">
-  <!ENTITY goffice010-buildsize     "79 MB (with tests)">
+  <!ENTITY goffice010-buildsize     "102 MB (with tests)">
   <!ENTITY goffice010-time          "0.4 SBU (Using parallelism=4; with tests)">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -41,5 +42,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -188,5 +189,5 @@
           <para>
             contains API functions to provide support for document centric
-            objects and utilities
+            objects and utilities.
           </para>
           <indexterm zone="goffice010 libgoffice010">
Index: x/lib/graphene.xml
===================================================================
--- x/lib/graphene.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/graphene.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY graphene-download-http "https://github.com/ebassi/graphene/releases/download/&graphene-version;/graphene-&graphene-version;.tar.xz">
   <!ENTITY graphene-download-ftp  " ">
-  <!ENTITY graphene-md5sum        "390139e704772b915ff2b7cac56c24ae">
-  <!ENTITY graphene-size          "328 KB">
-  <!ENTITY graphene-buildsize     "16 MB">
+  <!ENTITY graphene-md5sum        "a2c26c4f44a02ca053e0e9afb63cc94c">
+  <!ENTITY graphene-size          "288 KB">
+  <!ENTITY graphene-buildsize     "15 MB">
   <!ENTITY graphene-time          "0.1 SBU">
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -95,5 +96,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -111,7 +112,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -155,5 +153,5 @@
           <para>
             contains functions that provide a thin layer of types for graphics
-            libraries
+            libraries.
           </para>
           <indexterm zone="graphene libgraphene">
@@ -164,4 +162,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: x/lib/gtk+2.xml
===================================================================
--- x/lib/gtk+2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/gtk+2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -284,8 +285,9 @@
           <para>
            converts glade files into XML files which can be loaded with
-           GtkBuilder
+           GtkBuilder.
           </para>
           <indexterm zone="gtk2 gtk-builder-convert">
-            <primary sortas="b-gtk-builder-convert">gtk-builder-convert</primary>
+            <primary
+            sortas="b-gtk-builder-convert">gtk-builder-convert</primary>
           </indexterm>
         </listitem>
@@ -297,8 +299,9 @@
           <para>
             demonstrates <application>GTK+ 2</application> functionality and
-            provides code for the examples
+            provides code for the examples.
           </para>
           <indexterm zone="gtk2 gtk-demo">
-            <primary sortas="b-gtk-demo">gtk-demo</primary>
+            <primary
+            sortas="b-gtk-demo">gtk-demo</primary>
           </indexterm>
         </listitem>
@@ -310,8 +313,9 @@
           <para>
             collects information about loadable input method modules for
-            <application>GTK+ 2</application> and writes it to standard output
+            <application>GTK+ 2</application> and writes it to standard output.
           </para>
           <indexterm zone="gtk2 gtk-query-immodules-2.0">
-            <primary sortas="b-gtk-query-immodules-2.0">gtk-query-immodules-2.0</primary>
+            <primary
+            sortas="b-gtk-query-immodules-2.0">gtk-query-immodules-2.0</primary>
           </indexterm>
         </listitem>
@@ -325,5 +329,5 @@
             <application>gtk+-2.24.24</application>, add the flag
             <quote>--include-image-data</quote> to this command, if you wish
-            previous behavior, with image data in the cache
+            previous behavior, with image data in the cache.
           </para>
           <indexterm zone="gtk2 gtk-update-icon-cache">
@@ -339,5 +343,5 @@
             contains functions that act as a wrapper around the low-level
             drawing and windowing functions provided by the underlying graphics
-            system
+            system.
           </para>
           <indexterm zone="gtk2 libgdk-x11-2">
@@ -352,5 +356,5 @@
           <para>
             contains functions that provide an API to implement graphical user
-            interfaces
+            interfaces.
           </para>
           <indexterm zone="gtk2 libgtk-x11-2">
Index: x/lib/gtk+3.xml
===================================================================
--- x/lib/gtk+3.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/gtk+3.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY gtk3-download-http "&gnome-download-http;/gtk+/&gnome-minor-24;/gtk+-&gtk3-version;.tar.xz">
   <!ENTITY gtk3-download-ftp  "&gnome-download-ftp;/gtk+/&gnome-minor-24;/gtk+-&gtk3-version;.tar.xz">
-  <!ENTITY gtk3-md5sum        "1cfb66b3460ae5a62f964a5cc14c66b6">
-  <!ENTITY gtk3-size          "21 MB">
-  <!ENTITY gtk3-buildsize     "584 MB (add 16 MB for tests)">
-  <!ENTITY gtk3-time          "2.1 SBU (using parallelism=4, add 1.2 SBU for tests)">
+  <!ENTITY gtk3-md5sum        "b34ca94542bf0bbb30f01a1d7453810d">
+  <!ENTITY gtk3-size          "20 MB">
+  <!ENTITY gtk3-buildsize     "480 MB (add 9 MB for tests)">
+  <!ENTITY gtk3-time          "1.8 SBU (using parallelism=4, add 1.7 SBU for tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -154,8 +155,6 @@
       [pierre Sep 5th, 2020]: not for me for version 3.24.23, but I have
       other failures: display, and subtests in defaultvalue, objects-finalize,
-      window, and gtk-reftest.
-      [bdubbs Mar 3rd, 2011 Just two tests fail now. -->
-      The accessibility-dump test has subtests that are known to fail.
-      The gtk-reftest suite has two tests that are known to fail as well.
+      window, and gtk-reftest.-->
+      Some tests or subtests fail.
     </para>
 
@@ -293,5 +292,5 @@
         url="https://developer.gnome.org/gtk3/stable/GtkSettings.html">Settings:
         GTK+ 3 Reference Manual</ulink>. There are many more themes available at
-        <ulink url="https://www.gnome-look.org/browse/"/> and other places.
+        <ulink url="http://gnome-look.org/"/> and other places.
       </para>
    
@@ -362,5 +361,5 @@
             provides support for displaying
             <application>GTK+ 3</application> applications in a web browser,
-            using HTML5 and web sockets
+            using HTML5 and web sockets.
           </para>
           <indexterm zone="gtk3 broadwayd">
@@ -387,5 +386,5 @@
         <listitem>
           <para>
-            is a simple <application>GTK+ 3</application> application
+            is a simple <application>GTK+ 3</application> application.
           </para>
           <indexterm zone="gtk3 gtk3-demo-application">
@@ -401,5 +400,5 @@
             is a utility to explore the icons in the current icon theme. It
             shows icons in various sizes, their symbolic variants where
-            available, as well as a description of the icon and its context
+            available, as well as a description of the icon and its context.
           </para>
           <indexterm zone="gtk3 gtk3-icon-browser">
@@ -413,5 +412,5 @@
         <listitem>
           <para>
-            is a program to view <application>GTK+ 3</application> themes and widgets
+            is a program to view <application>GTK+ 3</application> themes and widgets.
           </para>
           <indexterm zone="gtk3 gtk3-widget-factory">
@@ -425,5 +424,5 @@
         <listitem>
           <para>
-            performs various operations on GtkBuilder .ui files
+            can perform various operations on GtkBuilder .ui files.
           </para>
           <indexterm zone="gtk3 gtk-builder-tool">
@@ -437,7 +436,7 @@
         <listitem>
           <para>
-            converts symbolic SVG icons into specially prepared PNG files.
-            <application>GTK+ 3</application> can load and recolor these PNGs,
-            just like original SVGs, but loading them is much faster
+            converts symbolic svg icons into specially prepared png files.
+            <application>GTK+ 3</application> can load and recolor these pngs,
+            just like original svgs, but loading them is much faster.
           </para>
           <indexterm zone="gtk3 gtk-encode-symbolic-svg">
@@ -454,5 +453,5 @@
             the application desktop file name, as residing in
             <filename class="directory">/usr/share/applications</filename>, with
-            or without the '.desktop' suffix
+            or without the '.desktop' suffix.
           </para>
           <indexterm zone="gtk3 gtk-launch">
@@ -468,5 +467,5 @@
             collects information about loadable input method modules for
             <application>GTK+ 3</application> and writes it to the default cache
-            file location, or to standard output
+            file location, or to standard output.
           </para>
           <indexterm zone="gtk3 gtk-query-immodules-3.0">
@@ -494,5 +493,5 @@
           <para>
             is an icon theme caching utility that creates mmap()able cache files
-            for icon themes
+            for icon themes.
           </para>
           <indexterm zone="gtk3 gtk-update-icon-cache3">
@@ -508,5 +507,5 @@
             contains functions that implement the accessibility interfaces
             defined by the <application>GNOME</application> Accessibility
-            Toolkit
+            Toolkit.
           </para>
           <indexterm zone="gtk3 libgailutil-3">
@@ -522,5 +521,5 @@
             contains functions that act as a wrapper around the low-level
             drawing and windowing functions provided by the underlying graphics
-            system
+            system.
           </para>
           <indexterm zone="gtk3 libgdk-3">
@@ -535,5 +534,5 @@
           <para>
             contains functions that provide an API to implement graphical user
-            interfaces
+            interfaces.
           </para>
           <indexterm zone="gtk3 libgtk-3">
Index: x/lib/gtk-engines.xml
===================================================================
--- x/lib/gtk-engines.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/gtk-engines.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -177,5 +178,5 @@
         <listitem>
           <para>
-            are manager systems for specific themes
+            are manager systems for specific themes.
           </para>
         </listitem>
@@ -183,4 +184,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: x/lib/gtk-vnc.xml
===================================================================
--- x/lib/gtk-vnc.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/gtk-vnc.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY gtk-vnc-download-http "&gnome-download-http;/gtk-vnc/1.2/gtk-vnc-&gtk-vnc-version;.tar.xz">
-  <!ENTITY gtk-vnc-download-ftp  "&gnome-download-ftp;/gtk-vnc/1.2/gtk-vnc-&gtk-vnc-version;.tar.xz">
-  <!ENTITY gtk-vnc-md5sum        "37c36412593d73f6a090b4545d1b0364">
-  <!ENTITY gtk-vnc-size          "216 KB">
-  <!ENTITY gtk-vnc-buildsize     "4.6 MB">
-  <!ENTITY gtk-vnc-time          "0.1 SBU">
+  <!ENTITY gtk-vnc-download-http "&gnome-download-http;/gtk-vnc/1.0/gtk-vnc-&gtk-vnc-version;.tar.xz">
+  <!ENTITY gtk-vnc-download-ftp  "&gnome-download-ftp;/gtk-vnc/1.0/gtk-vnc-&gtk-vnc-version;.tar.xz">
+  <!ENTITY gtk-vnc-md5sum        "ff2e531525f6200be613643b9ee87fbf">
+  <!ENTITY gtk-vnc-size          "212 KB">
+  <!ENTITY gtk-vnc-buildsize     "8.6 MB">
+  <!ENTITY gtk-vnc-time          "0.2 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -110,5 +111,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -186,5 +187,5 @@
         <listitem>
           <para>
-            is used to capture image from VNC server
+            is used to capture image from VNC server.
           </para>
           <indexterm zone="gtk-vnc gvnccapture">
@@ -199,5 +200,5 @@
           <para>
             contains the <application>GTK+ 3</application> bindings for
-            <application>Gtk VNC</application>
+            <application>Gtk VNC</application>.
           </para>
           <indexterm zone="gtk-vnc libgtk-vnc-2">
@@ -211,5 +212,5 @@
         <listitem>
           <para>
-            contains the GObject bindings for <application>Gtk VNC</application>
+            contains the GObject bindings for <application>Gtk VNC</application>.
           </para>
           <indexterm zone="gtk-vnc libgvnc-1a">
@@ -224,5 +225,5 @@
           <para>
             is the <application>PulseAudio</application> bridge for
-            <application>Gtk VNC</application>
+            <application>Gtk VNC</application>.
           </para>
           <indexterm zone="gtk-vnc libgvncpulse-1">
Index: lib/gtk4.xml
===================================================================
--- x/lib/gtk4.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,450 +1,0 @@
-<?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 gtk4-download-http "&gnome-download-http;/gtk/4.4/gtk-&gtk4-version;.tar.xz">
-  <!ENTITY gtk4-download-ftp  "&gnome-download-ftp;/gtk/4.4/gtk-&gtk4-version;.tar.xz">
-  <!ENTITY gtk4-md5sum        "113d24bd311037f774bf1aa7d5d0a344">
-  <!ENTITY gtk4-size          "29 MB">
-  <!ENTITY gtk4-buildsize     "670 MB (76 MB installed, add 10 MB for tests)">
-  <!ENTITY gtk4-time          "1.1 SBU (using parallelism=4, add 0.5 SBU for tests)">
-]>
-
-<sect1 id="gtk4" xreflabel="GTK-&gtk4-version;">
-  <?dbhtml filename="gtk4.html"?>
-
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>GTK-&gtk4-version;</title>
-
-  <indexterm zone="gtk4">
-    <primary sortas="a-gtk4">GTK-4</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GTK 4</title>
-
-    <para>
-      The <application>GTK 4</application> package contains libraries used for
-      creating graphical user interfaces for applications.
-    </para>
-
-    &lfs110a_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtk4-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtk4-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtk4-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtk4-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtk4-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtk4-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GTK 4 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="fribidi"/>,
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="graphene"/>,
-      <xref linkend="iso-codes"/>,
-      <xref linkend="libepoxy"/>,
-      <xref linkend="libxkbcommon"/>,
-      <xref linkend="pango"/>,
-      <xref linkend="wayland-protocols"/>,
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="adwaita-icon-theme"/> (default for some gtk4 settings keys),
-      <xref linkend="ffmpeg"/>,
-      <xref linkend="gst10-plugins-bad"/>,
-      <xref linkend="hicolor-icon-theme"/> (needed for tests and for defaults), and
-      <xref linkend="librsvg"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (Required if building GNOME)</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="colord"/>,
-      <xref linkend="cups"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref role="runtime" linkend="highlight"/>
-        (runtime, only used by <command>gtk4-demo</command> for syntax
-        highlighting of demo source code),
-      <xref linkend="json-glib"/>,
-      <xref linkend="rest"/>,
-      <xref linkend="sassc"/>,
-      <xref linkend="tracker3"/>,
-      <ulink url="https://gitlab.gnome.org/ebassi/gi-docgen">gi-docgen</ulink>,
-      <ulink url="https://gitlab.gnome.org/World/libcloudproviders">libcloudproviders</ulink>, and
-      <ulink url="https://vulkan.lunarg.com/sdk/home">vulkan</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gtk4"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GTK 4</title>
-
-    <para>
-      Install <application>GTK 4</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson --prefix=/usr --buildtype=release -Dbroadway-backend=true .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To run the tests, issue: <command>meson test --setup x11</command>. If you
-      are in a Wayland session, replace x11 with wayland. 8 tests are known to
-      fail, out of 730.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dbroadway-backend=true</parameter>: This switch enables the
-      HTML5 GDK backend.
-    </para>
-
-    <para>
-      <option>-Dcloudproviders=enabled</option>: Use this switch if you have
-      <ulink url="https://gitlab.gnome.org/World/libcloudproviders">libcloudproviders</ulink>
-      installed and wish to enable support for cloud providers in a file
-      chooser window.
-    </para>
-
-    <para>
-      <option>-Dsysprof=enabled</option>: Use this switch if you have
-      <xref linkend="sysprof"/> installed and wish to enable tracing support for
-      GTK4-based applications.
-    </para>
-
-    <para>
-      <option>-Dtracker=enabled</option>: Use this switch if you have
-      <xref linkend="tracker3"/> installed and wish to use search functionality
-      when running a file chooser.
-    </para>
-
-    <para>
-      <option>-Dcolord=enabled</option>: Use this switch if you have
-      <xref linkend="colord"/> installed and wish to use colord with the CUPS
-      printing backend.
-    </para>
-
-    <para>
-      <option>-Dgtk_doc=true</option>: Use this switch if you have
-      <xref linkend="gtk-doc"/> installed and wish to generate the API
-      reference documentation.
-    </para>
-
-  </sect2>
-
-  <!--Optional section-->
-  <sect2 role="configuration">
-    <title>Configuring GTK 4</title>
-
-    <sect3 id="gtk4-config">
-      <title>Config Files</title>
-      <para>
-        <filename>~/.config/gtk-4.0/settings.ini</filename> and
-        <filename>/usr/share/gtk-4.0/settings.ini</filename>
-      </para>
-
-      <indexterm zone="gtk4 gtk4-config">
-        <primary sortas="e-AA.home-gtk4-settings.ini">~/.config/gtk-4.0/settings.ini</primary>
-      </indexterm>
-
-      <indexterm zone="gtk4 gtk4-config">
-        <primary
-        sortas="e-usr-share-path-settings.ini">/usr/share/gtk-4.0/settings.ini</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        <application>GTK 4</application> themes change the way a
-        <application>GTK 4</application> application looks. An icon theme can
-        be used to change the icons that appear on the application's toolbar.
-        If you have installed a <application>GTK 4</application> theme (e.g.
-        the Adwaita theme built in <application>GTK 4</application>),
-        an icon theme (such as <xref linkend="oxygen-icons5"/>) and/or a font
-        (<xref linkend="dejavu-fonts"/>), you can set your preferences in
-        <filename>~/.config/gtk-4.0/settings.ini</filename>, or the default
-        system-wide configuration file (as the
-        <systemitem class="username">root</systemitem> user), in 
-        <filename>/usr/share/gtk-4.0/settings.ini</filename>. For the local
-        user, an example is:
-      </para>
-
-<screen><userinput>mkdir -pv ~/.config/gtk-4.0
-cat &gt; ~/.config/gtk-4.0/settings.ini &lt;&lt; "EOF"
-<literal>[Settings]
-gtk-theme-name = <replaceable>Adwaita</replaceable>
-gtk-icon-theme-name = <replaceable>oxygen</replaceable>
-gtk-font-name = <replaceable>DejaVu Sans 12</replaceable>
-gtk-cutsor-theme-size = <replaceable>18</replaceable>
-gtk-xft-antialias = <replaceable>1</replaceable>
-gtk-xft-hinting = <replaceable>1</replaceable>
-gtk-xft-hintstyle = <replaceable>hintslight</replaceable>
-gtk-xft-rgba = <replaceable>rgb</replaceable>
-gtk-cursor-theme-name = <replaceable>Adwaita</replaceable></literal>
-EOF</userinput></screen>
-
-       <para>
-         There are many settings keys, some with default values. You can find
-         them at <ulink 
-         url="https://developer.gnome.org/gtk4/stable/GtkSettings.html">Settings:
-         GTK 4 Reference Manual</ulink>.
-       </para>
-
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gtk4-broadwayd,
-          gtk4-builder-tool,
-          gtk4-demo,
-          gtk4-demo-application,
-          gtk4-encode-symbolic-svg,
-          gtk4-icon-browser,
-          gtk4-launch,
-          gtk4-print-editor,
-          gtk4-query-settings,
-          gtk4-update-icon-cache, and
-          gtk4-widget-factory
-        </seg>
-        <seg>
-          libgtk-4.so
-        </seg>
-        <seg>
-          /usr/include/gtk-4.0,
-          /usr/lib/gtk-4.0, and
-          /usr/share/gtk-4.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gtk4-broadwayd">
-        <term><command>gtk4-broadwayd</command></term>
-        <listitem>
-          <para>
-            provides support for displaying GTK 4 applications in a web
-            browser using HTML5 and web sockets
-          </para>
-          <indexterm zone="gtk4 gtk4-broadwayd">
-            <primary sortas="b-gtk4-broadwayd">gtk4-broadwayd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk4-builder-tool">
-        <term><command>gtk4-builder-tool</command></term>
-        <listitem>
-          <para>
-            performs various operations on GtkBuilder .ui files
-          </para>
-          <indexterm zone="gtk4 gtk4-builder-tool">
-            <primary sortas="b-gtk4-builder-tool">gtk4-builder-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk4-demo">
-        <term><command>gtk4-demo</command></term>
-        <listitem>
-          <para>
-            is a simple program that demonstrates some of the tasks that can be
-            done with GTK 4
-          </para>
-          <indexterm zone="gtk4 gtk4-demo">
-            <primary sortas="b-gtk4-demo">gtk4-demo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk4-demo-application">
-        <term><command>gtk4-demo-application</command></term>
-        <listitem>
-          <para>
-            is a simple GTK 4 application which is useful for testing
-          </para>
-          <indexterm zone="gtk4 gtk4-demo-application">
-            <primary sortas="b-gtk4-demo-application">gtk4-demo-application</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk4-encode-symbolic-svg">
-        <term><command>gtk4-encode-symbolic-svg</command></term>
-        <listitem>
-          <para>
-            converts symbolic SVG icons into special PNG files. GTK 4 can load
-            and recolor these PNGs, just like original SVGs, but loading them
-            is much faster
-          </para>
-          <indexterm zone="gtk4 gtk4-encode-symbolic-svg">
-            <primary sortas="b-gtk4-encode-symbolic-svg">gtk4-encode-symbolic-svg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk4-icon-browser">
-        <term><command>gtk4-icon-browser</command></term>
-        <listitem>
-          <para>
-            is a utility to explore the icons in the current icon theme. It
-            shows icons in various sizes, their symbolic variants when
-            available, as well as a description of the icon and its context
-          </para>
-          <indexterm zone="gtk4 gtk4-icon-browser">
-            <primary sortas="b-gtk4-icon-browser">gtk4-icon-browser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk4-launch">
-        <term><command>gtk4-launch</command></term>
-        <listitem>
-          <para>
-            launches an application using the given name. The name should match
-            the application .desktop file name (as seen in
-            <filename class="directory">/usr/share/applications</filename>),
-            with or without the '.desktop' extension
-          </para>
-          <indexterm zone="gtk4 gtk-launch">
-            <primary sortas="b-gtk4-launch">gtk4-launch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk4-print-editor">
-        <term><command>gtk4-print-editor</command></term>
-        <listitem>
-          <para>
-            is a simple program to demonstrate printing using GTK 4
-            applications
-          </para>
-          <indexterm zone="gtk4 gtk4-print-editor">
-            <primary sortas="b-gtk4-print-editor">gtk4-print-editor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk4-query-settings">
-        <term><command>gtk4-query-settings</command></term>
-        <listitem>
-          <para>
-            provides a complete listing of all settings related to GTK 4
-          </para>
-          <indexterm zone="gtk4 gtk4-query-settings">
-            <primary sortas="b-gtk4-query-settings">gtk4-query-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk4-update-icon-cache">
-        <term><command>gtk4-update-icon-cache</command></term>
-        <listitem>
-          <para>
-            is an icon theme caching utility that creates mmap()able cache
-            files for icon themes
-          </para>
-          <indexterm zone="gtk4 gtk4-update-icon-cache">
-            <primary sortas="b-gtk4-update-icon-cache">gtk4-update-icon-cache</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk4-widget-factory">
-        <term><command>gtk4-widget-factory</command></term>
-        <listitem>
-          <para>
-            is a program to view GTK 4 themes and widgets
-          </para>
-          <indexterm zone="gtk4 gtk4-widget-factory">
-            <primary sortas="b-gtk4-widget-factory">gtk4-widget-factory</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgtk-4">
-        <term><filename class="libraryfile">libgtk-4.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide an API to implement graphical user
-            interfaces
-          </para>
-          <indexterm zone="gtk4 libgtk-4">
-            <primary sortas="c-libgtk-4">libgtk-4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: x/lib/gtkmm2.xml
===================================================================
--- x/lib/gtkmm2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/gtkmm2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -115,4 +116,19 @@
   </sect2>
 
+<!-- as of 2.24.5, this is no longer needed. -renodr
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>CXXFLAGS="-g -O2 -std=c++11" ./configure...</command>: while
+      Gtkmm-&gtkmm2-version; has not yet been ported to the 2011 ISO C++
+      standard, all its dependencies have. <command>-std=c++11</command> has
+      to be used as an option to <command>g++</command>. We pass it into
+      <envar>CXXFLAGS</envar> together with the default options.
+    </para>
+
+  </sect2>
+-->
+
   <sect2 role="content">
     <title>Contents</title>
@@ -149,5 +165,5 @@
         <listitem>
         <para>
-          contains the GDK API classes
+          contains the GDK API classes.
         </para>
           <indexterm zone="gtkmm2 libgdkmm-2">
@@ -161,5 +177,5 @@
         <listitem>
         <para>
-          contains the <application>GTK+</application> API classes
+          contains the <application>GTK+</application> API classes.
         </para>
           <indexterm zone="gtkmm2 libgtkmm-2">
Index: x/lib/gtkmm3.xml
===================================================================
--- x/lib/gtkmm3.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/gtkmm3.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY gtkmm3-download-http "&gnome-download-http;/gtkmm/&gnome-minor-24;/gtkmm-&gtkmm3-version;.tar.xz">
   <!ENTITY gtkmm3-download-ftp  "&gnome-download-ftp;/gtkmm/&gnome-minor-24;/gtkmm-&gtkmm3-version;.tar.xz">
-  <!ENTITY gtkmm3-md5sum        "27af20542aaeb8a31a2ebaa267244bdb">
+  <!ENTITY gtkmm3-md5sum        "9a9a00bcd634e3eca0b101809f2eae02">
   <!ENTITY gtkmm3-size          "13 MB">
-  <!ENTITY gtkmm3-buildsize     "230 MB (with tests)">
-  <!ENTITY gtkmm3-time          "1.0 SBU (Using parallelism=4; with tests)">
+  <!ENTITY gtkmm3-buildsize     "373 MB (with tests)">
+  <!ENTITY gtkmm3-time          "0.9 SBU (Using parallelism=4; with tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -100,5 +101,7 @@
 cd    gtkmm3-build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr \
+      ..           &amp;&amp;
+
 ninja</userinput></screen>
 
@@ -123,5 +126,5 @@
     </para>
 
-<screen role="nodump"><userinput>mv -v /usr/share/doc/gtkmm-3.0 /usr/share/doc/gtkmm-&gtkmm3-version;</userinput></screen>
+<screen role="nodump">mv -v /usr/share/doc/gtkmm-3.0 /usr/share/doc/gtkmm-&gtkmm3-version;</screen>
 
   </sect2>
@@ -172,5 +175,5 @@
         <listitem>
         <para>
-          contains the GDK API classes
+          contains the GDK API classes.
         </para>
           <indexterm zone="gtkmm3 libgdkmm-3">
@@ -184,5 +187,5 @@
         <listitem>
         <para>
-          contains the <application>GTK+ 3</application> API classes
+          contains the <application>GTK+ 3</application> API classes.
         </para>
           <indexterm zone="gtkmm3 libgtkmm-3">
Index: x/lib/gtksourceview.xml
===================================================================
--- x/lib/gtksourceview.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/gtksourceview.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -92,5 +93,5 @@
       <xref linkend="itstool"/>,
       <xref linkend="fop"/> (or
-      <ulink url="https://sourceforge.net/projects/dblatex/">dblatex</ulink>),
+      <ulink url="http://sourceforge.net/projects/dblatex/">dblatex</ulink>),
       and
       <ulink url="http://glade.gnome.org/">Glade</ulink>
@@ -165,5 +166,5 @@
         <listitem>
           <para>
-            contains function extensions for the GtkTextView widget
+            contains function extensions for the GtkTextView widget.
           </para>
           <indexterm zone="gtksourceview libgtksourceview-3">
Index: x/lib/gtksourceview4.xml
===================================================================
--- x/lib/gtksourceview4.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/gtksourceview4.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -9,7 +9,7 @@
   <!ENTITY gtksourceview4-download-ftp
     "&gnome-download-ftp;/gtksourceview/4.8/gtksourceview-&gtksourceview4-version;.tar.xz">
-  <!ENTITY gtksourceview4-md5sum        "d10c624feb48412542f9e3447e75d6bc">
+  <!ENTITY gtksourceview4-md5sum        "5d4e599c298251691ca0fb5cb08130f0">
   <!ENTITY gtksourceview4-size          "1.1 MB">
-  <!ENTITY gtksourceview4-buildsize     "63 MB (with tests)">
+  <!ENTITY gtksourceview4-buildsize     "80 MB (with tests)">
   <!ENTITY gtksourceview4-time          "0.1 SBU (with tests; both using parallelism=4)">
 ]>
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -73,14 +74,4 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/gtksourceview4-&gtksourceview4-version;-buildfix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">GtkSourceView Dependencies</bridgehead>
 
@@ -103,5 +94,5 @@
       <xref linkend="itstool"/>,
       <xref linkend="fop"/> (or
-      <ulink url="https://sourceforge.net/projects/dblatex/">dblatex</ulink>),
+      <ulink url="http://sourceforge.net/projects/dblatex/">dblatex</ulink>),
       and
       <ulink url="http://glade.gnome.org/">Glade</ulink>
@@ -117,10 +108,4 @@
 
     <para>
-      First, apply a patch to prevent a race condition:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../gtksourceview4-&gtksourceview4-version;-buildfix-1.patch</userinput></screen>
-
-    <para>
       Install <application>GtkSourceView</application> by running the
       following commands:
@@ -130,5 +115,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -187,5 +172,5 @@
         <listitem>
           <para>
-            contains function extensions for the GtkTextView widget
+            contains function extensions for the GtkTextView widget.
           </para>
           <indexterm zone="gtksourceview4 libgtksourceview-4">
Index: lib/gtksourceview5.xml
===================================================================
--- x/lib/gtksourceview5.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,181 +1,0 @@
-<?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 gtksourceview5-download-http "&gnome-download-http;/gtksourceview/5.0/gtksourceview-&gtksourceview5-version;.tar.xz">
-  <!ENTITY gtksourceview5-download-ftp  "&gnome-download-ftp;/gtksourceview/5.0/gtksourceview-&gtksourceview5-version;.tar.xz">
-  <!ENTITY gtksourceview5-md5sum        "5e2241325697706341b5f6e6edba617e">
-  <!ENTITY gtksourceview5-size          "1.1 MB">
-  <!ENTITY gtksourceview5-buildsize     "31 MB">
-  <!ENTITY gtksourceview5-time          "0.2 SBU">
-]>
-
-<sect1 id="gtksourceview5" xreflabel="gtksourceview5-&gtksourceview5-version;">
-  <?dbhtml filename="gtksourceview5.html"?>
-
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>gtksourceview5-&gtksourceview5-version;</title>
-
-  <indexterm zone="gtksourceview5">
-    <primary sortas="a-gtksourceview5">gtksourceview5</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GtkSourceView</title>
-
-    <para>
-      The <application>GtkSourceView</application> package contains
-      a library used for extending the <application>GTK</application>
-      text functions to include syntax highlighting.
-    </para>
-
-    &lfs110a_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtksourceview5-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtksourceview5-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtksourceview5-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtksourceview5-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtksourceview5-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtksourceview5-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GtkSourceView Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk4"/> and
-      <xref linkend="pcre2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="sysprof"/>,
-      <xref linkend="vala"/>, and
-      <xref linkend="valgrind"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gtksourceview5"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GtkSourceView</title>
-
-    <para>
-      Install <application>GtkSourceView</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
-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>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-Dgtk_doc=true</option>: Use this switch if you have
-      <xref linkend="gtk-doc"/> installed and wish to generate the API
-      documentation.
-    </para>
-    
-    <para>
-      <option>-Dsysprof=true</option>: Use this switch if you have
-      <xref linkend="sysprof"/> installed and wish to build with sysprof
-      profiler support.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgtksourceview-5.so
-        </seg>
-        <seg>
-          /usr/include/gtksourceview-5 and
-          /usr/share/gtksourceview-5
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgtksourceview-5">
-        <term><filename class="libraryfile">libgtksourceview-5.so</filename></term>
-        <listitem>
-          <para>
-            contains function extensions for the GtkTextView widget
-          </para>
-          <indexterm zone="gtksourceview5 libgtksourceview-5">
-            <primary sortas="c-libgtksourceview-5">libgtksourceview-5.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: x/lib/imlib2.xml
===================================================================
--- x/lib/imlib2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/imlib2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY imlib2-download-http "&sourceforge-dl;/enlightenment/imlib2-&imlib2-version;.tar.bz2">
   <!ENTITY imlib2-download-ftp  " ">
-  <!ENTITY imlib2-md5sum        "d24dc90ac08810d0a66bcd226e35a451">
+  <!ENTITY imlib2-md5sum        "98569de9b10bcb6fd5d13e4d331ddd81">
   <!ENTITY imlib2-size          "876 KB">
-  <!ENTITY imlib2-buildsize     "11 MB">
+  <!ENTITY imlib2-buildsize     "12 MB">
   <!ENTITY imlib2-time          "0.2 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -75,9 +76,4 @@
     <para role="required">
       <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="giflib"/>
     </para>
 
@@ -86,6 +82,7 @@
       <xref linkend="libpng"/>,
       <xref linkend="libjpeg"/>,
-      <xref linkend="libtiff"/>, and
-      <ulink url="https://sourceforge.net/projects/mad">libid3tag</ulink>
+      <xref linkend="libtiff"/>,
+      <xref linkend="giflib"/>, and
+      <ulink url="http://sourceforge.net/projects/mad">libid3tag</ulink>
     </para>
 
@@ -154,5 +151,5 @@
         <listitem>
           <para>
-            is to test the <application>imlib2</application> bumpmap function
+            is to test the <application>imlib2</application> bumpmap function.
           </para>
           <indexterm zone="imlib2 imlib2_bumpmap">
@@ -167,5 +164,5 @@
           <para>
             is to test the <application>imlib2</application> colorspace
-            function
+            function.
           </para>
           <indexterm zone="imlib2 imlib2_colorspace">
@@ -180,5 +177,5 @@
           <para>
             is a script used to obtain <application>imlib2</application>
-            building informations
+            building informations.
           </para>
           <indexterm zone="imlib2 imlib2-config">
@@ -192,5 +189,5 @@
         <listitem>
           <para>
-            is to test the <application>imlib2</application> poly function
+            is to test the <application>imlib2</application> poly function.
           </para>
           <indexterm zone="imlib2 imlib2_poly">
@@ -204,5 +201,5 @@
         <listitem>
           <para>
-            converts images between formats
+            converts images between formats.
           </para>
           <indexterm zone="imlib2 imlib2_conv">
@@ -216,5 +213,5 @@
         <listitem>
           <para>
-            takes screenshots
+            take screenshots.
           </para>
           <indexterm zone="imlib2 imlib2_grab">
@@ -228,5 +225,5 @@
         <listitem>
           <para>
-            is an <application>imlib2</application> program test
+            is an <application>imlib2</application> program test.
           </para>
           <indexterm zone="imlib2 imlib2_show">
@@ -240,5 +237,5 @@
         <listitem>
           <para>
-            is an <application>imlib2</application> program test
+            is an <application>imlib2</application> program test.
           </para>
           <indexterm zone="imlib2 imlib2_test">
@@ -252,5 +249,5 @@
         <listitem>
           <para>
-            diplays images files
+            diplays images files.
           </para>
           <indexterm zone="imlib2 imlib2_view">
@@ -261,9 +258,9 @@
 
       <varlistentry id="libImlib2">
-        <term><filename class="libraryfile">libImlib2.so</filename></term>
-        <listitem>
-          <para>
-            provides the functions for programs to handle various
-            image data formats
+        <term><filename class='libraryfile'>libImlib2.so</filename></term>
+        <listitem>
+          <para>
+            provides the functions for programs to deal with various
+            image data formats.
           </para>
           <indexterm zone="imlib2 libImlib2">
Index: x/lib/keybinder2.xml
===================================================================
--- x/lib/keybinder2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/keybinder2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -167,5 +168,5 @@
           <para>
             is the library that registers global <application>X</application>
-            keyboard shortcuts
+            keyboard shortcuts.
           </para>
           <indexterm zone="keybinder2 keybinder2-lib">
Index: x/lib/keybinder3.xml
===================================================================
--- x/lib/keybinder3.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/keybinder3.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -157,5 +158,5 @@
           <para>
             is the library that registers global <application>X</application>
-            keyboard shortcuts
+            keyboard shortcuts.
           </para>
           <indexterm zone="keybinder3 keybinder3-lib">
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/lib.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="x-lib">
@@ -46,5 +51,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk+2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk+3.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-engines.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkmm2.xml"/>
@@ -53,5 +57,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtksourceview.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtksourceview4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtksourceview5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imlib2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="keybinder2.xml"/>
Index: x/lib/libdazzle.xml
===================================================================
--- x/lib/libdazzle.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/libdazzle.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,7 +5,7 @@
   %general-entities;
 
-  <!ENTITY libdazzle-download-http "&gnome-download-http;/libdazzle/&gnome-minor-40;/libdazzle-&libdazzle-version;.tar.xz">
-  <!ENTITY libdazzle-download-ftp  "&gnome-download-ftp;/libdazzle/&gnome-minor-40;/libdazzle-&libdazzle-version;.tar.xz">
-  <!ENTITY libdazzle-md5sum        "14381d1c64f14655da61c6094356d1d9">
+  <!ENTITY libdazzle-download-http "&gnome-download-http;/libdazzle/&gnome-minor-38;/libdazzle-&libdazzle-version;.tar.xz">
+  <!ENTITY libdazzle-download-ftp  "&gnome-download-ftp;/libdazzle/&gnome-minor-38;/libdazzle-&libdazzle-version;.tar.xz">
+  <!ENTITY libdazzle-md5sum        "7dee045bef026ff26af9b16f8252936b">
   <!ENTITY libdazzle-size          "440 KB">
   <!ENTITY libdazzle-buildsize     "42 MB (with tests)">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -98,5 +99,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -111,11 +112,4 @@
 
 <screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
   </sect2>
 
@@ -150,5 +144,5 @@
         <listitem>
           <para>
-            lists counters that are in use by a process
+            lists counters that are in use by a process.
           </para>
           <indexterm zone="libdazzle dazzle-list-counters">
@@ -171,4 +165,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: x/lib/libdrm.xml
===================================================================
--- x/lib/libdrm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/libdrm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY libdrm-download-http "https://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.xz">
   <!ENTITY libdrm-download-ftp  " ">
-  <!ENTITY libdrm-md5sum        "252175d363e3dbc4ffe32faaa8e93494">
-  <!ENTITY libdrm-size          "415 KB">
-  <!ENTITY libdrm-buildsize     "10 MB (with tests)">
-  <!ENTITY libdrm-time          "less than 0.1 SBU (with tests)">
+  <!ENTITY libdrm-md5sum        "002e4e06e7f23fadc2ec6dbd03f3d1ee">
+  <!ENTITY libdrm-size          "404 KB">
+  <!ENTITY libdrm-buildsize     "12 MB (with tests)">
+  <!ENTITY libdrm-time          "0.1 SBU (with tests)">
   <!-- With version 2.4.102, the tests add 1 second to my build. -->
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -86,6 +87,5 @@
       <xref linkend="cmake"/> (could be used to find dependencies without pkgconfig files),
       <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>,
-      <xref linkend="docutils"/>, and
+      <xref linkend="docbook-xsl"/> and
       <xref linkend="libxslt"/> (to build manual pages),
       <xref linkend="libatomic_ops"/> (required by architectures without native atomic operations),
@@ -110,8 +110,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=$XORG_PREFIX \
-      --buildtype=release   \
-      -Dudev=true           \
-      -Dvalgrind=false      &amp;&amp;
+meson --prefix=$XORG_PREFIX -Dudev=true &amp;&amp;
 ninja</userinput></screen>
 
@@ -143,17 +140,7 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
     <para>
       <parameter>-Dudev=true</parameter>: This parameter enables support for using
       <application>Udev</application> instead of <command>mknod</command>.
-    </para>
-
-    <para>
-      <parameter>-Dvalgrind=false</parameter>: This parameter disables building
-      libdrm with valgrind support. This fixes building sysprof and other
-      packages that use libdrm. Change this parameter to "true" if you need
-      support for valgrind.
     </para>
 
@@ -191,5 +178,5 @@
         <listitem>
           <para>
-            contains the AMDGPU specific Direct Rendering Manager functions
+            contains the AMDGPU specific Direct Rendering Manager functions.
           </para>
           <indexterm zone="libdrm libdrm_amdgpu">
@@ -204,5 +191,5 @@
           <para>
             contains the Intel specific Direct Rendering Manager
-            functions
+            functions.
           </para>
           <indexterm zone="libdrm libdrm_intel">
@@ -217,5 +204,5 @@
           <para>
             contains the open source nVidia (Nouveau) specific Direct
-            Rendering Manager functions
+            Rendering Manager functions.
           </para>
           <indexterm zone="libdrm libdrm_nouveau">
@@ -230,5 +217,5 @@
           <para>
             contains the AMD Radeon specific Direct Rendering Manager
-            functions
+            functions.
           </para>
           <indexterm zone="libdrm libdrm_radeon">
@@ -242,5 +229,5 @@
         <listitem>
           <para>
-            contains the Direct Rendering Manager API functions
+            contains the Direct Rendering Manager API functions.
           </para>
           <indexterm zone="libdrm libdrm-lib">
@@ -254,5 +241,5 @@
         <listitem>
           <para>
-            contains API functions for kernel mode setting abstraction
+            contains API functions for kernel mode setting abstraction.
           </para>
           <indexterm zone="libdrm libkms">
Index: x/lib/libepoxy.xml
===================================================================
--- x/lib/libepoxy.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/libepoxy.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY libepoxy-download-http "https://github.com/anholt/libepoxy/releases/download/&libepoxy-version;/libepoxy-&libepoxy-version;.tar.xz">
   <!ENTITY libepoxy-download-ftp  " ">
-  <!ENTITY libepoxy-md5sum        "ecd74bc119637f5aac8e2cf6ee8c3899">
+  <!ENTITY libepoxy-md5sum        "516ff05a42157c86e32c6598321737af">
   <!ENTITY libepoxy-size          "220 KB">
-  <!ENTITY libepoxy-buildsize     "17 MB (with tests)">
+  <!ENTITY libepoxy-buildsize     "20 MB (with tests)">
   <!ENTITY libepoxy-time          "0.1 SBU (with tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -98,5 +99,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -115,7 +116,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -158,5 +156,5 @@
           <para>
             contains API functions for handling OpenGL function
-            pointer management
+            pointer management.
           </para>
           <indexterm zone="libepoxy libepoxy-lib">
Index: x/lib/libglade.xml
===================================================================
--- x/lib/libglade.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/libglade.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -161,5 +162,5 @@
           <para>
             is used to convert old Glade interface files to
-            Glade-2.0 standards
+            Glade-2.0 standards.
           </para>
           <indexterm zone="libglade libglade-convert">
@@ -170,8 +171,8 @@
 
       <varlistentry id="libglade-lib">
-        <term><filename class="libraryfile">libglade-2.0.so</filename></term>
+        <term><filename class='libraryfile'>libglade-2.0.so</filename></term>
         <listitem>
           <para>
-            contains the functions necessary to load Glade interface files
+            contains the functions necessary to load Glade interface files.
           </para>
           <indexterm zone="libglade libglade-lib">
Index: x/lib/libhandy1.xml
===================================================================
--- x/lib/libhandy1.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/libhandy1.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY libhandy1-download-http "&gnome-download-http;/libhandy/1.2/libhandy-&libhandy1-version;.tar.xz">
-  <!ENTITY libhandy1-download-ftp  "&gnome-download-ftp;/libhandy/1.2/libhandy-&libhandy1-version;.tar.xz">
-  <!ENTITY libhandy1-md5sum        "f468e27518d393961e3fa8803d4550d5">
-  <!ENTITY libhandy1-size          "480 KB">
-  <!ENTITY libhandy1-buildsize     "26 MB (with tests)">
-  <!ENTITY libhandy1-time          "0.4 SBU (with tests)">
+  <!ENTITY libhandy1-download-http "&gnome-download-http;/libhandy/1.0/libhandy-&libhandy1-version;.tar.xz">
+  <!ENTITY libhandy1-download-ftp  "&gnome-download-ftp;/libhandy/1.0/libhandy-&libhandy1-version;.tar.xz">
+  <!ENTITY libhandy1-md5sum        "b2a93c1344f4c78afc0e8a84a6642cf3">
+  <!ENTITY libhandy1-size          "380 KB">
+  <!ENTITY libhandy1-buildsize     "16 MB (with tests)">
+  <!ENTITY libhandy1-time          "0.2 SBU (with tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -104,5 +105,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -121,7 +122,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -163,5 +161,5 @@
           <para>
             provides an example of how to use the
-            <application>libhandy</application> library
+            <application>libhandy</application> library.
           </para>
           <indexterm zone="libhandy1 handy-1-demo">
@@ -175,5 +173,5 @@
         <listitem>
           <para>
-            provides additional GTK widgets for use in creating user interfaces
+            provides additional GTK widgets for use in creating user interfaces.
           </para>
           <indexterm zone="libhandy1 libhandy-1">
@@ -184,4 +182,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: x/lib/libnotify.xml
===================================================================
--- x/lib/libnotify.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/libnotify.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -120,8 +121,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr       \
-      --buildtype=release \
-      -Dgtk_doc=false     \
-      -Dman=false .. &amp;&amp;
+meson --prefix=/usr -Dgtk_doc=false -Dman=false .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -140,7 +138,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
@@ -183,5 +178,5 @@
         <listitem>
           <para>
-            is a command used to send notifications
+            is a command used to send notifications.
           </para>
           <indexterm zone="libnotify notify-send">
@@ -192,8 +187,8 @@
 
       <varlistentry id="libnotify-lib">
-        <term><filename class="libraryfile">libnotify.so</filename></term>
+        <term><filename class='libraryfile'>libnotify.so</filename></term>
         <listitem>
           <para>
-            contains the <application>libnotify</application> API functions
+            contains the <application>libnotify</application> API functions.
           </para>
           <indexterm zone="libnotify libnotify">
Index: x/lib/libxklavier.xml
===================================================================
--- x/lib/libxklavier.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/libxklavier.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -161,5 +162,5 @@
         <listitem>
           <para>
-            contains XKB utility functions
+            contains XKB utility functions.
           </para>
           <indexterm zone="libxklavier libxklavier-lib">
Index: x/lib/pango.xml
===================================================================
--- x/lib/pango.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/pango.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY pango-download-http "&gnome-download-http;/pango/1.48/pango-&pango-version;.tar.xz">
   <!ENTITY pango-download-ftp  "&gnome-download-ftp;/pango/1.48/pango-&pango-version;.tar.xz">
-  <!ENTITY pango-md5sum        "243f05e6b2de17e5129402307e323e14">
-  <!ENTITY pango-size          "1.9 MB">
-  <!ENTITY pango-buildsize     "43 MB (with tests)">
+  <!ENTITY pango-md5sum        "ee5826242abd661fb5238e19b9e2e1aa">
+  <!ENTITY pango-size          "524 KB">
+  <!ENTITY pango-buildsize     "26 MB (with tests)">
   <!ENTITY pango-time          "0.2 SBU (with tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -94,8 +95,5 @@
     <para role="optional">
       <xref linkend="cantarell-fonts"/> (for tests),
-  <!--<xref linkend="gtk-doc"/>,-->
-      <xref linkend="sysprof"/>,
-      <ulink url="https://gitlab.gnome.org/GNOME/gi-docgen">gi-docgen</ulink>
-      (to generate documentation),
+      <xref linkend="gtk-doc"/>,
       <ulink url="https://ftpmirror.gnu.org/gnu/help2man">help2man</ulink>, and
       <ulink url="https://linux.thai.net/projects/libthai">libthai</ulink>
@@ -118,15 +116,12 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release --wrap-mode=nofallback .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
     <para>
-      To test the results, issue: <command>ninja test</command>. One test,
-      <filename>test-font</filename>, 
-      <!--<filename>test-layout</filename>, and
+      To test the results, issue: <command>ninja test</command>. Two tests,
+      <filename>test-layout</filename> and
       <filename>test-itemize</filename>, are known to fail if 
-      <xref linkend="cantarell-fonts"/> are not installed.-->
-      is known to fail.
-      <!-- the problematic tests get skipped now -->
+      <xref linkend="cantarell-fonts"/> is not installed.
     </para>
 
@@ -150,12 +145,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <!-- gtk-doc replaced by gi-docgen
     <para>
       <option>-Dgtk_doc</option>: Use this switch if gtk-doc is 
       installed and you wish to rebuild and install the API documentation.
-    </para>-->
+    </para>
 
     <para>
@@ -163,8 +154,4 @@
       want to use <xref linkend="gobject-introspection"/>.
     </para>
-
-    <!-- gi-docgen can get installed without this, if deps exist -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-wrap-nofallback.xml"/>
 
   </sect2>
@@ -215,5 +202,5 @@
       <seglistitem>
         <seg>
-          pango-list, pango-segmentation, and pango-view 
+          pango-list and pango-view 
         </seg>
         <seg>
@@ -238,5 +225,5 @@
           <para>
             displays a list of fonts that <application>Pango</application>
-            can use that are currently installed on the system
+            can use that are currently installed on the system.
           </para>
           <indexterm zone="pango pango-list">
@@ -246,16 +233,4 @@
       </varlistentry>
 
-      <varlistentry id="pango-segmentation">
-        <term><command>pango-segmentation</command></term>
-        <listitem>
-          <para>
-            shows text segmentation as determined by Pango.
-          </para>
-          <indexterm zone="pango pango-segmentation">
-            <primary sortas="b-pango-segmentation">pango-segmentation</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="pango-view">
         <term><command>pango-view</command></term>
@@ -263,5 +238,5 @@
           <para>
             renders a given text file through <application>Pango</application>
-            for viewing purposes
+            for viewing purposes.
           </para>
           <indexterm zone="pango pango-view">
@@ -277,5 +252,5 @@
             contains low level layout rendering routines, a high level driver for
             laying out entire blocks of text, and routines to assist in editing
-            internationalized text
+            internationalized text.
           </para>
           <indexterm zone="pango libpango-1">
Index: x/lib/pangomm.xml
===================================================================
--- x/lib/pangomm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/pangomm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY pangomm-download-http "&gnome-download-http;/pangomm/2.46/pangomm-&pangomm-version;.tar.xz">
-  <!ENTITY pangomm-download-ftp  "&gnome-download-ftp;/pangomm/2.46/pangomm-&pangomm-version;.tar.xz">
-  <!ENTITY pangomm-md5sum        "62665f7ace9e282a0c563b40a15627f5">
-  <!ENTITY pangomm-size          "660 KB">
-  <!ENTITY pangomm-buildsize     "11 MB">
+  <!ENTITY pangomm-download-http "&gnome-download-http;/pangomm/2.42/pangomm-&pangomm-version;.tar.xz">
+  <!ENTITY pangomm-download-ftp  "&gnome-download-ftp;/pangomm/2.42/pangomm-&pangomm-version;.tar.xz">
+  <!ENTITY pangomm-md5sum        "85707ce52628b6a3c3caf245095ba6d5">
+  <!ENTITY pangomm-size          "644 KB">
+  <!ENTITY pangomm-buildsize     "15 MB">
   <!ENTITY pangomm-time          "0.2 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -95,5 +96,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -142,5 +143,5 @@
         <listitem>
           <para>
-            contains the <application>Pango</application> API classes
+            contains the <application>Pango</application> API classes.
           </para>
           <indexterm zone="pangomm libpangomm-1">
Index: x/lib/qt5.xml
===================================================================
--- x/lib/qt5.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/qt5.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -63,5 +64,5 @@
   </itemizedlist>
 
-    &lfs110a_checked;
+  &lfs10_checked;
 
   <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -98,15 +99,4 @@
     </listitem>
   </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qt-everywhere-src-&qt5-version;-CVE-2021-3481-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
 <!--
   <bridgehead renderas="sect3">Qt5 Dependencies</bridgehead>
@@ -716,19 +706,11 @@
             -examplesdir    /usr/share/doc/qt5/examples</userinput></screen>
     </note>
-
-    <para>
-      First apply a patch to fix an Out Of Bounds read in QtSVG:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../qt-everywhere-src-&qt5-version;-CVE-2021-3481-1.patch</userinput></screen>
-
-    <para>
-      Next fix some issues using gcc-11:
-    </para>
-
-<screen><userinput>sed -i '/utility/a #include &lt;limits&gt;'     qtbase/src/corelib/global/qglobal.h         &amp;&amp;
-sed -i '/string/a #include &lt;limits&gt;'      qtbase/src/corelib/global/qfloat16.h        &amp;&amp;
-sed -i '/qbytearray/a #include &lt;limits&gt;'  qtbase/src/corelib/text/qbytearraymatcher.h &amp;&amp;
-sed -i '/type_traits/a #include &lt;limits&gt;' qtdeclarative/src/qmldebug/qqmlprofilerevent_p.h</userinput></screen>
+<!-- Applied upstream in 5.15.0
+    <para>
+      First fix an issues using gcc-10:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../qt-everywhere-src-&qt5-version;-gcc10-1.patch</userinput></screen>
+-->
 
     <para>
@@ -736,5 +718,5 @@
     </para>
 
-<screen revision="sysv"><userinput>./configure -prefix $QT5PREFIX                        \
+<screen><userinput>./configure -prefix $QT5PREFIX                        \
             -sysconfdir /etc/xdg                      \
             -confirm-license                          \
@@ -746,19 +728,4 @@
             -nomake examples                          \
             -no-rpath                                 \
-            -syslog                                   \
-            -skip qtwebengine                         &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure -prefix $QT5PREFIX                        \
-            -sysconfdir /etc/xdg                      \
-            -confirm-license                          \
-            -opensource                               \
-            -dbus-linked                              \
-            -openssl-linked                           \
-            -system-harfbuzz                          \
-            -system-sqlite                            \
-            -nomake examples                          \
-            -no-rpath                                 \
-            -journald                                 \
             -skip qtwebengine                         &amp;&amp;
 make</userinput></screen>
@@ -919,14 +886,4 @@
       <application>Qt5</application> libraries instead of
       <command>dlopen()</command>-ing them.
-    </para>
-
-    <para revision="sysv">
-      <parameter>-syslog</parameter>: This switch allows to send Qt messages
-      to the <command>syslog</command> logging system.
-    </para>
-
-    <para revision="systemd">
-      <parameter>-journald</parameter>: This switch allows to send Qt messages
-      to the <command>journald</command> logging system.
     </para>
 
@@ -1109,5 +1066,5 @@
           <para>
             is part of Qt5's Linguist tool chain. It can be used as a
-            standalone tool to convert and filter translation data files
+            standalone tool to convert and filter translation data files.
           </para>
           <indexterm zone="qt5 lconvert-qt5">
@@ -1122,5 +1079,5 @@
           <para>
             provides support for translating applications into
-            local languages
+            local languages.
           </para>
           <indexterm zone="qt5 linguist-qt5">
@@ -1136,5 +1093,5 @@
             is a simple command line tool. It reads XML-based translation
             file in TS format and produces message files used by the
-            application
+            application.
           </para>
           <indexterm zone="qt5 lrelease-qt5">
@@ -1149,5 +1106,5 @@
           <para>
             extracts project information from qmake projects and passes
-            it to lrelease
+            it to lrelease.
           </para>
           <indexterm zone="qt5 lrelease-pro">
@@ -1164,5 +1121,5 @@
             strings in the specified source, header and Qt Designer
             interface files, and stores the extracted messages in
-            translation files to be processed by lrelease
+            translation files to be processed by lrelease.
           </para>
           <indexterm zone="qt5 lupdate-qt5">
@@ -1177,5 +1134,5 @@
           <para>
             reads a Qt project file, an passes the collected information
-            to lupdate
+            to lupdate.
           </para>
           <indexterm zone="qt5 lupdate-pro">
@@ -1189,5 +1146,5 @@
         <listitem>
           <para>
-            displays information about qtquick-3d mesh files
+            displays information about qtquick-3d mesh files.
           </para>
           <indexterm zone="qt5 meshdebug">
@@ -1202,5 +1159,5 @@
           <para>
             is a desktop magnifier and as you move your mouse around
-            the screen it will show the magnified contents in its window
+            the screen it will show the magnified contents in its window.
           </para>
           <indexterm zone="qt5 pixeltool-qt5">
@@ -1214,5 +1171,5 @@
         <listitem>
           <para>
-            processes and converts Qt help files
+            processes and converts Qt help files.
           </para>
           <indexterm zone="qt5 qcollectiongenerator-qt5">
@@ -1227,5 +1184,5 @@
           <para>
             lists available services, object paths,  methods, signals, and
-            properties of objects on a bus
+            properties of objects on a bus.
           </para>
           <indexterm zone="qt5 qdbus-qt5">
@@ -1239,5 +1196,5 @@
         <listitem>
           <para>
-            is a graphical D-Bus browser
+            is a graphical D-Bus browser.
           </para>
           <indexterm zone="qt5 qdbusviewer-qt5">
@@ -1254,5 +1211,5 @@
             up an application's startup if the user interface has a lot of text,
             or multiple fonts, or a large amount of distinct characters, e.g. in
-            CJK writing systems
+            CJK writing systems.
           </para>
           <indexterm zone="qt5 qdistancefieldgenerator-qt5">
@@ -1267,5 +1224,5 @@
           <para>
             is a tool used by <application>Qt</application> Developers to
-            generate documentation for software projects
+            generate documentation for software projects.
           </para>
           <indexterm zone="qt5 qdoc-qt5">
@@ -1280,5 +1237,5 @@
           <para>
             imports a a variety of 3D model formats and exports into fast-to-load,
-            optimized glTF assets embedded into Qt resource files
+            optimized glTF assets embedded into Qt resource files.
           </para>
           <indexterm zone="qt5 qgltf">
@@ -1293,5 +1250,5 @@
           <para>
             is a tool used to generate a <application>Qt</application>
-            compressed help file
+            compressed help file.
           </para>
           <indexterm zone="qt5 qhelpgenerator-qt5">
@@ -1305,5 +1262,5 @@
         <listitem>
           <para>
-            executes a QML file
+            executes a QML file.
           </para>
           <indexterm zone="qt5 qml">
@@ -1317,5 +1274,5 @@
         <listitem>
           <para>
-            supports the creation of cache files at build time
+            supports the creation of cache files at build time.
           </para>
           <indexterm zone="qt5 qmlcachegen">
@@ -1330,5 +1287,5 @@
           <para>
             is a tool used to define the easing curves using an
-            interactive curve editor
+            interactive curve editor.
           </para>
           <indexterm zone="qt5 qmleasing-qt5">
@@ -1342,5 +1299,5 @@
         <listitem>
           <para>
-            formats QML files according to the QML coding conventions
+            formats QML files according to the QML coding conventions.
           </para>
           <indexterm zone="qt5 qmlformat-qt5">
@@ -1354,5 +1311,5 @@
         <listitem>
           <para>
-            is a tool used to import QML files from a directory
+            is a tool used to import QML files from a directory.
           </para>
           <indexterm zone="qt5 qmlimportscanner-qt5">
@@ -1366,5 +1323,5 @@
         <listitem>
           <para>
-            is a syntax checker for QML files
+            is a syntax checker for QML files.
           </para>
           <indexterm zone="qt5 qmllint-qt5">
@@ -1378,5 +1335,5 @@
         <listitem>
           <para>
-            removes comments and layout characters from a QML file
+            removes comments and layout characters from a QML file.
           </para>
           <indexterm zone="qt5 qmlmin-qt5">
@@ -1390,5 +1347,5 @@
         <listitem>
           <para>
-            is a tool to create a qmltypes file
+            is a tool to create a qmltypes file.
           </para>
           <indexterm zone="qt5 qmlplugindump-qt5">
@@ -1402,5 +1359,5 @@
         <listitem>
           <para>
-            is a tool used to analyze QML applications
+            is a tool used to analyze QML applications.
           </para>
           <indexterm zone="qt5 qmlpreview-qt5">
@@ -1415,5 +1372,5 @@
           <para>
             is a tool which watches QML and JavaScript files on disk and
-            updates the application live with any changes
+            updates the application live with any changes.
           </para>
           <indexterm zone="qt5 qmlprofiler-qt5">
@@ -1428,5 +1385,5 @@
           <para>
             is a utility that loads and displays QML documents even before
-            the application is complete
+            the application is complete.
           </para>
           <indexterm zone="qt5 qmlscene-qt5">
@@ -1440,5 +1397,5 @@
         <listitem>
           <para>
-            is a tool used to make tests
+            is a tool used to make tests.
           </para>
           <indexterm zone="qt5 qmltestrunner-qt5">
@@ -1452,5 +1409,5 @@
         <listitem>
           <para>
-            converts an input.scxml file to a header and cpp file
+            converts an input.scxml file to a header and cpp file.
           </para>
           <indexterm zone="qt5 qscxmlc-qt5">
@@ -1464,5 +1421,5 @@
         <listitem>
           <para>
-            processes qt_attribution.json files in Qt sources
+            processes qt_attribution.json files in Qt sources.
           </para>
           <indexterm zone="qt5 qtattributionsscanner-qt5">
@@ -1477,5 +1434,5 @@
           <para>
             is a tool for reporting diagnostic information about Qt and its
-            environment
+            environment.
           </para>
           <indexterm zone="qt5 qtdiag-qt5">
@@ -1489,5 +1446,5 @@
         <listitem>
           <para>
-            is a tool to query Qt path information
+            is a tool to query Qt path information.
           </para>
           <indexterm zone="qt5 qtpaths-qt5">
@@ -1501,5 +1458,5 @@
         <listitem>
           <para>
-            dumps meta-data about Qt plugins in JSON format
+            dumps meta-data about Qt plugins in JSON format.
           </para>
           <indexterm zone="qt5 qtplugininfo">
@@ -1514,5 +1471,5 @@
           <para>
             is the Replica Compiler, which generates QObject header files based
-            on an API definition file
+            on an API definition file.
           </para>
           <indexterm zone="qt5 repc">
@@ -1527,5 +1484,5 @@
           <para>
             performs a Session Description Protocol scan on a remote device,
-            using the SDP server represented by the local Bluetooth device
+            using the SDP server represented by the local Bluetooth device.
           </para>
           <indexterm zone="qt5 sdpscanner-qt5">
@@ -1540,5 +1497,5 @@
           <para>
             provides support for XPath, XQuery, XSLT, and XML Schema
-            validation
+            validation.
           </para>
           <indexterm zone="qt5 xmlpatterns-qt5">
@@ -1552,5 +1509,5 @@
         <listitem>
           <para>
-            is a tool used to validate XML documents
+            is a tool used to validate XML documents.
           </para>
           <indexterm zone="qt5 xmlpatternsvalidator-qt5">
Index: lib/qtwebengine.xml
===================================================================
--- x/lib/qtwebengine.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,672 +1,0 @@
-<?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 qtwebengine-major "5.15">
-<!-- URL if there is a public release
-  <!ENTITY qtwebengine-download-http "https://download.qt.io/archive/qt/&qtwebengine-major;/&qtwebengine-version;/submodules/qtwebengine-everywhere-src-&qtwebengine-version;.tar.xz">
-     URL for a prepared git version -->
-  <!ENTITY qtwebengine-download-http "&sources-anduin-http;/qtwebengine/qtwebengine-&qtwebengine-version;.tar.xz">
-  <!ENTITY qtwebengine-download-ftp  " ">
-  <!ENTITY qtwebengine-md5sum        "af799617842cca0b765102c312fbdd46">
-  <!ENTITY qtwebengine-size          "306 MB">
-  <!ENTITY qtwebengine-buildsize     "5.1 GB (154 MB installed)">
-  <!ENTITY qtwebengine-time          "97 SBU (typical, Using parallelism=4)">
-]>
-
-<sect1 id="qtwebengine" xreflabel="qtwebengine-&qtwebengine-version;">
-  <?dbhtml filename="qtwebengine.html"?>
-
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>QtWebEngine-&qtwebengine-version;</title>
-
-  <indexterm zone="qtwebengine">
-    <primary sortas="a-qtwebengine">qtwebengine</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to QtWebEngine</title>
-
-    <para>
-      <application>QtWebEngine</application> integrates
-      <application>chromium</application>'s web capabilities into Qt. It
-      ships with its own copy of ninja which it uses for the build if it cannot
-      find a system copy, and various copies of libraries from ffmpeg, icu,
-      libvpx, and zlib (including libminizip) which have been forked by the
-      <application>chromium</application> developers.
-    </para>
-
-    <para>
-      This package and browsers using it may be useful if you need to use a
-      website designed for google chrome, or chromium, browsers.
-    </para>
-
-    <!-- Note for editors re switching between git versions and releases:
-      If a public release of Qt 5.15.3 (or later) appears in a meaningful
-      time frame, please keep the notes re the git build, as comments, so
-      that updating for later fixes will be easier: in the past, updates
-      of 'stable' versions (i.e. 5.12 when 5.14, 5.15 were the newest)
-      happened much later than updates to the newest version (now Qt6)
-      and it seems likely we might again need to use a git version to fix
-      future chromium vulnerabilities. -->
-
-    <warning>
-      <para>
-        QtWebEngine uses a forked copy of chromium, and is therefore vulnerable
-        to many issues found there. The Qt developers have always preferred to
-        make releases at the same time as the rest of Qt (rather than adding
-        emergency fixes), but with stable versions getting released after the
-        current development version. Now that they are keen to move to Qt6, the
-        5.15.3 and later Qt-5.15 releases are initially only available to paying
-        customers. QtWebEngine is something of an exception because of its LGPL
-        licence, but getting the git sources (with the forked chromium submodule)
-        to a position where they will successfully build on a current BLFS system
-        can take a lot of effort and therefore updates to the book may be delayed.
-      </para>
-
-      <para>
-        It seems likely that future 5.15-series versions will also be released
-        long after the chromium vulnerabilities are known, but fixes for
-        QtWebEngine can be found in git and the editors take the view that
-        known vulnerabilities in browsers should be fixed.
-      </para>
-
-      <para> <!-- for git versions -->
-        The tarball linked to below was created from the 5.15.6 git branch
-        and the 87-branch of the chromium submodule (which is forked from
-        chromium). See the GIT-VERSIONS file in the tarball (after applying
-        any patches) for details of the latest commits.
-      </para>
-    </warning>
-
-    <!-- note for editors on obtaining webengine from git.
-      First (if you do not already have a past version)
-      git clone git://code.qt.io/qt/qtwebengine.git
-      git submodule init -
-       that will report qtwebengine-chromium.git registered for src/3rdparty
-       now find the main branch names:
-      git fetch origin
-      git branch -r
-       after a release is prepared (even if the rest is not public), the 5.15
-       branch now seems to get updated and might be what you want. But in the
-       approach to 5.15.6 the backported CVE and other security fixes were only
-       applied to 5.15.6.  So, assuming that a 5.15.7 branch now exists,
-      git checkout origin/5.15.7
-       Confirm that HEAD is where you expected.
-       Now go to src/3rdparty
-      git fetch origin
-      git branch -r
-       The required branch is likely to be 87-branch unless there is a newer one
-      mentioned in the 5.15 cgit web page (below).
-      git checkout origin/87-branch (or whatever)
-       Use git log or git tk to look at its HEAD and check it seems appropriate.
-
-      To decide when it might be worth creating a new tarball, periodically keep
-      an eye on https://code.qt.io/cgit/qt/qtwebengine.git/ (currently, the 5.15.6
-      branch, 5.15.7 might get used later). The interesting items are CVE fixes
-      for known chromium vulnerabilities, as well as numbered Security bugs -
-      again, these relate to chromium.
-
-      When I noticed some updates in late March I was searching for one of the
-      CVEs mentioned, and google found a link to a review page for Michael Brüning
-      at https://codereview.qt.nokia.com/q/owner:michael.bruning%2540qt.io. At that
-      time I could see various unmerged items, so I waited. The items for the
-      90-based chromium module are not relevant to 5.15-series (possibly they will
-      be for qtwebengine-6+). Review queues for other Qt employees might be found
-      in a similar way, but remember that everythng EXCEPT qtwebengine and chromium
-      is private to Qt until they choose to release it.
-
-      NOTE: the 3rdparty/chromium tree may contain more patches than have been
-      merged into the current 5.15.x branch. Any patches after what was in the
-      last 'update chromium' merge in qtwebengine occasionally break the build.
-
-      After merging the contents of the qtwebengine and src/3rdparty git extracts,
-      in the top level please create a GIT-VERSIONS file summarising the HEAD
-      commits of both parts, as a reminder of where we are up to. I've nove added
-      a CVE-fixes to keep track of what has been fixed (comits before 5.15.2 did not
-      mention the CVEs until they were detailed in a release).
-
-      Now create tarballs - 'git archive' does not work across submodule boundaries,
-      so you need to create one archive from the top of qtwebengine/ and another
-      from the top of src/3rdparty (chromium, gn, ninja are apparently all part of
-      the qtwebengine-chromium module).  Then in a work area untar the qtwebengine
-      tarball, go down to src/3rdparty and untar the submodule tarball.
-      Decide on what to call the result and create a full xz tarball using tar -cJf.
-
-      UPDATE: Since we have to host the tarball, and it is over 300MB, it makes
-      sense to create a patch for subsequent fixes (for the first version, 314KB
-      including the updates to the GIT-VERSIONS file).  For future updates, view
-      the current updates patch to see the previous commits. When the new commits
-      have been applied, rename the updated version to 'b', but untar the
-      unpatched tarball as 'a' and then diff a to b in the usual manner to get
-      all updates since the tarball was created.
-
-      For our own releases, probably best to create a fresh tarball.
-
-         end of note for editors -->
-
-    &lfs110a_checked;
-
-    <warning>
-      <para>
-        By default, ninja will use all online CPUs +2 (if at least 4 exist),
-        even if they are not available to the current task because the build
-        terminal has been restricted with 'taskset'.  In BLFS, this package 
-        takes more time to build than than any other.  In one example,
-        the build of this package crashed at about the 90 percent point 
-        due to an out of memory problem on a system with 24 cores and 32 GB 
-        of memory.
-      </para>
-
-      <para>
-        To work around this, see the Command Explanations below.
-      </para>
-    </warning>
-
-    <note>
-      <para>
-        Unusually, the shipped GN build system (used to create the Ninja files)
-        requires a static <filename class="libraryfile">libstdc++.a</filename>
-        although the installed libraries correctly use the shared version. If
-        that static library is not present, the build will fail quite quickly.
-        Please note that if you try to build webengine as part of
-        <application>Qt</application> and the static library is not available,
-        that build will either complete without installing webengine, or else
-        fail during the install (both variants were observed in 5.12.0).
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qtwebengine-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qtwebengine-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qtwebengine-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qtwebengine-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qtwebengine-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qtwebengine-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <!-- keep links for releases and git versions as a reminder
-               that the tarball names names differ
-          <ulink url="&patch-root;/qtwebengine-everywhere-src-&qtwebengine-version;-ICU68-2.patch"/> -->
-           <!--
-          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-upstream_fixes-2.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch:-->
-          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-build_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">qtwebengine Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-      <!-- the qmake output tends to be misleading. 'khr' is from Mesa -->
-    <para role="required">
-      <xref linkend="nodejs"/>,
-      <xref linkend="nss"/>,
-      <xref linkend="python2"/>, and
-      <xref linkend='qt5'/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <note>
-      <para>
-        If these packages are not installed, the build process will compile and
-        install its own (perhaps older) version, with the side effect of
-        increasing build and installed disk space and build time.
-      </para>
-    </note>
-
-    <para role="recommended">
-      either <xref linkend="alsa-lib"/> or
-      <xref linkend="pulseaudio"/> (or both),
-      <xref linkend="ffmpeg"/>,
-      <!-- awkward wording - libxslt needs libxml2, if libxml2 is built
-           before icu then the *shipped* icu will be used -->
-      <xref linkend="icu"/> (built before <xref linkend="libxml2"/>) ,
-      <xref linkend="libwebp"/>,
-      <xref linkend="libxslt"/>, and
-      <xref linkend="opus"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libevent"/>,
-      <xref linkend="pipewire"/>,
-      <xref linkend="poppler"/>,
-      <ulink url="https://github.com/open-source-parsers/jsoncpp/releases">jsoncpp</ulink>,
-      <ulink url="https://github.com/cisco/libsrtp/releases">libsrtp</ulink>,
-      <ulink url="http://google.github.io/snappy/">snappy</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/qtwebengine"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of qtwebengine</title>
-
-    <note>
-      <para>
-        Unlike version 5.15.2, the chromium-derived build system now needs
-        <command>python</command> to be available and to be python2. In
-        BLFS-10.1 the creation of the python symlink was removed as a step
-        towards eventually getting rid of python2 (other old packages which
-        need python2 usually work by invoking python2). If you are still
-        using an earlier version of BLFS where
-        <filename>/usr/bin/python</filename> exists, you can skip the
-        commands to create the symlink, and to later remove it.
-      </para>
-    </note>
-
-    <para>
-      First, as the <systemitem class="username">root</systemitem>
-      user, create the python symlink:
-    </para>
-
-<screen role="root"><userinput>ln -svf /usr/bin/python{2,}</userinput></screen>
-
-<!-- retain, there might later be a patch rather than a full 306MB tarball
-    <para>
-      Now apply a patch for security and other fixes:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-upstream_fixes-2.patch</userinput></screen>-->
-
-    <para>
-      Apply apply a patch to fix several issues that can prevent the build working:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-build_fixes-1.patch</userinput></screen>
-
-<!-- start of commands for git versions only -->
-    <para>
-      Although the patch has ensured that git is not invoked during the build,
-      the build system has labyrinthine rules of byzantine complexity, and in
-      particular trying to build without two <filename>.git</filename> directories
-      will lead to it eventually falling into unexpected and unbuildable code
-      which references a private header that has not been created. Avoid this
-      by creating the required directories:
-    </para>
-
-<screen><userinput>mkdir -pv .git src/3rdparty/chromium/.git</userinput></screen>
-
-    <para>
-      Because this version of qtwebengine is aimed at a later release than the
-      current public releases, change it to build for qt-&qt5-version; using a
-      sed:
-    </para>
-
-<screen><userinput>sed -e '/^MODULE_VERSION/s/5.*/&qt5-version;/' -i .qmake.conf</userinput></screen>
-<!-- end of commands for git versions only -->
-
-    <para>
-      Now, ensure that the local headers are available when not building as
-      part of the complete <xref linkend="qt5"/>:
-    </para>
-
-<screen><userinput>find -type f -name "*.pr[io]" |
-  xargs sed -i -e 's|INCLUDEPATH += |&amp;$$QTWEBENGINE_ROOT/include |'</userinput></screen>
-
-    <para>
-      Next, allow the pulseaudio library to be linked at build time, instead
-      of run time. This also prevents an issue with newer pulseaudio:
-    </para>
-
-<screen><userinput>sed -e '/link_pulseaudio/s/false/true/' \
-    -i src/3rdparty/chromium/media/media_options.gni</userinput></screen>
-
-    <para>
-      Finally, fix a change in the build system which allows its developers to
-      pass e.g. -j20 to make (for quick tests of some areas) but breaks the
-      build with LFS's use of the NINJAJOBS environment variable:
-    </para>
-
-<!-- editors: See thread at
-http://lists.linuxfromscratch.org/pipermail/blfs-dev/2019-December/036996.html
-et.seq, particularly 037002.html which shows the commit near the end. -->
-
-<screen><userinput>sed -i 's/NINJAJOBS/NINJA_JOBS/' src/core/gn_run.pro</userinput></screen>
-
-<!-- now that we always install this as 5.15.2, this seems to be redundant
-    <para>
-      If an older version of the package's main library has been installed,
-      when the package is built separately it will link to that in preference
-      to its own not-yet-installed version, and fail because of missing symbols.
-      Prevent that by, as the <systemitem class="username">root</systemitem>
-      user, moving the symlink out of the way:
-    </para>
-
-<screen role="root"><userinput>if [ -e ${QT5DIR}/lib/libQt5WebEngineCore.so ]; then
-  mv -v ${QT5DIR}/lib/libQt5WebEngineCore.so{,.old}
-fi</userinput></screen>-->
-
-    <para>
-      Install <application>qtwebengine</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-qmake .. -- -system-ffmpeg -webengine-icu &amp;&amp;
-make</userinput></screen>
-
-<!--
-    <para>
-      if you wish to build the HTML documentation, issue:
-    </para>
-
-<screen><userinput>make docs</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>
-
-    <!-- EDITORS NOTE: If you are updating this package, use INSTALL_ROOT=
-         instead of DESTDIR= -->
-<!--
-    <para>
-      If you built the HTML documentation, install it with:
-    </para>
-
-<screen role="root"><userinput>make install_docs</userinput></screen>
--->
-    <para>
-      Remove references to the build directory from installed library
-      dependency (prl) files by running the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>find $QT5DIR/ -name \*.prl \
-   -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
-
-    <para>
-      Finally, as the <systemitem class="username">root</systemitem>
-      user, remove the python symlink:
-    </para>
-
-<screen role="root"><userinput>rm -v /usr/bin/python</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>qmake</command>: This will build the included copy of
-      <application>ninja</application> if it is not already installed
-      and use it to configure the build.
-    </para>
-
-    <para>
-      <command>-- -system-ffmpeg -webengine-icu</command>: If any options are
-      passed to qmake they must come after '--' which must follow '..' that points
-      to the main directory. The options here cause it to use system ffmpeg and
-      system icu.  If built as part of full Qt5, the system icu is automatically
-      used (only) by Qt5Core if it is available, but unless this option is used
-      webengine will always use its shipped copy of icu, adding time and space
-      to the build.
-    </para>
-
-    <para>
-      <option>-webengine-jumbo-build 0</option>: If this is added to the qmake
-      command it will cause the 'Jumbo Build Merge Limit' to be reported as 'no'
-      instead of 8. That turns off the jumbo build. Some distros do that to get
-      a smaller build on some architectures such as MIPS. On x86_64 it might save
-      a little space in the build, but the build time will increase by a very
-      large amount.
-    </para>
-
-    <!--
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
-       href="../../xincludes/SIOCGSTAMP.xml"/>
-    -->
-
-    <para>
-      <option>NINJAJOBS=4 make</option>: If you patched system ninja in LFS to
-      recognize the NINJAJOBS environment variable, this command will run system
-      ninja with the specified number of jobs (i.e. 4). 
-      There are several reasons why you might want to use options like this this:
-    </para>
-
-      <itemizedlist>
-        <listitem>
-          <para>
-            Building on a subset of CPUs allows measuring the build time
-            for a smaller number of processors, and/or running other
-            CPU-intensive tasks at the same time. For an editor on a machine
-            with a lot of CPUs, trying to measure the build time for a 4-CPU
-            machine, <option>NINJAJOBS=4 make</option> will give a reasonable
-            approximation (there is a short period where N+2 python2 and node
-            jobs run).
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            On a machine with only 4 CPUs online, the default of scheduling
-            N+2 jobsi for qtwebengine is slower by between 3% and 7%, probably
-            because of the size of the C++ files and their many includes and
-            templates. Therefore, if in doubt set NINJAJOBS to the number of CPUs.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Reducing the number of cores being used on long running, CPU
-            intensive packages may alleviate heat problems.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Reducing the number of cores will prevent potential out-of-memory
-            problems on systems that do not have enough memory (or swap)
-            when all cores are active.  A suggested approach is to limit 
-            the number of cores to about one core for each 1.5 GB of 
-            combined RAM and swap space.
-          </para>
-        </listitem>
-      </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring QtWebEngine</title>
-
-    <sect3 id="qtwebengine-config">
-      <title>Configuration Information</title>
-
-      <para>
-        If you are upgrading from an older minor version of this
-        application, for some webpages to load you may need to
-        clear the <emphasis>browser</emphasis> caches, e.g. for
-        <application>falkon</application> they will be found in
-        <filename class="directory">~/.cache/falkon/</filename>.
-        You will need to do this if the browser starts to render
-        the page and then changes to a blank tab with a message
-        that something went wrong, and a button to Retry. Even
-        after removing the old caches, you may need to retry a
-        few times for each affected tab.
-      </para>
-
-      <para>
-        If a browser using this package fails to run and when run
-        from a term it reports 'Trace/breakpoint trap' that is
-        probably a kernel configuration issue - there is no need
-        to rebuild QtWebEngine, see the next section, recompile
-        the kernel and reboot to the new kernel.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="kernel" id="qtwebengine-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      This package does not require any of the optional kernel namespace items,
-      but if User namespace is enabled <phrase revision="systemd">(as happens
-      in some unit files, for hardening)</phrase> PID namespace must also be
-      enabled. In that case enable the following options in the kernel
-      configuration and recompile the kernel if necessary:
-    </para>
-
-<!-- Spaces are significant in <screen> sections -->
-<screen><literal>General setup ---&gt;
-  -*- Namespaces support ---&gt;
-    [ ]     User namespace                    [CONFIG_USER_NS]
-    [*]     PID namespace                     [CONFIG_PID_NS]</literal></screen>
-
-    <indexterm zone="qtwebengine qtwebengine-kernel">
-      <primary sortas="d-qtwebengine">qtwebengine</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          qtwebengine_convert_dict and 
-          QtWebEngineProcess (in $QT5DIR/libexec)
-        </seg>
-        <seg>
-          libQt5Pdf.so,
-          libQt5PdfWidgets.so,
-          libQt5WebEngineCore.so, 
-          libQt5WebEngine.so, and 
-          libQt5WebEngineWidgets.so
-        </seg>
-        <seg>
-          $QT5DIR/include/QtPdf,
-          $QT5DIR/include/QtPdfWidgets,
-          $QT5DIR/include/QtWebEngine,
-          $QT5DIR/include/QtWebEngineCore,
-          $QT5DIR/include/QtWebEngineWidgets,
-          $QT5DIR/qml/QtWebEngine, and
-          $QT5DIR/translations/qtwebengine_locales
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="qtwebengine_convert_dict">
-        <term><command>qtwebengine_convert_dict</command></term>
-        <listitem>
-          <para>
-            converts hunspell dictionaries (<literal>.dic</literal>) to chromium
-            format (<literal>.bdic</literal>)
-          </para>
-          <indexterm zone="qtwebengine qtwebengine_convert_dict">
-            <primary sortas="b-qtwebengine_convert_dict">qtwebengine_convert_dict</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="QtWebEngineProcess">
-        <term><command>QtWebEngineProcess</command></term>
-        <listitem>
-          <para>
-            is a libexec program which runs a zygote process (one that listens
-            for spawn requests from a master process and will fork itself in
-            response)
-          </para>
-          <indexterm zone="qtwebengine QtWebEngineProcess">
-            <primary sortas="b-QtWebEngineProcess">QtWebEngineProcess</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libQtWebEngine-lib">
-        <term><filename class="libraryfile">libQtWebEngine.so</filename></term>
-        <listitem>
-          <para>
-            provides QML types for rendering web content within a QML application
-          </para>
-          <indexterm zone="qtwebengine libQtWebEngine-lib">
-            <primary sortas="c-libQtWebEngine">libQtWebEngine.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libQtWebEngineCore">
-        <term><filename class="libraryfile">libQtWebEngineCore.so</filename></term>
-        <listitem>
-          <para>
-            provides public API shared by both QtWebEngine and QtWebEngineWidgets
-          </para>
-          <indexterm zone="qtwebengine libQtWebEngineCore">
-            <primary sortas="c-libQtWebEngineCore">libQtWebEngineCore.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libQtWebEngineWidgets">
-        <term><filename class="libraryfile">libQtWebEngineWidgets.so</filename></term>
-        <listitem>
-          <para>
-            provides a web browser engine as well as C++ classes to render and
-            interact with web content
-          </para>
-          <indexterm zone="qtwebengine libQtWebEngineWidgets">
-            <primary sortas="c-libQtWebEngineWidgets">libQtWebEngineWidgets.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: x/lib/startup-notification.xml
===================================================================
--- x/lib/startup-notification.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/startup-notification.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -141,10 +142,10 @@
 
       <varlistentry id="libstartup-notification-1">
-        <term><filename class="libraryfile">libstartup-notification-1.so</filename></term>
+        <term><filename class='libraryfile'>libstartup-notification-1.so</filename></term>
         <listitem>
           <para>
             provides the functions to assist applications in communicating
             with the cursor system to provide feedback to the user that the
-            application is loading
+            application is loading.
           </para>
           <indexterm zone="startup-notification libstartup-notification-1">
Index: x/lib/tepl.xml
===================================================================
--- x/lib/tepl.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/tepl.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY tepl-download-http "&gnome-download-http;/tepl/6.00/tepl-&tepl-version;.tar.xz">
-  <!ENTITY tepl-download-ftp  "&gnome-download-ftp;/tepl/6.00/tepl-&tepl-version;.tar.xz">
-  <!ENTITY tepl-md5sum        "08248e527cc87a4bf7300c04d1babcb9">
-  <!ENTITY tepl-size          "140 KB">
-  <!ENTITY tepl-buildsize     "7.5 MB (with tests)">
+  <!ENTITY tepl-download-http "&gnome-download-http;/tepl/5.0/tepl-&tepl-version;.tar.xz">
+  <!ENTITY tepl-download-ftp  "&gnome-download-ftp;/tepl/5.0/tepl-&tepl-version;.tar.xz">
+  <!ENTITY tepl-md5sum        "5b6b9e022de87ed804266d9edb0e0ff4">
+  <!ENTITY tepl-size          "124 KB">
+  <!ENTITY tepl-buildsize     "11 MB (with tests)">
   <!ENTITY tepl-time          "0.2 SBU (with tests)">
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -103,5 +104,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -140,9 +141,9 @@
         </seg>
         <seg>
-          libtepl-6.so
+          libtepl-5.so
         </seg>
         <seg>
-          /usr/include/tepl-6 and
-          /usr/share/gtk-doc/html/tepl-6.0
+          /usr/include/tepl-5 and
+          /usr/share/gtk-doc/html/tepl-5.0
         </seg>
       </seglistitem>
@@ -158,5 +159,5 @@
         <listitem>
           <para>
-            contains convenience functions for GtkSourceView4-based programs
+            contains convenience functions for GtkSourceView4-based programs.
           </para>
           <indexterm zone="tepl libtepl-5">
@@ -167,4 +168,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: x/lib/webkitgtk.xml
===================================================================
--- x/lib/webkitgtk.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/lib/webkitgtk.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,28 +7,29 @@
   <!ENTITY webkitgtk-download-http "https://webkitgtk.org/releases/webkitgtk-&webkitgtk-version;.tar.xz">
   <!ENTITY webkitgtk-download-ftp  " ">
-  <!ENTITY webkitgtk-md5sum        "f31b802de421865ea9f1391ec8190519">
-  <!ENTITY webkitgtk-size          "22 MB">
-  <!ENTITY webkitgtk-buildsize     "909 MB (127 MB installed)">
-  <!ENTITY webkitgtk-time          "29 SBU (using parallelism=4, estimated 97 SBU using one core)">
+  <!ENTITY webkitgtk-md5sum        "81c813d77a7b52ef655922f9b387f3a1">
+  <!ENTITY webkitgtk-size          "21 MB">
+  <!ENTITY webkitgtk-buildsize     "840 MB (121 MB installed)">
+  <!ENTITY webkitgtk-time          "24 SBU (using parallelism=4, estimated 79 SBU using one core)">
 ]>
 
-<sect1 id="webkitgtk" xreflabel="WebKitGTK-&webkitgtk-version;">
+<sect1 id="webkitgtk" xreflabel="WebKitGTK+-&webkitgtk-version;">
   <?dbhtml filename="webkitgtk.html"?>
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
 
-  <title>WebKitGTK-&webkitgtk-version;</title>
+  <title>WebKitGTK+-&webkitgtk-version;</title>
 
   <indexterm zone="webkitgtk">
-    <primary sortas="a-WebKitGTK">WebKitGTK</primary>
+    <primary sortas="a-WebKitGTK+">WebKitGTK+</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to WebKitGTK</title>
-
-    <para>
-      The <application>WebKitGTK</application> package is a port of the 
+    <title>Introduction to WebKitGTK+</title>
+
+    <para>
+      The <application>WebKitGTK+</application> package is a port of the 
       portable web rendering engine <application>WebKit</application> to the
       <application>GTK+ 3</application> and <application>GTK+ 2</application>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -72,17 +73,5 @@
     </itemizedlist>
 
-    <!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/webkitgtk-&webkitgtk-version;-icu_69-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-    -->
-
-    <bridgehead renderas="sect3">WebKitGTK Dependencies</bridgehead>
+    <bridgehead renderas="sect3">WebKitGTK+ Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -97,12 +86,10 @@
       <xref linkend="libsecret"/>,
       <xref linkend="libsoup"/>,
-      <xref linkend="libtasn1"/>,
       <xref linkend="libwebp"/>,
       <xref linkend="mesa"/>,
       <xref linkend="openjpeg2"/>,
       <xref linkend="ruby"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="which"/>, and
-      <xref linkend="wpebackend-fdo"/>
+      <xref linkend="sqlite"/>, and
+      <xref linkend="which"/>
     </para>
 
@@ -120,12 +107,12 @@
       <xref linkend="bubblewrap"/>,
       <xref linkend="gtk-doc"/>,
-      <xref linkend="gtk4"/>,
       <xref linkend="harfbuzz"/>,
       <xref linkend="wayland"/>,
       <xref linkend="woff2"/>,
       <ulink url="https://ccache.dev/">ccache</ulink>,
-      <ulink url="https://sourceforge.net/projects/hunspell/files/Hyphen/">Hyphen</ulink>,
+      <ulink url="http://sourceforge.net/projects/hunspell/files/Hyphen/">Hyphen</ulink>,
       <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>, 
-      <ulink url="https://gnome.pages.gitlab.gnome.org/libmanette/">libmanette</ulink>, and
+      <ulink url="https://github.com/WebPlatformForEmbedded/libwpe">libwpe</ulink>,
+      <ulink url="https://github.com/Igalia/WPEBackend-fdo">WPEBackend-fdo</ulink>, and
       <ulink url="https://github.com/flatpak/xdg-dbus-proxy">xdg-dbus-proxy</ulink>
     </para>
@@ -137,11 +124,17 @@
 
   <sect2 role="installation">
-    <title>Installation of WebKitGTK</title>
+    <title>Installation of WebKitGTK+</title>
 
     <bridgehead renderas="sect3">Installation of
-    <application>WebKitGTK</application></bridgehead>
-
-    <para>
-      Install <application>WebKitGTK</application> by running the
+    <application>WebKitGTK+</application></bridgehead>
+
+<!--
+    <para>First, ensure backward compatibility with the latest version of icu:</para>
+
+<screen><userinput>echo 'add_compile_definitions("U_DEFINE_FALSE_AND_TRUE=1")' &gt;&gt; Source/WTF/wtf/CMakeLists.txt</userinput></screen>
+-->
+
+    <para>
+      Install <application>WebKitGTK+</application> by running the
       following commands:
     </para>
@@ -156,8 +149,7 @@
       -DLIB_INSTALL_DIR=/usr/lib  \
       -DUSE_LIBHYPHEN=OFF         \
-      -DENABLE_GAMEPAD=OFF        \
       -DENABLE_MINIBROWSER=ON     \
       -DUSE_WOFF2=OFF             \
-      -DUSE_WPE_RENDERER=ON       \
+      -DUSE_WPE_RENDERER=OFF      \
       -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
       -Wno-dev -G Ninja ..        &amp;&amp;
@@ -173,8 +165,7 @@
       -DLIB_INSTALL_DIR=/usr/lib  \
       -DUSE_LIBHYPHEN=OFF         \
-      -DENABLE_GAMEPAD=OFF        \
       -DENABLE_MINIBROWSER=ON     \
       -DUSE_WOFF2=OFF             \
-      -DUSE_WPE_RENDERER=ON       \
+      -DUSE_WPE_RENDERER=OFF      \
       -DUSE_SYSTEMD=OFF           \
       -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
@@ -222,5 +213,5 @@
       default automatic hyphenation implementation. You need to install
       <ulink
-      url="https://sourceforge.net/projects/hunspell/files/Hyphen/">Hyphen</ulink>,
+      url="http://sourceforge.net/projects/hunspell/files/Hyphen/">Hyphen</ulink>,
       if you wish to enable it (replacing OFF with ON or just removing
       the switch).
@@ -228,11 +219,4 @@
 
     <para>
-      <parameter>-DENABLE_GAMEPAD=OFF</parameter>: This switch disables
-      gamepad support. Remove this switch if you have
-      <ulink url="https://gnome.pages.gitlab.gnome.org/libmanette/">libmanette</ulink>
-      installed and wish to enable it.
-    </para>
-
-    <para>
       <parameter>-DENABLE_MINIBROWSER=ON</parameter>: This switch enables
       compiling and installing the MiniBrowser.
@@ -240,6 +224,7 @@
 
     <para>
-      <parameter>-DUSE_WPE_RENDERER=ON</parameter>: This switch uses the WPE
-      renderer, which is recommended by upstream.
+      <parameter>-DUSE_WPE_RENDERER=OFF</parameter>: Remove this switch if the optional 
+      packages <ulink url="https://github.com/WebPlatformForEmbedded/libwpe">libwpe</ulink> and
+      <ulink url="https://github.com/Igalia/WPEBackend-fdo">WPEBackend-fdo</ulink> are installed.
     </para>
 
@@ -283,12 +268,4 @@
       support for fonts.
     </para>
-
-    <!-- Uncomment once GTK4 support works, or when it doesn't require
-         a development version of libsoup.
-    <para>
-      <option>-DUSE_GTK4=ON</option>: Use this switch if <xref linkend="gtk4"/>
-      is installed and you wish to build GTK4 support.
-    </para>
-    -->
 
   </sect2>
@@ -356,5 +333,5 @@
         <listitem>
           <para>
-            allows debugging and automation of web pages and browsers
+            allows debugging and automation of web pages and browsers.
           </para>
           <indexterm zone="webkitgtk WebKitWebDriver">
@@ -365,12 +342,11 @@
 
       <varlistentry id="libjavascriptcoregtk-4.0">
-        <term>
-          <filename class="libraryfile">libjavascriptcoregtk-4.0.so</filename>
-        </term>
+        <term><filename
+        class="libraryfile">libjavascriptcoregtk-4.0.so</filename></term>
         <listitem>
           <para>
             contains core JavaScript API functions used by
-            <command>jsc</command> and
-            <filename class="libraryfile">libwebkit2gtk-4.0</filename>
+            <command>jsc</command> and <filename
+            class="libraryfile">libwebkit2gtk-4.0</filename>.
           </para>
           <indexterm zone="webkitgtk libjavascriptcoregtk-4.0">
@@ -384,5 +360,5 @@
         <listitem>
           <para>
-            contains the <application>WebKit2</application> API functions
+            contains the <application>WebKit2</application> API functions.
           </para>
           <indexterm zone="webkitgtk libwebkit2gtk-4">
Index: x/wm/fluxbox.xml
===================================================================
--- x/wm/fluxbox.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/wm/fluxbox.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -96,10 +97,4 @@
   <sect2 role="installation">
     <title>Installation of Fluxbox</title>
-
-    <para>
-      First, fix a build failure when building with gcc-11.1:
-    </para>
-
-<screen><userinput remap="pre">sed -i '/text_prop.value &gt; 0/s/&gt;/!=/' util/fluxbox-remote.cc</userinput></screen>
 
     <para>
@@ -229,5 +224,5 @@
       </para>
 
-<screen role="nodump"><userinput>cp -r /usr/share/fluxbox/styles/&lt;theme&gt; ~/.fluxbox/theme &amp;&amp;
+<screen role="nodump"><userinput>cp /usr/share/fluxbox/styles/&lt;theme&gt; ~/.fluxbox/theme &amp;&amp;
 
 sed -i 's,\(session.styleFile:\).*,\1 ~/.fluxbox/theme,' ~/.fluxbox/init &amp;&amp;
@@ -275,5 +270,5 @@
           <para>
             is a window manager for <application>X11</application> based
-            on <application>Blackbox</application> 0.61.0
+            on <application>Blackbox</application> 0.61.0.
           </para>
           <indexterm zone="fluxbox fluxbox-prog">
@@ -294,7 +289,6 @@
             <command>qiv</command>, <command>xv</command>,
             <command>xsri</command>, <command>xli</command>, or
-            <command>xsetbg</command>. It also requires
-            <xref linkend="which-prog"/> if <command>Esetroot</command> is
-            found
+            <command>xsetbg</command>. It also requires <xref
+            linkend="which-prog"/> if <command>Esetroot</command> is found.
           </para>
           <indexterm zone="fluxbox fbsetbg">
@@ -309,5 +303,5 @@
           <para>
             is a utility to change root window appearance based on the
-            <application>Blackbox</application> application bsetroot
+            <application>Blackbox</application> application bsetroot.
           </para>
           <indexterm zone="fluxbox fbsetroot">
@@ -322,5 +316,5 @@
           <para>
             is a utility that generates a menu by scanning your
-            <envar>PATH</envar>
+            <envar>PATH</envar>.
           </para>
           <indexterm zone="fluxbox fluxbox-generate_menu">
@@ -335,5 +329,5 @@
           <para>
             is a session startup script that allows for command
-            executions prior to <command>fluxbox</command> starting
+            executions prior to <command>fluxbox</command> starting.
           </para>
           <indexterm zone="fluxbox startfluxbox">
@@ -347,5 +341,5 @@
         <listitem>
           <para>
-            displays a run dialog window
+            displays a run dialog window.
           </para>
           <indexterm zone="fluxbox fbrun">
@@ -360,5 +354,5 @@
           <para>
             provides command line access to key commands for
-            <application>Fluxbox</application>
+            <application>Fluxbox</application>.
           </para>
           <indexterm zone="fluxbox fluxbox-remote">
@@ -372,5 +366,5 @@
         <listitem>
           <para>
-            use to manage config files (reload, update, test)
+            use to manage config files (reload, update, test).
           </para>
           <indexterm zone="fluxbox fluxbox-update_configs">
Index: x/wm/icewm.xml
===================================================================
--- x/wm/icewm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/wm/icewm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY icewm-download-http "https://github.com/ice-wm/icewm/archive/&icewm-version;/icewm-&icewm-version;.tar.gz">
   <!ENTITY icewm-download-ftp  " ">
-  <!ENTITY icewm-md5sum        "4114f69e87441e81427ab1dea169acd0">
-  <!ENTITY icewm-size          "2.2 MB">
-  <!ENTITY icewm-buildsize     "44 MB">
-  <!ENTITY icewm-time          "0.2 SBU (Using parallelism=4)">
+  <!ENTITY icewm-md5sum        "0f02dadf0d4420c575685c87cb48d36f">
+  <!ENTITY icewm-size          "2.1 MB">
+  <!ENTITY icewm-buildsize     "46 MB">
+  <!ENTITY icewm-time          "0.2 SBU (Using parallelixm=4)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -81,7 +82,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="asciidoc"/> (for regenerating the HTML documentation),
       <xref linkend="fribidi"/> (for languages written right to left),
-      <xref linkend="imlib2"/>, 
       <xref linkend="librsvg"/>,
       <xref linkend="libao"/>,
@@ -110,6 +109,4 @@
       -DCFGDIR=/etc               \
       -DENABLE_LTO=ON             \
-      -DCONFIG_GDK_PIXBUF_XLIB=ON \
-      -DCONFIG_IMLIB2=OFF         \
       -DDOCDIR=/usr/share/doc/icewm-&icewm-version;  \
       .. &amp;&amp;
@@ -215,5 +212,5 @@
       </para>
 
-<screen><userinput>mkdir -pv ~/.icewm                                      &amp;&amp;
+<screen><userinput>mkdir -v ~/.icewm                                       &amp;&amp;
 cp -v /usr/share/icewm/keys ~/.icewm/keys               &amp;&amp;
 cp -v /usr/share/icewm/menu ~/.icewm/menu               &amp;&amp;
@@ -378,5 +375,5 @@
         <listitem>
           <para>
-            is used to display the html manual
+            is used to display the html manual.
           </para>
           <indexterm zone="icewm icehelp">
@@ -391,5 +388,5 @@
           <para>
             is a command-line window manager which can be used in
-            <filename>~/.icewm/startup</filename>
+            <filename>~/.icewm/startup</filename>.
           </para>
           <indexterm zone="icewm icesh">
@@ -403,5 +400,5 @@
         <listitem>
           <para>
-            plays audio files on GUI events raised by IceWM
+            plays audio files on GUI events raised by IceWM.
           </para>
           <indexterm zone="icewm icesound">
@@ -415,5 +412,5 @@
         <listitem>
           <para>
-            is the window manager
+            is the window manager.
           </para>
           <indexterm zone="icewm icewm-prog">
@@ -429,5 +426,5 @@
             can create a file in a format suitable for an IceWM menu, which
             lists those programs currently installed in a layout conforming to
-            the FDO Desktop Menu Specifications
+            the FDO Desktop Menu Specifications.
           </para>
           <indexterm zone="icewm icewm-menu-fdo">
@@ -441,5 +438,5 @@
         <listitem>
           <para>
-            is a helper program used to manage multi-screen configurations
+            is a helper program used to manage multi-screen configurations.
           </para>
           <indexterm zone="icewm icewm-menu-xrandr">
@@ -454,5 +451,5 @@
           <para>
             runs icewmbg, icewm, icewmtray, startup, shutdown (i.e. startup
-            and shutdown scripts are run if installed)
+            and shutdown scripts are run if installed).
           </para>
           <indexterm zone="icewm icewm-session">
@@ -468,5 +465,5 @@
             is a script to set the <application>GNOME</application> window
             manager to <application>icewm</application> using
-            <application>gconftool</application>
+            <application>gconftool</application>.
           </para>
           <indexterm zone="icewm icewm-set-gnomewm">
@@ -481,5 +478,5 @@
           <para>
             is used to set the background, according to the various
-            <literal>DesktopBackground</literal> settings in the preferences
+            <literal>DesktopBackground</literal> settings in the preferences.
           </para>
           <indexterm zone="icewm icewmbg">
@@ -493,5 +490,5 @@
         <listitem>
           <para>
-            is used internally
+            is used internally.
           </para>
           <indexterm zone="icewm icewmhint">
@@ -505,5 +502,5 @@
         <listitem>
           <para>
-            provides the tray
+            provides the tray.
           </para>
           <indexterm zone="icewm icewmtray">
Index: x/wm/openbox.xml
===================================================================
--- x/wm/openbox.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/wm/openbox.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -283,5 +284,5 @@
         <!-- 13-12-11 numlockx not found on the KDE website. This URL is OK ? -->
         <ulink url=
-        "https://ftp.debian.org/debian/pool/main/n/numlockx/numlockx_1.2.orig.tar.gz">
+        "http://ftp.de.debian.org/debian/pool/main/n/numlockx/numlockx_1.2.orig.tar.gz">
         Numlockx</ulink> and add that to your xinitrc. Another useful
         application is <xref linkend="dbus"/>:
@@ -334,5 +335,5 @@
           <para>
             is a command line tool to send signals to
-            <application>GDM</application>
+            <application>GDM</application>.
           </para>
           <indexterm zone="openbox gdm-control">
@@ -347,8 +348,9 @@
           <para>
             is a command line utility to invoke the <application>Gnome
-            Panel</application> run dialog/menu
+            Panel</application> run dialog/menu.
           </para>
           <indexterm zone="openbox gnome-panel-control">
-            <primary sortas="b-gnome-panel-control">gnome-panel-control</primary>
+            <primary
+            sortas="b-gnome-panel-control">gnome-panel-control</primary>
           </indexterm>
         </listitem>
@@ -361,5 +363,5 @@
             is a tool for displaying the properties on an x window. It has a
             similar functionality to <command>xprop</command>, but allows you to
-            see UTF-8 strings as text
+            see UTF-8 strings as text.
           </para>
           <indexterm zone="openbox obxprop">
@@ -373,5 +375,5 @@
         <listitem>
           <para>
-            is a standards compliant, highly configurable, window manager
+            is a standards compliant, highly configurable, window manager.
           </para>
           <indexterm zone="openbox openbox">
@@ -387,8 +389,9 @@
             is a script to launch an <application>Gnome</application> session
             with <application>Openbox</application> as your window manager from
-            your <filename>~/.xinitrc</filename>
+            your <filename>~/.xinitrc</filename>.
           </para>
           <indexterm zone="openbox openbox-gnome-session">
-            <primary sortas="b-openbox-gnome-session">openbox-gnome-session</primary>
+            <primary
+            sortas="b-openbox-gnome-session">openbox-gnome-session</primary>
           </indexterm>
         </listitem>
@@ -401,8 +404,9 @@
             is a script to launch an <application>KDE</application> session with
             <application>Openbox</application> as your window manager from your
-            <filename>~/.xinitrc</filename>
+            <filename>~/.xinitrc</filename>.
           </para>
           <indexterm zone="openbox openbox-kde-session">
-            <primary sortas="b-openbox-kde-session">openbox-kde-session</primary>
+            <primary
+            sortas="b-openbox-kde-session">openbox-kde-session</primary>
           </indexterm>
         </listitem>
@@ -414,5 +418,5 @@
           <para>
             is a script to launch an <application>Openbox</application> session
-            from your <filename>~/.xinitrc</filename>
+            from your <filename>~/.xinitrc</filename>.
           </para>
           <indexterm zone="openbox openbox-session">
@@ -427,5 +431,5 @@
           <para>
             contains the functions used by <application>Openbox</application>
-            for theme rendering
+            for theme rendering.
           </para>
           <indexterm zone="openbox libobrender">
@@ -439,5 +443,5 @@
         <listitem>
           <para>
-            is the <application>Openbox</application> toolkit library
+            is the <application>Openbox</application> toolkit library.
           </para>
           <indexterm zone="openbox libobt">
@@ -448,4 +452,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: x/wm/sawfish.xml
===================================================================
--- x/wm/sawfish.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/wm/sawfish.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY sawfish-download-http "https://download.tuxfamily.org/sawfish/sawfish_&sawfish-version;.tar.xz">
+  <!ENTITY sawfish-download-http "http://download.tuxfamily.org/sawfish/sawfish_&sawfish-version;.tar.xz">
   <!ENTITY sawfish-download-ftp  " ">
   <!ENTITY sawfish-md5sum        "074446085b2518a07cf0e0c8c8b6df41">
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -91,9 +92,4 @@
     </para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libnsl"/>
-    </para>
-
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/sawfish"/></para>
@@ -183,5 +179,5 @@
         (If you have a two-button mouse, try clicking both buttons
         simultaneously)</quote>. You can find this at <ulink
-        url="https://download.tuxfamily.org/sawfish/themes/FAQ.html/">sawfish's
+        url="http://download.tuxfamily.org/sawfish/themes/FAQ.html/">sawfish's
         FAQ</ulink>.
       </para>
@@ -227,5 +223,5 @@
           <para>
             is the extensible window manager using a
-            <application>Lisp</application>-based scripting language
+            <application>Lisp</application>-based scripting language.
           </para>
           <indexterm zone="sawfish sawfish-prog">
@@ -239,5 +235,5 @@
         <listitem>
           <para>
-            is the <application>sawfish</application> about window
+            is the <application>sawfish</application> about window.
           </para>
           <indexterm zone="sawfish sawfish-about">
@@ -252,5 +248,5 @@
           <para>
             allows you to connect to a window manager process and
-            evaluate arbitrary <application>Lisp</application> forms
+            evaluate arbitrary <application>Lisp</application> forms.
           </para>
           <indexterm zone="sawfish sawfish-client">
@@ -264,5 +260,5 @@
         <listitem>
           <para>
-            is the <application>sawfish</application> configuration manager
+            is the <application>sawfish</application> configuration manager.
           </para>
           <indexterm zone="sawfish sawfish-config-prog">
@@ -277,5 +273,5 @@
           <para>
              is a script to run <application>KDE4</application> using
-             <application>sawfish</application>
+             <application>sawfish</application>.
           </para>
           <indexterm zone="sawfish sawfish-kde4-session">
@@ -303,5 +299,5 @@
           <para>
              is a script to run <application>mate</application> using
-             <application>sawfish</application>
+             <application>sawfish</application>.
           </para>
           <indexterm zone="sawfish sawfish-mate-session">
@@ -316,5 +312,5 @@
           <para>
              is a script to run <application>Lumina</application> using
-             <application>sawfish</application>
+             <application>sawfish</application>.
           </para>
           <indexterm zone="sawfish sawfish-lumina-session">
@@ -329,5 +325,5 @@
           <para>
              is a script to run <application>xfce</application> using
-             <application>sawfish</application>
+             <application>sawfish</application>.
           </para>
           <indexterm zone="sawfish sawfish-xfce-session">
Index: x/wm/wm.xml
===================================================================
--- x/wm/wm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/wm/wm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,4 +10,9 @@
 
   <title>Window Managers</title>
+
+  <!--
+  $LastChangedBy$
+  $Date$/date>
+  -->
 
   <para>
Index: x/x.xml
===================================================================
--- x/x.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ x/x.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <part id="x" xreflabel="X plus Window and Display Managers">
Index: xfce/apps/apps.xml
===================================================================
--- xfce/apps/apps.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xfce/apps/apps.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="xfce-apps">
Index: xfce/apps/parole.xml
===================================================================
--- xfce/apps/parole.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xfce/apps/parole.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,9 +6,9 @@
 
   <!ENTITY parole-download-http
-           "https://archive.xfce.org/src/apps/parole/4.16/parole-&parole-version;.tar.bz2">
+           "http://archive.xfce.org/src/apps/parole/4.15/parole-&parole-version;.tar.bz2">
   <!ENTITY parole-download-ftp  " ">
-  <!ENTITY parole-md5sum        "b9adffdef4bab6ca454569d562051843">
-  <!ENTITY parole-size          "904 KB">
-  <!ENTITY parole-buildsize     "22 MB">
+  <!ENTITY parole-md5sum        "baf86d34ff5f88d83343bf7118f06702">
+  <!ENTITY parole-size          "896 KB">
+  <!ENTITY parole-buildsize     "18 MB">
   <!ENTITY parole-time          "0.2 SBU">
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <note>
@@ -128,10 +129,9 @@
   </sect2>
 
-<!-- We don't have gst-0.10 anymore, so this can go.
   <sect2 role="commands">
     <title>Command Explanations</title>
 
     <para>
-      <option>- -with-gstreamer=1.0</option>: Use this switch if both
+      <option>--with-gstreamer=1.0</option>: Use this switch if both
       the <xref linkend='gstreamer10'/> and the deprecated gstreamer-0.x  
       packages are installed.
@@ -139,5 +139,5 @@
 
   </sect2>
--->
+
   <sect2 role="using">
     <title>Using Parole</title>
@@ -188,6 +188,6 @@
         <listitem>
           <para>
-            is a <application>GTK+ 3</application> media player that
-            uses <application>GStreamer</application>
+            is a <application>GTK+ 2</application> media player that
+            uses <application>GStreamer</application>.
           </para>
           <indexterm zone="parole parole-prog">
Index: xfce/apps/ristretto.xml
===================================================================
--- xfce/apps/ristretto.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xfce/apps/ristretto.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,9 +6,9 @@
 
   <!ENTITY ristretto-download-http
-           "https://archive.xfce.org/src/apps/ristretto/0.11/ristretto-&ristretto-version;.tar.bz2">
+           "http://archive.xfce.org/src/apps/ristretto/0.10/ristretto-&ristretto-version;.tar.bz2">
   <!ENTITY ristretto-download-ftp  " ">
-  <!ENTITY ristretto-md5sum        "134d4a49a98b28ba6e91b862fb9a24cc">
-  <!ENTITY ristretto-size          "576 KB">
-  <!ENTITY ristretto-buildsize     "9.6 MB">
+  <!ENTITY ristretto-md5sum        "4249e14fba78728481d89ce61a8771fc">
+  <!ENTITY ristretto-size          "573 KB">
+  <!ENTITY ristretto-buildsize     "9.5 MB">
   <!ENTITY ristretto-time          "0.1 SBU">
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -142,5 +143,5 @@
         <listitem>
           <para>
-            is a fast and lightweight image viewer
+            is a fast and lightweight image viewer.
           </para>
           <indexterm zone="ristretto ristretto-prog">
Index: xfce/apps/xfburn.xml
===================================================================
--- xfce/apps/xfburn.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xfce/apps/xfburn.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY xfburn-download-http
-           "https://archive.xfce.org/src/apps/xfburn/0.6/xfburn-&xfburn-version;.tar.bz2">
+           "http://archive.xfce.org/src/apps/xfburn/0.6/xfburn-&xfburn-version;.tar.bz2">
   <!ENTITY xfburn-download-ftp  " ">
   <!ENTITY xfburn-md5sum        "f4666de100f62fac070b5840e8b98014">
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -156,5 +157,5 @@
           <para>
             is a <application>GTK+ 3</application> application for
-            creating CDs and DVDs
+            creating CDs and DVDs.
           </para>
           <indexterm zone="xfburn xfburn-prog">
Index: xfce/apps/xfce4-dev-tools.xml
===================================================================
--- xfce/apps/xfce4-dev-tools.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
+++ xfce/apps/xfce4-dev-tools.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -0,0 +1,156 @@
+<?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 xfce4-dev-tools-download-http
+           "http://archive.xfce.org/src/xfce/xfce4-dev-tools/4.14/xfce4-dev-tools-&xfce4-dev-tools-version;.tar.bz2">
+  <!ENTITY xfce4-dev-tools-download-ftp  " ">
+  <!ENTITY xfce4-dev-tools-md5sum        "5f8fc8af73819c08d9e4c26a3ac457e7">
+  <!ENTITY xfce4-dev-tools-size          "288 KB">
+  <!ENTITY xfce4-dev-tools-buildsize     "3.3 MB">
+  <!ENTITY xfce4-dev-tools-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="xfce4-dev-tools" xreflabel="xfce4-dev-tools-&xfce4-dev-tools-version;">
+  <?dbhtml filename="xfce4-dev-tools.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>xfce4-dev-tools-&xfce4-dev-tools-version;</title>
+
+  <indexterm zone="xfce4-dev-tools">
+    <primary sortas="a-xfce4-dev-tools">xfce4-dev-tools</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to the Xfce4 Development Tools</title>
+
+    <para>
+      The <application>Xfce4 Development Tools</application> are a collection of 
+      tools and macros for building some Xfce aplications.
+    </para>
+
+    &lfs10_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&xfce4-dev-tools-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&xfce4-dev-tools-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &xfce4-dev-tools-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &xfce4-dev-tools-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &xfce4-dev-tools-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &xfce4-dev-tools-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">The Xfce4 Development Tools Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="glib2"/> and
+      <xref linkend="gtk-doc"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/xfce4-dev-tools"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of the Xfce4 Development Tools</title>
+
+    <para>
+      Install the <application>Xfce4 Development Tools</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 Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          xdt-autogen and
+          xdt-csource
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/share/xfce4/dev-tools
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+<!--
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="xfce4-dev-tools-config">
+        <term><command>xfce4-dev-tools-config</command></term>
+        <listitem>
+          <para>
+            is a <application>GTK+</application> GUI that allows you to
+            change some of your preferences (theme and screen position)
+            for the notifications that the
+            <application>Xfce4 Notification Daemon</application> displays.
+          </para>
+          <indexterm zone="xfce4-dev-tools xfce4-dev-tools-config">
+            <primary sortas="b-xfce4-dev-tools-config">xfce4-dev-tools-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+-->
+  </sect2>
+
+</sect1>
Index: xfce/apps/xfce4-notifyd.xml
===================================================================
--- xfce/apps/xfce4-notifyd.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xfce/apps/xfce4-notifyd.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY xfce4-notifyd-download-http
-           "https://archive.xfce.org/src/apps/xfce4-notifyd/0.6/xfce4-notifyd-&xfce4-notifyd-version;.tar.bz2">
+           "http://archive.xfce.org/src/apps/xfce4-notifyd/0.6/xfce4-notifyd-&xfce4-notifyd-version;.tar.bz2">
   <!ENTITY xfce4-notifyd-download-ftp  " ">
   <!ENTITY xfce4-notifyd-md5sum        "7e4c7f8d922abc74b0a2e33fb123986a">
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -164,5 +165,5 @@
             change some of your preferences (theme and screen position)
             for the notifications that the
-            <application>Xfce4 Notification Daemon</application> displays
+            <application>Xfce4 Notification Daemon</application> displays.
           </para>
           <indexterm zone="xfce4-notifyd xfce4-notifyd-config">
Index: xfce/apps/xfce4-pulseaudio-plugin.xml
===================================================================
--- xfce/apps/xfce4-pulseaudio-plugin.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xfce/apps/xfce4-pulseaudio-plugin.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -41,5 +42,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: xfce/apps/xfce4-terminal.xml
===================================================================
--- xfce/apps/xfce4-terminal.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xfce/apps/xfce4-terminal.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY xfce4-terminal-download-http
-           "https://archive.xfce.org/src/apps/xfce4-terminal/0.8/xfce4-terminal-&xfce4-terminal-version;.tar.bz2">
+           "http://archive.xfce.org/src/apps/xfce4-terminal/0.8/xfce4-terminal-&xfce4-terminal-version;.tar.bz2">
   <!ENTITY xfce4-terminal-download-ftp  " ">
   <!ENTITY xfce4-terminal-md5sum        "6e18bad7109c33486cd26ef59a319f0d">
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -139,5 +140,5 @@
         <listitem>
           <para>
-            is a <application>GTK+ 3</application> terminal emulator
+            is a <application>GTK+ 3</application> terminal emulator.
           </para>
           <indexterm zone="xfce4-terminal xfce4-terminal-prog">
Index: xfce/core/core.xml
===================================================================
--- xfce/core/core.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xfce/core/core.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="xfce-core">
Index: xfce/core/exo.xml
===================================================================
--- xfce/core/exo.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xfce/core/exo.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,10 +6,10 @@
 
   <!ENTITY exo-download-http
-           "https://archive.xfce.org/src/xfce/exo/&xfce4-version;/exo-&exo-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/exo/&xfce4-version;/exo-&exo-version;.tar.bz2">
   <!ENTITY exo-download-ftp  " ">
-  <!ENTITY exo-md5sum        "c75bace01ab779afef911d8a3823c8fa">
-  <!ENTITY exo-size          "864 KB">
-  <!ENTITY exo-buildsize     "18 MB (with tests)">
-  <!ENTITY exo-time          "0.2 SBU (with tests)">
+  <!ENTITY exo-md5sum        "0e2cb9c8bbe1993249358e2b0b9d9c54">
+  <!ENTITY exo-size          "944 KB">
+  <!ENTITY exo-buildsize     "14 MB (with tests)">
+  <!ENTITY exo-time          "0.1 SBU (with tests)">
 ]>
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -154,5 +155,5 @@
         <listitem>
           <para>
-            is a command line utility to create or edit icons on the desktop
+            is a command line utility to create or edit icons on the desktop.
           </para>
           <indexterm zone="exo exo-desktop-item-edit">
@@ -169,5 +170,5 @@
             Preferred Applications framework. It can either be used to open a
             list of urls with the default URL handler or launch the preferred
-            application for a certain category
+            application for a certain category.
           </para>
           <indexterm zone="exo exo-open">
@@ -184,5 +185,5 @@
             light-weight session management support and functions to
             automatically synchronise object properties (based on GObject
-            Binding Properties)
+            Binding Properties).
           </para>
           <indexterm zone="exo libexo-2">
Index: xfce/core/garcon.xml
===================================================================
--- xfce/core/garcon.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xfce/core/garcon.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,9 +6,9 @@
 
   <!ENTITY garcon-download-http
-           "https://archive.xfce.org/src/xfce/garcon/&garcon-minor;/garcon-&garcon-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/garcon/&garcon-minor;/garcon-&garcon-version;.tar.bz2">
   <!ENTITY garcon-download-ftp  " ">
-  <!ENTITY garcon-md5sum        "0a8b96a47e375055fd7ebf41f495add5">
-  <!ENTITY garcon-size          "509 KB">
-  <!ENTITY garcon-buildsize     "8.2 MB">
+  <!ENTITY garcon-md5sum        "a9c2116b0c34a022385f421b639df0f4">
+  <!ENTITY garcon-size          "528 KB">
+  <!ENTITY garcon-buildsize     "8.1 MB">
   <!ENTITY garcon-time          "0.1 SBU">
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -149,5 +150,5 @@
             contains functions that provide a freedesktop.org compliant menu
             implementation based on <application>GLib</application> and
-            <application>GIO</application>
+            <application>GIO</application>.
           </para>
           <indexterm zone="garcon libgarcon-1">
Index: xfce/core/libxfce4ui.xml
===================================================================
--- xfce/core/libxfce4ui.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xfce/core/libxfce4ui.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY libxfce4ui-download-http
-           "https://archive.xfce.org/src/xfce/libxfce4ui/&xfce4-version;/libxfce4ui-&libxfce4ui-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/libxfce4ui/&xfce4-version;/libxfce4ui-&libxfce4ui-version;.tar.bz2">
   <!ENTITY libxfce4ui-download-ftp  " ">
   <!ENTITY libxfce4ui-md5sum        "4a7035374f016efa968b776a110065d9">
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -166,5 +167,5 @@
             is a private <application>Xfce</application> library for sharing
             code between <application>Xfwm4</application> and
-            <application>Xfce4 Settings</application>
+            <application>Xfce4 Settings</application>.
           </para>
           <indexterm zone="libxfce4ui libxfce4kbd-private-2">
@@ -179,5 +180,5 @@
           <para>
             contains widgets that are used by other
-            <application>Xfce</application> applications
+            <application>Xfce</application> applications.
           </para>
           <indexterm zone="libxfce4ui libxfce4ui-1">
Index: xfce/core/libxfce4util.xml
===================================================================
--- xfce/core/libxfce4util.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xfce/core/libxfce4util.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY libxfce4util-download-http
-           "https://archive.xfce.org/src/xfce/libxfce4util/&xfce4-version;/libxfce4util-&libxfce4util-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/libxfce4util/&xfce4-version;/libxfce4util-&libxfce4util-version;.tar.bz2">
   <!ENTITY libxfce4util-download-ftp  " ">
   <!ENTITY libxfce4util-md5sum        "5a2a7b72c0357f410d8e0d4190beeae2">
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -77,9 +78,4 @@
       <xref linkend="glib2"/> and
       <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="vala"/>
     </para>
 
@@ -151,5 +147,5 @@
             user and reports whether the user has the capabilities or not. This
             tool is mainly meant for system administrators to test their Kiosk
-            setup
+            setup.
           </para>
           <indexterm zone="libxfce4util xfce4-kiosk-query">
@@ -164,5 +160,5 @@
           <para>
             contains basic utility functions for the
-            <application>Xfce</application> desktop environment
+            <application>Xfce</application> desktop environment.
           </para>
           <indexterm zone="libxfce4util libxfce4util-lib">
Index: xfce/core/thunar-volman.xml
===================================================================
--- xfce/core/thunar-volman.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xfce/core/thunar-volman.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY thunar-volman-download-http
-           "https://archive.xfce.org/src/xfce/thunar-volman/&xfce4-version;/thunar-volman-&thunar-volman-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/thunar-volman/&xfce4-version;/thunar-volman-&thunar-volman-version;.tar.bz2">
   <!ENTITY thunar-volman-download-ftp  " ">
   <!ENTITY thunar-volman-md5sum        "50ccc0e9a4eb7b5a6e9e498823c577f9">
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -150,5 +151,5 @@
           <para>
             is the <application>Thunar</application> Volume Manager, a command
-            line utility to automatically mount or unmount removable media
+            line utility to automatically mount or unmount removable media.
           </para>
           <indexterm zone="thunar-volman thunar-volman-prog">
@@ -162,6 +163,6 @@
         <listitem>
           <para>
-            is a small <application>GTK+ 3</application> application for changing
-            <application>Thunar Volume Manager</application> settings
+            is a small <application>GTK+ 2</application> application for changing
+            <application>Thunar Volume Manager</application> settings.
           </para>
           <indexterm zone="thunar-volman thunar-volman-settings">
Index: xfce/core/thunar.xml
===================================================================
--- xfce/core/thunar.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xfce/core/thunar.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,10 +6,10 @@
 
   <!ENTITY thunar-download-http
-           "https://archive.xfce.org/src/xfce/thunar/&xfce4-version;/thunar-&thunar-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/thunar/&xfce4-version;/thunar-&thunar-version;.tar.bz2">
   <!ENTITY thunar-download-ftp  " ">
-  <!ENTITY thunar-md5sum        "7bdf84a1eb6bf7a033cf4df031e8715d">
-  <!ENTITY thunar-size          "2.4 MB">
-  <!ENTITY thunar-buildsize     "53 MB">
-  <!ENTITY thunar-time          "0.5 SBU">
+  <!ENTITY thunar-md5sum        "af620c3b226b3bf5c025a7eaad6dd540">
+  <!ENTITY thunar-size          "2.3 MB">
+  <!ENTITY thunar-buildsize     "52 MB">
+  <!ENTITY thunar-time          "0.4 SBU">
 ]>
 
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -41,5 +42,5 @@
     Nautilus).-->
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -81,5 +82,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="exo"/>
+      <xref linkend="exo"/> and
     </para>
 
@@ -91,7 +92,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="libgudev"/>,
-      <xref linkend="libnotify"/>, and
-      <xref linkend="pcre"/>
+      <xref linkend="libgudev"/> and
+      <xref linkend="libnotify"/> 
     </para>
 
@@ -186,5 +186,5 @@
         <listitem>
           <para>
-            is the <application>Xfce</application> file manager
+            is the <application>Xfce</application> file manager.
           </para>
           <indexterm zone="thunar thunar-prog">
@@ -199,5 +199,5 @@
           <para>
             is a shell script that launches a dialog box to allow you to alter
-            the behaviour of <application>Thunar</application>
+            the behaviour of <application>Thunar</application>.
           </para>
           <indexterm zone="thunar thunar-settings">
@@ -213,5 +213,5 @@
             contains the <application>Thunar</application> extension library
             which permits adding new features to the
-            <application>Thunar</application> file manager
+            <application>Thunar</application> file manager.
           </para>
           <indexterm zone="thunar libthunarx-3">
Index: xfce/core/tumbler.xml
===================================================================
--- xfce/core/tumbler.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xfce/core/tumbler.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY tumbler-download-http
-           "https://archive.xfce.org/src/xfce/tumbler/&xfce4-version;/tumbler-&tumbler-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/tumbler/&xfce4-version;/tumbler-&tumbler-version;.tar.bz2">
   <!ENTITY tumbler-download-ftp  " ">
   <!ENTITY tumbler-md5sum        "3ab8fc5ea03e975c6df2ac1c81fbfc68">
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -159,5 +160,5 @@
           <para>
             is a D-Bus service for applications such as Thunar and
-            Ristretto to use thumbnail images
+            Ristretto to use thumbnail images.
           </para>
           <indexterm zone="tumbler tumblerd">
@@ -172,5 +173,5 @@
           <para>
             contains functions that the <application>Tumbler</application>
-            daemon uses to create thumbnail images
+            daemon uses to create thumbnail images.
           </para>
           <indexterm zone="tumbler libtumbler-1">
Index: xfce/core/xfce4-appfinder.xml
===================================================================
--- xfce/core/xfce4-appfinder.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xfce/core/xfce4-appfinder.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,9 +6,9 @@
 
   <!ENTITY xfce4-appfinder-download-http
-           "https://archive.xfce.org/src/xfce/xfce4-appfinder/&xfce4-version;/xfce4-appfinder-&xfce4-appfinder-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/xfce4-appfinder/&xfce4-version;/xfce4-appfinder-&xfce4-appfinder-version;.tar.bz2">
   <!ENTITY xfce4-appfinder-download-ftp  " ">
-  <!ENTITY xfce4-appfinder-md5sum        "1007ec4307822c0b881d63b9ec56e60b">
-  <!ENTITY xfce4-appfinder-size          "567 KB">
-  <!ENTITY xfce4-appfinder-buildsize     "6.9 MB">
+  <!ENTITY xfce4-appfinder-md5sum        "7c285e138c3cb495badc2e4dcea5f100">
+  <!ENTITY xfce4-appfinder-size          "556 KB">
+  <!ENTITY xfce4-appfinder-buildsize     "6.8 MB">
   <!ENTITY xfce4-appfinder-time          "less than 0.1 SBU">
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -137,7 +138,7 @@
         <listitem>
           <para>
-            Is a <application>GTK+ 3</application> application that enables you
+            Is a <application>GTK+ 2</application> application that enables you
             to quickly search through the .desktop files installed on your
-            system looking for an application
+            system looking for an application.
           </para>
           <indexterm zone="xfce4-appfinder xfce4-appfinder-prog">
Index: xfce/core/xfce4-panel.xml
===================================================================
--- xfce/core/xfce4-panel.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xfce/core/xfce4-panel.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,8 +6,8 @@
 
   <!ENTITY xfce4-panel-download-http
-           "https://archive.xfce.org/src/xfce/xfce4-panel/&xfce4-version;/xfce4-panel-&xfce4-panel-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/xfce4-panel/&xfce4-version;/xfce4-panel-&xfce4-panel-version;.tar.bz2">
   <!ENTITY xfce4-panel-download-ftp  " ">
-  <!ENTITY xfce4-panel-md5sum        "7a1d1d405e15240c3bbcfa56c4f32efc">
-  <!ENTITY xfce4-panel-size          "1.4 MB">
+  <!ENTITY xfce4-panel-md5sum        "19e160296e6f79ae27266a38a499ef3b">
+  <!ENTITY xfce4-panel-size          "1.3 MB">
   <!ENTITY xfce4-panel-buildsize     "37 MB">
   <!ENTITY xfce4-panel-time          "0.4 SBU">
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -160,5 +161,5 @@
         <listitem>
           <para>
-            is the <application>Xfce</application> panel
+            is the <application>Xfce</application> panel.
           </para>
           <indexterm zone="xfce4-panel xfce4-panel-prog">
@@ -174,5 +175,5 @@
             is a shell script that uses <application>D-Bus</application> and
             <application>Xfce Panel</application> to display a popup menu of the
-            installed applications
+            installed applications.
           </para>
           <indexterm zone="xfce4-panel xfce4-popup-applicationsmenu">
@@ -188,5 +189,5 @@
             is a shell script that uses <application>D-Bus</application> and
             <application>Xfce Panel</application> to display a popup menu of
-            your home folder and its subdirectories
+            your home folder and its subdirectories.
           </para>
           <indexterm zone="xfce4-panel xfce4-popup-directorymenu">
@@ -201,5 +202,5 @@
           <para>
             is a shell script that uses <application>DBus</application> to
-            display the <application>Xfwm4</application> a popup menu
+            display the <application>Xfwm4</application> a popup menu.
           </para>
           <indexterm zone="xfce4-panel xfce4-popup-windowmenu">
@@ -213,5 +214,5 @@
         <listitem>
           <para>
-            contains the <application>Xfce Panel</application> API functions
+            contains the <application>Xfce Panel</application> API functions.
           </para>
           <indexterm zone="xfce4-panel libxfce4panel-2.0">
Index: xfce/core/xfce4-power-manager.xml
===================================================================
--- xfce/core/xfce4-power-manager.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xfce/core/xfce4-power-manager.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY xfce4-power-manager-download-http
-           "https://archive.xfce.org/src/xfce/xfce4-power-manager/&xfce4-version;/xfce4-power-manager-&xfce4-power-manager-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/xfce4-power-manager/&xfce4-version;/xfce4-power-manager-&xfce4-power-manager-version;.tar.bz2">
   <!ENTITY xfce4-power-manager-download-ftp  " ">
   <!ENTITY xfce4-power-manager-md5sum        "6fbf95dcfe2154be4ff252545c7c887b">
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -42,5 +43,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -155,5 +156,5 @@
           <para>
             is a helper program for the suspend and hibernate functions of
-            <command>xfce4-power-manager</command>
+            <command>xfce4-power-manager</command>.
           </para>
           <indexterm zone="xfce4-power-manager xfce4-pm-helper">
@@ -167,5 +168,5 @@
         <listitem>
           <para>
-            is the <application>Xfce</application> Power Manager
+            is the <application>Xfce</application> Power Manager.
           </para>
           <indexterm zone="xfce4-power-manager xfce4-power-manager-prog">
@@ -180,5 +181,5 @@
           <para>
             is a utility that comes with the <application>Xfce</application>
-            Power Manager to access/change its configuration
+            Power Manager to access/change its configuration.
           </para>
           <indexterm zone="xfce4-power-manager xfce4-power-manager-settings">
@@ -193,5 +194,5 @@
           <para>
             is a command line utility to get or set the brightness of your
-            screen
+            screen.
           </para>
           <indexterm zone="xfce4-power-manager xfpm-power-backlight-helper">
Index: xfce/core/xfce4-session.xml
===================================================================
--- xfce/core/xfce4-session.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xfce/core/xfce4-session.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY xfce4-session-download-http
-           "https://archive.xfce.org/src/xfce/xfce4-session/&xfce4-version;/xfce4-session-&xfce4-session-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/xfce4-session/&xfce4-version;/xfce4-session-&xfce4-session-version;.tar.bz2">
   <!ENTITY xfce4-session-download-ftp  " ">
   <!ENTITY xfce4-session-md5sum        "2bb95124f91e9469ea5571c94d6034fe">
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -256,5 +257,5 @@
         <listitem>
           <para>
-            starts up the <application>Xfce</application> Desktop Environment
+            starts up the <application>Xfce</application> Desktop Environment.
           </para>
           <indexterm zone="xfce4-session xfce4-session-prog">
@@ -268,5 +269,5 @@
         <listitem>
           <para>
-            logs out from <application>Xfce</application>
+            logs out from <application>Xfce</application>.
           </para>
           <indexterm zone="xfce4-session xfce4-session-logout">
@@ -280,6 +281,6 @@
         <listitem>
           <para>
-            is a <application>GTK+ 3</application> GUI which allows you to alter
-            your preferences for your <application>Xfce Session</application>
+            is a <application>GTK+ 2</application> GUI which allows you to alter
+            your preferences for your <application>Xfce Session</application>.
           </para>
           <indexterm zone="xfce4-session xfce4-session-settings">
Index: xfce/core/xfce4-settings.xml
===================================================================
--- xfce/core/xfce4-settings.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xfce/core/xfce4-settings.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,9 +6,9 @@
 
   <!ENTITY xfce4-settings-download-http
-           "https://archive.xfce.org/src/xfce/xfce4-settings/&xfce4-version;/xfce4-settings-&xfce4-settings-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/xfce4-settings/&xfce4-version;/xfce4-settings-&xfce4-settings-version;.tar.bz2">
   <!ENTITY xfce4-settings-download-ftp  " ">
-  <!ENTITY xfce4-settings-md5sum        "66828054b7c745dde39f1d4031ef0291">
+  <!ENTITY xfce4-settings-md5sum        "3aa1f4edb1190f5c164d5760688f247a">
   <!ENTITY xfce4-settings-size          "1.4 MB">
-  <!ENTITY xfce4-settings-buildsize     "38 MB">
+  <!ENTITY xfce4-settings-buildsize     "30 MB">
   <!ENTITY xfce4-settings-time          "0.2 SBU">
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -183,6 +184,6 @@
         <listitem>
           <para>
-            is a <application>GTK+ 3</application> GUI to allow you to change
-            some of your keyboard and mouse preferences
+            is a <application>GTK+ 2</application> GUI to allow you to change
+            some of your keyboard and mouse preferences.
           </para>
           <indexterm zone="xfce4-settings xfce4-accessibility-settings">
@@ -196,6 +197,6 @@
         <listitem>
           <para>
-            is a <application>GTK+ 3</application> GUI to allow you to change
-            some of your theme, icon and font preferences
+            is a <application>GTK+ 2</application> GUI to allow you to change
+            some of your theme, icon and font preferences.
           </para>
           <indexterm zone="xfce4-settings xfce4-appearance-settings">
@@ -209,6 +210,6 @@
         <listitem>
           <para>
-            is a <application>GTK+ 3</application> GUI to allow you to change
-            some of your screen preferences
+            is a <application>GTK+ 2</application> GUI to allow you to change
+            some of your screen preferences.
           </para>
           <indexterm zone="xfce4-settings xfce4-display-settings">
@@ -222,6 +223,6 @@
         <listitem>
           <para>
-            is a <application>GTK+ 3</application> GUI to allow you to change
-            some of your keyboard preferences
+            is a <application>GTK+ 2</application> GUI to allow you to change
+            some of your keyboard preferences.
           </para>
           <indexterm zone="xfce4-settings xfce4-keyboard-settings">
@@ -235,6 +236,6 @@
         <listitem>
           <para>
-            is a <application>GTK+ 3</application> GUI to allow you to change
-            which applications are used to handle different mime types
+            is a <application>GTK+ 2</application> GUI to allow you to change
+            which applications are used to handle different mime types.
           </para>
           <indexterm zone="xfce4-settings xfce4-mime-settings">
@@ -248,6 +249,6 @@
         <listitem>
           <para>
-            is a <application>GTK+ 3</application> GUI to allow you to change
-            some of your mouse preferences
+            is a <application>GTK+ 2</application> GUI to allow you to change
+            some of your mouse preferences.
           </para>
           <indexterm zone="xfce4-settings xfce4-mouse-settings">
@@ -261,6 +262,6 @@
         <listitem>
           <para>
-            is a <application>GTK+ 3</application> GUI to allow you to change
-            your preferences stored in <application>Xfconf</application>
+            is a <application>GTK+ 2</application> GUI to allow you to change
+            your preferences stored in <application>Xfconf</application>.
           </para>
           <indexterm zone="xfce4-settings xfce4-settings-editor">
@@ -274,6 +275,6 @@
         <listitem>
           <para>
-            is a <application>GTK+ 3</application> GUI to allow you to change
-            many of your <application>Xfce</application> preferences
+            is a <application>GTK+ 2</application> GUI to allow you to change
+            many of your <application>Xfce</application> preferences.
           </para>
           <indexterm zone="xfce4-settings xfce4-settings-manager">
@@ -287,5 +288,5 @@
         <listitem>
           <para>
-            is the <application>Xfce</application> settings daemon
+            is the <application>Xfce</application> settings daemon.
           </para>
           <indexterm zone="xfce4-settings xfsettingsd">
Index: xfce/core/xfconf.xml
===================================================================
--- xfce/core/xfconf.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xfce/core/xfconf.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY xfconf-download-http
-           "https://archive.xfce.org/src/xfce/xfconf/&xfce4-version;/xfconf-&xfconf-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/xfconf/&xfce4-version;/xfconf-&xfconf-version;.tar.bz2">
   <!ENTITY xfconf-download-ftp  " ">
   <!ENTITY xfconf-md5sum        "ac204fcc17fd4299d59e619aadbc6194">
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -144,5 +145,5 @@
           <para>
             is a commandline utility to view or change any setting stored in
-            <application>Xfconf</application>
+            <application>Xfconf</application>.
           </para>
           <indexterm zone="xfconf xfconf-query">
@@ -157,5 +158,5 @@
           <para>
             contains basic functions for <application>Xfce</application>
-            configuration
+            configuration.
           </para>
           <indexterm zone="xfconf libxfconf">
Index: xfce/core/xfdesktop.xml
===================================================================
--- xfce/core/xfdesktop.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xfce/core/xfdesktop.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,5 +6,5 @@
 
   <!ENTITY xfdesktop-download-http
-           "https://archive.xfce.org/src/xfce/xfdesktop/&xfce4-version;/xfdesktop-&xfdesktop-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/xfdesktop/&xfce4-version;/xfdesktop-&xfdesktop-version;.tar.bz2">
   <!ENTITY xfdesktop-download-ftp  " ">
   <!ENTITY xfdesktop-md5sum        "20de956693011c429e3ec2928f535b7a">
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -38,5 +39,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -149,5 +150,5 @@
           <para>
             is the <application>Xfce</application> Desktop Environment's desktop
-            manager
+            manager.
           </para>
           <indexterm zone="xfdesktop xfdesktop-prog">
@@ -161,7 +162,7 @@
         <listitem>
           <para>
-            is a <application>GTK+ 3</application> application that allows you to
+            is a <application>GTK+ 2</application> application that allows you to
             change your desktop background, some preferences for the right click
-            menu and what icons are displayed on the desktop
+            menu and what icons are displayed on the desktop.
           </para>
           <indexterm zone="xfdesktop xfdesktop-settings">
Index: xfce/core/xfwm4.xml
===================================================================
--- xfce/core/xfwm4.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xfce/core/xfwm4.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY xfwm4-download-http "https://archive.xfce.org/src/xfce/xfwm4/&xfce4-version;/xfwm4-&xfwm4-version;.tar.bz2">
+  <!ENTITY xfwm4-download-http "http://archive.xfce.org/src/xfce/xfwm4/&xfce4-version;/xfwm4-&xfwm4-version;.tar.bz2">
   <!ENTITY xfwm4-download-ftp  " ">
-  <!ENTITY xfwm4-md5sum        "7fd137caeb5b9a17f38e14641c638111">
+  <!ENTITY xfwm4-md5sum        "c464e52540cef79059ef31eb2fa6dc12">
   <!ENTITY xfwm4-size          "1.1 MB">
-  <!ENTITY xfwm4-buildsize     "33 MB">
+  <!ENTITY xfwm4-buildsize     "26 MB">
   <!ENTITY xfwm4-time          "0.2 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -162,5 +163,5 @@
         <listitem>
           <para>
-            is the <application>Xfce</application> window manager
+            is the <application>Xfce</application> window manager.
           </para>
           <indexterm zone="xfwm4 xfwm4-prog">
@@ -174,7 +175,7 @@
         <listitem>
           <para>
-            is a <application>GTK+ 3</application> application that allows
+            is a <application>GTK+ 2</application> application that allows
             setting some preferences such as your theme, keyboard shortcuts and
-            mouse focus behaviour
+            mouse focus behaviour.
           </para>
           <indexterm zone="xfwm4 xfwm4-settings">
@@ -188,6 +189,6 @@
         <listitem>
           <para>
-            is a <application>GTK+ 3</application> application that allows
-            setting some more preferences for <application>Xfwm4</application>
+            is a <application>GTK+ 2</application> application that allows
+            setting some more preferences for <application>Xfwm4</application>.
           </para>
           <indexterm zone="xfwm4 xfwm4-tweaks-settings">
@@ -201,6 +202,6 @@
         <listitem>
           <para>
-            is a <application>GTK+ 3</application> application that allows
-            setting your workspace preferences
+            is a <application>GTK+ 2</application> application that allows
+            setting your workspace preferences.
           </para>
           <indexterm zone="xfwm4 xfwm4-workspace-settings">
Index: xfce/xfce.xml
===================================================================
--- xfce/xfce.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xfce/xfce.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <part id="xfce" xreflabel="Xfce">
Index: xincludes/SIOCGSTAMP.xml
===================================================================
--- xincludes/SIOCGSTAMP.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/SIOCGSTAMP.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+<!-- $LastChangedBy$
+     $Date$ -->
 
     <para>
Index: xincludes/X11R6_symlink.xml
===================================================================
--- xincludes/X11R6_symlink.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/X11R6_symlink.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+    <!-- $LastChangedBy$ -->
+    <!-- $Date$ -->
 
     <para>This package (unfortunately) expects the <application>X
Index: xincludes/gnome-mandir.xml
===================================================================
--- xincludes/gnome-mandir.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/gnome-mandir.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,4 +6,6 @@
 ]>
 
+    <!-- $LastChangedBy$
+         $Date$ -->
 
     <!-- FIXME:ken - any use is probably no longer required, everything so far
Index: xincludes/gnome-old-prefix.xml
===================================================================
--- xincludes/gnome-old-prefix.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/gnome-old-prefix.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+    <!-- $LastChangedBy$
+         $Date$ -->
 
     <para><parameter>--prefix=$(pkg-config --variable=prefix
Index: xincludes/gnome-old-sysconfdir.xml
===================================================================
--- xincludes/gnome-old-sysconfdir.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/gnome-old-sysconfdir.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,4 +6,6 @@
 ]>
 
+    <!-- $LastChangedBy$
+         $Date$ -->
 
     <para><parameter>--sysconfdir=<envar>&gnome-old-etc-dir;</envar></parameter>:
Index: xincludes/gnome-prefix.xml
===================================================================
--- xincludes/gnome-prefix.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/gnome-prefix.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+    <!-- $LastChangedBy$
+         $Date$ -->
 
     <para><parameter>--prefix=<envar>$GNOME_PREFIX</envar></parameter>: Setting
Index: xincludes/gnome-sysconfdir.xml
===================================================================
--- xincludes/gnome-sysconfdir.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/gnome-sysconfdir.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,4 +6,6 @@
 ]>
 
+    <!-- $LastChangedBy$
+         $Date$ -->
 
     <para><parameter>--sysconfdir=<envar>$GNOME_SYSCONFDIR</envar></parameter>:
Index: xincludes/gnome2.xml
===================================================================
--- xincludes/gnome2.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/gnome2.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+    <!-- $LastChangedBy$
+         $Date$ -->
 
 
Index: xincludes/gsettings-destdir.xml
===================================================================
--- xincludes/gsettings-destdir.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/gsettings-destdir.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -2,4 +2,7 @@
 <!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
+
+    <!-- $LastChangedBy$
+         $Date$ -->
 
     <note>
Index: xincludes/gst10-objc-error.xml
===================================================================
--- xincludes/gst10-objc-error.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/gst10-objc-error.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+    <!-- $LastChangedBy$
+         $Date$ -->
 
     <!-- As part of their move to Meson, the GStreamer developers included a
Index: xincludes/gst10-plugins.xml
===================================================================
--- xincludes/gst10-plugins.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/gst10-plugins.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+    <!-- $LastChangedBy$
+         $Date$ -->
 
     <!-- Since this is referenced in every GStreamer Plugins page, simplify
Index: xincludes/gtk-doc-rebuild-problem.xml
===================================================================
--- xincludes/gtk-doc-rebuild-problem.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/gtk-doc-rebuild-problem.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+    <!-- $LastChangedBy$
+         $Date$ -->
 
     <para><option>--enable-gtk-doc</option>: This parameter is normally
Index: xincludes/gtk-doc-rebuild.xml
===================================================================
--- xincludes/gtk-doc-rebuild.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/gtk-doc-rebuild.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,7 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+    <!-- $LastChangedBy$
+         $Date$ -->
+
     <para><option>--enable-gtk-doc</option>: Use this parameter if
     <application>GTK-Doc</application> is installed and you wish to rebuild
Index: xincludes/gtk-update-icon-cache.xml
===================================================================
--- xincludes/gtk-update-icon-cache.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/gtk-update-icon-cache.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -2,4 +2,7 @@
 <!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
+
+    <!-- $LastChangedBy$
+         $Date$ -->
 
     <note>
Index: xincludes/lib-config.xml
===================================================================
--- xincludes/lib-config.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/lib-config.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+<!-- $LastChangedBy$
+     $Date$ -->
 
 <para>As with most libraries, there is no configuration to do, save that the
Index: ncludes/meson-buildtype-release.xml
===================================================================
--- xincludes/meson-buildtype-release.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-    <para>
-      <parameter>--buildtype=release</parameter>: Specify a buildtype
-      suitable for stable releases of the package, as the default may
-      produce unoptimized binaries.
-    </para>
Index: ncludes/meson-wrap-nodownload.xml
===================================================================
--- xincludes/meson-wrap-nodownload.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-
-    <para>
-      <parameter>--wrap-mode=nodownload</parameter>: This switch prevents
-      <command>meson</command> from downloading any optional dependency
-      which is not installed on the system.
-    </para>
Index: ncludes/meson-wrap-nofallback.xml
===================================================================
--- xincludes/meson-wrap-nofallback.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-
-    <para>
-      <parameter>--wrap-mode=nofallback</parameter>: This switch prevents
-      <command>meson</command> from iusing subproject fallbacks for any
-      dependency declarations in the build files, stopping it downloading
-      any optional dependency which is not installed on the system.
-    </para>
Index: xincludes/mozconfigure.xml
===================================================================
--- xincludes/mozconfigure.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/mozconfigure.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+<!-- $LastChangedBy$
+     $Date$ -->
 
     <!-- to go inside a NOTE on mozilla packages which need SHELL
Index: xincludes/mozmach.xml
===================================================================
--- xincludes/mozmach.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/mozmach.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+<!-- $LastChangedBy$
+     $Date$ -->
 
     <!-- to go inside a NOTE on mozilla packages which need SHELL
Index: xincludes/mozshm.xml
===================================================================
--- xincludes/mozshm.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/mozshm.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+<!-- $LastChangedBy$
+     $Date$ -->
 
     <!-- to go inside a NOTE on mozilla packages which need shm
Index: xincludes/perl-build-install.xml
===================================================================
--- xincludes/perl-build-install.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/perl-build-install.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+    <!-- $LastChangedBy$
+         $Date$ -->
 
     <para>
Index: xincludes/perl-standard-install.xml
===================================================================
--- xincludes/perl-standard-install.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/perl-standard-install.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+    <!-- $LastChangedBy$
+         $Date$ -->
 
     <para>
Index: xincludes/perl-unsafe-install.xml
===================================================================
--- xincludes/perl-unsafe-install.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/perl-unsafe-install.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+    <!-- $LastChangedBy$
+         $Date$ -->
 
     <!-- typically, these modules fail to reference inc::Module::Install
Index: xincludes/scrollkeeper-dir.xml
===================================================================
--- xincludes/scrollkeeper-dir.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/scrollkeeper-dir.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+    <!-- $LastChangedBy$
+         $Date$ -->
 
     <para><parameter>--localstatedir=/var/lib</parameter>: This parameter is
Index: xincludes/static-libraries.xml
===================================================================
--- xincludes/static-libraries.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/static-libraries.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -2,4 +2,7 @@
 <!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
+
+<!-- $LastChangedBy$
+     $Date$ -->
 
     <para>
Index: xincludes/tex-lib.xml
===================================================================
--- xincludes/tex-lib.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/tex-lib.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+<!-- $LastChangedBy$
+     $Date$ -->
 
 <para>
Index: xincludes/tex-prefix.xml
===================================================================
--- xincludes/tex-prefix.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/tex-prefix.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+<!-- $LastChangedBy$
+     $Date$ -->
 
 <para>
Index: xincludes/tex-shared.xml
===================================================================
--- xincludes/tex-shared.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/tex-shared.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+<!-- $LastChangedBy$
+     $Date$ -->
 
 <para>
Index: xincludes/tex-system.xml
===================================================================
--- xincludes/tex-system.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/tex-system.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+<!-- $LastChangedBy$
+     $Date$ -->
 
 <para>
Index: xincludes/tex-xpdf.xml
===================================================================
--- xincludes/tex-xpdf.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/tex-xpdf.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+<!-- $LastChangedBy$
+     $Date$ -->
 
 <para>
Index: xincludes/texoptional.xml
===================================================================
--- xincludes/texoptional.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/texoptional.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+<!-- $LastChangedBy$
+     $Date$ -->
 
 <para role="optional">
Index: xincludes/texprogs.xml
===================================================================
--- xincludes/texprogs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/texprogs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,4 +6,6 @@
 ]>
 
+<!-- $LastChangedBy$
+     $Date$ -->
 
           <para>The programs included in <application>TeX</application>
@@ -16,4 +18,4 @@
           Using <command>texdoc pdflatex</command> ( replace
           <emphasis>pdflatex</emphasis> with the command name ) may also be
-          useful
+          useful.
           </para>
Index: xincludes/texrecommendlibs.xml
===================================================================
--- xincludes/texrecommendlibs.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/texrecommendlibs.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+<!-- $LastChangedBy$
+     $Date$ -->
 
 <para role="recommended">
@@ -16,4 +18,6 @@
   <xref linkend="icu"/>,
   <xref linkend="libpaper"/> (used by at least context and xelatex),
-   and <xref linkend="libpng"/>
+   and <xref linkend="libpng"/>, also
+  <xref linkend="poppler"/> (only used if suitable file versions
+  are available in <filename class="directory">texk/web2c/pdftexdir</filename>)
 </para>
Index: xincludes/texruntime.xml
===================================================================
--- xincludes/texruntime.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/texruntime.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,11 +3,9 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+<!-- $LastChangedBy$
+     $Date$ -->
 
 <para role="recommended">
-  <xref role="runtime" linkend="python2"/> is used by many scripts - most are
-  unmaintained. Many invoke <filename>/usr/bin/env python</filename>, a couple
-  invoke <filename>/usr/bin/python</filename>. It is not generally known if
-  these will work with a symlink to <command>python3</command> (as used in some
-  distros) and two from pythontex invoke <command>python2</command>.
+  <xref role="runtime" linkend="python2"/> is used by many scripts.
   <xref role="runtime" linkend="ruby"/> is used by some scripts, mostly within
   mtx_context which is part of <application>conTeXt</application>, but also
Index: xincludes/update-desktop-database.xml
===================================================================
--- xincludes/update-desktop-database.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/update-desktop-database.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+    <!-- $LastChangedBy$
+         $Date$ -->
 
     <note>
Index: xincludes/update-icons-and-desktop.xml
===================================================================
--- xincludes/update-icons-and-desktop.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/update-icons-and-desktop.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+    <!-- $LastChangedBy$
+         $Date$ -->
 
     <note>
Index: xincludes/use-unzip.xml
===================================================================
--- xincludes/use-unzip.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/use-unzip.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+<!-- $LastChangedBy$
+     $Date$ -->
 
 <note>
Index: xincludes/without-gnome.xml
===================================================================
--- xincludes/without-gnome.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/without-gnome.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+    <!-- $LastChangedBy$
+         $Date$ -->
 
 <note>
Index: xincludes/without-scrollkeeper.xml
===================================================================
--- xincludes/without-scrollkeeper.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xincludes/without-scrollkeeper.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -3,4 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
 
+<!-- $LastChangedBy$
+     $Date$ -->
 
     <para>
Index: xsoft/graphweb/epiphany.xml
===================================================================
--- xsoft/graphweb/epiphany.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/graphweb/epiphany.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,11 +6,11 @@
 
   <!ENTITY epiphany-download-http
-           "&gnome-download-http;/epiphany/&gnome-40;/epiphany-&epiphany-version;.tar.xz">
+           "&gnome-download-http;/epiphany/&gnome-minor-38;/epiphany-&epiphany-version;.tar.xz">
   <!ENTITY epiphany-download-ftp
-           "&gnome-download-ftp;/epiphany/&gnome-40;/epiphany-&epiphany-version;.tar.xz">
-  <!ENTITY epiphany-md5sum        "9b5709c8ff1bb5650d810a0008b9cc85">
-  <!ENTITY epiphany-size          "5.1 MB">
-  <!ENTITY epiphany-buildsize     "109 MB"> 
-  <!ENTITY epiphany-time          "0.3 SBU (Using parallelism=4, including tests)"> 
+           "&gnome-download-ftp;/epiphany/&gnome-minor-38;/epiphany-&epiphany-version;.tar.xz">
+  <!ENTITY epiphany-md5sum        "486b5ff95db04073efc0a4d2bf9736ca">
+  <!ENTITY epiphany-size          "3.7 MB">
+  <!ENTITY epiphany-buildsize     "93 MB"> 
+  <!ENTITY epiphany-time          "0.2 SBU (Using parallelism=4, including tests)"> 
 ]>
 
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -120,5 +121,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -139,11 +140,4 @@
     </para>
 
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
   </sect2>
 
@@ -179,5 +173,5 @@
           <para>
             is a <application>GNOME</application> web browser based on
-            the <application>WebKit2</application> rendering engine
+            the <application>WebKit2</application> rendering engine.
           </para>
           <indexterm zone="epiphany epiphany-prog">
Index: xsoft/graphweb/falkon.xml
===================================================================
--- xsoft/graphweb/falkon.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/graphweb/falkon.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -41,21 +42,5 @@
     </para>
 
-    <warning>
-      <para>
-        Falkon relies on QtWebEngine. That uses a forked copy of chromium, and
-        is therefore vulnerable to many issues found there. The Qt developers
-        have always preferred to make releases at the same time as the rest of Qt
-        (rather than adding emergency fixes). Now that they are keen to move to
-        Qt6, the 5.15.3 and later Qt-5.15 releases are initially only available
-        to paying customers. QtWebEngine is something of an exception because of
-        its LGPL licence, but getting the git sources (with the forked chromium
-        submodule) to a point where they will successfully build on a current
-        BLFS system can take a lot of effort. Be aware that future fixes for
-        vulnerabilities might be very delayed, to the extent that you might wish
-        to consider using a different browser.
-      </para>
-    </warning>
-
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -227,5 +212,5 @@
         <listitem>
           <para>
-            is a web browser which uses qtwebengine
+            is a web browser which uses qtwebengine.
           </para>
           <indexterm zone="falkon falkon-prog">
@@ -239,5 +224,5 @@
         <listitem>
           <para>
-            contains functions used by falkon
+            contains functions used by falkon.
           </para>
           <indexterm zone="falkon libFalkonPrivate.so.3">
@@ -248,4 +233,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: oft/graphweb/firefox-legacy.xml
===================================================================
--- xsoft/graphweb/firefox-legacy.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ 	(revision )
@@ -1,664 +1,0 @@
-<?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 firefox-download-http "&mozilla-http;/firefox/releases/&JS78-version;esr/source/firefox-&JS78-version;esr.source.tar.xz">
-  <!ENTITY firefox-download-ftp  " ">
-  <!ENTITY firefox-md5sum        "872623fc9f93ea8d3f3290024f0c0925">
-  <!ENTITY firefox-size          "319 MB">
-  <!-- NB with stylo, much of the build uses rust, and therefore cargo files.
-    But the extra cached cargo files, if any, seem to be minimal -->
-  <!ENTITY firefox-buildsize     "5.2 GB (186 MB installed) without tests">
-  <!-- editors: with ff63 and rust-1.29, ./mach build -j4 is probably the
-   most practical way to get a timing on a machine with more cores, if taking
-   cores offline is not practical. If in doubt, round up -->
-  <!ENTITY firefox-time          "28 SBU (on a 4-core machine) without tests">
-]>
-
-<sect1 id="firefox-legacy" xreflabel="Firefox-&JS78-version; Legacy">
-  <?dbhtml filename="firefox-legacy.html" ?>
-
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Firefox-&JS78-version;</title>
-
-  <indexterm zone="firefox-legacy">
-    <primary sortas="a-Firefox">Firefox Legacy</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Firefox Legacy</title>
-
-    <para>
-      <application>Firefox</application> is a stand-alone browser based on the
-      <application>Mozilla</application> codebase.
-    </para>
-
-    <para>This package is known to build and work properly using an LFS-10.1
-    platform but cannot be built on systems using glibc-2.34.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&firefox-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&firefox-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &firefox-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &firefox-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &firefox-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &firefox-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--<bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/firefox-&firefox-version;esr-rust1520-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>-->
-
-    <warning>
-      <para>
-        This is the old series of firefox ESR releases, the final release is
-        planned to be 78.15.0 in October 2021.  This page is expected to be
-        removed in November 2021 when firefox-91.3 is released.
-      </para>
-
-      <para>
-        If you are using glibc-2.34 or later, this old version of firefox will
-        not be usable and you should use <xref linkend="firefox"/>.
-      </para>
-
-      <para>
-        There are only two reasons to use this version: either you want to use
-        ftp from the browser and do not yet have a workaround, or you have a
-        system which for unexplained reasons cannot compile current firefox
-        (there is now a patch to work around that).
-      </para>
-    </warning>
-
-    <note>
-      <para>
-        The directory name is firefox-&JS78-version;
-      </para>
-
-      <para>
-        Extracting the tarball
-        will reset the permissions of the current directory to 0755 if you
-        have permission to do that. If you do this in a directory where
-        the sticky bit is set, such
-        as <filename class="directory">/tmp</filename> it will end with error
-        messages:
-      </para>
-
-<literallayout>tar: .: Cannot utime: Operation not permitted
-tar: .: Cannot change mode to rwxr-xr-t: Operation not permitted
-tar: Exiting with failure status due to previous errors
-</literallayout>
-
-      <para>
-        This does finish with non-zero status, but it does
-        <emphasis>NOT</emphasis> mean there is a real problem.
-        Do not untar as the <systemitem class="username">root</systemitem> user
-        in a directory where the sticky bit is set - that will unset it.
-      </para>
-
-      <para>
-        As with other large packages which use C++ (or rust), the SBU times
-        to build this vary more widely than you might expect. The build times
-        will increase significantly if your machine has to swap.
-      </para>
-
-      <para>
-        Although upstream prefer to use <application>PulseAudio</application>,
-        for the moment <application>Alsa</application> can still be used. Both
-        may need runtime configuration to get sound working.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Firefox Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="autoconf213"/>,
-      <xref linkend="cbindgen"/>,
-      <xref linkend="dbus-glib"/>,
-      both <xref linkend="gtk3"/> and
-      <xref linkend="gtk2"/>,
-      <xref linkend="libnotify"/>,
-      <xref linkend="llvm"/> (clang, used for bindgen even if using gcc),
-      <xref linkend="nodejs"/>,
-      <xref linkend="nss"/>,
-      <xref linkend="pulseaudio"/>
-      (or
-      <xref linkend="alsa-lib"/> if you edit the mozconfig;
-        now deprecated by mozilla), in either case please read the
-        Configuration Information,
-      <!-- rustc is required by cbindgen so not needed here
-      <xref linkend="rust"/>,-->
-      <xref linkend="python3"/> (rebuilt after installing <xref linkend="sqlite"/>),
-      <xref linkend="startup-notification"/>,
-      <xref linkend="unzip"/>,
-      <xref linkend="yasm"/>, and
-      <xref linkend="zip"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="icu"/>,
-      <xref linkend="libevent"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="nasm"/>
-    </para>
-
-    <note>
-      <para>
-        If you don't install recommended dependencies, then internal copies of
-        those packages will be used. They might be tested to work, but they can
-        be out of date or contain security holes.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="curl"/>,
-      <xref linkend="doxygen"/>,
-      <xref role="runtime" linkend="ffmpeg"/> (runtime, to play mov, mp3 or mp4 files),
-      <!--      <phrase revision="sysv"><ulink url="https://sourceforge.net/projects/liboauth/files/">liboauth</ulink></phrase> -->
-      <xref linkend="liboauth"/>,
-      <xref linkend="openjdk"/>,
-      <xref linkend="valgrind"/>,
-      <xref linkend="wget"/>,
-      <xref linkend="wireless_tools"/>,
-      <ulink url="https://github.com/libproxy/libproxy">libproxy</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/firefox"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Firefox Legacy</title>
-
-    <para>
-      The configuration of <application>Firefox</application> is accomplished
-      by creating a <filename>mozconfig</filename> file containing the desired
-      configuration options. A default <filename>mozconfig</filename> is
-      created below. To see the entire list of available configuration options
-      (and an abbreviated description of some of them), issue <command>./mach
-      configure &amp;&amp; ./configure --help | less</command>. You may also
-      wish to review the entire file and uncomment any other desired options.
-      Create the file by issuing the following command:
-    </para>
-
-<screen><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
-<literal># If you have a multicore machine, all cores will be used by default.
-
-# If you have installed (or will install) wireless-tools, and you wish
-# to use geolocation web services, comment out this line
-ac_add_options --disable-necko-wifi
-
-# API Keys for geolocation APIs - necko-wifi (above) is required for MLS
-# Uncomment the following line if you wish to use Mozilla Location Service
-#ac_add_options --with-mozilla-api-keyfile=$PWD/mozilla-key
-
-# Uncomment the following line if you wish to use Google's geolocaton API
-# (needed for use with saved maps with Google Maps)
-#ac_add_options --with-google-location-service-api-keyfile=$PWD/google-key
-
-# startup-notification is required since firefox-78
-
-# Uncomment the following option if you have not installed PulseAudio
-#ac_add_options --disable-pulseaudio
-# or uncomment this if you installed alsa-lib instead of PulseAudio
-#ac_add_options --enable-alsa
-
-# Comment out following options if you have not installed
-# recommended dependencies:
-ac_add_options --with-system-libevent
-ac_add_options --with-system-webp
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-icu
-
-# Do not specify the gold linker which is not the default. It will take
-# longer and use more disk space when debug symbols are disabled.
-
-# libdavid (av1 decoder) requires nasm. Uncomment this if nasm
-# has not been installed.
-#ac_add_options --disable-av1
-
-# You cannot distribute the binary if you do this
-ac_add_options --enable-official-branding
-
-# Stripping is now enabled by default.
-# Uncomment these lines if you need to run a debugger:
-#ac_add_options --disable-strip
-#ac_add_options --disable-install-strip
-
-# Disabling debug symbols makes the build much smaller and a little
-# faster. Comment this if you need to run a debugger. Note: This is
-# required for compilation on i686.
-ac_add_options --disable-debug-symbols
-
-# The elf-hack is reported to cause failed installs (after successful builds)
-# on some machines. It is supposed to improve startup time and it shrinks
-# libxul.so by a few MB - comment this if you know your machine is not affected.
-ac_add_options --disable-elf-hack
-
-# The BLFS editors recommend not changing anything below this line:
-ac_add_options --prefix=/usr
-ac_add_options --enable-application=browser
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-# enabling the tests will use a lot more space and significantly
-# increase the build time, for no obvious benefit.
-ac_add_options --disable-tests
-
-# The default level of optimization again produces a working build with gcc.
-ac_add_options --enable-optimize
-
-ac_add_options --enable-system-ffi
-ac_add_options --enable-system-pixman
-
-# --with-system-bz2 was removed in firefox-78
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-png
-ac_add_options --with-system-zlib
-
-# The following option unsets Telemetry Reporting. With the Addons Fiasco,
-# Mozilla was found to be collecting user's data, including saved passwords and
-# web form data, without users consent. Mozilla was also found shipping updates
-# to systems without the user's knowledge or permission.
-# As a result of this, use the following command to permanently disable
-# telemetry reporting in Firefox.
-unset MOZ_TELEMETRY_REPORTING
-
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build-dir</literal>
-EOF</userinput></screen>
-
-    <para>
-      Compile <application>Firefox</application> by issuing the following
-      commands:
-    </para>
-
-<!--<para>
-      Apply a patch that prevent a crash when opening HTML videos if
-      compiling against rust-1.52.0 or higher:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../firefox-&firefox-version;esr-rust1520-1.patch</userinput></screen>-->
-
-    <para>
-      In the esr version of firefox-78, the code to ensure that add-ons
-      are signed by the trusted root has been disabled, presumably for
-      organizations which require their own add-ons. To enable it as an
-      added security measure issue the following command:
-    </para>
-
-<screen><userinput>sed -e 's/Disable/Enable/'            \
-    -e '/^MOZ_REQUIRE_SIGNING/s/0/1/' \
-    -i build/mozconfig.common</userinput></screen>
-
-    <para>
-      If the geolocation APIs are needed:
-    </para>
-
-    <note>
-      <para>
-        <!-- Taken from Arch Linux - an immensely helpful link - Thanks -->
-        The Google and Mozilla API Keys below are specific to LFS. If using
-        these instructions for another distro, or if you intend to distribute
-        binary copies of the software using these instructions, please obtain
-        your own keys following the instructions located at
-        <ulink url="http://www.chromium.org/developers/how-tos/api-keys"/> and
-        <ulink url="https://location.services.mozilla.com/api"/> respectively.
-        <!-- BLFS Devs, register an account at Google with your
-        @linuxfromscratch.org email address, and I'll make you an administrator
-        for the 'Google APIs for LFS' project (where the API and OAuth keys
-        were created for use in the book).-->
-      </para>
-    </note>
-
-<screen><userinput>echo "AIzaSyDxKL42zsPjbke5O8_rPVpVrLrJ8aeE9rQ" > google-key
-echo "613364a7-9418-4c86-bcee-57e32fd70c23" > mozilla-key</userinput></screen>
-
-    <note>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-       href="../../xincludes/mozshm.xml"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-       href="../../xincludes/mozmach.xml"/>
-
-    </note>
-    <!--
-    <para>
-      If you are building on i686, apply a fix to prevent Internal Compiler
-      Errors in GCC-7+:
-    </para>
-
-<screen><userinput remap="pre">case $(uname -m) in
-   i?86) sed -i "562 s/mips64/i386/" gfx/skia/skia/third_party/skcms/src/Transform_inl.h ;;
-esac</userinput></screen>
-    -->
-<!--<para>
-      Apply a patch to allow this to be compiled with <xref linkend="rust"/>:
-    </para>
-
-<screen><userinput remap="pre">patch -p1 -i ../firefox-&firefox-version;esr-rustc1470-1.patch</userinput></screen>-->
-
-    <para>
-      Now invoke the Python script to compile the package.
-    </para>
-
-<screen><userinput>export CC=gcc CXX=g++ &amp;&amp;
-export MOZBUILD_STATE_PATH=${PWD}/mozbuild &amp;&amp;
-./mach configure                           &amp;&amp;
-./mach build</userinput></screen>
-
-    <para>
-      The <filename>mozconfig</filename> above disables the tests because
-      they use a lot more time and disk space for no obvious benefit. If
-      you have nevertheless enabled them, you can run the tests by executing
-      <command>./mach gtest</command>. This will require a network connection,
-      and to be run from within an Xorg session - there is a popup dialog
-      when it fails to connect to ALSA (that does not create a failed test).
-      One or two tests will fail.  To see the details of the failure(s) you
-      will need to log the output from that command so that you can review it.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>./mach install</userinput></screen>
-
-    <para>
-      Set environment variables back to their values:
-    </para>
-
-<screen><userinput>unset CC CXX MOZBUILD_STATE_PATH</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-<!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/SIOCGSTAMP.xml"/>-->
-
-    <para>
-      <command>export CC=gcc CXX=g++ ...</command>: Upstream now prefer
-      <application>clang</application> so that they can use one compiler
-      everywhere. On the X86 architectures <application>clang</application>
-      now appears to support most of the same security-hardening options as
-      <application>GCC</application>.
-      <!-- supported in llvm-11
-      but the newer
-      <literal>-fstack-clash-protection</literal> is still not supported.-->
-      With the current versions and the default flags,
-      <application>GCC</application> creates a marginally bigger build but
-      takes typically 2 SBU less time on a 4-core machine using the mozconfig
-      above.
-    </para>
-
-    <para>
-      <command>export MOZBUILD_STATE_PATH=${PWD}/mozbuild</command>: The build
-      is now supposed to tell you that it intends to create <filename
-      class="directory">~/.mozbuild</filename>, and offer you an option to
-      press &lt;ENTER&gt; to accept this, or Ctrl-C to cancel and restart the
-      build after specifying the directory. In practice, the message may not
-      appear until after &lt;ENTER&gt; is keyed, i.e. the build stalls.
-    </para>
-
-    <para>
-      That directory is used for a (probably random) telemetry identifier.
-      Creating this in the build directory, and deleting that after the
-      installation, prevents it being used. If you wish to participate in
-      telemetry, export MOZBUILD_STATE_PATH to point to its default directory.
-    </para>
-
-    <para>
-      <command>./mach build</command>: <application>Firefox</application>
-      now uses this <application>python</application> script to run the
-      build and install.
-    </para>
-
-    <para>
-      <option>./mach build --verbose</option>: Use this alternative if you
-      need details of which files are being compiled, together with any C or
-      C++ flags being used. But do not add '--verbose' to the install command,
-      it is not accepted there.
-    </para>
-
-    <para>
-      <option>./mach build -jN</option>: The build should, by default, use
-      all the online CPU cores. If using all the cores causes the build to swap
-      because you have insufficient memory, using fewer cores can be faster.
-    </para>
-
-<!--
-    <para>
-      <command>mkdir -pv /usr/lib/mozilla/plugins</command>: This ensures
-      that <filename class="directory">/usr/lib/mozilla/plugins/</filename>
-      exists.
-    </para>
-
-    <para>
-      <command>ln -sv ... /usr/lib/firefox/browser</command>:
-      This command creates a symbolic link to <filename
-      class="directory">/usr/lib/mozilla/plugins</filename>. It's not really
-      needed, as <application>Firefox</application> checks <filename
-      class="directory">/usr/lib/mozilla/plugins</filename> by default, but the
-      symbolic link is made to keep all the plugins installed in one folder.
-    </para>
--->
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Firefox</title>
-
-    <para>
-      If you use a desktop environment like <application>Gnome</application> or
-      <application>KDE</application> you may like to create a
-      <filename>firefox.desktop</filename> file so that
-      <application>Firefox</application> appears in the panel's menus. <!--If you
-      didn't enable startup-notification in your mozconfig change the
-      StartupNotify line to false.--> As the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>mkdir -pv /usr/share/applications &amp;&amp;
-mkdir -pv /usr/share/pixmaps &amp;&amp;
-
-MIMETYPE="text/xml;text/mml;text/html;"                                    &amp;&amp;
-MIMETYPE="$MIMETYPE;application/xhtml+xml;application/vnd.mozilla.xul+xml" &amp;&amp;
-MIMETYPE="$MIMETYPE;x-scheme-handler/http;x-scheme-handler/https;          &amp;&amp;
-
-cat &gt; /usr/share/applications/firefox.desktop &lt;&lt; EOF &amp;&amp;
-<literal>[Desktop Entry]
-Encoding=UTF-8
-Name=Firefox Web Browser
-Comment=Browse the World Wide Web
-GenericName=Web Browser
-Exec=firefox %u
-Terminal=false
-Type=Application
-Icon=firefox
-Categories=GNOME;GTK;Network;WebBrowser;
-MimeType=$MIMETYPE
-StartupNotify=true</literal>
-EOF
-
-unset MIMETYPE &amp;&amp;
-
-ln -sfv /usr/lib/firefox/browser/chrome/icons/default/default128.png \
-        /usr/share/pixmaps/firefox.png</userinput></screen>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        The application settings for firefox are accessible by keying
-        <command>about:config</command> in the address bar.
-      </para>
-
-      <para>
-        Occasionally, getting working sound in
-        <application>firefox</application> can be a problem.  Although upstream
-        prefers pulseaudio,
-        on balance using <application>Alsa</application> may be easier.
-      </para>
-
-      <para>
-        If you enabled <application>Alsa</application> for sound, you may need
-        to alter one variable to get working sound. If you run
-        <command>firefox</command> from a term and try to play something with
-        sound you might encounter error messages like:
-      </para>
-
-      <para>
-         <literal>Sandbox: seccomp sandbox violation: pid 3941, tid 4030,
-         syscall 16, args 48 2147767296 139909894784796 0 0 0.</literal>
-      </para>
-
-      <para>
-        That was on x86_64, on i686 the syscall number is 54. To allow this
-        syscall, in <command>about:config</command> change
-        <command>security.sandbox.content.syscall_whitelist</command> to 16
-        (or 54 if using i686).
-      </para>
-
-      <para>
-        If you use <command>pulseaudio</command> in a Desktop Environment, it
-        might already be started by that DE.  But if it is not, although
-        firefox-57 managed to start it, firefox-58 did not.  If you run
-        <command>firefox</command> from a term and this problem is present,
-        trying to play sound will
-        encounter error messages warning <literal>Can't get cubeb
-        context!</literal>
-      </para>
-
-    <para>
-      The fix for this is to close firefox, start pulseaudio to check it
-      does start (if not, read the information on Configuring in <xref
-      linkend="pulseaudio"/>) and restart firefox to check it is working.
-      If it now works, add the following to your <filename>~/.xinitrc</filename>:
-<phrase revision="sysv">
-<literal>pulseaudio --verbose --log-target=syslog&amp;</literal></phrase>
-<phrase revision="systemd">
-<literal>pulseaudio --verbose --log-target=journald&amp;</literal></phrase>
-        (unfortunately, on some systems this does not work).
-      </para>
-
-      <para>
-        You may wish to use multiple profiles within firefox. To do that, invoke
-        firefox as <command>firefox --ProfileManager</command>. You can also
-        check which profile is currently in use from
-        <command>about:profiles</command>.
-      </para>
-
-      <para>
-        Although WebRender (using the GPU for compositing) is not used by
-        default, it now appears to work well on supported hardware (ATI, Nvidia
-        and Intel GPUs with Mesa-18 or later. For an explanation, please see
-        <ulink
-       url="https://hacks.mozilla.org/2017/10/the-whole-web-at-maximum-fps-how-webrender-gets-rid-of-jank/">hacks.mozilla.org</ulink>.
-       The only downside seems to be that on a machine with limited RAM it might
-       use more RAM.
-     </para>
-
-    <para>
-      To check if WebRender is being used, look in about:support. In the Graphics
-      section Compositing will either show 'Basic' (i.e. not in use) or
-      'WebRender'. To enable it, go to about:config and change gfx.webrender.all
-      to True. You will need to restart firefox.
-    </para>
-
-    <para>
-      It may be useful to mention the processes from firefox which can appear in
-      <command>top</command> - as well as firefox itself, there may be multiple
-      Web Content processes, and now an RDD Process (Remote Data Decoder) which
-      appears when playing web videos encoded with av1 (libdav1d). If WebRender
-      has been enabled, a GPU Process will also appear when firefox has to
-      repaint (e.g. scrolling, opening a new tab, or playing a video).
-    </para>
-
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          firefox
-        </seg>
-        <seg>
-          Numerous libraries, browser components, plugins, extensions, and
-          helper modules installed in /usr/lib/firefox
-        </seg>
-        <seg>
-	  /usr/lib/firefox and /usr/lib/mozilla
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="firefox-legacy-prog">
-        <term><command>firefox</command></term>
-        <listitem>
-          <para>
-	    is a <application>GTK+-3</application> internet browser that uses
-	    the Mozilla Gecko rendering engine
-          </para>
-          <indexterm zone="firefox-legacy firefox-legacy-prog">
-            <primary sortas="b-firefox">firefox</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/graphweb/firefox.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,13 +7,13 @@
   <!ENTITY firefox-download-http "&mozilla-http;/firefox/releases/&firefox-version;esr/source/firefox-&firefox-version;esr.source.tar.xz">
   <!ENTITY firefox-download-ftp  " ">
-  <!ENTITY firefox-md5sum        "f81ca2f266ab3dafdd080f269bbb2286">
-  <!ENTITY firefox-size          "366 MB">
+  <!ENTITY firefox-md5sum        "2df7dcedba6229f243dcf327ad3e7306">
+  <!ENTITY firefox-size          "323 MB">
   <!-- NB with stylo, much of the build uses rust, and therefore cargo files.
     But the extra cached cargo files, if any, seem to be minimal -->
-  <!ENTITY firefox-buildsize     "6.7 GB (196 MB installed) without tests">
+  <!ENTITY firefox-buildsize     "5.1 GB (185 MB installed) without tests">
   <!-- editors: with ff63 and rust-1.29, ./mach build -j4 is probably the
    most practical way to get a timing on a machine with more cores, if taking
    cores offline is not practical. If in doubt, round up -->
-  <!ENTITY firefox-time          "28 SBU (on a typical 4-core machine) without tests">
+  <!ENTITY firefox-time          "27 SBU (on a 4-core machine) without tests">
 ]>
 
@@ -22,4 +22,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -75,31 +76,15 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+<!--<bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
         <para>
           Required patch:
-          <ulink url="&patch-root;/firefox-&firefox-version;esr-glibc234-1.patch"/>
+          <ulink url="&patch-root;/firefox-&firefox-version;esr-rustc1470-1.patch"/>
         </para>
       </listitem>
-      <listitem>
-        <para>
-          Recommended patch:
-          <ulink url="&patch-root;/firefox-&firefox-version;esr-disable_rust_test-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
+    </itemizedlist>-->
 
     <note>
-
-      <!-- temporary note, remove with firefox-legacy -->
-      <para>
-        With the 91 ESR series, firefox no-longer works on ftp: links.
-        If that is important to you, as a temporary measure (on non-glibc-2.34
-        systems) you can continue to use <xref linkend="firefox-legacy"/>
-        while you explore alternative approaches.
-      </para>
-      <!-- end of temporary note -->
-
       <para>
         The directory name is firefox-&firefox-version;
@@ -199,5 +184,5 @@
       <xref linkend="doxygen"/>,
       <xref role="runtime" linkend="ffmpeg"/> (runtime, to play mov, mp3 or mp4 files),
-      <!--      <phrase revision="sysv"><ulink url="https://sourceforge.net/projects/liboauth/files/">liboauth</ulink></phrase> -->
+      <!--      <phrase revision="sysv"><ulink url="http://sourceforge.net/projects/liboauth/files/">liboauth</ulink></phrase> -->
       <xref linkend="liboauth"/>,
       <xref linkend="openjdk"/>,
@@ -249,8 +234,4 @@
 #ac_add_options --enable-alsa
 
-# Uncomment this line if you are building on an i686 system to fix a build
-# failure due to invalid ASM code.
-#ac_add_options --with-system-libvpx
-
 # Comment out following options if you have not installed
 # recommended dependencies:
@@ -301,4 +282,5 @@
 ac_add_options --enable-system-pixman
 
+# --with-system-bz2 was removed in firefox-78
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-png
@@ -321,17 +303,14 @@
     </para>
 
-    <para>
-      Apply a patch which allows compilation on systems running glibc-2.34:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../firefox-&firefox-version;esr-glibc234-1.patch</userinput></screen>
-
-    <para>
-      Now apply a patch which works around unexplained failures on some machines
-      (a message that a python check on libgkrust.a identified 1 networking
-      function, getsockname) in the rust static library.
-    </para>
-
-<screen><userinput>patch -Np1 -i ../firefox-&firefox-version;esr-disable_rust_test-1.patch</userinput></screen>
+     <para>
+       In the esr version of firefox-78, the code to ensure that add-ons
+       are signed by the trusted root has been disabled, presumably for
+       organizations which require their own add-ons. To enable it as an
+       added security measure issue the following command:
+     </para>
+
+<screen><userinput>sed -i -e 's/Disable/Enable/'      \
+ -e '/^MOZ_REQUIRE_SIGNING/s/0/1/' \
+ build/mozconfig.common</userinput></screen>
 
     <para>
@@ -384,11 +363,9 @@
 
     <para>
-      Now invoke the Python <command>mach</command> script to compile the package.
+      Now invoke the Python script to compile the package.
     </para>
 
 <screen><userinput>export CC=gcc CXX=g++ &amp;&amp;
-export MACH_USE_SYSTEM_PYTHON=1            &amp;&amp;
 export MOZBUILD_STATE_PATH=${PWD}/mozbuild &amp;&amp;
-./mach configure                           &amp;&amp;
 ./mach build</userinput></screen>
 
@@ -408,11 +385,14 @@
     </para>
 
-<screen role="root"><userinput>MACH_USE_SYSTEM_PYTHON=1 ./mach install</userinput></screen>
-
-    <para>
-      Empty the environment variables which were set above:
-    </para>
-
-<screen><userinput>unset CC CXX MACH_USE_SYSTEM_PYTHON MOZBUILD_STATE_PATH</userinput></screen>
+<screen role="root"><userinput>./mach install                                                  &amp;&amp;
+
+mkdir -pv  /usr/lib/mozilla/plugins                             &amp;&amp;
+ln    -sfv ../../mozilla/plugins /usr/lib/firefox/browser/</userinput></screen>
+
+    <para>
+      Set environment variables back to their values:
+    </para>
+
+<screen><userinput>unset CC CXX MOZBUILD_STATE_PATH</userinput></screen>
 
   </sect2>
@@ -452,17 +432,11 @@
       Creating this in the build directory, and deleting that after the
       installation, prevents it being used. If you wish to participate in
-      telemetry, export MOZBUILD_STATE_PATH to point to its default directory
-      and remove the entry from the <filename>mozconfig</filename>.
-    </para>
-
-    <para>
-      <command>MACH_USE_SYSTEM_PYTHON=1</command>: Use the system python
-      to create a virtual environment for <command>mach</command> without
-      downloading any python wheels.
-    </para>
-
-    <para>
-      <command>./mach configure</command>: This validates the supplied
-      dependencies and the <filename>mozconfig</filename>.
+      telemetry, export MOZBUILD_STATE_PATH to point to its default directory.
+    </para>
+
+    <para>
+      <command>./mach build</command>: <application>Firefox</application>
+      now uses this <application>python</application> script to run the
+      build and install.
     </para>
 
@@ -480,5 +454,4 @@
     </para>
 
-<!--
     <para>
       <command>mkdir -pv /usr/lib/mozilla/plugins</command>: This ensures
@@ -495,5 +468,4 @@
       symbolic link is made to keep all the plugins installed in one folder.
     </para>
--->
 
   </sect2>
@@ -513,11 +485,7 @@
 
 <screen role="root"><userinput>mkdir -pv /usr/share/applications &amp;&amp;
-mkdir -pv /usr/share/pixmaps      &amp;&amp;
-
-MIMETYPE="text/xml;text/mml;text/html;"                                    &amp;&amp;
-MIMETYPE="$MIMETYPE;application/xhtml+xml;application/vnd.mozilla.xul+xml" &amp;&amp;
-MIMETYPE="$MIMETYPE;x-scheme-handler/http;x-scheme-handler/https;          &amp;&amp;
-
-cat &gt; /usr/share/applications/firefox.desktop &lt;&lt; EOF &amp;&amp;
+mkdir -pv /usr/share/pixmaps &amp;&amp;
+
+cat &gt; /usr/share/applications/firefox.desktop &lt;&lt; "EOF" &amp;&amp;
 <literal>[Desktop Entry]
 Encoding=UTF-8
@@ -530,9 +498,7 @@
 Icon=firefox
 Categories=GNOME;GTK;Network;WebBrowser;
-MimeType=$MIMETYPE
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
 StartupNotify=true</literal>
 EOF
-
-unset MIMETYPE &amp;&amp;
 
 ln -sfv /usr/lib/firefox/browser/chrome/icons/default/default128.png \
@@ -662,5 +628,5 @@
           <para>
 	    is a <application>GTK+-3</application> internet browser that uses
-	    the Mozilla Gecko rendering engine
+	    the Mozilla Gecko rendering engine.
           </para>
           <indexterm zone="firefox firefox-prog">
Index: xsoft/graphweb/graphweb.xml
===================================================================
--- xsoft/graphweb/graphweb.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/graphweb/graphweb.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="xsoft-graphweb">
@@ -19,5 +24,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="epiphany.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="falkon.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="firefox-legacy.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="firefox.xml"/>
   <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="midori.xml"/>-->
Index: xsoft/graphweb/seamonkey.xml
===================================================================
--- xsoft/graphweb/seamonkey.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/graphweb/seamonkey.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY seamonkey-download-http "&mozilla-http;/seamonkey/releases/&seamonkey-version;/source/seamonkey-&seamonkey-version;.source.tar.xz">
   <!ENTITY seamonkey-download-ftp " ">
-  <!ENTITY seamonkey-md5sum        "f36c532bbd9c6903036aa02e9a40246b">
-  <!ENTITY seamonkey-size          "272 MB">
-  <!ENTITY seamonkey-buildsize     "6.1 GB (159 MB installed)">
-  <!ENTITY seamonkey-time          "21 SBU (with parallelism=4)">
+  <!ENTITY seamonkey-md5sum        "acb09e25a4ac3e985c7a4af238498d5e">
+  <!ENTITY seamonkey-size          "273 MB">
+  <!ENTITY seamonkey-buildsize     "6.9 GB (149 MB installed)">
+  <!ENTITY seamonkey-time          "19 SBU (on a 4-core machine)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -44,5 +45,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -137,5 +138,20 @@
       </para>
     </note>
-
+<!--
+    <note>
+      <para>
+        You must have installed <application>Openssl</application> before
+        <application>Python 2</application> or the build system will quickly
+        fail with output including "ImportError: cannot import name
+        HTTPSHandler". If you are in any doubt about this (e.g. upgrading from
+        an older version of Seamonkey), check if
+        <filename>/usr/lib/python&python2-majorver;/lib-dynload/_ssl.so</filename>
+        exists.  If it does not, reinstall <xref linkend="python2"/> (after
+        installing <xref linkend="openssl"/>.  The latest version of any
+        <emphasis>currently maintained</emphasis> version of Openssl should be
+        satisfactory if already installed.
+      </para>
+    </note>
+-->
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
@@ -150,7 +166,6 @@
       <xref linkend="valgrind"/>,
       <xref linkend="wget"/>,
-      <xref linkend="wireless_tools"/>,
-      <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>, and
-      <ulink url="https://facebook.github.io/watchman/">Watchman</ulink>
+      <xref linkend="wireless_tools"/>, and
+      <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>
     </para>
 
@@ -176,6 +191,8 @@
 
 <screen><?dbfo keep-together="auto"?><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
-<literal># If you have a multicore machine, all cores will be used
-# unless you pass -jN to ./mach build
+<literal># If you have a multicore machine, all cores will be used by default.
+# If desired, you can reduce the number of cores used, e.g. to 1, by
+# uncommenting the next line and setting a valid number of CPU cores.
+#mk_add_options MOZ_MAKE_FLAGS="-j1"
 
 # If you have installed DBus-Glib comment out this line:
@@ -210,20 +227,7 @@
 ac_add_options --with-system-webp
 
-# The elf-hack is reported to cause failed installs (after successful builds)
-# on some machines. It is supposed to improve startup time and it shrinks
-# libxul.so by a few MB - comment this if you know your machine is not affected.
-ac_add_options --disable-elf-hack
-
-# Seamonkey has some additional features that are not turned on by default,
-# such as an IRC client, calendar, and DOM Inspector. The DOM Inspector
-# aids with designing web pages. Comment these options if you do not
-# desire these features.
-ac_add_options --enable-calendar
-ac_add_options --enable-dominspector
-ac_add_options --enable-irc
-
 # The BLFS editors recommend not changing anything below this line:
 ac_add_options --prefix=/usr
-ac_add_options --enable-application=comm/suite
+ac_add_options --enable-application=suite
 
 ac_add_options --disable-crashreporter
@@ -234,9 +238,19 @@
 ac_add_options --enable-strip
 ac_add_options --enable-install-strip
+
+# not recognized since 2.53.1 - ac_add_options --enable-gio
 ac_add_options --enable-official-branding
-
-# The option to use system cairo was removed in 2.53.9.
+# not recognized since 2.53.1 - ac_add_options --enable-safe-browsing
+# not recognized since 2.53.1 - ac_add_options --enable-url-classifier
+
+# From firefox-40 (and the corresponding version of seamonkey),
+# using system cairo caused seamonkey to crash
+# frequently when it was doing background rendering in a tab.
+# This appears to again work in seamonkey-2.49.2
+ac_add_options --enable-system-cairo
 ac_add_options --enable-system-ffi
 ac_add_options --enable-system-pixman
+
+ac_add_options --with-pthreads
 
 ac_add_options --with-system-bz2
@@ -279,10 +293,6 @@
     </para>
 
-<screen><userinput>export CC=gcc CXX=g++ &amp;&amp;
-./mach configure      &amp;&amp;
-./mach build</userinput></screen>
-
-
-    <!-- comment this since llvm must have been installed for rust
+<screen><userinput>CC=gcc CXX=g++ make -f client.mk</userinput></screen>
+
     <note>
       <para>
@@ -290,5 +300,5 @@
         <xref linkend="llvm"/> is installed and you do not want to use clang.
       </para>
-    </note>-->
+    </note>
 
     <para>
@@ -302,6 +312,6 @@
 
 
-<screen role="root"><userinput>./mach install                  &amp;&amp;
-chown -R 0:0 /usr/lib/seamonkey &amp;&amp;
+<screen role="root"><userinput>make  -f client.mk install INSTALL_SDK= &amp;&amp;
+chown -R 0:0 /usr/lib/seamonkey         &amp;&amp;
 
 cp -v $(find -name seamonkey.1 | head -n1) /usr/share/man/man1</userinput></screen>
@@ -313,26 +323,9 @@
 
     <para>
-      <command>export CC=gcc CXX=g++ ...</command>: Upstream now prefer
-      <application>clang</application> so that they can use one compiler
-      everywhere. On the X86 architectures <application>clang</application>
-      takes a little longer than gcc to compile mozilla applications.
-    </para>
-
-    <para>
-      <command>./mach configure</command>: This validates the supplied
-      dependencies and the <filename>mozconfig</filename>.
-    </para>
-
-    <para>
-      <option>./mach build --verbose</option>: Use this alternative if you
-      need details of which files are being compiled, together with any C or
-      C++ flags being used. But do not add '--verbose' to the install command,
-      it is not accepted there.
-    </para>
-
-    <para>
-      <option>./mach build -jN</option>: The build should, by default, use
-      all the online CPU cores. If using all the cores causes the build to swap
-      because you have insufficient memory, using fewer cores can be faster.
+      <command>make -f client.mk</command>: Mozilla products are packaged to
+      allow the use of a configuration file which can be used to pass the
+      configuration settings to the <command>configure</command> command.
+      <command>make</command> uses the <filename>client.mk</filename> file to
+      get initial configuration and setup parameters.
     </para>
 
@@ -343,7 +336,7 @@
 
     <para>
-      For installing various <application>SeaMonkey</application> add-ons, refer
-      to <ulink url="https://addons.thunderbird.net/en-US/seamonkey/">Add-ons 
-      for Seamonkey</ulink>.
+      For installing various <application>SeaMonkey</application> plugins, refer
+      to <ulink url="http://plugindoc.mozdev.org/linux.html">Mozdev's PluginDoc
+      Project</ulink>.
     </para>
 
@@ -356,5 +349,5 @@
       <systemitem role="url">about:config</systemitem> in the address bar. This
       will display a list of the configuration preferences and information
-      related to each one. You can use the <quote>Search:</quote> bar to enter
+      related to each one. You can use the <quote>Filter:</quote> bar to enter
       search criteria and narrow down the listed items. Changing a preference
       can be done using two methods. One, if the preference has a boolean value
@@ -367,5 +360,4 @@
     </para>
 
-<!-- The URL no longer exists.
     <tip>
       <para>
@@ -376,5 +368,5 @@
       </para>
     </tip>
--->
+
     <para>
       If you use a desktop environment like <application>Gnome</application> or
@@ -418,9 +410,9 @@
         <seg>
           Numerous libraries, browser, and email/newsgroup components, plugins,
-          extensions, and helper modules installed in
-          <filename class="directory">/usr/lib/seamonkey-&seamonkey-version;</filename>
+          extensions, and helper modules installed in <filename
+          class="directory">/usr/lib/seamonkey-&seamonkey-version;</filename>
         </seg>
         <seg>
-          /usr/lib/seamonkey
+          /usr/lib/seamonkey-&seamonkey-version;
         </seg>
       </seglistitem>
@@ -436,5 +428,5 @@
         <listitem>
           <para>
-            is the Mozilla browser/email/newsgroup/chat client suite
+            is the Mozilla browser/email/newsgroup/chat client suite.
           </para>
           <indexterm zone="seamonkey seamonkey-prog">
@@ -445,4 +437,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: xsoft/office/abiword.xml
===================================================================
--- xsoft/office/abiword.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/office/abiword.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -11,5 +11,5 @@
            "https://www.abisource.com/downloads/abiword/&AbiWord-version;/source/abiword-&AbiWord-version;.tar.gz">
   <!ENTITY AbiWord-download-ftp  " ">
-  <!ENTITY AbiWord-md5sum        "a8f218b711450e4ccae43a0522e0e806">
+  <!ENTITY AbiWord-md5sum        "04e31887049a8c72297881bc153b77c4">
   <!ENTITY AbiWord-size          "11 MB">
 
@@ -19,5 +19,5 @@
   <!ENTITY AbiWordDocs-size          "1.5 MB">
 
-  <!ENTITY AbiWord-buildsize     "690 MB, with docs (76 MB installed)">
+  <!ENTITY AbiWord-buildsize     "605 MB, with docs (76 MB installed)">
   <!ENTITY AbiWord-time          "2.4 SBU (Using parallelism=4, with docs)">
 ]>
@@ -27,4 +27,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -44,5 +45,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -97,14 +98,5 @@
         </para>
       </listitem>
-<!--
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/abiword-&AbiWord-version;-gcc11_fixes-1.patch"/>
-        </para>
-      </listitem>
--->
     </itemizedlist>
-
 
     <bridgehead renderas="sect3">AbiWord Dependencies</bridgehead>
@@ -138,8 +130,8 @@
       <ulink url="http://aiksaurus.sourceforge.net/">Aiksaurus</ulink>,
       <ulink url="http://helm.cs.unibo.it/mml-widget/">GtkMathView</ulink>,
-      <ulink url="https://sourceforge.net/projects/wvware">libwmf</ulink>,
-      <ulink url="https://sourceforge.net/projects/libwpd/">libwpd</ulink>,
-      <ulink url="https://sourceforge.net/projects/libwpg/">libwpg</ulink>,
-      <ulink url="https://sourceforge.net/projects/libwps/">libwps</ulink>,
+      <ulink url="http://sourceforge.net/projects/wvware">libwmf</ulink>,
+      <ulink url="http://sourceforge.net/projects/libwpd/">libwpd</ulink>,
+      <ulink url="http://sourceforge.net/projects/libwpg/">libwpg</ulink>,
+      <ulink url="http://sourceforge.net/projects/libwps/">libwps</ulink>,
       <ulink url="http://www.abisource.com/projects/link-grammar/">
       Link Grammar Parser</ulink>,
@@ -165,12 +157,4 @@
   <sect2 role="installation">
     <title>Installation of AbiWord</title>
-
-<!--
-    <para>
-      First, fix a build failure when using GCC-11:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../abiword-&AbiWord-version;-gcc11_fixes-1.patch</userinput></screen>
--->
 
     <para>
@@ -358,5 +342,5 @@
             is the word processor, a wrapper for the functions in
             libabiword-&AbiWord-minor-version; - it can also be used on the
-            command line, see <command>man 1 abiword</command>
+            command line, see <command>man 1 abiword</command>.
           </para>
           <indexterm zone="abiword abiword-prog">
@@ -370,5 +354,5 @@
         <listitem>
           <para>
-            provides functions to access MS Word documents
+            provides functions to access MS Word documents.
           </para>
           <indexterm zone="abiword libabiword">
Index: xsoft/office/gnumeric.xml
===================================================================
--- xsoft/office/gnumeric.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/office/gnumeric.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY gnumeric-download-http "&gnome-download-http;/gnumeric/1.12/gnumeric-&gnumeric-version;.tar.xz">
   <!ENTITY gnumeric-download-ftp  "&gnome-download-ftp;/gnumeric/1.12/gnumeric-&gnumeric-version;.tar.xz">
-  <!ENTITY gnumeric-md5sum        "06868b655c5a231a4e9c1009ed701cc1">
+  <!ENTITY gnumeric-md5sum        "6141a2ff1790484933aafec2d0dce129">
   <!ENTITY gnumeric-size          "17 MB">
-  <!ENTITY gnumeric-buildsize     "280 MB (add 7 MB for tests)">
-  <!ENTITY gnumeric-time          "0.9 SBU (Using parallelism=4; add 8.2 SBU for tests)">
+  <!ENTITY gnumeric-buildsize     "370 MB (add 4 MB for tests)">
+  <!ENTITY gnumeric-time          "0.9 SBU (Using parallelism=4; add 7.7 SBU for tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -178,6 +179,7 @@
           /usr/lib/gnumeric,
           /usr/lib/goffice/0.10/plugins/gnumeric,
-          /usr/share/gnumeric, and
-          /usr/share/help/{C,cs,de,es}/gnumeric
+          /usr/share/gnumeric,
+          /usr/share/help/{C,cs,de,es}/gnumeric, and
+          /usr/share/pixmaps/gnumeric
         </seg>
       </seglistitem>
@@ -193,5 +195,5 @@
         <listitem>
           <para>
-            is a symlink to <command>gnumeric-&gnumeric-version;</command>
+            is a symlink to <command>gnumeric-&gnumeric-version;</command>.
           </para>
           <indexterm zone="gnumeric gnumeric-prog">
@@ -205,5 +207,5 @@
         <listitem>
           <para>
-            is <application>GNOME</application>'s spreadsheet application
+            is <application>GNOME</application>'s spreadsheet application.
           </para>
           <indexterm zone="gnumeric gnumeric-1">
@@ -218,5 +220,5 @@
           <para>
             is a command line utility to convert spreadsheet files
-            between various spreadsheet file formats
+            between various spreadsheet file formats.
           </para>
           <indexterm zone="gnumeric ssconvert">
@@ -230,5 +232,5 @@
         <listitem>
           <para>
-            is a command line utility to compare two spreadsheets
+            is a command line utility to compare two spreadsheets.
           </para>
           <indexterm zone="gnumeric ssdiff">
@@ -242,5 +244,5 @@
         <listitem>
           <para>
-            is a command line utility to search spreadsheets for strings
+            is a command line utility to search spreadsheets for strings.
           </para>
           <indexterm zone="gnumeric ssgrep">
@@ -255,5 +257,5 @@
           <para>
             is a command line utility to generate index data for
-            spreadsheet files
+            spreadsheet files.
           </para>
           <indexterm zone="gnumeric ssindex">
@@ -267,5 +269,5 @@
         <listitem>
           <para>
-            contains the gnumeric API functions
+            contains the gnumeric API functions.
           </para>
           <indexterm zone="gnumeric libspreadsheet">
Index: xsoft/office/libreoffice.xml
===================================================================
--- xsoft/office/libreoffice.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/office/libreoffice.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,25 +5,25 @@
   %general-entities;
 
-  <!ENTITY libreoffice-dl "https://download.documentfoundation.org/libreoffice/src/&libreoffice-version;">
+  <!ENTITY libreoffice-dl "http://download.documentfoundation.org/libreoffice/src/&libreoffice-version;">
 
   <!ENTITY libreoffice-core-download-http "&libreoffice-dl;/libreoffice-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-core-md5sum        "a4f2e92dc6829d556156ec7a13a965b8">
-  <!ENTITY libreoffice-core-size          "241 MB">
+  <!ENTITY libreoffice-core-md5sum        "cad93ef2c87928b5a2971ae7e6474fe1">
+  <!ENTITY libreoffice-core-size          "226 MB">
 
   <!ENTITY libreoffice-dict-download-http "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-dict-md5sum        "885d9cb74978ac389d007a44c63f9fe9">
-  <!ENTITY libreoffice-dict-size          "48 MB">
+  <!ENTITY libreoffice-dict-md5sum        "f55125ef3ec0541df31c87ee2fa00700">
+  <!ENTITY libreoffice-dict-size          "44 MB">
 
   <!ENTITY libreoffice-help-download-http "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-help-md5sum        "92f52be4258eb3a5e409f02a99401826">
-  <!ENTITY libreoffice-help-size          "107 MB">
+  <!ENTITY libreoffice-help-md5sum        "3862b85f1dd0e7daf2e02484e3839e72">
+  <!ENTITY libreoffice-help-size          "106 MB">
 
   <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-translations-md5sum        "702e9c5ad967830ab1cc72a93dffb61a">
-  <!ENTITY libreoffice-translations-size          "184 MB">
+  <!ENTITY libreoffice-translations-md5sum        "05aa6fbbec0cc08005ff6dca32cb4c40">
+  <!ENTITY libreoffice-translations-size          "168 MB">
 
   <!-- full size remeasured for 7.0.0.3 -->
 
-  <!ENTITY libreoffice-buildsize  "7.1 GB including the additional files if downloaded during the build (793 MB installed). Installing the whole set of languages requires more than 25 GB (around 3 GB installed)">
+  <!ENTITY libreoffice-buildsize  "6.5 GB including the additional files if downloaded during the build (775 MB installed). Installing the whole set of languages requires more than 25 GB (around 3 GB installed)">
 
  <!-- Editors: many updates to poppler will break LO using system poppler until
@@ -33,9 +33,5 @@
       optional according to whether or not we use the system version.  The
       installed size will be increased by 2 MB if using the shipped poppler, but
-      the variation in build times will be lost in the noise. - ken 
-
-      Not a problem with 7.1.7.2 and poppler-21.05.0.  - bdubbs
-
-  -->
+      the variation in build times will be lost in the noise. - ken -->
 
   <!-- for 6.1.2.1 I allowed 2 SBU for downloads, my total was 
@@ -53,5 +49,5 @@
        dictionaries. -renodr
   -->
-  <!ENTITY libreoffice-time "69 SBU with parallelism=4 plus download time">
+  <!ENTITY libreoffice-time "45 SBU with parallelism=4 including typical download time">
 
 ]>
@@ -61,4 +57,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -79,5 +76,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -115,7 +112,5 @@
       <para>
         Around 80 smallish tarballs and zip files will be downloaded during the
-        build. The download time will vary with the local internet speed and
-        server load.  The download time will probably be between 30 and 60 minutes.
-        If you have not downloaded one or more of the following, they too
+        build. If you have not downloaded one or more of the following, they too
         will also be downloaded during the build.
       </para>
@@ -177,13 +172,15 @@
       </listitem>
 
-<!-- keep one commented patch, it's sure to again need one or more in a few months: -->
-
-      <listitem>
-        <para>
-          Required patch to fix building with <xref linkend="freetype2"/>:
-          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-freetype_fix-1.patch"/>
-        </para>
-      </listitem>
-
+
+<!-- keep one commented patch, it's sure to again need one or more in a few months:
+-->
+<!--
+      <listitem>
+        <para>
+          Required patch to fix building with GCC 10 and later:
+          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-format_overflow-1.patch"/>
+        </para>
+      </listitem>
+-->
     </itemizedlist>
     <bridgehead renderas="sect3">LibreOffice Dependencies</bridgehead>
@@ -245,4 +242,5 @@
     </para>
 
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
@@ -255,4 +253,6 @@
       <xref linkend="gdb"/>,
       <xref linkend="gnutls"/>,
+<!-- not anymore in the book, but included in apache-ant
+     <xref linkend="junit"/>, -->
       <xref linkend="kf5-frameworks"/>,
       <xref linkend="libpaper"/>,
@@ -269,8 +269,7 @@
       <ulink url="https://commons.apache.org/proper/commons-lang/">Apache Commons Lang</ulink>,
       <ulink url="https://commons.apache.org/proper/commons-logging/">Apache Commons Logging</ulink>,
-      <ulink url="https://beanshell.github.io/">BeanShell</ulink>,
-      <ulink url="https://box2d.org/documentation/">box2d</ulink>,
+      <ulink url="http://www.beanshell.org/">BeanShell</ulink>,
       <ulink url="https://projects.coin-or.org/CoinMP/">CoinMP</ulink>,
-      <ulink url="https://sourceforge.net/projects/cppunit/">Cppunit</ulink>,
+      <ulink url="http://sourceforge.net/projects/cppunit/">Cppunit</ulink>,
       <ulink url="http://www.firebirdsql.org/">Firebird</ulink>,
       <ulink url="https://github.com/behdad/glyphy">glyphy</ulink>,
@@ -278,35 +277,26 @@
       <ulink url="https://github.com/hamcrest/JavaHamcrest/releases">hamcrest</ulink>,
       <ulink url="https://hunspell.github.io/">Hunspell</ulink>,
-      <ulink url="https://sourceforge.net/projects/hunspell/files/Hyphen/">Hyphen</ulink>,
+      <ulink url="http://sourceforge.net/projects/hunspell/files/Hyphen/">Hyphen</ulink>,
       <ulink url="http://include-what-you-use.org/">iwyu</ulink>,
       <ulink url="https://github.com/junit-team/junit4/releases">junit4</ulink>,
       <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libabw">libabw</ulink>,
       <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libcdr">libcdr</ulink>,
-      <ulink url="https://sourceforge.net/projects/libcmis/">libcmis</ulink>,
+      <ulink url="http://sourceforge.net/projects/libcmis/">libcmis</ulink>,
       <ulink url="http://www.sourceforge.net/projects/libebook/">libebook</ulink>,
-      <ulink url="https://sourceforge.net/projects/libepubgen/">libepubgen</ulink>,
-      <ulink url="https://wiki.documentfoundation.org/DLP/libraries/libetonyek">libetonyek</ulink>,
       <ulink url="https://wiki.documentfoundation.org/Libexttextcat">libexttextcat</ulink>,
       <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand">libfreehand</ulink>,
       <ulink url="http://tagoh.github.io/liblangtag/">liblangtag</ulink>,
       <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libmspub">libmspub</ulink>,
-      <ulink url="https://sourceforge.net/projects/libmwaw/">libmwaw</ulink>,
-      <ulink url="https://github.com/Numbertext/libnumbertext">libnumbertext</ulink>,
-      <ulink url="https://sourceforge.net/projects/libwpd/files/libodfgen/">libodfgen</ulink>,
+      <ulink url="http://sourceforge.net/projects/libmwaw/">libmwaw</ulink>,
+      <ulink url="http://sourceforge.net/projects/libwpd/files/libodfgen/">libodfgen</ulink>,
       <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker">libpagemaker</ulink>,
-      <ulink url="https://github.com/nayuki/QR-Code-generator">libqrcodegen</ulink>,
-      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libqxp">libqxp</ulink>,
-      <ulink url="https://sourceforge.net/projects/libwpd/files/librevenge/">librevenge (WordPerfect Document importer)</ulink>,
-      <ulink url="https://github.com/fosnola/libstaroffice/wiki">libstaroffice</ulink>,
+      <ulink url="http://sourceforge.net/projects/libwpd/files/librevenge/">librevenge (WordPerfect Document importer)</ulink>,
       <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libvisio">libvisio</ulink>,
       <ulink url="http://libwpd.sourceforge.net/">libwpd</ulink>,
       <ulink url="http://libwpg.sourceforge.net/">libwpg</ulink>,
       <ulink url="https://sourceforge.net/p/libwps/wiki/Home/">libwps</ulink>,
-      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libzmf">libzmf</ulink>,
       <ulink url="http://lpsolve.sourceforge.net/">lp_solve</ulink>,
       <ulink url="https://gitlab.com/mdds/mdds">mdds</ulink>,
-      <ulink url="https://sourceforge.net/projects/hunspell/files/MyThes/">MyThes</ulink>,
-      <ulink url="https://odftoolkit.org/conformance/ODFValidator.html">odfvalidator</ulink>,
-      <ulink url="https://code.google.com/archive/p/officeotron/">officeotron</ulink>,
+      <ulink url="http://sourceforge.net/projects/hunspell/files/MyThes/">MyThes</ulink>,
       <ulink url="https://github.com/KhronosGroup/OpenCOLLADA/">OpenCOLLADA</ulink>,
       <ulink url="https://gitlab.com/orcus/orcus">Orcus</ulink>,
@@ -341,11 +331,11 @@
 
 <!-- keep a commented instruction if no patches are currently required -->
-
-    <para>
-     Fix build failures introduced by the latest freetype version:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-freetype_fix-1.patch</userinput></screen>
-
+<!--
+    <para>
+     Fix build failures introduced by GCC 10 and later:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-format_overflow-1.patch</userinput></screen>
+-->
     <para>
       If you have downloaded the dictionaries, help and translations tarballs,
@@ -358,13 +348,4 @@
 ln -sv ../../../libreoffice-help-&libreoffice-dlversion;.tar.xz         external/tarballs/ &amp;&amp;
 ln -sv ../../../libreoffice-translations-&libreoffice-dlversion;.tar.xz external/tarballs/</userinput></screen>
-
-   <para>
-      The instructions in the package unpack some tarballs into a location
-      it cannot find later.  Create some symlinks to help out:
-   </para>
-
-<screen><userinput>ln -sv src/libreoffice-help-&libreoffice-dlversion;/helpcontent2/ &amp;&amp;
-ln -sv src/libreoffice-dictionaries-&libreoffice-dlversion;/dictionaries/ &amp;&amp;
-ln -sv src/libreoffice-translations-&libreoffice-dlversion;/translations/</userinput></screen>
 
     <note>
@@ -406,4 +387,7 @@
     </para>
 
+<!-- For the ICU seds, the spacing here is intentional. Sed will return syntax
+     errors otherise -->
+
 <screen><userinput>sed -e "/gzip -f/d"   \
     -e "s|.1.gz|.1|g" \
@@ -411,4 +395,12 @@
 
 sed -e "/distro-install-file-lists/d" -i Makefile.in &amp;&amp;
+
+sed -i 29a\
+'\\t\t&amp;&amp;sed -i "s/TRUE/true/g" src/lib/libcdr_utils.cpp \\' \
+external/libcdr/ExternalProject_libcdr.mk &amp;&amp;
+
+sed -i 30a\
+'\\t\t&amp;&amp;sed -i "s/TRUE/true/g" src/lib/EBOOKCharsetConverter.cpp \\' \
+external/libebook/ExternalProject_libebook.mk &amp;&amp;
 
 ./autogen.sh --prefix=$LO_PREFIX         \
@@ -517,6 +509,6 @@
     <para>
       The suite and main modules can be started from the menu. From a terminal,
-      the suite can be started with the <command>libreoffice</command> command
-      and the modules with the <command>libreoffice
+      the suite can be started with <command>libreoffice</command> command and
+      the modules with <command>libreoffice
       --<replaceable>&lt;module&gt;</replaceable></command> command,
       respectively, where <replaceable>&lt;module&gt;</replaceable> is one of
@@ -535,12 +527,9 @@
     <para>
       <command>sed -e ...</command>: The first sed prevents compression of the
-      manual pages and the second one prevents the install from failing.
-      <!--and the third one allows the build to use poppler-0.86.1 and later.-->
+      manual pages, the second one prevents the install from failing, and the
+      third one allows the build to use poppler-0.86.1 and later.
       <!-- FIXME update hardcoded poppler version in text when necessary -->
-      <!-- FIXME as far as I can tell, that sed is no longer present, so I
-           commented the description out here. -renodr -->
-    </para>
-
-<!--
+    </para>
+
     <para>
       <command>sed -i "s/TRUE/true/" ...</command>: These three sed commands
@@ -550,5 +539,5 @@
       the external projects (the source tarballs are unpacked during the build).
     </para>
--->
+
     <para>
       <parameter>--with-vendor=BLFS</parameter>: This switch sets BLFS as
@@ -661,5 +650,5 @@
 -->
     <para>
-      <command>make distro-pack-install</command>: This does a normal
+      <command>make distro-pack-install</command>: this does a normal
       install, but if you add a DESTDIR environment variable it will also
       install a lot of (text) gid_Module_* files in the DESTDIR, to help
@@ -743,5 +732,12 @@
       <application>base</application>.
     </para>
-
+    <!-- junit is not included anymore in ant, and neither hamcrest. Since
+    the hsqldb backend is deprecated anyway, forget this:
+    <para>
+      <option>- -with-junit=/opt/ant/lib/junit-4.12.jar</option> and
+      <option>- -with-hamcrest=/opt/ant/lib/hamcrest-core-1.3.jar</option>:
+      Those options are needed if you want to run the tests.
+    </para>
+    -->
     <para>
       <option>--without-fonts</option>: <application>LibreOffice</application>
@@ -819,5 +815,5 @@
           <para>
             is the main libreofice suite (symlink to
-            $LO_PREFIX/lib/libreoffice/program/soffice)
+            $LO_PREFIX/lib/libreoffice/program/soffice).
           </para>
           <indexterm zone="libreoffice libreoffice-suite">
@@ -831,5 +827,5 @@
         <listitem>
           <para>
-            is the database manager module shell starting script
+            is the database manager module shell starting script.
           </para>
           <indexterm zone="libreoffice lobase">
@@ -843,5 +839,5 @@
         <listitem>
           <para>
-            is the spreadsheet module shell starting script
+            is the spreadsheet module shell starting script.
           </para>
           <indexterm zone="libreoffice localc">
@@ -856,5 +852,5 @@
           <para>
             is the vector graphics editor and diagramming tool module shell
-            starting script
+            starting script.
           </para>
           <indexterm zone="libreoffice lodraw">
@@ -869,5 +865,5 @@
           <para>
             is the (PowerPoint) presentations editor and displayer
-            module shell starting script
+            module shell starting script.
           </para>
           <indexterm zone="libreoffice loimpress">
@@ -881,5 +877,5 @@
         <listitem>
           <para>
-            is the mathematical formula editor module shell starting script
+            is the mathematical formula editor module shell starting script.
           </para>
           <indexterm zone="libreoffice lomath">
@@ -893,5 +889,5 @@
         <listitem>
           <para>
-            is the HTML editor module shell starting script
+            is the HTML editor module shell starting script.
           </para>
           <indexterm zone="libreoffice loweb">
@@ -905,5 +901,5 @@
         <listitem>
           <para>
-            is the word processor module shell starting script
+            is the word processor module shell starting script.
           </para>
           <indexterm zone="libreoffice lowriter">
@@ -918,5 +914,5 @@
           <para>
             is a tool to manage <application>LibreOffice</application>
-            extensions from the command line
+            extensions from the command line.
           </para>
           <indexterm zone="libreoffice unopkg">
Index: xsoft/office/office.xml
===================================================================
--- xsoft/office/office.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/office/office.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="xsoft-office">
Index: xsoft/other/balsa.xml
===================================================================
--- xsoft/other/balsa.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/other/balsa.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY balsa-download-http "https://pawsa.fedorapeople.org/balsa/balsa-&balsa-version;.tar.xz">
+  <!ENTITY balsa-download-http "http://pawsa.fedorapeople.org/balsa/balsa-&balsa-version;.tar.bz2">
   <!ENTITY balsa-download-ftp  " ">
-  <!ENTITY balsa-md5sum        "cf6b5183cc3eb240c3dd120167822c35">
-  <!ENTITY balsa-size          "3.6 MB">
-  <!ENTITY balsa-buildsize     "77 MB">
+  <!ENTITY balsa-md5sum        "2361369eb566e53ddc2f6afa34eb7a9d">
+  <!ENTITY balsa-size          "4.4 MB">
+  <!ENTITY balsa-buildsize     "66 MB">
   <!ENTITY balsa-time          "0.2 SBU (Using parallelism=4)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -78,6 +79,5 @@
       <xref linkend="gmime3"/>,
       <xref linkend="gpgme"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="libnotify"/>, and
+      <xref linkend="gtk3"/>,and
       <xref linkend="rarian"/>
     </para>
@@ -100,4 +100,5 @@
       <xref linkend="gtksourceview"/>,
       <xref linkend="libcanberra"/>,
+      <xref linkend="libnotify"/>,
       <xref linkend="libsecret"/>,
       <xref linkend="mitkrb"/>,
@@ -128,5 +129,6 @@
             --sysconfdir=/etc        \
             --localstatedir=/var/lib \
-            --without-html-widget    &amp;&amp;
+            --without-html-widget    \
+            --without-libnotify      &amp;&amp;
 make</userinput></screen>
 
@@ -265,5 +267,5 @@
         <listitem>
           <para>
-            is a glib based mail client
+            is a glib based mail client.
           </para>
           <indexterm zone="balsa balsa-prog">
@@ -277,5 +279,5 @@
         <listitem>
           <para>
-            is the address-book application used by <command>balsa</command>
+            is the address-book application used by <command>balsa</command>.
           </para>
           <indexterm zone="balsa balsa-ab">
Index: xsoft/other/feh.xml
===================================================================
--- xsoft/other/feh.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/other/feh.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY feh-download-http "https://feh.finalrewind.org/feh-&feh-version;.tar.bz2">
+  <!ENTITY feh-download-http "http://feh.finalrewind.org/feh-&feh-version;.tar.bz2">
   <!ENTITY feh-download-ftp  " ">
-  <!ENTITY feh-md5sum        "28f291b9efbfa158f3e550ba92c13558">
+  <!ENTITY feh-md5sum        "0dd986d77805cd306a81864c69cf040c">
   <!ENTITY feh-size          "2.0 MB">
-  <!ENTITY feh-buildsize     "5.3 MB (with tests)">
+  <!ENTITY feh-buildsize     "5.4 MB (with tests)">
   <!ENTITY feh-time          "less than 0.1 SBU (with tests)">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -177,5 +178,5 @@
 
     <para>
-      <option>curl=0</option>: Use this make flag if you don't have the cURL
+      <option>curl=0</option>: Use this make flag if you don't have cURL
       package installed.
     </para>
@@ -219,5 +220,5 @@
         <listitem>
           <para>
-            is an image viewer and cataloguer
+            is an image viewer and cataloguer.
           </para>
           <indexterm zone="feh feh-prog">
Index: xsoft/other/fontforge.xml
===================================================================
--- xsoft/other/fontforge.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/other/fontforge.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -14,5 +14,5 @@
   <!ENTITY fontforge-size          "14 MB">
   <!ENTITY fontforge-buildsize     "167 MB (add 52 MB for the tests)">
-  <!ENTITY fontforge-time          "0.2 SBU (with parallelism=4, add 0.1 SBU for the tests)">
+  <!ENTITY fontforge-time          "0. SBU (with parallelism=4, add 0.1 SBU for the tests)">
 ]>
 
@@ -21,4 +21,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +41,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -218,5 +219,5 @@
           <para>
             is a program that allows you to create and
-            modify font files
+            modify font files.
           </para>
           <indexterm zone="fontforge fontforge-prog">
@@ -231,5 +232,5 @@
           <para>
             is a program that produces an image showing
-            representative glyphs of the font
+            representative glyphs of the font.
           </para>
           <indexterm zone="fontforge fontimage">
@@ -244,5 +245,5 @@
           <para>
             is a program that checks the font for certain
-            common errors
+            common errors.
           </para>
           <indexterm zone="fontforge fontlint">
@@ -256,5 +257,5 @@
         <listitem>
           <para>
-            is a program that compares two font files
+            is a program that compares two font files.
           </para>
           <indexterm zone="fontforge sfddiff">
Index: xsoft/other/gimp.xml
===================================================================
--- xsoft/other/gimp.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/other/gimp.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY gimp-download-http "https://download.gimp.org/pub/gimp/v2.10/gimp-&gimp-version;.tar.bz2">
   <!ENTITY gimp-download-ftp  " ">
-  <!ENTITY gimp-md5sum        "31e4a055ba34e6841f42a6b2439ca480">
-  <!ENTITY gimp-size          "30 MB">
-  <!ENTITY gimp-buildsize     "898 MB (201 MB installed, add 882 GB for tests)">
-  <!ENTITY gimp-time          "1.7 SBU (Using parallelism=4; add 0.7 SBU for tests)">
+  <!ENTITY gimp-md5sum        "9d559ba6f039da033754f1d62a91cc39">
+  <!ENTITY gimp-size          "32 MB">
+  <!ENTITY gimp-buildsize     "1.3 GB (267 MB installed, add 0.9 GB for tests)">
+  <!ENTITY gimp-time          "2.8 SBU (Using parallelism=4; add 0.7 SBU for tests)">
 
   <!-- pro-tem, a pull of gimp-help, https://gitlab.gnome.org/GNOME/gimp-help.git
@@ -27,11 +27,11 @@
        anduin.-->
 
-  <!ENTITY gimp-help-version    "2021-03-30">
+  <!ENTITY gimp-help-version    "2020-10-07">
   <!ENTITY gimp-help-download   "&sources-anduin-http;/gimp/gimp-help-&gimp-help-version;.tar.xz">
-  <!ENTITY gimp-help-md5sum     "df6acc812c829b610d621f8e6973a680">
+  <!ENTITY gimp-help-md5sum     "39cee813a1cd91cc2d2892cf94d44f05">
   <!ENTITY gimp-help-size       "170 MB">
-  <!ENTITY gimp-help-buildsize  "From 385 MB (en only) to 1.8 GB (all 17
+  <!ENTITY gimp-help-buildsize  "From 384 MB (en only) to 1.8 GB (all 18
                                  languages)">
-  <!ENTITY gimp-help-time       "1.9 SBU (en only), 9.1 SBU, with parallelism=4,
+  <!ENTITY gimp-help-time       "1.0 SBU (en only), 9.7 SBU, with parallelism=4,
                                  for all languages">
 ]>
@@ -41,4 +41,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -59,5 +60,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -167,4 +168,5 @@
       <xref linkend="dbus-glib"/>,
       <xref linkend="gs"/> (with libgs installed),
+      <xref linkend="gvfs"/> (to access the online help),
       <xref linkend="iso-codes"/>,
       <xref linkend="libgudev"/>,
@@ -177,5 +179,4 @@
       <xref linkend="aalib"/>,
       <xref linkend="alsa-lib"/>,
-      <xref linkend="gvfs"/> (to access the online help),
       <xref linkend="libmng"/>,
       <xref linkend="libwebp"/>,
@@ -186,10 +187,7 @@
       <ulink url="https://people.freedesktop.org/~hughsient/appstream-glib">appstream-glib</ulink>,
       <ulink url="https://github.com/ianlancetaylor/libbacktrace">libbacktrace</ulink>,
-      <ulink url="https://github.com/strukturag/libheif/">libheif</ulink> with
-      <ulink url="https://github.com/strukturag/libde265/">libde265</ulink>
-      (both needed to read macOS heic images),
-      <ulink url="https://www.nongnu.org/libunwind">libunwind</ulink>,
-      <ulink url="http://wvware.sourceforge.net/libwmf.html">libwmf</ulink>, and
-      <ulink url="https://www.openexr.com/">OpenEXR</ulink>
+      <ulink url="https://github.com/strukturag/libheif">libheif</ulink>,
+      <ulink url="https://www.nongnu.org/libunwind">libunwind</ulink>, and
+      <ulink url="http://wvware.sourceforge.net/libwmf.html">libwmf</ulink>
     </para>
 
@@ -265,5 +263,5 @@
     </para>
 
-<screen><userinput>ALL_LINGUAS=&quot;ca da de el en en_GB es fi fr it ja ko nn pt_BR ro ru zh_CN&quot; \
+<screen><userinput>ALL_LINGUAS=&quot;ca da de el en en_GB es fi fr it ja ko nl nn pt_BR ro ru zh_CN&quot; \
 ./autogen.sh --prefix=/usr</userinput></screen>
 
@@ -372,5 +370,5 @@
         <listitem>
           <para>
-            is a symbolic link to <command>gimp-2.10</command>
+            is a symbolic link to <command>gimp-2.10</command>.
           </para>
           <indexterm zone="gimp gimp-prog">
@@ -385,5 +383,5 @@
           <para>
             is the Gnu Image Manipulation Program. It works with a variety
-            of image formats and provides a large selection of tools
+            of image formats and provides a large selection of tools.
           </para>
           <indexterm zone="gimp gimp-2.10">
@@ -397,5 +395,5 @@
         <listitem>
           <para>
-            is a symbolic link to <command>gimp-console-2.10</command>
+            is a symbolic link to <command>gimp-console-2.10</command>.
           </para>
           <indexterm zone="gimp gimp-console">
@@ -411,5 +409,5 @@
             is a console program that behaves as if The
             <application>Gimp</application> was called with the
-            <option>--no-interface</option> command-line option
+            <option>--no-interface</option> command-line option.
           </para>
           <indexterm zone="gimp gimp-console-2.10">
@@ -427,5 +425,5 @@
             <command>gimptool-2.0</command> can also be used by programs that
             need to know what libraries and include-paths The
-            <application>Gimp</application> was compiled with
+            <application>Gimp</application> was compiled with.
           </para>
           <indexterm zone="gimp gimptool-2.0">
@@ -441,5 +439,5 @@
             provides C bindings for The <application>Gimp</application>'s
             Procedural Database (PDB) which offers an interface to core functions
-            and to functionality provided by plug-ins
+            and to functionality provided by plug-ins.
           </para>
           <indexterm zone="gimp libgimp-2.0">
@@ -457,5 +455,5 @@
             enumeration data types, gettext translation, determining The
             <application>Gimp</application>'s version number and capabilities,
-            handling data files and accessing the environment
+            handling data files and accessing the environment.
           </para>
           <indexterm zone="gimp libgimpbase-2.0">
@@ -466,10 +464,11 @@
 
       <varlistentry id="libgimpcolor-2.0">
-        <term><filename class="libraryfile">libgimpcolor-2.0.so</filename></term>
+        <term><filename
+        class="libraryfile">libgimpcolor-2.0.so</filename></term>
         <listitem>
           <para>
             provides the C functions relating to RGB, HSV and CMYK colors as
             well as converting colors between different color models and
-            performing adaptive supersampling on an area
+            performing adaptive supersampling on an area.
           </para>
           <indexterm zone="gimp libgimpcolor-2.0">
@@ -480,8 +479,9 @@
 
       <varlistentry id="libgimpconfig-2.0">
-        <term><filename class="libraryfile">libgimpconfig-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains C functions for reading and writing config information
+        <term><filename
+        class="libraryfile">libgimpconfig-2.0.so</filename></term>
+        <listitem>
+          <para>
+            contains C functions for reading and writing config information.
           </para>
           <indexterm zone="gimp libgimpconfig-2.0">
@@ -497,5 +497,5 @@
             contains C functions which provide mathematical definitions and
             macros, manipulate 3x3 transformation matrices, set up and manipulate
-            vectors and the MD5 message-digest algorithm
+            vectors and the MD5 message-digest algorithm.
           </para>
           <indexterm zone="gimp libgimpmath-2.0">
@@ -511,5 +511,5 @@
             provides the C functions which implements module loading using
             GModule and keeps a list of GimpModule's found in a given
-            searchpath
+            searchpath.
           </para>
           <indexterm zone="gimp libgimpmodule-2.0">
@@ -524,5 +524,5 @@
           <para>
             provides the C functions for handling The
-            <application>Gimp</application>'s thumbnail objects
+            <application>Gimp</application>'s thumbnail objects.
           </para>
           <indexterm zone="gimp libgimpthumb-2.0">
@@ -537,5 +537,5 @@
           <para>
             contains The <application>Gimp</application>'s common user
-            interface functions
+            interface functions.
           </para>
           <indexterm zone="gimp libgimpui-2.0">
@@ -551,8 +551,9 @@
             contains The <application>Gimp</application>
             and <application>GTK</application>'s widget creation and
-            manipulation functions
+            manipulation functions.
           </para>
           <indexterm zone="gimp libgimpwidgets-2.0">
-            <primary sortas="c-libgimpwidgets-2.0">libgimpwidgets-2.0.so</primary>
+            <primary
+            sortas="c-libgimpwidgets-2.0">libgimpwidgets-2.0.so</primary>
           </indexterm>
         </listitem>
Index: xsoft/other/gparted.xml
===================================================================
--- xsoft/other/gparted.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/other/gparted.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY gparted-download-http "&sourceforge-dl;/gparted/gparted-&gparted-version;.tar.gz">
   <!ENTITY gparted-download-ftp  " ">
-  <!ENTITY gparted-md5sum        "1b2de7823b39684d0cba1ddaad3a9cd5">
-  <!ENTITY gparted-size          "4.0 MB">
-  <!ENTITY gparted-buildsize     "76 MB (add 60 MB for tests)">
-  <!ENTITY gparted-time          "0.3 SBU (using parallelism=4; add 0.2 SBU for tests)">
+  <!ENTITY gparted-md5sum        "0da45cb522d766dfb4886fb3bdbc2634">
+  <!ENTITY gparted-size          "3.8 MB">
+  <!ENTITY gparted-buildsize     "90 MB (add 82 MB for tests)">
+  <!ENTITY gparted-time          "0.4 SBU (using parallelism=4; add 0.5 SBU for tests)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -81,6 +82,8 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="btrfs-progs"/> (if using a btrfs filesystem),
-      <ulink url="https://github.com/exfatprogs/exfatprogs">exfatprogs</ulink>, and
+      <xref linkend="btrfs-progs"/> (if using a btrfs filesystem) and
+      <!-- These dependencies were obsoleted in version 1.0.0, see #12110 -->
+      <!-- <xref linkend="rarian"/>,
+           <ulink url="&gnome-download-http;/gnome-doc-utils/">GNOME Doc Utils</ulink>  -->
       <ulink url="https://github.com/pali/udftools">udftools</ulink>
     </para>
@@ -154,9 +157,9 @@
       <xref linkend="reiserfs"/>,
       <xref linkend="xfsprogs"/>,
-      <ulink url="https://ftp.gnu.org/pub/gnu/mtools/">mtools</ulink> (required
+      <ulink url="https://ftpmirror.gnu.org/pub/gnu/mtools/">mtools</ulink> (required
       to read and write FAT16/32 volume labels and UUIDs),
       <ulink url="ftp://ftp.mars.org/pub/hfs/">hfsutils</ulink>,
-      <ulink url="https://packages.debian.org/sid/hfsprogs">hfsprogs</ulink>,
-      <ulink url="http://nilfs.sourceforge.io/en/">nilfs-utils</ulink> and
+      <ulink url="https://packages.debian.org/sid/hfsprogs/">hfsprogs</ulink>,
+      <ulink url="http://www.nilfs.org/download/">nilfs-utils</ulink> and
       <ulink url="https://reiser4.wiki.kernel.org/index.php/Reiser4progs">
       Reiser4progs</ulink>.
@@ -264,5 +267,5 @@
       <seglistitem>
         <seg>
-          gparted<!--, gpartedbin--> and gparted_polkit (optional)
+          gparted, gpartedbin and gparted_polkit (optional)
         </seg>
         <seg>
@@ -285,5 +288,5 @@
           <para>
             is a shell script which sets up the environment before calling
-            <command>gpartedbin</command>
+            <command>gpartedbin</command>.
           </para>
           <indexterm zone="gparted gparted-prog">
@@ -293,10 +296,9 @@
       </varlistentry>
 
-      <!--
       <varlistentry id="gpartedbin">
         <term><command>gpartedbin</command></term>
         <listitem>
           <para>
-            is the Gparted binary
+            is the Gparted binary.
           </para>
           <indexterm zone="gparted gpartedbin">
@@ -305,5 +307,4 @@
         </listitem>
       </varlistentry>
-      -->
 
       <varlistentry id="gparted_polkit">
@@ -312,5 +313,5 @@
           <para>
             is an optional script which can be used to run gparted with polkit,
-            from a menu
+            from a menu.
           </para>
           <indexterm zone="gparted gparted_polkit">
Index: xsoft/other/hexchat.xml
===================================================================
--- xsoft/other/hexchat.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/other/hexchat.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -10,5 +10,5 @@
   <!ENTITY hexchat-md5sum        "9f04c48f011b646b91d03c5776fce776">
   <!ENTITY hexchat-size          "1.2 MB">
-  <!ENTITY hexchat-buildsize     "21 MB">
+  <!ENTITY hexchat-buildsize     "31 MB">
   <!ENTITY hexchat-time          "0.1 SBU (using parallelism=4)">
 ]>
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -73,31 +74,16 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch:
-          <ulink url="&patch-root;/hexchat-&hexchat-version;-add_libera_chat-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">HexChat Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="glib2"/>, and
-      <xref linkend="libnotify"/>
+      <xref linkend="glib2"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="gtk2"/> and
-      <xref linkend="libcanberra"/>
-      <!--<xref linkend="lua"/> -->
-      <!-- Lua plugin support is currently broken and causes Hexchat to crash
-           upon startup.
-           FIXME: Check upstream in a few days.-->
+      <xref linkend="gtk2"/>,
+      <xref linkend="libcanberra"/>, and
+      <xref linkend="lua"/>
     </para>
 
@@ -122,17 +108,4 @@
 
     <para>
-      First, fix the python plugin:
-    </para>
-
-<screen><userinput remap="pre">sed -i "s/(python_opt/&amp; + '-embed'/" plugins/python/meson.build</userinput></screen>
-
-    <para>
-      Next, apply an optional patch to have the "libera.chat" network
-      preconfigured in the client:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../hexchat-&hexchat-version;-add_libera_chat-1.patch</userinput></screen>
-
-    <para>
       Install <application>HexChat</application> by running the following
       commands:
@@ -142,9 +115,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr         \
-      --buildtype=release   \
-      -Dwith-libproxy=false \
-      -Dwith-lua=false      \
-      ..                    &amp;&amp;
+meson --prefix=/usr -Dwith-libproxy=false -Dwith-lua=lua .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -164,15 +133,7 @@
     <title>Command Explanations</title>
 
-    <!--
     <para>
       <parameter>-Dwith-lua=lua</parameter>: By default, this package 
       will look for luajit. Use the normal lua instead.
-    </para>
-    -->
-
-    <para>
-      <parameter>-Dwith-lua=false</parameter>: By default, this package will
-      look for luajit. However, the Lua plugin support is currently broken
-      and will cause the application to crash on startup.
     </para>
 
@@ -208,5 +169,5 @@
         <listitem>
           <para>
-            is a graphical Internet Relay Chat (IRC) client
+            is a graphical Internet Relay Chat (IRC) client.
           </para>
           <indexterm zone="hexchat hexchat-prog">
Index: xsoft/other/inkscape.xml
===================================================================
--- xsoft/other/inkscape.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/other/inkscape.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -6,8 +6,8 @@
   <!ENTITY inkscape-download-http "https://media.inkscape.org/dl/resources/file/inkscape-&inkscape-version;.tar.xz">
   <!ENTITY inkscape-download-ftp  " ">
-  <!ENTITY inkscape-md5sum        "45e38e25fb93c7c91c51b84b9e4cf0ee">
-  <!ENTITY inkscape-size          "33 MB">
-  <!ENTITY inkscape-buildsize     "677 MB (169 MB installed)">
-  <!ENTITY inkscape-time          "6.7 SBU (with parallelism=4)">
+  <!ENTITY inkscape-md5sum        "daefc5212b72e49eff41a7681fd5e993">
+  <!ENTITY inkscape-size          "31 MB">
+  <!ENTITY inkscape-buildsize     "723 MB (165 MB installed)">
+  <!ENTITY inkscape-time          "5.8 SBU (with parallelism=4)">
 ]>
 
@@ -16,4 +16,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -69,5 +70,7 @@
       </listitem>
     </itemizedlist>
-<!--
+
+    <!-- With 1.0.0, there is now a dependency on IM7 instead of IM6.
+         It's explicitly searched for in CMakeLists.txt.
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -75,9 +78,8 @@
         <para>
           Required patch: <ulink
-          url="&patch-root;/inkscape-&inkscape-version;-glib_2.68-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
+          url="&patch-root;/inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch"/>
+        </para>
+      </listitem>
+      -->
       <!-- These are not needed right now. Inkscape builds/runs fine with the
            latest poppler as of this update (0.87.0). However, history says
@@ -105,5 +107,5 @@
         The tarball <emphasis>inkscape-&inkscape-version;.tar.xz</emphasis>
         will extract to
-        <emphasis>inkscape-&inkscape-version;_2021-05-24_c4e8f9ed74</emphasis>.
+        <emphasis>inkscape-&inkscape-version;_2020-09-07_3bc2e813f5</emphasis>.
       </para>
     </note>
@@ -197,5 +199,4 @@
     -->
 
-<!--
     <para>
       First, fix build failure with glibc-2.32:
@@ -203,5 +204,4 @@
 
 <screen><userinput remap="pre">sed -i '/#include &lt;iostream&gt;/a #include &lt;atomic&gt;' src/ui/tool/node.cpp</userinput></screen>
--->
 
     <para>
@@ -210,6 +210,6 @@
     </para>
 
-<screen><userinput>mkdir build                       &amp;&amp;
-cd    build                       &amp;&amp;
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
 
 cmake -DCMAKE_INSTALL_PREFIX=/usr \
@@ -292,5 +292,5 @@
         <listitem>
           <para>
-            is a SVG (Scalable Vector Graphics) editing program
+            is a SVG (Scalable Vector Graphics) editing program.
           </para>
           <indexterm zone="inkscape inkscape-prog">
@@ -304,5 +304,5 @@
         <listitem>
           <para>
-            is a simple program for displaying SVG files
+            is a simple program for displaying SVG files.
           </para>
           <indexterm zone="inkscape inkview">
@@ -316,5 +316,5 @@
         <listitem>
           <para>
-            provides the routines used by inkscape and inkview
+            provides the routines used by inkscape and inkview.
           </para>
           <indexterm zone="inkscape libinkscape_base">
Index: xsoft/other/other.xml
===================================================================
--- xsoft/other/other.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/other/other.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <chapter id="xsoft-other">
Index: xsoft/other/pidgin.xml
===================================================================
--- xsoft/other/pidgin.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/other/pidgin.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY pidgin-download-http "&sourceforge-dl;/pidgin/pidgin-&pidgin-version;.tar.bz2">
   <!ENTITY pidgin-download-ftp  " ">
-  <!ENTITY pidgin-md5sum        "bba0fd38ee1d8b9b725c4dbdc33e58e7">
-  <!ENTITY pidgin-size          "8.3 MB">
-  <!ENTITY pidgin-buildsize     "297 MB (with tests and docs)">
-  <!ENTITY pidgin-time          "0.6 SBU (using parallelism=4; with tests and docs)">
+  <!ENTITY pidgin-md5sum        "e135798bcf952ddb3c9e030c4b160c3e">
+  <!ENTITY pidgin-size          "8.4 MB">
+  <!ENTITY pidgin-buildsize     "277 MB (with tests and docs)">
+  <!ENTITY pidgin-time          "0.7 SBU (using parallelism=4; with tests and docs)">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -31,9 +32,9 @@
     <para>
       <application>Pidgin</application> is a Gtk+ 2 instant messaging client
-      that can connect with a wide range of networks including Bonjour, ICQ,
-      GroupWise, Jabber/XMPP, IRC, Gadu-Gadu, SILC, SIMPLE, and Zephyr.
-    </para>
-
-    &lfs110a_checked;
+      that can connect with a wide range of networks including AIM, ICQ,
+      GroupWise, MSN, Jabber, IRC, Napster, Gadu-Gadu, SILC, Zephyr and Yahoo!
+    </para>
+
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -86,5 +87,4 @@
     </para>
 
-    <!--
     <para>
       SSL support is required for the MSN Messenger, Yahoo!, Novel Groupwise and
@@ -93,5 +93,4 @@
       can cause problems).
     </para>
-    -->
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -100,10 +99,7 @@
       <xref linkend="cyrus-sasl"/>,
       <xref linkend="dbus"/>,
-      <xref linkend="doxygen"/>,
       <xref linkend="evolution-data-server"/>,
       <xref linkend="GConf"/>,
-      <xref linkend="graphviz"/>,
       <xref linkend="libidn"/> (required, if you wish to run the test suite),
-      <xref linkend="libnsl"/>,
       <xref linkend="NetworkManager"/>,
       <xref linkend="sqlite"/> (required for the Contact Availability Prediction
@@ -368,5 +364,5 @@
         <listitem>
           <para>
-            is a <application>GTK+</application> 2 instant messaging client
+            is a <application>GTK+</application> 2 instant messaging client.
           </para>
           <indexterm zone="pidgin pidgin-prog">
@@ -380,6 +376,6 @@
         <listitem>
           <para>
-            is an example that demonstrates how to use the libpurple-client
-            library to communicate with purple
+            is an example that demonstrate how to use libpurple-client
+            to communicate with purple.
           </para>
           <indexterm zone="pidgin purple-client-example">
@@ -393,5 +389,5 @@
         <listitem>
           <para>
-            sends remote commands to Pidgin/Finch
+            sends remote commands to Pidgin/Finch.
           </para>
           <indexterm zone="pidgin purple-remote">
@@ -405,5 +401,5 @@
         <listitem>
           <para>
-            calls purple API functions using DBus and prints the return value
+            calls purple API functions using DBus and prints the return value.
           </para>
           <indexterm zone="pidgin purple-send">
@@ -418,5 +414,5 @@
           <para>
             calls purple API functions using DBus. As opposed to
-            <command>purple-send</command>, it does not print the return value
+            <command>purple-send</command>, it does not print the return value.
           </para>
           <indexterm zone="pidgin purple-send-async">
@@ -430,5 +426,5 @@
         <listitem>
           <para>
-            is a python script to handle URLs with purple
+            is a python script to handle URLs with purple.
           </para>
           <indexterm zone="pidgin purple-url-handler">
Index: xsoft/other/rox-filer.xml
===================================================================
--- xsoft/other/rox-filer.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/other/rox-filer.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date> </date>
   </sect1info>
@@ -34,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -294,5 +295,5 @@
         <listitem>
           <para>
-            is the rox file manager
+            is the rox file manager.
           </para>
           <indexterm zone="rox-filer rox-filer-prog">
@@ -303,4 +304,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: xsoft/other/rxvt-unicode.xml
===================================================================
--- xsoft/other/rxvt-unicode.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/other/rxvt-unicode.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
   <!ENTITY rxvt-unicode-download-http "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-&rxvt-unicode-version;.tar.bz2">
   <!ENTITY rxvt-unicode-download-ftp  " ">
-  <!ENTITY rxvt-unicode-md5sum        "18dd0b15e7f67478bf0a88b0fc5e8cd4">
-  <!ENTITY rxvt-unicode-size          "884 KB">
-  <!ENTITY rxvt-unicode-buildsize     "23 MB">
+  <!ENTITY rxvt-unicode-md5sum        "93782dec27494eb079467dacf6e48185">
+  <!ENTITY rxvt-unicode-size          "910 KB">
+  <!ENTITY rxvt-unicode-buildsize     "23 MB (plus 9 MB if gdk-pixbuf is present)">
   <!ENTITY rxvt-unicode-time          "0.2 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <note>
@@ -274,5 +275,5 @@
         <seg>urxvt, urxvtd, and urxvtc</seg>
         <seg>Many <application>Perl</application> extensions located under
-        <filename class="directory">/usr/lib/urxvt/perl</filename></seg>
+        <filename class='directory'>/usr/lib/urxvt/perl</filename></seg>
         <seg>/usr/lib/urxvt</seg>
       </seglistitem>
@@ -288,5 +289,5 @@
         <listitem>
           <para>
-            is a terminal emulator for the X Window System
+            is a terminal emulator for the X Window System.
           </para>
           <indexterm zone="rxvt-unicode urxvt-bin">
@@ -300,5 +301,5 @@
         <listitem>
           <para>
-            is the <command>urxvt</command> terminal daemon
+            is the <command>urxvt</command> terminal daemon.
           </para>
           <indexterm zone="rxvt-unicode urxvtd">
@@ -312,5 +313,5 @@
         <listitem>
           <para>
-            controls the <command>urxvtd</command> daemon
+            controls the <command>urxvtd</command> daemon.
           </para>
           <indexterm zone="rxvt-unicode urxvtc">
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/other/thunderbird.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY thunderbird-download-http "&mozilla-http;/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.xz">
   <!ENTITY thunderbird-download-ftp  " ">
-  <!ENTITY thunderbird-md5sum        "f08dd55b8b1b0baf2c38a88aa3734cf8">
-  <!ENTITY thunderbird-size          "390 MB">
-  <!ENTITY thunderbird-buildsize     "6.9 GB (201 MB installed)">
-  <!ENTITY thunderbird-time          "29 SBU (on a 4-core machine)">
+  <!ENTITY thunderbird-md5sum        "853eb1511136b99712c2cd2ace0a9790">
+  <!ENTITY thunderbird-size          "337 MB">
+  <!ENTITY thunderbird-buildsize     "5.4 GB (178 MB installed)">
+  <!ENTITY thunderbird-time          "30 SBU (on a 4-core machine)">
   <!-- Removed the -j1 time because python and rust do not obey it, although
        the C/C++ code appears to obey it -->
@@ -19,4 +19,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -72,5 +73,5 @@
       </listitem>
     </itemizedlist>
-
+    <!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -78,9 +79,9 @@
         <para>
           Required patch:
-          <ulink url="&patch-root;/thunderbird-&thunderbird-version;-glibc234-1.patch"/>
+          <ulink url="&patch-root;/thunderbird-&thunderbird-version;-rustc1470-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
-
+    -->
     <bridgehead renderas="sect3">Thunderbird Dependencies</bridgehead>
 
@@ -136,7 +137,6 @@
       <!-- <xref linkend="openjdk"/>, not in build log -->
       <!--<xref linkend="pulseaudio"/>,-->
-      <xref linkend="wget"/>,
-      <xref linkend="wireless_tools"/>, and
-      <ulink url="https://facebook.github.io/watchman/">watchman</ulink>
+      <xref linkend="wget"/>, and
+      <xref linkend="wireless_tools"/>
     </para>
 
@@ -186,9 +186,17 @@
 ac_add_options --with-system-nss
 ac_add_options --with-system-icu
-
-# The elf-hack causes failed installs on some machines.
-# It is supposed to improve startup time and it shrinks libxul.so
-# by a few MB - comment this if you know your machine is not affected.
-ac_add_options --disable-elf-hack
+<!--Not with libvpx-1.8.0 or later
+ac_add_options - -with-system-libvpx
+====
+These do not seem to be needed any more
+# Set CFLAGS and CXXFLAGS to prevent segfaults due to aggressive
+# optimizations in GCC-6:
+export CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
+export CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
+-->
+# The elf-hack causes failed builds on clang-9.0.1 with some CFLAGS including
+# -march=native on Ryzen. It is supposed to improve startup time and it shrinks
+# libxul.so by a few MB - Uncomment this if your build is affected.
+#ac_add_options --disable-elf-hack
 
 # The BLFS editors recommend not changing anything below this line:
@@ -217,13 +225,15 @@
 EOF</userinput></screen>
 
-    <para>
-      Apply a patch which allows compilation on systems running glibc-2.34:
-    </para>
-
-<screen><userinput remap="pre">patch -p1 -i ../thunderbird-&thunderbird-version;-glibc234-1.patch</userinput></screen>
-
-    <para>
-      Now invoke the Python <command>mach</command> script to compile
-      <application>Thunderbird</application>:
+<!--
+    <para>
+      Apply a patch to allow this to be compiled with <xref linkend="rust"/>:
+    </para>
+
+<screen><userinput remap="pre">patch -p1 -i ../thunderbird-&thunderbird-version;-rustc1470-1.patch</userinput></screen>
+-->
+
+    <para>
+      Compile <application>Thunderbird</application> by issuing the following
+      commands:
     </para>
 
@@ -237,9 +247,5 @@
     </note>
 
-<screen><userinput>export CC=gcc CXX=g++ &amp;&amp;
-export MACH_USE_SYSTEM_PYTHON=1 &amp;&amp;
-./mach create-mach-environment &amp;&amp;
-./mach configure      &amp;&amp;
-./mach build</userinput></screen>
+<screen><userinput>CC=gcc CXX=g++ ./mach build</userinput></screen>
 
     <para>
@@ -252,11 +258,5 @@
     </para>
 
-<screen role="root"><userinput>MACH_USE_SYSTEM_PYTHON=1 ./mach install</userinput></screen>
-
-    <para>
-      Empty the environment variables which were set above:
-    </para>
-
-<screen><userinput>unset CC CXX MACH_USE_SYSTEM_PYTHON</userinput></screen>
+<screen role="root"><userinput>./mach install</userinput></screen>
 
   </sect2>
@@ -273,18 +273,11 @@
 
     <para>
-      <command>CC=gcc CXX=g++ ./mach configure</command>: 
+      <command>CC=gcc CXX=g++ ./mach build</command>: 
       <application>Thunderbird</application>
       now uses this <application>python3</application> script to run the
-      configuration,
       build and install. Forcing GCC causes the build to come out smaller
       and run faster.
       <!-- For more info, see Ticket #13969. ~12GB to ~5GB build size, 
       significantly smaller build time.-->
-    </para>
-
-    <para>
-      <command>MACH_USE_SYSTEM_PYTHON=1</command>: Use the system python
-      to create a virtual environment for <command>mach</command> without
-      downloading any python wheels.
     </para>
 
@@ -412,5 +405,5 @@
         <listitem>
           <para>
-            is <application>Mozilla</application>'s email and newsgroup client
+            is <application>Mozilla</application>'s email and newsgroup client.
           </para>
           <indexterm zone="thunderbird thunderbird-prog">
Index: xsoft/other/tigervnc.xml
===================================================================
--- xsoft/other/tigervnc.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/other/tigervnc.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -37,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -102,11 +103,11 @@
           Optional files:
             <itemizedlist spacing="compact">
-              <listitem revision='sysv'>
+              <listitem>
                 <para><ulink url="&sources-anduin-http;/tigervnc/vncserver"/></para>
               </listitem>
-              <listitem revision='sysv'>
+              <listitem>
                 <para><ulink url="&sources-anduin-http;/tigervnc/vncserver.1"/></para>
               </listitem>
-              <listitem revision='systemd'>
+              <listitem>
                 <para><ulink url="&sources-anduin-http;/tigervnc/Xsession"/></para>
               </listitem>
@@ -178,5 +179,5 @@
   autoreconf -fiv  &amp;&amp;
 
-  CPPFLAGS="-I/usr/include/drm"       \
+  CFLAGS="$CFLAGS -I/usr/include/drm" \
   ./configure $XORG_CONFIG            \
       --disable-xwayland    --disable-dri        --disable-dmx         \
@@ -261,5 +262,5 @@
     <title>Configuring Tigervnc</title>
 
-    <para revision='sysv'>
+    <para>
       The default installation of this package makes some changes in the way it
       is used.  The vncserver perl script is placed in /usr/libexec and the
@@ -270,12 +271,13 @@
     </para>
 
-    <para revision='sysv'>
-      To restore the previous behavior, install the additional downloaded
-      files as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="nodump" revision='sysv'><userinput>install -m755 --owner=root ../vncserver /usr/bin &amp;&amp;
+    <para>
+
+      To restore the previous behavior, as the <systemitem
+      class="username">root</systemitem> user:</para>
+
+<screen role="nodump"><userinput>install -m755 --owner=root ../vncserver /usr/bin &amp;&amp;
 cp ../vncserver.1 /usr/share/man/man1</userinput></screen>
 
-    <para revision='sysv'>
+    <para>
       Using the previous procedures, the user specific configuration files of
       vncserver reside in the <filename class='directory'>.vnc</filename>
@@ -288,10 +290,10 @@
     </para>
 
-<screen revision='sysv'>#!/bin/sh
+<screen>#!/bin/sh
 [ -x /etc/vnc/xstartup ] &amp;&amp; exec /etc/vnc/xstartup
 [ -r $HOME/.Xresources ] &amp;&amp; xrdb $HOME/.Xresources
 startlxde &amp;</screen>
 
-    <para revision='sysv'>
+    <para>
       The <filename>xstartup</filename> file must be executable for the
       commands in it to be executed, so run <command>chmod a+x
@@ -299,5 +301,5 @@
     </para>
 
-    <para revision='sysv'>
+    <para>
       Set up the vnc passwd with <command>vncpasswd</command>. The
       server can then be started with the <command>vncserver</command>
@@ -309,5 +311,4 @@
     <bridgehead renderas="sect3" revision="systemd">Server Configuration</bridgehead>
 
-    <!--
     <note revision="systemd">
       <para>
@@ -317,5 +318,5 @@
       </para>
     </note>
-    -->
+
     <para revision="systemd">
       On systemd systems, another method of configuration is available.
@@ -408,5 +409,5 @@
             is a X VNC (Virtual Network Computing) server.
              It is based on a standard X server, but it has a
-             <quote>virtual</quote> screen rather than a physical one
+             <quote>virtual</quote> screen rather than a physical one.
           </para>
           <indexterm zone="tigervnc xvnc">
@@ -420,5 +421,5 @@
         <listitem>
           <para>
-            is a program to configure and control a VNC server
+            is a program to configure and control a VNC server.
           </para>
           <indexterm zone="tigervnc vncconfig">
@@ -432,5 +433,5 @@
         <listitem>
           <para>
-            allows you to set the password used to access VNC desktops
+            allows you to set the password used to access VNC desktops.
           </para>
           <indexterm zone="tigervnc vncpasswd">
@@ -444,5 +445,5 @@
         <listitem>
           <para>
-            is a perl script used to start or stop a VNC server
+            is a perl script used to start or stop a VNC server.
           </para>
           <indexterm zone="tigervnc vncserver">
@@ -456,5 +457,5 @@
         <listitem>
           <para>
-            is a client used to connect to VNC desktops
+            is a client used to connect to VNC desktops.
           </para>
           <indexterm zone="tigervnc vncviewer">
@@ -469,5 +470,5 @@
           <para>
             is a program to make an X display on a physical
-            terminal accessible via TigerVNC or compatible viewers
+            terminal accessible via TigerVNC or compatible viewers.
           </para>
           <indexterm zone="tigervnc x0vncserver">
Index: xsoft/other/transmission.xml
===================================================================
--- xsoft/other/transmission.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/other/transmission.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,8 +41,8 @@
       It can be raised, but even on a fast internet connection, the highest 
       speeds seen were about 500 KB/s. For those that have internet capabilites 
-      faster than about 1 MB/s, direct downloads (if available) will be much faster.
+      faster thanabout 1 MB/s, direct downloads (if available) will be much faster.
     </para></note>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -196,5 +197,5 @@
           <para>
             is a lightweight, command-line BitTorrent client with scripting
-            capabilities
+            capabilities.
           </para>
           <indexterm zone="transmission transmission-cli">
@@ -208,5 +209,5 @@
         <listitem>
           <para>
-            is a command line tool used to create .torrent files
+            is a command line tool used to create .torrent files.
           </para>
           <indexterm zone="transmission transmission-create">
@@ -222,5 +223,5 @@
             is a daemon-based Transmission session that can be controlled via
             RPC commands from transmission's web interface or
-            <command>transmission-remote</command>
+            <command>transmission-remote</command>.
           </para>
           <indexterm zone="transmission transmission-daemon">
@@ -234,5 +235,5 @@
         <listitem>
           <para>
-            is a command-line utility to modify .torrent files' announce URLs
+            is a command-line utility to modify .torrent files' announce URLs.
           </para>
           <indexterm zone="transmission transmission-edit">
@@ -246,5 +247,5 @@
         <listitem>
           <para>
-            is a GTK+ bittorrent client
+            is a GTK+ bittorrent client.
           </para>
           <indexterm zone="transmission transmission-gtk">
@@ -258,5 +259,5 @@
         <listitem>
           <para>
-            is a Qt bittorrent client
+            is a Qt bittorrent client.
           </para>
           <indexterm zone="transmission transmission-qt">
@@ -270,5 +271,5 @@
         <listitem>
           <para>
-            is a remote control utility for transmission-daemon and transmission
+            is a remote control utility for transmission-daemon and transmission.
           </para>
           <indexterm zone="transmission transmission-remote">
@@ -282,5 +283,5 @@
         <listitem>
           <para>
-            is a command line tool to display bittorrent .torrent file metadata
+            is a command line tool to display bittorrent .torrent file metadata.
           </para>
           <indexterm zone="transmission transmission-show">
Index: xsoft/other/xarchiver.xml
===================================================================
--- xsoft/other/xarchiver.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/other/xarchiver.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,7 +7,7 @@
 <!ENTITY xarchiver-download-http  "https://github.com/ib/xarchiver/archive/&xarchiver-version;/xarchiver-&xarchiver-version;.tar.gz">
   <!ENTITY xarchiver-download-ftp  " ">
-  <!ENTITY xarchiver-md5sum        "f09d266775347f2ebccd94b01cf23c65">
+  <!ENTITY xarchiver-md5sum        "d453da75498b8085adc768e926179d5a">
   <!ENTITY xarchiver-size          "1.0 MB">
-  <!ENTITY xarchiver-buildsize     "12 MB">
+  <!ENTITY xarchiver-buildsize     "28 MB">
   <!ENTITY xarchiver-time          "0.1 SBU">
 ]>
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <note>
@@ -193,5 +194,5 @@
         <listitem>
           <para>
-            is a <application>GTK+</application> archive manager
+            is a <application>GTK+</application> archive manager.
           </para>
           <indexterm zone="xarchiver xarchiver-prog">
Index: xsoft/other/xdg-utils.xml
===================================================================
--- xsoft/other/xdg-utils.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/other/xdg-utils.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -18,4 +18,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date> </date>
   </sect1info>
@@ -36,23 +37,5 @@
     </para>
 
-    <warning>
-      <para>
-        A security vulnerability exists in all versions of
-        <application>xdg-utils</application> from version 1.1.0rc1 when handling
-        mailto: URIs. An attacker could potentially send a victim a URI that
-        automatically attaches a sensitive file to a new email. If a victim user
-        does not notice that an attachment was added and sends the email, this
-        could result in sensitive information disclosure.
-      </para>
-
-      <para>
-        To mitigate this flaw, either do not use mailto links at all, or always
-        double-check in the user interface that there are no unwanted attachments
-        before sending emails, especially when the email originates from clicking
-        on a mailto link.
-      </para>
-    </warning>
-
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -175,5 +158,5 @@
         <listitem>
           <para>
-            is a command line tool for (un)installing desktop menu items
+            is a command line tool for (un)installing desktop menu items.
           </para>
           <indexterm zone="xdg-utils xdg-desktop-menu">
@@ -187,5 +170,5 @@
         <listitem>
           <para>
-            is a command line tool for (un)installing icons to the desktop
+            is a command line tool for (un)installing icons to the desktop.
           </para>
           <indexterm zone="xdg-utils xdg-desktop-icon">
@@ -200,5 +183,5 @@
           <para>
             is a command line tool for querying information about file
-            type handling and adding descriptions for new file types
+            type handling and adding descriptions for new file types.
           </para>
           <indexterm zone="xdg-utils xdg-mime">
@@ -212,5 +195,5 @@
         <listitem>
           <para>
-            is a command line tool for (un)installing icon resources
+            is a command line tool for (un)installing icon resources.
           </para>
           <indexterm zone="xdg-utils xdg-icon-resource">
@@ -224,5 +207,5 @@
         <listitem>
           <para>
-            opens a file or URL in the user's preferred application
+            opens a file or URL in the user's preferred application.
           </para>
           <indexterm zone="xdg-utils xdg-open">
@@ -237,5 +220,5 @@
           <para>
             opens the user's preferred e-mail composer in order to send a mail
-            message
+            message.
           </para>
           <indexterm zone="xdg-utils xdg-email">
@@ -249,5 +232,5 @@
         <listitem>
           <para>
-            is a command line tool for controlling the screensaver
+            is a command line tool for controlling the screensaver.
           </para>
           <indexterm zone="xdg-utils xdg-screensaver">
@@ -262,5 +245,5 @@
           <para>
             is a command line tool for managing various settings from
-            the desktop environment
+            the desktop environment.
           </para>
           <indexterm zone="xdg-utils xdg-settings">
@@ -272,4 +255,3 @@
     </variablelist>
   </sect2>
-
 </sect1>
Index: xsoft/other/xscreensaver.xml
===================================================================
--- xsoft/other/xscreensaver.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/other/xscreensaver.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -7,8 +7,8 @@
   <!ENTITY xscreensaver-download-http "https://www.jwz.org/xscreensaver/xscreensaver-&xscreensaver-version;.tar.gz">
   <!ENTITY xscreensaver-download-ftp  " ">
-  <!ENTITY xscreensaver-md5sum        "a78738a034c7dc1c7960048c8a670588">
-  <!ENTITY xscreensaver-size          "27 MB">
-  <!ENTITY xscreensaver-buildsize     "244 MB">
-  <!ENTITY xscreensaver-time          "0.3 SBU (Using parallelism=4)">
+  <!ENTITY xscreensaver-md5sum        "dffe3be6c0db7468f1620873ec03a32e">
+  <!ENTITY xscreensaver-size          "26 MB">
+  <!ENTITY xscreensaver-buildsize     "384 MB">
+  <!ENTITY xscreensaver-time          "1.0 SBU">
 ]>
 
@@ -17,4 +17,5 @@
 
   <sect1info>
+    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -41,5 +42,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs10_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -94,9 +95,15 @@
     <para role="optional">
       <xref linkend="gdm"/>,
-      <xref linkend="linux-pam"/>,
-      <xref linkend="mitkrb"/>, and
-      <ulink url="http://linas.org/gle/">GLE</ulink>
-    </para>
-
+      <xref linkend="mitkrb"/>,
+      <ulink url="http://linas.org/gle/">GLE</ulink> and
+      <xref linkend="linux-pam"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
+    <para role="optional">
+      The adobe-100dpi font, with libXfont and bdftopcf from
+      <xref role="runtime" linkend="xorg7-legacy"/> (to enlarge the splash
+      screen, error messages, and password prompt)
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -208,5 +215,5 @@
           xscreensaver, xscreensaver-command, xscreensaver-demo, xscreensaver-getimage,
           xscreensaver-getimage-file, xscreensaver-getimage-video,
-          xscreensaver-gl-helper, xscreensaver-settings and xscreensaver-text
+          xscreensaver-gl-helper and xscreensaver-text
         </seg>
         <seg>
@@ -229,5 +236,5 @@
         <listitem>
           <para>
-            is a screen saver and locker daemon
+            is a screen saver and locker daemon.
           </para>
           <indexterm zone="xscreensaver xscreensaver-prog">
@@ -242,5 +249,5 @@
           <para>
             controls a running <command>xscreensaver</command>
-            process by sending it client messages
+            process by sending it client messages.
           </para>
           <indexterm zone="xscreensaver xscreensaver-command">
@@ -254,5 +261,6 @@
         <listitem>
           <para>
-            is a symlink to <command>xscreensaver-settings</command>
+            is a graphical front-end for setting the parameters used
+            by the background <command>xscreensaver</command> daemon.
           </para>
           <indexterm zone="xscreensaver xscreensaver-demo">
@@ -267,5 +275,5 @@
           <para>
             is a helper program for the <command>xscreensaver</command>
-            modules that manipulate images
+            modules that manipulate images.
           </para>
           <indexterm zone="xscreensaver xscreensaver-getimage">
@@ -280,5 +288,5 @@
           <para>
             is a helper program for the <command>xscreensaver</command>
-            modules that manipulate images
+            modules that manipulate images.
           </para>
           <indexterm zone="xscreensaver xscreensaver-getimage-file">
@@ -293,5 +301,5 @@
           <para>
             is a helper program for the <command>xscreensaver</command>
-            modules that manipulate images
+            modules that manipulate images.
           </para>
           <indexterm zone="xscreensaver xscreensaver-getimage-video">
@@ -306,5 +314,5 @@
           <para>
             is a helper program for the <command>xscreensaver</command>
-            OpenGL modules
+            OpenGL modules.
           </para>
           <indexterm zone="xscreensaver xscreensaver-gl-helper">
@@ -314,35 +322,9 @@
       </varlistentry>
 
-      <varlistentry id="xscreensaver-gl-visual">
-        <term><command>xscreensaver-gl-visual</command></term>
-        <listitem>
-          <para>
-            is a helper program for the <command>xscreensaver</command>
-            OpenGL modules to figure out which X visual to use
-          </para>
-          <indexterm zone="xscreensaver xscreensaver-gl-visual">
-            <primary sortas="b-xscreensaver-gl-visual">xscreensaver-gl-visual</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xscreensaver-settings">
-        <term><command>xscreensaver-settings</command></term>
-        <listitem>
-          <para>
-            is a graphical front-end for setting the parameters used
-            by the background <command>xscreensaver</command> daemon
-          </para>
-          <indexterm zone="xscreensaver xscreensaver-settings">
-            <primary sortas="b-xscreensaver-settings">xscreensaver-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="xscreensaver-text">
         <term><command>xscreensaver-text</command></term>
         <listitem>
           <para>
-            prints some text to stdout, for use by screen savers
+            prints some text to stdout, for use by screen savers.
           </para>
           <indexterm zone="xscreensaver xscreensaver-text">
Index: xsoft/xsoft.xml
===================================================================
--- xsoft/xsoft.xml	(revision c94264543192314f7443c25daf72b1130d570dc8)
+++ xsoft/xsoft.xml	(revision 45b31bb9a8735a5e094da68b03b225c84f87a460)
@@ -5,4 +5,9 @@
   %general-entities;
 ]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
 
 <part id="xsoft" xreflabel="X Software">
